Merge remote-tracking branch 'master' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/asm/kvm_para.h

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1153 files changed, 49142 insertions, 39720 deletions

diff --git a/include/Kbuild b/include/Kbuild
index 8d226bfa2696..83256b64166a 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,12 +1,8 @@
 # Top-level Makefile calls into asm-$(ARCH)
 # List only non-arch directories below
 
-header-y += asm-generic/
 header-y += linux/
 header-y += sound/
-header-y += mtd/
 header-y += rdma/
 header-y += video/
-header-y += drm/
-header-y += xen/
 header-y += scsi/
diff --git a/include/acpi/acbuffer.h b/include/acpi/acbuffer.h
new file mode 100644
index 000000000000..a1e45cdd729a
--- /dev/null
+++ b/include/acpi/acbuffer.h
@@ -0,0 +1,235 @@
+/******************************************************************************
+ *
+ * Name: acbuffer.h - Support for buffers returned by ACPI predefined names
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACBUFFER_H__
+#define __ACBUFFER_H__
+
+/*
+ * Contains buffer structures for these predefined names:
+ * _FDE, _GRT, _GTM, _PLD, _SRT
+ */
+
+/*
+ * Note: C bitfields are not used for this reason:
+ *
+ * "Bitfields are great and easy to read, but unfortunately the C language
+ * does not specify the layout of bitfields in memory, which means they are
+ * essentially useless for dealing with packed data in on-disk formats or
+ * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me,
+ * this decision was a design error in C. Ritchie could have picked an order
+ * and stuck with it." Norman Ramsey.
+ * See http://stackoverflow.com/a/1053662/41661
+ */
+
+/* _FDE return value */
+
+struct acpi_fde_info {
+        u32 floppy0;
+        u32 floppy1;
+        u32 floppy2;
+        u32 floppy3;
+        u32 tape;
+};
+
+/*
+ * _GRT return value
+ * _SRT input value
+ */
+struct acpi_grt_info {
+        u16 year;
+        u8 month;
+        u8 day;
+        u8 hour;
+        u8 minute;
+        u8 second;
+        u8 valid;
+        u16 milliseconds;
+        u16 timezone;
+        u8 daylight;
+        u8 reserved[3];
+};
+
+/* _GTM return value */
+
+struct acpi_gtm_info {
+        u32 pio_speed0;
+        u32 dma_speed0;
+        u32 pio_speed1;
+        u32 dma_speed1;
+        u32 flags;
+};
+
+/*
+ * Formatted _PLD return value. The minimum size is a package containing
+ * one buffer.
+ * Revision 1: Buffer is 16 bytes (128 bits)
+ * Revision 2: Buffer is 20 bytes (160 bits)
+ *
+ * Note: This structure is returned from the acpi_decode_pld_buffer
+ * interface.
+ */
+struct acpi_pld_info {
+        u8 revision;
+        u8 ignore_color;
+        u32 color;
+        u16 width;
+        u16 height;
+        u8 user_visible;
+        u8 dock;
+        u8 lid;
+        u8 panel;
+        u8 vertical_position;
+        u8 horizontal_position;
+        u8 shape;
+        u8 group_orientation;
+        u8 group_token;
+        u8 group_position;
+        u8 bay;
+        u8 ejectable;
+        u8 ospm_eject_required;
+        u8 cabinet_number;
+        u8 card_cage_number;
+        u8 reference;
+        u8 rotation;
+        u8 order;
+        u8 reserved;
+        u16 vertical_offset;
+        u16 horizontal_offset;
+};
+
+/*
+ * Macros to:
+ *     1) Convert a _PLD buffer to internal struct acpi_pld_info format - ACPI_PLD_GET*
+ *        (Used by acpi_decode_pld_buffer)
+ *     2) Construct a _PLD buffer - ACPI_PLD_SET*
+ *        (Intended for BIOS use only)
+ */
+#define ACPI_PLD_REV1_BUFFER_SIZE               16      /* For Revision 1 of the buffer (From ACPI spec) */
+#define ACPI_PLD_BUFFER_SIZE                    20      /* For Revision 2 of the buffer (From ACPI spec) */
+
+/* First 32-bit dword, bits 0:32 */
+
+#define ACPI_PLD_GET_REVISION(dword)            ACPI_GET_BITS (dword, 0, ACPI_7BIT_MASK)
+#define ACPI_PLD_SET_REVISION(dword,value)      ACPI_SET_BITS (dword, 0, ACPI_7BIT_MASK, value) /* Offset 0, Len 7 */
+
+#define ACPI_PLD_GET_IGNORE_COLOR(dword)        ACPI_GET_BITS (dword, 7, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_IGNORE_COLOR(dword,value)  ACPI_SET_BITS (dword, 7, ACPI_1BIT_MASK, value) /* Offset 7, Len 1 */
+
+#define ACPI_PLD_GET_COLOR(dword)               ACPI_GET_BITS (dword, 8, ACPI_24BIT_MASK)
+#define ACPI_PLD_SET_COLOR(dword,value)         ACPI_SET_BITS (dword, 8, ACPI_24BIT_MASK, value)        /* Offset 8, Len 24 */
+
+/* Second 32-bit dword, bits 33:63 */
+
+#define ACPI_PLD_GET_WIDTH(dword)               ACPI_GET_BITS (dword, 0, ACPI_16BIT_MASK)
+#define ACPI_PLD_SET_WIDTH(dword,value)         ACPI_SET_BITS (dword, 0, ACPI_16BIT_MASK, value)        /* Offset 32+0=32, Len 16 */
+
+#define ACPI_PLD_GET_HEIGHT(dword)              ACPI_GET_BITS (dword, 16, ACPI_16BIT_MASK)
+#define ACPI_PLD_SET_HEIGHT(dword,value)        ACPI_SET_BITS (dword, 16, ACPI_16BIT_MASK, value)       /* Offset 32+16=48, Len 16 */
+
+/* Third 32-bit dword, bits 64:95 */
+
+#define ACPI_PLD_GET_USER_VISIBLE(dword)        ACPI_GET_BITS (dword, 0, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_USER_VISIBLE(dword,value)  ACPI_SET_BITS (dword, 0, ACPI_1BIT_MASK, value) /* Offset 64+0=64, Len 1 */
+
+#define ACPI_PLD_GET_DOCK(dword)                ACPI_GET_BITS (dword, 1, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_DOCK(dword,value)          ACPI_SET_BITS (dword, 1, ACPI_1BIT_MASK, value) /* Offset 64+1=65, Len 1 */
+
+#define ACPI_PLD_GET_LID(dword)                 ACPI_GET_BITS (dword, 2, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_LID(dword,value)           ACPI_SET_BITS (dword, 2, ACPI_1BIT_MASK, value) /* Offset 64+2=66, Len 1 */
+
+#define ACPI_PLD_GET_PANEL(dword)               ACPI_GET_BITS (dword, 3, ACPI_3BIT_MASK)
+#define ACPI_PLD_SET_PANEL(dword,value)         ACPI_SET_BITS (dword, 3, ACPI_3BIT_MASK, value) /* Offset 64+3=67, Len 3 */
+
+#define ACPI_PLD_GET_VERTICAL(dword)            ACPI_GET_BITS (dword, 6, ACPI_2BIT_MASK)
+#define ACPI_PLD_SET_VERTICAL(dword,value)      ACPI_SET_BITS (dword, 6, ACPI_2BIT_MASK, value) /* Offset 64+6=70, Len 2 */
+
+#define ACPI_PLD_GET_HORIZONTAL(dword)          ACPI_GET_BITS (dword, 8, ACPI_2BIT_MASK)
+#define ACPI_PLD_SET_HORIZONTAL(dword,value)    ACPI_SET_BITS (dword, 8, ACPI_2BIT_MASK, value) /* Offset 64+8=72, Len 2 */
+
+#define ACPI_PLD_GET_SHAPE(dword)               ACPI_GET_BITS (dword, 10, ACPI_4BIT_MASK)
+#define ACPI_PLD_SET_SHAPE(dword,value)         ACPI_SET_BITS (dword, 10, ACPI_4BIT_MASK, value)        /* Offset 64+10=74, Len 4 */
+
+#define ACPI_PLD_GET_ORIENTATION(dword)         ACPI_GET_BITS (dword, 14, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_ORIENTATION(dword,value)   ACPI_SET_BITS (dword, 14, ACPI_1BIT_MASK, value)        /* Offset 64+14=78, Len 1 */
+
+#define ACPI_PLD_GET_TOKEN(dword)               ACPI_GET_BITS (dword, 15, ACPI_8BIT_MASK)
+#define ACPI_PLD_SET_TOKEN(dword,value)         ACPI_SET_BITS (dword, 15, ACPI_8BIT_MASK, value)        /* Offset 64+15=79, Len 8 */
+
+#define ACPI_PLD_GET_POSITION(dword)            ACPI_GET_BITS (dword, 23, ACPI_8BIT_MASK)
+#define ACPI_PLD_SET_POSITION(dword,value)      ACPI_SET_BITS (dword, 23, ACPI_8BIT_MASK, value)        /* Offset 64+23=87, Len 8 */
+
+#define ACPI_PLD_GET_BAY(dword)                 ACPI_GET_BITS (dword, 31, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_BAY(dword,value)           ACPI_SET_BITS (dword, 31, ACPI_1BIT_MASK, value)        /* Offset 64+31=95, Len 1 */
+
+/* Fourth 32-bit dword, bits 96:127 */
+
+#define ACPI_PLD_GET_EJECTABLE(dword)           ACPI_GET_BITS (dword, 0, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_EJECTABLE(dword,value)     ACPI_SET_BITS (dword, 0, ACPI_1BIT_MASK, value) /* Offset 96+0=96, Len 1 */
+
+#define ACPI_PLD_GET_OSPM_EJECT(dword)          ACPI_GET_BITS (dword, 1, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_OSPM_EJECT(dword,value)    ACPI_SET_BITS (dword, 1, ACPI_1BIT_MASK, value) /* Offset 96+1=97, Len 1 */
+
+#define ACPI_PLD_GET_CABINET(dword)             ACPI_GET_BITS (dword, 2, ACPI_8BIT_MASK)
+#define ACPI_PLD_SET_CABINET(dword,value)       ACPI_SET_BITS (dword, 2, ACPI_8BIT_MASK, value) /* Offset 96+2=98, Len 8 */
+
+#define ACPI_PLD_GET_CARD_CAGE(dword)           ACPI_GET_BITS (dword, 10, ACPI_8BIT_MASK)
+#define ACPI_PLD_SET_CARD_CAGE(dword,value)     ACPI_SET_BITS (dword, 10, ACPI_8BIT_MASK, value)        /* Offset 96+10=106, Len 8 */
+
+#define ACPI_PLD_GET_REFERENCE(dword)           ACPI_GET_BITS (dword, 18, ACPI_1BIT_MASK)
+#define ACPI_PLD_SET_REFERENCE(dword,value)     ACPI_SET_BITS (dword, 18, ACPI_1BIT_MASK, value)        /* Offset 96+18=114, Len 1 */
+
+#define ACPI_PLD_GET_ROTATION(dword)            ACPI_GET_BITS (dword, 19, ACPI_4BIT_MASK)
+#define ACPI_PLD_SET_ROTATION(dword,value)      ACPI_SET_BITS (dword, 19, ACPI_4BIT_MASK, value)        /* Offset 96+19=115, Len 4 */
+
+#define ACPI_PLD_GET_ORDER(dword)               ACPI_GET_BITS (dword, 23, ACPI_5BIT_MASK)
+#define ACPI_PLD_SET_ORDER(dword,value)         ACPI_SET_BITS (dword, 23, ACPI_5BIT_MASK, value)        /* Offset 96+23=119, Len 5 */
+
+/* Fifth 32-bit dword, bits 128:159 (Revision 2 of _PLD only) */
+
+#define ACPI_PLD_GET_VERT_OFFSET(dword)         ACPI_GET_BITS (dword, 0, ACPI_16BIT_MASK)
+#define ACPI_PLD_SET_VERT_OFFSET(dword,value)   ACPI_SET_BITS (dword, 0, ACPI_16BIT_MASK, value)        /* Offset 128+0=128, Len 16 */
+
+#define ACPI_PLD_GET_HORIZ_OFFSET(dword)        ACPI_GET_BITS (dword, 16, ACPI_16BIT_MASK)
+#define ACPI_PLD_SET_HORIZ_OFFSET(dword,value)  ACPI_SET_BITS (dword, 16, ACPI_16BIT_MASK, value)       /* Offset 128+16=144, Len 16 */
+
+#endif                          /* ACBUFFER_H */
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index d988ac54f41e..745dd24e3cb5 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -63,11 +63,10 @@
 #define METHOD_NAME__PRW        "_PRW"
 #define METHOD_NAME__SRS        "_SRS"
 #define METHOD_NAME__CBA        "_CBA"
+#define METHOD_NAME__PLD        "_PLD"
 
 /* Method names - these methods must appear at the namespace root */
 
-#define METHOD_PATHNAME__BFS    "\\_BFS"
-#define METHOD_PATHNAME__GTS    "\\_GTS"
 #define METHOD_PATHNAME__PTS    "\\_PTS"
 #define METHOD_PATHNAME__SST    "\\_SI._SST"
 #define METHOD_PATHNAME__WAK    "\\_WAK"
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index bde976ee068d..0daa0fbd8654 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -54,37 +54,8 @@ acpi_status
 acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
                         u32 status_code, struct acpi_buffer *status_buf);
 
-struct acpi_pld {
-        unsigned int revision:7; /* 0 */
-        unsigned int ignore_colour:1; /* 7 */
-        unsigned int colour:24; /* 8 */
-        unsigned int width:16; /* 32 */
-        unsigned int height:16; /* 48 */
-        unsigned int user_visible:1; /* 64 */
-        unsigned int dock:1; /* 65 */
-        unsigned int lid:1; /* 66 */
-        unsigned int panel:3; /* 67 */
-        unsigned int vertical_pos:2; /* 70 */
-        unsigned int horizontal_pos:2; /* 72 */
-        unsigned int shape:4; /* 74 */
-        unsigned int group_orientation:1; /* 78 */
-        unsigned int group_token:8; /* 79 */
-        unsigned int group_position:8; /* 87 */
-        unsigned int bay:1; /* 95 */
-        unsigned int ejectable:1; /* 96 */
-        unsigned int ospm_eject_required:1; /* 97 */
-        unsigned int cabinet_number:8; /* 98 */
-        unsigned int card_cage_number:8; /* 106 */
-        unsigned int reference:1; /* 114 */
-        unsigned int rotation:4; /* 115 */
-        unsigned int order:5; /* 119 */
-        unsigned int reserved:4; /* 124 */
-        unsigned int vertical_offset:16; /* 128 */
-        unsigned int horizontal_offset:16; /* 144 */
-} __attribute__((__packed__));
-
 acpi_status
-acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld *pld);
+acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);
 #ifdef CONFIG_ACPI
 
 #include <linux/proc_fs.h>
@@ -208,6 +179,7 @@ struct acpi_device_pnp {
         struct list_head ids;           /* _HID and _CIDs */
         acpi_device_name device_name;   /* Driver-determined */
         acpi_device_class device_class; /*        "          */
+        union acpi_object *str_obj;     /* unicode string for _STR method */
 };
 
 #define acpi_device_bid(d)      ((d)->pnp.bus_id)
@@ -282,8 +254,16 @@ struct acpi_device_wakeup {
         int prepare_count;
 };
 
-/* Device */
+struct acpi_device_physical_node {
+        u8 node_id;
+        struct list_head node;
+        struct device *dev;
+};
+
+/* set maximum of physical nodes to 32 for expansibility */
+#define ACPI_MAX_PHYSICAL_NODE  32
 
+/* Device */
 struct acpi_device {
         int device_type;
         acpi_handle handle;             /* no handle for fixed hardware */
@@ -304,6 +284,10 @@ struct acpi_device {
         struct device dev;
         struct acpi_bus_ops bus_ops;    /* workaround for different code path for hotplug */
         enum acpi_bus_removal_type removal_type;        /* indicate for different removal type */
+        u8 physical_node_count;
+        struct list_head physical_node_list;
+        struct mutex physical_node_lock;
+        DECLARE_BITMAP(physical_node_id_bitmap, ACPI_MAX_PHYSICAL_NODE);
 };
 
 static inline void *acpi_driver_data(struct acpi_device *d)
@@ -381,6 +365,19 @@ int acpi_match_device_ids(struct acpi_device *device,
 int acpi_create_dir(struct acpi_device *);
 void acpi_remove_dir(struct acpi_device *);
 
+
+/**
+ * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver
+ * @__acpi_driver: acpi_driver struct
+ *
+ * Helper macro for ACPI drivers which do not do anything special in module
+ * init/exit. This eliminates a lot of boilerplate. Each module may only
+ * use this macro once, and calling it replaces module_init() and module_exit()
+ */
+#define module_acpi_driver(__acpi_driver) \
+        module_driver(__acpi_driver, acpi_bus_register_driver, \
+                      acpi_bus_unregister_driver)
+
 /*
  * Bind physical devices with ACPI devices
  */
@@ -394,7 +391,6 @@ struct acpi_bus_type {
 };
 int register_acpi_bus_type(struct acpi_bus_type *);
 int unregister_acpi_bus_type(struct acpi_bus_type *);
-struct device *acpi_get_physical_device(acpi_handle);
 
 struct acpi_pci_root {
         struct list_head node;
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 51405d32ac64..8b891dbead66 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,11 +47,12 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20120711
+#define ACPI_CA_VERSION                 0x20120913
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
 #include <acpi/actbl.h>
+#include <acpi/acbuffer.h>
 
 extern u8 acpi_gbl_permanent_mmap;
 
@@ -144,6 +145,10 @@ acpi_check_address_range(acpi_adr_space_type space_id,
                          acpi_physical_address address,
                          acpi_size length, u8 warn);
 
+acpi_status
+acpi_decode_pld_buffer(u8 *in_buffer,
+                       acpi_size length, struct acpi_pld_info **return_buffer);
+
 /*
  * ACPI Memory management
  */
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 59a73e1b2845..4f94b1d812d5 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -79,9 +79,15 @@
 #pragma pack(1)
 
 /*
- * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
- * This is the only type that is even remotely portable. Anything else is not
- * portable, so do not use any other bitfield types.
+ * Note: C bitfields are not used for this reason:
+ *
+ * "Bitfields are great and easy to read, but unfortunately the C language
+ * does not specify the layout of bitfields in memory, which means they are
+ * essentially useless for dealing with packed data in on-disk formats or
+ * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me,
+ * this decision was a design error in C. Ritchie could have picked an order
+ * and stuck with it." Norman Ramsey.
+ * See http://stackoverflow.com/a/1053662/41661
  */
 
 /*******************************************************************************
@@ -94,7 +100,7 @@
 struct acpi_table_header {
         char signature[ACPI_NAME_SIZE]; /* ASCII table signature */
         u32 length;             /* Length of table in bytes, including this header */
-        u8 revision;            /* ACPI Specification minor version # */
+        u8 revision;            /* ACPI Specification minor version number */
         u8 checksum;            /* To make sum of entire table == 0 */
         char oem_id[ACPI_OEM_ID_SIZE];  /* ASCII OEM identification */
         char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];      /* ASCII OEM table identification */
@@ -108,7 +114,7 @@ struct acpi_table_header {
  * GAS - Generic Address Structure (ACPI 2.0+)
  *
  * Note: Since this structure is used in the ACPI tables, it is byte aligned.
- * If misaliged access is not supported by the hardware, accesses to the
+ * If misaligned access is not supported by the hardware, accesses to the
  * 64-bit Address field must be performed with care.
  *
  ******************************************************************************/
@@ -210,18 +216,18 @@ struct acpi_table_fadt {
         u8 preferred_profile;   /* Conveys preferred power management profile to OSPM. */
         u16 sci_interrupt;      /* System vector of SCI interrupt */
         u32 smi_command;        /* 32-bit Port address of SMI command port */
-        u8 acpi_enable;         /* Value to write to smi_cmd to enable ACPI */
-        u8 acpi_disable;        /* Value to write to smi_cmd to disable ACPI */
-        u8 s4_bios_request;     /* Value to write to SMI CMD to enter S4BIOS state */
+        u8 acpi_enable;         /* Value to write to SMI_CMD to enable ACPI */
+        u8 acpi_disable;        /* Value to write to SMI_CMD to disable ACPI */
+        u8 s4_bios_request;     /* Value to write to SMI_CMD to enter S4BIOS state */
         u8 pstate_control;      /* Processor performance state control */
-        u32 pm1a_event_block;   /* 32-bit Port address of Power Mgt 1a Event Reg Blk */
-        u32 pm1b_event_block;   /* 32-bit Port address of Power Mgt 1b Event Reg Blk */
-        u32 pm1a_control_block; /* 32-bit Port address of Power Mgt 1a Control Reg Blk */
-        u32 pm1b_control_block; /* 32-bit Port address of Power Mgt 1b Control Reg Blk */
-        u32 pm2_control_block;  /* 32-bit Port address of Power Mgt 2 Control Reg Blk */
-        u32 pm_timer_block;     /* 32-bit Port address of Power Mgt Timer Ctrl Reg Blk */
-        u32 gpe0_block;         /* 32-bit Port address of General Purpose Event 0 Reg Blk */
-        u32 gpe1_block;         /* 32-bit Port address of General Purpose Event 1 Reg Blk */
+        u32 pm1a_event_block;   /* 32-bit port address of Power Mgt 1a Event Reg Blk */
+        u32 pm1b_event_block;   /* 32-bit port address of Power Mgt 1b Event Reg Blk */
+        u32 pm1a_control_block; /* 32-bit port address of Power Mgt 1a Control Reg Blk */
+        u32 pm1b_control_block; /* 32-bit port address of Power Mgt 1b Control Reg Blk */
+        u32 pm2_control_block;  /* 32-bit port address of Power Mgt 2 Control Reg Blk */
+        u32 pm_timer_block;     /* 32-bit port address of Power Mgt Timer Ctrl Reg Blk */
+        u32 gpe0_block;         /* 32-bit port address of General Purpose Event 0 Reg Blk */
+        u32 gpe1_block;         /* 32-bit port address of General Purpose Event 1 Reg Blk */
         u8 pm1_event_length;    /* Byte Length of ports at pm1x_event_block */
         u8 pm1_control_length;  /* Byte Length of ports at pm1x_control_block */
         u8 pm2_control_length;  /* Byte Length of ports at pm2_control_block */
@@ -229,12 +235,12 @@ struct acpi_table_fadt {
         u8 gpe0_block_length;   /* Byte Length of ports at gpe0_block */
         u8 gpe1_block_length;   /* Byte Length of ports at gpe1_block */
         u8 gpe1_base;           /* Offset in GPE number space where GPE1 events start */
-        u8 cst_control;         /* Support for the _CST object and C States change notification */
+        u8 cst_control;         /* Support for the _CST object and C-States change notification */
         u16 c2_latency;         /* Worst case HW latency to enter/exit C2 state */
         u16 c3_latency;         /* Worst case HW latency to enter/exit C3 state */
-        u16 flush_size;         /* Processor's memory cache line width, in bytes */
+        u16 flush_size;         /* Processor memory cache line width, in bytes */
         u16 flush_stride;       /* Number of flush strides that need to be read */
-        u8 duty_offset;         /* Processor duty cycle index in processor's P_CNT reg */
+        u8 duty_offset;         /* Processor duty cycle index in processor P_CNT reg */
         u8 duty_width;          /* Processor duty cycle value bit width in P_CNT register */
         u8 day_alarm;           /* Index to day-of-month alarm in RTC CMOS RAM */
         u8 month_alarm;         /* Index to month-of-year alarm in RTC CMOS RAM */
@@ -255,11 +261,11 @@ struct acpi_table_fadt {
         struct acpi_generic_address xpm_timer_block;    /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */
         struct acpi_generic_address xgpe0_block;        /* 64-bit Extended General Purpose Event 0 Reg Blk address */
         struct acpi_generic_address xgpe1_block;        /* 64-bit Extended General Purpose Event 1 Reg Blk address */
-        struct acpi_generic_address sleep_control;      /* 64-bit Sleep Control register */
-        struct acpi_generic_address sleep_status;       /* 64-bit Sleep Status register */
+        struct acpi_generic_address sleep_control;      /* 64-bit Sleep Control register (ACPI 5.0) */
+        struct acpi_generic_address sleep_status;       /* 64-bit Sleep Status register (ACPI 5.0) */
 };
 
-/* Masks for FADT Boot Architecture Flags (boot_flags) */
+/* Masks for FADT Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
 
 #define ACPI_FADT_LEGACY_DEVICES    (1)         /* 00: [V2] System has LPC or ISA bus devices */
 #define ACPI_FADT_8042              (1<<1)      /* 01: [V3] System has an 8042 controller on port 60/64 */
@@ -272,13 +278,13 @@ struct acpi_table_fadt {
 
 /* Masks for FADT flags */
 
-#define ACPI_FADT_WBINVD            (1) /* 00: [V1] The wbinvd instruction works properly */
-#define ACPI_FADT_WBINVD_FLUSH      (1<<1)      /* 01: [V1] wbinvd flushes but does not invalidate caches */
+#define ACPI_FADT_WBINVD            (1) /* 00: [V1] The WBINVD instruction works properly */
+#define ACPI_FADT_WBINVD_FLUSH      (1<<1)      /* 01: [V1] WBINVD flushes but does not invalidate caches */
 #define ACPI_FADT_C1_SUPPORTED      (1<<2)      /* 02: [V1] All processors support C1 state */
 #define ACPI_FADT_C2_MP_SUPPORTED   (1<<3)      /* 03: [V1] C2 state works on MP system */
 #define ACPI_FADT_POWER_BUTTON      (1<<4)      /* 04: [V1] Power button is handled as a control method device */
 #define ACPI_FADT_SLEEP_BUTTON      (1<<5)      /* 05: [V1] Sleep button is handled as a control method device */
-#define ACPI_FADT_FIXED_RTC         (1<<6)      /* 06: [V1] RTC wakeup status not in fixed register space */
+#define ACPI_FADT_FIXED_RTC         (1<<6)      /* 06: [V1] RTC wakeup status is not in fixed register space */
 #define ACPI_FADT_S4_RTC_WAKE       (1<<7)      /* 07: [V1] RTC alarm can wake system from S4 */
 #define ACPI_FADT_32BIT_TIMER       (1<<8)      /* 08: [V1] ACPI timer width is 32-bit (0=24-bit) */
 #define ACPI_FADT_DOCKING_SUPPORTED (1<<9)      /* 09: [V1] Docking supported */
@@ -297,7 +303,7 @@ struct acpi_table_fadt {
 
 /* Values for preferred_profile (Preferred Power Management Profiles) */
 
-enum acpi_prefered_pm_profiles {
+enum acpi_preferred_pm_profiles {
         PM_UNSPECIFIED = 0,
         PM_DESKTOP = 1,
         PM_MOBILE = 2,
@@ -335,7 +341,7 @@ union acpi_name_union {
 struct acpi_table_desc {
         acpi_physical_address address;
         struct acpi_table_header *pointer;
-        u32 length;             /* Length fixed at 32 bits */
+        u32 length;             /* Length fixed at 32 bits (fixed in table header) */
         union acpi_name_union signature;
         acpi_owner_id owner_id;
         u8 flags;
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 300d14e7c5d5..280fc45b59dd 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -79,9 +79,15 @@
 #pragma pack(1)
 
 /*
- * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
- * This is the only type that is even remotely portable. Anything else is not
- * portable, so do not use any other bitfield types.
+ * Note: C bitfields are not used for this reason:
+ *
+ * "Bitfields are great and easy to read, but unfortunately the C language
+ * does not specify the layout of bitfields in memory, which means they are
+ * essentially useless for dealing with packed data in on-disk formats or
+ * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me,
+ * this decision was a design error in C. Ritchie could have picked an order
+ * and stuck with it." Norman Ramsey.
+ * See http://stackoverflow.com/a/1053662/41661
  */
 
 /*******************************************************************************
@@ -489,7 +495,9 @@ enum acpi_hest_notify_types {
         ACPI_HEST_NOTIFY_LOCAL = 2,
         ACPI_HEST_NOTIFY_SCI = 3,
         ACPI_HEST_NOTIFY_NMI = 4,
-        ACPI_HEST_NOTIFY_RESERVED = 5   /* 5 and greater are reserved */
+        ACPI_HEST_NOTIFY_CMCI = 5,      /* ACPI 5.0 */
+        ACPI_HEST_NOTIFY_MCE = 6,       /* ACPI 5.0 */
+        ACPI_HEST_NOTIFY_RESERVED = 7   /* 7 and greater are reserved */
 };
 
 /* Values for config_write_enable bitfield above */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index d9ceb3d31629..1b2b356486d1 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -63,6 +63,8 @@
  */
 #define ACPI_SIG_ASF            "ASF!"  /* Alert Standard Format table */
 #define ACPI_SIG_BOOT           "BOOT"  /* Simple Boot Flag Table */
+#define ACPI_SIG_CSRT           "CSRT"  /* Core System Resource Table */
+#define ACPI_SIG_DBG2           "DBG2"  /* Debug Port table type 2 */
 #define ACPI_SIG_DBGP           "DBGP"  /* Debug Port table */
 #define ACPI_SIG_DMAR           "DMAR"  /* DMA Remapping table */
 #define ACPI_SIG_HPET           "HPET"  /* High Precision Event Timer table */
@@ -96,9 +98,15 @@
 #pragma pack(1)
 
 /*
- * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
- * This is the only type that is even remotely portable. Anything else is not
- * portable, so do not use any other bitfield types.
+ * Note: C bitfields are not used for this reason:
+ *
+ * "Bitfields are great and easy to read, but unfortunately the C language
+ * does not specify the layout of bitfields in memory, which means they are
+ * essentially useless for dealing with packed data in on-disk formats or
+ * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me,
+ * this decision was a design error in C. Ritchie could have picked an order
+ * and stuck with it." Norman Ramsey.
+ * See http://stackoverflow.com/a/1053662/41661
  */
 
 /*******************************************************************************
@@ -232,6 +240,115 @@ struct acpi_table_boot {
 
 /*******************************************************************************
  *
+ * CSRT - Core System Resource Table
+ *        Version 0
+ *
+ * Conforms to the "Core System Resource Table (CSRT)", November 14, 2011
+ *
+ ******************************************************************************/
+
+struct acpi_table_csrt {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* Resource Group subtable */
+
+struct acpi_csrt_group {
+        u32 length;
+        u32 vendor_id;
+        u32 subvendor_id;
+        u16 device_id;
+        u16 subdevice_id;
+        u16 revision;
+        u16 reserved;
+        u32 info_length;
+
+        /* Shared data (length = info_length) immediately follows */
+};
+
+/* Resource Descriptor subtable */
+
+struct acpi_csrt_descriptor {
+        u32 length;
+        u16 type;
+        u16 subtype;
+        u32 uid;
+
+        /* Resource-specific information immediately follows */
+};
+
+/* Resource Types */
+
+#define ACPI_CSRT_TYPE_INTERRUPT    0x0001
+#define ACPI_CSRT_TYPE_TIMER        0x0002
+#define ACPI_CSRT_TYPE_DMA          0x0003
+
+/* Resource Subtypes */
+
+#define ACPI_CSRT_XRUPT_LINE        0x0000
+#define ACPI_CSRT_XRUPT_CONTROLLER  0x0001
+#define ACPI_CSRT_TIMER             0x0000
+#define ACPI_CSRT_DMA_CHANNEL       0x0000
+#define ACPI_CSRT_DMA_CONTROLLER    0x0001
+
+/*******************************************************************************
+ *
+ * DBG2 - Debug Port Table 2
+ *        Version 0 (Both main table and subtables)
+ *
+ * Conforms to "Microsoft Debug Port Table 2 (DBG2)", May 22 2012.
+ *
+ ******************************************************************************/
+
+struct acpi_table_dbg2 {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 info_offset;
+        u32 info_count;
+};
+
+/* Debug Device Information Subtable */
+
+struct acpi_dbg2_device {
+        u8 revision;
+        u16 length;
+        u8 register_count;      /* Number of base_address registers */
+        u16 namepath_length;
+        u16 namepath_offset;
+        u16 oem_data_length;
+        u16 oem_data_offset;
+        u16 port_type;
+        u16 port_subtype;
+        u16 reserved;
+        u16 base_address_offset;
+        u16 address_size_offset;
+        /*
+         * Data that follows:
+         *    base_address (required) - Each in 12-byte Generic Address Structure format.
+         *    address_size (required) - Array of u32 sizes corresponding to each base_address register.
+         *    Namepath    (required) - Null terminated string. Single dot if not supported.
+         *    oem_data    (optional) - Length is oem_data_length.
+         */
+};
+
+/* Types for port_type field above */
+
+#define ACPI_DBG2_SERIAL_PORT       0x8000
+#define ACPI_DBG2_1394_PORT         0x8001
+#define ACPI_DBG2_USB_PORT          0x8002
+#define ACPI_DBG2_NET_PORT          0x8003
+
+/* Subtypes for port_subtype field above */
+
+#define ACPI_DBG2_16550_COMPATIBLE  0x0000
+#define ACPI_DBG2_16550_SUBSET      0x0001
+
+#define ACPI_DBG2_1394_STANDARD     0x0000
+
+#define ACPI_DBG2_USB_XHCI          0x0000
+#define ACPI_DBG2_USB_EHCI          0x0001
+
+/*******************************************************************************
+ *
  * DBGP - Debug Port table
  *        Version 1
  *
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index f65a0ed869eb..8c61b5fe42a4 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -75,7 +75,6 @@
 /* Reserved table signatures */
 
 #define ACPI_SIG_CSRT           "CSRT"  /* Core System Resources Table */
-#define ACPI_SIG_DBG2           "DBG2"  /* Debug Port table 2 */
 #define ACPI_SIG_MATR           "MATR"  /* Memory Address Translation Table */
 #define ACPI_SIG_MSDM           "MSDM"  /* Microsoft Data Management Table */
 #define ACPI_SIG_WPBT           "WPBT"  /* Windows Platform Binary Table */
@@ -87,9 +86,15 @@
 #pragma pack(1)
 
 /*
- * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
- * This is the only type that is even remotely portable. Anything else is not
- * portable, so do not use any other bitfield types.
+ * Note: C bitfields are not used for this reason:
+ *
+ * "Bitfields are great and easy to read, but unfortunately the C language
+ * does not specify the layout of bitfields in memory, which means they are
+ * essentially useless for dealing with packed data in on-disk formats or
+ * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me,
+ * this decision was a design error in C. Ritchie could have picked an order
+ * and stuck with it." Norman Ramsey.
+ * See http://stackoverflow.com/a/1053662/41661
  */
 
 /*******************************************************************************
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 3d00bd5bd7e3..a85bae968262 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -519,13 +519,6 @@ typedef u64 acpi_integer;
 #define ACPI_SLEEP_TYPE_INVALID         0xFF
 
 /*
- * Sleep/Wake flags
- */
-#define ACPI_NO_OPTIONAL_METHODS        0x00    /* Do not execute any optional methods */
-#define ACPI_EXECUTE_GTS                0x01    /* For enter sleep interface */
-#define ACPI_EXECUTE_BFS                0x02    /* For leave sleep prep interface */
-
-/*
  * Standard notify values
  */
 #define ACPI_NOTIFY_BUS_CHECK           (u8) 0x00
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
deleted file mode 100644
index 2c85a0f647b7..000000000000
--- a/include/asm-generic/Kbuild
+++ /dev/null
@@ -1,35 +0,0 @@
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += errno-base.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += int-l64.h
-header-y += int-ll64.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman-common.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += shmparam.h
-header-y += siginfo.h
-header-y += signal-defs.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += ucontext.h
-header-y += unistd.h
diff --git a/include/asm-generic/bitops/count_zeros.h b/include/asm-generic/bitops/count_zeros.h
new file mode 100644
index 000000000000..97520d21fe62
--- /dev/null
+++ b/include/asm-generic/bitops/count_zeros.h
@@ -0,0 +1,57 @@
+/* Count leading and trailing zeros functions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+#define _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+
+#include <asm/bitops.h>
+
+/**
+ * count_leading_zeros - Count the number of zeros from the MSB back
+ * @x: The value
+ *
+ * Count the number of leading zeros from the MSB going towards the LSB in @x.
+ *
+ * If the MSB of @x is set, the result is 0.
+ * If only the LSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_LEADING_ZEROS_0.
+ */
+static inline int count_leading_zeros(unsigned long x)
+{
+        if (sizeof(x) == 4)
+                return BITS_PER_LONG - fls(x);
+        else
+                return BITS_PER_LONG - fls64(x);
+}
+
+#define COUNT_LEADING_ZEROS_0 BITS_PER_LONG
+
+/**
+ * count_trailing_zeros - Count the number of zeros from the LSB forwards
+ * @x: The value
+ *
+ * Count the number of trailing zeros from the LSB going towards the MSB in @x.
+ *
+ * If the LSB of @x is set, the result is 0.
+ * If only the MSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_TRAILING_ZEROS_0.
+ */
+static inline int count_trailing_zeros(unsigned long x)
+{
+#define COUNT_TRAILING_ZEROS_0 (-1)
+
+        if (sizeof(x) == 4)
+                return ffs(x);
+        else
+                return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0;
+}
+
+#endif /* _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_ */
diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h
index f95c663a6a41..61731543c00e 100644
--- a/include/asm-generic/bitops/le.h
+++ b/include/asm-generic/bitops/le.h
@@ -54,6 +54,16 @@ static inline int test_bit_le(int nr, const void *addr)
         return test_bit(nr ^ BITOP_LE_SWIZZLE, addr);
 }
 
+static inline void set_bit_le(int nr, void *addr)
+{
+        set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void clear_bit_le(int nr, void *addr)
+{
+        clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
 static inline void __set_bit_le(int nr, void *addr)
 {
         __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
diff --git a/include/asm-generic/bitsperlong.h b/include/asm-generic/bitsperlong.h
index a7b0914348fd..d1d70aa19021 100644
--- a/include/asm-generic/bitsperlong.h
+++ b/include/asm-generic/bitsperlong.h
@@ -1,18 +1,8 @@
 #ifndef __ASM_GENERIC_BITS_PER_LONG
 #define __ASM_GENERIC_BITS_PER_LONG
 
-/*
- * There seems to be no way of detecting this automatically from user
- * space, so 64 bit architectures should override this in their
- * bitsperlong.h. In particular, an architecture that supports
- * both 32 and 64 bit user space must not rely on CONFIG_64BIT
- * to decide it, but rather check a compiler provided macro.
- */
-#ifndef __BITS_PER_LONG
-#define __BITS_PER_LONG 32
-#endif
+#include <uapi/asm-generic/bitsperlong.h>
 
-#ifdef __KERNEL__
 
 #ifdef CONFIG_64BIT
 #define BITS_PER_LONG 64
@@ -32,5 +22,4 @@
 #define BITS_PER_LONG_LONG 64
 #endif
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_GENERIC_BITS_PER_LONG */
diff --git a/include/asm-generic/clkdev.h b/include/asm-generic/clkdev.h
new file mode 100644
index 000000000000..90a32a61dd21
--- /dev/null
+++ b/include/asm-generic/clkdev.h
@@ -0,0 +1,28 @@
+/*
+ *  include/asm-generic/clkdev.h
+ *
+ * Based on the ARM clkdev.h:
+ *  Copyright (C) 2008 Russell King.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Helper for the clk API to assist looking up a struct clk.
+ */
+#ifndef __ASM_CLKDEV_H
+#define __ASM_CLKDEV_H
+
+#include <linux/slab.h>
+
+struct clk;
+
+static inline int __clk_get(struct clk *clk) { return 1; }
+static inline void __clk_put(struct clk *clk) { }
+
+static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
+{
+        return kzalloc(size, GFP_KERNEL);
+}
+
+#endif
diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
index 1ca3efc976cc..27d4ec0dfce0 100644
--- a/include/asm-generic/int-l64.h
+++ b/include/asm-generic/int-l64.h
@@ -4,33 +4,11 @@
  * Integer declarations for architectures which use "long"
  * for 64-bit types.
  */
-
 #ifndef _ASM_GENERIC_INT_L64_H
 #define _ASM_GENERIC_INT_L64_H
 
-#include <asm/bitsperlong.h>
-
-#ifndef __ASSEMBLY__
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
+#include <uapi/asm-generic/int-l64.h>
 
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
-#endif /* __ASSEMBLY__ */
-
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -68,6 +46,4 @@ typedef unsigned long u64;
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_INT_L64_H */
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
index f394147c0739..4cd84855cb46 100644
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -4,38 +4,11 @@
  * Integer declarations for architectures which use "long long"
  * for 64-bit types.
  */
-
 #ifndef _ASM_GENERIC_INT_LL64_H
 #define _ASM_GENERIC_INT_LL64_H
 
-#include <asm/bitsperlong.h>
-
-#ifndef __ASSEMBLY__
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
+#include <uapi/asm-generic/int-ll64.h>
 
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#ifdef __GNUC__
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#else
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -73,6 +46,4 @@ typedef unsigned long long u64;
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_INT_LL64_H */
diff --git a/include/asm-generic/ioctl.h b/include/asm-generic/ioctl.h
index 15828b2d663c..d17295b290fa 100644
--- a/include/asm-generic/ioctl.h
+++ b/include/asm-generic/ioctl.h
@@ -1,105 +1,12 @@
 #ifndef _ASM_GENERIC_IOCTL_H
 #define _ASM_GENERIC_IOCTL_H
 
-/* ioctl command encoding: 32 bits total, command in lower 16 bits,
- * size of the parameter structure in the lower 14 bits of the
- * upper 16 bits.
- * Encoding the size of the parameter structure in the ioctl request
- * is useful for catching programs compiled with old versions
- * and to avoid overwriting user space outside the user buffer area.
- * The highest 2 bits are reserved for indicating the ``access mode''.
- * NOTE: This limits the max parameter size to 16kB -1 !
- */
+#include <uapi/asm-generic/ioctl.h>
 
-/*
- * The following is for compatibility across the various Linux
- * platforms.  The generic ioctl numbering scheme doesn't really enforce
- * a type field.  De facto, however, the top 8 bits of the lower 16
- * bits are indeed used as a type field, so we might just as well make
- * this explicit here.  Please be sure to use the decoding macros
- * below from now on.
- */
-#define _IOC_NRBITS     8
-#define _IOC_TYPEBITS   8
-
-/*
- * Let any architecture override either of the following before
- * including this file.
- */
-
-#ifndef _IOC_SIZEBITS
-# define _IOC_SIZEBITS  14
-#endif
-
-#ifndef _IOC_DIRBITS
-# define _IOC_DIRBITS   2
-#endif
-
-#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT    0
-#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-/*
- * Direction bits, which any architecture can choose to override
- * before including this file.
- */
-
-#ifndef _IOC_NONE
-# define _IOC_NONE      0U
-#endif
-
-#ifndef _IOC_WRITE
-# define _IOC_WRITE     1U
-#endif
-
-#ifndef _IOC_READ
-# define _IOC_READ      2U
-#endif
-
-#define _IOC(dir,type,nr,size) \
-        (((dir)  << _IOC_DIRSHIFT) | \
-         ((type) << _IOC_TYPESHIFT) | \
-         ((nr)   << _IOC_NRSHIFT) | \
-         ((size) << _IOC_SIZESHIFT))
-
-#ifdef __KERNEL__
 /* provoke compile error for invalid uses of size argument */
 extern unsigned int __invalid_size_argument_for_IOC;
 #define _IOC_TYPECHECK(t) \
         ((sizeof(t) == sizeof(t[1]) && \
           sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
           sizeof(t) : __invalid_size_argument_for_IOC)
-#else
-#define _IOC_TYPECHECK(t) (sizeof(t))
-#endif
-
-/* used to create numbers */
-#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOR_BAD(type,nr,size)  _IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW_BAD(type,nr,size)  _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-/* used to decode ioctl numbers.. */
-#define _IOC_DIR(nr)            (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr)           (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr)             (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr)           (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-/* ...and for the drivers/sound files... */
-
-#define IOC_IN          (_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT         (_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT       ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
-
 #endif /* _ASM_GENERIC_IOCTL_H */
diff --git a/include/asm-generic/kvm_para.h b/include/asm-generic/kvm_para.h
index 5cba37f9eae1..9d96605f160a 100644
--- a/include/asm-generic/kvm_para.h
+++ b/include/asm-generic/kvm_para.h
@@ -1,7 +1,8 @@
 #ifndef _ASM_GENERIC_KVM_PARA_H
 #define _ASM_GENERIC_KVM_PARA_H
 
-#ifdef __KERNEL__
+#include <uapi/asm-generic/kvm_para.h>
+
 
 /*
  * This function is used by architectures that support kvm to avoid issuing
@@ -17,6 +18,4 @@ static inline unsigned int kvm_arch_para_features(void)
         return 0;
 }
 
-#endif  /* _KERNEL__ */
-
 #endif
diff --git a/include/asm-generic/module.h b/include/asm-generic/module.h
index ed5b44de4c91..14dc41d185a7 100644
--- a/include/asm-generic/module.h
+++ b/include/asm-generic/module.h
@@ -5,18 +5,44 @@
  * Many architectures just need a simple module
  * loader without arch specific data.
  */
+#ifndef CONFIG_HAVE_MOD_ARCH_SPECIFIC
 struct mod_arch_specific
 {
 };
+#endif
 
 #ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
+#define Elf_Shdr        Elf64_Shdr
+#define Elf_Phdr        Elf64_Phdr
+#define Elf_Sym         Elf64_Sym
+#define Elf_Dyn         Elf64_Dyn
+#define Elf_Ehdr        Elf64_Ehdr
+#define Elf_Addr        Elf64_Addr
+#ifdef CONFIG_MODULES_USE_ELF_REL
+#define Elf_Rel         Elf64_Rel
+#endif
+#ifdef CONFIG_MODULES_USE_ELF_RELA
+#define Elf_Rela        Elf64_Rela
+#endif
+#define ELF_R_TYPE(X)   ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF64_R_SYM(X)
+
+#else /* CONFIG_64BIT */
+
+#define Elf_Shdr        Elf32_Shdr
+#define Elf_Phdr        Elf32_Phdr
+#define Elf_Sym         Elf32_Sym
+#define Elf_Dyn         Elf32_Dyn
+#define Elf_Ehdr        Elf32_Ehdr
+#define Elf_Addr        Elf32_Addr
+#ifdef CONFIG_MODULES_USE_ELF_REL
+#define Elf_Rel         Elf32_Rel
+#endif
+#ifdef CONFIG_MODULES_USE_ELF_RELA
+#define Elf_Rela        Elf32_Rela
+#endif
+#define ELF_R_TYPE(X)   ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF32_R_SYM(X)
 #endif
 
 #endif /* __ASM_GENERIC_MODULE_H */
diff --git a/include/asm-generic/param.h b/include/asm-generic/param.h
index 835632a3b468..04e715bccceb 100644
--- a/include/asm-generic/param.h
+++ b/include/asm-generic/param.h
@@ -1,25 +1,10 @@
 #ifndef __ASM_GENERIC_PARAM_H
 #define __ASM_GENERIC_PARAM_H
 
-#ifndef HZ
-#define HZ 100
-#endif
+#include <uapi/asm-generic/param.h>
 
-#ifndef EXEC_PAGESIZE
-#define EXEC_PAGESIZE   4096
-#endif
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-
-#ifdef __KERNEL__
 # undef HZ
 # define HZ             CONFIG_HZ       /* Internal kernel timer frequency */
 # define USER_HZ        100             /* some user interfaces are */
 # define CLOCKS_PER_SEC (USER_HZ)       /* in "ticks" like times() */
-#endif
-
 #endif /* __ASM_GENERIC_PARAM_H */
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index ff4947b7a976..b36ce40bd1c6 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -87,7 +87,7 @@ static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,
                                        pmd_t *pmdp)
 {
         pmd_t pmd = *pmdp;
-        pmd_clear(mm, address, pmdp);
+        pmd_clear(pmdp);
         return pmd;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
@@ -162,6 +162,19 @@ extern void pmdp_splitting_flush(struct vm_area_struct *vma,
                                  unsigned long address, pmd_t *pmdp);
 #endif
 
+#ifndef __HAVE_ARCH_PGTABLE_DEPOSIT
+extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pgtable_t pgtable);
+#endif
+
+#ifndef __HAVE_ARCH_PGTABLE_WITHDRAW
+extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm);
+#endif
+
+#ifndef __HAVE_ARCH_PMDP_INVALIDATE
+extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
+                            pmd_t *pmdp);
+#endif
+
 #ifndef __HAVE_ARCH_PTE_SAME
 static inline int pte_same(pte_t pte_a, pte_t pte_b)
 {
@@ -381,48 +394,59 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,
 
 #ifndef __HAVE_PFNMAP_TRACKING
 /*
- * Interface that can be used by architecture code to keep track of
- * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
- *
- * track_pfn_vma_new is called when a _new_ pfn mapping is being established
- * for physical range indicated by pfn and size.
+ * Interfaces that can be used by architecture code to keep track of
+ * memory type of pfn mappings specified by the remap_pfn_range,
+ * vm_insert_pfn.
+ */
+
+/*
+ * track_pfn_remap is called when a _new_ pfn mapping is being established
+ * by remap_pfn_range() for physical range indicated by pfn and size.
  */
-static inline int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t *prot,
-                                        unsigned long pfn, unsigned long size)
+static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,
+                                  unsigned long pfn, unsigned long addr,
+                                  unsigned long size)
 {
         return 0;
 }
 
 /*
- * Interface that can be used by architecture code to keep track of
- * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
- *
- * track_pfn_vma_copy is called when vma that is covering the pfnmap gets
+ * track_pfn_insert is called when a _new_ single pfn is established
+ * by vm_insert_pfn().
+ */
+static inline int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,
+                                   unsigned long pfn)
+{
+        return 0;
+}
+
+/*
+ * track_pfn_copy is called when vma that is covering the pfnmap gets
  * copied through copy_page_range().
  */
-static inline int track_pfn_vma_copy(struct vm_area_struct *vma)
+static inline int track_pfn_copy(struct vm_area_struct *vma)
 {
         return 0;
 }
 
 /*
- * Interface that can be used by architecture code to keep track of
- * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
- *
  * untrack_pfn_vma is called while unmapping a pfnmap for a region.
  * untrack can be called for a specific region indicated by pfn and size or
- * can be for the entire vma (in which case size can be zero).
+ * can be for the entire vma (in which case pfn, size are zero).
  */
-static inline void untrack_pfn_vma(struct vm_area_struct *vma,
-                                        unsigned long pfn, unsigned long size)
+static inline void untrack_pfn(struct vm_area_struct *vma,
+                               unsigned long pfn, unsigned long size)
 {
 }
 #else
-extern int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t *prot,
-                                unsigned long pfn, unsigned long size);
-extern int track_pfn_vma_copy(struct vm_area_struct *vma);
-extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
-                                unsigned long size);
+extern int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,
+                           unsigned long pfn, unsigned long addr,
+                           unsigned long size);
+extern int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,
+                            unsigned long pfn);
+extern int track_pfn_copy(struct vm_area_struct *vma);
+extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
+                        unsigned long size);
 #endif
 
 #ifdef CONFIG_MMU
diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h
index 61fa862fe08d..b4ea8f50fc65 100644
--- a/include/asm-generic/resource.h
+++ b/include/asm-generic/resource.h
@@ -1,70 +1,8 @@
 #ifndef _ASM_GENERIC_RESOURCE_H
 #define _ASM_GENERIC_RESOURCE_H
 
-/*
- * Resource limit IDs
- *
- * ( Compatibility detail: there are architectures that have
- *   a different rlimit ID order in the 5-9 range and want
- *   to keep that order for binary compatibility. The reasons
- *   are historic and all new rlimits are identical across all
- *   arches. If an arch has such special order for some rlimits
- *   then it defines them prior including asm-generic/resource.h. )
- */
-
-#define RLIMIT_CPU              0       /* CPU time in sec */
-#define RLIMIT_FSIZE            1       /* Maximum filesize */
-#define RLIMIT_DATA             2       /* max data size */
-#define RLIMIT_STACK            3       /* max stack size */
-#define RLIMIT_CORE             4       /* max core file size */
-
-#ifndef RLIMIT_RSS
-# define RLIMIT_RSS             5       /* max resident set size */
-#endif
-
-#ifndef RLIMIT_NPROC
-# define RLIMIT_NPROC           6       /* max number of processes */
-#endif
-
-#ifndef RLIMIT_NOFILE
-# define RLIMIT_NOFILE          7       /* max number of open files */
-#endif
+#include <uapi/asm-generic/resource.h>
 
-#ifndef RLIMIT_MEMLOCK
-# define RLIMIT_MEMLOCK         8       /* max locked-in-memory address space */
-#endif
-
-#ifndef RLIMIT_AS
-# define RLIMIT_AS              9       /* address space limit */
-#endif
-
-#define RLIMIT_LOCKS            10      /* maximum file locks held */
-#define RLIMIT_SIGPENDING       11      /* max number of pending signals */
-#define RLIMIT_MSGQUEUE         12      /* maximum bytes in POSIX mqueues */
-#define RLIMIT_NICE             13      /* max nice prio allowed to raise to
-                                           0-39 for nice level 19 .. -20 */
-#define RLIMIT_RTPRIO           14      /* maximum realtime priority */
-#define RLIMIT_RTTIME           15      /* timeout for RT tasks in us */
-#define RLIM_NLIMITS            16
-
-/*
- * SuS says limits have to be unsigned.
- * Which makes a ton more sense anyway.
- *
- * Some architectures override this (for compatibility reasons):
- */
-#ifndef RLIM_INFINITY
-# define RLIM_INFINITY          (~0UL)
-#endif
-
-/*
- * RLIMIT_STACK default maximum - some architectures override it:
- */
-#ifndef _STK_LIM_MAX
-# define _STK_LIM_MAX           RLIM_INFINITY
-#endif
-
-#ifdef __KERNEL__
 
 /*
  * boot-time rlimit defaults for the init task:
@@ -89,6 +27,4 @@
         [RLIMIT_RTTIME]         = {  RLIM_INFINITY,  RLIM_INFINITY },   \
 }
 
-#endif  /* __KERNEL__ */
-
 #endif
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 8ed67779fc09..b685d3bd32e2 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -1,145 +1,8 @@
 #ifndef _ASM_GENERIC_SIGINFO_H
 #define _ASM_GENERIC_SIGINFO_H
 
-#include <linux/compiler.h>
-#include <linux/types.h>
+#include <uapi/asm-generic/siginfo.h>
 
-typedef union sigval {
-        int sival_int;
-        void __user *sival_ptr;
-} sigval_t;
-
-/*
- * This is the size (including padding) of the part of the
- * struct siginfo that is before the union.
- */
-#ifndef __ARCH_SI_PREAMBLE_SIZE
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
-#endif
-
-#define SI_MAX_SIZE     128
-#ifndef SI_PAD_SIZE
-#define SI_PAD_SIZE     ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
-#endif
-
-#ifndef __ARCH_SI_UID_T
-#define __ARCH_SI_UID_T __kernel_uid32_t
-#endif
-
-/*
- * The default "si_band" type is "long", as specified by POSIX.
- * However, some architectures want to override this to "int"
- * for historical compatibility reasons, so we allow that.
- */
-#ifndef __ARCH_SI_BAND_T
-#define __ARCH_SI_BAND_T long
-#endif
-
-#ifndef __ARCH_SI_CLOCK_T
-#define __ARCH_SI_CLOCK_T __kernel_clock_t
-#endif
-
-#ifndef __ARCH_SI_ATTRIBUTES
-#define __ARCH_SI_ATTRIBUTES
-#endif
-
-#ifndef HAVE_ARCH_SIGINFO_T
-
-typedef struct siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[SI_PAD_SIZE];
-
-                /* kill() */
-                struct {
-                        __kernel_pid_t _pid;    /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        __kernel_timer_t _tid;  /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        __kernel_pid_t _pid;    /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        __kernel_pid_t _pid;    /* which child */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        int _status;            /* exit code */
-                        __ARCH_SI_CLOCK_T _utime;
-                        __ARCH_SI_CLOCK_T _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void __user *_addr; /* faulting insn/memory ref. */
-#ifdef __ARCH_SI_TRAPNO
-                        int _trapno;    /* TRAP # which caused the signal */
-#endif
-                        short _addr_lsb; /* LSB of the reported address */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-
-                /* SIGSYS */
-                struct {
-                        void __user *_call_addr; /* calling user insn */
-                        int _syscall;   /* triggering system call number */
-                        unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
-                } _sigsys;
-        } _sifields;
-} __ARCH_SI_ATTRIBUTES siginfo_t;
-
-/* If the arch shares siginfo, then it has SIGSYS. */
-#define __ARCH_SIGSYS
-#endif
-
-/*
- * How these fields are to be accessed.
- */
-#define si_pid          _sifields._kill._pid
-#define si_uid          _sifields._kill._uid
-#define si_tid          _sifields._timer._tid
-#define si_overrun      _sifields._timer._overrun
-#define si_sys_private  _sifields._timer._sys_private
-#define si_status       _sifields._sigchld._status
-#define si_utime        _sifields._sigchld._utime
-#define si_stime        _sifields._sigchld._stime
-#define si_value        _sifields._rt._sigval
-#define si_int          _sifields._rt._sigval.sival_int
-#define si_ptr          _sifields._rt._sigval.sival_ptr
-#define si_addr         _sifields._sigfault._addr
-#ifdef __ARCH_SI_TRAPNO
-#define si_trapno       _sifields._sigfault._trapno
-#endif
-#define si_addr_lsb     _sifields._sigfault._addr_lsb
-#define si_band         _sifields._sigpoll._band
-#define si_fd           _sifields._sigpoll._fd
-#ifdef __ARCH_SIGSYS
-#define si_call_addr    _sifields._sigsys._call_addr
-#define si_syscall      _sifields._sigsys._syscall
-#define si_arch         _sifields._sigsys._arch
-#endif
-
-#ifdef __KERNEL__
 #define __SI_MASK       0xffff0000u
 #define __SI_KILL       (0 << 16)
 #define __SI_TIMER      (1 << 16)
@@ -150,162 +13,6 @@ typedef struct siginfo {
 #define __SI_MESGQ      (6 << 16)
 #define __SI_SYS        (7 << 16)
 #define __SI_CODE(T,N)  ((T) | ((N) & 0xffff))
-#else
-#define __SI_KILL       0
-#define __SI_TIMER      0
-#define __SI_POLL       0
-#define __SI_FAULT      0
-#define __SI_CHLD       0
-#define __SI_RT         0
-#define __SI_MESGQ      0
-#define __SI_SYS        0
-#define __SI_CODE(T,N)  (N)
-#endif
-
-/*
- * si_code values
- * Digital reserves positive values for kernel-generated signals.
- */
-#define SI_USER         0               /* sent by kill, sigsend, raise */
-#define SI_KERNEL       0x80            /* sent by the kernel from somewhere */
-#define SI_QUEUE        -1              /* sent by sigqueue */
-#define SI_TIMER __SI_CODE(__SI_TIMER,-2) /* sent by timer expiration */
-#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3) /* sent by real time mesq state change */
-#define SI_ASYNCIO      -4              /* sent by AIO completion */
-#define SI_SIGIO        -5              /* sent by queued SIGIO */
-#define SI_TKILL        -6              /* sent by tkill system call */
-#define SI_DETHREAD     -7              /* sent by execve() killing subsidiary threads */
-
-#define SI_FROMUSER(siptr)      ((siptr)->si_code <= 0)
-#define SI_FROMKERNEL(siptr)    ((siptr)->si_code > 0)
-
-/*
- * SIGILL si_codes
- */
-#define ILL_ILLOPC      (__SI_FAULT|1)  /* illegal opcode */
-#define ILL_ILLOPN      (__SI_FAULT|2)  /* illegal operand */
-#define ILL_ILLADR      (__SI_FAULT|3)  /* illegal addressing mode */
-#define ILL_ILLTRP      (__SI_FAULT|4)  /* illegal trap */
-#define ILL_PRVOPC      (__SI_FAULT|5)  /* privileged opcode */
-#define ILL_PRVREG      (__SI_FAULT|6)  /* privileged register */
-#define ILL_COPROC      (__SI_FAULT|7)  /* coprocessor error */
-#define ILL_BADSTK      (__SI_FAULT|8)  /* internal stack error */
-#define NSIGILL         8
-
-/*
- * SIGFPE si_codes
- */
-#define FPE_INTDIV      (__SI_FAULT|1)  /* integer divide by zero */
-#define FPE_INTOVF      (__SI_FAULT|2)  /* integer overflow */
-#define FPE_FLTDIV      (__SI_FAULT|3)  /* floating point divide by zero */
-#define FPE_FLTOVF      (__SI_FAULT|4)  /* floating point overflow */
-#define FPE_FLTUND      (__SI_FAULT|5)  /* floating point underflow */
-#define FPE_FLTRES      (__SI_FAULT|6)  /* floating point inexact result */
-#define FPE_FLTINV      (__SI_FAULT|7)  /* floating point invalid operation */
-#define FPE_FLTSUB      (__SI_FAULT|8)  /* subscript out of range */
-#define NSIGFPE         8
-
-/*
- * SIGSEGV si_codes
- */
-#define SEGV_MAPERR     (__SI_FAULT|1)  /* address not mapped to object */
-#define SEGV_ACCERR     (__SI_FAULT|2)  /* invalid permissions for mapped object */
-#define NSIGSEGV        2
-
-/*
- * SIGBUS si_codes
- */
-#define BUS_ADRALN      (__SI_FAULT|1)  /* invalid address alignment */
-#define BUS_ADRERR      (__SI_FAULT|2)  /* non-existent physical address */
-#define BUS_OBJERR      (__SI_FAULT|3)  /* object specific hardware error */
-/* hardware memory error consumed on a machine check: action required */
-#define BUS_MCEERR_AR   (__SI_FAULT|4)
-/* hardware memory error detected in process but not consumed: action optional*/
-#define BUS_MCEERR_AO   (__SI_FAULT|5)
-#define NSIGBUS         5
-
-/*
- * SIGTRAP si_codes
- */
-#define TRAP_BRKPT      (__SI_FAULT|1)  /* process breakpoint */
-#define TRAP_TRACE      (__SI_FAULT|2)  /* process trace trap */
-#define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
-#define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint/watchpoint */
-#define NSIGTRAP        4
-
-/*
- * SIGCHLD si_codes
- */
-#define CLD_EXITED      (__SI_CHLD|1)   /* child has exited */
-#define CLD_KILLED      (__SI_CHLD|2)   /* child was killed */
-#define CLD_DUMPED      (__SI_CHLD|3)   /* child terminated abnormally */
-#define CLD_TRAPPED     (__SI_CHLD|4)   /* traced child has trapped */
-#define CLD_STOPPED     (__SI_CHLD|5)   /* child has stopped */
-#define CLD_CONTINUED   (__SI_CHLD|6)   /* stopped child has continued */
-#define NSIGCHLD        6
-
-/*
- * SIGPOLL si_codes
- */
-#define POLL_IN         (__SI_POLL|1)   /* data input available */
-#define POLL_OUT        (__SI_POLL|2)   /* output buffers available */
-#define POLL_MSG        (__SI_POLL|3)   /* input message available */
-#define POLL_ERR        (__SI_POLL|4)   /* i/o error */
-#define POLL_PRI        (__SI_POLL|5)   /* high priority input available */
-#define POLL_HUP        (__SI_POLL|6)   /* device disconnected */
-#define NSIGPOLL        6
-
-/*
- * SIGSYS si_codes
- */
-#define SYS_SECCOMP             (__SI_SYS|1)    /* seccomp triggered */
-#define NSIGSYS 1
-
-/*
- * sigevent definitions
- * 
- * It seems likely that SIGEV_THREAD will have to be handled from 
- * userspace, libpthread transmuting it to SIGEV_SIGNAL, which the
- * thread manager then catches and does the appropriate nonsense.
- * However, everything is written out here so as to not get lost.
- */
-#define SIGEV_SIGNAL    0       /* notify via signal */
-#define SIGEV_NONE      1       /* other notification: meaningless */
-#define SIGEV_THREAD    2       /* deliver via thread creation */
-#define SIGEV_THREAD_ID 4       /* deliver to thread */
-
-/*
- * This works because the alignment is ok on all current architectures
- * but we leave open this being overridden in the future
- */
-#ifndef __ARCH_SIGEV_PREAMBLE_SIZE
-#define __ARCH_SIGEV_PREAMBLE_SIZE      (sizeof(int) * 2 + sizeof(sigval_t))
-#endif
-
-#define SIGEV_MAX_SIZE  64
-#define SIGEV_PAD_SIZE  ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) \
-                / sizeof(int))
-
-typedef struct sigevent {
-        sigval_t sigev_value;
-        int sigev_signo;
-        int sigev_notify;
-        union {
-                int _pad[SIGEV_PAD_SIZE];
-                 int _tid;
-
-                struct {
-                        void (*_function)(sigval_t);
-                        void *_attribute;       /* really pthread_attr_t */
-                } _sigev_thread;
-        } _sigev_un;
-} sigevent_t;
-
-#define sigev_notify_function   _sigev_un._sigev_thread._function
-#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
-#define sigev_notify_thread_id   _sigev_un._tid
-
-#ifdef __KERNEL__
 
 struct siginfo;
 void do_schedule_next_timer(struct siginfo *info);
@@ -327,6 +34,4 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
 
 extern int copy_siginfo_to_user(struct siginfo __user *to, struct siginfo *from);
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h
index 555c0aee8a47..98caa306122a 100644
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal.h
@@ -1,131 +1,16 @@
 #ifndef __ASM_GENERIC_SIGNAL_H
 #define __ASM_GENERIC_SIGNAL_H
 
-#include <linux/types.h>
-
-#define _NSIG           64
-#define _NSIG_BPW       __BITS_PER_LONG
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#ifndef SIGRTMAX
-#define SIGRTMAX        _NSIG
-#endif
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-/*
- * New architectures should not define the obsolete
- *      SA_RESTORER     0x04000000
- */
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
+#include <uapi/asm-generic/signal.h>
 
 #ifndef __ASSEMBLY__
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-/* not actually used, but required for linux/syscalls.h */
-typedef unsigned long old_sigset_t;
-
-#include <asm-generic/signal-defs.h>
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
 #ifdef SA_RESTORER
-        __sigrestore_t sa_restorer;
 #endif
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
 
 #include <asm/sigcontext.h>
 #undef __HAVE_ARCH_SIG_BITOPS
 
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 
-#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
-
 #endif /* _ASM_GENERIC_SIGNAL_H */
diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h
index c749af9c0983..4b934e9ec970 100644
--- a/include/asm-generic/statfs.h
+++ b/include/asm-generic/statfs.h
@@ -1,86 +1,7 @@
 #ifndef _GENERIC_STATFS_H
 #define _GENERIC_STATFS_H
 
-#include <linux/types.h>
+#include <uapi/asm-generic/statfs.h>
 
-#ifdef __KERNEL__
 typedef __kernel_fsid_t fsid_t;
 #endif
-
-/*
- * Most 64-bit platforms use 'long', while most 32-bit platforms use '__u32'.
- * Yes, they differ in signedness as well as size.
- * Special cases can override it for themselves -- except for S390x, which
- * is just a little too special for us. And MIPS, which I'm not touching
- * with a 10' pole.
- */
-#ifndef __statfs_word
-#if __BITS_PER_LONG == 64
-#define __statfs_word long
-#else
-#define __statfs_word __u32
-#endif
-#endif
-
-struct statfs {
-        __statfs_word f_type;
-        __statfs_word f_bsize;
-        __statfs_word f_blocks;
-        __statfs_word f_bfree;
-        __statfs_word f_bavail;
-        __statfs_word f_files;
-        __statfs_word f_ffree;
-        __kernel_fsid_t f_fsid;
-        __statfs_word f_namelen;
-        __statfs_word f_frsize;
-        __statfs_word f_flags;
-        __statfs_word f_spare[4];
-};
-
-/*
- * ARM needs to avoid the 32-bit padding at the end, for consistency
- * between EABI and OABI 
- */
-#ifndef ARCH_PACK_STATFS64
-#define ARCH_PACK_STATFS64
-#endif
-
-struct statfs64 {
-        __statfs_word f_type;
-        __statfs_word f_bsize;
-        __u64 f_blocks;
-        __u64 f_bfree;
-        __u64 f_bavail;
-        __u64 f_files;
-        __u64 f_ffree;
-        __kernel_fsid_t f_fsid;
-        __statfs_word f_namelen;
-        __statfs_word f_frsize;
-        __statfs_word f_flags;
-        __statfs_word f_spare[4];
-} ARCH_PACK_STATFS64;
-
-/* 
- * IA64 and x86_64 need to avoid the 32-bit padding at the end,
- * to be compatible with the i386 ABI
- */
-#ifndef ARCH_PACK_COMPAT_STATFS64
-#define ARCH_PACK_COMPAT_STATFS64
-#endif
-
-struct compat_statfs64 {
-        __u32 f_type;
-        __u32 f_bsize;
-        __u64 f_blocks;
-        __u64 f_bfree;
-        __u64 f_bavail;
-        __u64 f_files;
-        __u64 f_ffree;
-        __kernel_fsid_t f_fsid;
-        __u32 f_namelen;
-        __u32 f_frsize;
-        __u32 f_flags;
-        __u32 f_spare[4];
-} ARCH_PACK_COMPAT_STATFS64;
-
-#endif
diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index d0922adc56d4..4fa6fe0fc2a2 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -1,54 +1,9 @@
 #ifndef _ASM_GENERIC_TERMIOS_H
 #define _ASM_GENERIC_TERMIOS_H
-/*
- * Most architectures have straight copies of the x86 code, with
- * varying levels of bug fixes on top. Usually it's a good idea
- * to use this generic version instead, but be careful to avoid
- * ABI changes.
- * New architectures should not provide their own version.
- */
 
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
 
 #include <asm/uaccess.h>
+#include <uapi/asm-generic/termios.h>
 
 /*      intr=^C         quit=^\         erase=del       kill=^U
         eof=^D          vtime=\0        vmin=\1         sxtc=\0
@@ -149,6 +104,4 @@ static inline int kernel_termios_to_user_termios(struct termios __user *u,
 }
 #endif /* TCGETS2 */
 
-#endif  /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_TERMIOS_H */
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 3748ec92dcbc..a36991ab334e 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -1,910 +1,4 @@
-#if !defined(_ASM_GENERIC_UNISTD_H) || defined(__SYSCALL)
-#define _ASM_GENERIC_UNISTD_H
-
-#include <asm/bitsperlong.h>
-
-/*
- * This file contains the system call numbers, based on the
- * layout of the x86-64 architecture, which embeds the
- * pointer to the syscall in the table.
- *
- * As a basic principle, no duplication of functionality
- * should be added, e.g. we don't use lseek when llseek
- * is present. New architectures should use this file
- * and implement the less feature-full calls in user space.
- */
-
-#ifndef __SYSCALL
-#define __SYSCALL(x, y)
-#endif
-
-#if __BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)
-#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _32)
-#else
-#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _64)
-#endif
-
-#ifdef __SYSCALL_COMPAT
-#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _comp)
-#define __SC_COMP_3264(_nr, _32, _64, _comp) __SYSCALL(_nr, _comp)
-#else
-#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _sys)
-#define __SC_COMP_3264(_nr, _32, _64, _comp) __SC_3264(_nr, _32, _64)
-#endif
-
-#define __NR_io_setup 0
-__SC_COMP(__NR_io_setup, sys_io_setup, compat_sys_io_setup)
-#define __NR_io_destroy 1
-__SYSCALL(__NR_io_destroy, sys_io_destroy)
-#define __NR_io_submit 2
-__SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
-#define __NR_io_cancel 3
-__SYSCALL(__NR_io_cancel, sys_io_cancel)
-#define __NR_io_getevents 4
-__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents)
-
-/* fs/xattr.c */
-#define __NR_setxattr 5
-__SYSCALL(__NR_setxattr, sys_setxattr)
-#define __NR_lsetxattr 6
-__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
-#define __NR_fsetxattr 7
-__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
-#define __NR_getxattr 8
-__SYSCALL(__NR_getxattr, sys_getxattr)
-#define __NR_lgetxattr 9
-__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
-#define __NR_fgetxattr 10
-__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
-#define __NR_listxattr 11
-__SYSCALL(__NR_listxattr, sys_listxattr)
-#define __NR_llistxattr 12
-__SYSCALL(__NR_llistxattr, sys_llistxattr)
-#define __NR_flistxattr 13
-__SYSCALL(__NR_flistxattr, sys_flistxattr)
-#define __NR_removexattr 14
-__SYSCALL(__NR_removexattr, sys_removexattr)
-#define __NR_lremovexattr 15
-__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
-#define __NR_fremovexattr 16
-__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
-
-/* fs/dcache.c */
-#define __NR_getcwd 17
-__SYSCALL(__NR_getcwd, sys_getcwd)
-
-/* fs/cookies.c */
-#define __NR_lookup_dcookie 18
-__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)
-
-/* fs/eventfd.c */
-#define __NR_eventfd2 19
-__SYSCALL(__NR_eventfd2, sys_eventfd2)
-
-/* fs/eventpoll.c */
-#define __NR_epoll_create1 20
-__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
-#define __NR_epoll_ctl 21
-__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
-#define __NR_epoll_pwait 22
-__SC_COMP(__NR_epoll_pwait, sys_epoll_pwait, compat_sys_epoll_pwait)
-
-/* fs/fcntl.c */
-#define __NR_dup 23
-__SYSCALL(__NR_dup, sys_dup)
-#define __NR_dup3 24
-__SYSCALL(__NR_dup3, sys_dup3)
-#define __NR3264_fcntl 25
-__SC_COMP_3264(__NR3264_fcntl, sys_fcntl64, sys_fcntl, compat_sys_fcntl64)
-
-/* fs/inotify_user.c */
-#define __NR_inotify_init1 26
-__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
-#define __NR_inotify_add_watch 27
-__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
-#define __NR_inotify_rm_watch 28
-__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
-
-/* fs/ioctl.c */
-#define __NR_ioctl 29
-__SC_COMP(__NR_ioctl, sys_ioctl, compat_sys_ioctl)
-
-/* fs/ioprio.c */
-#define __NR_ioprio_set 30
-__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
-#define __NR_ioprio_get 31
-__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
-
-/* fs/locks.c */
-#define __NR_flock 32
-__SYSCALL(__NR_flock, sys_flock)
-
-/* fs/namei.c */
-#define __NR_mknodat 33
-__SYSCALL(__NR_mknodat, sys_mknodat)
-#define __NR_mkdirat 34
-__SYSCALL(__NR_mkdirat, sys_mkdirat)
-#define __NR_unlinkat 35
-__SYSCALL(__NR_unlinkat, sys_unlinkat)
-#define __NR_symlinkat 36
-__SYSCALL(__NR_symlinkat, sys_symlinkat)
-#define __NR_linkat 37
-__SYSCALL(__NR_linkat, sys_linkat)
-#define __NR_renameat 38
-__SYSCALL(__NR_renameat, sys_renameat)
-
-/* fs/namespace.c */
-#define __NR_umount2 39
-__SYSCALL(__NR_umount2, sys_umount)
-#define __NR_mount 40
-__SC_COMP(__NR_mount, sys_mount, compat_sys_mount)
-#define __NR_pivot_root 41
-__SYSCALL(__NR_pivot_root, sys_pivot_root)
-
-/* fs/nfsctl.c */
-#define __NR_nfsservctl 42
-__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
-
-/* fs/open.c */
-#define __NR3264_statfs 43
-__SC_COMP_3264(__NR3264_statfs, sys_statfs64, sys_statfs, \
-               compat_sys_statfs64)
-#define __NR3264_fstatfs 44
-__SC_COMP_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs, \
-               compat_sys_fstatfs64)
-#define __NR3264_truncate 45
-__SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate, \
-               compat_sys_truncate64)
-#define __NR3264_ftruncate 46
-__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate, \
-               compat_sys_ftruncate64)
-
-#define __NR_fallocate 47
-__SC_COMP(__NR_fallocate, sys_fallocate, compat_sys_fallocate)
-#define __NR_faccessat 48
-__SYSCALL(__NR_faccessat, sys_faccessat)
-#define __NR_chdir 49
-__SYSCALL(__NR_chdir, sys_chdir)
-#define __NR_fchdir 50
-__SYSCALL(__NR_fchdir, sys_fchdir)
-#define __NR_chroot 51
-__SYSCALL(__NR_chroot, sys_chroot)
-#define __NR_fchmod 52
-__SYSCALL(__NR_fchmod, sys_fchmod)
-#define __NR_fchmodat 53
-__SYSCALL(__NR_fchmodat, sys_fchmodat)
-#define __NR_fchownat 54
-__SYSCALL(__NR_fchownat, sys_fchownat)
-#define __NR_fchown 55
-__SYSCALL(__NR_fchown, sys_fchown)
-#define __NR_openat 56
-__SC_COMP(__NR_openat, sys_openat, compat_sys_openat)
-#define __NR_close 57
-__SYSCALL(__NR_close, sys_close)
-#define __NR_vhangup 58
-__SYSCALL(__NR_vhangup, sys_vhangup)
-
-/* fs/pipe.c */
-#define __NR_pipe2 59
-__SYSCALL(__NR_pipe2, sys_pipe2)
-
-/* fs/quota.c */
-#define __NR_quotactl 60
-__SYSCALL(__NR_quotactl, sys_quotactl)
-
-/* fs/readdir.c */
-#define __NR_getdents64 61
-__SC_COMP(__NR_getdents64, sys_getdents64, compat_sys_getdents64)
-
-/* fs/read_write.c */
-#define __NR3264_lseek 62
-__SC_3264(__NR3264_lseek, sys_llseek, sys_lseek)
-#define __NR_read 63
-__SYSCALL(__NR_read, sys_read)
-#define __NR_write 64
-__SYSCALL(__NR_write, sys_write)
-#define __NR_readv 65
-__SC_COMP(__NR_readv, sys_readv, compat_sys_readv)
-#define __NR_writev 66
-__SC_COMP(__NR_writev, sys_writev, compat_sys_writev)
-#define __NR_pread64 67
-__SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)
-#define __NR_pwrite64 68
-__SC_COMP(__NR_pwrite64, sys_pwrite64, compat_sys_pwrite64)
-#define __NR_preadv 69
-__SC_COMP(__NR_preadv, sys_preadv, compat_sys_preadv)
-#define __NR_pwritev 70
-__SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev)
-
-/* fs/sendfile.c */
-#define __NR3264_sendfile 71
-__SYSCALL(__NR3264_sendfile, sys_sendfile64)
-
-/* fs/select.c */
-#define __NR_pselect6 72
-__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6)
-#define __NR_ppoll 73
-__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll)
-
-/* fs/signalfd.c */
-#define __NR_signalfd4 74
-__SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)
-
-/* fs/splice.c */
-#define __NR_vmsplice 75
-__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice)
-#define __NR_splice 76
-__SYSCALL(__NR_splice, sys_splice)
-#define __NR_tee 77
-__SYSCALL(__NR_tee, sys_tee)
-
-/* fs/stat.c */
-#define __NR_readlinkat 78
-__SYSCALL(__NR_readlinkat, sys_readlinkat)
-#define __NR3264_fstatat 79
-__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)
-#define __NR3264_fstat 80
-__SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)
-
-/* fs/sync.c */
-#define __NR_sync 81
-__SYSCALL(__NR_sync, sys_sync)
-#define __NR_fsync 82
-__SYSCALL(__NR_fsync, sys_fsync)
-#define __NR_fdatasync 83
-__SYSCALL(__NR_fdatasync, sys_fdatasync)
-#ifdef __ARCH_WANT_SYNC_FILE_RANGE2
-#define __NR_sync_file_range2 84
-__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2, \
-          compat_sys_sync_file_range2)
-#else
-#define __NR_sync_file_range 84
-__SC_COMP(__NR_sync_file_range, sys_sync_file_range, \
-          compat_sys_sync_file_range)
-#endif
-
-/* fs/timerfd.c */
-#define __NR_timerfd_create 85
-__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
-#define __NR_timerfd_settime 86
-__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \
-          compat_sys_timerfd_settime)
-#define __NR_timerfd_gettime 87
-__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \
-          compat_sys_timerfd_gettime)
-
-/* fs/utimes.c */
-#define __NR_utimensat 88
-__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat)
-
-/* kernel/acct.c */
-#define __NR_acct 89
-__SYSCALL(__NR_acct, sys_acct)
-
-/* kernel/capability.c */
-#define __NR_capget 90
-__SYSCALL(__NR_capget, sys_capget)
-#define __NR_capset 91
-__SYSCALL(__NR_capset, sys_capset)
-
-/* kernel/exec_domain.c */
-#define __NR_personality 92
-__SYSCALL(__NR_personality, sys_personality)
-
-/* kernel/exit.c */
-#define __NR_exit 93
-__SYSCALL(__NR_exit, sys_exit)
-#define __NR_exit_group 94
-__SYSCALL(__NR_exit_group, sys_exit_group)
-#define __NR_waitid 95
-__SC_COMP(__NR_waitid, sys_waitid, compat_sys_waitid)
-
-/* kernel/fork.c */
-#define __NR_set_tid_address 96
-__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
-#define __NR_unshare 97
-__SYSCALL(__NR_unshare, sys_unshare)
-
-/* kernel/futex.c */
-#define __NR_futex 98
-__SC_COMP(__NR_futex, sys_futex, compat_sys_futex)
-#define __NR_set_robust_list 99
-__SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
-          compat_sys_set_robust_list)
-#define __NR_get_robust_list 100
-__SC_COMP(__NR_get_robust_list, sys_get_robust_list, \
-          compat_sys_get_robust_list)
-
-/* kernel/hrtimer.c */
-#define __NR_nanosleep 101
-__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep)
-
-/* kernel/itimer.c */
-#define __NR_getitimer 102
-__SC_COMP(__NR_getitimer, sys_getitimer, compat_sys_getitimer)
-#define __NR_setitimer 103
-__SC_COMP(__NR_setitimer, sys_setitimer, compat_sys_setitimer)
-
-/* kernel/kexec.c */
-#define __NR_kexec_load 104
-__SC_COMP(__NR_kexec_load, sys_kexec_load, compat_sys_kexec_load)
-
-/* kernel/module.c */
-#define __NR_init_module 105
-__SYSCALL(__NR_init_module, sys_init_module)
-#define __NR_delete_module 106
-__SYSCALL(__NR_delete_module, sys_delete_module)
-
-/* kernel/posix-timers.c */
-#define __NR_timer_create 107
-__SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
-#define __NR_timer_gettime 108
-__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime)
-#define __NR_timer_getoverrun 109
-__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
-#define __NR_timer_settime 110
-__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime)
-#define __NR_timer_delete 111
-__SYSCALL(__NR_timer_delete, sys_timer_delete)
-#define __NR_clock_settime 112
-__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime)
-#define __NR_clock_gettime 113
-__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)
-#define __NR_clock_getres 114
-__SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres)
-#define __NR_clock_nanosleep 115
-__SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \
-          compat_sys_clock_nanosleep)
-
-/* kernel/printk.c */
-#define __NR_syslog 116
-__SYSCALL(__NR_syslog, sys_syslog)
-
-/* kernel/ptrace.c */
-#define __NR_ptrace 117
-__SYSCALL(__NR_ptrace, sys_ptrace)
-
-/* kernel/sched.c */
-#define __NR_sched_setparam 118
-__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
-#define __NR_sched_setscheduler 119
-__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
-#define __NR_sched_getscheduler 120
-__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
-#define __NR_sched_getparam 121
-__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
-#define __NR_sched_setaffinity 122
-__SC_COMP(__NR_sched_setaffinity, sys_sched_setaffinity, \
-          compat_sys_sched_setaffinity)
-#define __NR_sched_getaffinity 123
-__SC_COMP(__NR_sched_getaffinity, sys_sched_getaffinity, \
-          compat_sys_sched_getaffinity)
-#define __NR_sched_yield 124
-__SYSCALL(__NR_sched_yield, sys_sched_yield)
-#define __NR_sched_get_priority_max 125
-__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
-#define __NR_sched_get_priority_min 126
-__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
-#define __NR_sched_rr_get_interval 127
-__SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \
-          compat_sys_sched_rr_get_interval)
-
-/* kernel/signal.c */
-#define __NR_restart_syscall 128
-__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
-#define __NR_kill 129
-__SYSCALL(__NR_kill, sys_kill)
-#define __NR_tkill 130
-__SYSCALL(__NR_tkill, sys_tkill)
-#define __NR_tgkill 131
-__SYSCALL(__NR_tgkill, sys_tgkill)
-#define __NR_sigaltstack 132
-__SC_COMP(__NR_sigaltstack, sys_sigaltstack, compat_sys_sigaltstack)
-#define __NR_rt_sigsuspend 133
-__SC_COMP(__NR_rt_sigsuspend, sys_rt_sigsuspend, compat_sys_rt_sigsuspend)
-#define __NR_rt_sigaction 134
-__SC_COMP(__NR_rt_sigaction, sys_rt_sigaction, compat_sys_rt_sigaction)
-#define __NR_rt_sigprocmask 135
-__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)
-#define __NR_rt_sigpending 136
-__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)
-#define __NR_rt_sigtimedwait 137
-__SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \
-          compat_sys_rt_sigtimedwait)
-#define __NR_rt_sigqueueinfo 138
-__SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \
-          compat_sys_rt_sigqueueinfo)
-#define __NR_rt_sigreturn 139
-__SC_COMP(__NR_rt_sigreturn, sys_rt_sigreturn, compat_sys_rt_sigreturn)
-
-/* kernel/sys.c */
-#define __NR_setpriority 140
-__SYSCALL(__NR_setpriority, sys_setpriority)
-#define __NR_getpriority 141
-__SYSCALL(__NR_getpriority, sys_getpriority)
-#define __NR_reboot 142
-__SYSCALL(__NR_reboot, sys_reboot)
-#define __NR_setregid 143
-__SYSCALL(__NR_setregid, sys_setregid)
-#define __NR_setgid 144
-__SYSCALL(__NR_setgid, sys_setgid)
-#define __NR_setreuid 145
-__SYSCALL(__NR_setreuid, sys_setreuid)
-#define __NR_setuid 146
-__SYSCALL(__NR_setuid, sys_setuid)
-#define __NR_setresuid 147
-__SYSCALL(__NR_setresuid, sys_setresuid)
-#define __NR_getresuid 148
-__SYSCALL(__NR_getresuid, sys_getresuid)
-#define __NR_setresgid 149
-__SYSCALL(__NR_setresgid, sys_setresgid)
-#define __NR_getresgid 150
-__SYSCALL(__NR_getresgid, sys_getresgid)
-#define __NR_setfsuid 151
-__SYSCALL(__NR_setfsuid, sys_setfsuid)
-#define __NR_setfsgid 152
-__SYSCALL(__NR_setfsgid, sys_setfsgid)
-#define __NR_times 153
-__SC_COMP(__NR_times, sys_times, compat_sys_times)
-#define __NR_setpgid 154
-__SYSCALL(__NR_setpgid, sys_setpgid)
-#define __NR_getpgid 155
-__SYSCALL(__NR_getpgid, sys_getpgid)
-#define __NR_getsid 156
-__SYSCALL(__NR_getsid, sys_getsid)
-#define __NR_setsid 157
-__SYSCALL(__NR_setsid, sys_setsid)
-#define __NR_getgroups 158
-__SYSCALL(__NR_getgroups, sys_getgroups)
-#define __NR_setgroups 159
-__SYSCALL(__NR_setgroups, sys_setgroups)
-#define __NR_uname 160
-__SYSCALL(__NR_uname, sys_newuname)
-#define __NR_sethostname 161
-__SYSCALL(__NR_sethostname, sys_sethostname)
-#define __NR_setdomainname 162
-__SYSCALL(__NR_setdomainname, sys_setdomainname)
-#define __NR_getrlimit 163
-__SC_COMP(__NR_getrlimit, sys_getrlimit, compat_sys_getrlimit)
-#define __NR_setrlimit 164
-__SC_COMP(__NR_setrlimit, sys_setrlimit, compat_sys_setrlimit)
-#define __NR_getrusage 165
-__SC_COMP(__NR_getrusage, sys_getrusage, compat_sys_getrusage)
-#define __NR_umask 166
-__SYSCALL(__NR_umask, sys_umask)
-#define __NR_prctl 167
-__SYSCALL(__NR_prctl, sys_prctl)
-#define __NR_getcpu 168
-__SYSCALL(__NR_getcpu, sys_getcpu)
-
-/* kernel/time.c */
-#define __NR_gettimeofday 169
-__SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)
-#define __NR_settimeofday 170
-__SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)
-#define __NR_adjtimex 171
-__SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex)
-
-/* kernel/timer.c */
-#define __NR_getpid 172
-__SYSCALL(__NR_getpid, sys_getpid)
-#define __NR_getppid 173
-__SYSCALL(__NR_getppid, sys_getppid)
-#define __NR_getuid 174
-__SYSCALL(__NR_getuid, sys_getuid)
-#define __NR_geteuid 175
-__SYSCALL(__NR_geteuid, sys_geteuid)
-#define __NR_getgid 176
-__SYSCALL(__NR_getgid, sys_getgid)
-#define __NR_getegid 177
-__SYSCALL(__NR_getegid, sys_getegid)
-#define __NR_gettid 178
-__SYSCALL(__NR_gettid, sys_gettid)
-#define __NR_sysinfo 179
-__SC_COMP(__NR_sysinfo, sys_sysinfo, compat_sys_sysinfo)
-
-/* ipc/mqueue.c */
-#define __NR_mq_open 180
-__SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)
-#define __NR_mq_unlink 181
-__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
-#define __NR_mq_timedsend 182
-__SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend)
-#define __NR_mq_timedreceive 183
-__SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \
-          compat_sys_mq_timedreceive)
-#define __NR_mq_notify 184
-__SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)
-#define __NR_mq_getsetattr 185
-__SC_COMP(__NR_mq_getsetattr, sys_mq_getsetattr, compat_sys_mq_getsetattr)
-
-/* ipc/msg.c */
-#define __NR_msgget 186
-__SYSCALL(__NR_msgget, sys_msgget)
-#define __NR_msgctl 187
-__SC_COMP(__NR_msgctl, sys_msgctl, compat_sys_msgctl)
-#define __NR_msgrcv 188
-__SC_COMP(__NR_msgrcv, sys_msgrcv, compat_sys_msgrcv)
-#define __NR_msgsnd 189
-__SC_COMP(__NR_msgsnd, sys_msgsnd, compat_sys_msgsnd)
-
-/* ipc/sem.c */
-#define __NR_semget 190
-__SYSCALL(__NR_semget, sys_semget)
-#define __NR_semctl 191
-__SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
-#define __NR_semtimedop 192
-__SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop)
-#define __NR_semop 193
-__SYSCALL(__NR_semop, sys_semop)
-
-/* ipc/shm.c */
-#define __NR_shmget 194
-__SYSCALL(__NR_shmget, sys_shmget)
-#define __NR_shmctl 195
-__SC_COMP(__NR_shmctl, sys_shmctl, compat_sys_shmctl)
-#define __NR_shmat 196
-__SC_COMP(__NR_shmat, sys_shmat, compat_sys_shmat)
-#define __NR_shmdt 197
-__SYSCALL(__NR_shmdt, sys_shmdt)
-
-/* net/socket.c */
-#define __NR_socket 198
-__SYSCALL(__NR_socket, sys_socket)
-#define __NR_socketpair 199
-__SYSCALL(__NR_socketpair, sys_socketpair)
-#define __NR_bind 200
-__SYSCALL(__NR_bind, sys_bind)
-#define __NR_listen 201
-__SYSCALL(__NR_listen, sys_listen)
-#define __NR_accept 202
-__SYSCALL(__NR_accept, sys_accept)
-#define __NR_connect 203
-__SYSCALL(__NR_connect, sys_connect)
-#define __NR_getsockname 204
-__SYSCALL(__NR_getsockname, sys_getsockname)
-#define __NR_getpeername 205
-__SYSCALL(__NR_getpeername, sys_getpeername)
-#define __NR_sendto 206
-__SYSCALL(__NR_sendto, sys_sendto)
-#define __NR_recvfrom 207
-__SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom)
-#define __NR_setsockopt 208
-__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt)
-#define __NR_getsockopt 209
-__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt)
-#define __NR_shutdown 210
-__SYSCALL(__NR_shutdown, sys_shutdown)
-#define __NR_sendmsg 211
-__SC_COMP(__NR_sendmsg, sys_sendmsg, compat_sys_sendmsg)
-#define __NR_recvmsg 212
-__SC_COMP(__NR_recvmsg, sys_recvmsg, compat_sys_recvmsg)
-
-/* mm/filemap.c */
-#define __NR_readahead 213
-__SC_COMP(__NR_readahead, sys_readahead, compat_sys_readahead)
-
-/* mm/nommu.c, also with MMU */
-#define __NR_brk 214
-__SYSCALL(__NR_brk, sys_brk)
-#define __NR_munmap 215
-__SYSCALL(__NR_munmap, sys_munmap)
-#define __NR_mremap 216
-__SYSCALL(__NR_mremap, sys_mremap)
-
-/* security/keys/keyctl.c */
-#define __NR_add_key 217
-__SYSCALL(__NR_add_key, sys_add_key)
-#define __NR_request_key 218
-__SYSCALL(__NR_request_key, sys_request_key)
-#define __NR_keyctl 219
-__SC_COMP(__NR_keyctl, sys_keyctl, compat_sys_keyctl)
-
-/* arch/example/kernel/sys_example.c */
-#define __NR_clone 220
-__SYSCALL(__NR_clone, sys_clone)
-#define __NR_execve 221
-__SC_COMP(__NR_execve, sys_execve, compat_sys_execve)
-
-#define __NR3264_mmap 222
-__SC_3264(__NR3264_mmap, sys_mmap2, sys_mmap)
-/* mm/fadvise.c */
-#define __NR3264_fadvise64 223
-__SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64)
-
-/* mm/, CONFIG_MMU only */
-#ifndef __ARCH_NOMMU
-#define __NR_swapon 224
-__SYSCALL(__NR_swapon, sys_swapon)
-#define __NR_swapoff 225
-__SYSCALL(__NR_swapoff, sys_swapoff)
-#define __NR_mprotect 226
-__SYSCALL(__NR_mprotect, sys_mprotect)
-#define __NR_msync 227
-__SYSCALL(__NR_msync, sys_msync)
-#define __NR_mlock 228
-__SYSCALL(__NR_mlock, sys_mlock)
-#define __NR_munlock 229
-__SYSCALL(__NR_munlock, sys_munlock)
-#define __NR_mlockall 230
-__SYSCALL(__NR_mlockall, sys_mlockall)
-#define __NR_munlockall 231
-__SYSCALL(__NR_munlockall, sys_munlockall)
-#define __NR_mincore 232
-__SYSCALL(__NR_mincore, sys_mincore)
-#define __NR_madvise 233
-__SYSCALL(__NR_madvise, sys_madvise)
-#define __NR_remap_file_pages 234
-__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
-#define __NR_mbind 235
-__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)
-#define __NR_get_mempolicy 236
-__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)
-#define __NR_set_mempolicy 237
-__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)
-#define __NR_migrate_pages 238
-__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)
-#define __NR_move_pages 239
-__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)
-#endif
-
-#define __NR_rt_tgsigqueueinfo 240
-__SC_COMP(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo, \
-          compat_sys_rt_tgsigqueueinfo)
-#define __NR_perf_event_open 241
-__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
-#define __NR_accept4 242
-__SYSCALL(__NR_accept4, sys_accept4)
-#define __NR_recvmmsg 243
-__SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg)
-
-/*
- * Architectures may provide up to 16 syscalls of their own
- * starting with this value.
- */
-#define __NR_arch_specific_syscall 244
-
-#define __NR_wait4 260
-__SC_COMP(__NR_wait4, sys_wait4, compat_sys_wait4)
-#define __NR_prlimit64 261
-__SYSCALL(__NR_prlimit64, sys_prlimit64)
-#define __NR_fanotify_init 262
-__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
-#define __NR_fanotify_mark 263
-__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
-#define __NR_name_to_handle_at         264
-__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
-#define __NR_open_by_handle_at         265
-__SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \
-          compat_sys_open_by_handle_at)
-#define __NR_clock_adjtime 266
-__SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
-#define __NR_syncfs 267
-__SYSCALL(__NR_syncfs, sys_syncfs)
-#define __NR_setns 268
-__SYSCALL(__NR_setns, sys_setns)
-#define __NR_sendmmsg 269
-__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)
-#define __NR_process_vm_readv 270
-__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \
-          compat_sys_process_vm_readv)
-#define __NR_process_vm_writev 271
-__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
-          compat_sys_process_vm_writev)
-#define __NR_kcmp 272
-__SYSCALL(__NR_kcmp, sys_kcmp)
-
-#undef __NR_syscalls
-#define __NR_syscalls 273
-
-/*
- * All syscalls below here should go away really,
- * these are provided for both review and as a porting
- * help for the C library version.
-*
- * Last chance: are any of these important enough to
- * enable by default?
- */
-#ifdef __ARCH_WANT_SYSCALL_NO_AT
-#define __NR_open 1024
-__SYSCALL(__NR_open, sys_open)
-#define __NR_link 1025
-__SYSCALL(__NR_link, sys_link)
-#define __NR_unlink 1026
-__SYSCALL(__NR_unlink, sys_unlink)
-#define __NR_mknod 1027
-__SYSCALL(__NR_mknod, sys_mknod)
-#define __NR_chmod 1028
-__SYSCALL(__NR_chmod, sys_chmod)
-#define __NR_chown 1029
-__SYSCALL(__NR_chown, sys_chown)
-#define __NR_mkdir 1030
-__SYSCALL(__NR_mkdir, sys_mkdir)
-#define __NR_rmdir 1031
-__SYSCALL(__NR_rmdir, sys_rmdir)
-#define __NR_lchown 1032
-__SYSCALL(__NR_lchown, sys_lchown)
-#define __NR_access 1033
-__SYSCALL(__NR_access, sys_access)
-#define __NR_rename 1034
-__SYSCALL(__NR_rename, sys_rename)
-#define __NR_readlink 1035
-__SYSCALL(__NR_readlink, sys_readlink)
-#define __NR_symlink 1036
-__SYSCALL(__NR_symlink, sys_symlink)
-#define __NR_utimes 1037
-__SYSCALL(__NR_utimes, sys_utimes)
-#define __NR3264_stat 1038
-__SC_3264(__NR3264_stat, sys_stat64, sys_newstat)
-#define __NR3264_lstat 1039
-__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR3264_lstat+1)
-#endif /* __ARCH_WANT_SYSCALL_NO_AT */
-
-#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS
-#define __NR_pipe 1040
-__SYSCALL(__NR_pipe, sys_pipe)
-#define __NR_dup2 1041
-__SYSCALL(__NR_dup2, sys_dup2)
-#define __NR_epoll_create 1042
-__SYSCALL(__NR_epoll_create, sys_epoll_create)
-#define __NR_inotify_init 1043
-__SYSCALL(__NR_inotify_init, sys_inotify_init)
-#define __NR_eventfd 1044
-__SYSCALL(__NR_eventfd, sys_eventfd)
-#define __NR_signalfd 1045
-__SYSCALL(__NR_signalfd, sys_signalfd)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_signalfd+1)
-#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */
-
-#if (__BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)) && \
-     defined(__ARCH_WANT_SYSCALL_OFF_T)
-#define __NR_sendfile 1046
-__SYSCALL(__NR_sendfile, sys_sendfile)
-#define __NR_ftruncate 1047
-__SYSCALL(__NR_ftruncate, sys_ftruncate)
-#define __NR_truncate 1048
-__SYSCALL(__NR_truncate, sys_truncate)
-#define __NR_stat 1049
-__SYSCALL(__NR_stat, sys_newstat)
-#define __NR_lstat 1050
-__SYSCALL(__NR_lstat, sys_newlstat)
-#define __NR_fstat 1051
-__SYSCALL(__NR_fstat, sys_newfstat)
-#define __NR_fcntl 1052
-__SYSCALL(__NR_fcntl, sys_fcntl)
-#define __NR_fadvise64 1053
-#define __ARCH_WANT_SYS_FADVISE64
-__SYSCALL(__NR_fadvise64, sys_fadvise64)
-#define __NR_newfstatat 1054
-#define __ARCH_WANT_SYS_NEWFSTATAT
-__SYSCALL(__NR_newfstatat, sys_newfstatat)
-#define __NR_fstatfs 1055
-__SYSCALL(__NR_fstatfs, sys_fstatfs)
-#define __NR_statfs 1056
-__SYSCALL(__NR_statfs, sys_statfs)
-#define __NR_lseek 1057
-__SYSCALL(__NR_lseek, sys_lseek)
-#define __NR_mmap 1058
-__SYSCALL(__NR_mmap, sys_mmap)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_mmap+1)
-#endif /* 32 bit off_t syscalls */
-
-#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
-#define __NR_alarm 1059
-#define __ARCH_WANT_SYS_ALARM
-__SYSCALL(__NR_alarm, sys_alarm)
-#define __NR_getpgrp 1060
-#define __ARCH_WANT_SYS_GETPGRP
-__SYSCALL(__NR_getpgrp, sys_getpgrp)
-#define __NR_pause 1061
-#define __ARCH_WANT_SYS_PAUSE
-__SYSCALL(__NR_pause, sys_pause)
-#define __NR_time 1062
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_COMPAT_SYS_TIME
-__SYSCALL(__NR_time, sys_time)
-#define __NR_utime 1063
-#define __ARCH_WANT_SYS_UTIME
-__SYSCALL(__NR_utime, sys_utime)
-
-#define __NR_creat 1064
-__SYSCALL(__NR_creat, sys_creat)
-#define __NR_getdents 1065
-#define __ARCH_WANT_SYS_GETDENTS
-__SYSCALL(__NR_getdents, sys_getdents)
-#define __NR_futimesat 1066
-__SYSCALL(__NR_futimesat, sys_futimesat)
-#define __NR_select 1067
-#define __ARCH_WANT_SYS_SELECT
-__SYSCALL(__NR_select, sys_select)
-#define __NR_poll 1068
-__SYSCALL(__NR_poll, sys_poll)
-#define __NR_epoll_wait 1069
-__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
-#define __NR_ustat 1070
-__SYSCALL(__NR_ustat, sys_ustat)
-#define __NR_vfork 1071
-__SYSCALL(__NR_vfork, sys_vfork)
-#define __NR_oldwait4 1072
-__SYSCALL(__NR_oldwait4, sys_wait4)
-#define __NR_recv 1073
-__SYSCALL(__NR_recv, sys_recv)
-#define __NR_send 1074
-__SYSCALL(__NR_send, sys_send)
-#define __NR_bdflush 1075
-__SYSCALL(__NR_bdflush, sys_bdflush)
-#define __NR_umount 1076
-__SYSCALL(__NR_umount, sys_oldumount)
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __NR_uselib 1077
-__SYSCALL(__NR_uselib, sys_uselib)
-#define __NR__sysctl 1078
-__SYSCALL(__NR__sysctl, sys_sysctl)
-
-#define __NR_fork 1079
-#ifdef CONFIG_MMU
-__SYSCALL(__NR_fork, sys_fork)
-#else
-__SYSCALL(__NR_fork, sys_ni_syscall)
-#endif /* CONFIG_MMU */
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_fork+1)
-
-#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
-
-/*
- * 32 bit systems traditionally used different
- * syscalls for off_t and loff_t arguments, while
- * 64 bit systems only need the off_t version.
- * For new 32 bit platforms, there is no need to
- * implement the old 32 bit off_t syscalls, so
- * they take different names.
- * Here we map the numbers so that both versions
- * use the same syscall table layout.
- */
-#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
-#define __NR_fcntl __NR3264_fcntl
-#define __NR_statfs __NR3264_statfs
-#define __NR_fstatfs __NR3264_fstatfs
-#define __NR_truncate __NR3264_truncate
-#define __NR_ftruncate __NR3264_ftruncate
-#define __NR_lseek __NR3264_lseek
-#define __NR_sendfile __NR3264_sendfile
-#define __NR_newfstatat __NR3264_fstatat
-#define __NR_fstat __NR3264_fstat
-#define __NR_mmap __NR3264_mmap
-#define __NR_fadvise64 __NR3264_fadvise64
-#ifdef __NR3264_stat
-#define __NR_stat __NR3264_stat
-#define __NR_lstat __NR3264_lstat
-#endif
-#else
-#define __NR_fcntl64 __NR3264_fcntl
-#define __NR_statfs64 __NR3264_statfs
-#define __NR_fstatfs64 __NR3264_fstatfs
-#define __NR_truncate64 __NR3264_truncate
-#define __NR_ftruncate64 __NR3264_ftruncate
-#define __NR_llseek __NR3264_lseek
-#define __NR_sendfile64 __NR3264_sendfile
-#define __NR_fstatat64 __NR3264_fstatat
-#define __NR_fstat64 __NR3264_fstat
-#define __NR_mmap2 __NR3264_mmap
-#define __NR_fadvise64_64 __NR3264_fadvise64
-#ifdef __NR3264_stat
-#define __NR_stat64 __NR3264_stat
-#define __NR_lstat64 __NR3264_lstat
-#endif
-#endif
-
-#ifdef __KERNEL__
+#include <uapi/asm-generic/unistd.h>
 
 /*
  * These are required system calls, we should
@@ -928,6 +22,3 @@ __SYSCALL(__NR_fork, sys_ni_syscall)
 #ifndef cond_syscall
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 #endif
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_GENERIC_UNISTD_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4e2e1cc505ab..d1ea7ce0b4cb 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -530,9 +530,18 @@
                 *(.scommon)                                             \
         }
 
+/*
+ * Allow archectures to redefine BSS_FIRST_SECTIONS to add extra
+ * sections to the front of bss.
+ */
+#ifndef BSS_FIRST_SECTIONS
+#define BSS_FIRST_SECTIONS
+#endif
+
 #define BSS(bss_align)                                                  \
         . = ALIGN(bss_align);                                           \
         .bss : AT(ADDR(.bss) - LOAD_OFFSET) {                           \
+                BSS_FIRST_SECTIONS                                      \
                 *(.bss..page_aligned)                                   \
                 *(.dynbss)                                              \
                 *(.bss)                                                 \
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h
index 6028fb862254..b4d843225afd 100644
--- a/include/asm-generic/xor.h
+++ b/include/asm-generic/xor.h
@@ -693,7 +693,7 @@ static struct xor_block_template xor_block_32regs = {
         .do_5 = xor_32regs_5,
 };
 
-static struct xor_block_template xor_block_8regs_p = {
+static struct xor_block_template xor_block_8regs_p __maybe_unused = {
         .name = "8regs_prefetch",
         .do_2 = xor_8regs_p_2,
         .do_3 = xor_8regs_p_3,
@@ -701,7 +701,7 @@ static struct xor_block_template xor_block_8regs_p = {
         .do_5 = xor_8regs_p_5,
 };
 
-static struct xor_block_template xor_block_32regs_p = {
+static struct xor_block_template xor_block_32regs_p __maybe_unused = {
         .name = "32regs_prefetch",
         .do_2 = xor_32regs_p_2,
         .do_3 = xor_32regs_p_3,
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
new file mode 100644
index 000000000000..f5b0224c9967
--- /dev/null
+++ b/include/crypto/public_key.h
@@ -0,0 +1,108 @@
+/* Asymmetric public-key algorithm definitions
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_PUBLIC_KEY_H
+#define _LINUX_PUBLIC_KEY_H
+
+#include <linux/mpi.h>
+
+enum pkey_algo {
+        PKEY_ALGO_DSA,
+        PKEY_ALGO_RSA,
+        PKEY_ALGO__LAST
+};
+
+extern const char *const pkey_algo[PKEY_ALGO__LAST];
+
+enum pkey_hash_algo {
+        PKEY_HASH_MD4,
+        PKEY_HASH_MD5,
+        PKEY_HASH_SHA1,
+        PKEY_HASH_RIPE_MD_160,
+        PKEY_HASH_SHA256,
+        PKEY_HASH_SHA384,
+        PKEY_HASH_SHA512,
+        PKEY_HASH_SHA224,
+        PKEY_HASH__LAST
+};
+
+extern const char *const pkey_hash_algo[PKEY_HASH__LAST];
+
+enum pkey_id_type {
+        PKEY_ID_PGP,            /* OpenPGP generated key ID */
+        PKEY_ID_X509,           /* X.509 arbitrary subjectKeyIdentifier */
+        PKEY_ID_TYPE__LAST
+};
+
+extern const char *const pkey_id_type[PKEY_ID_TYPE__LAST];
+
+/*
+ * Cryptographic data for the public-key subtype of the asymmetric key type.
+ *
+ * Note that this may include private part of the key as well as the public
+ * part.
+ */
+struct public_key {
+        const struct public_key_algorithm *algo;
+        u8      capabilities;
+#define PKEY_CAN_ENCRYPT        0x01
+#define PKEY_CAN_DECRYPT        0x02
+#define PKEY_CAN_SIGN           0x04
+#define PKEY_CAN_VERIFY         0x08
+        enum pkey_id_type id_type : 8;
+        union {
+                MPI     mpi[5];
+                struct {
+                        MPI     p;      /* DSA prime */
+                        MPI     q;      /* DSA group order */
+                        MPI     g;      /* DSA group generator */
+                        MPI     y;      /* DSA public-key value = g^x mod p */
+                        MPI     x;      /* DSA secret exponent (if present) */
+                } dsa;
+                struct {
+                        MPI     n;      /* RSA public modulus */
+                        MPI     e;      /* RSA public encryption exponent */
+                        MPI     d;      /* RSA secret encryption exponent (if present) */
+                        MPI     p;      /* RSA secret prime (if present) */
+                        MPI     q;      /* RSA secret prime (if present) */
+                } rsa;
+        };
+};
+
+extern void public_key_destroy(void *payload);
+
+/*
+ * Public key cryptography signature data
+ */
+struct public_key_signature {
+        u8 *digest;
+        u8 digest_size;                 /* Number of bytes in digest */
+        u8 nr_mpi;                      /* Occupancy of mpi[] */
+        enum pkey_hash_algo pkey_hash_algo : 8;
+        union {
+                MPI mpi[2];
+                struct {
+                        MPI s;          /* m^d mod n */
+                } rsa;
+                struct {
+                        MPI r;
+                        MPI s;
+                } dsa;
+        };
+};
+
+struct key;
+extern int verify_signature(const struct key *key,
+                            const struct public_key_signature *sig);
+
+#endif /* _LINUX_PUBLIC_KEY_H */
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
deleted file mode 100644
index 1e38a19d68f6..000000000000
--- a/include/drm/Kbuild
+++ /dev/null
@@ -1,15 +0,0 @@
-header-y += drm.h
-header-y += drm_fourcc.h
-header-y += drm_mode.h
-header-y += drm_sarea.h
-header-y += exynos_drm.h
-header-y += i810_drm.h
-header-y += i915_drm.h
-header-y += mga_drm.h
-header-y += nouveau_drm.h
-header-y += r128_drm.h
-header-y += radeon_drm.h
-header-y += savage_drm.h
-header-y += sis_drm.h
-header-y += via_drm.h
-header-y += vmwgfx_drm.h
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 1816bb31273a..3fa18b7e9497 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -878,6 +878,7 @@ extern char *drm_get_tv_subconnector_name(int val);
 extern char *drm_get_tv_select_name(int val);
 extern void drm_fb_release(struct drm_file *file_priv);
 extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
+extern bool drm_probe_ddc(struct i2c_adapter *adapter);
 extern struct edid *drm_get_edid(struct drm_connector *connector,
                                  struct i2c_adapter *adapter);
 extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 1744b18c06b3..fe061489f91f 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -26,7 +26,19 @@
 #include <linux/types.h>
 #include <linux/i2c.h>
 
-/* From the VESA DisplayPort spec */
+/*
+ * Unless otherwise noted, all values are from the DP 1.1a spec.  Note that
+ * DP and DPCD versions are independent.  Differences from 1.0 are not noted,
+ * 1.0 devices basically don't exist in the wild.
+ *
+ * Abbreviations, in chronological order:
+ *
+ * eDP: Embedded DisplayPort version 1
+ * DPI: DisplayPort Interoperability Guideline v1.1a
+ * 1.2: DisplayPort 1.2
+ *
+ * 1.2 formally includes both eDP and DPI definitions.
+ */
 
 #define AUX_NATIVE_WRITE        0x8
 #define AUX_NATIVE_READ         0x9
@@ -53,7 +65,7 @@
 
 #define DP_MAX_LANE_COUNT                   0x002
 # define DP_MAX_LANE_COUNT_MASK             0x1f
-# define DP_TPS3_SUPPORTED                  (1 << 6)
+# define DP_TPS3_SUPPORTED                  (1 << 6) /* 1.2 */
 # define DP_ENHANCED_FRAME_CAP              (1 << 7)
 
 #define DP_MAX_DOWNSPREAD                   0x003
@@ -69,19 +81,33 @@
 /* 10b = TMDS or HDMI */
 /* 11b = Other */
 # define DP_FORMAT_CONVERSION               (1 << 3)
+# define DP_DETAILED_CAP_INFO_AVAILABLE     (1 << 4) /* DPI */
 
 #define DP_MAIN_LINK_CHANNEL_CODING         0x006
 
 #define DP_DOWN_STREAM_PORT_COUNT           0x007
-#define  DP_PORT_COUNT_MASK                 0x0f
-#define  DP_OUI_SUPPORT                     (1 << 7)
-
-#define DP_EDP_CONFIGURATION_CAP            0x00d
-#define DP_TRAINING_AUX_RD_INTERVAL         0x00e
-
-#define DP_PSR_SUPPORT                      0x070
+# define DP_PORT_COUNT_MASK                 0x0f
+# define DP_MSA_TIMING_PAR_IGNORED          (1 << 6) /* eDP */
+# define DP_OUI_SUPPORT                     (1 << 7)
+
+#define DP_I2C_SPEED_CAP                    0x00c    /* DPI */
+# define DP_I2C_SPEED_1K                    0x01
+# define DP_I2C_SPEED_5K                    0x02
+# define DP_I2C_SPEED_10K                   0x04
+# define DP_I2C_SPEED_100K                  0x08
+# define DP_I2C_SPEED_400K                  0x10
+# define DP_I2C_SPEED_1M                    0x20
+
+#define DP_EDP_CONFIGURATION_CAP            0x00d   /* XXX 1.2? */
+#define DP_TRAINING_AUX_RD_INTERVAL         0x00e   /* XXX 1.2? */
+
+/* Multiple stream transport */
+#define DP_MSTM_CAP                         0x021   /* 1.2 */
+# define DP_MST_CAP                         (1 << 0)
+
+#define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */
 # define DP_PSR_IS_SUPPORTED                1
-#define DP_PSR_CAPS                         0x071
+#define DP_PSR_CAPS                         0x071   /* XXX 1.2? */
 # define DP_PSR_NO_TRAIN_ON_EXIT            1
 # define DP_PSR_SETUP_TIME_330              (0 << 1)
 # define DP_PSR_SETUP_TIME_275              (1 << 1)
@@ -93,11 +119,36 @@
 # define DP_PSR_SETUP_TIME_MASK             (7 << 1)
 # define DP_PSR_SETUP_TIME_SHIFT            1
 
+/*
+ * 0x80-0x8f describe downstream port capabilities, but there are two layouts
+ * based on whether DP_DETAILED_CAP_INFO_AVAILABLE was set.  If it was not,
+ * each port's descriptor is one byte wide.  If it was set, each port's is
+ * four bytes wide, starting with the one byte from the base info.  As of
+ * DP interop v1.1a only VGA defines additional detail.
+ */
+
+/* offset 0 */
+#define DP_DOWNSTREAM_PORT_0                0x80
+# define DP_DS_PORT_TYPE_MASK               (7 << 0)
+# define DP_DS_PORT_TYPE_DP                 0
+# define DP_DS_PORT_TYPE_VGA                1
+# define DP_DS_PORT_TYPE_DVI                2
+# define DP_DS_PORT_TYPE_HDMI               3
+# define DP_DS_PORT_TYPE_NON_EDID           4
+# define DP_DS_PORT_HPD                     (1 << 3)
+/* offset 1 for VGA is maximum megapixels per second / 8 */
+/* offset 2 */
+# define DP_DS_VGA_MAX_BPC_MASK             (3 << 0)
+# define DP_DS_VGA_8BPC                     0
+# define DP_DS_VGA_10BPC                    1
+# define DP_DS_VGA_12BPC                    2
+# define DP_DS_VGA_16BPC                    3
+
 /* link configuration */
 #define DP_LINK_BW_SET                      0x100
 # define DP_LINK_BW_1_62                    0x06
 # define DP_LINK_BW_2_7                     0x0a
-# define DP_LINK_BW_5_4                     0x14
+# define DP_LINK_BW_5_4                     0x14    /* 1.2 */
 
 #define DP_LANE_COUNT_SET                   0x101
 # define DP_LANE_COUNT_MASK                 0x0f
@@ -107,7 +158,7 @@
 # define DP_TRAINING_PATTERN_DISABLE        0
 # define DP_TRAINING_PATTERN_1              1
 # define DP_TRAINING_PATTERN_2              2
-# define DP_TRAINING_PATTERN_3              3
+# define DP_TRAINING_PATTERN_3              3       /* 1.2 */
 # define DP_TRAINING_PATTERN_MASK           0x3
 
 # define DP_LINK_QUAL_PATTERN_DISABLE       (0 << 2)
@@ -148,24 +199,38 @@
 
 #define DP_DOWNSPREAD_CTRL                  0x107
 # define DP_SPREAD_AMP_0_5                  (1 << 4)
+# define DP_MSA_TIMING_PAR_IGNORE_EN        (1 << 7) /* eDP */
 
 #define DP_MAIN_LINK_CHANNEL_CODING_SET     0x108
 # define DP_SET_ANSI_8B10B                  (1 << 0)
 
-#define DP_PSR_EN_CFG                       0x170
+#define DP_I2C_SPEED_CONTROL_STATUS         0x109   /* DPI */
+/* bitmask as for DP_I2C_SPEED_CAP */
+
+#define DP_EDP_CONFIGURATION_SET            0x10a   /* XXX 1.2? */
+
+#define DP_MSTM_CTRL                        0x111   /* 1.2 */
+# define DP_MST_EN                          (1 << 0)
+# define DP_UP_REQ_EN                       (1 << 1)
+# define DP_UPSTREAM_IS_SRC                 (1 << 2)
+
+#define DP_PSR_EN_CFG                       0x170   /* XXX 1.2? */
 # define DP_PSR_ENABLE                      (1 << 0)
 # define DP_PSR_MAIN_LINK_ACTIVE            (1 << 1)
 # define DP_PSR_CRC_VERIFICATION            (1 << 2)
 # define DP_PSR_FRAME_CAPTURE               (1 << 3)
 
+#define DP_SINK_COUNT                       0x200
+/* prior to 1.2 bit 7 was reserved mbz */
+# define DP_GET_SINK_COUNT(x)               ((((x) & 0x80) >> 1) | ((x) & 0x3f))
+# define DP_SINK_CP_READY                   (1 << 6)
+
 #define DP_DEVICE_SERVICE_IRQ_VECTOR        0x201
 # define DP_REMOTE_CONTROL_COMMAND_PENDING  (1 << 0)
 # define DP_AUTOMATED_TEST_REQUEST          (1 << 1)
 # define DP_CP_IRQ                          (1 << 2)
 # define DP_SINK_SPECIFIC_IRQ               (1 << 6)
 
-#define DP_EDP_CONFIGURATION_SET            0x10a
-
 #define DP_LANE0_1_STATUS                   0x202
 #define DP_LANE2_3_STATUS                   0x203
 # define DP_LANE_CR_DONE                    (1 << 0)
@@ -225,14 +290,14 @@
 # define DP_SET_POWER_D0                    0x1
 # define DP_SET_POWER_D3                    0x2
 
-#define DP_PSR_ERROR_STATUS                 0x2006
+#define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */
 # define DP_PSR_LINK_CRC_ERROR              (1 << 0)
 # define DP_PSR_RFB_STORAGE_ERROR           (1 << 1)
 
-#define DP_PSR_ESI                          0x2007
+#define DP_PSR_ESI                          0x2007  /* XXX 1.2? */
 # define DP_PSR_CAPS_CHANGE                 (1 << 0)
 
-#define DP_PSR_STATUS                       0x2008
+#define DP_PSR_STATUS                       0x2008  /* XXX 1.2? */
 # define DP_PSR_SINK_INACTIVE               0
 # define DP_PSR_SINK_ACTIVE_SRC_SYNCED      1
 # define DP_PSR_SINK_ACTIVE_RFB             2
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index c78bb997e2c6..af1cbaf535ed 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -205,6 +205,8 @@
         {0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x678A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6790, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x6791, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x6792, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
@@ -217,6 +219,7 @@
         {0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x6811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h
index 1f2acdfbfd6d..3c13a3a4b158 100644
--- a/include/drm/exynos_drm.h
+++ b/include/drm/exynos_drm.h
@@ -25,182 +25,10 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-
 #ifndef _EXYNOS_DRM_H_
 #define _EXYNOS_DRM_H_
 
-#include <drm/drm.h>
-
-/**
- * User-desired buffer creation information structure.
- *
- * @size: user-desired memory allocation size.
- *      - this size value would be page-aligned internally.
- * @flags: user request for setting memory type or cache attributes.
- * @handle: returned a handle to created gem object.
- *      - this handle will be set by gem module of kernel side.
- */
-struct drm_exynos_gem_create {
-        uint64_t size;
-        unsigned int flags;
-        unsigned int handle;
-};
-
-/**
- * A structure for getting buffer offset.
- *
- * @handle: a pointer to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @offset: relatived offset value of the memory region allocated.
- *      - this value should be set by user.
- */
-struct drm_exynos_gem_map_off {
-        unsigned int handle;
-        unsigned int pad;
-        uint64_t offset;
-};
-
-/**
- * A structure for mapping buffer.
- *
- * @handle: a handle to gem object created.
- * @pad: just padding to be 64-bit aligned.
- * @size: memory size to be mapped.
- * @mapped: having user virtual address mmaped.
- *      - this variable would be filled by exynos gem module
- *      of kernel side with user virtual address which is allocated
- *      by do_mmap().
- */
-struct drm_exynos_gem_mmap {
-        unsigned int handle;
-        unsigned int pad;
-        uint64_t size;
-        uint64_t mapped;
-};
-
-/**
- * A structure to gem information.
- *
- * @handle: a handle to gem object created.
- * @flags: flag value including memory type and cache attribute and
- *      this value would be set by driver.
- * @size: size to memory region allocated by gem and this size would
- *      be set by driver.
- */
-struct drm_exynos_gem_info {
-        unsigned int handle;
-        unsigned int flags;
-        uint64_t size;
-};
-
-/**
- * A structure for user connection request of virtual display.
- *
- * @connection: indicate whether doing connetion or not by user.
- * @extensions: if this value is 1 then the vidi driver would need additional
- *      128bytes edid data.
- * @edid: the edid data pointer from user side.
- */
-struct drm_exynos_vidi_connection {
-        unsigned int connection;
-        unsigned int extensions;
-        uint64_t edid;
-};
-
-/* memory type definitions. */
-enum e_drm_exynos_gem_mem_type {
-        /* Physically Continuous memory and used as default. */
-        EXYNOS_BO_CONTIG        = 0 << 0,
-        /* Physically Non-Continuous memory. */
-        EXYNOS_BO_NONCONTIG     = 1 << 0,
-        /* non-cachable mapping and used as default. */
-        EXYNOS_BO_NONCACHABLE   = 0 << 1,
-        /* cachable mapping. */
-        EXYNOS_BO_CACHABLE      = 1 << 1,
-        /* write-combine mapping. */
-        EXYNOS_BO_WC            = 1 << 2,
-        EXYNOS_BO_MASK          = EXYNOS_BO_NONCONTIG | EXYNOS_BO_CACHABLE |
-                                        EXYNOS_BO_WC
-};
-
-struct drm_exynos_g2d_get_ver {
-        __u32   major;
-        __u32   minor;
-};
-
-struct drm_exynos_g2d_cmd {
-        __u32   offset;
-        __u32   data;
-};
-
-enum drm_exynos_g2d_event_type {
-        G2D_EVENT_NOT,
-        G2D_EVENT_NONSTOP,
-        G2D_EVENT_STOP,         /* not yet */
-};
-
-struct drm_exynos_g2d_set_cmdlist {
-        __u64                                   cmd;
-        __u64                                   cmd_gem;
-        __u32                                   cmd_nr;
-        __u32                                   cmd_gem_nr;
-
-        /* for g2d event */
-        __u64                                   event_type;
-        __u64                                   user_data;
-};
-
-struct drm_exynos_g2d_exec {
-        __u64                                   async;
-};
-
-#define DRM_EXYNOS_GEM_CREATE           0x00
-#define DRM_EXYNOS_GEM_MAP_OFFSET       0x01
-#define DRM_EXYNOS_GEM_MMAP             0x02
-/* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */
-#define DRM_EXYNOS_GEM_GET              0x04
-#define DRM_EXYNOS_VIDI_CONNECTION      0x07
-
-/* G2D */
-#define DRM_EXYNOS_G2D_GET_VER          0x20
-#define DRM_EXYNOS_G2D_SET_CMDLIST      0x21
-#define DRM_EXYNOS_G2D_EXEC             0x22
-
-#define DRM_IOCTL_EXYNOS_GEM_CREATE             DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
-
-#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off)
-
-#define DRM_IOCTL_EXYNOS_GEM_MMAP       DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
-
-#define DRM_IOCTL_EXYNOS_GEM_GET        DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_GEM_GET,     struct drm_exynos_gem_info)
-
-#define DRM_IOCTL_EXYNOS_VIDI_CONNECTION        DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_VIDI_CONNECTION, struct drm_exynos_vidi_connection)
-
-#define DRM_IOCTL_EXYNOS_G2D_GET_VER            DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_G2D_GET_VER, struct drm_exynos_g2d_get_ver)
-#define DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST        DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_G2D_SET_CMDLIST, struct drm_exynos_g2d_set_cmdlist)
-#define DRM_IOCTL_EXYNOS_G2D_EXEC               DRM_IOWR(DRM_COMMAND_BASE + \
-                DRM_EXYNOS_G2D_EXEC, struct drm_exynos_g2d_exec)
-
-/* EXYNOS specific events */
-#define DRM_EXYNOS_G2D_EVENT            0x80000000
-
-struct drm_exynos_g2d_event {
-        struct drm_event        base;
-        __u64                   user_data;
-        __u32                   tv_sec;
-        __u32                   tv_usec;
-        __u32                   cmdlist_no;
-        __u32                   reserved;
-};
-
-#ifdef __KERNEL__
+#include <uapi/drm/exynos_drm.h>
 
 /**
  * A structure for lcd panel information.
@@ -257,5 +85,4 @@ struct exynos_drm_hdmi_pdata {
         int (*get_hpd)(void);
 };
 
-#endif  /* __KERNEL__ */
 #endif  /* _EXYNOS_DRM_H_ */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index a940d4e18917..63d609d8a3f6 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -23,933 +23,15 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
 
-#include <drm/drm.h>
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints.
- */
+#include <uapi/drm/i915_drm.h>
 
-#ifdef __KERNEL__
 /* For use by IPS driver */
 extern unsigned long i915_read_mch_val(void);
 extern bool i915_gpu_raise(void);
 extern bool i915_gpu_lower(void);
 extern bool i915_gpu_busy(void);
 extern bool i915_gpu_turbo_disable(void);
-#endif
-
-/* Each region is a minimum of 16k, and there are at most 255 of them.
- */
-#define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use
-                                 * of chars for next/prev indices */
-#define I915_LOG_MIN_TEX_REGION_SIZE 14
-
-typedef struct _drm_i915_init {
-        enum {
-                I915_INIT_DMA = 0x01,
-                I915_CLEANUP_DMA = 0x02,
-                I915_RESUME_DMA = 0x03
-        } func;
-        unsigned int mmio_offset;
-        int sarea_priv_offset;
-        unsigned int ring_start;
-        unsigned int ring_end;
-        unsigned int ring_size;
-        unsigned int front_offset;
-        unsigned int back_offset;
-        unsigned int depth_offset;
-        unsigned int w;
-        unsigned int h;
-        unsigned int pitch;
-        unsigned int pitch_bits;
-        unsigned int back_pitch;
-        unsigned int depth_pitch;
-        unsigned int cpp;
-        unsigned int chipset;
-} drm_i915_init_t;
-
-typedef struct _drm_i915_sarea {
-        struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
-        int last_upload;        /* last time texture was uploaded */
-        int last_enqueue;       /* last time a buffer was enqueued */
-        int last_dispatch;      /* age of the most recently dispatched buffer */
-        int ctxOwner;           /* last context to upload state */
-        int texAge;
-        int pf_enabled;         /* is pageflipping allowed? */
-        int pf_active;
-        int pf_current_page;    /* which buffer is being displayed? */
-        int perf_boxes;         /* performance boxes to be displayed */
-        int width, height;      /* screen size in pixels */
-
-        drm_handle_t front_handle;
-        int front_offset;
-        int front_size;
-
-        drm_handle_t back_handle;
-        int back_offset;
-        int back_size;
-
-        drm_handle_t depth_handle;
-        int depth_offset;
-        int depth_size;
-
-        drm_handle_t tex_handle;
-        int tex_offset;
-        int tex_size;
-        int log_tex_granularity;
-        int pitch;
-        int rotation;           /* 0, 90, 180 or 270 */
-        int rotated_offset;
-        int rotated_size;
-        int rotated_pitch;
-        int virtualX, virtualY;
-
-        unsigned int front_tiled;
-        unsigned int back_tiled;
-        unsigned int depth_tiled;
-        unsigned int rotated_tiled;
-        unsigned int rotated2_tiled;
-
-        int pipeA_x;
-        int pipeA_y;
-        int pipeA_w;
-        int pipeA_h;
-        int pipeB_x;
-        int pipeB_y;
-        int pipeB_w;
-        int pipeB_h;
-
-        /* fill out some space for old userspace triple buffer */
-        drm_handle_t unused_handle;
-        __u32 unused1, unused2, unused3;
-
-        /* buffer object handles for static buffers. May change
-         * over the lifetime of the client.
-         */
-        __u32 front_bo_handle;
-        __u32 back_bo_handle;
-        __u32 unused_bo_handle;
-        __u32 depth_bo_handle;
-
-} drm_i915_sarea_t;
-
-/* due to userspace building against these headers we need some compat here */
-#define planeA_x pipeA_x
-#define planeA_y pipeA_y
-#define planeA_w pipeA_w
-#define planeA_h pipeA_h
-#define planeB_x pipeB_x
-#define planeB_y pipeB_y
-#define planeB_w pipeB_w
-#define planeB_h pipeB_h
-
-/* Flags for perf_boxes
- */
-#define I915_BOX_RING_EMPTY    0x1
-#define I915_BOX_FLIP          0x2
-#define I915_BOX_WAIT          0x4
-#define I915_BOX_TEXTURE_LOAD  0x8
-#define I915_BOX_LOST_CONTEXT  0x10
-
-/* I915 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_I915_INIT           0x00
-#define DRM_I915_FLUSH          0x01
-#define DRM_I915_FLIP           0x02
-#define DRM_I915_BATCHBUFFER    0x03
-#define DRM_I915_IRQ_EMIT       0x04
-#define DRM_I915_IRQ_WAIT       0x05
-#define DRM_I915_GETPARAM       0x06
-#define DRM_I915_SETPARAM       0x07
-#define DRM_I915_ALLOC          0x08
-#define DRM_I915_FREE           0x09
-#define DRM_I915_INIT_HEAP      0x0a
-#define DRM_I915_CMDBUFFER      0x0b
-#define DRM_I915_DESTROY_HEAP   0x0c
-#define DRM_I915_SET_VBLANK_PIPE        0x0d
-#define DRM_I915_GET_VBLANK_PIPE        0x0e
-#define DRM_I915_VBLANK_SWAP    0x0f
-#define DRM_I915_HWS_ADDR       0x11
-#define DRM_I915_GEM_INIT       0x13
-#define DRM_I915_GEM_EXECBUFFER 0x14
-#define DRM_I915_GEM_PIN        0x15
-#define DRM_I915_GEM_UNPIN      0x16
-#define DRM_I915_GEM_BUSY       0x17
-#define DRM_I915_GEM_THROTTLE   0x18
-#define DRM_I915_GEM_ENTERVT    0x19
-#define DRM_I915_GEM_LEAVEVT    0x1a
-#define DRM_I915_GEM_CREATE     0x1b
-#define DRM_I915_GEM_PREAD      0x1c
-#define DRM_I915_GEM_PWRITE     0x1d
-#define DRM_I915_GEM_MMAP       0x1e
-#define DRM_I915_GEM_SET_DOMAIN 0x1f
-#define DRM_I915_GEM_SW_FINISH  0x20
-#define DRM_I915_GEM_SET_TILING 0x21
-#define DRM_I915_GEM_GET_TILING 0x22
-#define DRM_I915_GEM_GET_APERTURE 0x23
-#define DRM_I915_GEM_MMAP_GTT   0x24
-#define DRM_I915_GET_PIPE_FROM_CRTC_ID  0x25
-#define DRM_I915_GEM_MADVISE    0x26
-#define DRM_I915_OVERLAY_PUT_IMAGE      0x27
-#define DRM_I915_OVERLAY_ATTRS  0x28
-#define DRM_I915_GEM_EXECBUFFER2        0x29
-#define DRM_I915_GET_SPRITE_COLORKEY    0x2a
-#define DRM_I915_SET_SPRITE_COLORKEY    0x2b
-#define DRM_I915_GEM_WAIT       0x2c
-#define DRM_I915_GEM_CONTEXT_CREATE     0x2d
-#define DRM_I915_GEM_CONTEXT_DESTROY    0x2e
-#define DRM_I915_GEM_SET_CACHING        0x2f
-#define DRM_I915_GEM_GET_CACHING        0x30
-#define DRM_I915_REG_READ               0x31
-
-#define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
-#define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-#define DRM_IOCTL_I915_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
-#define DRM_IOCTL_I915_BATCHBUFFER      DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
-#define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
-#define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
-#define DRM_IOCTL_I915_SETPARAM         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
-#define DRM_IOCTL_I915_ALLOC            DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
-#define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
-#define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
-#define DRM_IOCTL_I915_CMDBUFFER        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
-#define DRM_IOCTL_I915_DESTROY_HEAP     DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
-#define DRM_IOCTL_I915_SET_VBLANK_PIPE  DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_GET_VBLANK_PIPE  DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_VBLANK_SWAP      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-#define DRM_IOCTL_I915_HWS_ADDR         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_HWS_ADDR, struct drm_i915_gem_init)
-#define DRM_IOCTL_I915_GEM_INIT         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
-#define DRM_IOCTL_I915_GEM_EXECBUFFER   DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
-#define DRM_IOCTL_I915_GEM_EXECBUFFER2  DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2)
-#define DRM_IOCTL_I915_GEM_PIN          DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
-#define DRM_IOCTL_I915_GEM_UNPIN        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
-#define DRM_IOCTL_I915_GEM_BUSY         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-#define DRM_IOCTL_I915_GEM_SET_CACHING          DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching)
-#define DRM_IOCTL_I915_GEM_GET_CACHING          DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)
-#define DRM_IOCTL_I915_GEM_THROTTLE     DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)
-#define DRM_IOCTL_I915_GEM_ENTERVT      DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)
-#define DRM_IOCTL_I915_GEM_LEAVEVT      DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)
-#define DRM_IOCTL_I915_GEM_CREATE       DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create)
-#define DRM_IOCTL_I915_GEM_PREAD        DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
-#define DRM_IOCTL_I915_GEM_PWRITE       DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
-#define DRM_IOCTL_I915_GEM_MMAP         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
-#define DRM_IOCTL_I915_GEM_MMAP_GTT     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
-#define DRM_IOCTL_I915_GEM_SET_DOMAIN   DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
-#define DRM_IOCTL_I915_GEM_SW_FINISH    DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
-#define DRM_IOCTL_I915_GEM_SET_TILING   DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
-#define DRM_IOCTL_I915_GEM_GET_TILING   DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
-#define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
-#define DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_PIPE_FROM_CRTC_ID, struct drm_i915_get_pipe_from_crtc_id)
-#define DRM_IOCTL_I915_GEM_MADVISE      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MADVISE, struct drm_i915_gem_madvise)
-#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
-#define DRM_IOCTL_I915_OVERLAY_ATTRS    DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
-#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GEM_WAIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
-#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE       DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
-#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY      DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
-#define DRM_IOCTL_I915_REG_READ                 DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read)
-
-/* Allow drivers to submit batchbuffers directly to hardware, relying
- * on the security mechanisms provided by hardware.
- */
-typedef struct drm_i915_batchbuffer {
-        int start;              /* agp offset */
-        int used;               /* nr bytes in use */
-        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
-        int num_cliprects;      /* mulitpass with multiple cliprects? */
-        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
-} drm_i915_batchbuffer_t;
-
-/* As above, but pass a pointer to userspace buffer which can be
- * validated by the kernel prior to sending to hardware.
- */
-typedef struct _drm_i915_cmdbuffer {
-        char __user *buf;       /* pointer to userspace command buffer */
-        int sz;                 /* nr bytes in buf */
-        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
-        int num_cliprects;      /* mulitpass with multiple cliprects? */
-        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
-} drm_i915_cmdbuffer_t;
-
-/* Userspace can request & wait on irq's:
- */
-typedef struct drm_i915_irq_emit {
-        int __user *irq_seq;
-} drm_i915_irq_emit_t;
-
-typedef struct drm_i915_irq_wait {
-        int irq_seq;
-} drm_i915_irq_wait_t;
-
-/* Ioctl to query kernel params:
- */
-#define I915_PARAM_IRQ_ACTIVE            1
-#define I915_PARAM_ALLOW_BATCHBUFFER     2
-#define I915_PARAM_LAST_DISPATCH         3
-#define I915_PARAM_CHIPSET_ID            4
-#define I915_PARAM_HAS_GEM               5
-#define I915_PARAM_NUM_FENCES_AVAIL      6
-#define I915_PARAM_HAS_OVERLAY           7
-#define I915_PARAM_HAS_PAGEFLIPPING      8
-#define I915_PARAM_HAS_EXECBUF2          9
-#define I915_PARAM_HAS_BSD               10
-#define I915_PARAM_HAS_BLT               11
-#define I915_PARAM_HAS_RELAXED_FENCING   12
-#define I915_PARAM_HAS_COHERENT_RINGS    13
-#define I915_PARAM_HAS_EXEC_CONSTANTS    14
-#define I915_PARAM_HAS_RELAXED_DELTA     15
-#define I915_PARAM_HAS_GEN7_SOL_RESET    16
-#define I915_PARAM_HAS_LLC               17
-#define I915_PARAM_HAS_ALIASING_PPGTT    18
-#define I915_PARAM_HAS_WAIT_TIMEOUT      19
-#define I915_PARAM_HAS_SEMAPHORES        20
-#define I915_PARAM_HAS_PRIME_VMAP_FLUSH  21
-#define I915_PARAM_RSVD_FOR_FUTURE_USE   22
-
-typedef struct drm_i915_getparam {
-        int param;
-        int __user *value;
-} drm_i915_getparam_t;
-
-/* Ioctl to set kernel params:
- */
-#define I915_SETPARAM_USE_MI_BATCHBUFFER_START            1
-#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY             2
-#define I915_SETPARAM_ALLOW_BATCHBUFFER                   3
-#define I915_SETPARAM_NUM_USED_FENCES                     4
-
-typedef struct drm_i915_setparam {
-        int param;
-        int value;
-} drm_i915_setparam_t;
-
-/* A memory manager for regions of shared memory:
- */
-#define I915_MEM_REGION_AGP 1
-
-typedef struct drm_i915_mem_alloc {
-        int region;
-        int alignment;
-        int size;
-        int __user *region_offset;      /* offset from start of fb or agp */
-} drm_i915_mem_alloc_t;
-
-typedef struct drm_i915_mem_free {
-        int region;
-        int region_offset;
-} drm_i915_mem_free_t;
-
-typedef struct drm_i915_mem_init_heap {
-        int region;
-        int size;
-        int start;
-} drm_i915_mem_init_heap_t;
-
-/* Allow memory manager to be torn down and re-initialized (eg on
- * rotate):
- */
-typedef struct drm_i915_mem_destroy_heap {
-        int region;
-} drm_i915_mem_destroy_heap_t;
-
-/* Allow X server to configure which pipes to monitor for vblank signals
- */
-#define DRM_I915_VBLANK_PIPE_A  1
-#define DRM_I915_VBLANK_PIPE_B  2
-
-typedef struct drm_i915_vblank_pipe {
-        int pipe;
-} drm_i915_vblank_pipe_t;
-
-/* Schedule buffer swap at given vertical blank:
- */
-typedef struct drm_i915_vblank_swap {
-        drm_drawable_t drawable;
-        enum drm_vblank_seq_type seqtype;
-        unsigned int sequence;
-} drm_i915_vblank_swap_t;
-
-typedef struct drm_i915_hws_addr {
-        __u64 addr;
-} drm_i915_hws_addr_t;
-
-struct drm_i915_gem_init {
-        /**
-         * Beginning offset in the GTT to be managed by the DRM memory
-         * manager.
-         */
-        __u64 gtt_start;
-        /**
-         * Ending offset in the GTT to be managed by the DRM memory
-         * manager.
-         */
-        __u64 gtt_end;
-};
-
-struct drm_i915_gem_create {
-        /**
-         * Requested size for the object.
-         *
-         * The (page-aligned) allocated size for the object will be returned.
-         */
-        __u64 size;
-        /**
-         * Returned handle for the object.
-         *
-         * Object handles are nonzero.
-         */
-        __u32 handle;
-        __u32 pad;
-};
-
-struct drm_i915_gem_pread {
-        /** Handle for the object being read. */
-        __u32 handle;
-        __u32 pad;
-        /** Offset into the object to read from */
-        __u64 offset;
-        /** Length of data to read */
-        __u64 size;
-        /**
-         * Pointer to write the data into.
-         *
-         * This is a fixed-size type for 32/64 compatibility.
-         */
-        __u64 data_ptr;
-};
-
-struct drm_i915_gem_pwrite {
-        /** Handle for the object being written to. */
-        __u32 handle;
-        __u32 pad;
-        /** Offset into the object to write to */
-        __u64 offset;
-        /** Length of data to write */
-        __u64 size;
-        /**
-         * Pointer to read the data from.
-         *
-         * This is a fixed-size type for 32/64 compatibility.
-         */
-        __u64 data_ptr;
-};
-
-struct drm_i915_gem_mmap {
-        /** Handle for the object being mapped. */
-        __u32 handle;
-        __u32 pad;
-        /** Offset in the object to map. */
-        __u64 offset;
-        /**
-         * Length of data to map.
-         *
-         * The value will be page-aligned.
-         */
-        __u64 size;
-        /**
-         * Returned pointer the data was mapped at.
-         *
-         * This is a fixed-size type for 32/64 compatibility.
-         */
-        __u64 addr_ptr;
-};
-
-struct drm_i915_gem_mmap_gtt {
-        /** Handle for the object being mapped. */
-        __u32 handle;
-        __u32 pad;
-        /**
-         * Fake offset to use for subsequent mmap call
-         *
-         * This is a fixed-size type for 32/64 compatibility.
-         */
-        __u64 offset;
-};
-
-struct drm_i915_gem_set_domain {
-        /** Handle for the object */
-        __u32 handle;
-
-        /** New read domains */
-        __u32 read_domains;
-
-        /** New write domain */
-        __u32 write_domain;
-};
-
-struct drm_i915_gem_sw_finish {
-        /** Handle for the object */
-        __u32 handle;
-};
-
-struct drm_i915_gem_relocation_entry {
-        /**
-         * Handle of the buffer being pointed to by this relocation entry.
-         *
-         * It's appealing to make this be an index into the mm_validate_entry
-         * list to refer to the buffer, but this allows the driver to create
-         * a relocation list for state buffers and not re-write it per
-         * exec using the buffer.
-         */
-        __u32 target_handle;
-
-        /**
-         * Value to be added to the offset of the target buffer to make up
-         * the relocation entry.
-         */
-        __u32 delta;
-
-        /** Offset in the buffer the relocation entry will be written into */
-        __u64 offset;
-
-        /**
-         * Offset value of the target buffer that the relocation entry was last
-         * written as.
-         *
-         * If the buffer has the same offset as last time, we can skip syncing
-         * and writing the relocation.  This value is written back out by
-         * the execbuffer ioctl when the relocation is written.
-         */
-        __u64 presumed_offset;
-
-        /**
-         * Target memory domains read by this operation.
-         */
-        __u32 read_domains;
-
-        /**
-         * Target memory domains written by this operation.
-         *
-         * Note that only one domain may be written by the whole
-         * execbuffer operation, so that where there are conflicts,
-         * the application will get -EINVAL back.
-         */
-        __u32 write_domain;
-};
-
-/** @{
- * Intel memory domains
- *
- * Most of these just align with the various caches in
- * the system and are used to flush and invalidate as
- * objects end up cached in different domains.
- */
-/** CPU cache */
-#define I915_GEM_DOMAIN_CPU             0x00000001
-/** Render cache, used by 2D and 3D drawing */
-#define I915_GEM_DOMAIN_RENDER          0x00000002
-/** Sampler cache, used by texture engine */
-#define I915_GEM_DOMAIN_SAMPLER         0x00000004
-/** Command queue, used to load batch buffers */
-#define I915_GEM_DOMAIN_COMMAND         0x00000008
-/** Instruction cache, used by shader programs */
-#define I915_GEM_DOMAIN_INSTRUCTION     0x00000010
-/** Vertex address cache */
-#define I915_GEM_DOMAIN_VERTEX          0x00000020
-/** GTT domain - aperture and scanout */
-#define I915_GEM_DOMAIN_GTT             0x00000040
-/** @} */
-
-struct drm_i915_gem_exec_object {
-        /**
-         * User's handle for a buffer to be bound into the GTT for this
-         * operation.
-         */
-        __u32 handle;
-
-        /** Number of relocations to be performed on this buffer */
-        __u32 relocation_count;
-        /**
-         * Pointer to array of struct drm_i915_gem_relocation_entry containing
-         * the relocations to be performed in this buffer.
-         */
-        __u64 relocs_ptr;
-
-        /** Required alignment in graphics aperture */
-        __u64 alignment;
-
-        /**
-         * Returned value of the updated offset of the object, for future
-         * presumed_offset writes.
-         */
-        __u64 offset;
-};
-
-struct drm_i915_gem_execbuffer {
-        /**
-         * List of buffers to be validated with their relocations to be
-         * performend on them.
-         *
-         * This is a pointer to an array of struct drm_i915_gem_validate_entry.
-         *
-         * These buffers must be listed in an order such that all relocations
-         * a buffer is performing refer to buffers that have already appeared
-         * in the validate list.
-         */
-        __u64 buffers_ptr;
-        __u32 buffer_count;
-
-        /** Offset in the batchbuffer to start execution from. */
-        __u32 batch_start_offset;
-        /** Bytes used in batchbuffer from batch_start_offset */
-        __u32 batch_len;
-        __u32 DR1;
-        __u32 DR4;
-        __u32 num_cliprects;
-        /** This is a struct drm_clip_rect *cliprects */
-        __u64 cliprects_ptr;
-};
-
-struct drm_i915_gem_exec_object2 {
-        /**
-         * User's handle for a buffer to be bound into the GTT for this
-         * operation.
-         */
-        __u32 handle;
-
-        /** Number of relocations to be performed on this buffer */
-        __u32 relocation_count;
-        /**
-         * Pointer to array of struct drm_i915_gem_relocation_entry containing
-         * the relocations to be performed in this buffer.
-         */
-        __u64 relocs_ptr;
-
-        /** Required alignment in graphics aperture */
-        __u64 alignment;
-
-        /**
-         * Returned value of the updated offset of the object, for future
-         * presumed_offset writes.
-         */
-        __u64 offset;
-
-#define EXEC_OBJECT_NEEDS_FENCE (1<<0)
-        __u64 flags;
-        __u64 rsvd1;
-        __u64 rsvd2;
-};
-
-struct drm_i915_gem_execbuffer2 {
-        /**
-         * List of gem_exec_object2 structs
-         */
-        __u64 buffers_ptr;
-        __u32 buffer_count;
-
-        /** Offset in the batchbuffer to start execution from. */
-        __u32 batch_start_offset;
-        /** Bytes used in batchbuffer from batch_start_offset */
-        __u32 batch_len;
-        __u32 DR1;
-        __u32 DR4;
-        __u32 num_cliprects;
-        /** This is a struct drm_clip_rect *cliprects */
-        __u64 cliprects_ptr;
-#define I915_EXEC_RING_MASK              (7<<0)
-#define I915_EXEC_DEFAULT                (0<<0)
-#define I915_EXEC_RENDER                 (1<<0)
-#define I915_EXEC_BSD                    (2<<0)
-#define I915_EXEC_BLT                    (3<<0)
-
-/* Used for switching the constants addressing mode on gen4+ RENDER ring.
- * Gen6+ only supports relative addressing to dynamic state (default) and
- * absolute addressing.
- *
- * These flags are ignored for the BSD and BLT rings.
- */
-#define I915_EXEC_CONSTANTS_MASK        (3<<6)
-#define I915_EXEC_CONSTANTS_REL_GENERAL (0<<6) /* default */
-#define I915_EXEC_CONSTANTS_ABSOLUTE    (1<<6)
-#define I915_EXEC_CONSTANTS_REL_SURFACE (2<<6) /* gen4/5 only */
-        __u64 flags;
-        __u64 rsvd1; /* now used for context info */
-        __u64 rsvd2;
-};
-
-/** Resets the SO write offset registers for transform feedback on gen7. */
-#define I915_EXEC_GEN7_SOL_RESET        (1<<8)
-
-#define I915_EXEC_CONTEXT_ID_MASK       (0xffffffff)
-#define i915_execbuffer2_set_context_id(eb2, context) \
-        (eb2).rsvd1 = context & I915_EXEC_CONTEXT_ID_MASK
-#define i915_execbuffer2_get_context_id(eb2) \
-        ((eb2).rsvd1 & I915_EXEC_CONTEXT_ID_MASK)
-
-struct drm_i915_gem_pin {
-        /** Handle of the buffer to be pinned. */
-        __u32 handle;
-        __u32 pad;
-
-        /** alignment required within the aperture */
-        __u64 alignment;
-
-        /** Returned GTT offset of the buffer. */
-        __u64 offset;
-};
-
-struct drm_i915_gem_unpin {
-        /** Handle of the buffer to be unpinned. */
-        __u32 handle;
-        __u32 pad;
-};
-
-struct drm_i915_gem_busy {
-        /** Handle of the buffer to check for busy */
-        __u32 handle;
-
-        /** Return busy status (1 if busy, 0 if idle).
-         * The high word is used to indicate on which rings the object
-         * currently resides:
-         *  16:31 - busy (r or r/w) rings (16 render, 17 bsd, 18 blt, etc)
-         */
-        __u32 busy;
-};
-
-#define I915_CACHING_NONE               0
-#define I915_CACHING_CACHED             1
-
-struct drm_i915_gem_caching {
-        /**
-         * Handle of the buffer to set/get the caching level of. */
-        __u32 handle;
-
-        /**
-         * Cacheing level to apply or return value
-         *
-         * bits0-15 are for generic caching control (i.e. the above defined
-         * values). bits16-31 are reserved for platform-specific variations
-         * (e.g. l3$ caching on gen7). */
-        __u32 caching;
-};
-
-#define I915_TILING_NONE        0
-#define I915_TILING_X           1
-#define I915_TILING_Y           2
-
-#define I915_BIT_6_SWIZZLE_NONE         0
-#define I915_BIT_6_SWIZZLE_9            1
-#define I915_BIT_6_SWIZZLE_9_10         2
-#define I915_BIT_6_SWIZZLE_9_11         3
-#define I915_BIT_6_SWIZZLE_9_10_11      4
-/* Not seen by userland */
-#define I915_BIT_6_SWIZZLE_UNKNOWN      5
-/* Seen by userland. */
-#define I915_BIT_6_SWIZZLE_9_17         6
-#define I915_BIT_6_SWIZZLE_9_10_17      7
-
-struct drm_i915_gem_set_tiling {
-        /** Handle of the buffer to have its tiling state updated */
-        __u32 handle;
-
-        /**
-         * Tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
-         * I915_TILING_Y).
-         *
-         * This value is to be set on request, and will be updated by the
-         * kernel on successful return with the actual chosen tiling layout.
-         *
-         * The tiling mode may be demoted to I915_TILING_NONE when the system
-         * has bit 6 swizzling that can't be managed correctly by GEM.
-         *
-         * Buffer contents become undefined when changing tiling_mode.
-         */
-        __u32 tiling_mode;
-
-        /**
-         * Stride in bytes for the object when in I915_TILING_X or
-         * I915_TILING_Y.
-         */
-        __u32 stride;
-
-        /**
-         * Returned address bit 6 swizzling required for CPU access through
-         * mmap mapping.
-         */
-        __u32 swizzle_mode;
-};
-
-struct drm_i915_gem_get_tiling {
-        /** Handle of the buffer to get tiling state for. */
-        __u32 handle;
-
-        /**
-         * Current tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
-         * I915_TILING_Y).
-         */
-        __u32 tiling_mode;
-
-        /**
-         * Returned address bit 6 swizzling required for CPU access through
-         * mmap mapping.
-         */
-        __u32 swizzle_mode;
-};
-
-struct drm_i915_gem_get_aperture {
-        /** Total size of the aperture used by i915_gem_execbuffer, in bytes */
-        __u64 aper_size;
-
-        /**
-         * Available space in the aperture used by i915_gem_execbuffer, in
-         * bytes
-         */
-        __u64 aper_available_size;
-};
-
-struct drm_i915_get_pipe_from_crtc_id {
-        /** ID of CRTC being requested **/
-        __u32 crtc_id;
-
-        /** pipe of requested CRTC **/
-        __u32 pipe;
-};
-
-#define I915_MADV_WILLNEED 0
-#define I915_MADV_DONTNEED 1
-#define __I915_MADV_PURGED 2 /* internal state */
-
-struct drm_i915_gem_madvise {
-        /** Handle of the buffer to change the backing store advice */
-        __u32 handle;
-
-        /* Advice: either the buffer will be needed again in the near future,
-         *         or wont be and could be discarded under memory pressure.
-         */
-        __u32 madv;
-
-        /** Whether the backing store still exists. */
-        __u32 retained;
-};
-
-/* flags */
-#define I915_OVERLAY_TYPE_MASK          0xff
-#define I915_OVERLAY_YUV_PLANAR         0x01
-#define I915_OVERLAY_YUV_PACKED         0x02
-#define I915_OVERLAY_RGB                0x03
-
-#define I915_OVERLAY_DEPTH_MASK         0xff00
-#define I915_OVERLAY_RGB24              0x1000
-#define I915_OVERLAY_RGB16              0x2000
-#define I915_OVERLAY_RGB15              0x3000
-#define I915_OVERLAY_YUV422             0x0100
-#define I915_OVERLAY_YUV411             0x0200
-#define I915_OVERLAY_YUV420             0x0300
-#define I915_OVERLAY_YUV410             0x0400
-
-#define I915_OVERLAY_SWAP_MASK          0xff0000
-#define I915_OVERLAY_NO_SWAP            0x000000
-#define I915_OVERLAY_UV_SWAP            0x010000
-#define I915_OVERLAY_Y_SWAP             0x020000
-#define I915_OVERLAY_Y_AND_UV_SWAP      0x030000
-
-#define I915_OVERLAY_FLAGS_MASK         0xff000000
-#define I915_OVERLAY_ENABLE             0x01000000
-
-struct drm_intel_overlay_put_image {
-        /* various flags and src format description */
-        __u32 flags;
-        /* source picture description */
-        __u32 bo_handle;
-        /* stride values and offsets are in bytes, buffer relative */
-        __u16 stride_Y; /* stride for packed formats */
-        __u16 stride_UV;
-        __u32 offset_Y; /* offset for packet formats */
-        __u32 offset_U;
-        __u32 offset_V;
-        /* in pixels */
-        __u16 src_width;
-        __u16 src_height;
-        /* to compensate the scaling factors for partially covered surfaces */
-        __u16 src_scan_width;
-        __u16 src_scan_height;
-        /* output crtc description */
-        __u32 crtc_id;
-        __u16 dst_x;
-        __u16 dst_y;
-        __u16 dst_width;
-        __u16 dst_height;
-};
-
-/* flags */
-#define I915_OVERLAY_UPDATE_ATTRS       (1<<0)
-#define I915_OVERLAY_UPDATE_GAMMA       (1<<1)
-struct drm_intel_overlay_attrs {
-        __u32 flags;
-        __u32 color_key;
-        __s32 brightness;
-        __u32 contrast;
-        __u32 saturation;
-        __u32 gamma0;
-        __u32 gamma1;
-        __u32 gamma2;
-        __u32 gamma3;
-        __u32 gamma4;
-        __u32 gamma5;
-};
-
-/*
- * Intel sprite handling
- *
- * Color keying works with a min/mask/max tuple.  Both source and destination
- * color keying is allowed.
- *
- * Source keying:
- * Sprite pixels within the min & max values, masked against the color channels
- * specified in the mask field, will be transparent.  All other pixels will
- * be displayed on top of the primary plane.  For RGB surfaces, only the min
- * and mask fields will be used; ranged compares are not allowed.
- *
- * Destination keying:
- * Primary plane pixels that match the min value, masked against the color
- * channels specified in the mask field, will be replaced by corresponding
- * pixels from the sprite plane.
- *
- * Note that source & destination keying are exclusive; only one can be
- * active on a given plane.
- */
-
-#define I915_SET_COLORKEY_NONE          (1<<0) /* disable color key matching */
-#define I915_SET_COLORKEY_DESTINATION   (1<<1)
-#define I915_SET_COLORKEY_SOURCE        (1<<2)
-struct drm_intel_sprite_colorkey {
-        __u32 plane_id;
-        __u32 min_value;
-        __u32 channel_mask;
-        __u32 max_value;
-        __u32 flags;
-};
-
-struct drm_i915_gem_wait {
-        /** Handle of BO we shall wait on */
-        __u32 bo_handle;
-        __u32 flags;
-        /** Number of nanoseconds to wait, Returns time remaining. */
-        __s64 timeout_ns;
-};
-
-struct drm_i915_gem_context_create {
-        /*  output: id of new context*/
-        __u32 ctx_id;
-        __u32 pad;
-};
-
-struct drm_i915_gem_context_destroy {
-        __u32 ctx_id;
-        __u32 pad;
-};
-
-struct drm_i915_reg_read {
-        __u64 offset;
-        __u64 val; /* Return value */
-};
 #endif                          /* _I915_DRM_H_ */
diff --git a/include/keys/asymmetric-parser.h b/include/keys/asymmetric-parser.h
new file mode 100644
index 000000000000..09b3b4807f5c
--- /dev/null
+++ b/include/keys/asymmetric-parser.h
@@ -0,0 +1,37 @@
+/* Asymmetric public-key cryptography data parser
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_PARSER_H
+#define _KEYS_ASYMMETRIC_PARSER_H
+
+/*
+ * Key data parser.  Called during key instantiation.
+ */
+struct asymmetric_key_parser {
+        struct list_head        link;
+        struct module           *owner;
+        const char              *name;
+
+        /* Attempt to parse a key from the data blob passed to add_key() or
+         * keyctl_instantiate().  Should also generate a proposed description
+         * that the caller can optionally use for the key.
+         *
+         * Return EBADMSG if not recognised.
+         */
+        int (*parse)(struct key_preparsed_payload *prep);
+};
+
+extern int register_asymmetric_key_parser(struct asymmetric_key_parser *);
+extern void unregister_asymmetric_key_parser(struct asymmetric_key_parser *);
+
+#endif /* _KEYS_ASYMMETRIC_PARSER_H */
diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
new file mode 100644
index 000000000000..4b840e822209
--- /dev/null
+++ b/include/keys/asymmetric-subtype.h
@@ -0,0 +1,55 @@
+/* Asymmetric public-key cryptography key subtype
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_SUBTYPE_H
+#define _KEYS_ASYMMETRIC_SUBTYPE_H
+
+#include <linux/seq_file.h>
+#include <keys/asymmetric-type.h>
+
+struct public_key_signature;
+
+/*
+ * Keys of this type declare a subtype that indicates the handlers and
+ * capabilities.
+ */
+struct asymmetric_key_subtype {
+        struct module           *owner;
+        const char              *name;
+        unsigned short          name_len;       /* length of name */
+
+        /* Describe a key of this subtype for /proc/keys */
+        void (*describe)(const struct key *key, struct seq_file *m);
+
+        /* Destroy a key of this subtype */
+        void (*destroy)(void *payload);
+
+        /* Verify the signature on a key of this subtype (optional) */
+        int (*verify_signature)(const struct key *key,
+                                const struct public_key_signature *sig);
+};
+
+/**
+ * asymmetric_key_subtype - Get the subtype from an asymmetric key
+ * @key: The key of interest.
+ *
+ * Retrieves and returns the subtype pointer of the asymmetric key from the
+ * type-specific data attached to the key.
+ */
+static inline
+struct asymmetric_key_subtype *asymmetric_key_subtype(const struct key *key)
+{
+        return key->type_data.p[0];
+}
+
+#endif /* _KEYS_ASYMMETRIC_SUBTYPE_H */
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
new file mode 100644
index 000000000000..7dd473496180
--- /dev/null
+++ b/include/keys/asymmetric-type.h
@@ -0,0 +1,25 @@
+/* Asymmetric Public-key cryptography key type interface
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_TYPE_H
+#define _KEYS_ASYMMETRIC_TYPE_H
+
+#include <linux/key-type.h>
+
+extern struct key_type key_type_asymmetric;
+
+/*
+ * The payload is at the discretion of the subtype.
+ */
+
+#endif /* _KEYS_ASYMMETRIC_TYPE_H */
diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index bc9ec1d7698c..5e452c84f1e6 100644
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -35,8 +35,10 @@ struct user_key_payload {
 extern struct key_type key_type_user;
 extern struct key_type key_type_logon;
 
-extern int user_instantiate(struct key *key, const void *data, size_t datalen);
-extern int user_update(struct key *key, const void *data, size_t datalen);
+struct key_preparsed_payload;
+
+extern int user_instantiate(struct key *key, struct key_preparsed_payload *prep);
+extern int user_update(struct key *key, struct key_preparsed_payload *prep);
 extern int user_match(const struct key *key, const void *criterion);
 extern void user_revoke(struct key *key);
 extern void user_destroy(struct key *key);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index e149e8be9065..7fe2dae251e5 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -1,413 +1,5 @@
-header-y += byteorder/
-header-y += can/
-header-y += caif/
 header-y += dvb/
 header-y += hdlc/
 header-y += hsi/
-header-y += isdn/
-header-y += mmc/
-header-y += nfsd/
 header-y += raid/
-header-y += spi/
-header-y += sunrpc/
-header-y += tc_act/
-header-y += tc_ematch/
-header-y += netfilter/
-header-y += netfilter_arp/
-header-y += netfilter_bridge/
-header-y += netfilter_ipv4/
-header-y += netfilter_ipv6/
 header-y += usb/
-header-y += wimax/
-
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
-                  $(srctree)/include/asm-$(SRCARCH)/a.out.h \
-                  $(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
-header-y += a.out.h
-endif
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
-                  $(srctree)/include/asm-$(SRCARCH)/kvm.h \
-                  $(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
-header-y += kvm.h
-endif
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
-                  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
-                  $(INSTALL_HDR_PATH)/include/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-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
diff --git a/include/linux/a.out.h b/include/linux/a.out.h
index e86dfca44589..220f14338895 100644
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
@@ -1,278 +1,84 @@
 #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__ */
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 */
diff --git a/include/linux/adb.h b/include/linux/adb.h
index 63bca502fa55..cde41300c7ad 100644
--- a/include/linux/adb.h
+++ b/include/linux/adb.h
@@ -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 */
diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h
index b19801f73890..0d991071a9d4 100644
--- a/include/linux/adfs_fs.h
+++ b/include/linux/adfs_fs.h
@@ -1,47 +1,9 @@
 #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
  * the disk size is non-zero!!!
@@ -59,5 +21,3 @@ static inline int adfs_checkbblk(unsigned char *ptr)
         return (result & 0xff) != ptr[511];
 }
 #endif
-
-#endif
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index f6778eceb8f4..c6b61ca97053 100644
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -23,94 +23,12 @@
  * 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/alarmtimer.h b/include/linux/alarmtimer.h
index 96c5c249b086..9069694e70eb 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -21,7 +21,6 @@ enum alarmtimer_restart {
 
 #define ALARMTIMER_STATE_INACTIVE       0x00
 #define ALARMTIMER_STATE_ENQUEUED       0x01
-#define ALARMTIMER_STATE_CALLBACK       0x02
 
 /**
  * struct alarm - Alarm timer structure
@@ -35,6 +34,7 @@ enum alarmtimer_restart {
  */
 struct alarm {
         struct timerqueue_node  node;
+        struct hrtimer          timer;
         enum alarmtimer_restart (*function)(struct alarm *, ktime_t now);
         enum alarmtimer_type    type;
         int                     state;
@@ -43,39 +43,12 @@ struct alarm {
 
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
                 enum alarmtimer_restart (*function)(struct alarm *, ktime_t));
-void alarm_start(struct alarm *alarm, ktime_t start);
+int alarm_start(struct alarm *alarm, ktime_t start);
 int alarm_try_to_cancel(struct alarm *alarm);
 int alarm_cancel(struct alarm *alarm);
 
 u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval);
 
-/*
- * A alarmtimer is active, when it is enqueued into timerqueue or the
- * callback function is running.
- */
-static inline int alarmtimer_active(const struct alarm *timer)
-{
-        return timer->state != ALARMTIMER_STATE_INACTIVE;
-}
-
-/*
- * Helper function to check, whether the timer is on one of the queues
- */
-static inline int alarmtimer_is_queued(struct alarm *timer)
-{
-        return timer->state & ALARMTIMER_STATE_ENQUEUED;
-}
-
-/*
- * Helper function to check, whether the timer is running the callback
- * function
- */
-static inline int alarmtimer_callback_running(struct alarm *timer)
-{
-        return timer->state & ALARMTIMER_STATE_CALLBACK;
-}
-
-
 /* Provide way to access the rtc device being used by alarmtimers */
 struct rtc_device *alarmtimer_get_rtcdev(void);
 
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index 01a6244c9bc9..9c3a87184f48 100644
--- a/include/linux/apm_bios.h
+++ b/include/linux/apm_bios.h
@@ -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)
@@ -15,25 +12,11 @@
  * 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/asn1.h b/include/linux/asn1.h
new file mode 100644
index 000000000000..5c3f4e4b9a23
--- /dev/null
+++ b/include/linux/asn1.h
@@ -0,0 +1,67 @@
+/* ASN.1 BER/DER/CER encoding definitions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_H
+#define _LINUX_ASN1_H
+
+/* Class */
+enum asn1_class {
+        ASN1_UNIV       = 0,    /* Universal */
+        ASN1_APPL       = 1,    /* Application */
+        ASN1_CONT       = 2,    /* Context */
+        ASN1_PRIV       = 3     /* Private */
+};
+#define ASN1_CLASS_BITS 0xc0
+
+
+enum asn1_method {
+        ASN1_PRIM       = 0,    /* Primitive */
+        ASN1_CONS       = 1     /* Constructed */
+};
+#define ASN1_CONS_BIT   0x20
+
+/* Tag */
+enum asn1_tag {
+        ASN1_EOC        = 0,    /* End Of Contents or N/A */
+        ASN1_BOOL       = 1,    /* Boolean */
+        ASN1_INT        = 2,    /* Integer */
+        ASN1_BTS        = 3,    /* Bit String */
+        ASN1_OTS        = 4,    /* Octet String */
+        ASN1_NULL       = 5,    /* Null */
+        ASN1_OID        = 6,    /* Object Identifier  */
+        ASN1_ODE        = 7,    /* Object Description */
+        ASN1_EXT        = 8,    /* External */
+        ASN1_REAL       = 9,    /* Real float */
+        ASN1_ENUM       = 10,   /* Enumerated */
+        ASN1_EPDV       = 11,   /* Embedded PDV */
+        ASN1_UTF8STR    = 12,   /* UTF8 String */
+        ASN1_RELOID     = 13,   /* Relative OID */
+        /* 14 - Reserved */
+        /* 15 - Reserved */
+        ASN1_SEQ        = 16,   /* Sequence and Sequence of */
+        ASN1_SET        = 17,   /* Set and Set of */
+        ASN1_NUMSTR     = 18,   /* Numerical String */
+        ASN1_PRNSTR     = 19,   /* Printable String */
+        ASN1_TEXSTR     = 20,   /* T61 String / Teletext String */
+        ASN1_VIDSTR     = 21,   /* Videotex String */
+        ASN1_IA5STR     = 22,   /* IA5 String */
+        ASN1_UNITIM     = 23,   /* Universal Time */
+        ASN1_GENTIM     = 24,   /* General Time */
+        ASN1_GRASTR     = 25,   /* Graphic String */
+        ASN1_VISSTR     = 26,   /* Visible String */
+        ASN1_GENSTR     = 27,   /* General String */
+        ASN1_UNISTR     = 28,   /* Universal String */
+        ASN1_CHRSTR     = 29,   /* Character String */
+        ASN1_BMPSTR     = 30,   /* BMP String */
+        ASN1_LONG_TAG   = 31    /* Long form tag */
+};
+
+#endif /* _LINUX_ASN1_H */
diff --git a/include/linux/asn1_ber_bytecode.h b/include/linux/asn1_ber_bytecode.h
new file mode 100644
index 000000000000..945d44ae529c
--- /dev/null
+++ b/include/linux/asn1_ber_bytecode.h
@@ -0,0 +1,87 @@
+/* ASN.1 BER/DER/CER parsing state machine internal definitions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_BER_BYTECODE_H
+#define _LINUX_ASN1_BER_BYTECODE_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+#include <linux/asn1.h>
+
+typedef int (*asn1_action_t)(void *context,
+                             size_t hdrlen, /* In case of ANY type */
+                             unsigned char tag, /* In case of ANY type */
+                             const void *value, size_t vlen);
+
+struct asn1_decoder {
+        const unsigned char *machine;
+        size_t machlen;
+        const asn1_action_t *actions;
+};
+
+enum asn1_opcode {
+        /* The tag-matching ops come first and the odd-numbered slots
+         * are for OR_SKIP ops.
+         */
+#define ASN1_OP_MATCH__SKIP               0x01
+#define ASN1_OP_MATCH__ACT                0x02
+#define ASN1_OP_MATCH__JUMP               0x04
+#define ASN1_OP_MATCH__ANY                0x08
+#define ASN1_OP_MATCH__COND               0x10
+
+        ASN1_OP_MATCH                   = 0x00,
+        ASN1_OP_MATCH_OR_SKIP           = 0x01,
+        ASN1_OP_MATCH_ACT               = 0x02,
+        ASN1_OP_MATCH_ACT_OR_SKIP       = 0x03,
+        ASN1_OP_MATCH_JUMP              = 0x04,
+        ASN1_OP_MATCH_JUMP_OR_SKIP      = 0x05,
+        ASN1_OP_MATCH_ANY               = 0x08,
+        ASN1_OP_MATCH_ANY_ACT           = 0x0a,
+        /* Everything before here matches unconditionally */
+
+        ASN1_OP_COND_MATCH_OR_SKIP      = 0x11,
+        ASN1_OP_COND_MATCH_ACT_OR_SKIP  = 0x13,
+        ASN1_OP_COND_MATCH_JUMP_OR_SKIP = 0x15,
+        ASN1_OP_COND_MATCH_ANY          = 0x18,
+        ASN1_OP_COND_MATCH_ANY_ACT      = 0x1a,
+
+        /* Everything before here will want a tag from the data */
+#define ASN1_OP__MATCHES_TAG ASN1_OP_COND_MATCH_ANY_ACT
+
+        /* These are here to help fill up space */
+        ASN1_OP_COND_FAIL               = 0x1b,
+        ASN1_OP_COMPLETE                = 0x1c,
+        ASN1_OP_ACT                     = 0x1d,
+        ASN1_OP_RETURN                  = 0x1e,
+
+        /* The following eight have bit 0 -> SET, 1 -> OF, 2 -> ACT */
+        ASN1_OP_END_SEQ                 = 0x20,
+        ASN1_OP_END_SET                 = 0x21,
+        ASN1_OP_END_SEQ_OF              = 0x22,
+        ASN1_OP_END_SET_OF              = 0x23,
+        ASN1_OP_END_SEQ_ACT             = 0x24,
+        ASN1_OP_END_SET_ACT             = 0x25,
+        ASN1_OP_END_SEQ_OF_ACT          = 0x26,
+        ASN1_OP_END_SET_OF_ACT          = 0x27,
+#define ASN1_OP_END__SET                  0x01
+#define ASN1_OP_END__OF                   0x02
+#define ASN1_OP_END__ACT                  0x04
+
+        ASN1_OP__NR
+};
+
+#define _tag(CLASS, CP, TAG) ((ASN1_##CLASS << 6) | (ASN1_##CP << 5) | ASN1_##TAG)
+#define _tagn(CLASS, CP, TAG) ((ASN1_##CLASS << 6) | (ASN1_##CP << 5) | TAG)
+#define _jump_target(N) (N)
+#define _action(N) (N)
+
+#endif /* _LINUX_ASN1_BER_BYTECODE_H */
diff --git a/include/linux/asn1_decoder.h b/include/linux/asn1_decoder.h
new file mode 100644
index 000000000000..fa2ff5bc0483
--- /dev/null
+++ b/include/linux/asn1_decoder.h
@@ -0,0 +1,24 @@
+/* ASN.1 decoder
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_DECODER_H
+#define _LINUX_ASN1_DECODER_H
+
+#include <linux/asn1.h>
+
+struct asn1_decoder;
+
+extern int asn1_ber_decoder(const struct asn1_decoder *decoder,
+                            void *context,
+                            const unsigned char *data,
+                            size_t datalen);
+
+#endif /* _LINUX_ASN1_DECODER_H */
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index f57c36881c48..73fd8b7e9534 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -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__ */
diff --git a/include/linux/atm.h b/include/linux/atm.h
index d3b292174aeb..30006c435951 100644
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -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_tcp.h b/include/linux/atm_tcp.h
index 375638f8554b..db6b65fc0aec 100644
--- a/include/linux/atm_tcp.h
+++ b/include/linux/atm_tcp.h
@@ -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/atmdev.h b/include/linux/atmdev.h
index 06fd4bbc58f6..22ef21c33d0c 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -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/atomic.h b/include/linux/atomic.h
index 70cfcb2d63c4..5b08a8540ecf 100644
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -86,6 +86,31 @@ static inline int atomic_dec_unless_positive(atomic_t *p)
 }
 #endif
 
+/*
+ * atomic_dec_if_positive - decrement by 1 if old value positive
+ * @v: pointer of type atomic_t
+ *
+ * The function returns the old value of *v minus 1, even if
+ * the atomic variable, v, was not decremented.
+ */
+#ifndef atomic_dec_if_positive
+static inline int atomic_dec_if_positive(atomic_t *v)
+{
+        int c, old, dec;
+        c = atomic_read(v);
+        for (;;) {
+                dec = c - 1;
+                if (unlikely(dec < 0))
+                        break;
+                old = atomic_cmpxchg((v), c, dec);
+                if (likely(old == c))
+                        break;
+                c = old;
+        }
+        return dec;
+}
+#endif
+
 #ifndef CONFIG_ARCH_HAS_ATOMIC_OR
 static inline void atomic_or(int i, atomic_t *v)
 {
diff --git a/include/linux/audit.h b/include/linux/audit.h
index e7c836d961ea..bce729afbcf9 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -20,388 +20,11 @@
  * 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_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;
@@ -452,6 +75,16 @@ struct audit_field {
 extern int __init audit_register_class(int class, unsigned *list);
 extern int audit_classify_syscall(int abi, unsigned syscall);
 extern int audit_classify_arch(int arch);
+
+/* audit_names->type values */
+#define AUDIT_TYPE_UNKNOWN      0       /* we don't know yet */
+#define AUDIT_TYPE_NORMAL       1       /* a "normal" audit record */
+#define AUDIT_TYPE_PARENT       2       /* a parent audit record */
+#define AUDIT_TYPE_CHILD_DELETE 3       /* a child being deleted */
+#define AUDIT_TYPE_CHILD_CREATE 4       /* a child being created */
+
+struct filename;
+
 #ifdef CONFIG_AUDITSYSCALL
 /* These are defined in auditsc.c */
                                 /* Public API */
@@ -461,11 +94,14 @@ extern void __audit_syscall_entry(int arch,
                                   int major, unsigned long a0, unsigned long a1,
                                   unsigned long a2, unsigned long a3);
 extern void __audit_syscall_exit(int ret_success, long ret_value);
-extern void __audit_getname(const char *name);
-extern void audit_putname(const char *name);
-extern void __audit_inode(const char *name, const struct dentry *dentry);
-extern void __audit_inode_child(const struct dentry *dentry,
-                                const struct inode *parent);
+extern struct filename *__audit_reusename(const __user char *uptr);
+extern void __audit_getname(struct filename *name);
+extern void audit_putname(struct filename *name);
+extern void __audit_inode(struct filename *name, const struct dentry *dentry,
+                                unsigned int parent);
+extern void __audit_inode_child(const struct inode *parent,
+                                const struct dentry *dentry,
+                                const unsigned char type);
 extern void __audit_seccomp(unsigned long syscall, long signr, int code);
 extern void __audit_ptrace(struct task_struct *t);
 
@@ -495,19 +131,27 @@ static inline void audit_syscall_exit(void *pt_regs)
                 __audit_syscall_exit(success, return_code);
         }
 }
-static inline void audit_getname(const char *name)
+static inline struct filename *audit_reusename(const __user char *name)
+{
+        if (unlikely(!audit_dummy_context()))
+                return __audit_reusename(name);
+        return NULL;
+}
+static inline void audit_getname(struct filename *name)
 {
         if (unlikely(!audit_dummy_context()))
                 __audit_getname(name);
 }
-static inline void audit_inode(const char *name, const struct dentry *dentry) {
+static inline void audit_inode(struct filename *name, const struct dentry *dentry,
+                                unsigned int parent) {
         if (unlikely(!audit_dummy_context()))
-                __audit_inode(name, dentry);
+                __audit_inode(name, dentry, parent);
 }
-static inline void audit_inode_child(const struct dentry *dentry,
-                                     const struct inode *parent) {
+static inline void audit_inode_child(const struct inode *parent,
+                                     const struct dentry *dentry,
+                                     const unsigned char type) {
         if (unlikely(!audit_dummy_context()))
-                __audit_inode_child(dentry, parent);
+                __audit_inode_child(parent, dentry, type);
 }
 void audit_core_dumps(long signr);
 
@@ -527,9 +171,18 @@ static inline void audit_ptrace(struct task_struct *t)
 extern unsigned int audit_serial(void);
 extern int auditsc_get_stamp(struct audit_context *ctx,
                               struct timespec *t, unsigned int *serial);
-extern int  audit_set_loginuid(kuid_t loginuid);
-#define audit_get_loginuid(t) ((t)->loginuid)
-#define audit_get_sessionid(t) ((t)->sessionid)
+extern int audit_set_loginuid(kuid_t loginuid);
+
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+{
+        return tsk->loginuid;
+}
+
+static inline int audit_get_sessionid(struct task_struct *tsk)
+{
+        return tsk->sessionid;
+}
+
 extern void audit_log_task_context(struct audit_buffer *ab);
 extern void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk);
 extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp);
@@ -626,38 +279,111 @@ static inline void audit_mmap_fd(int fd, int flags)
 extern int audit_n_rules;
 extern int audit_signals;
 #else /* CONFIG_AUDITSYSCALL */
-#define audit_alloc(t) ({ 0; })
-#define audit_free(t) do { ; } while (0)
-#define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0)
-#define audit_syscall_exit(r) do { ; } while (0)
-#define audit_dummy_context() 1
-#define audit_getname(n) do { ; } while (0)
-#define audit_putname(n) do { ; } while (0)
-#define __audit_inode(n,d) do { ; } while (0)
-#define __audit_inode_child(i,p) do { ; } while (0)
-#define audit_inode(n,d) do { (void)(d); } while (0)
-#define audit_inode_child(i,p) do { ; } while (0)
-#define audit_core_dumps(i) do { ; } while (0)
-#define audit_seccomp(i,s,c) do { ; } while (0)
-#define auditsc_get_stamp(c,t,s) (0)
-#define audit_get_loginuid(t) (INVALID_UID)
-#define audit_get_sessionid(t) (-1)
-#define audit_log_task_context(b) do { ; } while (0)
-#define audit_log_task_info(b, t) do { ; } while (0)
-#define audit_ipc_obj(i) ((void)0)
-#define audit_ipc_set_perm(q,u,g,m) ((void)0)
-#define audit_bprm(p) ({ 0; })
-#define audit_socketcall(n,a) ((void)0)
-#define audit_fd_pair(n,a) ((void)0)
-#define audit_sockaddr(len, addr) ({ 0; })
-#define audit_mq_open(o,m,a) ((void)0)
-#define audit_mq_sendrecv(d,l,p,t) ((void)0)
-#define audit_mq_notify(d,n) ((void)0)
-#define audit_mq_getsetattr(d,s) ((void)0)
-#define audit_log_bprm_fcaps(b, ncr, ocr) ({ 0; })
-#define audit_log_capset(pid, ncr, ocr) ((void)0)
-#define audit_mmap_fd(fd, flags) ((void)0)
-#define audit_ptrace(t) ((void)0)
+static inline int audit_alloc(struct task_struct *task)
+{
+        return 0;
+}
+static inline void audit_free(struct task_struct *task)
+{ }
+static inline void audit_syscall_entry(int arch, int major, unsigned long a0,
+                                       unsigned long a1, unsigned long a2,
+                                       unsigned long a3)
+{ }
+static inline void audit_syscall_exit(void *pt_regs)
+{ }
+static inline int audit_dummy_context(void)
+{
+        return 1;
+}
+static inline struct filename *audit_reusename(const __user char *name)
+{
+        return NULL;
+}
+static inline void audit_getname(struct filename *name)
+{ }
+static inline void audit_putname(struct filename *name)
+{ }
+static inline void __audit_inode(struct filename *name,
+                                        const struct dentry *dentry,
+                                        unsigned int parent)
+{ }
+static inline void __audit_inode_child(const struct inode *parent,
+                                        const struct dentry *dentry,
+                                        const unsigned char type)
+{ }
+static inline void audit_inode(struct filename *name,
+                                const struct dentry *dentry,
+                                unsigned int parent)
+{ }
+static inline void audit_inode_child(const struct inode *parent,
+                                     const struct dentry *dentry,
+                                     const unsigned char type)
+{ }
+static inline void audit_core_dumps(long signr)
+{ }
+static inline void __audit_seccomp(unsigned long syscall, long signr, int code)
+{ }
+static inline void audit_seccomp(unsigned long syscall, long signr, int code)
+{ }
+static inline int auditsc_get_stamp(struct audit_context *ctx,
+                              struct timespec *t, unsigned int *serial)
+{
+        return 0;
+}
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+{
+        return INVALID_UID;
+}
+static inline int audit_get_sessionid(struct task_struct *tsk)
+{
+        return -1;
+}
+static inline void audit_log_task_context(struct audit_buffer *ab)
+{ }
+static inline void audit_log_task_info(struct audit_buffer *ab,
+                                       struct task_struct *tsk)
+{ }
+static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{ }
+static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid,
+                                        gid_t gid, umode_t mode)
+{ }
+static inline int audit_bprm(struct linux_binprm *bprm)
+{
+        return 0;
+}
+static inline void audit_socketcall(int nargs, unsigned long *args)
+{ }
+static inline void audit_fd_pair(int fd1, int fd2)
+{ }
+static inline int audit_sockaddr(int len, void *addr)
+{
+        return 0;
+}
+static inline void audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
+{ }
+static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len,
+                                     unsigned int msg_prio,
+                                     const struct timespec *abs_timeout)
+{ }
+static inline void audit_mq_notify(mqd_t mqdes,
+                                   const struct sigevent *notification)
+{ }
+static inline void audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
+{ }
+static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
+                                       const struct cred *new,
+                                       const struct cred *old)
+{
+        return 0;
+}
+static inline void audit_log_capset(pid_t pid, const struct cred *new,
+                                   const struct cred *old)
+{ }
+static inline void audit_mmap_fd(int fd, int flags)
+{ }
+static inline void audit_ptrace(struct task_struct *t)
+{ }
 #define audit_n_rules 0
 #define audit_signals 0
 #endif /* CONFIG_AUDITSYSCALL */
@@ -681,7 +407,6 @@ extern void		    audit_log_n_hex(struct audit_buffer *ab,
 extern void                 audit_log_n_string(struct audit_buffer *ab,
                                                const char *buf,
                                                size_t n);
-#define audit_log_string(a,b) audit_log_n_string(a, b, strlen(b));
 extern void                 audit_log_n_untrustedstring(struct audit_buffer *ab,
                                                         const char *string,
                                                         size_t n);
@@ -698,7 +423,8 @@ extern void		    audit_log_lost(const char *message);
 #ifdef CONFIG_SECURITY
 extern void                 audit_log_secctx(struct audit_buffer *ab, u32 secid);
 #else
-#define audit_log_secctx(b,s) do { ; } while (0)
+static inline void          audit_log_secctx(struct audit_buffer *ab, u32 secid)
+{ }
 #endif
 
 extern int                  audit_update_lsm_rules(void);
@@ -710,22 +436,49 @@ extern int  audit_receive_filter(int type, int pid, int seq,
                                 void *data, size_t datasz, kuid_t loginuid,
                                 u32 sessionid, u32 sid);
 extern int audit_enabled;
-#else
-#define audit_log(c,g,t,f,...) do { ; } while (0)
-#define audit_log_start(c,g,t) ({ NULL; })
-#define audit_log_vformat(b,f,a) do { ; } while (0)
-#define audit_log_format(b,f,...) do { ; } while (0)
-#define audit_log_end(b) do { ; } while (0)
-#define audit_log_n_hex(a,b,l) do { ; } while (0)
-#define audit_log_n_string(a,c,l) do { ; } while (0)
-#define audit_log_string(a,c) do { ; } while (0)
-#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
-#define audit_log_untrustedstring(a,s) do { ; } while (0)
-#define audit_log_d_path(b, p, d) do { ; } while (0)
-#define audit_log_key(b, k) do { ; } while (0)
-#define audit_log_link_denied(o, l) do { ; } while (0)
-#define audit_log_secctx(b,s) do { ; } while (0)
+#else /* CONFIG_AUDIT */
+static inline __printf(4, 5)
+void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
+               const char *fmt, ...)
+{ }
+static inline struct audit_buffer *audit_log_start(struct audit_context *ctx,
+                                                   gfp_t gfp_mask, int type)
+{
+        return NULL;
+}
+static inline __printf(2, 3)
+void audit_log_format(struct audit_buffer *ab, const char *fmt, ...)
+{ }
+static inline void audit_log_end(struct audit_buffer *ab)
+{ }
+static inline void audit_log_n_hex(struct audit_buffer *ab,
+                                   const unsigned char *buf, size_t len)
+{ }
+static inline void audit_log_n_string(struct audit_buffer *ab,
+                                      const char *buf, size_t n)
+{ }
+static inline void  audit_log_n_untrustedstring(struct audit_buffer *ab,
+                                                const char *string, size_t n)
+{ }
+static inline void audit_log_untrustedstring(struct audit_buffer *ab,
+                                             const char *string)
+{ }
+static inline void audit_log_d_path(struct audit_buffer *ab,
+                                    const char *prefix,
+                                    const struct path *path)
+{ }
+static inline void audit_log_key(struct audit_buffer *ab, char *key)
+{ }
+static inline void audit_log_link_denied(const char *string,
+                                         const struct path *link)
+{ }
+static inline void audit_log_secctx(struct audit_buffer *ab, u32 secid)
+{ }
 #define audit_enabled 0
-#endif
-#endif
+#endif /* CONFIG_AUDIT */
+static inline void audit_log_string(struct audit_buffer *ab, const char *buf)
+{
+        audit_log_n_string(ab, buf, strlen(buf));
+}
+
 #endif
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
index da64e15004b6..fcd704d354c4 100644
--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -10,77 +10,11 @@
  *
  * ----------------------------------------------------------------------- */
 
-
 #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/auxvec.h b/include/linux/auxvec.h
index f3b5d4e3a2ac..669fef5c745a 100644
--- a/include/linux/auxvec.h
+++ b/include/linux/auxvec.h
@@ -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/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 6ba45d2b99db..1cf1749440ac 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -522,6 +522,8 @@ struct bcma_sflash {
         u32 blocksize;
         u16 numblocks;
         u32 size;
+
+        struct mtd_info *mtd;
 };
 #endif
 
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 366422bc1633..cfcc6bfcaec0 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -1,24 +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
 
@@ -72,7 +58,7 @@ struct linux_binprm {
 
 /* Function parameter for binfmt->coredump */
 struct coredump_params {
-        long signr;
+        siginfo_t *siginfo;
         struct pt_regs *regs;
         struct file *file;
         unsigned long limit;
@@ -132,9 +118,11 @@ extern int copy_strings_kernel(int argc, const char *const *argv,
                                struct linux_binprm *bprm);
 extern int prepare_bprm_creds(struct linux_binprm *bprm);
 extern void install_exec_creds(struct linux_binprm *bprm);
-extern void do_coredump(long signr, int exit_code, struct pt_regs *regs);
 extern void set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
 
-#endif /* __KERNEL__ */
+#ifdef __ARCH_WANT_KERNEL_EXECVE
+extern void ret_from_kernel_execve(struct pt_regs *normal) __noreturn;
+#endif
+
 #endif /* _LINUX_BINFMTS_H */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 26435890dc87..820e7aaad4fd 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -212,20 +212,41 @@ extern void bio_pair_release(struct bio_pair *dbio);
 extern struct bio_set *bioset_create(unsigned int, unsigned int);
 extern void bioset_free(struct bio_set *);
 
-extern struct bio *bio_alloc(gfp_t, unsigned int);
-extern struct bio *bio_kmalloc(gfp_t, unsigned int);
 extern struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);
 extern void bio_put(struct bio *);
-extern void bio_free(struct bio *, struct bio_set *);
+
+extern void __bio_clone(struct bio *, struct bio *);
+extern struct bio *bio_clone_bioset(struct bio *, gfp_t, struct bio_set *bs);
+
+extern struct bio_set *fs_bio_set;
+
+static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs)
+{
+        return bio_alloc_bioset(gfp_mask, nr_iovecs, fs_bio_set);
+}
+
+static inline struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask)
+{
+        return bio_clone_bioset(bio, gfp_mask, fs_bio_set);
+}
+
+static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned int nr_iovecs)
+{
+        return bio_alloc_bioset(gfp_mask, nr_iovecs, NULL);
+}
+
+static inline struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask)
+{
+        return bio_clone_bioset(bio, gfp_mask, NULL);
+
+}
 
 extern void bio_endio(struct bio *, int);
 struct request_queue;
 extern int bio_phys_segments(struct request_queue *, struct bio *);
 
-extern void __bio_clone(struct bio *, struct bio *);
-extern struct bio *bio_clone(struct bio *, gfp_t);
-
 extern void bio_init(struct bio *);
+extern void bio_reset(struct bio *);
 
 extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int);
 extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *,
@@ -304,8 +325,6 @@ struct biovec_slab {
         struct kmem_cache *slab;
 };
 
-extern struct bio_set *fs_bio_set;
-
 /*
  * a small number of entries is fine, not going to be performance critical.
  * basically we just need to survive
@@ -367,9 +386,31 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
 /*
  * Check whether this bio carries any data or not. A NULL bio is allowed.
  */
-static inline int bio_has_data(struct bio *bio)
+static inline bool bio_has_data(struct bio *bio)
 {
-        return bio && bio->bi_io_vec != NULL;
+        if (bio && bio->bi_vcnt)
+                return true;
+
+        return false;
+}
+
+static inline bool bio_is_rw(struct bio *bio)
+{
+        if (!bio_has_data(bio))
+                return false;
+
+        if (bio->bi_rw & REQ_WRITE_SAME)
+                return false;
+
+        return true;
+}
+
+static inline bool bio_mergeable(struct bio *bio)
+{
+        if (bio->bi_rw & REQ_NOMERGE_FLAGS)
+                return false;
+
+        return true;
 }
 
 /*
@@ -505,9 +546,8 @@ static inline struct bio *bio_list_get(struct bio_list *bl)
 
 #define bio_integrity(bio) (bio->bi_integrity != NULL)
 
-extern struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *, gfp_t, unsigned int, struct bio_set *);
 extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);
-extern void bio_integrity_free(struct bio *, struct bio_set *);
+extern void bio_integrity_free(struct bio *);
 extern int bio_integrity_add_page(struct bio *, struct page *, unsigned int, unsigned int);
 extern int bio_integrity_enabled(struct bio *bio);
 extern int bio_integrity_set_tag(struct bio *, void *, unsigned int);
@@ -517,7 +557,7 @@ extern void bio_integrity_endio(struct bio *, int);
 extern void bio_integrity_advance(struct bio *, unsigned int);
 extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int);
 extern void bio_integrity_split(struct bio *, struct bio_pair *, int);
-extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t, struct bio_set *);
+extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t);
 extern int bioset_integrity_create(struct bio_set *, int);
 extern void bioset_integrity_free(struct bio_set *);
 extern void bio_integrity_init(void);
@@ -549,13 +589,13 @@ static inline int bio_integrity_prep(struct bio *bio)
         return 0;
 }
 
-static inline void bio_integrity_free(struct bio *bio, struct bio_set *bs)
+static inline void bio_integrity_free(struct bio *bio)
 {
         return;
 }
 
 static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
-                                      gfp_t gfp_mask, struct bio_set *bs)
+                                      gfp_t gfp_mask)
 {
         return 0;
 }
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 7b7ac9ccec7a..cdf11191e645 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -59,12 +59,6 @@ struct bio {
         unsigned int            bi_seg_front_size;
         unsigned int            bi_seg_back_size;
 
-        unsigned int            bi_max_vecs;    /* max bvl_vecs we can hold */
-
-        atomic_t                bi_cnt;         /* pin count */
-
-        struct bio_vec          *bi_io_vec;     /* the actual vec list */
-
         bio_end_io_t            *bi_end_io;
 
         void                    *bi_private;
@@ -80,7 +74,17 @@ struct bio {
         struct bio_integrity_payload *bi_integrity;  /* data integrity */
 #endif
 
-        bio_destructor_t        *bi_destructor; /* destructor */
+        /*
+         * Everything starting with bi_max_vecs will be preserved by bio_reset()
+         */
+
+        unsigned int            bi_max_vecs;    /* max bvl_vecs we can hold */
+
+        atomic_t                bi_cnt;         /* pin count */
+
+        struct bio_vec          *bi_io_vec;     /* the actual vec list */
+
+        struct bio_set          *bi_pool;
 
         /*
          * We can inline a number of vecs at the end of the bio, to avoid
@@ -90,6 +94,8 @@ struct bio {
         struct bio_vec          bi_inline_vecs[0];
 };
 
+#define BIO_RESET_BYTES         offsetof(struct bio, bi_max_vecs)
+
 /*
  * bio flags
  */
@@ -105,6 +111,13 @@ struct bio {
 #define BIO_FS_INTEGRITY 9      /* fs owns integrity data, not block layer */
 #define BIO_QUIET       10      /* Make BIO Quiet */
 #define BIO_MAPPED_INTEGRITY 11/* integrity metadata has been remapped */
+
+/*
+ * Flags starting here get preserved by bio_reset() - this includes
+ * BIO_POOL_IDX()
+ */
+#define BIO_RESET_BITS  12
+
 #define bio_flagged(bio, flag)  ((bio)->bi_flags & (1 << (flag)))
 
 /*
@@ -134,6 +147,7 @@ enum rq_flag_bits {
         __REQ_PRIO,             /* boost priority in cfq */
         __REQ_DISCARD,          /* request to discard sectors */
         __REQ_SECURE,           /* secure discard (used with __REQ_DISCARD) */
+        __REQ_WRITE_SAME,       /* write same block many times */
 
         __REQ_NOIDLE,           /* don't anticipate more IO after this one */
         __REQ_FUA,              /* forced unit access */
@@ -172,15 +186,21 @@ enum rq_flag_bits {
 #define REQ_META                (1 << __REQ_META)
 #define REQ_PRIO                (1 << __REQ_PRIO)
 #define REQ_DISCARD             (1 << __REQ_DISCARD)
+#define REQ_WRITE_SAME          (1 << __REQ_WRITE_SAME)
 #define REQ_NOIDLE              (1 << __REQ_NOIDLE)
 
 #define REQ_FAILFAST_MASK \
         (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)
 #define REQ_COMMON_MASK \
         (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \
-         REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE)
+         REQ_DISCARD | REQ_WRITE_SAME | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | \
+         REQ_SECURE)
 #define REQ_CLONE_MASK          REQ_COMMON_MASK
 
+/* This mask is used for both bio and request merge checking */
+#define REQ_NOMERGE_FLAGS \
+        (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA)
+
 #define REQ_RAHEAD              (1 << __REQ_RAHEAD)
 #define REQ_THROTTLED           (1 << __REQ_THROTTLED)
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4a2ab7c85393..1756001210d2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -270,6 +270,7 @@ struct queue_limits {
         unsigned int            io_min;
         unsigned int            io_opt;
         unsigned int            max_discard_sectors;
+        unsigned int            max_write_same_sectors;
         unsigned int            discard_granularity;
         unsigned int            discard_alignment;
 
@@ -540,8 +541,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
 
 #define blk_account_rq(rq) \
         (((rq)->cmd_flags & REQ_STARTED) && \
-         ((rq)->cmd_type == REQ_TYPE_FS || \
-          ((rq)->cmd_flags & REQ_DISCARD)))
+         ((rq)->cmd_type == REQ_TYPE_FS))
 
 #define blk_pm_request(rq)      \
         ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND || \
@@ -595,17 +595,39 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync)
         rl->flags &= ~flag;
 }
 
+static inline bool rq_mergeable(struct request *rq)
+{
+        if (rq->cmd_type != REQ_TYPE_FS)
+                return false;
 
-/*
- * mergeable request must not have _NOMERGE or _BARRIER bit set, nor may
- * it already be started by driver.
- */
-#define RQ_NOMERGE_FLAGS        \
-        (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_DISCARD)
-#define rq_mergeable(rq)        \
-        (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \
-         (((rq)->cmd_flags & REQ_DISCARD) || \
-          (rq)->cmd_type == REQ_TYPE_FS))
+        if (rq->cmd_flags & REQ_NOMERGE_FLAGS)
+                return false;
+
+        return true;
+}
+
+static inline bool blk_check_merge_flags(unsigned int flags1,
+                                         unsigned int flags2)
+{
+        if ((flags1 & REQ_DISCARD) != (flags2 & REQ_DISCARD))
+                return false;
+
+        if ((flags1 & REQ_SECURE) != (flags2 & REQ_SECURE))
+                return false;
+
+        if ((flags1 & REQ_WRITE_SAME) != (flags2 & REQ_WRITE_SAME))
+                return false;
+
+        return true;
+}
+
+static inline bool blk_write_same_mergeable(struct bio *a, struct bio *b)
+{
+        if (bio_data(a) == bio_data(b))
+                return true;
+
+        return false;
+}
 
 /*
  * q->prep_rq_fn return values
@@ -802,6 +824,28 @@ static inline unsigned int blk_rq_cur_sectors(const struct request *rq)
         return blk_rq_cur_bytes(rq) >> 9;
 }
 
+static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q,
+                                                     unsigned int cmd_flags)
+{
+        if (unlikely(cmd_flags & REQ_DISCARD))
+                return q->limits.max_discard_sectors;
+
+        if (unlikely(cmd_flags & REQ_WRITE_SAME))
+                return q->limits.max_write_same_sectors;
+
+        return q->limits.max_sectors;
+}
+
+static inline unsigned int blk_rq_get_max_sectors(struct request *rq)
+{
+        struct request_queue *q = rq->q;
+
+        if (unlikely(rq->cmd_type == REQ_TYPE_BLOCK_PC))
+                return q->limits.max_hw_sectors;
+
+        return blk_queue_get_max_sectors(q, rq->cmd_flags);
+}
+
 /*
  * Request issue related functions.
  */
@@ -857,6 +901,8 @@ extern void blk_queue_max_segments(struct request_queue *, unsigned short);
 extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);
 extern void blk_queue_max_discard_sectors(struct request_queue *q,
                 unsigned int max_discard_sectors);
+extern void blk_queue_max_write_same_sectors(struct request_queue *q,
+                unsigned int max_write_same_sectors);
 extern void blk_queue_logical_block_size(struct request_queue *, unsigned short);
 extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);
 extern void blk_queue_alignment_offset(struct request_queue *q,
@@ -987,6 +1033,8 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,
 extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *);
 extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
+extern int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,
+                sector_t nr_sects, gfp_t gfp_mask, struct page *page);
 extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
                         sector_t nr_sects, gfp_t gfp_mask);
 static inline int sb_issue_discard(struct super_block *sb, sector_t block,
@@ -1164,6 +1212,16 @@ static inline unsigned int bdev_discard_zeroes_data(struct block_device *bdev)
         return queue_discard_zeroes_data(bdev_get_queue(bdev));
 }
 
+static inline unsigned int bdev_write_same(struct block_device *bdev)
+{
+        struct request_queue *q = bdev_get_queue(bdev);
+
+        if (q)
+                return q->limits.max_write_same_sectors;
+
+        return 0;
+}
+
 static inline int queue_dma_alignment(struct request_queue *q)
 {
         return q ? q->dma_alignment : 511;
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
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index ecb4730d0868..7173f6e9d2dd 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -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
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
deleted file mode 100644
index 5896e344ba6c..000000000000
--- a/include/linux/byteorder/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-header-y += big_endian.h
-header-y += little_endian.h
diff --git a/include/linux/byteorder/big_endian.h b/include/linux/byteorder/big_endian.h
index 3c80fd7e8b56..392041475c72 100644
--- a/include/linux/byteorder/big_endian.h
+++ b/include/linux/byteorder/big_endian.h
@@ -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 */
diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
index 83195fb82962..08057377aa23 100644
--- a/include/linux/byteorder/little_endian.h
+++ b/include/linux/byteorder/little_endian.h
@@ -1,108 +1,7 @@
 #ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H
 #define _LINUX_BYTEORDER_LITTLE_ENDIAN_H
 
-#ifndef __LITTLE_ENDIAN
-#define __LITTLE_ENDIAN 1234
-#endif
-#ifndef __LITTLE_ENDIAN_BITFIELD
-#define __LITTLE_ENDIAN_BITFIELD
-#endif
+#include <uapi/linux/byteorder/little_endian.h>
 
-#include <linux/types.h>
-#include <linux/swab.h>
-
-#define __constant_htonl(x) ((__force __be32)___constant_swab32((x)))
-#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x))
-#define __constant_htons(x) ((__force __be16)___constant_swab16((x)))
-#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x))
-#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x))
-#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x))
-#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x))
-#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x)))
-#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x)))
-#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x)))
-#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__force __le64)(__u64)(x))
-#define __le64_to_cpu(x) ((__force __u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
-#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__force __le16)(__u16)(x))
-#define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__force __be64)__swab64((x)))
-#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__force __be32)__swab32((x)))
-#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
-#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
-
-static inline __le64 __cpu_to_le64p(const __u64 *p)
-{
-        return (__force __le64)*p;
-}
-static inline __u64 __le64_to_cpup(const __le64 *p)
-{
-        return (__force __u64)*p;
-}
-static inline __le32 __cpu_to_le32p(const __u32 *p)
-{
-        return (__force __le32)*p;
-}
-static inline __u32 __le32_to_cpup(const __le32 *p)
-{
-        return (__force __u32)*p;
-}
-static inline __le16 __cpu_to_le16p(const __u16 *p)
-{
-        return (__force __le16)*p;
-}
-static inline __u16 __le16_to_cpup(const __le16 *p)
-{
-        return (__force __u16)*p;
-}
-static inline __be64 __cpu_to_be64p(const __u64 *p)
-{
-        return (__force __be64)__swab64p(p);
-}
-static inline __u64 __be64_to_cpup(const __be64 *p)
-{
-        return __swab64p((__u64 *)p);
-}
-static inline __be32 __cpu_to_be32p(const __u32 *p)
-{
-        return (__force __be32)__swab32p(p);
-}
-static inline __u32 __be32_to_cpup(const __be32 *p)
-{
-        return __swab32p((__u32 *)p);
-}
-static inline __be16 __cpu_to_be16p(const __u16 *p)
-{
-        return (__force __be16)__swab16p(p);
-}
-static inline __u16 __be16_to_cpup(const __be16 *p)
-{
-        return __swab16p((__u16 *)p);
-}
-#define __cpu_to_le64s(x) do { (void)(x); } while (0)
-#define __le64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le32s(x) do { (void)(x); } while (0)
-#define __le32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le16s(x) do { (void)(x); } while (0)
-#define __le16_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be64s(x) __swab64s((x))
-#define __be64_to_cpus(x) __swab64s((x))
-#define __cpu_to_be32s(x) __swab32s((x))
-#define __be32_to_cpus(x) __swab32s((x))
-#define __cpu_to_be16s(x) __swab16s((x))
-#define __be16_to_cpus(x) __swab16s((x))
-
-#ifdef __KERNEL__
 #include <linux/byteorder/generic.h>
-#endif
-
 #endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
diff --git a/include/linux/caif/Kbuild b/include/linux/caif/Kbuild
deleted file mode 100644
index a9cf250689dc..000000000000
--- a/include/linux/caif/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-header-y += caif_socket.h
-header-y += if_caif.h
diff --git a/include/linux/can/Kbuild b/include/linux/can/Kbuild
deleted file mode 100644
index c62b7f1728f9..000000000000
--- a/include/linux/can/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-header-y += raw.h
-header-y += bcm.h
-header-y += gw.h
-header-y += error.h
-header-y += netlink.h
diff --git a/include/linux/capability.h b/include/linux/capability.h
index d10b7ed595b1..98503b792369 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -9,82 +9,11 @@
  *
  * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
  */
-
 #ifndef _LINUX_CAPABILITY_H
 #define _LINUX_CAPABILITY_H
 
-#include <linux/types.h>
-
-struct task_struct;
-
-/* User-level do most of the mapping between kernel and user
-   capabilities based on the version tag given by the kernel. The
-   kernel might be somewhat backwards compatible, but don't bet on
-   it. */
-
-/* Note, cap_t, is defined by POSIX (draft) to be an "opaque" pointer to
-   a set of three capability sets.  The transposition of 3*the
-   following structure to such a composite is better handled in a user
-   library since the draft standard requires the use of malloc/free
-   etc.. */
-
-#define _LINUX_CAPABILITY_VERSION_1  0x19980330
-#define _LINUX_CAPABILITY_U32S_1     1
-
-#define _LINUX_CAPABILITY_VERSION_2  0x20071026  /* deprecated - use v3 */
-#define _LINUX_CAPABILITY_U32S_2     2
-
-#define _LINUX_CAPABILITY_VERSION_3  0x20080522
-#define _LINUX_CAPABILITY_U32S_3     2
-
-typedef struct __user_cap_header_struct {
-        __u32 version;
-        int pid;
-} __user *cap_user_header_t;
-
-typedef struct __user_cap_data_struct {
-        __u32 effective;
-        __u32 permitted;
-        __u32 inheritable;
-} __user *cap_user_data_t;
-
-
-#define VFS_CAP_REVISION_MASK   0xFF000000
-#define VFS_CAP_REVISION_SHIFT  24
-#define VFS_CAP_FLAGS_MASK      ~VFS_CAP_REVISION_MASK
-#define VFS_CAP_FLAGS_EFFECTIVE 0x000001
-
-#define VFS_CAP_REVISION_1      0x01000000
-#define VFS_CAP_U32_1           1
-#define XATTR_CAPS_SZ_1         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_1))
-
-#define VFS_CAP_REVISION_2      0x02000000
-#define VFS_CAP_U32_2           2
-#define XATTR_CAPS_SZ_2         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_2))
+#include <uapi/linux/capability.h>
 
-#define XATTR_CAPS_SZ           XATTR_CAPS_SZ_2
-#define VFS_CAP_U32             VFS_CAP_U32_2
-#define VFS_CAP_REVISION        VFS_CAP_REVISION_2
-
-struct vfs_cap_data {
-        __le32 magic_etc;            /* Little endian */
-        struct {
-                __le32 permitted;    /* Little endian */
-                __le32 inheritable;  /* Little endian */
-        } data[VFS_CAP_U32];
-};
-
-#ifndef __KERNEL__
-
-/*
- * Backwardly compatible definition for source code - trapped in a
- * 32-bit world. If you find you need this, please consider using
- * libcap to untrap yourself...
- */
-#define _LINUX_CAPABILITY_VERSION  _LINUX_CAPABILITY_VERSION_1
-#define _LINUX_CAPABILITY_U32S     _LINUX_CAPABILITY_U32S_1
-
-#else
 
 #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
 #define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
@@ -105,277 +34,6 @@ struct cpu_vfs_cap_data {
 #define _USER_CAP_HEADER_SIZE  (sizeof(struct __user_cap_header_struct))
 #define _KERNEL_CAP_T_SIZE     (sizeof(kernel_cap_t))
 
-#endif
-
-
-/**
- ** POSIX-draft defined capabilities.
- **/
-
-/* In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
-   overrides the restriction of changing file ownership and group
-   ownership. */
-
-#define CAP_CHOWN            0
-
-/* Override all DAC access, including ACL execute access if
-   [_POSIX_ACL] is defined. Excluding DAC access covered by
-   CAP_LINUX_IMMUTABLE. */
-
-#define CAP_DAC_OVERRIDE     1
-
-/* Overrides all DAC restrictions regarding read and search on files
-   and directories, including ACL restrictions if [_POSIX_ACL] is
-   defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE. */
-
-#define CAP_DAC_READ_SEARCH  2
-
-/* Overrides all restrictions about allowed operations on files, where
-   file owner ID must be equal to the user ID, except where CAP_FSETID
-   is applicable. It doesn't override MAC and DAC restrictions. */
-
-#define CAP_FOWNER           3
-
-/* Overrides the following restrictions that the effective user ID
-   shall match the file owner ID when setting the S_ISUID and S_ISGID
-   bits on that file; that the effective group ID (or one of the
-   supplementary group IDs) shall match the file owner ID when setting
-   the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
-   cleared on successful return from chown(2) (not implemented). */
-
-#define CAP_FSETID           4
-
-/* Overrides the restriction that the real or effective user ID of a
-   process sending a signal must match the real or effective user ID
-   of the process receiving the signal. */
-
-#define CAP_KILL             5
-
-/* Allows setgid(2) manipulation */
-/* Allows setgroups(2) */
-/* Allows forged gids on socket credentials passing. */
-
-#define CAP_SETGID           6
-
-/* Allows set*uid(2) manipulation (including fsuid). */
-/* Allows forged pids on socket credentials passing. */
-
-#define CAP_SETUID           7
-
-
-/**
- ** Linux-specific capabilities
- **/
-
-/* Without VFS support for capabilities:
- *   Transfer any capability in your permitted set to any pid,
- *   remove any capability in your permitted set from any pid
- * With VFS support for capabilities (neither of above, but)
- *   Add any capability from current's capability bounding set
- *       to the current process' inheritable set
- *   Allow taking bits out of capability bounding set
- *   Allow modification of the securebits for a process
- */
-
-#define CAP_SETPCAP          8
-
-/* Allow modification of S_IMMUTABLE and S_APPEND file attributes */
-
-#define CAP_LINUX_IMMUTABLE  9
-
-/* Allows binding to TCP/UDP sockets below 1024 */
-/* Allows binding to ATM VCIs below 32 */
-
-#define CAP_NET_BIND_SERVICE 10
-
-/* Allow broadcasting, listen to multicast */
-
-#define CAP_NET_BROADCAST    11
-
-/* Allow interface configuration */
-/* Allow administration of IP firewall, masquerading and accounting */
-/* Allow setting debug option on sockets */
-/* Allow modification of routing tables */
-/* Allow setting arbitrary process / process group ownership on
-   sockets */
-/* Allow binding to any address for transparent proxying (also via NET_RAW) */
-/* Allow setting TOS (type of service) */
-/* Allow setting promiscuous mode */
-/* Allow clearing driver statistics */
-/* Allow multicasting */
-/* Allow read/write of device-specific registers */
-/* Allow activation of ATM control sockets */
-
-#define CAP_NET_ADMIN        12
-
-/* Allow use of RAW sockets */
-/* Allow use of PACKET sockets */
-/* Allow binding to any address for transparent proxying (also via NET_ADMIN) */
-
-#define CAP_NET_RAW          13
-
-/* Allow locking of shared memory segments */
-/* Allow mlock and mlockall (which doesn't really have anything to do
-   with IPC) */
-
-#define CAP_IPC_LOCK         14
-
-/* Override IPC ownership checks */
-
-#define CAP_IPC_OWNER        15
-
-/* Insert and remove kernel modules - modify kernel without limit */
-#define CAP_SYS_MODULE       16
-
-/* Allow ioperm/iopl access */
-/* Allow sending USB messages to any device via /proc/bus/usb */
-
-#define CAP_SYS_RAWIO        17
-
-/* Allow use of chroot() */
-
-#define CAP_SYS_CHROOT       18
-
-/* Allow ptrace() of any process */
-
-#define CAP_SYS_PTRACE       19
-
-/* Allow configuration of process accounting */
-
-#define CAP_SYS_PACCT        20
-
-/* Allow configuration of the secure attention key */
-/* Allow administration of the random device */
-/* Allow examination and configuration of disk quotas */
-/* Allow setting the domainname */
-/* Allow setting the hostname */
-/* Allow calling bdflush() */
-/* Allow mount() and umount(), setting up new smb connection */
-/* Allow some autofs root ioctls */
-/* Allow nfsservctl */
-/* Allow VM86_REQUEST_IRQ */
-/* Allow to read/write pci config on alpha */
-/* Allow irix_prctl on mips (setstacksize) */
-/* Allow flushing all cache on m68k (sys_cacheflush) */
-/* Allow removing semaphores */
-/* Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
-   and shared memory */
-/* Allow locking/unlocking of shared memory segment */
-/* Allow turning swap on/off */
-/* Allow forged pids on socket credentials passing */
-/* Allow setting readahead and flushing buffers on block devices */
-/* Allow setting geometry in floppy driver */
-/* Allow turning DMA on/off in xd driver */
-/* Allow administration of md devices (mostly the above, but some
-   extra ioctls) */
-/* Allow tuning the ide driver */
-/* Allow access to the nvram device */
-/* Allow administration of apm_bios, serial and bttv (TV) device */
-/* Allow manufacturer commands in isdn CAPI support driver */
-/* Allow reading non-standardized portions of pci configuration space */
-/* Allow DDI debug ioctl on sbpcd driver */
-/* Allow setting up serial ports */
-/* Allow sending raw qic-117 commands */
-/* Allow enabling/disabling tagged queuing on SCSI controllers and sending
-   arbitrary SCSI commands */
-/* Allow setting encryption key on loopback filesystem */
-/* Allow setting zone reclaim policy */
-
-#define CAP_SYS_ADMIN        21
-
-/* Allow use of reboot() */
-
-#define CAP_SYS_BOOT         22
-
-/* Allow raising priority and setting priority on other (different
-   UID) processes */
-/* Allow use of FIFO and round-robin (realtime) scheduling on own
-   processes and setting the scheduling algorithm used by another
-   process. */
-/* Allow setting cpu affinity on other processes */
-
-#define CAP_SYS_NICE         23
-
-/* Override resource limits. Set resource limits. */
-/* Override quota limits. */
-/* Override reserved space on ext2 filesystem */
-/* Modify data journaling mode on ext3 filesystem (uses journaling
-   resources) */
-/* NOTE: ext2 honors fsuid when checking for resource overrides, so
-   you can override using fsuid too */
-/* Override size restrictions on IPC message queues */
-/* Allow more than 64hz interrupts from the real-time clock */
-/* Override max number of consoles on console allocation */
-/* Override max number of keymaps */
-
-#define CAP_SYS_RESOURCE     24
-
-/* Allow manipulation of system clock */
-/* Allow irix_stime on mips */
-/* Allow setting the real-time clock */
-
-#define CAP_SYS_TIME         25
-
-/* Allow configuration of tty devices */
-/* Allow vhangup() of tty */
-
-#define CAP_SYS_TTY_CONFIG   26
-
-/* Allow the privileged aspects of mknod() */
-
-#define CAP_MKNOD            27
-
-/* Allow taking of leases on files */
-
-#define CAP_LEASE            28
-
-#define CAP_AUDIT_WRITE      29
-
-#define CAP_AUDIT_CONTROL    30
-
-#define CAP_SETFCAP          31
-
-/* Override MAC access.
-   The base kernel enforces no MAC policy.
-   An LSM may enforce a MAC policy, and if it does and it chooses
-   to implement capability based overrides of that policy, this is
-   the capability it should use to do so. */
-
-#define CAP_MAC_OVERRIDE     32
-
-/* Allow MAC configuration or state changes.
-   The base kernel requires no MAC configuration.
-   An LSM may enforce a MAC policy, and if it does and it chooses
-   to implement capability based checks on modifications to that
-   policy or the data required to maintain it, this is the
-   capability it should use to do so. */
-
-#define CAP_MAC_ADMIN        33
-
-/* Allow configuring the kernel's syslog (printk behaviour) */
-
-#define CAP_SYSLOG           34
-
-/* Allow triggering something that will wake the system */
-
-#define CAP_WAKE_ALARM            35
-
-/* Allow preventing system suspends */
-
-#define CAP_BLOCK_SUSPEND    36
-
-#define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
-
-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-
-/*
- * Bit location of each capability (used by user-space library and kernel)
- */
-
-#define CAP_TO_INDEX(x)     ((x) >> 5)        /* 1 << 5 == bits in __u32 */
-#define CAP_TO_MASK(x)      (1 << ((x) & 31)) /* mask for indexed __u32 */
-
-#ifdef __KERNEL__
 
 struct inode;
 struct dentry;
@@ -557,6 +215,4 @@ extern bool inode_capable(const struct inode *inode, int cap);
 /* audit system wants to get cap info from files as well */
 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
 
-#endif /* __KERNEL__ */
-
 #endif /* !_LINUX_CAPABILITY_H */
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index 986493f5b92b..84b6e2d0f44d 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -1,91 +1,8 @@
 #ifndef CCISS_IOCTLH
 #define CCISS_IOCTLH
 
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/cciss_defs.h>
+#include <uapi/linux/cciss_ioctl.h>
 
-#define CCISS_IOC_MAGIC 'B'
-
-
-typedef struct _cciss_pci_info_struct
-{
-        unsigned char   bus;
-        unsigned char   dev_fn;
-        unsigned short  domain;
-        __u32           board_id;
-} cciss_pci_info_struct; 
-
-typedef struct _cciss_coalint_struct
-{
-        __u32  delay;
-        __u32  count;
-} cciss_coalint_struct;
-
-typedef char NodeName_type[16];
-
-typedef __u32 Heartbeat_type;
-
-#define CISS_PARSCSIU2  0x0001
-#define CISS_PARCSCIU3  0x0002
-#define CISS_FIBRE1G    0x0100
-#define CISS_FIBRE2G    0x0200
-typedef __u32 BusTypes_type;
-
-typedef char FirmwareVer_type[4];
-typedef __u32 DriverVer_type;
-
-#define MAX_KMALLOC_SIZE 128000
-
-typedef struct _IOCTL_Command_struct {
-  LUNAddr_struct           LUN_info;
-  RequestBlock_struct      Request;
-  ErrorInfo_struct         error_info; 
-  WORD                     buf_size;  /* size in bytes of the buf */
-  BYTE                     __user *buf;
-} IOCTL_Command_struct;
-
-typedef struct _BIG_IOCTL_Command_struct {
-  LUNAddr_struct           LUN_info;
-  RequestBlock_struct      Request;
-  ErrorInfo_struct         error_info;
-  DWORD                    malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
-  DWORD                    buf_size;    /* size in bytes of the buf */
-                                        /* < malloc_size * MAXSGENTRIES */
-  BYTE                     __user *buf;
-} BIG_IOCTL_Command_struct;
-
-typedef struct _LogvolInfo_struct{
-        __u32   LunID;
-        int     num_opens;  /* number of opens on the logical volume */
-        int     num_parts;  /* number of partitions configured on logvol */
-} LogvolInfo_struct;
-
-#define CCISS_GETPCIINFO _IOR(CCISS_IOC_MAGIC, 1, cciss_pci_info_struct)
-
-#define CCISS_GETINTINFO _IOR(CCISS_IOC_MAGIC, 2, cciss_coalint_struct)
-#define CCISS_SETINTINFO _IOW(CCISS_IOC_MAGIC, 3, cciss_coalint_struct)
-
-#define CCISS_GETNODENAME _IOR(CCISS_IOC_MAGIC, 4, NodeName_type)
-#define CCISS_SETNODENAME _IOW(CCISS_IOC_MAGIC, 5, NodeName_type)
-
-#define CCISS_GETHEARTBEAT _IOR(CCISS_IOC_MAGIC, 6, Heartbeat_type)
-#define CCISS_GETBUSTYPES  _IOR(CCISS_IOC_MAGIC, 7, BusTypes_type)
-#define CCISS_GETFIRMVER   _IOR(CCISS_IOC_MAGIC, 8, FirmwareVer_type)
-#define CCISS_GETDRIVVER   _IOR(CCISS_IOC_MAGIC, 9, DriverVer_type)
-#define CCISS_REVALIDVOLS  _IO(CCISS_IOC_MAGIC, 10)
-#define CCISS_PASSTHRU     _IOWR(CCISS_IOC_MAGIC, 11, IOCTL_Command_struct)
-#define CCISS_DEREGDISK    _IO(CCISS_IOC_MAGIC, 12)
-
-/* no longer used... use REGNEWD instead */ 
-#define CCISS_REGNEWDISK  _IOW(CCISS_IOC_MAGIC, 13, int)
-
-#define CCISS_REGNEWD      _IO(CCISS_IOC_MAGIC, 14)
-#define CCISS_RESCANDISK   _IO(CCISS_IOC_MAGIC, 16)
-#define CCISS_GETLUNINFO   _IOR(CCISS_IOC_MAGIC, 17, LogvolInfo_struct)
-#define CCISS_BIG_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL_Command_struct)
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 
 /* 32 bit compatible ioctl structs */
@@ -111,5 +28,4 @@ typedef struct _BIG_IOCTL32_Command_struct {
 #define CCISS_BIG_PASSTHRU32 _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL32_Command_struct)
 
 #endif /* CONFIG_COMPAT */
-#endif /* __KERNEL__ */
 #endif  
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index dfd7f187c351..8609d577bb66 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -7,910 +7,12 @@
  *               1997, 1998   Erik Andersen, andersee@debian.org
  *               1998-2002    Jens Axboe, axboe@suse.de
  */
- 
 #ifndef _LINUX_CDROM_H
 #define _LINUX_CDROM_H
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*******************************************************
- * As of Linux 2.1.x, all Linux CD-ROM application programs will use this 
- * (and only this) include file.  It is my hope to provide Linux with
- * a uniform interface between software accessing CD-ROMs and the various 
- * device drivers that actually talk to the drives.  There may still be
- * 23 different kinds of strange CD-ROM drives, but at least there will 
- * now be one, and only one, Linux CD-ROM interface.
- *
- * Additionally, as of Linux 2.1.x, all Linux application programs 
- * should use the O_NONBLOCK option when opening a CD-ROM device 
- * for subsequent ioctl commands.  This allows for neat system errors 
- * like "No medium found" or "Wrong medium type" upon attempting to 
- * mount or play an empty slot, mount an audio disc, or play a data disc.
- * Generally, changing an application program to support O_NONBLOCK
- * is as easy as the following:
- *       -    drive = open("/dev/cdrom", O_RDONLY);
- *       +    drive = open("/dev/cdrom", O_RDONLY | O_NONBLOCK);
- * It is worth the small change.
- *
- *  Patches for many common CD programs (provided by David A. van Leeuwen)
- *  can be found at:  ftp://ftp.gwdg.de/pub/linux/cdrom/drivers/cm206/
- * 
- *******************************************************/
-
-/* When a driver supports a certain function, but the cdrom drive we are 
- * using doesn't, we will return the error EDRIVE_CANT_DO_THIS.  We will 
- * borrow the "Operation not supported" error from the network folks to 
- * accomplish this.  Maybe someday we will get a more targeted error code, 
- * but this will do for now... */
-#define EDRIVE_CANT_DO_THIS  EOPNOTSUPP
-
-/*******************************************************
- * The CD-ROM IOCTL commands  -- these should be supported by 
- * all the various cdrom drivers.  For the CD-ROM ioctls, we 
- * will commandeer byte 0x53, or 'S'.
- *******************************************************/
-#define CDROMPAUSE              0x5301 /* Pause Audio Operation */ 
-#define CDROMRESUME             0x5302 /* Resume paused Audio Operation */
-#define CDROMPLAYMSF            0x5303 /* Play Audio MSF (struct cdrom_msf) */
-#define CDROMPLAYTRKIND         0x5304 /* Play Audio Track/index 
-                                           (struct cdrom_ti) */
-#define CDROMREADTOCHDR         0x5305 /* Read TOC header 
-                                           (struct cdrom_tochdr) */
-#define CDROMREADTOCENTRY       0x5306 /* Read TOC entry 
-                                           (struct cdrom_tocentry) */
-#define CDROMSTOP               0x5307 /* Stop the cdrom drive */
-#define CDROMSTART              0x5308 /* Start the cdrom drive */
-#define CDROMEJECT              0x5309 /* Ejects the cdrom media */
-#define CDROMVOLCTRL            0x530a /* Control output volume 
-                                           (struct cdrom_volctrl) */
-#define CDROMSUBCHNL            0x530b /* Read subchannel data 
-                                           (struct cdrom_subchnl) */
-#define CDROMREADMODE2          0x530c /* Read CDROM mode 2 data (2336 Bytes) 
-                                           (struct cdrom_read) */
-#define CDROMREADMODE1          0x530d /* Read CDROM mode 1 data (2048 Bytes)
-                                           (struct cdrom_read) */
-#define CDROMREADAUDIO          0x530e /* (struct cdrom_read_audio) */
-#define CDROMEJECT_SW           0x530f /* enable(1)/disable(0) auto-ejecting */
-#define CDROMMULTISESSION       0x5310 /* Obtain the start-of-last-session 
-                                           address of multi session disks 
-                                           (struct cdrom_multisession) */
-#define CDROM_GET_MCN           0x5311 /* Obtain the "Universal Product Code" 
-                                           if available (struct cdrom_mcn) */
-#define CDROM_GET_UPC           CDROM_GET_MCN  /* This one is deprecated, 
-                                          but here anyway for compatibility */
-#define CDROMRESET              0x5312 /* hard-reset the drive */
-#define CDROMVOLREAD            0x5313 /* Get the drive's volume setting 
-                                          (struct cdrom_volctrl) */
-#define CDROMREADRAW            0x5314  /* read data in raw mode (2352 Bytes)
-                                           (struct cdrom_read) */
-/* 
- * These ioctls are used only used in aztcd.c and optcd.c
- */
-#define CDROMREADCOOKED         0x5315  /* read data in cooked mode */
-#define CDROMSEEK               0x5316  /* seek msf address */
-  
-/*
- * This ioctl is only used by the scsi-cd driver.  
-   It is for playing audio in logical block addressing mode.
- */
-#define CDROMPLAYBLK            0x5317  /* (struct cdrom_blk) */
-
-/* 
- * These ioctls are only used in optcd.c
- */
-#define CDROMREADALL            0x5318  /* read all 2646 bytes */
-
-/* 
- * These ioctls are (now) only in ide-cd.c for controlling 
- * drive spindown time.  They should be implemented in the
- * Uniform driver, via generic packet commands, GPCMD_MODE_SELECT_10,
- * GPCMD_MODE_SENSE_10 and the GPMODE_POWER_PAGE...
- *  -Erik
- */
-#define CDROMGETSPINDOWN        0x531d
-#define CDROMSETSPINDOWN        0x531e
-
-/* 
- * These ioctls are implemented through the uniform CD-ROM driver
- * They _will_ be adopted by all CD-ROM drivers, when all the CD-ROM
- * drivers are eventually ported to the uniform CD-ROM driver interface.
- */
-#define CDROMCLOSETRAY          0x5319  /* pendant of CDROMEJECT */
-#define CDROM_SET_OPTIONS       0x5320  /* Set behavior options */
-#define CDROM_CLEAR_OPTIONS     0x5321  /* Clear behavior options */
-#define CDROM_SELECT_SPEED      0x5322  /* Set the CD-ROM speed */
-#define CDROM_SELECT_DISC       0x5323  /* Select disc (for juke-boxes) */
-#define CDROM_MEDIA_CHANGED     0x5325  /* Check is media changed  */
-#define CDROM_DRIVE_STATUS      0x5326  /* Get tray position, etc. */
-#define CDROM_DISC_STATUS       0x5327  /* Get disc type, etc. */
-#define CDROM_CHANGER_NSLOTS    0x5328  /* Get number of slots */
-#define CDROM_LOCKDOOR          0x5329  /* lock or unlock door */
-#define CDROM_DEBUG             0x5330  /* Turn debug messages on/off */
-#define CDROM_GET_CAPABILITY    0x5331  /* get capabilities */
-
-/* Note that scsi/scsi_ioctl.h also uses 0x5382 - 0x5386.
- * Future CDROM ioctls should be kept below 0x537F
- */
-
-/* This ioctl is only used by sbpcd at the moment */
-#define CDROMAUDIOBUFSIZ        0x5382  /* set the audio buffer size */
-                                        /* conflict with SCSI_IOCTL_GET_IDLUN */
-
-/* DVD-ROM Specific ioctls */
-#define DVD_READ_STRUCT         0x5390  /* Read structure */
-#define DVD_WRITE_STRUCT        0x5391  /* Write structure */
-#define DVD_AUTH                0x5392  /* Authentication */
-
-#define CDROM_SEND_PACKET       0x5393  /* send a packet to the drive */
-#define CDROM_NEXT_WRITABLE     0x5394  /* get next writable block */
-#define CDROM_LAST_WRITTEN      0x5395  /* get last block written on disc */
-
-/*******************************************************
- * CDROM IOCTL structures
- *******************************************************/
-
-/* Address in MSF format */
-struct cdrom_msf0               
-{
-        __u8    minute;
-        __u8    second;
-        __u8    frame;
-};
-
-/* Address in either MSF or logical format */
-union cdrom_addr                
-{
-        struct cdrom_msf0       msf;
-        int                     lba;
-};
-
-/* This struct is used by the CDROMPLAYMSF ioctl */ 
-struct cdrom_msf 
-{
-        __u8    cdmsf_min0;     /* start minute */
-        __u8    cdmsf_sec0;     /* start second */
-        __u8    cdmsf_frame0;   /* start frame */
-        __u8    cdmsf_min1;     /* end minute */
-        __u8    cdmsf_sec1;     /* end second */
-        __u8    cdmsf_frame1;   /* end frame */
-};
-
-/* This struct is used by the CDROMPLAYTRKIND ioctl */
-struct cdrom_ti 
-{
-        __u8    cdti_trk0;      /* start track */
-        __u8    cdti_ind0;      /* start index */
-        __u8    cdti_trk1;      /* end track */
-        __u8    cdti_ind1;      /* end index */
-};
-
-/* This struct is used by the CDROMREADTOCHDR ioctl */
-struct cdrom_tochdr     
-{
-        __u8    cdth_trk0;      /* start track */
-        __u8    cdth_trk1;      /* end track */
-};
-
-/* This struct is used by the CDROMVOLCTRL and CDROMVOLREAD ioctls */
-struct cdrom_volctrl
-{
-        __u8    channel0;
-        __u8    channel1;
-        __u8    channel2;
-        __u8    channel3;
-};
-
-/* This struct is used by the CDROMSUBCHNL ioctl */
-struct cdrom_subchnl 
-{
-        __u8    cdsc_format;
-        __u8    cdsc_audiostatus;
-        __u8    cdsc_adr:       4;
-        __u8    cdsc_ctrl:      4;
-        __u8    cdsc_trk;
-        __u8    cdsc_ind;
-        union cdrom_addr cdsc_absaddr;
-        union cdrom_addr cdsc_reladdr;
-};
-
-
-/* This struct is used by the CDROMREADTOCENTRY ioctl */
-struct cdrom_tocentry 
-{
-        __u8    cdte_track;
-        __u8    cdte_adr        :4;
-        __u8    cdte_ctrl       :4;
-        __u8    cdte_format;
-        union cdrom_addr cdte_addr;
-        __u8    cdte_datamode;
-};
-
-/* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */
-struct cdrom_read      
-{
-        int     cdread_lba;
-        char    *cdread_bufaddr;
-        int     cdread_buflen;
-};
-
-/* This struct is used by the CDROMREADAUDIO ioctl */
-struct cdrom_read_audio
-{
-        union cdrom_addr addr; /* frame address */
-        __u8 addr_format;      /* CDROM_LBA or CDROM_MSF */
-        int nframes;           /* number of 2352-byte-frames to read at once */
-        __u8 __user *buf;      /* frame buffer (size: nframes*2352 bytes) */
-};
-
-/* This struct is used with the CDROMMULTISESSION ioctl */
-struct cdrom_multisession
-{
-        union cdrom_addr addr; /* frame address: start-of-last-session 
-                                   (not the new "frame 16"!).  Only valid
-                                   if the "xa_flag" is true. */
-        __u8 xa_flag;        /* 1: "is XA disk" */
-        __u8 addr_format;    /* CDROM_LBA or CDROM_MSF */
-};
-
-/* This struct is used with the CDROM_GET_MCN ioctl.  
- * Very few audio discs actually have Universal Product Code information, 
- * which should just be the Medium Catalog Number on the box.  Also note 
- * that the way the codeis written on CD is _not_ uniform across all discs!
- */  
-struct cdrom_mcn 
-{
-  __u8 medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */
-};
-
-/* This is used by the CDROMPLAYBLK ioctl */
-struct cdrom_blk 
-{
-        unsigned from;
-        unsigned short len;
-};
-
-#define CDROM_PACKET_SIZE       12
-
-#define CGC_DATA_UNKNOWN        0
-#define CGC_DATA_WRITE          1
-#define CGC_DATA_READ           2
-#define CGC_DATA_NONE           3
-
-/* for CDROM_PACKET_COMMAND ioctl */
-struct cdrom_generic_command
-{
-        unsigned char           cmd[CDROM_PACKET_SIZE];
-        unsigned char           __user *buffer;
-        unsigned int            buflen;
-        int                     stat;
-        struct request_sense    __user *sense;
-        unsigned char           data_direction;
-        int                     quiet;
-        int                     timeout;
-        void                    __user *reserved[1];    /* unused, actually */
-};
-
-/*
- * A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336, 
- * 2340, or 2352 bytes long.  
-
-*         Sector types of the standard CD-ROM data formats:
- *
- * format   sector type               user data size (bytes)
- * -----------------------------------------------------------------------------
- *   1     (Red Book)    CD-DA          2352    (CD_FRAMESIZE_RAW)
- *   2     (Yellow Book) Mode1 Form1    2048    (CD_FRAMESIZE)
- *   3     (Yellow Book) Mode1 Form2    2336    (CD_FRAMESIZE_RAW0)
- *   4     (Green Book)  Mode2 Form1    2048    (CD_FRAMESIZE)
- *   5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
- *
- *
- *       The layout of the standard CD-ROM data formats:
- * -----------------------------------------------------------------------------
- * - audio (red):                  | audio_sample_bytes |
- *                                 |        2352        |
- *
- * - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
- *                                 |  12  -   4  - 2048 -  4  -   8  - 276 |
- *
- * - data (yellow, mode2):         | sync - head - data |
- *                                 |  12  -   4  - 2336 |
- *
- * - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
- *                                 |  12  -   4  -  8  - 2048 -  4  - 276 |
- *
- * - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
- *                                 |  12  -   4  -  8  - 2324 -  4    |
- *
- */
-
-/* Some generally useful CD-ROM information -- mostly based on the above */
-#define CD_MINS              74 /* max. minutes per CD, not really a limit */
-#define CD_SECS              60 /* seconds per minute */
-#define CD_FRAMES            75 /* frames per second */
-#define CD_SYNC_SIZE         12 /* 12 sync bytes per raw data frame */
-#define CD_MSF_OFFSET       150 /* MSF numbering offset of first frame */
-#define CD_CHUNK_SIZE        24 /* lowest-level "data bytes piece" */
-#define CD_NUM_OF_CHUNKS     98 /* chunks per frame */
-#define CD_FRAMESIZE_SUB     96 /* subchannel data "frame" size */
-#define CD_HEAD_SIZE          4 /* header (address) bytes per raw data frame */
-#define CD_SUBHEAD_SIZE       8 /* subheader bytes per raw XA data frame */
-#define CD_EDC_SIZE           4 /* bytes EDC per most raw data frame types */
-#define CD_ZERO_SIZE          8 /* bytes zero per yellow book mode 1 frame */
-#define CD_ECC_SIZE         276 /* bytes ECC per most raw data frame types */
-#define CD_FRAMESIZE       2048 /* bytes per frame, "cooked" mode */
-#define CD_FRAMESIZE_RAW   2352 /* bytes per frame, "raw" mode */
-#define CD_FRAMESIZE_RAWER 2646 /* The maximum possible returned bytes */ 
-/* most drives don't deliver everything: */
-#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
-#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
-
-#define CD_XA_HEAD        (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) /* "before data" part of raw XA frame */
-#define CD_XA_TAIL        (CD_EDC_SIZE+CD_ECC_SIZE) /* "after data" part of raw XA frame */
-#define CD_XA_SYNC_HEAD   (CD_SYNC_SIZE+CD_XA_HEAD) /* sync bytes + header of XA frame */
-
-/* CD-ROM address types (cdrom_tocentry.cdte_format) */
-#define CDROM_LBA 0x01 /* "logical block": first frame is #0 */
-#define CDROM_MSF 0x02 /* "minute-second-frame": binary, not bcd here! */
-
-/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */
-#define CDROM_DATA_TRACK        0x04
-
-/* The leadout track is always 0xAA, regardless of # of tracks on disc */
-#define CDROM_LEADOUT           0xAA
-
-/* audio states (from SCSI-2, but seen with other drives, too) */
-#define CDROM_AUDIO_INVALID     0x00    /* audio status not supported */
-#define CDROM_AUDIO_PLAY        0x11    /* audio play operation in progress */
-#define CDROM_AUDIO_PAUSED      0x12    /* audio play operation paused */
-#define CDROM_AUDIO_COMPLETED   0x13    /* audio play successfully completed */
-#define CDROM_AUDIO_ERROR       0x14    /* audio play stopped due to error */
-#define CDROM_AUDIO_NO_STATUS   0x15    /* no current audio status to return */
-
-/* capability flags used with the uniform CD-ROM driver */ 
-#define CDC_CLOSE_TRAY          0x1     /* caddy systems _can't_ close */
-#define CDC_OPEN_TRAY           0x2     /* but _can_ eject.  */
-#define CDC_LOCK                0x4     /* disable manual eject */
-#define CDC_SELECT_SPEED        0x8     /* programmable speed */
-#define CDC_SELECT_DISC         0x10    /* select disc from juke-box */
-#define CDC_MULTI_SESSION       0x20    /* read sessions>1 */
-#define CDC_MCN                 0x40    /* Medium Catalog Number */
-#define CDC_MEDIA_CHANGED       0x80    /* media changed */
-#define CDC_PLAY_AUDIO          0x100   /* audio functions */
-#define CDC_RESET               0x200   /* hard reset device */
-#define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
-#define CDC_GENERIC_PACKET      0x1000  /* driver implements generic packets */
-#define CDC_CD_R                0x2000  /* drive is a CD-R */
-#define CDC_CD_RW               0x4000  /* drive is a CD-RW */
-#define CDC_DVD                 0x8000  /* drive is a DVD */
-#define CDC_DVD_R               0x10000 /* drive can write DVD-R */
-#define CDC_DVD_RAM             0x20000 /* drive can write DVD-RAM */
-#define CDC_MO_DRIVE            0x40000 /* drive is an MO device */
-#define CDC_MRW                 0x80000 /* drive can read MRW */
-#define CDC_MRW_W               0x100000 /* drive can write MRW */
-#define CDC_RAM                 0x200000 /* ok to open for WRITE */
-
-/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
-#define CDS_NO_INFO             0       /* if not implemented */
-#define CDS_NO_DISC             1
-#define CDS_TRAY_OPEN           2
-#define CDS_DRIVE_NOT_READY     3
-#define CDS_DISC_OK             4
-
-/* return values for the CDROM_DISC_STATUS ioctl */
-/* can also return CDS_NO_[INFO|DISC], from above */
-#define CDS_AUDIO               100
-#define CDS_DATA_1              101
-#define CDS_DATA_2              102
-#define CDS_XA_2_1              103
-#define CDS_XA_2_2              104
-#define CDS_MIXED               105
-
-/* User-configurable behavior options for the uniform CD-ROM driver */
-#define CDO_AUTO_CLOSE          0x1     /* close tray on first open() */
-#define CDO_AUTO_EJECT          0x2     /* open tray on last release() */
-#define CDO_USE_FFLAGS          0x4     /* use O_NONBLOCK information on open */
-#define CDO_LOCK                0x8     /* lock tray on open files */
-#define CDO_CHECK_TYPE          0x10    /* check type on open for data */
-
-/* Special codes used when specifying changer slots. */
-#define CDSL_NONE               (INT_MAX-1)
-#define CDSL_CURRENT            INT_MAX
-
-/* For partition based multisession access. IDE can handle 64 partitions
- * per drive - SCSI CD-ROM's use minors to differentiate between the
- * various drives, so we can't do multisessions the same way there.
- * Use the -o session=x option to mount on them.
- */
-#define CD_PART_MAX             64
-#define CD_PART_MASK            (CD_PART_MAX - 1)
-
-/*********************************************************************
- * Generic Packet commands, MMC commands, and such
- *********************************************************************/
-
- /* The generic packet command opcodes for CD/DVD Logical Units,
- * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-#define GPCMD_BLANK                         0xa1
-#define GPCMD_CLOSE_TRACK                   0x5b
-#define GPCMD_FLUSH_CACHE                   0x35
-#define GPCMD_FORMAT_UNIT                   0x04
-#define GPCMD_GET_CONFIGURATION             0x46
-#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a
-#define GPCMD_GET_PERFORMANCE               0xac
-#define GPCMD_INQUIRY                       0x12
-#define GPCMD_LOAD_UNLOAD                   0xa6
-#define GPCMD_MECHANISM_STATUS              0xbd
-#define GPCMD_MODE_SELECT_10                0x55
-#define GPCMD_MODE_SENSE_10                 0x5a
-#define GPCMD_PAUSE_RESUME                  0x4b
-#define GPCMD_PLAY_AUDIO_10                 0x45
-#define GPCMD_PLAY_AUDIO_MSF                0x47
-#define GPCMD_PLAY_AUDIO_TI                 0x48
-#define GPCMD_PLAY_CD                       0xbc
-#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL  0x1e
-#define GPCMD_READ_10                       0x28
-#define GPCMD_READ_12                       0xa8
-#define GPCMD_READ_BUFFER                   0x3c
-#define GPCMD_READ_BUFFER_CAPACITY          0x5c
-#define GPCMD_READ_CDVD_CAPACITY            0x25
-#define GPCMD_READ_CD                       0xbe
-#define GPCMD_READ_CD_MSF                   0xb9
-#define GPCMD_READ_DISC_INFO                0x51
-#define GPCMD_READ_DVD_STRUCTURE            0xad
-#define GPCMD_READ_FORMAT_CAPACITIES        0x23
-#define GPCMD_READ_HEADER                   0x44
-#define GPCMD_READ_TRACK_RZONE_INFO         0x52
-#define GPCMD_READ_SUBCHANNEL               0x42
-#define GPCMD_READ_TOC_PMA_ATIP             0x43
-#define GPCMD_REPAIR_RZONE_TRACK            0x58
-#define GPCMD_REPORT_KEY                    0xa4
-#define GPCMD_REQUEST_SENSE                 0x03
-#define GPCMD_RESERVE_RZONE_TRACK           0x53
-#define GPCMD_SEND_CUE_SHEET                0x5d
-#define GPCMD_SCAN                          0xba
-#define GPCMD_SEEK                          0x2b
-#define GPCMD_SEND_DVD_STRUCTURE            0xbf
-#define GPCMD_SEND_EVENT                    0xa2
-#define GPCMD_SEND_KEY                      0xa3
-#define GPCMD_SEND_OPC                      0x54
-#define GPCMD_SET_READ_AHEAD                0xa7
-#define GPCMD_SET_STREAMING                 0xb6
-#define GPCMD_START_STOP_UNIT               0x1b
-#define GPCMD_STOP_PLAY_SCAN                0x4e
-#define GPCMD_TEST_UNIT_READY               0x00
-#define GPCMD_VERIFY_10                     0x2f
-#define GPCMD_WRITE_10                      0x2a
-#define GPCMD_WRITE_12                      0xaa
-#define GPCMD_WRITE_AND_VERIFY_10           0x2e
-#define GPCMD_WRITE_BUFFER                  0x3b
-/* This is listed as optional in ATAPI 2.6, but is (curiously) 
- * missing from Mt. Fuji, Table 57.  It _is_ mentioned in Mt. Fuji
- * Table 377 as an MMC command for SCSi devices though...  Most ATAPI
- * drives support it. */
-#define GPCMD_SET_SPEED                     0xbb
-/* This seems to be a SCSI specific CD-ROM opcode 
- * to play data at track/index */
-#define GPCMD_PLAYAUDIO_TI                  0x48
-/*
- * From MS Media Status Notification Support Specification. For
- * older drives only.
- */
-#define GPCMD_GET_MEDIA_STATUS              0xda
-
-/* Mode page codes for mode sense/set */
-#define GPMODE_VENDOR_PAGE              0x00
-#define GPMODE_R_W_ERROR_PAGE           0x01
-#define GPMODE_WRITE_PARMS_PAGE         0x05
-#define GPMODE_WCACHING_PAGE            0x08
-#define GPMODE_AUDIO_CTL_PAGE           0x0e
-#define GPMODE_POWER_PAGE               0x1a
-#define GPMODE_FAULT_FAIL_PAGE          0x1c
-#define GPMODE_TO_PROTECT_PAGE          0x1d
-#define GPMODE_CAPABILITIES_PAGE        0x2a
-#define GPMODE_ALL_PAGES                0x3f
-/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
- * of MODE_SENSE_POWER_PAGE */
-#define GPMODE_CDROM_PAGE               0x0d
-
-
-
-/* DVD struct types */
-#define DVD_STRUCT_PHYSICAL     0x00
-#define DVD_STRUCT_COPYRIGHT    0x01
-#define DVD_STRUCT_DISCKEY      0x02
-#define DVD_STRUCT_BCA          0x03
-#define DVD_STRUCT_MANUFACT     0x04
-
-struct dvd_layer {
-        __u8 book_version       : 4;
-        __u8 book_type          : 4;
-        __u8 min_rate           : 4;
-        __u8 disc_size          : 4;
-        __u8 layer_type         : 4;
-        __u8 track_path         : 1;
-        __u8 nlayers            : 2;
-        __u8 track_density      : 4;
-        __u8 linear_density     : 4;
-        __u8 bca                : 1;
-        __u32 start_sector;
-        __u32 end_sector;
-        __u32 end_sector_l0;
-};
-
-#define DVD_LAYERS      4
-
-struct dvd_physical {
-        __u8 type;
-        __u8 layer_num;
-        struct dvd_layer layer[DVD_LAYERS];
-};
-
-struct dvd_copyright {
-        __u8 type;
-
-        __u8 layer_num;
-        __u8 cpst;
-        __u8 rmi;
-};
-
-struct dvd_disckey {
-        __u8 type;
-
-        unsigned agid           : 2;
-        __u8 value[2048];
-};
-
-struct dvd_bca {
-        __u8 type;
-
-        int len;
-        __u8 value[188];
-};
-
-struct dvd_manufact {
-        __u8 type;
-
-        __u8 layer_num;
-        int len;
-        __u8 value[2048];
-};
-
-typedef union {
-        __u8 type;
-
-        struct dvd_physical     physical;
-        struct dvd_copyright    copyright;
-        struct dvd_disckey      disckey;
-        struct dvd_bca          bca;
-        struct dvd_manufact     manufact;
-} dvd_struct;
-
-/*
- * DVD authentication ioctl
- */
-
-/* Authentication states */
-#define DVD_LU_SEND_AGID        0
-#define DVD_HOST_SEND_CHALLENGE 1
-#define DVD_LU_SEND_KEY1        2
-#define DVD_LU_SEND_CHALLENGE   3
-#define DVD_HOST_SEND_KEY2      4
-
-/* Termination states */
-#define DVD_AUTH_ESTABLISHED    5
-#define DVD_AUTH_FAILURE        6
-
-/* Other functions */
-#define DVD_LU_SEND_TITLE_KEY   7
-#define DVD_LU_SEND_ASF         8
-#define DVD_INVALIDATE_AGID     9
-#define DVD_LU_SEND_RPC_STATE   10
-#define DVD_HOST_SEND_RPC_STATE 11
-
-/* State data */
-typedef __u8 dvd_key[5];                /* 40-bit value, MSB is first elem. */
-typedef __u8 dvd_challenge[10]; /* 80-bit value, MSB is first elem. */
-
-struct dvd_lu_send_agid {
-        __u8 type;
-        unsigned agid           : 2;
-};
-
-struct dvd_host_send_challenge {
-        __u8 type;
-        unsigned agid           : 2;
-
-        dvd_challenge chal;
-};
-
-struct dvd_send_key {
-        __u8 type;
-        unsigned agid           : 2;
-
-        dvd_key key;
-};
-
-struct dvd_lu_send_challenge {
-        __u8 type;
-        unsigned agid           : 2;
-
-        dvd_challenge chal;
-};
-
-#define DVD_CPM_NO_COPYRIGHT    0
-#define DVD_CPM_COPYRIGHTED     1
-
-#define DVD_CP_SEC_NONE         0
-#define DVD_CP_SEC_EXIST        1
-
-#define DVD_CGMS_UNRESTRICTED   0
-#define DVD_CGMS_SINGLE         2
-#define DVD_CGMS_RESTRICTED     3
-
-struct dvd_lu_send_title_key {
-        __u8 type;
-        unsigned agid           : 2;
-
-        dvd_key title_key;
-        int lba;
-        unsigned cpm            : 1;
-        unsigned cp_sec         : 1;
-        unsigned cgms           : 2;
-};
-
-struct dvd_lu_send_asf {
-        __u8 type;
-        unsigned agid           : 2;
-
-        unsigned asf            : 1;
-};
-
-struct dvd_host_send_rpcstate {
-        __u8 type;
-        __u8 pdrc;
-};
-
-struct dvd_lu_send_rpcstate {
-        __u8 type               : 2;
-        __u8 vra                : 3;
-        __u8 ucca               : 3;
-        __u8 region_mask;
-        __u8 rpc_scheme;
-};
-
-typedef union {
-        __u8 type;
-
-        struct dvd_lu_send_agid         lsa;
-        struct dvd_host_send_challenge  hsc;
-        struct dvd_send_key             lsk;
-        struct dvd_lu_send_challenge    lsc;
-        struct dvd_send_key             hsk;
-        struct dvd_lu_send_title_key    lstk;
-        struct dvd_lu_send_asf          lsasf;
-        struct dvd_host_send_rpcstate   hrpcs;
-        struct dvd_lu_send_rpcstate     lrpcs;
-} dvd_authinfo;
-
-struct request_sense {
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 valid              : 1;
-        __u8 error_code         : 7;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 error_code         : 7;
-        __u8 valid              : 1;
-#endif
-        __u8 segment_number;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved1          : 2;
-        __u8 ili                : 1;
-        __u8 reserved2          : 1;
-        __u8 sense_key          : 4;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 sense_key          : 4;
-        __u8 reserved2          : 1;
-        __u8 ili                : 1;
-        __u8 reserved1          : 2;
-#endif
-        __u8 information[4];
-        __u8 add_sense_len;
-        __u8 command_info[4];
-        __u8 asc;
-        __u8 ascq;
-        __u8 fruc;
-        __u8 sks[3];
-        __u8 asb[46];
-};
-
-/*
- * feature profile
- */
-#define CDF_RWRT        0x0020  /* "Random Writable" */
-#define CDF_HWDM        0x0024  /* "Hardware Defect Management" */
-#define CDF_MRW         0x0028
-
-/*
- * media status bits
- */
-#define CDM_MRW_NOTMRW                  0
-#define CDM_MRW_BGFORMAT_INACTIVE       1
-#define CDM_MRW_BGFORMAT_ACTIVE         2
-#define CDM_MRW_BGFORMAT_COMPLETE       3
-
-/*
- * mrw address spaces
- */
-#define MRW_LBA_DMA                     0
-#define MRW_LBA_GAA                     1
-
-/*
- * mrw mode pages (first is deprecated) -- probed at init time and
- * cdi->mrw_mode_page is set
- */
-#define MRW_MODE_PC_PRE1                0x2c
-#define MRW_MODE_PC                     0x03
-
-struct mrw_feature_desc {
-        __be16 feature_code;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved1          : 2;
-        __u8 feature_version    : 4;
-        __u8 persistent         : 1;
-        __u8 curr               : 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 curr               : 1;
-        __u8 persistent         : 1;
-        __u8 feature_version    : 4;
-        __u8 reserved1          : 2;
-#endif
-        __u8 add_len;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved2          : 7;
-        __u8 write              : 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 write              : 1;
-        __u8 reserved2          : 7;
-#endif
-        __u8 reserved3;
-        __u8 reserved4;
-        __u8 reserved5;
-};
-
-/* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */
-struct rwrt_feature_desc {
-        __be16 feature_code;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved1          : 2;
-        __u8 feature_version    : 4;
-        __u8 persistent         : 1;
-        __u8 curr               : 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 curr               : 1;
-        __u8 persistent         : 1;
-        __u8 feature_version    : 4;
-        __u8 reserved1          : 2;
-#endif
-        __u8 add_len;
-        __u32 last_lba;
-        __u32 block_size;
-        __u16 blocking;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved2          : 7;
-        __u8 page_present       : 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 page_present       : 1;
-        __u8 reserved2          : 7;
-#endif
-        __u8 reserved3;
-};
-
-typedef struct {
-        __be16 disc_information_length;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved1                  : 3;
-        __u8 erasable                   : 1;
-        __u8 border_status              : 2;
-        __u8 disc_status                : 2;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 disc_status                : 2;
-        __u8 border_status              : 2;
-        __u8 erasable                   : 1;
-        __u8 reserved1                  : 3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        __u8 n_first_track;
-        __u8 n_sessions_lsb;
-        __u8 first_track_lsb;
-        __u8 last_track_lsb;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 did_v                      : 1;
-        __u8 dbc_v                      : 1;
-        __u8 uru                        : 1;
-        __u8 reserved2                  : 2;
-        __u8 dbit                       : 1;
-        __u8 mrw_status                 : 2;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 mrw_status                 : 2;
-        __u8 dbit                       : 1;
-        __u8 reserved2                  : 2;
-        __u8 uru                        : 1;
-        __u8 dbc_v                      : 1;
-        __u8 did_v                      : 1;
-#endif
-        __u8 disc_type;
-        __u8 n_sessions_msb;
-        __u8 first_track_msb;
-        __u8 last_track_msb;
-        __u32 disc_id;
-        __u32 lead_in;
-        __u32 lead_out;
-        __u8 disc_bar_code[8];
-        __u8 reserved3;
-        __u8 n_opc;
-} disc_information;
-
-typedef struct {
-        __be16 track_information_length;
-        __u8 track_lsb;
-        __u8 session_lsb;
-        __u8 reserved1;
-#if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 reserved2                  : 2;
-        __u8 damage                     : 1;
-        __u8 copy                       : 1;
-        __u8 track_mode                 : 4;
-        __u8 rt                         : 1;
-        __u8 blank                      : 1;
-        __u8 packet                     : 1;
-        __u8 fp                         : 1;
-        __u8 data_mode                  : 4;
-        __u8 reserved3                  : 6;
-        __u8 lra_v                      : 1;
-        __u8 nwa_v                      : 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 track_mode                 : 4;
-        __u8 copy                       : 1;
-        __u8 damage                     : 1;
-        __u8 reserved2                  : 2;
-        __u8 data_mode                  : 4;
-        __u8 fp                         : 1;
-        __u8 packet                     : 1;
-        __u8 blank                      : 1;
-        __u8 rt                         : 1;
-        __u8 nwa_v                      : 1;
-        __u8 lra_v                      : 1;
-        __u8 reserved3                  : 6;
-#endif
-        __be32 track_start;
-        __be32 next_writable;
-        __be32 free_blocks;
-        __be32 fixed_packet_size;
-        __be32 track_size;
-        __be32 last_rec_address;
-} track_information;
-
-struct feature_header {
-        __u32 data_len;
-        __u8 reserved1;
-        __u8 reserved2;
-        __u16 curr_profile;
-};
-
-struct mode_page_header {
-        __be16 mode_data_length;
-        __u8 medium_type;
-        __u8 reserved1;
-        __u8 reserved2;
-        __u8 reserved3;
-        __be16 desc_length;
-};
-
-#ifdef __KERNEL__
 #include <linux/fs.h>           /* not really needed, later.. */
 #include <linux/list.h>
+#include <uapi/linux/cdrom.h>
 
 struct packet_command
 {
@@ -1209,6 +311,4 @@ static inline int msf_to_lba(u8 m, u8 s, u8 f)
 {
         return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
 }
-#endif  /* End of kernel only stuff */ 
-
 #endif  /* _LINUX_CDROM_H */
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index 1fb93e9080b0..a486f390dfbe 100644
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -71,7 +71,6 @@ struct ceph_mon_client {
         int cur_mon;                       /* last monitor i contacted */
         unsigned long sub_sent, sub_renew_after;
         struct ceph_connection con;
-        bool have_fsid;
 
         /* pending generic requests */
         struct rb_root generic_request_tree;
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index cedfb1a8434a..d9b880e977e6 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -207,7 +207,7 @@ extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc,
 extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,
                                  struct ceph_msg *msg);
 
-extern void ceph_calc_raw_layout(struct ceph_osd_client *osdc,
+extern int ceph_calc_raw_layout(struct ceph_osd_client *osdc,
                         struct ceph_file_layout *layout,
                         u64 snapid,
                         u64 off, u64 *plen, u64 *bno,
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 25b930bffea6..e37acbe989a9 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -109,9 +109,9 @@ extern struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
 
 /* calculate mapping of a file extent to an object */
-extern void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
-                                          u64 off, u64 *plen,
-                                          u64 *bno, u64 *oxoff, u64 *oxlen);
+extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
+                                         u64 off, u64 *plen,
+                                         u64 *bno, u64 *oxoff, u64 *oxlen);
 
 /* calculate mapping of object to a placement group */
 extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index fbe89e17124e..4dceaf8ae152 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -319,22 +319,6 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz)
         __clocksource_updatefreq_scale(cs, 1000, khz);
 }
 
-#ifdef CONFIG_GENERIC_TIME_VSYSCALL
-extern void
-update_vsyscall(struct timespec *ts, struct timespec *wtm,
-                        struct clocksource *c, u32 mult);
-extern void update_vsyscall_tz(void);
-#else
-static inline void
-update_vsyscall(struct timespec *ts, struct timespec *wtm,
-                        struct clocksource *c, u32 mult)
-{
-}
-
-static inline void update_vsyscall_tz(void)
-{
-}
-#endif
 
 extern void timekeeping_notify(struct clocksource *clock);
 
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 3c4aac406175..88bee3a33090 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -1,68 +1,10 @@
 #ifndef _CM4000_H_
 #define _CM4000_H_
 
-#include <linux/types.h>
+#include <uapi/linux/cm4000_cs.h>
 
-#define MAX_ATR                 33
-
-#define CM4000_MAX_DEV          4
-
-/* those two structures are passed via ioctl() from/to userspace.  They are
- * used by existing userspace programs, so I kepth the awkward "bIFSD" naming
- * not to break compilation of userspace apps. -HW */
-
-typedef struct atreq {
-        __s32 atr_len;
-        unsigned char atr[64];
-        __s32 power_act;
-        unsigned char bIFSD;
-        unsigned char bIFSC;
-} atreq_t;
-
-
-/* what is particularly stupid in the original driver is the arch-dependent
- * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
- * will lay out the structure members differently than the 64bit kernel.
- *
- * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".
- * On 32bit this will make no difference.  With 64bit kernels, it will make
- * 32bit apps work, too.
- */
-
-typedef struct ptsreq {
-        __u32 protocol; /*T=0: 2^0, T=1:  2^1*/
-        unsigned char flags;
-        unsigned char pts1;
-        unsigned char pts2;
-        unsigned char pts3;
-} ptsreq_t;
-
-#define CM_IOC_MAGIC            'c'
-#define CM_IOC_MAXNR            255
-
-#define CM_IOCGSTATUS           _IOR (CM_IOC_MAGIC, 0, unsigned char *)
-#define CM_IOCGATR              _IOWR(CM_IOC_MAGIC, 1, atreq_t *)
-#define CM_IOCSPTS              _IOW (CM_IOC_MAGIC, 2, ptsreq_t *)
-#define CM_IOCSRDR              _IO  (CM_IOC_MAGIC, 3)
-#define CM_IOCARDOFF            _IO  (CM_IOC_MAGIC, 4)
-
-#define CM_IOSDBGLVL            _IOW(CM_IOC_MAGIC, 250, int*)
-
-/* card and device states */
-#define CM_CARD_INSERTED                0x01
-#define CM_CARD_POWERED                 0x02
-#define CM_ATR_PRESENT                  0x04
-#define CM_ATR_VALID                    0x08
-#define CM_STATE_VALID                  0x0f
-/* extra info only from CM4000 */
-#define CM_NO_READER                    0x10
-#define CM_BAD_CARD                     0x20
-
-
-#ifdef __KERNEL__
 
 #define DEVICE_NAME             "cmm"
 #define MODULE_NAME             "cm4000_cs"
 
-#endif  /* __KERNEL__ */
 #endif  /* _CM4000_H_ */
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index d03612b196e1..2c1bc1ea04ee 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -14,111 +14,11 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
-
 #ifndef CN_PROC_H
 #define CN_PROC_H
 
-#include <linux/types.h>
-
-/*
- * Userspace sends this enum to register with the kernel that it is listening
- * for events on the connector.
- */
-enum proc_cn_mcast_op {
-        PROC_CN_MCAST_LISTEN = 1,
-        PROC_CN_MCAST_IGNORE = 2
-};
-
-/*
- * From the user's point of view, the process
- * ID is the thread group ID and thread ID is the internal
- * kernel "pid". So, fields are assigned as follow:
- *
- *  In user space     -  In  kernel space
- *
- * parent process ID  =  parent->tgid
- * parent thread  ID  =  parent->pid
- * child  process ID  =  child->tgid
- * child  thread  ID  =  child->pid
- */
-
-struct proc_event {
-        enum what {
-                /* Use successive bits so the enums can be used to record
-                 * sets of events as well
-                 */
-                PROC_EVENT_NONE = 0x00000000,
-                PROC_EVENT_FORK = 0x00000001,
-                PROC_EVENT_EXEC = 0x00000002,
-                PROC_EVENT_UID  = 0x00000004,
-                PROC_EVENT_GID  = 0x00000040,
-                PROC_EVENT_SID  = 0x00000080,
-                PROC_EVENT_PTRACE = 0x00000100,
-                PROC_EVENT_COMM = 0x00000200,
-                /* "next" should be 0x00000400 */
-                /* "last" is the last process event: exit */
-                PROC_EVENT_EXIT = 0x80000000
-        } what;
-        __u32 cpu;
-        __u64 __attribute__((aligned(8))) timestamp_ns;
-                /* Number of nano seconds since system boot */
-        union { /* must be last field of proc_event struct */
-                struct {
-                        __u32 err;
-                } ack;
-
-                struct fork_proc_event {
-                        __kernel_pid_t parent_pid;
-                        __kernel_pid_t parent_tgid;
-                        __kernel_pid_t child_pid;
-                        __kernel_pid_t child_tgid;
-                } fork;
-
-                struct exec_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                } exec;
-
-                struct id_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                        union {
-                                __u32 ruid; /* task uid */
-                                __u32 rgid; /* task gid */
-                        } r;
-                        union {
-                                __u32 euid;
-                                __u32 egid;
-                        } e;
-                } id;
-
-                struct sid_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                } sid;
-
-                struct ptrace_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                        __kernel_pid_t tracer_pid;
-                        __kernel_pid_t tracer_tgid;
-                } ptrace;
-
-                struct comm_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                        char           comm[16];
-                } comm;
-
-                struct exit_proc_event {
-                        __kernel_pid_t process_pid;
-                        __kernel_pid_t process_tgid;
-                        __u32 exit_code, exit_signal;
-                } exit;
-        } event_data;
-};
+#include <uapi/linux/cn_proc.h>
 
-#ifdef __KERNEL__
 #ifdef CONFIG_PROC_EVENTS
 void proc_fork_connector(struct task_struct *task);
 void proc_exec_connector(struct task_struct *task);
@@ -151,5 +51,4 @@ static inline void proc_ptrace_connector(struct task_struct *task,
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif  /* CONFIG_PROC_EVENTS */
-#endif  /* __KERNEL__ */
 #endif  /* CN_PROC_H */
diff --git a/include/linux/coda.h b/include/linux/coda.h
index 96c87693800b..cff544f81105 100644
--- a/include/linux/coda.h
+++ b/include/linux/coda.h
@@ -55,690 +55,12 @@ Mellon the rights to redistribute these changes without encumbrance.
  * Linux modifications by 
  * Peter Braam, Aug 1996
  */
-
 #ifndef _CODA_HEADER_
 #define _CODA_HEADER_
 
-
-/* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */
-#if defined(__NetBSD__) || \
-  ((defined(DJGPP) || defined(__CYGWIN32__)) && !defined(KERNEL))
-#include <sys/types.h>
-#endif 
-
-#ifndef CODA_MAXSYMLINKS
-#define CODA_MAXSYMLINKS 10
-#endif
-
-#if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef KERNEL
-typedef unsigned long u_long;
-typedef unsigned int u_int;
-typedef unsigned short u_short;
-typedef u_long ino_t;
-typedef u_long dev_t;
-typedef void * caddr_t;
-#ifdef DOS
-typedef unsigned __int64 u_quad_t;
-#else 
-typedef unsigned long long u_quad_t;
-#endif
-
-#define inline
-
-struct timespec {
-        long       ts_sec;
-        long       ts_nsec;
-};
-#else  /* DJGPP but not KERNEL */
-#include <sys/time.h>
-typedef unsigned long long u_quad_t;
-#endif /* !KERNEL */
-#endif /* !DJGPP */
-
-
 #if defined(__linux__)
-#include <linux/time.h>
-#define cdev_t u_quad_t
-#ifndef __KERNEL__
-#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
-#define _UQUAD_T_ 1
 typedef unsigned long long u_quad_t;
-#endif
-#else /*__KERNEL__ */
-typedef unsigned long long u_quad_t;
-#endif /* __KERNEL__ */
 #else
-#define cdev_t dev_t
-#endif
-
-#ifdef __CYGWIN32__
-struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
-};
-#endif
-
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-typedef signed char           int8_t;
-typedef unsigned char       u_int8_t;
-typedef short                int16_t;
-typedef unsigned short     u_int16_t;
-typedef int                  int32_t;
-typedef unsigned int       u_int32_t;
-#endif
-
-
-/*
- * Cfs constants
- */
-#define CODA_MAXNAMLEN   255
-#define CODA_MAXPATHLEN  1024
-#define CODA_MAXSYMLINK  10
-
-/* these are Coda's version of O_RDONLY etc combinations
- * to deal with VFS open modes
- */
-#define C_O_READ        0x001
-#define C_O_WRITE       0x002
-#define C_O_TRUNC       0x010
-#define C_O_EXCL        0x100
-#define C_O_CREAT       0x200
-
-/* these are to find mode bits in Venus */ 
-#define C_M_READ  00400
-#define C_M_WRITE 00200
-
-/* for access Venus will use */
-#define C_A_C_OK    8               /* Test for writing upon create.  */
-#define C_A_R_OK    4               /* Test for read permission.  */
-#define C_A_W_OK    2               /* Test for write permission.  */
-#define C_A_X_OK    1               /* Test for execute permission.  */
-#define C_A_F_OK    0               /* Test for existence.  */
-
-
-
-#ifndef _VENUS_DIRENT_T_
-#define _VENUS_DIRENT_T_ 1
-struct venus_dirent {
-        u_int32_t d_fileno;             /* file number of entry */
-        u_int16_t d_reclen;             /* length of this record */
-        u_int8_t  d_type;                       /* file type, see below */
-        u_int8_t  d_namlen;             /* length of string in d_name */
-        char      d_name[CODA_MAXNAMLEN + 1];/* name must be no longer than this */
-};
-#undef DIRSIZ
-#define DIRSIZ(dp)      ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + \
-                         (((dp)->d_namlen+1 + 3) &~ 3))
-
-/*
- * File types
- */
-#define CDT_UNKNOWN      0
-#define CDT_FIFO         1
-#define CDT_CHR          2
-#define CDT_DIR          4
-#define CDT_BLK          6
-#define CDT_REG          8
-#define CDT_LNK         10
-#define CDT_SOCK        12
-#define CDT_WHT         14
-
-/*
- * Convert between stat structure types and directory types.
- */
-#define IFTOCDT(mode)   (((mode) & 0170000) >> 12)
-#define CDTTOIF(dirtype)        ((dirtype) << 12)
-
 #endif
-
-#ifndef _VUID_T_
-#define _VUID_T_
-typedef u_int32_t vuid_t;
-typedef u_int32_t vgid_t;
-#endif /*_VUID_T_ */
-
-struct CodaFid {
-        u_int32_t opaque[4];
-};
-
-#define coda_f2i(fid)\
-        (fid ? (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]) : 0)
-
-#ifndef _VENUS_VATTR_T_
-#define _VENUS_VATTR_T_
-/*
- * Vnode types.  VNON means no type.
- */
-enum coda_vtype { C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
-
-struct coda_vattr {
-        long            va_type;        /* vnode type (for create) */
-        u_short         va_mode;        /* files access mode and type */
-        short           va_nlink;       /* number of references to file */
-        vuid_t          va_uid;         /* owner user id */
-        vgid_t          va_gid;         /* owner group id */
-        long            va_fileid;      /* file id */
-        u_quad_t        va_size;        /* file size in bytes */
-        long            va_blocksize;   /* blocksize preferred for i/o */
-        struct timespec va_atime;       /* time of last access */
-        struct timespec va_mtime;       /* time of last modification */
-        struct timespec va_ctime;       /* time file changed */
-        u_long          va_gen;         /* generation number of file */
-        u_long          va_flags;       /* flags defined for file */
-        cdev_t          va_rdev;        /* device special file represents */
-        u_quad_t        va_bytes;       /* bytes of disk space held by file */
-        u_quad_t        va_filerev;     /* file modification number */
-};
-
+#include <uapi/linux/coda.h>
 #endif 
-
-/* structure used by CODA_STATFS for getting cache information from venus */
-struct coda_statfs {
-    int32_t f_blocks;
-    int32_t f_bfree;
-    int32_t f_bavail;
-    int32_t f_files;
-    int32_t f_ffree;
-};
-
-/*
- * Kernel <--> Venus communications.
- */
-
-#define CODA_ROOT       2
-#define CODA_OPEN_BY_FD 3
-#define CODA_OPEN       4
-#define CODA_CLOSE      5
-#define CODA_IOCTL      6
-#define CODA_GETATTR    7
-#define CODA_SETATTR    8
-#define CODA_ACCESS     9
-#define CODA_LOOKUP     10
-#define CODA_CREATE     11
-#define CODA_REMOVE     12
-#define CODA_LINK       13
-#define CODA_RENAME     14
-#define CODA_MKDIR      15
-#define CODA_RMDIR      16
-#define CODA_SYMLINK    18
-#define CODA_READLINK   19
-#define CODA_FSYNC      20
-#define CODA_VGET       22
-#define CODA_SIGNAL     23
-#define CODA_REPLACE     24 /* DOWNCALL */
-#define CODA_FLUSH       25 /* DOWNCALL */
-#define CODA_PURGEUSER   26 /* DOWNCALL */
-#define CODA_ZAPFILE     27 /* DOWNCALL */
-#define CODA_ZAPDIR      28 /* DOWNCALL */
-#define CODA_PURGEFID    30 /* DOWNCALL */
-#define CODA_OPEN_BY_PATH 31
-#define CODA_RESOLVE     32
-#define CODA_REINTEGRATE 33
-#define CODA_STATFS      34
-#define CODA_STORE       35
-#define CODA_RELEASE     36
-#define CODA_NCALLS 37
-
-#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
-
-#define VC_MAXDATASIZE      8192
-#define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
-                            VC_MAXDATASIZE  
-
-#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
-
-#define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
-
-/*
- *        Venus <-> Coda  RPC arguments
- */
-struct coda_in_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;       /* Keep multiple outstanding msgs distinct */
-    pid_t pid;
-    pid_t pgid;
-    vuid_t uid;
-};
-
-/* Really important that opcode and unique are 1st two fields! */
-struct coda_out_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;   
-    u_int32_t result;
-};
-
-/* coda_root: NO_IN */
-struct coda_root_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-};
-
-struct coda_root_in {
-    struct coda_in_hdr in;
-};
-
-/* coda_open: */
-struct coda_open_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_open_out {
-    struct coda_out_hdr oh;
-    cdev_t      dev;
-    ino_t       inode;
-};
-
-
-/* coda_store: */
-struct coda_store_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_store_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_release: */
-struct coda_release_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_release_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_close: */
-struct coda_close_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_close_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_ioctl: */
-struct coda_ioctl_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int cmd;
-    int len;
-    int rwflag;
-    char *data;                 /* Place holder for data. */
-};
-
-struct coda_ioctl_out {
-    struct coda_out_hdr oh;
-    int len;
-    caddr_t     data;           /* Place holder for data. */
-};
-
-
-/* coda_getattr: */
-struct coda_getattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_getattr_out {
-    struct coda_out_hdr oh;
-    struct coda_vattr attr;
-};
-
-
-/* coda_setattr: NO_OUT */
-struct coda_setattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-struct coda_setattr_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_access: NO_OUT */
-struct coda_access_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_access_out {
-    struct coda_out_hdr out;
-};
-
-
-/* lookup flags */
-#define CLU_CASE_SENSITIVE     0x01
-#define CLU_CASE_INSENSITIVE   0x02
-
-/* coda_lookup: */
-struct  coda_lookup_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int         name;           /* Place holder for data. */
-    int         flags;  
-};
-
-struct coda_lookup_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    int vtype;
-};
-
-
-/* coda_create: */
-struct coda_create_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-    int excl;
-    int mode;
-    int         name;           /* Place holder for data. */
-};
-
-struct coda_create_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_remove: NO_OUT */
-struct coda_remove_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int name;           /* Place holder for data. */
-};
-
-struct coda_remove_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_link: NO_OUT */
-struct coda_link_in {
-    struct coda_in_hdr ih;
-    struct CodaFid sourceFid;   /* cnode to link *to* */
-    struct CodaFid destFid;     /* Directory in which to place link */
-    int tname;          /* Place holder for data. */
-};
-
-struct coda_link_out {
-    struct coda_out_hdr out;
-};
-
-
-/* coda_rename: NO_OUT */
-struct coda_rename_in {
-    struct coda_in_hdr ih;
-    struct CodaFid sourceFid;
-    int         srcname;
-    struct CodaFid destFid;
-    int         destname;
-};
-
-struct coda_rename_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_mkdir: */
-struct coda_mkdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-    int    name;                /* Place holder for data. */
-};
-
-struct coda_mkdir_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_rmdir: NO_OUT */
-struct coda_rmdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int name;           /* Place holder for data. */
-};
-
-struct coda_rmdir_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_symlink: NO_OUT */
-struct coda_symlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;        /* Directory to put symlink in */
-    int srcname;
-    struct coda_vattr attr;
-    int tname;
-};
-
-struct coda_symlink_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_readlink: */
-struct coda_readlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_readlink_out {
-    struct coda_out_hdr oh;
-    int count;
-    caddr_t     data;           /* Place holder for data. */
-};
-
-
-/* coda_fsync: NO_OUT */
-struct coda_fsync_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_fsync_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_vget: */
-struct coda_vget_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_vget_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    int vtype;
-};
-
-
-/* CODA_SIGNAL is out-of-band, doesn't need data. */
-/* CODA_INVALIDATE is a venus->kernel call */
-/* CODA_FLUSH is a venus->kernel call */
-
-/* coda_purgeuser: */
-/* CODA_PURGEUSER is a venus->kernel call */
-struct coda_purgeuser_out {
-    struct coda_out_hdr oh;
-    vuid_t uid;
-};
-
-/* coda_zapfile: */
-/* CODA_ZAPFILE is a venus->kernel call */
-struct coda_zapfile_out {  
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_zapdir: */
-/* CODA_ZAPDIR is a venus->kernel call */       
-struct coda_zapdir_out {          
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_purgefid: */
-/* CODA_PURGEFID is a venus->kernel call */     
-struct coda_purgefid_out { 
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_replace: */
-/* CODA_REPLACE is a venus->kernel call */      
-struct coda_replace_out { /* coda_replace is a venus->kernel call */
-    struct coda_out_hdr oh;
-    struct CodaFid NewFid;
-    struct CodaFid OldFid;
-};
-
-/* coda_open_by_fd: */
-struct coda_open_by_fd_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int        flags;
-};
-
-struct coda_open_by_fd_out {
-    struct coda_out_hdr oh;
-    int fd;
-
-#ifdef __KERNEL__
-    struct file *fh; /* not passed from userspace but used in-kernel only */
-#endif
-};
-
-/* coda_open_by_path: */
-struct coda_open_by_path_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int flags;
-};
-
-struct coda_open_by_path_out {
-    struct coda_out_hdr oh;
-        int path;
-};
-
-/* coda_statfs: NO_IN */
-struct coda_statfs_in {
-    struct coda_in_hdr in;
-};
-
-struct coda_statfs_out {
-    struct coda_out_hdr oh;
-    struct coda_statfs stat;
-};
-
-/* 
- * Occasionally, we don't cache the fid returned by CODA_LOOKUP. 
- * For instance, if the fid is inconsistent. 
- * This case is handled by setting the top bit of the type result parameter.
- */
-#define CODA_NOCACHE          0x80000000
-
-union inputArgs {
-    struct coda_in_hdr ih;              /* NB: every struct below begins with an ih */
-    struct coda_open_in coda_open;
-    struct coda_store_in coda_store;
-    struct coda_release_in coda_release;
-    struct coda_close_in coda_close;
-    struct coda_ioctl_in coda_ioctl;
-    struct coda_getattr_in coda_getattr;
-    struct coda_setattr_in coda_setattr;
-    struct coda_access_in coda_access;
-    struct coda_lookup_in coda_lookup;
-    struct coda_create_in coda_create;
-    struct coda_remove_in coda_remove;
-    struct coda_link_in coda_link;
-    struct coda_rename_in coda_rename;
-    struct coda_mkdir_in coda_mkdir;
-    struct coda_rmdir_in coda_rmdir;
-    struct coda_symlink_in coda_symlink;
-    struct coda_readlink_in coda_readlink;
-    struct coda_fsync_in coda_fsync;
-    struct coda_vget_in coda_vget;
-    struct coda_open_by_fd_in coda_open_by_fd;
-    struct coda_open_by_path_in coda_open_by_path;
-    struct coda_statfs_in coda_statfs;
-};
-
-union outputArgs {
-    struct coda_out_hdr oh;             /* NB: every struct below begins with an oh */
-    struct coda_root_out coda_root;
-    struct coda_open_out coda_open;
-    struct coda_ioctl_out coda_ioctl;
-    struct coda_getattr_out coda_getattr;
-    struct coda_lookup_out coda_lookup;
-    struct coda_create_out coda_create;
-    struct coda_mkdir_out coda_mkdir;
-    struct coda_readlink_out coda_readlink;
-    struct coda_vget_out coda_vget;
-    struct coda_purgeuser_out coda_purgeuser;
-    struct coda_zapfile_out coda_zapfile;
-    struct coda_zapdir_out coda_zapdir;
-    struct coda_purgefid_out coda_purgefid;
-    struct coda_replace_out coda_replace;
-    struct coda_open_by_fd_out coda_open_by_fd;
-    struct coda_open_by_path_out coda_open_by_path;
-    struct coda_statfs_out coda_statfs;
-};    
-
-union coda_downcalls {
-    /* CODA_INVALIDATE is a venus->kernel call */
-    /* CODA_FLUSH is a venus->kernel call */
-    struct coda_purgeuser_out purgeuser;
-    struct coda_zapfile_out zapfile;
-    struct coda_zapdir_out zapdir;
-    struct coda_purgefid_out purgefid;
-    struct coda_replace_out replace;
-};
-
-
-/*
- * Used for identifying usage of "Control" and pioctls
- */
-
-#define PIOCPARM_MASK 0x0000ffff
-struct ViceIoctl {
-        void __user *in;        /* Data to be transferred in */
-        void __user *out;       /* Data to be transferred out */
-        u_short in_size;        /* Size of input buffer <= 2K */
-        u_short out_size;       /* Maximum size of output buffer, <= 2K */
-};
-
-struct PioctlData {
-        const char __user *path;
-        int follow;
-        struct ViceIoctl vi;
-};
-
-#define CODA_CONTROL            ".CONTROL"
-#define CODA_CONTROLLEN         8
-#define CTL_INO                 -1
-
-/* Data passed to mount */
-
-#define CODA_MOUNT_VERSION 1
-
-struct coda_mount_data {
-        int             version;
-        int             fd;       /* Opened device */
-};
-
-#endif 
-
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 72f2d2f0af91..8031d6eef102 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -1,14 +1,9 @@
 #ifndef __CODA_PSDEV_H
 #define __CODA_PSDEV_H
 
-#include <linux/magic.h>
-
-#define CODA_PSDEV_MAJOR 67
-#define MAX_CODADEVS  5    /* how many do we allow */
-
-#ifdef __KERNEL__
 #include <linux/backing-dev.h>
 #include <linux/mutex.h>
+#include <uapi/linux/coda_psdev.h>
 
 struct kstatfs;
 
@@ -74,23 +69,4 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
  */
 
 extern struct venus_comm coda_comms[];
-#endif /* __KERNEL__ */
-
-/* messages between coda filesystem in kernel and Venus */
-struct upc_req {
-        struct list_head    uc_chain;
-        caddr_t             uc_data;
-        u_short             uc_flags;
-        u_short             uc_inSize;  /* Size is at most 5000 bytes */
-        u_short             uc_outSize;
-        u_short             uc_opcode;  /* copied from data to save lookup */
-        int                 uc_unique;
-        wait_queue_head_t   uc_sleep;   /* process' wait queue */
-};
-
-#define CODA_REQ_ASYNC  0x1
-#define CODA_REQ_READ   0x2
-#define CODA_REQ_WRITE  0x4
-#define CODA_REQ_ABORT  0x8
-
 #endif
diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index ef658147e4e8..6ecb6dc2f303 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -22,8 +22,9 @@ extern int sysctl_extfrag_handler(struct ctl_table *table, int write,
 extern int fragmentation_index(struct zone *zone, unsigned int order);
 extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
                         int order, gfp_t gfp_mask, nodemask_t *mask,
-                        bool sync, bool *contended);
+                        bool sync, bool *contended, struct page **page);
 extern int compact_pgdat(pg_data_t *pgdat, int order);
+extern void reset_isolation_suitable(pg_data_t *pgdat);
 extern unsigned long compaction_suitable(struct zone *zone, int order);
 
 /* Do not skip compaction more than 64 times */
@@ -61,10 +62,20 @@ static inline bool compaction_deferred(struct zone *zone, int order)
         return zone->compact_considered < defer_limit;
 }
 
+/* Returns true if restarting compaction after many failures */
+static inline bool compaction_restarting(struct zone *zone, int order)
+{
+        if (order < zone->compact_order_failed)
+                return false;
+
+        return zone->compact_defer_shift == COMPACT_MAX_DEFER_SHIFT &&
+                zone->compact_considered >= 1UL << zone->compact_defer_shift;
+}
+
 #else
 static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,
                         int order, gfp_t gfp_mask, nodemask_t *nodemask,
-                        bool sync, bool *contended)
+                        bool sync, bool *contended, struct page **page)
 {
         return COMPACT_CONTINUE;
 }
@@ -74,6 +85,10 @@ static inline int compact_pgdat(pg_data_t *pgdat, int order)
         return COMPACT_CONTINUE;
 }
 
+static inline void reset_isolation_suitable(pg_data_t *pgdat)
+{
+}
+
 static inline unsigned long compaction_suitable(struct zone *zone, int order)
 {
         return COMPACT_SKIPPED;
diff --git a/include/linux/compat.h b/include/linux/compat.h
index fd4e29956d1c..d0ced1011f2f 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -160,11 +160,6 @@ struct compat_ustat {
         char                    f_fpack[6];
 };
 
-typedef union compat_sigval {
-        compat_int_t    sival_int;
-        compat_uptr_t   sival_ptr;
-} compat_sigval_t;
-
 #define COMPAT_SIGEV_PAD_SIZE   ((SIGEV_MAX_SIZE/sizeof(int)) - 3)
 
 typedef struct compat_sigevent {
@@ -289,8 +284,12 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
                 const struct compat_iovec __user *vec,
                 unsigned long vlen, u32 pos_low, u32 pos_high);
 
-int compat_do_execve(char *filename, compat_uptr_t __user *argv,
-                     compat_uptr_t __user *envp, struct pt_regs *regs);
+int compat_do_execve(const char *filename, const compat_uptr_t __user *argv,
+                     const compat_uptr_t __user *envp, struct pt_regs *regs);
+#ifdef __ARCH_WANT_SYS_EXECVE
+asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv,
+                     const compat_uptr_t __user *envp);
+#endif
 
 asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
                 compat_ulong_t __user *outp, compat_ulong_t __user *exp,
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 934bc34d5f99..412bc6c2b023 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -59,7 +59,7 @@
 #if __GNUC_MINOR__ > 0
 #define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
 #endif
-#if __GNUC_MINOR__ >= 4 && !defined(__CHECKER__)
+#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__)
 #define __compiletime_warning(message) __attribute__((warning(message)))
 #define __compiletime_error(message) __attribute__((error(message)))
 #endif
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 76384074262d..b2b5a41b6a24 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -18,63 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __CONNECTOR_H
 #define __CONNECTOR_H
 
-#include <linux/types.h>
-
-/*
- * Process Events connector unique ids -- used for message routing
- */
-#define CN_IDX_PROC                     0x1
-#define CN_VAL_PROC                     0x1
-#define CN_IDX_CIFS                     0x2
-#define CN_VAL_CIFS                     0x1
-#define CN_W1_IDX                       0x3     /* w1 communication */
-#define CN_W1_VAL                       0x1
-#define CN_IDX_V86D                     0x4
-#define CN_VAL_V86D_UVESAFB             0x1
-#define CN_IDX_BB                       0x5     /* BlackBoard, from the TSP GPL sampling framework */
-#define CN_DST_IDX                      0x6
-#define CN_DST_VAL                      0x1
-#define CN_IDX_DM                       0x7     /* Device Mapper */
-#define CN_VAL_DM_USERSPACE_LOG         0x1
-#define CN_IDX_DRBD                     0x8
-#define CN_VAL_DRBD                     0x1
-#define CN_KVP_IDX                      0x9     /* HyperV KVP */
-#define CN_KVP_VAL                      0x1     /* queries from the kernel */
-
-#define CN_NETLINK_USERS                10      /* Highest index + 1 */
-
-/*
- * Maximum connector's message size.
- */
-#define CONNECTOR_MAX_MSG_SIZE          16384
-
-/*
- * idx and val are unique identifiers which 
- * are used for message routing and 
- * must be registered in connector.h for in-kernel usage.
- */
-
-struct cb_id {
-        __u32 idx;
-        __u32 val;
-};
-
-struct cn_msg {
-        struct cb_id id;
-
-        __u32 seq;
-        __u32 ack;
-
-        __u16 len;              /* Length of the following data */
-        __u16 flags;
-        __u8 data[0];
-};
-
-#ifdef __KERNEL__
 
 #include <linux/atomic.h>
 
@@ -82,6 +28,7 @@ struct cn_msg {
 #include <linux/workqueue.h>
 
 #include <net/sock.h>
+#include <uapi/linux/connector.h>
 
 #define CN_CBQ_NAMELEN          32
 
@@ -137,5 +84,4 @@ void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
 
-#endif                          /* __KERNEL__ */
 #endif                          /* __CONNECTOR_H */
diff --git a/include/linux/console.h b/include/linux/console.h
index 7201ce4280ca..dedb082fe50f 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -83,8 +83,14 @@ void give_up_console(const struct consw *sw);
 int con_debug_enter(struct vc_data *vc);
 int con_debug_leave(void);
 #else
-#define con_debug_enter(vc) (0)
-#define con_debug_leave() (0)
+static inline int con_debug_enter(struct vc_data *vc)
+{
+        return 0;
+}
+static inline int con_debug_leave(void)
+{
+        return 0;
+}
 #endif
 
 /* scroll */
diff --git a/include/linux/coredump.h b/include/linux/coredump.h
index ba4b85a6d9b8..1d7399314a89 100644
--- a/include/linux/coredump.h
+++ b/include/linux/coredump.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
+#include <asm/siginfo.h>
 
 /*
  * These are the only things you should do on a core-file: use only these
@@ -11,5 +12,10 @@
  */
 extern int dump_write(struct file *file, const void *addr, int nr);
 extern int dump_seek(struct file *file, loff_t off);
+#ifdef CONFIG_COREDUMP
+extern void do_coredump(siginfo_t *siginfo, struct pt_regs *regs);
+#else
+static inline void do_coredump(siginfo_t *siginfo, struct pt_regs *regs) {}
+#endif
 
 #endif /* _LINUX_COREDUMP_H */
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h
new file mode 100644
index 000000000000..851530128e65
--- /dev/null
+++ b/include/linux/cpu_cooling.h
@@ -0,0 +1,58 @@
+/*
+ *  linux/include/linux/cpu_cooling.h
+ *
+ *  Copyright (C) 2012  Samsung Electronics Co., Ltd(http://www.samsung.com)
+ *  Copyright (C) 2012  Amit Daniel <amit.kachhap@linaro.org>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#ifndef __CPU_COOLING_H__
+#define __CPU_COOLING_H__
+
+#include <linux/thermal.h>
+
+#define CPUFREQ_COOLING_START           0
+#define CPUFREQ_COOLING_STOP            1
+
+#ifdef CONFIG_CPU_THERMAL
+/**
+ * cpufreq_cooling_register - function to create cpufreq cooling device.
+ * @clip_cpus: cpumask of cpus where the frequency constraints will happen
+ */
+struct thermal_cooling_device *cpufreq_cooling_register(
+                struct cpumask *clip_cpus);
+
+/**
+ * cpufreq_cooling_unregister - function to remove cpufreq cooling device.
+ * @cdev: thermal cooling device pointer.
+ */
+void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev);
+#else /* !CONFIG_CPU_THERMAL */
+static inline struct thermal_cooling_device *cpufreq_cooling_register(
+        struct cpumask *clip_cpus)
+{
+        return NULL;
+}
+static inline void cpufreq_cooling_unregister(
+                struct thermal_cooling_device *cdev)
+{
+        return;
+}
+#endif  /* CONFIG_CPU_THERMAL */
+
+#endif /* __CPU_COOLING_H__ */
diff --git a/include/linux/cramfs_fs.h b/include/linux/cramfs_fs.h
index 0e7bf272ec2f..133789609f23 100644
--- a/include/linux/cramfs_fs.h
+++ b/include/linux/cramfs_fs.h
@@ -1,94 +1,10 @@
 #ifndef __CRAMFS_H
 #define __CRAMFS_H
 
-#include <linux/types.h>
-#include <linux/magic.h>
+#include <uapi/linux/cramfs_fs.h>
 
-#define CRAMFS_SIGNATURE        "Compressed ROMFS"
-
-/*
- * Width of various bitfields in struct cramfs_inode.
- * Primarily used to generate warnings in mkcramfs.
- */
-#define CRAMFS_MODE_WIDTH 16
-#define CRAMFS_UID_WIDTH 16
-#define CRAMFS_SIZE_WIDTH 24
-#define CRAMFS_GID_WIDTH 8
-#define CRAMFS_NAMELEN_WIDTH 6
-#define CRAMFS_OFFSET_WIDTH 26
-
-/*
- * Since inode.namelen is a unsigned 6-bit number, the maximum cramfs
- * path length is 63 << 2 = 252.
- */
-#define CRAMFS_MAXPATHLEN (((1 << CRAMFS_NAMELEN_WIDTH) - 1) << 2)
-
-/*
- * Reasonably terse representation of the inode data.
- */
-struct cramfs_inode {
-        __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
-        /* SIZE for device files is i_rdev */
-        __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
-        /* NAMELEN is the length of the file name, divided by 4 and
-           rounded up.  (cramfs doesn't support hard links.) */
-        /* OFFSET: For symlinks and non-empty regular files, this
-           contains the offset (divided by 4) of the file data in
-           compressed form (starting with an array of block pointers;
-           see README).  For non-empty directories it is the offset
-           (divided by 4) of the inode of the first file in that
-           directory.  For anything else, offset is zero. */
-        __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
-};
-
-struct cramfs_info {
-        __u32 crc;
-        __u32 edition;
-        __u32 blocks;
-        __u32 files;
-};
-
-/*
- * Superblock information at the beginning of the FS.
- */
-struct cramfs_super {
-        __u32 magic;                    /* 0x28cd3d45 - random number */
-        __u32 size;                     /* length in bytes */
-        __u32 flags;                    /* feature flags */
-        __u32 future;                   /* reserved for future use */
-        __u8 signature[16];             /* "Compressed ROMFS" */
-        struct cramfs_info fsid;        /* unique filesystem info */
-        __u8 name[16];                  /* user-defined name */
-        struct cramfs_inode root;       /* root inode data */
-};
-
-/*
- * Feature flags
- *
- * 0x00000000 - 0x000000ff: features that work for all past kernels
- * 0x00000100 - 0xffffffff: features that don't work for past kernels
- */
-#define CRAMFS_FLAG_FSID_VERSION_2      0x00000001      /* fsid version #2 */
-#define CRAMFS_FLAG_SORTED_DIRS         0x00000002      /* sorted dirs */
-#define CRAMFS_FLAG_HOLES               0x00000100      /* support for holes */
-#define CRAMFS_FLAG_WRONG_SIGNATURE     0x00000200      /* reserved */
-#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET 0x00000400      /* shifted root fs */
-
-/*
- * Valid values in super.flags.  Currently we refuse to mount
- * if (flags & ~CRAMFS_SUPPORTED_FLAGS).  Maybe that should be
- * changed to test super.future instead.
- */
-#define CRAMFS_SUPPORTED_FLAGS  ( 0x000000ff \
-                                | CRAMFS_FLAG_HOLES \
-                                | CRAMFS_FLAG_WRONG_SIGNATURE \
-                                | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET )
-
-#ifdef __KERNEL__
 /* Uncompression interfaces to the underlying zlib */
 int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen);
 int cramfs_uncompress_init(void);
 void cramfs_uncompress_exit(void);
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/cuda.h b/include/linux/cuda.h
index 9f9865ff781e..b72332823807 100644
--- a/include/linux/cuda.h
+++ b/include/linux/cuda.h
@@ -4,38 +4,15 @@
  *
  * Copyright (C) 1996 Paul Mackerras.
  */
-
 #ifndef _LINUX_CUDA_H
 #define _LINUX_CUDA_H
 
-/* CUDA commands (2nd byte) */
-#define CUDA_WARM_START         0
-#define CUDA_AUTOPOLL           1
-#define CUDA_GET_6805_ADDR      2
-#define CUDA_GET_TIME           3
-#define CUDA_GET_PRAM           7
-#define CUDA_SET_6805_ADDR      8
-#define CUDA_SET_TIME           9
-#define CUDA_POWERDOWN          0xa
-#define CUDA_POWERUP_TIME       0xb
-#define CUDA_SET_PRAM           0xc
-#define CUDA_MS_RESET           0xd
-#define CUDA_SEND_DFAC          0xe
-#define CUDA_RESET_SYSTEM       0x11
-#define CUDA_SET_IPL            0x12
-#define CUDA_SET_AUTO_RATE      0x14
-#define CUDA_GET_AUTO_RATE      0x16
-#define CUDA_SET_DEVICE_LIST    0x19
-#define CUDA_GET_DEVICE_LIST    0x1a
-#define CUDA_GET_SET_IIC        0x22
+#include <uapi/linux/cuda.h>
 
-#ifdef __KERNEL__
 
 extern int find_via_cuda(void);
 extern int cuda_request(struct adb_request *req,
                         void (*done)(struct adb_request *), int nbytes, ...);
 extern void cuda_poll(void);
 
-#endif  /* __KERNEL */
-
 #endif /* _LINUX_CUDA_H */
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index a5049eaf782d..19ae518f5471 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -63,434 +63,11 @@
  *
  *
  */
-
 #ifndef _LINUX_CYCLADES_H
 #define _LINUX_CYCLADES_H
 
-#include <linux/types.h>
-
-struct cyclades_monitor {
-        unsigned long           int_count;
-        unsigned long           char_count;
-        unsigned long           char_max;
-        unsigned long           char_last;
-};
-
-/*
- * These stats all reflect activity since the device was last initialized.
- * (i.e., since the port was opened with no other processes already having it
- * open)
- */
-struct cyclades_idle_stats {
-    __kernel_time_t in_use;     /* Time device has been in use (secs) */
-    __kernel_time_t recv_idle;  /* Time since last char received (secs) */
-    __kernel_time_t xmit_idle;  /* Time since last char transmitted (secs) */
-    unsigned long  recv_bytes;  /* Bytes received */
-    unsigned long  xmit_bytes;  /* Bytes transmitted */
-    unsigned long  overruns;    /* Input overruns */
-    unsigned long  frame_errs;  /* Input framing errors */
-    unsigned long  parity_errs; /* Input parity errors */
-};
-
-#define CYCLADES_MAGIC  0x4359
-
-#define CYGETMON                0x435901
-#define CYGETTHRESH             0x435902
-#define CYSETTHRESH             0x435903
-#define CYGETDEFTHRESH          0x435904
-#define CYSETDEFTHRESH          0x435905
-#define CYGETTIMEOUT            0x435906
-#define CYSETTIMEOUT            0x435907
-#define CYGETDEFTIMEOUT         0x435908
-#define CYSETDEFTIMEOUT         0x435909
-#define CYSETRFLOW              0x43590a
-#define CYGETRFLOW              0x43590b
-#define CYSETRTSDTR_INV         0x43590c
-#define CYGETRTSDTR_INV         0x43590d
-#define CYZSETPOLLCYCLE         0x43590e
-#define CYZGETPOLLCYCLE         0x43590f
-#define CYGETCD1400VER          0x435910
-#define CYSETWAIT               0x435912
-#define CYGETWAIT               0x435913
-
-/*************** CYCLOM-Z ADDITIONS ***************/
-
-#define CZIOC           ('M' << 8)
-#define CZ_NBOARDS      (CZIOC|0xfa)
-#define CZ_BOOT_START   (CZIOC|0xfb)
-#define CZ_BOOT_DATA    (CZIOC|0xfc)
-#define CZ_BOOT_END     (CZIOC|0xfd)
-#define CZ_TEST         (CZIOC|0xfe)
-
-#define CZ_DEF_POLL     (HZ/25)
-
-#define MAX_BOARD       4       /* Max number of boards */
-#define MAX_DEV         256     /* Max number of ports total */
-#define CYZ_MAX_SPEED   921600
-
-#define CYZ_FIFO_SIZE   16
-
-#define CYZ_BOOT_NWORDS 0x100
-struct CYZ_BOOT_CTRL {
-        unsigned short  nboard;
-        int             status[MAX_BOARD];
-        int             nchannel[MAX_BOARD];
-        int             fw_rev[MAX_BOARD];
-        unsigned long   offset;
-        unsigned long   data[CYZ_BOOT_NWORDS];
-};
-
-
-#ifndef DP_WINDOW_SIZE
-/*
- *      Memory Window Sizes
- */
-
-#define DP_WINDOW_SIZE          (0x00080000)    /* window size 512 Kb */
-#define ZE_DP_WINDOW_SIZE       (0x00100000)    /* window size 1 Mb (Ze and
-                                                  8Zo V.2 */
-#define CTRL_WINDOW_SIZE        (0x00000080)    /* runtime regs 128 bytes */
-
-/*
- *      CUSTOM_REG - Cyclom-Z/PCI Custom Registers Set. The driver
- *      normally will access only interested on the fpga_id, fpga_version,
- *      start_cpu and stop_cpu.
- */
-
-struct  CUSTOM_REG {
-        __u32   fpga_id;                /* FPGA Identification Register */
-        __u32   fpga_version;           /* FPGA Version Number Register */
-        __u32   cpu_start;              /* CPU start Register (write) */
-        __u32   cpu_stop;               /* CPU stop Register (write) */
-        __u32   misc_reg;               /* Miscellaneous Register */
-        __u32   idt_mode;               /* IDT mode Register */
-        __u32   uart_irq_status;        /* UART IRQ status Register */
-        __u32   clear_timer0_irq;       /* Clear timer interrupt Register */
-        __u32   clear_timer1_irq;       /* Clear timer interrupt Register */
-        __u32   clear_timer2_irq;       /* Clear timer interrupt Register */
-        __u32   test_register;          /* Test Register */
-        __u32   test_count;             /* Test Count Register */
-        __u32   timer_select;           /* Timer select register */
-        __u32   pr_uart_irq_status;     /* Prioritized UART IRQ stat Reg */
-        __u32   ram_wait_state;         /* RAM wait-state Register */
-        __u32   uart_wait_state;        /* UART wait-state Register */
-        __u32   timer_wait_state;       /* timer wait-state Register */
-        __u32   ack_wait_state;         /* ACK wait State Register */
-};
-
-/*
- *      RUNTIME_9060 - PLX PCI9060ES local configuration and shared runtime
- *      registers. This structure can be used to access the 9060 registers
- *      (memory mapped).
- */
-
-struct RUNTIME_9060 {
-        __u32   loc_addr_range; /* 00h - Local Address Range */
-        __u32   loc_addr_base;  /* 04h - Local Address Base */
-        __u32   loc_arbitr;     /* 08h - Local Arbitration */
-        __u32   endian_descr;   /* 0Ch - Big/Little Endian Descriptor */
-        __u32   loc_rom_range;  /* 10h - Local ROM Range */
-        __u32   loc_rom_base;   /* 14h - Local ROM Base */
-        __u32   loc_bus_descr;  /* 18h - Local Bus descriptor */
-        __u32   loc_range_mst;  /* 1Ch - Local Range for Master to PCI */
-        __u32   loc_base_mst;   /* 20h - Local Base for Master PCI */
-        __u32   loc_range_io;   /* 24h - Local Range for Master IO */
-        __u32   pci_base_mst;   /* 28h - PCI Base for Master PCI */
-        __u32   pci_conf_io;    /* 2Ch - PCI configuration for Master IO */
-        __u32   filler1;        /* 30h */
-        __u32   filler2;        /* 34h */
-        __u32   filler3;        /* 38h */
-        __u32   filler4;        /* 3Ch */
-        __u32   mail_box_0;     /* 40h - Mail Box 0 */
-        __u32   mail_box_1;     /* 44h - Mail Box 1 */
-        __u32   mail_box_2;     /* 48h - Mail Box 2 */
-        __u32   mail_box_3;     /* 4Ch - Mail Box 3 */
-        __u32   filler5;        /* 50h */
-        __u32   filler6;        /* 54h */
-        __u32   filler7;        /* 58h */
-        __u32   filler8;        /* 5Ch */
-        __u32   pci_doorbell;   /* 60h - PCI to Local Doorbell */
-        __u32   loc_doorbell;   /* 64h - Local to PCI Doorbell */
-        __u32   intr_ctrl_stat; /* 68h - Interrupt Control/Status */
-        __u32   init_ctrl;      /* 6Ch - EEPROM control, Init Control, etc */
-};
-
-/* Values for the Local Base Address re-map register */
-
-#define WIN_RAM         0x00000001L     /* set the sliding window to RAM */
-#define WIN_CREG        0x14000001L     /* set the window to custom Registers */
-
-/* Values timer select registers */
-
-#define TIMER_BY_1M     0x00            /* clock divided by 1M */
-#define TIMER_BY_256K   0x01            /* clock divided by 256k */
-#define TIMER_BY_128K   0x02            /* clock divided by 128k */
-#define TIMER_BY_32K    0x03            /* clock divided by 32k */
-
-/****************** ****************** *******************/
-#endif
-
-#ifndef ZFIRM_ID
-/* #include "zfwint.h" */
-/****************** ****************** *******************/
-/*
- *      This file contains the definitions for interfacing with the
- *      Cyclom-Z ZFIRM Firmware.
- */
-
-/* General Constant definitions */
-
-#define MAX_CHAN        64              /* max number of channels per board */
-
-/* firmware id structure (set after boot) */
-
-#define ID_ADDRESS      0x00000180L     /* signature/pointer address */
-#define ZFIRM_ID        0x5557465AL     /* ZFIRM/U signature */
-#define ZFIRM_HLT       0x59505B5CL     /* ZFIRM needs external power supply */
-#define ZFIRM_RST       0x56040674L     /* RST signal (due to FW reset) */
-
-#define ZF_TINACT_DEF   1000            /* default inactivity timeout 
-                                           (1000 ms) */
-#define ZF_TINACT       ZF_TINACT_DEF
-
-struct  FIRM_ID {
-        __u32   signature;              /* ZFIRM/U signature */
-        __u32   zfwctrl_addr;           /* pointer to ZFW_CTRL structure */
-};
-
-/* Op. System id */
-
-#define C_OS_LINUX      0x00000030      /* generic Linux system */
-
-/* channel op_mode */
-
-#define C_CH_DISABLE    0x00000000      /* channel is disabled */
-#define C_CH_TXENABLE   0x00000001      /* channel Tx enabled */
-#define C_CH_RXENABLE   0x00000002      /* channel Rx enabled */
-#define C_CH_ENABLE     0x00000003      /* channel Tx/Rx enabled */
-#define C_CH_LOOPBACK   0x00000004      /* Loopback mode */
-
-/* comm_parity - parity */
-
-#define C_PR_NONE       0x00000000      /* None */
-#define C_PR_ODD        0x00000001      /* Odd */
-#define C_PR_EVEN       0x00000002      /* Even */
-#define C_PR_MARK       0x00000004      /* Mark */
-#define C_PR_SPACE      0x00000008      /* Space */
-#define C_PR_PARITY     0x000000ff
-
-#define C_PR_DISCARD    0x00000100      /* discard char with frame/par error */
-#define C_PR_IGNORE     0x00000200      /* ignore frame/par error */
-
-/* comm_data_l - data length and stop bits */
-
-#define C_DL_CS5        0x00000001
-#define C_DL_CS6        0x00000002
-#define C_DL_CS7        0x00000004
-#define C_DL_CS8        0x00000008
-#define C_DL_CS         0x0000000f
-#define C_DL_1STOP      0x00000010
-#define C_DL_15STOP     0x00000020
-#define C_DL_2STOP      0x00000040
-#define C_DL_STOP       0x000000f0
-
-/* interrupt enabling/status */
-
-#define C_IN_DISABLE    0x00000000      /* zero, disable interrupts */
-#define C_IN_TXBEMPTY   0x00000001      /* tx buffer empty */
-#define C_IN_TXLOWWM    0x00000002      /* tx buffer below LWM */
-#define C_IN_RXHIWM     0x00000010      /* rx buffer above HWM */
-#define C_IN_RXNNDT     0x00000020      /* rx no new data timeout */
-#define C_IN_MDCD       0x00000100      /* modem DCD change */
-#define C_IN_MDSR       0x00000200      /* modem DSR change */
-#define C_IN_MRI        0x00000400      /* modem RI change */
-#define C_IN_MCTS       0x00000800      /* modem CTS change */
-#define C_IN_RXBRK      0x00001000      /* Break received */
-#define C_IN_PR_ERROR   0x00002000      /* parity error */
-#define C_IN_FR_ERROR   0x00004000      /* frame error */
-#define C_IN_OVR_ERROR  0x00008000      /* overrun error */
-#define C_IN_RXOFL      0x00010000      /* RX buffer overflow */
-#define C_IN_IOCTLW     0x00020000      /* I/O control w/ wait */
-#define C_IN_MRTS       0x00040000      /* modem RTS drop */
-#define C_IN_ICHAR      0x00080000
- 
-/* flow control */
-
-#define C_FL_OXX        0x00000001      /* output Xon/Xoff flow control */
-#define C_FL_IXX        0x00000002      /* output Xon/Xoff flow control */
-#define C_FL_OIXANY     0x00000004      /* output Xon/Xoff (any xon) */
-#define C_FL_SWFLOW     0x0000000f
-
-/* flow status */
-
-#define C_FS_TXIDLE     0x00000000      /* no Tx data in the buffer or UART */
-#define C_FS_SENDING    0x00000001      /* UART is sending data */
-#define C_FS_SWFLOW     0x00000002      /* Tx is stopped by received Xoff */
-
-/* rs_control/rs_status RS-232 signals */
-
-#define C_RS_PARAM      0x80000000      /* Indicates presence of parameter in 
-                                           IOCTLM command */
-#define C_RS_RTS        0x00000001      /* RTS */
-#define C_RS_DTR        0x00000004      /* DTR */
-#define C_RS_DCD        0x00000100      /* CD */
-#define C_RS_DSR        0x00000200      /* DSR */
-#define C_RS_RI         0x00000400      /* RI */
-#define C_RS_CTS        0x00000800      /* CTS */
-
-/* commands Host <-> Board */
-
-#define C_CM_RESET      0x01            /* reset/flush buffers */
-#define C_CM_IOCTL      0x02            /* re-read CH_CTRL */
-#define C_CM_IOCTLW     0x03            /* re-read CH_CTRL, intr when done */
-#define C_CM_IOCTLM     0x04            /* RS-232 outputs change */
-#define C_CM_SENDXOFF   0x10            /* send Xoff */
-#define C_CM_SENDXON    0x11            /* send Xon */
-#define C_CM_CLFLOW     0x12            /* Clear flow control (resume) */
-#define C_CM_SENDBRK    0x41            /* send break */
-#define C_CM_INTBACK    0x42            /* Interrupt back */
-#define C_CM_SET_BREAK  0x43            /* Tx break on */
-#define C_CM_CLR_BREAK  0x44            /* Tx break off */
-#define C_CM_CMD_DONE   0x45            /* Previous command done */
-#define C_CM_INTBACK2   0x46            /* Alternate Interrupt back */
-#define C_CM_TINACT     0x51            /* set inactivity detection */
-#define C_CM_IRQ_ENBL   0x52            /* enable generation of interrupts */
-#define C_CM_IRQ_DSBL   0x53            /* disable generation of interrupts */
-#define C_CM_ACK_ENBL   0x54            /* enable acknowledged interrupt mode */
-#define C_CM_ACK_DSBL   0x55            /* disable acknowledged intr mode */
-#define C_CM_FLUSH_RX   0x56            /* flushes Rx buffer */
-#define C_CM_FLUSH_TX   0x57            /* flushes Tx buffer */
-#define C_CM_Q_ENABLE   0x58            /* enables queue access from the 
-                                           driver */
-#define C_CM_Q_DISABLE  0x59            /* disables queue access from the 
-                                           driver */
-
-#define C_CM_TXBEMPTY   0x60            /* Tx buffer is empty */
-#define C_CM_TXLOWWM    0x61            /* Tx buffer low water mark */
-#define C_CM_RXHIWM     0x62            /* Rx buffer high water mark */
-#define C_CM_RXNNDT     0x63            /* rx no new data timeout */
-#define C_CM_TXFEMPTY   0x64
-#define C_CM_ICHAR      0x65
-#define C_CM_MDCD       0x70            /* modem DCD change */
-#define C_CM_MDSR       0x71            /* modem DSR change */
-#define C_CM_MRI        0x72            /* modem RI change */
-#define C_CM_MCTS       0x73            /* modem CTS change */
-#define C_CM_MRTS       0x74            /* modem RTS drop */
-#define C_CM_RXBRK      0x84            /* Break received */
-#define C_CM_PR_ERROR   0x85            /* Parity error */
-#define C_CM_FR_ERROR   0x86            /* Frame error */
-#define C_CM_OVR_ERROR  0x87            /* Overrun error */
-#define C_CM_RXOFL      0x88            /* RX buffer overflow */
-#define C_CM_CMDERROR   0x90            /* command error */
-#define C_CM_FATAL      0x91            /* fatal error */
-#define C_CM_HW_RESET   0x92            /* reset board */
-
-/*
- *      CH_CTRL - This per port structure contains all parameters
- *      that control an specific port. It can be seen as the
- *      configuration registers of a "super-serial-controller".
- */
-
-struct CH_CTRL {
-        __u32   op_mode;        /* operation mode */
-        __u32   intr_enable;    /* interrupt masking */
-        __u32   sw_flow;        /* SW flow control */
-        __u32   flow_status;    /* output flow status */
-        __u32   comm_baud;      /* baud rate  - numerically specified */
-        __u32   comm_parity;    /* parity */
-        __u32   comm_data_l;    /* data length/stop */
-        __u32   comm_flags;     /* other flags */
-        __u32   hw_flow;        /* HW flow control */
-        __u32   rs_control;     /* RS-232 outputs */
-        __u32   rs_status;      /* RS-232 inputs */
-        __u32   flow_xon;       /* xon char */
-        __u32   flow_xoff;      /* xoff char */
-        __u32   hw_overflow;    /* hw overflow counter */
-        __u32   sw_overflow;    /* sw overflow counter */
-        __u32   comm_error;     /* frame/parity error counter */
-        __u32 ichar;
-        __u32 filler[7];
-};
-
-
-/*
- *      BUF_CTRL - This per channel structure contains
- *      all Tx and Rx buffer control for a given channel.
- */
-
-struct  BUF_CTRL        {
-        __u32   flag_dma;       /* buffers are in Host memory */
-        __u32   tx_bufaddr;     /* address of the tx buffer */
-        __u32   tx_bufsize;     /* tx buffer size */
-        __u32   tx_threshold;   /* tx low water mark */
-        __u32   tx_get;         /* tail index tx buf */
-        __u32   tx_put;         /* head index tx buf */
-        __u32   rx_bufaddr;     /* address of the rx buffer */
-        __u32   rx_bufsize;     /* rx buffer size */
-        __u32   rx_threshold;   /* rx high water mark */
-        __u32   rx_get;         /* tail index rx buf */
-        __u32   rx_put;         /* head index rx buf */
-        __u32   filler[5];      /* filler to align structures */
-};
-
-/*
- *      BOARD_CTRL - This per board structure contains all global 
- *      control fields related to the board.
- */
-
-struct BOARD_CTRL {
-
-        /* static info provided by the on-board CPU */
-        __u32   n_channel;      /* number of channels */
-        __u32   fw_version;     /* firmware version */
-
-        /* static info provided by the driver */
-        __u32   op_system;      /* op_system id */
-        __u32   dr_version;     /* driver version */
-
-        /* board control area */
-        __u32   inactivity;     /* inactivity control */
-
-        /* host to FW commands */
-        __u32   hcmd_channel;   /* channel number */
-        __u32   hcmd_param;     /* pointer to parameters */
-
-        /* FW to Host commands */
-        __u32   fwcmd_channel;  /* channel number */
-        __u32   fwcmd_param;    /* pointer to parameters */
-        __u32   zf_int_queue_addr; /* offset for INT_QUEUE structure */
-
-        /* filler so the structures are aligned */
-        __u32   filler[6];
-};
-
-/* Host Interrupt Queue */
-
-#define QUEUE_SIZE      (10*MAX_CHAN)
-
-struct  INT_QUEUE {
-        unsigned char   intr_code[QUEUE_SIZE];
-        unsigned long   channel[QUEUE_SIZE];
-        unsigned long   param[QUEUE_SIZE];
-        unsigned long   put;
-        unsigned long   get;
-};
-
-/*
- *      ZFW_CTRL - This is the data structure that includes all other
- *      data structures used by the Firmware.
- */
- 
-struct ZFW_CTRL {
-        struct BOARD_CTRL       board_ctrl;
-        struct CH_CTRL          ch_ctrl[MAX_CHAN];
-        struct BUF_CTRL         buf_ctrl[MAX_CHAN];
-};
-
-/****************** ****************** *******************/
-#endif
+#include <uapi/linux/cyclades.h>
 
-#ifdef __KERNEL__
 
 /* Per card data structure */
 struct cyclades_card {
@@ -780,5 +357,4 @@ struct cyclades_port {
 
 /***************************************************************************/
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_CYCLADES_H */
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index d16294e2a118..439ff698000a 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -1,239 +1,6 @@
 #ifndef _LINUX_DCCP_H
 #define _LINUX_DCCP_H
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/**
- * struct dccp_hdr - generic part of DCCP packet header
- *
- * @dccph_sport - Relevant port on the endpoint that sent this packet
- * @dccph_dport - Relevant port on the other endpoint
- * @dccph_doff - Data Offset from the start of the DCCP header, in 32-bit words
- * @dccph_ccval - Used by the HC-Sender CCID
- * @dccph_cscov - Parts of the packet that are covered by the Checksum field
- * @dccph_checksum - Internet checksum, depends on dccph_cscov
- * @dccph_x - 0 = 24 bit sequence number, 1 = 48
- * @dccph_type - packet type, see DCCP_PKT_ prefixed macros
- * @dccph_seq - sequence number high or low order 24 bits, depends on dccph_x
- */
-struct dccp_hdr {
-        __be16  dccph_sport,
-                dccph_dport;
-        __u8    dccph_doff;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8    dccph_cscov:4,
-                dccph_ccval:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8    dccph_ccval:4,
-                dccph_cscov:4;
-#else
-#error  "Adjust your <asm/byteorder.h> defines"
-#endif
-        __sum16 dccph_checksum;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8    dccph_x:1,
-                dccph_type:4,
-                dccph_reserved:3;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8    dccph_reserved:3,
-                dccph_type:4,
-                dccph_x:1;
-#else
-#error  "Adjust your <asm/byteorder.h> defines"
-#endif
-        __u8    dccph_seq2;
-        __be16  dccph_seq;
-};
-
-/**
- * struct dccp_hdr_ext - the low bits of a 48 bit seq packet
- *
- * @dccph_seq_low - low 24 bits of a 48 bit seq packet
- */
-struct dccp_hdr_ext {
-        __be32  dccph_seq_low;
-};
-
-/**
- * struct dccp_hdr_request - Connection initiation request header
- *
- * @dccph_req_service - Service to which the client app wants to connect
- */
-struct dccp_hdr_request {
-        __be32  dccph_req_service;
-};
-/**
- * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
- *
- * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
- * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
- */
-struct dccp_hdr_ack_bits {
-        __be16  dccph_reserved1;
-        __be16  dccph_ack_nr_high;
-        __be32  dccph_ack_nr_low;
-};
-/**
- * struct dccp_hdr_response - Connection initiation response header
- *
- * @dccph_resp_ack - 48 bit Acknowledgment Number Subheader (5.3)
- * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
- */
-struct dccp_hdr_response {
-        struct dccp_hdr_ack_bits        dccph_resp_ack;
-        __be32                          dccph_resp_service;
-};
-
-/**
- * struct dccp_hdr_reset - Unconditionally shut down a connection
- *
- * @dccph_reset_ack - 48 bit Acknowledgment Number Subheader (5.6)
- * @dccph_reset_code - one of %dccp_reset_codes
- * @dccph_reset_data - the Data 1 ... Data 3 fields from 5.6
- */
-struct dccp_hdr_reset {
-        struct dccp_hdr_ack_bits        dccph_reset_ack;
-        __u8                            dccph_reset_code,
-                                        dccph_reset_data[3];
-};
-
-enum dccp_pkt_type {
-        DCCP_PKT_REQUEST = 0,
-        DCCP_PKT_RESPONSE,
-        DCCP_PKT_DATA,
-        DCCP_PKT_ACK,
-        DCCP_PKT_DATAACK,
-        DCCP_PKT_CLOSEREQ,
-        DCCP_PKT_CLOSE,
-        DCCP_PKT_RESET,
-        DCCP_PKT_SYNC,
-        DCCP_PKT_SYNCACK,
-        DCCP_PKT_INVALID,
-};
-
-#define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID
-
-static inline unsigned int dccp_packet_hdr_len(const __u8 type)
-{
-        if (type == DCCP_PKT_DATA)
-                return 0;
-        if (type == DCCP_PKT_DATAACK    ||
-            type == DCCP_PKT_ACK        ||
-            type == DCCP_PKT_SYNC       ||
-            type == DCCP_PKT_SYNCACK    ||
-            type == DCCP_PKT_CLOSE      ||
-            type == DCCP_PKT_CLOSEREQ)
-                return sizeof(struct dccp_hdr_ack_bits);
-        if (type == DCCP_PKT_REQUEST)
-                return sizeof(struct dccp_hdr_request);
-        if (type == DCCP_PKT_RESPONSE)
-                return sizeof(struct dccp_hdr_response);
-        return sizeof(struct dccp_hdr_reset);
-}
-enum dccp_reset_codes {
-        DCCP_RESET_CODE_UNSPECIFIED = 0,
-        DCCP_RESET_CODE_CLOSED,
-        DCCP_RESET_CODE_ABORTED,
-        DCCP_RESET_CODE_NO_CONNECTION,
-        DCCP_RESET_CODE_PACKET_ERROR,
-        DCCP_RESET_CODE_OPTION_ERROR,
-        DCCP_RESET_CODE_MANDATORY_ERROR,
-        DCCP_RESET_CODE_CONNECTION_REFUSED,
-        DCCP_RESET_CODE_BAD_SERVICE_CODE,
-        DCCP_RESET_CODE_TOO_BUSY,
-        DCCP_RESET_CODE_BAD_INIT_COOKIE,
-        DCCP_RESET_CODE_AGGRESSION_PENALTY,
-
-        DCCP_MAX_RESET_CODES            /* Leave at the end!  */
-};
-
-/* DCCP options */
-enum {
-        DCCPO_PADDING = 0,
-        DCCPO_MANDATORY = 1,
-        DCCPO_MIN_RESERVED = 3,
-        DCCPO_MAX_RESERVED = 31,
-        DCCPO_CHANGE_L = 32,
-        DCCPO_CONFIRM_L = 33,
-        DCCPO_CHANGE_R = 34,
-        DCCPO_CONFIRM_R = 35,
-        DCCPO_NDP_COUNT = 37,
-        DCCPO_ACK_VECTOR_0 = 38,
-        DCCPO_ACK_VECTOR_1 = 39,
-        DCCPO_TIMESTAMP = 41,
-        DCCPO_TIMESTAMP_ECHO = 42,
-        DCCPO_ELAPSED_TIME = 43,
-        DCCPO_MAX = 45,
-        DCCPO_MIN_RX_CCID_SPECIFIC = 128,       /* from sender to receiver */
-        DCCPO_MAX_RX_CCID_SPECIFIC = 191,
-        DCCPO_MIN_TX_CCID_SPECIFIC = 192,       /* from receiver to sender */
-        DCCPO_MAX_TX_CCID_SPECIFIC = 255,
-};
-/* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
-#define DCCP_SINGLE_OPT_MAXLEN  253
-
-/* DCCP CCIDS */
-enum {
-        DCCPC_CCID2 = 2,
-        DCCPC_CCID3 = 3,
-};
-
-/* DCCP features (RFC 4340 section 6.4) */
-enum dccp_feature_numbers {
-        DCCPF_RESERVED = 0,
-        DCCPF_CCID = 1,
-        DCCPF_SHORT_SEQNOS = 2,
-        DCCPF_SEQUENCE_WINDOW = 3,
-        DCCPF_ECN_INCAPABLE = 4,
-        DCCPF_ACK_RATIO = 5,
-        DCCPF_SEND_ACK_VECTOR = 6,
-        DCCPF_SEND_NDP_COUNT = 7,
-        DCCPF_MIN_CSUM_COVER = 8,
-        DCCPF_DATA_CHECKSUM = 9,
-        /* 10-127 reserved */
-        DCCPF_MIN_CCID_SPECIFIC = 128,
-        DCCPF_SEND_LEV_RATE = 192,      /* RFC 4342, sec. 8.4 */
-        DCCPF_MAX_CCID_SPECIFIC = 255,
-};
-
-/* DCCP socket control message types for cmsg */
-enum dccp_cmsg_type {
-        DCCP_SCM_PRIORITY = 1,
-        DCCP_SCM_QPOLICY_MAX = 0xFFFF,
-        /* ^-- Up to here reserved exclusively for qpolicy parameters */
-        DCCP_SCM_MAX
-};
-
-/* DCCP priorities for outgoing/queued packets */
-enum dccp_packet_dequeueing_policy {
-        DCCPQ_POLICY_SIMPLE,
-        DCCPQ_POLICY_PRIO,
-        DCCPQ_POLICY_MAX
-};
-
-/* DCCP socket options */
-#define DCCP_SOCKOPT_PACKET_SIZE        1 /* XXX deprecated, without effect */
-#define DCCP_SOCKOPT_SERVICE            2
-#define DCCP_SOCKOPT_CHANGE_L           3
-#define DCCP_SOCKOPT_CHANGE_R           4
-#define DCCP_SOCKOPT_GET_CUR_MPS        5
-#define DCCP_SOCKOPT_SERVER_TIMEWAIT    6
-#define DCCP_SOCKOPT_SEND_CSCOV         10
-#define DCCP_SOCKOPT_RECV_CSCOV         11
-#define DCCP_SOCKOPT_AVAILABLE_CCIDS    12
-#define DCCP_SOCKOPT_CCID               13
-#define DCCP_SOCKOPT_TX_CCID            14
-#define DCCP_SOCKOPT_RX_CCID            15
-#define DCCP_SOCKOPT_QPOLICY_ID         16
-#define DCCP_SOCKOPT_QPOLICY_TXQLEN     17
-#define DCCP_SOCKOPT_CCID_RX_INFO       128
-#define DCCP_SOCKOPT_CCID_TX_INFO       192
-
-/* maximum number of services provided on the same listening port */
-#define DCCP_SERVICE_LIST_MAX_LEN      32
-
-#ifdef __KERNEL__
 
 #include <linux/in.h>
 #include <linux/interrupt.h>
@@ -246,6 +13,7 @@ enum dccp_packet_dequeueing_policy {
 #include <net/inet_sock.h>
 #include <net/inet_timewait_sock.h>
 #include <net/tcp_states.h>
+#include <uapi/linux/dccp.h>
 
 enum dccp_state {
         DCCP_OPEN            = TCP_ESTABLISHED,
@@ -551,6 +319,4 @@ static inline const char *dccp_role(const struct sock *sk)
 
 extern void dccp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_DCCP_H */
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 520152411cd1..1d47dcce11e1 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -10,68 +10,11 @@
 **
 *******************************************************************************
 ******************************************************************************/
-
 #ifndef __DLM_DOT_H__
 #define __DLM_DOT_H__
 
-/*
- * Interface to Distributed Lock Manager (DLM)
- * routines and structures to use DLM lockspaces
- */
-
-/* Lock levels and flags are here */
-#include <linux/dlmconstants.h>
-#include <linux/types.h>
-
-typedef void dlm_lockspace_t;
-
-/*
- * Lock status block
- *
- * Use this structure to specify the contents of the lock value block.  For a
- * conversion request, this structure is used to specify the lock ID of the
- * lock.  DLM writes the status of the lock request and the lock ID assigned
- * to the request in the lock status block.
- *
- * sb_lkid: the returned lock ID.  It is set on new (non-conversion) requests.
- * It is available when dlm_lock returns.
- *
- * sb_lvbptr: saves or returns the contents of the lock's LVB according to rules
- * shown for the DLM_LKF_VALBLK flag.
- *
- * sb_flags: DLM_SBF_DEMOTED is returned if in the process of promoting a lock,
- * it was first demoted to NL to avoid conversion deadlock.
- * DLM_SBF_VALNOTVALID is returned if the resource's LVB is marked invalid.
- *
- * sb_status: the returned status of the lock request set prior to AST
- * execution.  Possible return values:
- *
- * 0 if lock request was successful
- * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE
- * -DLM_EUNLOCK if unlock request was successful
- * -DLM_ECANCEL if a cancel completed successfully
- * -EDEADLK if a deadlock was detected
- * -ETIMEDOUT if the lock request was canceled due to a timeout
- */
-
-#define DLM_SBF_DEMOTED         0x01
-#define DLM_SBF_VALNOTVALID     0x02
-#define DLM_SBF_ALTMODE         0x04
+#include <uapi/linux/dlm.h>
 
-struct dlm_lksb {
-        int      sb_status;
-        __u32    sb_lkid;
-        char     sb_flags;
-        char *   sb_lvbptr;
-};
-
-/* dlm_new_lockspace() flags */
-
-#define DLM_LSFL_TIMEWARN       0x00000002
-#define DLM_LSFL_FS             0x00000004
-#define DLM_LSFL_NEWEXCL        0x00000008
-
-#ifdef __KERNEL__
 
 struct dlm_slot {
         int nodeid; /* 1 to MAX_INT */
@@ -226,7 +169,4 @@ int dlm_unlock(dlm_lockspace_t *lockspace,
                struct dlm_lksb *lksb,
                void *astarg);
 
-#endif                          /* __KERNEL__ */
-
 #endif                          /* __DLM_DOT_H__ */
-
diff --git a/include/linux/dlm_plock.h b/include/linux/dlm_plock.h
index 3b1cc1be419f..95ad387a7769 100644
--- a/include/linux/dlm_plock.h
+++ b/include/linux/dlm_plock.h
@@ -5,50 +5,15 @@
  * modify, copy, or redistribute it subject to the terms and conditions
  * of the GNU General Public License v.2.
  */
-
 #ifndef __DLM_PLOCK_DOT_H__
 #define __DLM_PLOCK_DOT_H__
 
-#include <linux/types.h>
-
-#define DLM_PLOCK_MISC_NAME             "dlm_plock"
-
-#define DLM_PLOCK_VERSION_MAJOR 1
-#define DLM_PLOCK_VERSION_MINOR 2
-#define DLM_PLOCK_VERSION_PATCH 0
-
-enum {
-        DLM_PLOCK_OP_LOCK = 1,
-        DLM_PLOCK_OP_UNLOCK,
-        DLM_PLOCK_OP_GET,
-};
+#include <uapi/linux/dlm_plock.h>
 
-#define DLM_PLOCK_FL_CLOSE 1
-
-struct dlm_plock_info {
-        __u32 version[3];
-        __u8 optype;
-        __u8 ex;
-        __u8 wait;
-        __u8 flags;
-        __u32 pid;
-        __s32 nodeid;
-        __s32 rv;
-        __u32 fsid;
-        __u64 number;
-        __u64 start;
-        __u64 end;
-        __u64 owner;
-};
-
-#ifdef __KERNEL__
 int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
                 int cmd, struct file_lock *fl);
 int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
                 struct file_lock *fl);
 int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file,
                 struct file_lock *fl);
-#endif /* __KERNEL__ */
-
 #endif
-
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 9c02a4508b25..d3201e438d16 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -591,7 +591,7 @@ struct dma_device {
         struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
                 size_t period_len, enum dma_transfer_direction direction,
-                void *context);
+                unsigned long flags, void *context);
         struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
                 struct dma_chan *chan, struct dma_interleaved_template *xt,
                 unsigned long flags);
@@ -653,10 +653,11 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_rio_sg(
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
-                size_t period_len, enum dma_transfer_direction dir)
+                size_t period_len, enum dma_transfer_direction dir,
+                unsigned long flags)
 {
         return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,
-                                                period_len, dir, NULL);
+                                                period_len, dir, flags, NULL);
 }
 
 static inline int dmaengine_terminate_all(struct dma_chan *chan)
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
index f4dba8637f98..e69de29bb2d1 100644
--- a/include/linux/dvb/Kbuild
+++ b/include/linux/dvb/Kbuild
@@ -1,8 +0,0 @@
-header-y += audio.h
-header-y += ca.h
-header-y += dmx.h
-header-y += frontend.h
-header-y += net.h
-header-y += osd.h
-header-y += version.h
-header-y += video.h
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index f078f3ac82d4..0be6d8f2b52b 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -20,138 +20,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
-
 #ifndef _DVBDMX_H_
 #define _DVBDMX_H_
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/time.h>
-#else
-#include <time.h>
-#endif
-
-
-#define DMX_FILTER_SIZE 16
-
-typedef enum
-{
-        DMX_OUT_DECODER, /* Streaming directly to decoder. */
-        DMX_OUT_TAP,     /* Output going to a memory buffer */
-                         /* (to be retrieved via the read command).*/
-        DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
-                         /* (to be retrieved by reading from the */
-                         /* logical DVR device).                 */
-        DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
-} dmx_output_t;
-
-
-typedef enum
-{
-        DMX_IN_FRONTEND, /* Input from a front-end device.  */
-        DMX_IN_DVR       /* Input from the logical DVR device.  */
-} dmx_input_t;
-
-
-typedef enum
-{
-        DMX_PES_AUDIO0,
-        DMX_PES_VIDEO0,
-        DMX_PES_TELETEXT0,
-        DMX_PES_SUBTITLE0,
-        DMX_PES_PCR0,
-
-        DMX_PES_AUDIO1,
-        DMX_PES_VIDEO1,
-        DMX_PES_TELETEXT1,
-        DMX_PES_SUBTITLE1,
-        DMX_PES_PCR1,
-
-        DMX_PES_AUDIO2,
-        DMX_PES_VIDEO2,
-        DMX_PES_TELETEXT2,
-        DMX_PES_SUBTITLE2,
-        DMX_PES_PCR2,
-
-        DMX_PES_AUDIO3,
-        DMX_PES_VIDEO3,
-        DMX_PES_TELETEXT3,
-        DMX_PES_SUBTITLE3,
-        DMX_PES_PCR3,
-
-        DMX_PES_OTHER
-} dmx_pes_type_t;
-
-#define DMX_PES_AUDIO    DMX_PES_AUDIO0
-#define DMX_PES_VIDEO    DMX_PES_VIDEO0
-#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
-#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
-#define DMX_PES_PCR      DMX_PES_PCR0
-
-
-typedef struct dmx_filter
-{
-        __u8  filter[DMX_FILTER_SIZE];
-        __u8  mask[DMX_FILTER_SIZE];
-        __u8  mode[DMX_FILTER_SIZE];
-} dmx_filter_t;
-
-
-struct dmx_sct_filter_params
-{
-        __u16          pid;
-        dmx_filter_t   filter;
-        __u32          timeout;
-        __u32          flags;
-#define DMX_CHECK_CRC       1
-#define DMX_ONESHOT         2
-#define DMX_IMMEDIATE_START 4
-#define DMX_KERNEL_CLIENT   0x8000
-};
-
-
-struct dmx_pes_filter_params
-{
-        __u16          pid;
-        dmx_input_t    input;
-        dmx_output_t   output;
-        dmx_pes_type_t pes_type;
-        __u32          flags;
-};
-
-typedef struct dmx_caps {
-        __u32 caps;
-        int num_decoders;
-} dmx_caps_t;
-
-typedef enum {
-        DMX_SOURCE_FRONT0 = 0,
-        DMX_SOURCE_FRONT1,
-        DMX_SOURCE_FRONT2,
-        DMX_SOURCE_FRONT3,
-        DMX_SOURCE_DVR0   = 16,
-        DMX_SOURCE_DVR1,
-        DMX_SOURCE_DVR2,
-        DMX_SOURCE_DVR3
-} dmx_source_t;
-
-struct dmx_stc {
-        unsigned int num;       /* input : which STC? 0..N */
-        unsigned int base;      /* output: divisor for stc to get 90 kHz clock */
-        __u64 stc;              /* output: stc in 'base'*90 kHz units */
-};
-
-
-#define DMX_START                _IO('o', 41)
-#define DMX_STOP                 _IO('o', 42)
-#define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)
-#define DMX_SET_PES_FILTER       _IOW('o', 44, struct dmx_pes_filter_params)
-#define DMX_SET_BUFFER_SIZE      _IO('o', 45)
-#define DMX_GET_PES_PIDS         _IOR('o', 47, __u16[5])
-#define DMX_GET_CAPS             _IOR('o', 48, dmx_caps_t)
-#define DMX_SET_SOURCE           _IOW('o', 49, dmx_source_t)
-#define DMX_GET_STC              _IOWR('o', 50, struct dmx_stc)
-#define DMX_ADD_PID              _IOW('o', 51, __u16)
-#define DMX_REMOVE_PID           _IOW('o', 52, __u16)
+#include <uapi/linux/dvb/dmx.h>
 
 #endif /*_DVBDMX_H_*/
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 1d750c0fd86e..85c20d925696 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -20,257 +20,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
-
 #ifndef _DVBVIDEO_H_
 #define _DVBVIDEO_H_
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/compiler.h>
-#else
-#include <stdint.h>
-#include <time.h>
-#endif
-
-typedef enum {
-        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
-        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
-        VIDEO_FORMAT_221_1    /* 2.21:1 */
-} video_format_t;
-
-
-typedef enum {
-         VIDEO_SYSTEM_PAL,
-         VIDEO_SYSTEM_NTSC,
-         VIDEO_SYSTEM_PALN,
-         VIDEO_SYSTEM_PALNc,
-         VIDEO_SYSTEM_PALM,
-         VIDEO_SYSTEM_NTSC60,
-         VIDEO_SYSTEM_PAL60,
-         VIDEO_SYSTEM_PALM60
-} video_system_t;
-
-
-typedef enum {
-        VIDEO_PAN_SCAN,       /* use pan and scan format */
-        VIDEO_LETTER_BOX,     /* use letterbox format */
-        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
-} video_displayformat_t;
-
-typedef struct {
-        int w;
-        int h;
-        video_format_t aspect_ratio;
-} video_size_t;
-
-typedef enum {
-        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
-        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
-                               comes from the user through the write
-                               system call */
-} video_stream_source_t;
-
-
-typedef enum {
-        VIDEO_STOPPED, /* Video is stopped */
-        VIDEO_PLAYING, /* Video is currently playing */
-        VIDEO_FREEZED  /* Video is freezed */
-} video_play_state_t;
-
-
-/* Decoder commands */
-#define VIDEO_CMD_PLAY        (0)
-#define VIDEO_CMD_STOP        (1)
-#define VIDEO_CMD_FREEZE      (2)
-#define VIDEO_CMD_CONTINUE    (3)
-
-/* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
-
-/* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
-
-/* Play input formats: */
-/* The decoder has no special format requirements */
-#define VIDEO_PLAY_FMT_NONE         (0)
-/* The decoder requires full GOPs */
-#define VIDEO_PLAY_FMT_GOP          (1)
-
-/* The structure must be zeroed before use by the application
-   This ensures it can be extended safely in the future. */
-struct video_command {
-        __u32 cmd;
-        __u32 flags;
-        union {
-                struct {
-                        __u64 pts;
-                } stop;
-
-                struct {
-                        /* 0 or 1000 specifies normal speed,
-                           1 specifies forward single stepping,
-                           -1 specifies backward single stepping,
-                           >1: playback at speed/1000 of the normal speed,
-                           <-1: reverse playback at (-speed/1000) of the normal speed. */
-                        __s32 speed;
-                        __u32 format;
-                } play;
-
-                struct {
-                        __u32 data[16];
-                } raw;
-        };
-};
-
-/* FIELD_UNKNOWN can be used if the hardware does not know whether
-   the Vsync is for an odd, even or progressive (i.e. non-interlaced)
-   field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
-#define VIDEO_VSYNC_FIELD_ODD           (1)
-#define VIDEO_VSYNC_FIELD_EVEN          (2)
-#define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)
-
-struct video_event {
-        __s32 type;
-#define VIDEO_EVENT_SIZE_CHANGED        1
-#define VIDEO_EVENT_FRAME_RATE_CHANGED  2
-#define VIDEO_EVENT_DECODER_STOPPED     3
-#define VIDEO_EVENT_VSYNC               4
-        __kernel_time_t timestamp;
-        union {
-                video_size_t size;
-                unsigned int frame_rate;        /* in frames per 1000sec */
-                unsigned char vsync_field;      /* unknown/odd/even/progressive */
-        } u;
-};
-
-
-struct video_status {
-        int                   video_blank;   /* blank video on freeze? */
-        video_play_state_t    play_state;    /* current state of playback */
-        video_stream_source_t stream_source; /* current source (demux/memory) */
-        video_format_t        video_format;  /* current aspect ratio of stream*/
-        video_displayformat_t display_format;/* selected cropping mode */
-};
-
-
-struct video_still_picture {
-        char __user *iFrame;        /* pointer to a single iframe in memory */
-        __s32 size;
-};
-
-
-typedef
-struct video_highlight {
-        int     active;      /*    1=show highlight, 0=hide highlight */
-        __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
-                             /*    3- 0  Background pixel contrast */
-        __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
-                             /*    3- 0  Emphasis pixel-1 contrast */
-        __u8    color1;      /*    7- 4  Pattern pixel color */
-                             /*    3- 0  Background pixel color */
-        __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
-                             /*    3- 0  Emphasis pixel-1 color */
-        __u32    ypos;       /*   23-22  auto action mode */
-                             /*   21-12  start y */
-                             /*    9- 0  end y */
-        __u32    xpos;       /*   23-22  button color number */
-                             /*   21-12  start x */
-                             /*    9- 0  end x */
-} video_highlight_t;
-
-
-typedef struct video_spu {
-        int active;
-        int stream_id;
-} video_spu_t;
-
-
-typedef struct video_spu_palette {      /* SPU Palette information */
-        int length;
-        __u8 __user *palette;
-} video_spu_palette_t;
-
-
-typedef struct video_navi_pack {
-        int length;          /* 0 ... 1024 */
-        __u8 data[1024];
-} video_navi_pack_t;
-
-
-typedef __u16 video_attributes_t;
-/*   bits: descr. */
-/*   15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
-/*   13-12 TV system (0=525/60, 1=625/50) */
-/*   11-10 Aspect ratio (0=4:3, 3=16:9) */
-/*    9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca */
-/*    7    line 21-1 data present in GOP (1=yes, 0=no) */
-/*    6    line 21-2 data present in GOP (1=yes, 0=no) */
-/*    5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 */
-/*    2    source letterboxed (1=yes, 0=no) */
-/*    0    film/camera mode (0=camera, 1=film (625/50 only)) */
-
-
-/* bit definitions for capabilities: */
-/* can the hardware decode MPEG1 and/or MPEG2? */
-#define VIDEO_CAP_MPEG1   1
-#define VIDEO_CAP_MPEG2   2
-/* can you send a system and/or program stream to video device?
-   (you still have to open the video and the audio device but only
-    send the stream to the video device) */
-#define VIDEO_CAP_SYS     4
-#define VIDEO_CAP_PROG    8
-/* can the driver also handle SPU, NAVI and CSS encoded data?
-   (CSS API is not present yet) */
-#define VIDEO_CAP_SPU    16
-#define VIDEO_CAP_NAVI   32
-#define VIDEO_CAP_CSS    64
-
-
-#define VIDEO_STOP                 _IO('o', 21)
-#define VIDEO_PLAY                 _IO('o', 22)
-#define VIDEO_FREEZE               _IO('o', 23)
-#define VIDEO_CONTINUE             _IO('o', 24)
-#define VIDEO_SELECT_SOURCE        _IO('o', 25)
-#define VIDEO_SET_BLANK            _IO('o', 26)
-#define VIDEO_GET_STATUS           _IOR('o', 27, struct video_status)
-#define VIDEO_GET_EVENT            _IOR('o', 28, struct video_event)
-#define VIDEO_SET_DISPLAY_FORMAT   _IO('o', 29)
-#define VIDEO_STILLPICTURE         _IOW('o', 30, struct video_still_picture)
-#define VIDEO_FAST_FORWARD         _IO('o', 31)
-#define VIDEO_SLOWMOTION           _IO('o', 32)
-#define VIDEO_GET_CAPABILITIES     _IOR('o', 33, unsigned int)
-#define VIDEO_CLEAR_BUFFER         _IO('o',  34)
-#define VIDEO_SET_ID               _IO('o', 35)
-#define VIDEO_SET_STREAMTYPE       _IO('o', 36)
-#define VIDEO_SET_FORMAT           _IO('o', 37)
-#define VIDEO_SET_SYSTEM           _IO('o', 38)
-#define VIDEO_SET_HIGHLIGHT        _IOW('o', 39, video_highlight_t)
-#define VIDEO_SET_SPU              _IOW('o', 50, video_spu_t)
-#define VIDEO_SET_SPU_PALETTE      _IOW('o', 51, video_spu_palette_t)
-#define VIDEO_GET_NAVI             _IOR('o', 52, video_navi_pack_t)
-#define VIDEO_SET_ATTRIBUTES       _IO('o', 53)
-#define VIDEO_GET_SIZE             _IOR('o', 55, video_size_t)
-#define VIDEO_GET_FRAME_RATE       _IOR('o', 56, unsigned int)
-
-/**
- * VIDEO_GET_PTS
- *
- * Read the 33 bit presentation time stamp as defined
- * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
- *
- * The PTS should belong to the currently played
- * frame if possible, but may also be a value close to it
- * like the PTS of the last decoded frame or the last PTS
- * extracted by the PES parser.
- */
-#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
-
-/* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
-
-#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
+#include <uapi/linux/dvb/video.h>
 
 #endif /*_DVBVIDEO_H_*/
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 2412e02d7c0f..e1c8c9e919ac 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -19,6 +19,10 @@
  * @nr_channels: Number of channels supported by hardware (max 8)
  * @is_private: The device channels should be marked as private and not for
  *      by the general purpose DMA channel allocator.
+ * @block_size: Maximum block size supported by the controller
+ * @nr_masters: Number of AHB masters supported by the controller
+ * @data_width: Maximum data width supported by hardware per AHB master
+ *              (0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
  */
 struct dw_dma_platform_data {
         unsigned int    nr_channels;
@@ -29,6 +33,9 @@ struct dw_dma_platform_data {
 #define CHAN_PRIORITY_ASCENDING         0       /* chan0 highest */
 #define CHAN_PRIORITY_DESCENDING        1       /* chan7 highest */
         unsigned char   chan_priority;
+        unsigned short  block_size;
+        unsigned char   nr_masters;
+        unsigned char   data_width[4];
 };
 
 /* bursts size */
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index c18257b0fa72..6dd4787a798a 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -61,7 +61,7 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,
                          const char *fmt, ...);
 
 #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)                \
-        static struct _ddebug __used __aligned(8)               \
+        static struct _ddebug  __aligned(8)                     \
         __attribute__((section("__verbose"))) name = {          \
                 .modname = KBUILD_MODNAME,                      \
                 .function = __func__,                           \
diff --git a/include/linux/edd.h b/include/linux/edd.h
index 4cbd0fe9df08..83d4371ec996 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -30,165 +30,9 @@
 #ifndef _LINUX_EDD_H
 #define _LINUX_EDD_H
 
-#include <linux/types.h>
-
-#define EDDNR 0x1e9             /* addr of number of edd_info structs at EDDBUF
-                                   in boot_params - treat this as 1 byte  */
-#define EDDBUF  0xd00           /* addr of edd_info structs in boot_params */
-#define EDDMAXNR 6              /* number of edd_info structs starting at EDDBUF  */
-#define EDDEXTSIZE 8            /* change these if you muck with the structures */
-#define EDDPARMSIZE 74
-#define CHECKEXTENSIONSPRESENT 0x41
-#define GETDEVICEPARAMETERS 0x48
-#define LEGACYGETDEVICEPARAMETERS 0x08
-#define EDDMAGIC1 0x55AA
-#define EDDMAGIC2 0xAA55
-
-
-#define READ_SECTORS 0x02         /* int13 AH=0x02 is READ_SECTORS command */
-#define EDD_MBR_SIG_OFFSET 0x1B8  /* offset of signature in the MBR */
-#define EDD_MBR_SIG_BUF    0x290  /* addr in boot params */
-#define EDD_MBR_SIG_MAX 16        /* max number of signatures to store */
-#define EDD_MBR_SIG_NR_BUF 0x1ea  /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
-                                     in boot_params - treat this as 1 byte  */
+#include <uapi/linux/edd.h>
 
 #ifndef __ASSEMBLY__
-
-#define EDD_EXT_FIXED_DISK_ACCESS           (1 << 0)
-#define EDD_EXT_DEVICE_LOCKING_AND_EJECTING (1 << 1)
-#define EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT (1 << 2)
-#define EDD_EXT_64BIT_EXTENSIONS            (1 << 3)
-
-#define EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT (1 << 0)
-#define EDD_INFO_GEOMETRY_VALID                (1 << 1)
-#define EDD_INFO_REMOVABLE                     (1 << 2)
-#define EDD_INFO_WRITE_VERIFY                  (1 << 3)
-#define EDD_INFO_MEDIA_CHANGE_NOTIFICATION     (1 << 4)
-#define EDD_INFO_LOCKABLE                      (1 << 5)
-#define EDD_INFO_NO_MEDIA_PRESENT              (1 << 6)
-#define EDD_INFO_USE_INT13_FN50                (1 << 7)
-
-struct edd_device_params {
-        __u16 length;
-        __u16 info_flags;
-        __u32 num_default_cylinders;
-        __u32 num_default_heads;
-        __u32 sectors_per_track;
-        __u64 number_of_sectors;
-        __u16 bytes_per_sector;
-        __u32 dpte_ptr;         /* 0xFFFFFFFF for our purposes */
-        __u16 key;              /* = 0xBEDD */
-        __u8 device_path_info_length;   /* = 44 */
-        __u8 reserved2;
-        __u16 reserved3;
-        __u8 host_bus_type[4];
-        __u8 interface_type[8];
-        union {
-                struct {
-                        __u16 base_address;
-                        __u16 reserved1;
-                        __u32 reserved2;
-                } __attribute__ ((packed)) isa;
-                struct {
-                        __u8 bus;
-                        __u8 slot;
-                        __u8 function;
-                        __u8 channel;
-                        __u32 reserved;
-                } __attribute__ ((packed)) pci;
-                /* pcix is same as pci */
-                struct {
-                        __u64 reserved;
-                } __attribute__ ((packed)) ibnd;
-                struct {
-                        __u64 reserved;
-                } __attribute__ ((packed)) xprs;
-                struct {
-                        __u64 reserved;
-                } __attribute__ ((packed)) htpt;
-                struct {
-                        __u64 reserved;
-                } __attribute__ ((packed)) unknown;
-        } interface_path;
-        union {
-                struct {
-                        __u8 device;
-                        __u8 reserved1;
-                        __u16 reserved2;
-                        __u32 reserved3;
-                        __u64 reserved4;
-                } __attribute__ ((packed)) ata;
-                struct {
-                        __u8 device;
-                        __u8 lun;
-                        __u8 reserved1;
-                        __u8 reserved2;
-                        __u32 reserved3;
-                        __u64 reserved4;
-                } __attribute__ ((packed)) atapi;
-                struct {
-                        __u16 id;
-                        __u64 lun;
-                        __u16 reserved1;
-                        __u32 reserved2;
-                } __attribute__ ((packed)) scsi;
-                struct {
-                        __u64 serial_number;
-                        __u64 reserved;
-                } __attribute__ ((packed)) usb;
-                struct {
-                        __u64 eui;
-                        __u64 reserved;
-                } __attribute__ ((packed)) i1394;
-                struct {
-                        __u64 wwid;
-                        __u64 lun;
-                } __attribute__ ((packed)) fibre;
-                struct {
-                        __u64 identity_tag;
-                        __u64 reserved;
-                } __attribute__ ((packed)) i2o;
-                struct {
-                        __u32 array_number;
-                        __u32 reserved1;
-                        __u64 reserved2;
-                } __attribute__ ((packed)) raid;
-                struct {
-                        __u8 device;
-                        __u8 reserved1;
-                        __u16 reserved2;
-                        __u32 reserved3;
-                        __u64 reserved4;
-                } __attribute__ ((packed)) sata;
-                struct {
-                        __u64 reserved1;
-                        __u64 reserved2;
-                } __attribute__ ((packed)) unknown;
-        } device_path;
-        __u8 reserved4;
-        __u8 checksum;
-} __attribute__ ((packed));
-
-struct edd_info {
-        __u8 device;
-        __u8 version;
-        __u16 interface_support;
-        __u16 legacy_max_cylinder;
-        __u8 legacy_max_head;
-        __u8 legacy_sectors_per_track;
-        struct edd_device_params params;
-} __attribute__ ((packed));
-
-struct edd {
-        unsigned int mbr_signature[EDD_MBR_SIG_MAX];
-        struct edd_info edd_info[EDDMAXNR];
-        unsigned char mbr_signature_nr;
-        unsigned char edd_info_nr;
-};
-
-#ifdef __KERNEL__
 extern struct edd edd;
-#endif /* __KERNEL__ */
 #endif                          /*!__ASSEMBLY__ */
-
 #endif                          /* _LINUX_EDD_H */
diff --git a/include/linux/edma.h b/include/linux/edma.h
new file mode 100644
index 000000000000..a1307e7827e8
--- /dev/null
+++ b/include/linux/edma.h
@@ -0,0 +1,29 @@
+/*
+ * TI EDMA DMA engine driver
+ *
+ * Copyright 2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __LINUX_EDMA_H
+#define __LINUX_EDMA_H
+
+struct dma_chan;
+
+#if defined(CONFIG_TI_EDMA) || defined(CONFIG_TI_EDMA_MODULE)
+bool edma_filter_fn(struct dma_chan *, void *);
+#else
+static inline bool edma_filter_fn(struct dma_chan *chan, void *param)
+{
+        return false;
+}
+#endif
+
+#endif
diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h
index 7cd2e80cebc8..386440317b0c 100644
--- a/include/linux/elf-fdpic.h
+++ b/include/linux/elf-fdpic.h
@@ -1,4 +1,4 @@
-/* elf-fdpic.h: FDPIC ELF load map
+/* FDPIC ELF load map
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
@@ -12,24 +12,7 @@
 #ifndef _LINUX_ELF_FDPIC_H
 #define _LINUX_ELF_FDPIC_H
 
-#include <linux/elf.h>
-
-#define PT_GNU_STACK    (PT_LOOS + 0x474e551)
-
-/* segment mappings for ELF FDPIC libraries/executables/interpreters */
-struct elf32_fdpic_loadseg {
-        Elf32_Addr      addr;           /* core address to which mapped */
-        Elf32_Addr      p_vaddr;        /* VMA recorded in file */
-        Elf32_Word      p_memsz;        /* allocation size recorded in file */
-};
-
-struct elf32_fdpic_loadmap {
-        Elf32_Half      version;        /* version of these structures, just in case... */
-        Elf32_Half      nsegs;          /* number of segments */
-        struct elf32_fdpic_loadseg segs[];
-};
-
-#define ELF32_FDPIC_LOADMAP_VERSION     0x0000
+#include <uapi/linux/elf-fdpic.h>
 
 /*
  * binfmt binary parameters structure
@@ -58,13 +41,11 @@ struct elf_fdpic_params {
 #define ELF_FDPIC_FLAG_PRESENT          0x80000000      /* T if this object is present */
 };
 
-#ifdef __KERNEL__
 #ifdef CONFIG_MMU
 extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
                                       struct elf_fdpic_params *interp_params,
                                       unsigned long *start_stack,
                                       unsigned long *start_brk);
 #endif
-#endif /* __KERNEL__ */
 
 #endif /* _LINUX_ELF_FDPIC_H */
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 0a05051a8924..8c9048e33463 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -1,414 +1,9 @@
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
-#include <linux/types.h>
-#include <linux/elf-em.h>
-#ifdef __KERNEL__
 #include <asm/elf.h>
-#endif
-
-/* 32-bit ELF base types. */
-typedef __u32   Elf32_Addr;
-typedef __u16   Elf32_Half;
-typedef __u32   Elf32_Off;
-typedef __s32   Elf32_Sword;
-typedef __u32   Elf32_Word;
-
-/* 64-bit ELF base types. */
-typedef __u64   Elf64_Addr;
-typedef __u16   Elf64_Half;
-typedef __s16   Elf64_SHalf;
-typedef __u64   Elf64_Off;
-typedef __s32   Elf64_Sword;
-typedef __u32   Elf64_Word;
-typedef __u64   Elf64_Xword;
-typedef __s64   Elf64_Sxword;
-
-/* These constants are for the segment types stored in the image headers */
-#define PT_NULL    0
-#define PT_LOAD    1
-#define PT_DYNAMIC 2
-#define PT_INTERP  3
-#define PT_NOTE    4
-#define PT_SHLIB   5
-#define PT_PHDR    6
-#define PT_TLS     7               /* Thread local storage segment */
-#define PT_LOOS    0x60000000      /* OS-specific */
-#define PT_HIOS    0x6fffffff      /* OS-specific */
-#define PT_LOPROC  0x70000000
-#define PT_HIPROC  0x7fffffff
-#define PT_GNU_EH_FRAME         0x6474e550
-
-#define PT_GNU_STACK    (PT_LOOS + 0x474e551)
-
-/*
- * Extended Numbering
- *
- * If the real number of program header table entries is larger than
- * or equal to PN_XNUM(0xffff), it is set to sh_info field of the
- * section header at index 0, and PN_XNUM is set to e_phnum
- * field. Otherwise, the section header at index 0 is zero
- * initialized, if it exists.
- *
- * Specifications are available in:
- *
- * - Sun microsystems: Linker and Libraries.
- *   Part No: 817-1984-17, September 2008.
- *   URL: http://docs.sun.com/app/docs/doc/817-1984
- *
- * - System V ABI AMD64 Architecture Processor Supplement
- *   Draft Version 0.99.,
- *   May 11, 2009.
- *   URL: http://www.x86-64.org/
- */
-#define PN_XNUM 0xffff
-
-/* These constants define the different elf file types */
-#define ET_NONE   0
-#define ET_REL    1
-#define ET_EXEC   2
-#define ET_DYN    3
-#define ET_CORE   4
-#define ET_LOPROC 0xff00
-#define ET_HIPROC 0xffff
-
-/* This is the info that is needed to parse the dynamic section of the file */
-#define DT_NULL         0
-#define DT_NEEDED       1
-#define DT_PLTRELSZ     2
-#define DT_PLTGOT       3
-#define DT_HASH         4
-#define DT_STRTAB       5
-#define DT_SYMTAB       6
-#define DT_RELA         7
-#define DT_RELASZ       8
-#define DT_RELAENT      9
-#define DT_STRSZ        10
-#define DT_SYMENT       11
-#define DT_INIT         12
-#define DT_FINI         13
-#define DT_SONAME       14
-#define DT_RPATH        15
-#define DT_SYMBOLIC     16
-#define DT_REL          17
-#define DT_RELSZ        18
-#define DT_RELENT       19
-#define DT_PLTREL       20
-#define DT_DEBUG        21
-#define DT_TEXTREL      22
-#define DT_JMPREL       23
-#define DT_ENCODING     32
-#define OLD_DT_LOOS     0x60000000
-#define DT_LOOS         0x6000000d
-#define DT_HIOS         0x6ffff000
-#define DT_VALRNGLO     0x6ffffd00
-#define DT_VALRNGHI     0x6ffffdff
-#define DT_ADDRRNGLO    0x6ffffe00
-#define DT_ADDRRNGHI    0x6ffffeff
-#define DT_VERSYM       0x6ffffff0
-#define DT_RELACOUNT    0x6ffffff9
-#define DT_RELCOUNT     0x6ffffffa
-#define DT_FLAGS_1      0x6ffffffb
-#define DT_VERDEF       0x6ffffffc
-#define DT_VERDEFNUM    0x6ffffffd
-#define DT_VERNEED      0x6ffffffe
-#define DT_VERNEEDNUM   0x6fffffff
-#define OLD_DT_HIOS     0x6fffffff
-#define DT_LOPROC       0x70000000
-#define DT_HIPROC       0x7fffffff
-
-/* This info is needed when parsing the symbol table */
-#define STB_LOCAL  0
-#define STB_GLOBAL 1
-#define STB_WEAK   2
-
-#define STT_NOTYPE  0
-#define STT_OBJECT  1
-#define STT_FUNC    2
-#define STT_SECTION 3
-#define STT_FILE    4
-#define STT_COMMON  5
-#define STT_TLS     6
-
-#define ELF_ST_BIND(x)          ((x) >> 4)
-#define ELF_ST_TYPE(x)          (((unsigned int) x) & 0xf)
-#define ELF32_ST_BIND(x)        ELF_ST_BIND(x)
-#define ELF32_ST_TYPE(x)        ELF_ST_TYPE(x)
-#define ELF64_ST_BIND(x)        ELF_ST_BIND(x)
-#define ELF64_ST_TYPE(x)        ELF_ST_TYPE(x)
-
-typedef struct dynamic{
-  Elf32_Sword d_tag;
-  union{
-    Elf32_Sword d_val;
-    Elf32_Addr  d_ptr;
-  } d_un;
-} Elf32_Dyn;
-
-typedef struct {
-  Elf64_Sxword d_tag;           /* entry tag value */
-  union {
-    Elf64_Xword d_val;
-    Elf64_Addr d_ptr;
-  } d_un;
-} Elf64_Dyn;
-
-/* The following are used with relocations */
-#define ELF32_R_SYM(x) ((x) >> 8)
-#define ELF32_R_TYPE(x) ((x) & 0xff)
-
-#define ELF64_R_SYM(i)                  ((i) >> 32)
-#define ELF64_R_TYPE(i)                 ((i) & 0xffffffff)
-
-typedef struct elf32_rel {
-  Elf32_Addr    r_offset;
-  Elf32_Word    r_info;
-} Elf32_Rel;
-
-typedef struct elf64_rel {
-  Elf64_Addr r_offset;  /* Location at which to apply the action */
-  Elf64_Xword r_info;   /* index and type of relocation */
-} Elf64_Rel;
-
-typedef struct elf32_rela{
-  Elf32_Addr    r_offset;
-  Elf32_Word    r_info;
-  Elf32_Sword   r_addend;
-} Elf32_Rela;
-
-typedef struct elf64_rela {
-  Elf64_Addr r_offset;  /* Location at which to apply the action */
-  Elf64_Xword r_info;   /* index and type of relocation */
-  Elf64_Sxword r_addend;        /* Constant addend used to compute value */
-} Elf64_Rela;
-
-typedef struct elf32_sym{
-  Elf32_Word    st_name;
-  Elf32_Addr    st_value;
-  Elf32_Word    st_size;
-  unsigned char st_info;
-  unsigned char st_other;
-  Elf32_Half    st_shndx;
-} Elf32_Sym;
-
-typedef struct elf64_sym {
-  Elf64_Word st_name;           /* Symbol name, index in string tbl */
-  unsigned char st_info;        /* Type and binding attributes */
-  unsigned char st_other;       /* No defined meaning, 0 */
-  Elf64_Half st_shndx;          /* Associated section index */
-  Elf64_Addr st_value;          /* Value of the symbol */
-  Elf64_Xword st_size;          /* Associated symbol size */
-} Elf64_Sym;
-
-
-#define EI_NIDENT       16
-
-typedef struct elf32_hdr{
-  unsigned char e_ident[EI_NIDENT];
-  Elf32_Half    e_type;
-  Elf32_Half    e_machine;
-  Elf32_Word    e_version;
-  Elf32_Addr    e_entry;  /* Entry point */
-  Elf32_Off     e_phoff;
-  Elf32_Off     e_shoff;
-  Elf32_Word    e_flags;
-  Elf32_Half    e_ehsize;
-  Elf32_Half    e_phentsize;
-  Elf32_Half    e_phnum;
-  Elf32_Half    e_shentsize;
-  Elf32_Half    e_shnum;
-  Elf32_Half    e_shstrndx;
-} Elf32_Ehdr;
-
-typedef struct elf64_hdr {
-  unsigned char e_ident[EI_NIDENT];     /* ELF "magic number" */
-  Elf64_Half e_type;
-  Elf64_Half e_machine;
-  Elf64_Word e_version;
-  Elf64_Addr e_entry;           /* Entry point virtual address */
-  Elf64_Off e_phoff;            /* Program header table file offset */
-  Elf64_Off e_shoff;            /* Section header table file offset */
-  Elf64_Word e_flags;
-  Elf64_Half e_ehsize;
-  Elf64_Half e_phentsize;
-  Elf64_Half e_phnum;
-  Elf64_Half e_shentsize;
-  Elf64_Half e_shnum;
-  Elf64_Half e_shstrndx;
-} Elf64_Ehdr;
-
-/* These constants define the permissions on sections in the program
-   header, p_flags. */
-#define PF_R            0x4
-#define PF_W            0x2
-#define PF_X            0x1
-
-typedef struct elf32_phdr{
-  Elf32_Word    p_type;
-  Elf32_Off     p_offset;
-  Elf32_Addr    p_vaddr;
-  Elf32_Addr    p_paddr;
-  Elf32_Word    p_filesz;
-  Elf32_Word    p_memsz;
-  Elf32_Word    p_flags;
-  Elf32_Word    p_align;
-} Elf32_Phdr;
-
-typedef struct elf64_phdr {
-  Elf64_Word p_type;
-  Elf64_Word p_flags;
-  Elf64_Off p_offset;           /* Segment file offset */
-  Elf64_Addr p_vaddr;           /* Segment virtual address */
-  Elf64_Addr p_paddr;           /* Segment physical address */
-  Elf64_Xword p_filesz;         /* Segment size in file */
-  Elf64_Xword p_memsz;          /* Segment size in memory */
-  Elf64_Xword p_align;          /* Segment alignment, file & memory */
-} Elf64_Phdr;
-
-/* sh_type */
-#define SHT_NULL        0
-#define SHT_PROGBITS    1
-#define SHT_SYMTAB      2
-#define SHT_STRTAB      3
-#define SHT_RELA        4
-#define SHT_HASH        5
-#define SHT_DYNAMIC     6
-#define SHT_NOTE        7
-#define SHT_NOBITS      8
-#define SHT_REL         9
-#define SHT_SHLIB       10
-#define SHT_DYNSYM      11
-#define SHT_NUM         12
-#define SHT_LOPROC      0x70000000
-#define SHT_HIPROC      0x7fffffff
-#define SHT_LOUSER      0x80000000
-#define SHT_HIUSER      0xffffffff
-
-/* sh_flags */
-#define SHF_WRITE       0x1
-#define SHF_ALLOC       0x2
-#define SHF_EXECINSTR   0x4
-#define SHF_MASKPROC    0xf0000000
-
-/* special section indexes */
-#define SHN_UNDEF       0
-#define SHN_LORESERVE   0xff00
-#define SHN_LOPROC      0xff00
-#define SHN_HIPROC      0xff1f
-#define SHN_ABS         0xfff1
-#define SHN_COMMON      0xfff2
-#define SHN_HIRESERVE   0xffff
- 
-typedef struct elf32_shdr {
-  Elf32_Word    sh_name;
-  Elf32_Word    sh_type;
-  Elf32_Word    sh_flags;
-  Elf32_Addr    sh_addr;
-  Elf32_Off     sh_offset;
-  Elf32_Word    sh_size;
-  Elf32_Word    sh_link;
-  Elf32_Word    sh_info;
-  Elf32_Word    sh_addralign;
-  Elf32_Word    sh_entsize;
-} Elf32_Shdr;
-
-typedef struct elf64_shdr {
-  Elf64_Word sh_name;           /* Section name, index in string tbl */
-  Elf64_Word sh_type;           /* Type of section */
-  Elf64_Xword sh_flags;         /* Miscellaneous section attributes */
-  Elf64_Addr sh_addr;           /* Section virtual addr at execution */
-  Elf64_Off sh_offset;          /* Section file offset */
-  Elf64_Xword sh_size;          /* Size of section in bytes */
-  Elf64_Word sh_link;           /* Index of another section */
-  Elf64_Word sh_info;           /* Additional section information */
-  Elf64_Xword sh_addralign;     /* Section alignment */
-  Elf64_Xword sh_entsize;       /* Entry size if section holds table */
-} Elf64_Shdr;
-
-#define EI_MAG0         0               /* e_ident[] indexes */
-#define EI_MAG1         1
-#define EI_MAG2         2
-#define EI_MAG3         3
-#define EI_CLASS        4
-#define EI_DATA         5
-#define EI_VERSION      6
-#define EI_OSABI        7
-#define EI_PAD          8
-
-#define ELFMAG0         0x7f            /* EI_MAG */
-#define ELFMAG1         'E'
-#define ELFMAG2         'L'
-#define ELFMAG3         'F'
-#define ELFMAG          "\177ELF"
-#define SELFMAG         4
-
-#define ELFCLASSNONE    0               /* EI_CLASS */
-#define ELFCLASS32      1
-#define ELFCLASS64      2
-#define ELFCLASSNUM     3
-
-#define ELFDATANONE     0               /* e_ident[EI_DATA] */
-#define ELFDATA2LSB     1
-#define ELFDATA2MSB     2
-
-#define EV_NONE         0               /* e_version, EI_VERSION */
-#define EV_CURRENT      1
-#define EV_NUM          2
-
-#define ELFOSABI_NONE   0
-#define ELFOSABI_LINUX  3
-
-#ifndef ELF_OSABI
-#define ELF_OSABI ELFOSABI_NONE
-#endif
-
-/*
- * Notes used in ET_CORE. Architectures export some of the arch register sets
- * using the corresponding note types via the PTRACE_GETREGSET and
- * PTRACE_SETREGSET requests.
- */
-#define NT_PRSTATUS     1
-#define NT_PRFPREG      2
-#define NT_PRPSINFO     3
-#define NT_TASKSTRUCT   4
-#define NT_AUXV         6
-#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
-#define NT_PPC_VMX      0x100           /* PowerPC Altivec/VMX registers */
-#define NT_PPC_SPE      0x101           /* PowerPC SPE/EVR registers */
-#define NT_PPC_VSX      0x102           /* PowerPC VSX registers */
-#define NT_386_TLS      0x200           /* i386 TLS slots (struct user_desc) */
-#define NT_386_IOPERM   0x201           /* x86 io permission bitmap (1=deny) */
-#define NT_X86_XSTATE   0x202           /* x86 extended state using xsave */
-#define NT_S390_HIGH_GPRS       0x300   /* s390 upper register halves */
-#define NT_S390_TIMER   0x301           /* s390 timer register */
-#define NT_S390_TODCMP  0x302           /* s390 TOD clock comparator register */
-#define NT_S390_TODPREG 0x303           /* s390 TOD programmable register */
-#define NT_S390_CTRS    0x304           /* s390 control registers */
-#define NT_S390_PREFIX  0x305           /* s390 prefix register */
-#define NT_S390_LAST_BREAK      0x306   /* s390 breaking event address */
-#define NT_S390_SYSTEM_CALL     0x307   /* s390 system call restart data */
-#define NT_S390_TDB     0x308           /* s390 transaction diagnostic block */
-#define NT_ARM_VFP      0x400           /* ARM VFP/NEON registers */
-#define NT_ARM_TLS      0x401           /* ARM TLS register */
-#define NT_ARM_HW_BREAK 0x402           /* ARM hardware breakpoint registers */
-#define NT_ARM_HW_WATCH 0x403           /* ARM hardware watchpoint registers */
-
-
-/* Note header in a PT_NOTE section */
-typedef struct elf32_note {
-  Elf32_Word    n_namesz;       /* Name size */
-  Elf32_Word    n_descsz;       /* Content size */
-  Elf32_Word    n_type;         /* Content type */
-} Elf32_Nhdr;
-
-/* Note header in a PT_NOTE section */
-typedef struct elf64_note {
-  Elf64_Word n_namesz;  /* Name size */
-  Elf64_Word n_descsz;  /* Content size */
-  Elf64_Word n_type;    /* Content type */
-} Elf64_Nhdr;
+#include <uapi/linux/elf.h>
 
-#ifdef __KERNEL__
 #ifndef elf_read_implies_exec
   /* Executables for which elf_read_implies_exec() returns TRUE will
      have the READ_IMPLIES_EXEC personality flag set automatically.
@@ -449,5 +44,4 @@ static inline int elf_coredump_extra_notes_write(struct file *file,
 extern int elf_coredump_extra_notes_size(void);
 extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
 #endif
-#endif /* __KERNEL__ */
 #endif /* _LINUX_ELF_H */
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 0698c79fbcb2..cdd3d13efce7 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -1,109 +1,11 @@
 #ifndef _LINUX_ELFCORE_H
 #define _LINUX_ELFCORE_H
 
-#include <linux/types.h>
-#include <linux/signal.h>
-#include <linux/time.h>
-#ifdef __KERNEL__
 #include <linux/user.h>
 #include <linux/bug.h>
-#endif
-#include <linux/ptrace.h>
-#include <linux/elf.h>
-#include <linux/fs.h>
-
-struct elf_siginfo
-{
-        int     si_signo;                       /* signal number */
-        int     si_code;                        /* extra code */
-        int     si_errno;                       /* errno */
-};
-
-#ifdef __KERNEL__
 #include <asm/elf.h>
-#endif
+#include <uapi/linux/elfcore.h>
 
-#ifndef __KERNEL__
-typedef elf_greg_t greg_t;
-typedef elf_gregset_t gregset_t;
-typedef elf_fpregset_t fpregset_t;
-typedef elf_fpxregset_t fpxregset_t;
-#define NGREG ELF_NGREG
-#endif
-
-/*
- * Definitions to generate Intel SVR4-like core files.
- * These mostly have the same names as the SVR4 types with "elf_"
- * tacked on the front to prevent clashes with linux definitions,
- * and the typedef forms have been avoided.  This is mostly like
- * the SVR4 structure, but more Linuxy, with things that Linux does
- * not support and which gdb doesn't really use excluded.
- * Fields present but not used are marked with "XXX".
- */
-struct elf_prstatus
-{
-#if 0
-        long    pr_flags;       /* XXX Process flags */
-        short   pr_why;         /* XXX Reason for process halt */
-        short   pr_what;        /* XXX More detailed reason */
-#endif
-        struct elf_siginfo pr_info;     /* Info associated with signal */
-        short   pr_cursig;              /* Current signal */
-        unsigned long pr_sigpend;       /* Set of pending signals */
-        unsigned long pr_sighold;       /* Set of held signals */
-#if 0
-        struct sigaltstack pr_altstack; /* Alternate stack info */
-        struct sigaction pr_action;     /* Signal action for current sig */
-#endif
-        pid_t   pr_pid;
-        pid_t   pr_ppid;
-        pid_t   pr_pgrp;
-        pid_t   pr_sid;
-        struct timeval pr_utime;        /* User time */
-        struct timeval pr_stime;        /* System time */
-        struct timeval pr_cutime;       /* Cumulative user time */
-        struct timeval pr_cstime;       /* Cumulative system time */
-#if 0
-        long    pr_instr;               /* Current instruction */
-#endif
-        elf_gregset_t pr_reg;   /* GP registers */
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-        /* When using FDPIC, the loadmap addresses need to be communicated
-         * to GDB in order for GDB to do the necessary relocations.  The
-         * fields (below) used to communicate this information are placed
-         * immediately after ``pr_reg'', so that the loadmap addresses may
-         * be viewed as part of the register set if so desired.
-         */
-        unsigned long pr_exec_fdpic_loadmap;
-        unsigned long pr_interp_fdpic_loadmap;
-#endif
-        int pr_fpvalid;         /* True if math co-processor being used.  */
-};
-
-#define ELF_PRARGSZ     (80)    /* Number of chars for args */
-
-struct elf_prpsinfo
-{
-        char    pr_state;       /* numeric process state */
-        char    pr_sname;       /* char for pr_state */
-        char    pr_zomb;        /* zombie */
-        char    pr_nice;        /* nice val */
-        unsigned long pr_flag;  /* flags */
-        __kernel_uid_t  pr_uid;
-        __kernel_gid_t  pr_gid;
-        pid_t   pr_pid, pr_ppid, pr_pgrp, pr_sid;
-        /* Lots missing */
-        char    pr_fname[16];   /* filename of executable */
-        char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
-};
-
-#ifndef __KERNEL__
-typedef struct elf_prstatus prstatus_t;
-typedef struct elf_prpsinfo prpsinfo_t;
-#define PRARGSZ ELF_PRARGSZ 
-#endif
-
-#ifdef __KERNEL__
 static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
 {
 #ifdef ELF_CORE_COPY_REGS
@@ -167,6 +69,4 @@ extern int
 elf_core_write_extra_data(struct file *file, size_t *size, unsigned long limit);
 extern size_t elf_core_extra_data_size(void);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_ELFCORE_H */
diff --git a/include/linux/errno.h b/include/linux/errno.h
index e0de516374da..f6bf082d4d4f 100644
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
@@ -1,9 +1,8 @@
 #ifndef _LINUX_ERRNO_H
 #define _LINUX_ERRNO_H
 
-#include <asm/errno.h>
+#include <uapi/linux/errno.h>
 
-#ifdef __KERNEL__
 
 /*
  * These should never be seen by user programs.  To return one of ERESTART*
@@ -32,5 +31,3 @@
 #define EIOCBRETRY      530     /* iocb queued, will trigger a retry */
 
 #endif
-
-#endif
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index fd0628be45ce..9ca23fcfb5d7 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -1,33 +1,12 @@
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
 
-#include <linux/types.h>
-
-struct sock_extended_err {
-        __u32   ee_errno;       
-        __u8    ee_origin;
-        __u8    ee_type;
-        __u8    ee_code;
-        __u8    ee_pad;
-        __u32   ee_info;
-        __u32   ee_data;
-};
-
-#define SO_EE_ORIGIN_NONE       0
-#define SO_EE_ORIGIN_LOCAL      1
-#define SO_EE_ORIGIN_ICMP       2
-#define SO_EE_ORIGIN_ICMP6      3
-#define SO_EE_ORIGIN_TXSTATUS   4
-#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
-
-#define SO_EE_OFFENDER(ee)      ((struct sockaddr*)((ee)+1))
-
-#ifdef __KERNEL__
 
 #include <net/ip.h>
 #if IS_ENABLED(CONFIG_IPV6)
 #include <linux/ipv6.h>
 #endif
+#include <uapi/linux/errqueue.h>
 
 #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb))
 
@@ -44,5 +23,3 @@ struct sock_exterr_skb {
 };
 
 #endif
-
-#endif
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index fcb4f8e60c1c..c8e3e7e39c6b 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -9,596 +9,12 @@
  *                                scott.feldman@intel.com)
  * Portions Copyright (C) Sun Microsystems 2008
  */
-
 #ifndef _LINUX_ETHTOOL_H
 #define _LINUX_ETHTOOL_H
 
-#ifdef __KERNEL__
 #include <linux/compat.h>
-#endif
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/* This should work for both 32 and 64 bit userland. */
-struct ethtool_cmd {
-        __u32   cmd;
-        __u32   supported;      /* Features this interface supports */
-        __u32   advertising;    /* Features this interface advertises */
-        __u16   speed;          /* The forced speed (lower bits) in
-                                 * Mbps. Please use
-                                 * ethtool_cmd_speed()/_set() to
-                                 * access it */
-        __u8    duplex;         /* Duplex, half or full */
-        __u8    port;           /* Which connector port */
-        __u8    phy_address;    /* MDIO PHY address (PRTAD for clause 45).
-                                 * May be read-only or read-write
-                                 * depending on the driver.
-                                 */
-        __u8    transceiver;    /* Which transceiver to use */
-        __u8    autoneg;        /* Enable or disable autonegotiation */
-        __u8    mdio_support;   /* MDIO protocols supported.  Read-only.
-                                 * Not set by all drivers.
-                                 */
-        __u32   maxtxpkt;       /* Tx pkts before generating tx int */
-        __u32   maxrxpkt;       /* Rx pkts before generating rx int */
-        __u16   speed_hi;       /* The forced speed (upper
-                                 * bits) in Mbps. Please use
-                                 * ethtool_cmd_speed()/_set() to
-                                 * access it */
-        __u8    eth_tp_mdix;    /* twisted pair MDI-X status */
-        __u8    eth_tp_mdix_ctrl; /* twisted pair MDI-X control, when set,
-                                   * link should be renegotiated if necessary
-                                   */
-        __u32   lp_advertising; /* Features the link partner advertises */
-        __u32   reserved[2];
-};
-
-static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
-                                         __u32 speed)
-{
-
-        ep->speed = (__u16)speed;
-        ep->speed_hi = (__u16)(speed >> 16);
-}
-
-static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
-{
-        return (ep->speed_hi << 16) | ep->speed;
-}
-
-/* Device supports clause 22 register access to PHY or peripherals
- * using the interface defined in <linux/mii.h>.  This should not be
- * set if there are known to be no such peripherals present or if
- * the driver only emulates clause 22 registers for compatibility.
- */
-#define ETH_MDIO_SUPPORTS_C22   1
-
-/* Device supports clause 45 register access to PHY or peripherals
- * using the interface defined in <linux/mii.h> and <linux/mdio.h>.
- * This should not be set if there are known to be no such peripherals
- * present.
- */
-#define ETH_MDIO_SUPPORTS_C45   2
-
-#define ETHTOOL_FWVERS_LEN      32
-#define ETHTOOL_BUSINFO_LEN     32
-/* these strings are set to whatever the driver author decides... */
-struct ethtool_drvinfo {
-        __u32   cmd;
-        char    driver[32];     /* driver short name, "tulip", "eepro100" */
-        char    version[32];    /* driver version string */
-        char    fw_version[ETHTOOL_FWVERS_LEN]; /* firmware version string */
-        char    bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
-                                /* For PCI devices, use pci_name(pci_dev). */
-        char    reserved1[32];
-        char    reserved2[12];
-                                /*
-                                 * Some struct members below are filled in
-                                 * using ops->get_sset_count().  Obtaining
-                                 * this info from ethtool_drvinfo is now
-                                 * deprecated; Use ETHTOOL_GSSET_INFO
-                                 * instead.
-                                 */
-        __u32   n_priv_flags;   /* number of flags valid in ETHTOOL_GPFLAGS */
-        __u32   n_stats;        /* number of u64's from ETHTOOL_GSTATS */
-        __u32   testinfo_len;
-        __u32   eedump_len;     /* Size of data from ETHTOOL_GEEPROM (bytes) */
-        __u32   regdump_len;    /* Size of data from ETHTOOL_GREGS (bytes) */
-};
-
-#define SOPASS_MAX      6
-/* wake-on-lan settings */
-struct ethtool_wolinfo {
-        __u32   cmd;
-        __u32   supported;
-        __u32   wolopts;
-        __u8    sopass[SOPASS_MAX]; /* SecureOn(tm) password */
-};
-
-/* for passing single values */
-struct ethtool_value {
-        __u32   cmd;
-        __u32   data;
-};
-
-/* for passing big chunks of data */
-struct ethtool_regs {
-        __u32   cmd;
-        __u32   version; /* driver-specific, indicates different chips/revs */
-        __u32   len; /* bytes */
-        __u8    data[0];
-};
-
-/* for passing EEPROM chunks */
-struct ethtool_eeprom {
-        __u32   cmd;
-        __u32   magic;
-        __u32   offset; /* in bytes */
-        __u32   len; /* in bytes */
-        __u8    data[0];
-};
-
-/**
- * struct ethtool_eee - Energy Efficient Ethernet information
- * @cmd: ETHTOOL_{G,S}EEE
- * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
- *      for which there is EEE support.
- * @advertised: Mask of %ADVERTISED_* flags for the speed/duplex combinations
- *      advertised as eee capable.
- * @lp_advertised: Mask of %ADVERTISED_* flags for the speed/duplex
- *      combinations advertised by the link partner as eee capable.
- * @eee_active: Result of the eee auto negotiation.
- * @eee_enabled: EEE configured mode (enabled/disabled).
- * @tx_lpi_enabled: Whether the interface should assert its tx lpi, given
- *      that eee was negotiated.
- * @tx_lpi_timer: Time in microseconds the interface delays prior to asserting
- *      its tx lpi (after reaching 'idle' state). Effective only when eee
- *      was negotiated and tx_lpi_enabled was set.
- */
-struct ethtool_eee {
-        __u32   cmd;
-        __u32   supported;
-        __u32   advertised;
-        __u32   lp_advertised;
-        __u32   eee_active;
-        __u32   eee_enabled;
-        __u32   tx_lpi_enabled;
-        __u32   tx_lpi_timer;
-        __u32   reserved[2];
-};
-
-/**
- * struct ethtool_modinfo - plugin module eeprom information
- * @cmd: %ETHTOOL_GMODULEINFO
- * @type: Standard the module information conforms to %ETH_MODULE_SFF_xxxx
- * @eeprom_len: Length of the eeprom
- *
- * This structure is used to return the information to
- * properly size memory for a subsequent call to %ETHTOOL_GMODULEEEPROM.
- * The type code indicates the eeprom data format
- */
-struct ethtool_modinfo {
-        __u32   cmd;
-        __u32   type;
-        __u32   eeprom_len;
-        __u32   reserved[8];
-};
-
-/**
- * struct ethtool_coalesce - coalescing parameters for IRQs and stats updates
- * @cmd: ETHTOOL_{G,S}COALESCE
- * @rx_coalesce_usecs: How many usecs to delay an RX interrupt after
- *      a packet arrives.
- * @rx_max_coalesced_frames: Maximum number of packets to receive
- *      before an RX interrupt.
- * @rx_coalesce_usecs_irq: Same as @rx_coalesce_usecs, except that
- *      this value applies while an IRQ is being serviced by the host.
- * @rx_max_coalesced_frames_irq: Same as @rx_max_coalesced_frames,
- *      except that this value applies while an IRQ is being serviced
- *      by the host.
- * @tx_coalesce_usecs: How many usecs to delay a TX interrupt after
- *      a packet is sent.
- * @tx_max_coalesced_frames: Maximum number of packets to be sent
- *      before a TX interrupt.
- * @tx_coalesce_usecs_irq: Same as @tx_coalesce_usecs, except that
- *      this value applies while an IRQ is being serviced by the host.
- * @tx_max_coalesced_frames_irq: Same as @tx_max_coalesced_frames,
- *      except that this value applies while an IRQ is being serviced
- *      by the host.
- * @stats_block_coalesce_usecs: How many usecs to delay in-memory
- *      statistics block updates.  Some drivers do not have an
- *      in-memory statistic block, and in such cases this value is
- *      ignored.  This value must not be zero.
- * @use_adaptive_rx_coalesce: Enable adaptive RX coalescing.
- * @use_adaptive_tx_coalesce: Enable adaptive TX coalescing.
- * @pkt_rate_low: Threshold for low packet rate (packets per second).
- * @rx_coalesce_usecs_low: How many usecs to delay an RX interrupt after
- *      a packet arrives, when the packet rate is below @pkt_rate_low.
- * @rx_max_coalesced_frames_low: Maximum number of packets to be received
- *      before an RX interrupt, when the packet rate is below @pkt_rate_low.
- * @tx_coalesce_usecs_low: How many usecs to delay a TX interrupt after
- *      a packet is sent, when the packet rate is below @pkt_rate_low.
- * @tx_max_coalesced_frames_low: Maximum nuumber of packets to be sent before
- *      a TX interrupt, when the packet rate is below @pkt_rate_low.
- * @pkt_rate_high: Threshold for high packet rate (packets per second).
- * @rx_coalesce_usecs_high: How many usecs to delay an RX interrupt after
- *      a packet arrives, when the packet rate is above @pkt_rate_high.
- * @rx_max_coalesced_frames_high: Maximum number of packets to be received
- *      before an RX interrupt, when the packet rate is above @pkt_rate_high.
- * @tx_coalesce_usecs_high: How many usecs to delay a TX interrupt after
- *      a packet is sent, when the packet rate is above @pkt_rate_high.
- * @tx_max_coalesced_frames_high: Maximum number of packets to be sent before
- *      a TX interrupt, when the packet rate is above @pkt_rate_high.
- * @rate_sample_interval: How often to do adaptive coalescing packet rate
- *      sampling, measured in seconds.  Must not be zero.
- *
- * Each pair of (usecs, max_frames) fields specifies this exit
- * condition for interrupt coalescing:
- *      (usecs > 0 && time_since_first_completion >= usecs) ||
- *      (max_frames > 0 && completed_frames >= max_frames)
- * It is illegal to set both usecs and max_frames to zero as this
- * would cause interrupts to never be generated.  To disable
- * coalescing, set usecs = 0 and max_frames = 1.
- *
- * Some implementations ignore the value of max_frames and use the
- * condition:
- *      time_since_first_completion >= usecs
- * This is deprecated.  Drivers for hardware that does not support
- * counting completions should validate that max_frames == !rx_usecs.
- *
- * Adaptive RX/TX coalescing is an algorithm implemented by some
- * drivers to improve latency under low packet rates and improve
- * throughput under high packet rates.  Some drivers only implement
- * one of RX or TX adaptive coalescing.  Anything not implemented by
- * the driver causes these values to be silently ignored.
- *
- * When the packet rate is below @pkt_rate_high but above
- * @pkt_rate_low (both measured in packets per second) the
- * normal {rx,tx}_* coalescing parameters are used.
- */
-struct ethtool_coalesce {
-        __u32   cmd;
-        __u32   rx_coalesce_usecs;
-        __u32   rx_max_coalesced_frames;
-        __u32   rx_coalesce_usecs_irq;
-        __u32   rx_max_coalesced_frames_irq;
-        __u32   tx_coalesce_usecs;
-        __u32   tx_max_coalesced_frames;
-        __u32   tx_coalesce_usecs_irq;
-        __u32   tx_max_coalesced_frames_irq;
-        __u32   stats_block_coalesce_usecs;
-        __u32   use_adaptive_rx_coalesce;
-        __u32   use_adaptive_tx_coalesce;
-        __u32   pkt_rate_low;
-        __u32   rx_coalesce_usecs_low;
-        __u32   rx_max_coalesced_frames_low;
-        __u32   tx_coalesce_usecs_low;
-        __u32   tx_max_coalesced_frames_low;
-        __u32   pkt_rate_high;
-        __u32   rx_coalesce_usecs_high;
-        __u32   rx_max_coalesced_frames_high;
-        __u32   tx_coalesce_usecs_high;
-        __u32   tx_max_coalesced_frames_high;
-        __u32   rate_sample_interval;
-};
-
-/* for configuring RX/TX ring parameters */
-struct ethtool_ringparam {
-        __u32   cmd;    /* ETHTOOL_{G,S}RINGPARAM */
-
-        /* Read only attributes.  These indicate the maximum number
-         * of pending RX/TX ring entries the driver will allow the
-         * user to set.
-         */
-        __u32   rx_max_pending;
-        __u32   rx_mini_max_pending;
-        __u32   rx_jumbo_max_pending;
-        __u32   tx_max_pending;
-
-        /* Values changeable by the user.  The valid values are
-         * in the range 1 to the "*_max_pending" counterpart above.
-         */
-        __u32   rx_pending;
-        __u32   rx_mini_pending;
-        __u32   rx_jumbo_pending;
-        __u32   tx_pending;
-};
-
-/**
- * struct ethtool_channels - configuring number of network channel
- * @cmd: ETHTOOL_{G,S}CHANNELS
- * @max_rx: Read only. Maximum number of receive channel the driver support.
- * @max_tx: Read only. Maximum number of transmit channel the driver support.
- * @max_other: Read only. Maximum number of other channel the driver support.
- * @max_combined: Read only. Maximum number of combined channel the driver
- *      support. Set of queues RX, TX or other.
- * @rx_count: Valid values are in the range 1 to the max_rx.
- * @tx_count: Valid values are in the range 1 to the max_tx.
- * @other_count: Valid values are in the range 1 to the max_other.
- * @combined_count: Valid values are in the range 1 to the max_combined.
- *
- * This can be used to configure RX, TX and other channels.
- */
-
-struct ethtool_channels {
-        __u32   cmd;
-        __u32   max_rx;
-        __u32   max_tx;
-        __u32   max_other;
-        __u32   max_combined;
-        __u32   rx_count;
-        __u32   tx_count;
-        __u32   other_count;
-        __u32   combined_count;
-};
-
-/* for configuring link flow control parameters */
-struct ethtool_pauseparam {
-        __u32   cmd;    /* ETHTOOL_{G,S}PAUSEPARAM */
-
-        /* If the link is being auto-negotiated (via ethtool_cmd.autoneg
-         * being true) the user may set 'autoneg' here non-zero to have the
-         * pause parameters be auto-negotiated too.  In such a case, the
-         * {rx,tx}_pause values below determine what capabilities are
-         * advertised.
-         *
-         * If 'autoneg' is zero or the link is not being auto-negotiated,
-         * then {rx,tx}_pause force the driver to use/not-use pause
-         * flow control.
-         */
-        __u32   autoneg;
-        __u32   rx_pause;
-        __u32   tx_pause;
-};
-
-#define ETH_GSTRING_LEN         32
-enum ethtool_stringset {
-        ETH_SS_TEST             = 0,
-        ETH_SS_STATS,
-        ETH_SS_PRIV_FLAGS,
-        ETH_SS_NTUPLE_FILTERS,  /* Do not use, GRXNTUPLE is now deprecated */
-        ETH_SS_FEATURES,
-};
-
-/* for passing string sets for data tagging */
-struct ethtool_gstrings {
-        __u32   cmd;            /* ETHTOOL_GSTRINGS */
-        __u32   string_set;     /* string set id e.c. ETH_SS_TEST, etc*/
-        __u32   len;            /* number of strings in the string set */
-        __u8    data[0];
-};
-
-struct ethtool_sset_info {
-        __u32   cmd;            /* ETHTOOL_GSSET_INFO */
-        __u32   reserved;
-        __u64   sset_mask;      /* input: each bit selects an sset to query */
-                                /* output: each bit a returned sset */
-        __u32   data[0];        /* ETH_SS_xxx count, in order, based on bits
-                                   in sset_mask.  One bit implies one
-                                   __u32, two bits implies two
-                                   __u32's, etc. */
-};
-
-/**
- * enum ethtool_test_flags - flags definition of ethtool_test
- * @ETH_TEST_FL_OFFLINE: if set perform online and offline tests, otherwise
- *      only online tests.
- * @ETH_TEST_FL_FAILED: Driver set this flag if test fails.
- * @ETH_TEST_FL_EXTERNAL_LB: Application request to perform external loopback
- *      test.
- * @ETH_TEST_FL_EXTERNAL_LB_DONE: Driver performed the external loopback test
- */
-
-enum ethtool_test_flags {
-        ETH_TEST_FL_OFFLINE     = (1 << 0),
-        ETH_TEST_FL_FAILED      = (1 << 1),
-        ETH_TEST_FL_EXTERNAL_LB = (1 << 2),
-        ETH_TEST_FL_EXTERNAL_LB_DONE    = (1 << 3),
-};
-
-/* for requesting NIC test and getting results*/
-struct ethtool_test {
-        __u32   cmd;            /* ETHTOOL_TEST */
-        __u32   flags;          /* ETH_TEST_FL_xxx */
-        __u32   reserved;
-        __u32   len;            /* result length, in number of u64 elements */
-        __u64   data[0];
-};
-
-/* for dumping NIC-specific statistics */
-struct ethtool_stats {
-        __u32   cmd;            /* ETHTOOL_GSTATS */
-        __u32   n_stats;        /* number of u64's being returned */
-        __u64   data[0];
-};
-
-struct ethtool_perm_addr {
-        __u32   cmd;            /* ETHTOOL_GPERMADDR */
-        __u32   size;
-        __u8    data[0];
-};
-
-/* boolean flags controlling per-interface behavior characteristics.
- * When reading, the flag indicates whether or not a certain behavior
- * is enabled/present.  When writing, the flag indicates whether
- * or not the driver should turn on (set) or off (clear) a behavior.
- *
- * Some behaviors may read-only (unconditionally absent or present).
- * If such is the case, return EINVAL in the set-flags operation if the
- * flag differs from the read-only value.
- */
-enum ethtool_flags {
-        ETH_FLAG_TXVLAN         = (1 << 7),     /* TX VLAN offload enabled */
-        ETH_FLAG_RXVLAN         = (1 << 8),     /* RX VLAN offload enabled */
-        ETH_FLAG_LRO            = (1 << 15),    /* LRO is enabled */
-        ETH_FLAG_NTUPLE         = (1 << 27),    /* N-tuple filters enabled */
-        ETH_FLAG_RXHASH         = (1 << 28),
-};
+#include <uapi/linux/ethtool.h>
 
-/* The following structures are for supporting RX network flow
- * classification and RX n-tuple configuration. Note, all multibyte
- * fields, e.g., ip4src, ip4dst, psrc, pdst, spi, etc. are expected to
- * be in network byte order.
- */
-
-/**
- * struct ethtool_tcpip4_spec - flow specification for TCP/IPv4 etc.
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @psrc: Source port
- * @pdst: Destination port
- * @tos: Type-of-service
- *
- * This can be used to specify a TCP/IPv4, UDP/IPv4 or SCTP/IPv4 flow.
- */
-struct ethtool_tcpip4_spec {
-        __be32  ip4src;
-        __be32  ip4dst;
-        __be16  psrc;
-        __be16  pdst;
-        __u8    tos;
-};
-
-/**
- * struct ethtool_ah_espip4_spec - flow specification for IPsec/IPv4
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @spi: Security parameters index
- * @tos: Type-of-service
- *
- * This can be used to specify an IPsec transport or tunnel over IPv4.
- */
-struct ethtool_ah_espip4_spec {
-        __be32  ip4src;
-        __be32  ip4dst;
-        __be32  spi;
-        __u8    tos;
-};
-
-#define ETH_RX_NFC_IP4  1
-
-/**
- * struct ethtool_usrip4_spec - general flow specification for IPv4
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @l4_4_bytes: First 4 bytes of transport (layer 4) header
- * @tos: Type-of-service
- * @ip_ver: Value must be %ETH_RX_NFC_IP4; mask must be 0
- * @proto: Transport protocol number; mask must be 0
- */
-struct ethtool_usrip4_spec {
-        __be32  ip4src;
-        __be32  ip4dst;
-        __be32  l4_4_bytes;
-        __u8    tos;
-        __u8    ip_ver;
-        __u8    proto;
-};
-
-union ethtool_flow_union {
-        struct ethtool_tcpip4_spec              tcp_ip4_spec;
-        struct ethtool_tcpip4_spec              udp_ip4_spec;
-        struct ethtool_tcpip4_spec              sctp_ip4_spec;
-        struct ethtool_ah_espip4_spec           ah_ip4_spec;
-        struct ethtool_ah_espip4_spec           esp_ip4_spec;
-        struct ethtool_usrip4_spec              usr_ip4_spec;
-        struct ethhdr                           ether_spec;
-        __u8                                    hdata[60];
-};
-
-struct ethtool_flow_ext {
-        __be16  vlan_etype;
-        __be16  vlan_tci;
-        __be32  data[2];
-};
-
-/**
- * struct ethtool_rx_flow_spec - classification rule for RX flows
- * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
- * @h_u: Flow fields to match (dependent on @flow_type)
- * @h_ext: Additional fields to match
- * @m_u: Masks for flow field bits to be matched
- * @m_ext: Masks for additional field bits to be matched
- *      Note, all additional fields must be ignored unless @flow_type
- *      includes the %FLOW_EXT flag.
- * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
- *      if packets should be discarded
- * @location: Location of rule in the table.  Locations must be
- *      numbered such that a flow matching multiple rules will be
- *      classified according to the first (lowest numbered) rule.
- */
-struct ethtool_rx_flow_spec {
-        __u32           flow_type;
-        union ethtool_flow_union h_u;
-        struct ethtool_flow_ext h_ext;
-        union ethtool_flow_union m_u;
-        struct ethtool_flow_ext m_ext;
-        __u64           ring_cookie;
-        __u32           location;
-};
-
-/**
- * struct ethtool_rxnfc - command to get or set RX flow classification rules
- * @cmd: Specific command number - %ETHTOOL_GRXFH, %ETHTOOL_SRXFH,
- *      %ETHTOOL_GRXRINGS, %ETHTOOL_GRXCLSRLCNT, %ETHTOOL_GRXCLSRULE,
- *      %ETHTOOL_GRXCLSRLALL, %ETHTOOL_SRXCLSRLDEL or %ETHTOOL_SRXCLSRLINS
- * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW
- * @data: Command-dependent value
- * @fs: Flow classification rule
- * @rule_cnt: Number of rules to be affected
- * @rule_locs: Array of used rule locations
- *
- * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating
- * the fields included in the flow hash, e.g. %RXH_IP_SRC.  The following
- * structure fields must not be used.
- *
- * For %ETHTOOL_GRXRINGS, @data is set to the number of RX rings/queues
- * on return.
- *
- * For %ETHTOOL_GRXCLSRLCNT, @rule_cnt is set to the number of defined
- * rules on return.  If @data is non-zero on return then it is the
- * size of the rule table, plus the flag %RX_CLS_LOC_SPECIAL if the
- * driver supports any special location values.  If that flag is not
- * set in @data then special location values should not be used.
- *
- * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an
- * existing rule on entry and @fs contains the rule on return.
- *
- * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the
- * user buffer for @rule_locs on entry.  On return, @data is the size
- * of the rule table, @rule_cnt is the number of defined rules, and
- * @rule_locs contains the locations of the defined rules.  Drivers
- * must use the second parameter to get_rxnfc() instead of @rule_locs.
- *
- * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.
- * @fs.@location either specifies the location to use or is a special
- * location value with %RX_CLS_LOC_SPECIAL flag set.  On return,
- * @fs.@location is the actual rule location.
- *
- * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
- * existing rule on entry.
- *
- * A driver supporting the special location values for
- * %ETHTOOL_SRXCLSRLINS may add the rule at any suitable unused
- * location, and may remove a rule at a later location (lower
- * priority) that matches exactly the same set of flows.  The special
- * values are: %RX_CLS_LOC_ANY, selecting any location;
- * %RX_CLS_LOC_FIRST, selecting the first suitable location (maximum
- * priority); and %RX_CLS_LOC_LAST, selecting the last suitable
- * location (minimum priority).  Additional special values may be
- * defined in future and drivers must return -%EINVAL for any
- * unrecognised value.
- */
-struct ethtool_rxnfc {
-        __u32                           cmd;
-        __u32                           flow_type;
-        __u64                           data;
-        struct ethtool_rx_flow_spec     fs;
-        __u32                           rule_cnt;
-        __u32                           rule_locs[0];
-};
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 
 struct compat_ethtool_rx_flow_spec {
@@ -621,223 +37,6 @@ struct compat_ethtool_rxnfc {
 };
 
 #endif /* CONFIG_COMPAT */
-#endif /* __KERNEL__ */
-
-/**
- * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection
- * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR
- * @size: On entry, the array size of the user buffer, which may be zero.
- *      On return from %ETHTOOL_GRXFHINDIR, the array size of the hardware
- *      indirection table.
- * @ring_index: RX ring/queue index for each hash value
- *
- * For %ETHTOOL_GRXFHINDIR, a @size of zero means that only the size
- * should be returned.  For %ETHTOOL_SRXFHINDIR, a @size of zero means
- * the table should be reset to default values.  This last feature
- * is not supported by the original implementations.
- */
-struct ethtool_rxfh_indir {
-        __u32   cmd;
-        __u32   size;
-        __u32   ring_index[0];
-};
-
-/**
- * struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter
- * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
- * @h_u: Flow field values to match (dependent on @flow_type)
- * @m_u: Masks for flow field value bits to be ignored
- * @vlan_tag: VLAN tag to match
- * @vlan_tag_mask: Mask for VLAN tag bits to be ignored
- * @data: Driver-dependent data to match
- * @data_mask: Mask for driver-dependent data bits to be ignored
- * @action: RX ring/queue index to deliver to (non-negative) or other action
- *      (negative, e.g. %ETHTOOL_RXNTUPLE_ACTION_DROP)
- *
- * For flow types %TCP_V4_FLOW, %UDP_V4_FLOW and %SCTP_V4_FLOW, where
- * a field value and mask are both zero this is treated as if all mask
- * bits are set i.e. the field is ignored.
- */
-struct ethtool_rx_ntuple_flow_spec {
-        __u32            flow_type;
-        union {
-                struct ethtool_tcpip4_spec              tcp_ip4_spec;
-                struct ethtool_tcpip4_spec              udp_ip4_spec;
-                struct ethtool_tcpip4_spec              sctp_ip4_spec;
-                struct ethtool_ah_espip4_spec           ah_ip4_spec;
-                struct ethtool_ah_espip4_spec           esp_ip4_spec;
-                struct ethtool_usrip4_spec              usr_ip4_spec;
-                struct ethhdr                           ether_spec;
-                __u8                                    hdata[72];
-        } h_u, m_u;
-
-        __u16           vlan_tag;
-        __u16           vlan_tag_mask;
-        __u64           data;
-        __u64           data_mask;
-
-        __s32           action;
-#define ETHTOOL_RXNTUPLE_ACTION_DROP    (-1)    /* drop packet */
-#define ETHTOOL_RXNTUPLE_ACTION_CLEAR   (-2)    /* clear filter */
-};
-
-/**
- * struct ethtool_rx_ntuple - command to set or clear RX flow filter
- * @cmd: Command number - %ETHTOOL_SRXNTUPLE
- * @fs: Flow filter specification
- */
-struct ethtool_rx_ntuple {
-        __u32                                   cmd;
-        struct ethtool_rx_ntuple_flow_spec      fs;
-};
-
-#define ETHTOOL_FLASH_MAX_FILENAME      128
-enum ethtool_flash_op_type {
-        ETHTOOL_FLASH_ALL_REGIONS       = 0,
-};
-
-/* for passing firmware flashing related parameters */
-struct ethtool_flash {
-        __u32   cmd;
-        __u32   region;
-        char    data[ETHTOOL_FLASH_MAX_FILENAME];
-};
-
-/**
- * struct ethtool_dump - used for retrieving, setting device dump
- * @cmd: Command number - %ETHTOOL_GET_DUMP_FLAG, %ETHTOOL_GET_DUMP_DATA, or
- *      %ETHTOOL_SET_DUMP
- * @version: FW version of the dump, filled in by driver
- * @flag: driver dependent flag for dump setting, filled in by driver during
- *        get and filled in by ethtool for set operation.
- *        flag must be initialized by macro ETH_FW_DUMP_DISABLE value when
- *        firmware dump is disabled.
- * @len: length of dump data, used as the length of the user buffer on entry to
- *       %ETHTOOL_GET_DUMP_DATA and this is returned as dump length by driver
- *       for %ETHTOOL_GET_DUMP_FLAG command
- * @data: data collected for get dump data operation
- */
-
-#define ETH_FW_DUMP_DISABLE 0
-
-struct ethtool_dump {
-        __u32   cmd;
-        __u32   version;
-        __u32   flag;
-        __u32   len;
-        __u8    data[0];
-};
-
-/* for returning and changing feature sets */
-
-/**
- * struct ethtool_get_features_block - block with state of 32 features
- * @available: mask of changeable features
- * @requested: mask of features requested to be enabled if possible
- * @active: mask of currently enabled features
- * @never_changed: mask of features not changeable for any device
- */
-struct ethtool_get_features_block {
-        __u32   available;
-        __u32   requested;
-        __u32   active;
-        __u32   never_changed;
-};
-
-/**
- * struct ethtool_gfeatures - command to get state of device's features
- * @cmd: command number = %ETHTOOL_GFEATURES
- * @size: in: number of elements in the features[] array;
- *       out: number of elements in features[] needed to hold all features
- * @features: state of features
- */
-struct ethtool_gfeatures {
-        __u32   cmd;
-        __u32   size;
-        struct ethtool_get_features_block features[0];
-};
-
-/**
- * struct ethtool_set_features_block - block with request for 32 features
- * @valid: mask of features to be changed
- * @requested: values of features to be changed
- */
-struct ethtool_set_features_block {
-        __u32   valid;
-        __u32   requested;
-};
-
-/**
- * struct ethtool_sfeatures - command to request change in device's features
- * @cmd: command number = %ETHTOOL_SFEATURES
- * @size: array size of the features[] array
- * @features: feature change masks
- */
-struct ethtool_sfeatures {
-        __u32   cmd;
-        __u32   size;
-        struct ethtool_set_features_block features[0];
-};
-
-/**
- * struct ethtool_ts_info - holds a device's timestamping and PHC association
- * @cmd: command number = %ETHTOOL_GET_TS_INFO
- * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags
- * @phc_index: device index of the associated PHC, or -1 if there is none
- * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values
- * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values
- *
- * The bits in the 'tx_types' and 'rx_filters' fields correspond to
- * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
- * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
- * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
- */
-struct ethtool_ts_info {
-        __u32   cmd;
-        __u32   so_timestamping;
-        __s32   phc_index;
-        __u32   tx_types;
-        __u32   tx_reserved[3];
-        __u32   rx_filters;
-        __u32   rx_reserved[3];
-};
-
-/*
- * %ETHTOOL_SFEATURES changes features present in features[].valid to the
- * values of corresponding bits in features[].requested. Bits in .requested
- * not set in .valid or not changeable are ignored.
- *
- * Returns %EINVAL when .valid contains undefined or never-changeable bits
- * or size is not equal to required number of features words (32-bit blocks).
- * Returns >= 0 if request was completed; bits set in the value mean:
- *   %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not
- *      changeable (not present in %ETHTOOL_GFEATURES' features[].available)
- *      those bits were ignored.
- *   %ETHTOOL_F_WISH - some or all changes requested were recorded but the
- *      resulting state of bits masked by .valid is not equal to .requested.
- *      Probably there are other device-specific constraints on some features
- *      in the set. When %ETHTOOL_F_UNSUPPORTED is set, .valid is considered
- *      here as though ignored bits were cleared.
- *   %ETHTOOL_F_COMPAT - some or all changes requested were made by calling
- *      compatibility functions. Requested offload state cannot be properly
- *      managed by kernel.
- *
- * Meaning of bits in the masks are obtained by %ETHTOOL_GSSET_INFO (number of
- * bits in the arrays - always multiple of 32) and %ETHTOOL_GSTRINGS commands
- * for ETH_SS_FEATURES string set. First entry in the table corresponds to least
- * significant bit in features[0] fields. Empty strings mark undefined features.
- */
-enum ethtool_sfeatures_retval_bits {
-        ETHTOOL_F_UNSUPPORTED__BIT,
-        ETHTOOL_F_WISH__BIT,
-        ETHTOOL_F_COMPAT__BIT,
-};
-
-#define ETHTOOL_F_UNSUPPORTED   (1 << ETHTOOL_F_UNSUPPORTED__BIT)
-#define ETHTOOL_F_WISH          (1 << ETHTOOL_F_WISH__BIT)
-#define ETHTOOL_F_COMPAT        (1 << ETHTOOL_F_COMPAT__BIT)
-
-#ifdef __KERNEL__
 
 #include <linux/rculist.h>
 
@@ -1049,277 +248,4 @@ struct ethtool_ops {
 
 
 };
-#endif /* __KERNEL__ */
-
-/* CMDs currently supported */
-#define ETHTOOL_GSET            0x00000001 /* Get settings. */
-#define ETHTOOL_SSET            0x00000002 /* Set settings. */
-#define ETHTOOL_GDRVINFO        0x00000003 /* Get driver info. */
-#define ETHTOOL_GREGS           0x00000004 /* Get NIC registers. */
-#define ETHTOOL_GWOL            0x00000005 /* Get wake-on-lan options. */
-#define ETHTOOL_SWOL            0x00000006 /* Set wake-on-lan options. */
-#define ETHTOOL_GMSGLVL         0x00000007 /* Get driver message level */
-#define ETHTOOL_SMSGLVL         0x00000008 /* Set driver msg level. */
-#define ETHTOOL_NWAY_RST        0x00000009 /* Restart autonegotiation. */
-/* Get link status for host, i.e. whether the interface *and* the
- * physical port (if there is one) are up (ethtool_value). */
-#define ETHTOOL_GLINK           0x0000000a
-#define ETHTOOL_GEEPROM         0x0000000b /* Get EEPROM data */
-#define ETHTOOL_SEEPROM         0x0000000c /* Set EEPROM data. */
-#define ETHTOOL_GCOALESCE       0x0000000e /* Get coalesce config */
-#define ETHTOOL_SCOALESCE       0x0000000f /* Set coalesce config. */
-#define ETHTOOL_GRINGPARAM      0x00000010 /* Get ring parameters */
-#define ETHTOOL_SRINGPARAM      0x00000011 /* Set ring parameters. */
-#define ETHTOOL_GPAUSEPARAM     0x00000012 /* Get pause parameters */
-#define ETHTOOL_SPAUSEPARAM     0x00000013 /* Set pause parameters. */
-#define ETHTOOL_GRXCSUM         0x00000014 /* Get RX hw csum enable (ethtool_value) */
-#define ETHTOOL_SRXCSUM         0x00000015 /* Set RX hw csum enable (ethtool_value) */
-#define ETHTOOL_GTXCSUM         0x00000016 /* Get TX hw csum enable (ethtool_value) */
-#define ETHTOOL_STXCSUM         0x00000017 /* Set TX hw csum enable (ethtool_value) */
-#define ETHTOOL_GSG             0x00000018 /* Get scatter-gather enable
-                                            * (ethtool_value) */
-#define ETHTOOL_SSG             0x00000019 /* Set scatter-gather enable
-                                            * (ethtool_value). */
-#define ETHTOOL_TEST            0x0000001a /* execute NIC self-test. */
-#define ETHTOOL_GSTRINGS        0x0000001b /* get specified string set */
-#define ETHTOOL_PHYS_ID         0x0000001c /* identify the NIC */
-#define ETHTOOL_GSTATS          0x0000001d /* get NIC-specific statistics */
-#define ETHTOOL_GTSO            0x0000001e /* Get TSO enable (ethtool_value) */
-#define ETHTOOL_STSO            0x0000001f /* Set TSO enable (ethtool_value) */
-#define ETHTOOL_GPERMADDR       0x00000020 /* Get permanent hardware address */
-#define ETHTOOL_GUFO            0x00000021 /* Get UFO enable (ethtool_value) */
-#define ETHTOOL_SUFO            0x00000022 /* Set UFO enable (ethtool_value) */
-#define ETHTOOL_GGSO            0x00000023 /* Get GSO enable (ethtool_value) */
-#define ETHTOOL_SGSO            0x00000024 /* Set GSO enable (ethtool_value) */
-#define ETHTOOL_GFLAGS          0x00000025 /* Get flags bitmap(ethtool_value) */
-#define ETHTOOL_SFLAGS          0x00000026 /* Set flags bitmap(ethtool_value) */
-#define ETHTOOL_GPFLAGS         0x00000027 /* Get driver-private flags bitmap */
-#define ETHTOOL_SPFLAGS         0x00000028 /* Set driver-private flags bitmap */
-
-#define ETHTOOL_GRXFH           0x00000029 /* Get RX flow hash configuration */
-#define ETHTOOL_SRXFH           0x0000002a /* Set RX flow hash configuration */
-#define ETHTOOL_GGRO            0x0000002b /* Get GRO enable (ethtool_value) */
-#define ETHTOOL_SGRO            0x0000002c /* Set GRO enable (ethtool_value) */
-#define ETHTOOL_GRXRINGS        0x0000002d /* Get RX rings available for LB */
-#define ETHTOOL_GRXCLSRLCNT     0x0000002e /* Get RX class rule count */
-#define ETHTOOL_GRXCLSRULE      0x0000002f /* Get RX classification rule */
-#define ETHTOOL_GRXCLSRLALL     0x00000030 /* Get all RX classification rule */
-#define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
-#define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
-#define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
-#define ETHTOOL_RESET           0x00000034 /* Reset hardware */
-#define ETHTOOL_SRXNTUPLE       0x00000035 /* Add an n-tuple filter to device */
-#define ETHTOOL_GRXNTUPLE       0x00000036 /* deprecated */
-#define ETHTOOL_GSSET_INFO      0x00000037 /* Get string set info */
-#define ETHTOOL_GRXFHINDIR      0x00000038 /* Get RX flow hash indir'n table */
-#define ETHTOOL_SRXFHINDIR      0x00000039 /* Set RX flow hash indir'n table */
-
-#define ETHTOOL_GFEATURES       0x0000003a /* Get device offload settings */
-#define ETHTOOL_SFEATURES       0x0000003b /* Change device offload settings */
-#define ETHTOOL_GCHANNELS       0x0000003c /* Get no of channels */
-#define ETHTOOL_SCHANNELS       0x0000003d /* Set no of channels */
-#define ETHTOOL_SET_DUMP        0x0000003e /* Set dump settings */
-#define ETHTOOL_GET_DUMP_FLAG   0x0000003f /* Get dump settings */
-#define ETHTOOL_GET_DUMP_DATA   0x00000040 /* Get dump data */
-#define ETHTOOL_GET_TS_INFO     0x00000041 /* Get time stamping and PHC info */
-#define ETHTOOL_GMODULEINFO     0x00000042 /* Get plug-in module information */
-#define ETHTOOL_GMODULEEEPROM   0x00000043 /* Get plug-in module eeprom */
-#define ETHTOOL_GEEE            0x00000044 /* Get EEE settings */
-#define ETHTOOL_SEEE            0x00000045 /* Set EEE settings */
-
-/* compatibility with older code */
-#define SPARC_ETH_GSET          ETHTOOL_GSET
-#define SPARC_ETH_SSET          ETHTOOL_SSET
-
-/* Indicates what features are supported by the interface. */
-#define SUPPORTED_10baseT_Half          (1 << 0)
-#define SUPPORTED_10baseT_Full          (1 << 1)
-#define SUPPORTED_100baseT_Half         (1 << 2)
-#define SUPPORTED_100baseT_Full         (1 << 3)
-#define SUPPORTED_1000baseT_Half        (1 << 4)
-#define SUPPORTED_1000baseT_Full        (1 << 5)
-#define SUPPORTED_Autoneg               (1 << 6)
-#define SUPPORTED_TP                    (1 << 7)
-#define SUPPORTED_AUI                   (1 << 8)
-#define SUPPORTED_MII                   (1 << 9)
-#define SUPPORTED_FIBRE                 (1 << 10)
-#define SUPPORTED_BNC                   (1 << 11)
-#define SUPPORTED_10000baseT_Full       (1 << 12)
-#define SUPPORTED_Pause                 (1 << 13)
-#define SUPPORTED_Asym_Pause            (1 << 14)
-#define SUPPORTED_2500baseX_Full        (1 << 15)
-#define SUPPORTED_Backplane             (1 << 16)
-#define SUPPORTED_1000baseKX_Full       (1 << 17)
-#define SUPPORTED_10000baseKX4_Full     (1 << 18)
-#define SUPPORTED_10000baseKR_Full      (1 << 19)
-#define SUPPORTED_10000baseR_FEC        (1 << 20)
-#define SUPPORTED_20000baseMLD2_Full    (1 << 21)
-#define SUPPORTED_20000baseKR2_Full     (1 << 22)
-#define SUPPORTED_40000baseKR4_Full     (1 << 23)
-#define SUPPORTED_40000baseCR4_Full     (1 << 24)
-#define SUPPORTED_40000baseSR4_Full     (1 << 25)
-#define SUPPORTED_40000baseLR4_Full     (1 << 26)
-
-/* Indicates what features are advertised by the interface. */
-#define ADVERTISED_10baseT_Half         (1 << 0)
-#define ADVERTISED_10baseT_Full         (1 << 1)
-#define ADVERTISED_100baseT_Half        (1 << 2)
-#define ADVERTISED_100baseT_Full        (1 << 3)
-#define ADVERTISED_1000baseT_Half       (1 << 4)
-#define ADVERTISED_1000baseT_Full       (1 << 5)
-#define ADVERTISED_Autoneg              (1 << 6)
-#define ADVERTISED_TP                   (1 << 7)
-#define ADVERTISED_AUI                  (1 << 8)
-#define ADVERTISED_MII                  (1 << 9)
-#define ADVERTISED_FIBRE                (1 << 10)
-#define ADVERTISED_BNC                  (1 << 11)
-#define ADVERTISED_10000baseT_Full      (1 << 12)
-#define ADVERTISED_Pause                (1 << 13)
-#define ADVERTISED_Asym_Pause           (1 << 14)
-#define ADVERTISED_2500baseX_Full       (1 << 15)
-#define ADVERTISED_Backplane            (1 << 16)
-#define ADVERTISED_1000baseKX_Full      (1 << 17)
-#define ADVERTISED_10000baseKX4_Full    (1 << 18)
-#define ADVERTISED_10000baseKR_Full     (1 << 19)
-#define ADVERTISED_10000baseR_FEC       (1 << 20)
-#define ADVERTISED_20000baseMLD2_Full   (1 << 21)
-#define ADVERTISED_20000baseKR2_Full    (1 << 22)
-#define ADVERTISED_40000baseKR4_Full    (1 << 23)
-#define ADVERTISED_40000baseCR4_Full    (1 << 24)
-#define ADVERTISED_40000baseSR4_Full    (1 << 25)
-#define ADVERTISED_40000baseLR4_Full    (1 << 26)
-
-/* The following are all involved in forcing a particular link
- * mode for the device for setting things.  When getting the
- * devices settings, these indicate the current mode and whether
- * it was forced up into this mode or autonegotiated.
- */
-
-/* The forced speed, 10Mb, 100Mb, gigabit, 2.5Gb, 10GbE. */
-#define SPEED_10                10
-#define SPEED_100               100
-#define SPEED_1000              1000
-#define SPEED_2500              2500
-#define SPEED_10000             10000
-#define SPEED_UNKNOWN           -1
-
-/* Duplex, half or full. */
-#define DUPLEX_HALF             0x00
-#define DUPLEX_FULL             0x01
-#define DUPLEX_UNKNOWN          0xff
-
-/* Which connector port. */
-#define PORT_TP                 0x00
-#define PORT_AUI                0x01
-#define PORT_MII                0x02
-#define PORT_FIBRE              0x03
-#define PORT_BNC                0x04
-#define PORT_DA                 0x05
-#define PORT_NONE               0xef
-#define PORT_OTHER              0xff
-
-/* Which transceiver to use. */
-#define XCVR_INTERNAL           0x00
-#define XCVR_EXTERNAL           0x01
-#define XCVR_DUMMY1             0x02
-#define XCVR_DUMMY2             0x03
-#define XCVR_DUMMY3             0x04
-
-/* Enable or disable autonegotiation.  If this is set to enable,
- * the forced link modes above are completely ignored.
- */
-#define AUTONEG_DISABLE         0x00
-#define AUTONEG_ENABLE          0x01
-
-/* MDI or MDI-X status/control - if MDI/MDI_X/AUTO is set then
- * the driver is required to renegotiate link
- */
-#define ETH_TP_MDI_INVALID      0x00 /* status: unknown; control: unsupported */
-#define ETH_TP_MDI              0x01 /* status: MDI;     control: force MDI */
-#define ETH_TP_MDI_X            0x02 /* status: MDI-X;   control: force MDI-X */
-#define ETH_TP_MDI_AUTO         0x03 /*                  control: auto-select */
-
-/* Wake-On-Lan options. */
-#define WAKE_PHY                (1 << 0)
-#define WAKE_UCAST              (1 << 1)
-#define WAKE_MCAST              (1 << 2)
-#define WAKE_BCAST              (1 << 3)
-#define WAKE_ARP                (1 << 4)
-#define WAKE_MAGIC              (1 << 5)
-#define WAKE_MAGICSECURE        (1 << 6) /* only meaningful if WAKE_MAGIC */
-
-/* L2-L4 network traffic flow types */
-#define TCP_V4_FLOW     0x01    /* hash or spec (tcp_ip4_spec) */
-#define UDP_V4_FLOW     0x02    /* hash or spec (udp_ip4_spec) */
-#define SCTP_V4_FLOW    0x03    /* hash or spec (sctp_ip4_spec) */
-#define AH_ESP_V4_FLOW  0x04    /* hash only */
-#define TCP_V6_FLOW     0x05    /* hash only */
-#define UDP_V6_FLOW     0x06    /* hash only */
-#define SCTP_V6_FLOW    0x07    /* hash only */
-#define AH_ESP_V6_FLOW  0x08    /* hash only */
-#define AH_V4_FLOW      0x09    /* hash or spec (ah_ip4_spec) */
-#define ESP_V4_FLOW     0x0a    /* hash or spec (esp_ip4_spec) */
-#define AH_V6_FLOW      0x0b    /* hash only */
-#define ESP_V6_FLOW     0x0c    /* hash only */
-#define IP_USER_FLOW    0x0d    /* spec only (usr_ip4_spec) */
-#define IPV4_FLOW       0x10    /* hash only */
-#define IPV6_FLOW       0x11    /* hash only */
-#define ETHER_FLOW      0x12    /* spec only (ether_spec) */
-/* Flag to enable additional fields in struct ethtool_rx_flow_spec */
-#define FLOW_EXT        0x80000000
-
-/* L3-L4 network traffic flow hash options */
-#define RXH_L2DA        (1 << 1)
-#define RXH_VLAN        (1 << 2)
-#define RXH_L3_PROTO    (1 << 3)
-#define RXH_IP_SRC      (1 << 4)
-#define RXH_IP_DST      (1 << 5)
-#define RXH_L4_B_0_1    (1 << 6) /* src port in case of TCP/UDP/SCTP */
-#define RXH_L4_B_2_3    (1 << 7) /* dst port in case of TCP/UDP/SCTP */
-#define RXH_DISCARD     (1 << 31)
-
-#define RX_CLS_FLOW_DISC        0xffffffffffffffffULL
-
-/* Special RX classification rule insert location values */
-#define RX_CLS_LOC_SPECIAL      0x80000000      /* flag */
-#define RX_CLS_LOC_ANY          0xffffffff
-#define RX_CLS_LOC_FIRST        0xfffffffe
-#define RX_CLS_LOC_LAST         0xfffffffd
-
-/* EEPROM Standards for plug in modules */
-#define ETH_MODULE_SFF_8079             0x1
-#define ETH_MODULE_SFF_8079_LEN         256
-#define ETH_MODULE_SFF_8472             0x2
-#define ETH_MODULE_SFF_8472_LEN         512
-
-/* Reset flags */
-/* The reset() operation must clear the flags for the components which
- * were actually reset.  On successful return, the flags indicate the
- * components which were not reset, either because they do not exist
- * in the hardware or because they cannot be reset independently.  The
- * driver must never reset any components that were not requested.
- */
-enum ethtool_reset_flags {
-        /* These flags represent components dedicated to the interface
-         * the command is addressed to.  Shift any flag left by
-         * ETH_RESET_SHARED_SHIFT to reset a shared component of the
-         * same type.
-         */
-        ETH_RESET_MGMT          = 1 << 0,       /* Management processor */
-        ETH_RESET_IRQ           = 1 << 1,       /* Interrupt requester */
-        ETH_RESET_DMA           = 1 << 2,       /* DMA engine */
-        ETH_RESET_FILTER        = 1 << 3,       /* Filtering/flow direction */
-        ETH_RESET_OFFLOAD       = 1 << 4,       /* Protocol offload */
-        ETH_RESET_MAC           = 1 << 5,       /* Media access controller */
-        ETH_RESET_PHY           = 1 << 6,       /* Transceiver/PHY */
-        ETH_RESET_RAM           = 1 << 7,       /* RAM shared between
-                                                 * multiple components */
-
-        ETH_RESET_DEDICATED     = 0x0000ffff,   /* All components dedicated to
-                                                 * this interface */
-        ETH_RESET_ALL           = 0xffffffff,   /* All components used by this
-                                                 * interface, even if shared */
-};
-#define ETH_RESET_SHARED_SHIFT  16
-
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f4bb378ccf6a..6daf6d4971f6 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -10,58 +10,11 @@
  *  Davide Libenzi <davidel@xmailserver.org>
  *
  */
-
 #ifndef _LINUX_EVENTPOLL_H
 #define _LINUX_EVENTPOLL_H
 
-/* For O_CLOEXEC */
-#include <linux/fcntl.h>
-#include <linux/types.h>
-
-/* Flags for epoll_create1.  */
-#define EPOLL_CLOEXEC O_CLOEXEC
-
-/* Valid opcodes to issue to sys_epoll_ctl() */
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_DEL 2
-#define EPOLL_CTL_MOD 3
-
-/*
- * Request the handling of system wakeup events so as to prevent system suspends
- * from happening while those events are being processed.
- *
- * Assuming neither EPOLLET nor EPOLLONESHOT is set, system suspends will not be
- * re-allowed until epoll_wait is called again after consuming the wakeup
- * event(s).
- *
- * Requires CAP_BLOCK_SUSPEND
- */
-#define EPOLLWAKEUP (1 << 29)
-
-/* Set the One Shot behaviour for the target file descriptor */
-#define EPOLLONESHOT (1 << 30)
+#include <uapi/linux/eventpoll.h>
 
-/* Set the Edge Triggered behaviour for the target file descriptor */
-#define EPOLLET (1 << 31)
-
-/* 
- * On x86-64 make the 64bit structure have the same alignment as the
- * 32bit structure. This makes 32bit emulation easier.
- *
- * UML/x86_64 needs the same packing as x86_64
- */
-#ifdef __x86_64__
-#define EPOLL_PACKED __attribute__((packed))
-#else
-#define EPOLL_PACKED
-#endif
-
-struct epoll_event {
-        __u32 events;
-        __u64 data;
-} EPOLL_PACKED;
-
-#ifdef __KERNEL__
 
 /* Forward declarations to avoid compiler errors */
 struct file;
@@ -115,7 +68,4 @@ static inline void eventpoll_release(struct file *file) {}
 
 #endif
 
-#endif /* #ifdef __KERNEL__ */
-
 #endif /* #ifndef _LINUX_EVENTPOLL_H */
-
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 7443a560c9d0..2c26c14cd710 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -68,7 +68,7 @@ enum extcon_cable_name {
         EXTCON_VIDEO_OUT,
         EXTCON_MECHANICAL,
 };
-extern const char *extcon_cable_name[];
+extern const char extcon_cable_name[][CABLE_NAME_MAX + 1];
 
 struct extcon_cable;
 
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 73e0b628e058..31591686ac2d 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -1,10 +1,8 @@
 #ifndef _FALLOC_H_
 #define _FALLOC_H_
 
-#define FALLOC_FL_KEEP_SIZE     0x01 /* default is extend size */
-#define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
+#include <uapi/linux/falloc.h>
 
-#ifdef __KERNEL__
 
 /*
  * Space reservation ioctls and argument structure
@@ -23,6 +21,4 @@ struct space_resv {
 #define FS_IOC_RESVSP           _IOW('X', 40, struct space_resv)
 #define FS_IOC_RESVSP64         _IOW('X', 42, struct space_resv)
 
-#endif /* __KERNEL__ */
-
 #endif /* _FALLOC_H_ */
diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index 6c6133f76e16..cef93ddcc5a0 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -1,120 +1,8 @@
 #ifndef _LINUX_FANOTIFY_H
 #define _LINUX_FANOTIFY_H
 
-#include <linux/types.h>
+#include <uapi/linux/fanotify.h>
 
-/* the following events that user-space can register for */
-#define FAN_ACCESS              0x00000001      /* File was accessed */
-#define FAN_MODIFY              0x00000002      /* File was modified */
-#define FAN_CLOSE_WRITE         0x00000008      /* Writtable file closed */
-#define FAN_CLOSE_NOWRITE       0x00000010      /* Unwrittable file closed */
-#define FAN_OPEN                0x00000020      /* File was opened */
-
-#define FAN_Q_OVERFLOW          0x00004000      /* Event queued overflowed */
-
-#define FAN_OPEN_PERM           0x00010000      /* File open in perm check */
-#define FAN_ACCESS_PERM         0x00020000      /* File accessed in perm check */
-
-#define FAN_ONDIR               0x40000000      /* event occurred against dir */
-
-#define FAN_EVENT_ON_CHILD      0x08000000      /* interested in child events */
-
-/* helper events */
-#define FAN_CLOSE               (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
-
-/* flags used for fanotify_init() */
-#define FAN_CLOEXEC             0x00000001
-#define FAN_NONBLOCK            0x00000002
-
-/* These are NOT bitwise flags.  Both bits are used togther.  */
-#define FAN_CLASS_NOTIF         0x00000000
-#define FAN_CLASS_CONTENT       0x00000004
-#define FAN_CLASS_PRE_CONTENT   0x00000008
-#define FAN_ALL_CLASS_BITS      (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
-                                 FAN_CLASS_PRE_CONTENT)
-
-#define FAN_UNLIMITED_QUEUE     0x00000010
-#define FAN_UNLIMITED_MARKS     0x00000020
-
-#define FAN_ALL_INIT_FLAGS      (FAN_CLOEXEC | FAN_NONBLOCK | \
-                                 FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
-                                 FAN_UNLIMITED_MARKS)
-
-/* flags used for fanotify_modify_mark() */
-#define FAN_MARK_ADD            0x00000001
-#define FAN_MARK_REMOVE         0x00000002
-#define FAN_MARK_DONT_FOLLOW    0x00000004
-#define FAN_MARK_ONLYDIR        0x00000008
-#define FAN_MARK_MOUNT          0x00000010
-#define FAN_MARK_IGNORED_MASK   0x00000020
-#define FAN_MARK_IGNORED_SURV_MODIFY    0x00000040
-#define FAN_MARK_FLUSH          0x00000080
-#ifdef __KERNEL__
 /* not valid from userspace, only kernel internal */
 #define FAN_MARK_ONDIR          0x00000100
-#endif
-
-#define FAN_ALL_MARK_FLAGS      (FAN_MARK_ADD |\
-                                 FAN_MARK_REMOVE |\
-                                 FAN_MARK_DONT_FOLLOW |\
-                                 FAN_MARK_ONLYDIR |\
-                                 FAN_MARK_MOUNT |\
-                                 FAN_MARK_IGNORED_MASK |\
-                                 FAN_MARK_IGNORED_SURV_MODIFY |\
-                                 FAN_MARK_FLUSH)
-
-/*
- * All of the events - we build the list by hand so that we can add flags in
- * the future and not break backward compatibility.  Apps will get only the
- * events that they originally wanted.  Be sure to add new events here!
- */
-#define FAN_ALL_EVENTS (FAN_ACCESS |\
-                        FAN_MODIFY |\
-                        FAN_CLOSE |\
-                        FAN_OPEN)
-
-/*
- * All events which require a permission response from userspace
- */
-#define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM |\
-                             FAN_ACCESS_PERM)
-
-#define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS |\
-                                 FAN_ALL_PERM_EVENTS |\
-                                 FAN_Q_OVERFLOW)
-
-#define FANOTIFY_METADATA_VERSION       3
-
-struct fanotify_event_metadata {
-        __u32 event_len;
-        __u8 vers;
-        __u8 reserved;
-        __u16 metadata_len;
-        __aligned_u64 mask;
-        __s32 fd;
-        __s32 pid;
-};
-
-struct fanotify_response {
-        __s32 fd;
-        __u32 response;
-};
-
-/* Legit userspace responses to a _PERM event */
-#define FAN_ALLOW       0x01
-#define FAN_DENY        0x02
-/* No fd set in event */
-#define FAN_NOFD        -1
-
-/* Helper functions to deal with fanotify_event_metadata buffers */
-#define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
-
-#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, \
-                                   (struct fanotify_event_metadata*)(((char *)(meta)) + \
-                                   (meta)->event_len))
-
-#define FAN_EVENT_OK(meta, len) ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && \
-                                (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \
-                                (long)(meta)->event_len <= (long)(len))
-
 #endif /* _LINUX_FANOTIFY_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index ac3f1c605843..c7a95714b1fe 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -1,409 +1,10 @@
 #ifndef _LINUX_FB_H
 #define _LINUX_FB_H
 
-#include <linux/types.h>
-#include <linux/i2c.h>
-#ifdef __KERNEL__
 #include <linux/kgdb.h>
-#endif /* __KERNEL__ */
+#include <uapi/linux/fb.h>
 
-/* Definitions of frame buffers                                         */
-
-#define FB_MAX                  32      /* sufficient for now */
-
-/* ioctls
-   0x46 is 'F'                                                          */
-#define FBIOGET_VSCREENINFO     0x4600
-#define FBIOPUT_VSCREENINFO     0x4601
-#define FBIOGET_FSCREENINFO     0x4602
-#define FBIOGETCMAP             0x4604
-#define FBIOPUTCMAP             0x4605
-#define FBIOPAN_DISPLAY         0x4606
-#ifdef __KERNEL__
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)
-#else
-#define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor)
-#endif
-/* 0x4607-0x460B are defined below */
-/* #define FBIOGET_MONITORSPEC  0x460C */
-/* #define FBIOPUT_MONITORSPEC  0x460D */
-/* #define FBIOSWITCH_MONIBIT   0x460E */
-#define FBIOGET_CON2FBMAP       0x460F
-#define FBIOPUT_CON2FBMAP       0x4610
-#define FBIOBLANK               0x4611          /* arg: 0 or vesa level + 1 */
-#define FBIOGET_VBLANK          _IOR('F', 0x12, struct fb_vblank)
-#define FBIO_ALLOC              0x4613
-#define FBIO_FREE               0x4614
-#define FBIOGET_GLYPH           0x4615
-#define FBIOGET_HWCINFO         0x4616
-#define FBIOPUT_MODEINFO        0x4617
-#define FBIOGET_DISPINFO        0x4618
-#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, __u32)
-
-#define FB_TYPE_PACKED_PIXELS           0       /* Packed Pixels        */
-#define FB_TYPE_PLANES                  1       /* Non interleaved planes */
-#define FB_TYPE_INTERLEAVED_PLANES      2       /* Interleaved planes   */
-#define FB_TYPE_TEXT                    3       /* Text/attributes      */
-#define FB_TYPE_VGA_PLANES              4       /* EGA/VGA planes       */
-#define FB_TYPE_FOURCC                  5       /* Type identified by a V4L2 FOURCC */
-
-#define FB_AUX_TEXT_MDA         0       /* Monochrome text */
-#define FB_AUX_TEXT_CGA         1       /* CGA/EGA/VGA Color text */
-#define FB_AUX_TEXT_S3_MMIO     2       /* S3 MMIO fasttext */
-#define FB_AUX_TEXT_MGA_STEP16  3       /* MGA Millenium I: text, attr, 14 reserved bytes */
-#define FB_AUX_TEXT_MGA_STEP8   4       /* other MGAs:      text, attr,  6 reserved bytes */
-#define FB_AUX_TEXT_SVGA_GROUP  8       /* 8-15: SVGA tileblit compatible modes */
-#define FB_AUX_TEXT_SVGA_MASK   7       /* lower three bits says step */
-#define FB_AUX_TEXT_SVGA_STEP2  8       /* SVGA text mode:  text, attr */
-#define FB_AUX_TEXT_SVGA_STEP4  9       /* SVGA text mode:  text, attr,  2 reserved bytes */
-#define FB_AUX_TEXT_SVGA_STEP8  10      /* SVGA text mode:  text, attr,  6 reserved bytes */
-#define FB_AUX_TEXT_SVGA_STEP16 11      /* SVGA text mode:  text, attr, 14 reserved bytes */
-#define FB_AUX_TEXT_SVGA_LAST   15      /* reserved up to 15 */
-
-#define FB_AUX_VGA_PLANES_VGA4          0       /* 16 color planes (EGA/VGA) */
-#define FB_AUX_VGA_PLANES_CFB4          1       /* CFB4 in planes (VGA) */
-#define FB_AUX_VGA_PLANES_CFB8          2       /* CFB8 in planes (VGA) */
-
-#define FB_VISUAL_MONO01                0       /* Monochr. 1=Black 0=White */
-#define FB_VISUAL_MONO10                1       /* Monochr. 1=White 0=Black */
-#define FB_VISUAL_TRUECOLOR             2       /* True color   */
-#define FB_VISUAL_PSEUDOCOLOR           3       /* Pseudo color (like atari) */
-#define FB_VISUAL_DIRECTCOLOR           4       /* Direct color */
-#define FB_VISUAL_STATIC_PSEUDOCOLOR    5       /* Pseudo color readonly */
-#define FB_VISUAL_FOURCC                6       /* Visual identified by a V4L2 FOURCC */
-
-#define FB_ACCEL_NONE           0       /* no hardware accelerator      */
-#define FB_ACCEL_ATARIBLITT     1       /* Atari Blitter                */
-#define FB_ACCEL_AMIGABLITT     2       /* Amiga Blitter                */
-#define FB_ACCEL_S3_TRIO64      3       /* Cybervision64 (S3 Trio64)    */
-#define FB_ACCEL_NCR_77C32BLT   4       /* RetinaZ3 (NCR 77C32BLT)      */
-#define FB_ACCEL_S3_VIRGE       5       /* Cybervision64/3D (S3 ViRGE)  */
-#define FB_ACCEL_ATI_MACH64GX   6       /* ATI Mach 64GX family         */
-#define FB_ACCEL_DEC_TGA        7       /* DEC 21030 TGA                */
-#define FB_ACCEL_ATI_MACH64CT   8       /* ATI Mach 64CT family         */
-#define FB_ACCEL_ATI_MACH64VT   9       /* ATI Mach 64CT family VT class */
-#define FB_ACCEL_ATI_MACH64GT   10      /* ATI Mach 64CT family GT class */
-#define FB_ACCEL_SUN_CREATOR    11      /* Sun Creator/Creator3D        */
-#define FB_ACCEL_SUN_CGSIX      12      /* Sun cg6                      */
-#define FB_ACCEL_SUN_LEO        13      /* Sun leo/zx                   */
-#define FB_ACCEL_IMS_TWINTURBO  14      /* IMS Twin Turbo               */
-#define FB_ACCEL_3DLABS_PERMEDIA2 15    /* 3Dlabs Permedia 2            */
-#define FB_ACCEL_MATROX_MGA2064W 16     /* Matrox MGA2064W (Millenium)  */
-#define FB_ACCEL_MATROX_MGA1064SG 17    /* Matrox MGA1064SG (Mystique)  */
-#define FB_ACCEL_MATROX_MGA2164W 18     /* Matrox MGA2164W (Millenium II) */
-#define FB_ACCEL_MATROX_MGA2164W_AGP 19 /* Matrox MGA2164W (Millenium II) */
-#define FB_ACCEL_MATROX_MGAG100 20      /* Matrox G100 (Productiva G100) */
-#define FB_ACCEL_MATROX_MGAG200 21      /* Matrox G200 (Myst, Mill, ...) */
-#define FB_ACCEL_SUN_CG14       22      /* Sun cgfourteen                */
-#define FB_ACCEL_SUN_BWTWO      23      /* Sun bwtwo                    */
-#define FB_ACCEL_SUN_CGTHREE    24      /* Sun cgthree                  */
-#define FB_ACCEL_SUN_TCX        25      /* Sun tcx                      */
-#define FB_ACCEL_MATROX_MGAG400 26      /* Matrox G400                  */
-#define FB_ACCEL_NV3            27      /* nVidia RIVA 128              */
-#define FB_ACCEL_NV4            28      /* nVidia RIVA TNT              */
-#define FB_ACCEL_NV5            29      /* nVidia RIVA TNT2             */
-#define FB_ACCEL_CT_6555x       30      /* C&T 6555x                    */
-#define FB_ACCEL_3DFX_BANSHEE   31      /* 3Dfx Banshee                 */
-#define FB_ACCEL_ATI_RAGE128    32      /* ATI Rage128 family           */
-#define FB_ACCEL_IGS_CYBER2000  33      /* CyberPro 2000                */
-#define FB_ACCEL_IGS_CYBER2010  34      /* CyberPro 2010                */
-#define FB_ACCEL_IGS_CYBER5000  35      /* CyberPro 5000                */
-#define FB_ACCEL_SIS_GLAMOUR    36      /* SiS 300/630/540              */
-#define FB_ACCEL_3DLABS_PERMEDIA3 37    /* 3Dlabs Permedia 3            */
-#define FB_ACCEL_ATI_RADEON     38      /* ATI Radeon family            */
-#define FB_ACCEL_I810           39      /* Intel 810/815                */
-#define FB_ACCEL_SIS_GLAMOUR_2  40      /* SiS 315, 650, 740            */
-#define FB_ACCEL_SIS_XABRE      41      /* SiS 330 ("Xabre")            */
-#define FB_ACCEL_I830           42      /* Intel 830M/845G/85x/865G     */
-#define FB_ACCEL_NV_10          43      /* nVidia Arch 10               */
-#define FB_ACCEL_NV_20          44      /* nVidia Arch 20               */
-#define FB_ACCEL_NV_30          45      /* nVidia Arch 30               */
-#define FB_ACCEL_NV_40          46      /* nVidia Arch 40               */
-#define FB_ACCEL_XGI_VOLARI_V   47      /* XGI Volari V3XT, V5, V8      */
-#define FB_ACCEL_XGI_VOLARI_Z   48      /* XGI Volari Z7                */
-#define FB_ACCEL_OMAP1610       49      /* TI OMAP16xx                  */
-#define FB_ACCEL_TRIDENT_TGUI   50      /* Trident TGUI                 */
-#define FB_ACCEL_TRIDENT_3DIMAGE 51     /* Trident 3DImage              */
-#define FB_ACCEL_TRIDENT_BLADE3D 52     /* Trident Blade3D              */
-#define FB_ACCEL_TRIDENT_BLADEXP 53     /* Trident BladeXP              */
-#define FB_ACCEL_CIRRUS_ALPINE   53     /* Cirrus Logic 543x/544x/5480  */
-#define FB_ACCEL_NEOMAGIC_NM2070 90     /* NeoMagic NM2070              */
-#define FB_ACCEL_NEOMAGIC_NM2090 91     /* NeoMagic NM2090              */
-#define FB_ACCEL_NEOMAGIC_NM2093 92     /* NeoMagic NM2093              */
-#define FB_ACCEL_NEOMAGIC_NM2097 93     /* NeoMagic NM2097              */
-#define FB_ACCEL_NEOMAGIC_NM2160 94     /* NeoMagic NM2160              */
-#define FB_ACCEL_NEOMAGIC_NM2200 95     /* NeoMagic NM2200              */
-#define FB_ACCEL_NEOMAGIC_NM2230 96     /* NeoMagic NM2230              */
-#define FB_ACCEL_NEOMAGIC_NM2360 97     /* NeoMagic NM2360              */
-#define FB_ACCEL_NEOMAGIC_NM2380 98     /* NeoMagic NM2380              */
-#define FB_ACCEL_PXA3XX          99     /* PXA3xx                       */
-
-#define FB_ACCEL_SAVAGE4        0x80    /* S3 Savage4                   */
-#define FB_ACCEL_SAVAGE3D       0x81    /* S3 Savage3D                  */
-#define FB_ACCEL_SAVAGE3D_MV    0x82    /* S3 Savage3D-MV               */
-#define FB_ACCEL_SAVAGE2000     0x83    /* S3 Savage2000                */
-#define FB_ACCEL_SAVAGE_MX_MV   0x84    /* S3 Savage/MX-MV              */
-#define FB_ACCEL_SAVAGE_MX      0x85    /* S3 Savage/MX                 */
-#define FB_ACCEL_SAVAGE_IX_MV   0x86    /* S3 Savage/IX-MV              */
-#define FB_ACCEL_SAVAGE_IX      0x87    /* S3 Savage/IX                 */
-#define FB_ACCEL_PROSAVAGE_PM   0x88    /* S3 ProSavage PM133           */
-#define FB_ACCEL_PROSAVAGE_KM   0x89    /* S3 ProSavage KM133           */
-#define FB_ACCEL_S3TWISTER_P    0x8a    /* S3 Twister                   */
-#define FB_ACCEL_S3TWISTER_K    0x8b    /* S3 TwisterK                  */
-#define FB_ACCEL_SUPERSAVAGE    0x8c    /* S3 Supersavage               */
-#define FB_ACCEL_PROSAVAGE_DDR  0x8d    /* S3 ProSavage DDR             */
-#define FB_ACCEL_PROSAVAGE_DDRK 0x8e    /* S3 ProSavage DDR-K           */
-
-#define FB_ACCEL_PUV3_UNIGFX    0xa0    /* PKUnity-v3 Unigfx            */
-
-#define FB_CAP_FOURCC           1       /* Device supports FOURCC-based formats */
-
-struct fb_fix_screeninfo {
-        char id[16];                    /* identification string eg "TT Builtin" */
-        unsigned long smem_start;       /* Start of frame buffer mem */
-                                        /* (physical address) */
-        __u32 smem_len;                 /* Length of frame buffer mem */
-        __u32 type;                     /* see FB_TYPE_*                */
-        __u32 type_aux;                 /* Interleave for interleaved Planes */
-        __u32 visual;                   /* see FB_VISUAL_*              */ 
-        __u16 xpanstep;                 /* zero if no hardware panning  */
-        __u16 ypanstep;                 /* zero if no hardware panning  */
-        __u16 ywrapstep;                /* zero if no hardware ywrap    */
-        __u32 line_length;              /* length of a line in bytes    */
-        unsigned long mmio_start;       /* Start of Memory Mapped I/O   */
-                                        /* (physical address) */
-        __u32 mmio_len;                 /* Length of Memory Mapped I/O  */
-        __u32 accel;                    /* Indicate to driver which     */
-                                        /*  specific chip/card we have  */
-        __u16 capabilities;             /* see FB_CAP_*                 */
-        __u16 reserved[2];              /* Reserved for future compatibility */
-};
-
-/* Interpretation of offset for color fields: All offsets are from the right,
- * inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you
- * can use the offset as right argument to <<). A pixel afterwards is a bit
- * stream and is written to video memory as that unmodified.
- *
- * For pseudocolor: offset and length should be the same for all color
- * components. Offset specifies the position of the least significant bit
- * of the pallette index in a pixel value. Length indicates the number
- * of available palette entries (i.e. # of entries = 1 << length).
- */
-struct fb_bitfield {
-        __u32 offset;                   /* beginning of bitfield        */
-        __u32 length;                   /* length of bitfield           */
-        __u32 msb_right;                /* != 0 : Most significant bit is */ 
-                                        /* right */ 
-};
-
-#define FB_NONSTD_HAM           1       /* Hold-And-Modify (HAM)        */
-#define FB_NONSTD_REV_PIX_IN_B  2       /* order of pixels in each byte is reversed */
-
-#define FB_ACTIVATE_NOW         0       /* set values immediately (or vbl)*/
-#define FB_ACTIVATE_NXTOPEN     1       /* activate on next open        */
-#define FB_ACTIVATE_TEST        2       /* don't set, round up impossible */
-#define FB_ACTIVATE_MASK       15
-                                        /* values                       */
-#define FB_ACTIVATE_VBL        16       /* activate values on next vbl  */
-#define FB_CHANGE_CMAP_VBL     32       /* change colormap on vbl       */
-#define FB_ACTIVATE_ALL        64       /* change all VCs on this fb    */
-#define FB_ACTIVATE_FORCE     128       /* force apply even when no change*/
-#define FB_ACTIVATE_INV_MODE  256       /* invalidate videomode */
-
-#define FB_ACCELF_TEXT          1       /* (OBSOLETE) see fb_info.flags and vc_mode */
-
-#define FB_SYNC_HOR_HIGH_ACT    1       /* horizontal sync high active  */
-#define FB_SYNC_VERT_HIGH_ACT   2       /* vertical sync high active    */
-#define FB_SYNC_EXT             4       /* external sync                */
-#define FB_SYNC_COMP_HIGH_ACT   8       /* composite sync high active   */
-#define FB_SYNC_BROADCAST       16      /* broadcast video timings      */
-                                        /* vtotal = 144d/288n/576i => PAL  */
-                                        /* vtotal = 121d/242n/484i => NTSC */
-#define FB_SYNC_ON_GREEN        32      /* sync on green */
-
-#define FB_VMODE_NONINTERLACED  0       /* non interlaced */
-#define FB_VMODE_INTERLACED     1       /* interlaced   */
-#define FB_VMODE_DOUBLE         2       /* double scan */
-#define FB_VMODE_ODD_FLD_FIRST  4       /* interlaced: top line first */
-#define FB_VMODE_MASK           255
-
-#define FB_VMODE_YWRAP          256     /* ywrap instead of panning     */
-#define FB_VMODE_SMOOTH_XPAN    512     /* smooth xpan possible (internally used) */
-#define FB_VMODE_CONUPDATE      512     /* don't update x/yoffset       */
-
-/*
- * Display rotation support
- */
-#define FB_ROTATE_UR      0
-#define FB_ROTATE_CW      1
-#define FB_ROTATE_UD      2
-#define FB_ROTATE_CCW     3
-
-#define PICOS2KHZ(a) (1000000000UL/(a))
-#define KHZ2PICOS(a) (1000000000UL/(a))
-
-struct fb_var_screeninfo {
-        __u32 xres;                     /* visible resolution           */
-        __u32 yres;
-        __u32 xres_virtual;             /* virtual resolution           */
-        __u32 yres_virtual;
-        __u32 xoffset;                  /* offset from virtual to visible */
-        __u32 yoffset;                  /* resolution                   */
-
-        __u32 bits_per_pixel;           /* guess what                   */
-        __u32 grayscale;                /* 0 = color, 1 = grayscale,    */
-                                        /* >1 = FOURCC                  */
-        struct fb_bitfield red;         /* bitfield in fb mem if true color, */
-        struct fb_bitfield green;       /* else only length is significant */
-        struct fb_bitfield blue;
-        struct fb_bitfield transp;      /* transparency                 */      
-
-        __u32 nonstd;                   /* != 0 Non standard pixel format */
-
-        __u32 activate;                 /* see FB_ACTIVATE_*            */
-
-        __u32 height;                   /* height of picture in mm    */
-        __u32 width;                    /* width of picture in mm     */
-
-        __u32 accel_flags;              /* (OBSOLETE) see fb_info.flags */
-
-        /* Timing: All values in pixclocks, except pixclock (of course) */
-        __u32 pixclock;                 /* pixel clock in ps (pico seconds) */
-        __u32 left_margin;              /* time from sync to picture    */
-        __u32 right_margin;             /* time from picture to sync    */
-        __u32 upper_margin;             /* time from sync to picture    */
-        __u32 lower_margin;
-        __u32 hsync_len;                /* length of horizontal sync    */
-        __u32 vsync_len;                /* length of vertical sync      */
-        __u32 sync;                     /* see FB_SYNC_*                */
-        __u32 vmode;                    /* see FB_VMODE_*               */
-        __u32 rotate;                   /* angle we rotate counter clockwise */
-        __u32 colorspace;               /* colorspace for FOURCC-based modes */
-        __u32 reserved[4];              /* Reserved for future compatibility */
-};
-
-struct fb_cmap {
-        __u32 start;                    /* First entry  */
-        __u32 len;                      /* Number of entries */
-        __u16 *red;                     /* Red values   */
-        __u16 *green;
-        __u16 *blue;
-        __u16 *transp;                  /* transparency, can be NULL */
-};
-
-struct fb_con2fbmap {
-        __u32 console;
-        __u32 framebuffer;
-};
-
-/* VESA Blanking Levels */
-#define VESA_NO_BLANKING        0
-#define VESA_VSYNC_SUSPEND      1
-#define VESA_HSYNC_SUSPEND      2
-#define VESA_POWERDOWN          3
-
-
-enum {
-        /* screen: unblanked, hsync: on,  vsync: on */
-        FB_BLANK_UNBLANK       = VESA_NO_BLANKING,
-
-        /* screen: blanked,   hsync: on,  vsync: on */
-        FB_BLANK_NORMAL        = VESA_NO_BLANKING + 1,
-
-        /* screen: blanked,   hsync: on,  vsync: off */
-        FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1,
-
-        /* screen: blanked,   hsync: off, vsync: on */
-        FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1,
-
-        /* screen: blanked,   hsync: off, vsync: off */
-        FB_BLANK_POWERDOWN     = VESA_POWERDOWN + 1
-};
-
-#define FB_VBLANK_VBLANKING     0x001   /* currently in a vertical blank */
-#define FB_VBLANK_HBLANKING     0x002   /* currently in a horizontal blank */
-#define FB_VBLANK_HAVE_VBLANK   0x004   /* vertical blanks can be detected */
-#define FB_VBLANK_HAVE_HBLANK   0x008   /* horizontal blanks can be detected */
-#define FB_VBLANK_HAVE_COUNT    0x010   /* global retrace counter is available */
-#define FB_VBLANK_HAVE_VCOUNT   0x020   /* the vcount field is valid */
-#define FB_VBLANK_HAVE_HCOUNT   0x040   /* the hcount field is valid */
-#define FB_VBLANK_VSYNCING      0x080   /* currently in a vsync */
-#define FB_VBLANK_HAVE_VSYNC    0x100   /* verical syncs can be detected */
-
-struct fb_vblank {
-        __u32 flags;                    /* FB_VBLANK flags */
-        __u32 count;                    /* counter of retraces since boot */
-        __u32 vcount;                   /* current scanline position */
-        __u32 hcount;                   /* current scandot position */
-        __u32 reserved[4];              /* reserved for future compatibility */
-};
-
-/* Internal HW accel */
-#define ROP_COPY 0
-#define ROP_XOR  1
-
-struct fb_copyarea {
-        __u32 dx;
-        __u32 dy;
-        __u32 width;
-        __u32 height;
-        __u32 sx;
-        __u32 sy;
-};
-
-struct fb_fillrect {
-        __u32 dx;       /* screen-relative */
-        __u32 dy;
-        __u32 width;
-        __u32 height;
-        __u32 color;
-        __u32 rop;
-};
-
-struct fb_image {
-        __u32 dx;               /* Where to place image */
-        __u32 dy;
-        __u32 width;            /* Size of image */
-        __u32 height;
-        __u32 fg_color;         /* Only used when a mono bitmap */
-        __u32 bg_color;
-        __u8  depth;            /* Depth of the image */
-        const char *data;       /* Pointer to image data */
-        struct fb_cmap cmap;    /* color map info */
-};
-
-/*
- * hardware cursor control
- */
-
-#define FB_CUR_SETIMAGE 0x01
-#define FB_CUR_SETPOS   0x02
-#define FB_CUR_SETHOT   0x04
-#define FB_CUR_SETCMAP  0x08
-#define FB_CUR_SETSHAPE 0x10
-#define FB_CUR_SETSIZE  0x20
-#define FB_CUR_SETALL   0xFF
-
-struct fbcurpos {
-        __u16 x, y;
-};
-
-struct fb_cursor {
-        __u16 set;              /* what to set */
-        __u16 enable;           /* cursor on/off */
-        __u16 rop;              /* bitop operation */
-        const char *mask;       /* cursor mask bits */
-        struct fbcurpos hot;    /* cursor hot spot */
-        struct fb_image image;  /* Cursor image */
-};
-
-#ifdef CONFIG_FB_BACKLIGHT
-/* Settings for the generic backlight code */
-#define FB_BACKLIGHT_LEVELS     128
-#define FB_BACKLIGHT_MAX        0xFF
-#endif
-
-#ifdef __KERNEL__
 
 #include <linux/fs.h>
 #include <linux/init.h>
@@ -1181,6 +782,4 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
                         const struct fb_videomode *default_mode,
                         unsigned int default_bpp);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_FB_H */
diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index f550f894ba15..76ce329e656d 100644
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -1,54 +1,8 @@
 #ifndef _LINUX_FCNTL_H
 #define _LINUX_FCNTL_H
 
-#include <asm/fcntl.h>
+#include <uapi/linux/fcntl.h>
 
-#define F_SETLEASE      (F_LINUX_SPECIFIC_BASE + 0)
-#define F_GETLEASE      (F_LINUX_SPECIFIC_BASE + 1)
-
-/*
- * Cancel a blocking posix lock; internal use only until we expose an
- * asynchronous lock api to userspace:
- */
-#define F_CANCELLK      (F_LINUX_SPECIFIC_BASE + 5)
-
-/* Create a file descriptor with FD_CLOEXEC set. */
-#define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6)
-
-/*
- * Request nofications on a directory.
- * See below for events that may be notified.
- */
-#define F_NOTIFY        (F_LINUX_SPECIFIC_BASE+2)
-
-/*
- * Set and get of pipe page size array
- */
-#define F_SETPIPE_SZ    (F_LINUX_SPECIFIC_BASE + 7)
-#define F_GETPIPE_SZ    (F_LINUX_SPECIFIC_BASE + 8)
-
-/*
- * Types of directory notifications that may be requested.
- */
-#define DN_ACCESS       0x00000001      /* File accessed */
-#define DN_MODIFY       0x00000002      /* File modified */
-#define DN_CREATE       0x00000004      /* File created */
-#define DN_DELETE       0x00000008      /* File removed */
-#define DN_RENAME       0x00000010      /* File renamed */
-#define DN_ATTRIB       0x00000020      /* File changed attibutes */
-#define DN_MULTISHOT    0x80000000      /* Don't remove notifier */
-
-#define AT_FDCWD                -100    /* Special value used to indicate
-                                           openat should use the current
-                                           working directory. */
-#define AT_SYMLINK_NOFOLLOW     0x100   /* Do not follow symbolic links.  */
-#define AT_REMOVEDIR            0x200   /* Remove directory instead of
-                                           unlinking file.  */
-#define AT_SYMLINK_FOLLOW       0x400   /* Follow symbolic links.  */
-#define AT_NO_AUTOMOUNT         0x800   /* Suppress terminal automount traversal */
-#define AT_EMPTY_PATH           0x1000  /* Allow empty relative pathname */
-
-#ifdef __KERNEL__
 
 #ifndef force_o_largefile
 #define force_o_largefile() (BITS_PER_LONG != 32)
@@ -74,6 +28,4 @@
 #define IS_SETLK(cmd)   (IS_SETLK32(cmd)  || IS_SETLK64(cmd))
 #define IS_SETLKW(cmd)  (IS_SETLKW32(cmd) || IS_SETLKW64(cmd))
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/fd.h b/include/linux/fd.h
index 72202b1b9a6a..69275bccc3e4 100644
--- a/include/linux/fd.h
+++ b/include/linux/fd.h
@@ -1,384 +1,8 @@
 #ifndef _LINUX_FD_H
 #define _LINUX_FD_H
 
-#include <linux/ioctl.h>
-#include <linux/compiler.h>
+#include <uapi/linux/fd.h>
 
-/* New file layout: Now the ioctl definitions immediately follow the
- * definitions of the structures that they use */
-
-/*
- * Geometry
- */
-struct floppy_struct {
-        unsigned int    size,           /* nr of sectors total */
-                        sect,           /* sectors per track */
-                        head,           /* nr of heads */
-                        track,          /* nr of tracks */
-                        stretch;        /* bit 0 !=0 means double track steps */
-                                        /* bit 1 != 0 means swap sides */
-                                        /* bits 2..9 give the first sector */
-                                        /*  number (the LSB is flipped) */
-#define FD_STRETCH 1
-#define FD_SWAPSIDES 2
-#define FD_ZEROBASED 4
-#define FD_SECTBASEMASK 0x3FC
-#define FD_MKSECTBASE(s) (((s) ^ 1) << 2)
-#define FD_SECTBASE(floppy) ((((floppy)->stretch & FD_SECTBASEMASK) >> 2) ^ 1)
-
-        unsigned char   gap,            /* gap1 size */
-
-                        rate,           /* data rate. |= 0x40 for perpendicular */
-#define FD_2M 0x4
-#define FD_SIZECODEMASK 0x38
-#define FD_SIZECODE(floppy) (((((floppy)->rate&FD_SIZECODEMASK)>> 3)+ 2) %8)
-#define FD_SECTSIZE(floppy) ( (floppy)->rate & FD_2M ? \
-                             512 : 128 << FD_SIZECODE(floppy) )
-#define FD_PERP 0x40
-
-                        spec1,          /* stepping rate, head unload time */
-                        fmt_gap;        /* gap2 size */
-        const char      * name; /* used only for predefined formats */
-};
-
-
-/* commands needing write access have 0x40 set */
-/* commands needing super user access have 0x80 set */
-
-#define FDCLRPRM _IO(2, 0x41)
-/* clear user-defined parameters */
-
-#define FDSETPRM _IOW(2, 0x42, struct floppy_struct) 
-#define FDSETMEDIAPRM FDSETPRM
-/* set user-defined parameters for current media */
-
-#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct) 
-#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
-#define FDDEFMEDIAPRM FDDEFPRM
-#define FDGETMEDIAPRM FDGETPRM
-/* set/get disk parameters */
-
-
-#define FDMSGON  _IO(2,0x45)
-#define FDMSGOFF _IO(2,0x46)
-/* issue/don't issue kernel messages on media type change */
-
-
-/* 
- * Formatting (obsolete)
- */
-#define FD_FILL_BYTE 0xF6 /* format fill byte. */
-
-struct format_descr {
-        unsigned int device,head,track;
-};
-
-#define FDFMTBEG _IO(2,0x47)
-/* begin formatting a disk */
-#define FDFMTTRK _IOW(2,0x48, struct format_descr)
-/* format the specified track */
-#define FDFMTEND _IO(2,0x49)
-/* end formatting a disk */
-
-
-/*
- * Error thresholds
- */
-struct floppy_max_errors {
-        unsigned int
-          abort,      /* number of errors to be reached before aborting */
-          read_track, /* maximal number of errors permitted to read an
-                       * entire track at once */
-          reset,      /* maximal number of errors before a reset is tried */
-          recal,      /* maximal number of errors before a recalibrate is
-                       * tried */
-
-          /*
-           * Threshold for reporting FDC errors to the console.
-           * Setting this to zero may flood your screen when using
-           * ultra cheap floppies ;-)
-           */
-          reporting;
-
-};
-
-#define FDSETEMSGTRESH  _IO(2,0x4a)
-/* set fdc error reporting threshold */
-
-#define FDFLUSH  _IO(2,0x4b)
-/* flush buffers for media; either for verifying media, or for
- * handling a media change without closing the file descriptor */
-
-#define FDSETMAXERRS _IOW(2, 0x4c, struct floppy_max_errors)
-#define FDGETMAXERRS _IOR(2, 0x0e, struct floppy_max_errors)
-/* set/get abortion and read_track threshold. See also floppy_drive_params
- * structure */
-
-
-typedef char floppy_drive_name[16];
-#define FDGETDRVTYP _IOR(2, 0x0f, floppy_drive_name)
-/* get drive type: 5 1/4 or 3 1/2 */
-
-
-/*
- * Drive parameters (user modifiable)
- */
-struct floppy_drive_params {
-        signed char cmos;               /* CMOS type */
-        
-        /* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms 
-         * etc) and ND is set means no DMA. Hardcoded to 6 (HLD=6ms, use DMA).
-         */
-        unsigned long max_dtr;          /* Step rate, usec */
-        unsigned long hlt;              /* Head load/settle time, msec */
-        unsigned long hut;              /* Head unload time (remnant of 
-                                         * 8" drives) */
-        unsigned long srt;              /* Step rate, usec */
-
-        unsigned long spinup;           /* time needed for spinup (expressed
-                                         * in jiffies) */
-        unsigned long spindown;         /* timeout needed for spindown */
-        unsigned char spindown_offset;  /* decides in which position the disk
-                                         * will stop */
-        unsigned char select_delay;     /* delay to wait after select */
-        unsigned char rps;              /* rotations per second */
-        unsigned char tracks;           /* maximum number of tracks */
-        unsigned long timeout;          /* timeout for interrupt requests */
-        
-        unsigned char interleave_sect;  /* if there are more sectors, use 
-                                         * interleave */
-        
-        struct floppy_max_errors max_errors;
-        
-        char flags;                     /* various flags, including ftd_msg */
-/*
- * Announce successful media type detection and media information loss after
- * disk changes.
- * Also used to enable/disable printing of overrun warnings.
- */
-
-#define FTD_MSG 0x10
-#define FD_BROKEN_DCL 0x20
-#define FD_DEBUG 0x02
-#define FD_SILENT_DCL_CLEAR 0x4
-#define FD_INVERTED_DCL 0x80 /* must be 0x80, because of hardware 
-                                considerations */
-
-        char read_track;                /* use readtrack during probing? */
-
-/*
- * Auto-detection. Each drive type has eight formats which are
- * used in succession to try to read the disk. If the FDC cannot lock onto
- * the disk, the next format is tried. This uses the variable 'probing'.
- */
-        short autodetect[8];            /* autodetected formats */
-        
-        int checkfreq; /* how often should the drive be checked for disk 
-                        * changes */
-        int native_format; /* native format of this drive */
-};
-
-enum {
-        FD_NEED_TWADDLE_BIT,    /* more magic */
-        FD_VERIFY_BIT,          /* inquire for write protection */
-        FD_DISK_NEWCHANGE_BIT,  /* change detected, and no action undertaken yet
-                                 * to clear media change status */
-        FD_UNUSED_BIT,
-        FD_DISK_CHANGED_BIT,    /* disk has been changed since last i/o */
-        FD_DISK_WRITABLE_BIT    /* disk is writable */
-};
-
-#define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params)
-#define FDGETDRVPRM _IOR(2, 0x11, struct floppy_drive_params)
-/* set/get drive parameters */
-
-
-/*
- * Current drive state (not directly modifiable by user, readonly)
- */
-struct floppy_drive_struct {
-        unsigned long flags;
-/* values for these flags */
-#define FD_NEED_TWADDLE (1 << FD_NEED_TWADDLE_BIT)
-#define FD_VERIFY (1 << FD_VERIFY_BIT)
-#define FD_DISK_NEWCHANGE (1 << FD_DISK_NEWCHANGE_BIT)
-#define FD_DISK_CHANGED (1 << FD_DISK_CHANGED_BIT)
-#define FD_DISK_WRITABLE (1 << FD_DISK_WRITABLE_BIT)
-
-        unsigned long spinup_date;
-        unsigned long select_date;
-        unsigned long first_read_date;
-        short probed_format;
-        short track; /* current track */
-        short maxblock; /* id of highest block read */
-        short maxtrack; /* id of highest half track read */
-        int generation; /* how many diskchanges? */
-
-/*
- * (User-provided) media information is _not_ discarded after a media change
- * if the corresponding keep_data flag is non-zero. Positive values are
- * decremented after each probe.
- */
-        int keep_data;
-        
-        /* Prevent "aliased" accesses. */
-        int fd_ref;
-        int fd_device;
-        unsigned long last_checked; /* when was the drive last checked for a disk 
-                           * change? */
-        
-        char *dmabuf;
-        int bufblocks;
-};
-
-#define FDGETDRVSTAT _IOR(2, 0x12, struct floppy_drive_struct)
-#define FDPOLLDRVSTAT _IOR(2, 0x13, struct floppy_drive_struct)
-/* get drive state: GET returns the cached state, POLL polls for new state */
-
-
-/*
- * reset FDC
- */
-enum reset_mode {
-        FD_RESET_IF_NEEDED,     /* reset only if the reset flags is set */
-        FD_RESET_IF_RAWCMD,     /* obsolete */
-        FD_RESET_ALWAYS         /* reset always */
-};
-#define FDRESET _IO(2, 0x54)
-
-
-/*
- * FDC state
- */
-struct floppy_fdc_state {       
-        int spec1;              /* spec1 value last used */
-        int spec2;              /* spec2 value last used */
-        int dtr;
-        unsigned char version;  /* FDC version code */
-        unsigned char dor;
-        unsigned long address;  /* io address */
-        unsigned int rawcmd:2;
-        unsigned int reset:1;
-        unsigned int need_configure:1;
-        unsigned int perp_mode:2;
-        unsigned int has_fifo:1;
-        unsigned int driver_version;    /* version code for floppy driver */
-#define FD_DRIVER_VERSION 0x100
-/* user programs using the floppy API should use floppy_fdc_state to
- * get the version number of the floppy driver that they are running
- * on. If this version number is bigger than the one compiled into the
- * user program (the FD_DRIVER_VERSION define), it should be prepared
- * to bigger structures
- */
-
-        unsigned char track[4];
-        /* Position of the heads of the 4 units attached to this FDC,
-         * as stored on the FDC. In the future, the position as stored
-         * on the FDC might not agree with the actual physical
-         * position of these drive heads. By allowing such
-         * disagreement, it will be possible to reset the FDC without
-         * incurring the expensive cost of repositioning all heads.
-         * Right now, these positions are hard wired to 0. */
-
-};
-
-#define FDGETFDCSTAT _IOR(2, 0x15, struct floppy_fdc_state)
-
-
-/*
- * Asynchronous Write error tracking
- */
-struct floppy_write_errors {
-        /* Write error logging.
-         *
-         * These fields can be cleared with the FDWERRORCLR ioctl.
-         * Only writes that were attempted but failed due to a physical media
-         * error are logged.  write(2) calls that fail and return an error code
-         * to the user process are not counted.
-         */
-
-        unsigned int write_errors;  /* number of physical write errors 
-                                     * encountered */
-        
-        /* position of first and last write errors */
-        unsigned long first_error_sector;
-        int           first_error_generation;
-        unsigned long last_error_sector;
-        int           last_error_generation;
-        
-        unsigned int badness; /* highest retry count for a read or write 
-                               * operation */
-};
-
-#define FDWERRORCLR  _IO(2, 0x56)
-/* clear write error and badness information */
-#define FDWERRORGET  _IOR(2, 0x17, struct floppy_write_errors)
-/* get write error and badness information */
-
-
-/*
- * Raw commands
- */
-/* new interface flag: now we can do them in batches */
-#define FDHAVEBATCHEDRAWCMD
-
-struct floppy_raw_cmd {
-        unsigned int flags;
-#define FD_RAW_READ 1
-#define FD_RAW_WRITE 2
-#define FD_RAW_NO_MOTOR 4
-#define FD_RAW_DISK_CHANGE 4 /* out: disk change flag was set */
-#define FD_RAW_INTR 8    /* wait for an interrupt */
-#define FD_RAW_SPIN 0x10 /* spin up the disk for this command */
-#define FD_RAW_NO_MOTOR_AFTER 0x20 /* switch the motor off after command 
-                                    * completion */
-#define FD_RAW_NEED_DISK 0x40  /* this command needs a disk to be present */
-#define FD_RAW_NEED_SEEK 0x80  /* this command uses an implied seek (soft) */
-
-/* more "in" flags */
-#define FD_RAW_MORE 0x100  /* more records follow */
-#define FD_RAW_STOP_IF_FAILURE 0x200 /* stop if we encounter a failure */
-#define FD_RAW_STOP_IF_SUCCESS 0x400 /* stop if command successful */
-#define FD_RAW_SOFTFAILURE 0x800 /* consider the return value for failure
-                                  * detection too */
-
-/* more "out" flags */
-#define FD_RAW_FAILURE 0x10000 /* command sent to fdc, fdc returned error */
-#define FD_RAW_HARDFAILURE 0x20000 /* fdc had to be reset, or timed out */
-
-        void __user *data;
-        char *kernel_data; /* location of data buffer in the kernel */
-        struct floppy_raw_cmd *next; /* used for chaining of raw cmd's 
-                                      * within the kernel */
-        long length; /* in: length of dma transfer. out: remaining bytes */
-        long phys_length; /* physical length, if different from dma length */
-        int buffer_length; /* length of allocated buffer */
-
-        unsigned char rate;
-        unsigned char cmd_count;
-        unsigned char cmd[16];
-        unsigned char reply_count;
-        unsigned char reply[16];
-        int track;
-        int resultcode;
-
-        int reserved1;
-        int reserved2;
-};
-
-#define FDRAWCMD _IO(2, 0x58)
-/* send a raw command to the fdc. Structure size not included, because of
- * batches */
-
-#define FDTWADDLE _IO(2, 0x59)
-/* flicker motor-on bit before reading a sector. Experimental */
-
-
-#define FDEJECT _IO(2, 0x5a)
-/* eject the disk */
-
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 #include <linux/compat.h>
 
@@ -398,5 +22,3 @@ struct compat_floppy_struct {
 #define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct)
 #endif
 #endif
-
-#endif
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 2ded090e10f4..24d251f3bab0 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1,141 +1,12 @@
 /*
  * Linux Socket Filter Data Structures
  */
-
 #ifndef __LINUX_FILTER_H__
 #define __LINUX_FILTER_H__
 
-#include <linux/compiler.h>
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 #include <linux/atomic.h>
 #include <linux/compat.h>
-#endif
-
-/*
- * Current version of the filter code architecture.
- */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-/*
- *      Try and keep these values and structures similar to BSD, especially
- *      the BPF code definitions which need to match so you can share filters
- */
- 
-struct sock_filter {    /* Filter block */
-        __u16   code;   /* Actual filter code */
-        __u8    jt;     /* Jump true */
-        __u8    jf;     /* Jump false */
-        __u32   k;      /* Generic multiuse field */
-};
-
-struct sock_fprog {     /* Required for SO_ATTACH_FILTER. */
-        unsigned short          len;    /* Number of filter blocks */
-        struct sock_filter __user *filter;
-};
-
-/*
- * Instruction classes
- */
-
-#define BPF_CLASS(code) ((code) & 0x07)
-#define         BPF_LD          0x00
-#define         BPF_LDX         0x01
-#define         BPF_ST          0x02
-#define         BPF_STX         0x03
-#define         BPF_ALU         0x04
-#define         BPF_JMP         0x05
-#define         BPF_RET         0x06
-#define         BPF_MISC        0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)  ((code) & 0x18)
-#define         BPF_W           0x00
-#define         BPF_H           0x08
-#define         BPF_B           0x10
-#define BPF_MODE(code)  ((code) & 0xe0)
-#define         BPF_IMM         0x00
-#define         BPF_ABS         0x20
-#define         BPF_IND         0x40
-#define         BPF_MEM         0x60
-#define         BPF_LEN         0x80
-#define         BPF_MSH         0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)    ((code) & 0xf0)
-#define         BPF_ADD         0x00
-#define         BPF_SUB         0x10
-#define         BPF_MUL         0x20
-#define         BPF_DIV         0x30
-#define         BPF_OR          0x40
-#define         BPF_AND         0x50
-#define         BPF_LSH         0x60
-#define         BPF_RSH         0x70
-#define         BPF_NEG         0x80
-#define         BPF_MOD         0x90
-#define         BPF_XOR         0xa0
-
-#define         BPF_JA          0x00
-#define         BPF_JEQ         0x10
-#define         BPF_JGT         0x20
-#define         BPF_JGE         0x30
-#define         BPF_JSET        0x40
-#define BPF_SRC(code)   ((code) & 0x08)
-#define         BPF_K           0x00
-#define         BPF_X           0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)  ((code) & 0x18)
-#define         BPF_A           0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define         BPF_TAX         0x00
-#define         BPF_TXA         0x80
-
-#ifndef BPF_MAXINSNS
-#define BPF_MAXINSNS 4096
-#endif
-
-/*
- * Macros for filter block array initializers.
- */
-#ifndef BPF_STMT
-#define BPF_STMT(code, k) { (unsigned short)(code), 0, 0, k }
-#endif
-#ifndef BPF_JUMP
-#define BPF_JUMP(code, k, jt, jf) { (unsigned short)(code), jt, jf, k }
-#endif
-
-/*
- * Number of scratch memory words for: BPF_ST and BPF_STX
- */
-#define BPF_MEMWORDS 16
-
-/* RATIONALE. Negative offsets are invalid in BPF.
-   We use them to reference ancillary data.
-   Unlike introduction new instructions, it does not break
-   existing compilers/optimizers.
- */
-#define SKF_AD_OFF    (-0x1000)
-#define SKF_AD_PROTOCOL 0
-#define SKF_AD_PKTTYPE  4
-#define SKF_AD_IFINDEX  8
-#define SKF_AD_NLATTR   12
-#define SKF_AD_NLATTR_NEST      16
-#define SKF_AD_MARK     20
-#define SKF_AD_QUEUE    24
-#define SKF_AD_HATYPE   28
-#define SKF_AD_RXHASH   32
-#define SKF_AD_CPU      36
-#define SKF_AD_ALU_XOR_X        40
-#define SKF_AD_MAX      44
-#define SKF_NET_OFF   (-0x100000)
-#define SKF_LL_OFF    (-0x200000)
-
-#ifdef __KERNEL__
+#include <uapi/linux/filter.h>
 
 #ifdef CONFIG_COMPAT
 /*
@@ -254,6 +125,4 @@ enum {
         BPF_S_ANC_SECCOMP_LD_W,
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* __LINUX_FILTER_H__ */
diff --git a/include/linux/flat.h b/include/linux/flat.h
index ec56852e2659..2c1eb15c4ba4 100644
--- a/include/linux/flat.h
+++ b/include/linux/flat.h
@@ -6,58 +6,12 @@
  * This file provides the definitions and structures needed to
  * support uClinux flat-format executables.
  */
-
 #ifndef _LINUX_FLAT_H
 #define _LINUX_FLAT_H
 
-#ifdef __KERNEL__
 #include <asm/flat.h>
-#endif
-
-#define FLAT_VERSION                    0x00000004L
-
-#ifdef CONFIG_BINFMT_SHARED_FLAT
-#define MAX_SHARED_LIBS                 (4)
-#else
-#define MAX_SHARED_LIBS                 (1)
-#endif
-
-/*
- * To make everything easier to port and manage cross platform
- * development,  all fields are in network byte order.
- */
+#include <uapi/linux/flat.h>
 
-struct flat_hdr {
-        char magic[4];
-        unsigned long rev;          /* version (as above) */
-        unsigned long entry;        /* Offset of first executable instruction
-                                       with text segment from beginning of file */
-        unsigned long data_start;   /* Offset of data segment from beginning of
-                                       file */
-        unsigned long data_end;     /* Offset of end of data segment
-                                       from beginning of file */
-        unsigned long bss_end;      /* Offset of end of bss segment from beginning
-                                       of file */
-
-        /* (It is assumed that data_end through bss_end forms the bss segment.) */
-
-        unsigned long stack_size;   /* Size of stack, in bytes */
-        unsigned long reloc_start;  /* Offset of relocation records from
-                                       beginning of file */
-        unsigned long reloc_count;  /* Number of relocation records */
-        unsigned long flags;       
-        unsigned long build_date;   /* When the program/library was built */
-        unsigned long filler[5];    /* Reservered, set to zero */
-};
-
-#define FLAT_FLAG_RAM    0x0001 /* load program entirely into RAM */
-#define FLAT_FLAG_GOTPIC 0x0002 /* program is PIC with GOT */
-#define FLAT_FLAG_GZIP   0x0004 /* all but the header is compressed */
-#define FLAT_FLAG_GZDATA 0x0008 /* only data/relocs are compressed (for XIP) */
-#define FLAT_FLAG_KTRACE 0x0010 /* output useful kernel trace for debugging */
-
-
-#ifdef __KERNEL__ /* so systems without linux headers can compile the apps */
 /*
  * While it would be nice to keep this header clean,  users of older
  * tools still need this support in the kernel.  So this section is
@@ -95,6 +49,4 @@ typedef union {
         } reloc;
 } flat_v2_reloc_t;
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_FLAT_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ca6d8c806f47..b33cfc97b9ca 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1,62 +1,68 @@
 #ifndef _LINUX_FS_H
 #define _LINUX_FS_H
 
-/*
- * This file has definitions for some important file table
- * structures etc.
- */
 
-#include <linux/limits.h>
-#include <linux/ioctl.h>
+#include <linux/linkage.h>
+#include <linux/wait.h>
+#include <linux/kdev_t.h>
+#include <linux/dcache.h>
+#include <linux/path.h>
+#include <linux/stat.h>
+#include <linux/cache.h>
+#include <linux/list.h>
+#include <linux/radix-tree.h>
+#include <linux/rbtree.h>
+#include <linux/init.h>
+#include <linux/pid.h>
+#include <linux/bug.h>
+#include <linux/mutex.h>
+#include <linux/capability.h>
+#include <linux/semaphore.h>
+#include <linux/fiemap.h>
+#include <linux/rculist_bl.h>
+#include <linux/atomic.h>
+#include <linux/shrinker.h>
+#include <linux/migrate_mode.h>
+#include <linux/uidgid.h>
+#include <linux/lockdep.h>
+#include <linux/percpu-rwsem.h>
 #include <linux/blk_types.h>
-#include <linux/types.h>
 
-/*
- * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
- * the file limit at runtime and only root can increase the per-process
- * nr_file rlimit, so it's safe to set up a ridiculously high absolute
- * upper limit on files-per-process.
- *
- * Some programs (notably those using select()) may have to be 
- * recompiled to take full advantage of the new limits..  
- */
-
-/* Fixed constants first: */
-#undef NR_OPEN
-#define INR_OPEN_CUR 1024       /* Initial setting for nfile rlimits */
-#define INR_OPEN_MAX 4096       /* Hard limit for nfile rlimits */
-
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
-
-#define SEEK_SET        0       /* seek relative to beginning of file */
-#define SEEK_CUR        1       /* seek relative to current file position */
-#define SEEK_END        2       /* seek relative to end of file */
-#define SEEK_DATA       3       /* seek to the next data */
-#define SEEK_HOLE       4       /* seek to the next hole */
-#define SEEK_MAX        SEEK_HOLE
-
-struct fstrim_range {
-        __u64 start;
-        __u64 len;
-        __u64 minlen;
-};
+#include <asm/byteorder.h>
+#include <uapi/linux/fs.h>
 
-/* And dynamically-tunable limits and defaults: */
-struct files_stat_struct {
-        unsigned long nr_files;         /* read only */
-        unsigned long nr_free_files;    /* read only */
-        unsigned long max_files;                /* tunable */
-};
+struct export_operations;
+struct hd_geometry;
+struct iovec;
+struct nameidata;
+struct kiocb;
+struct kobject;
+struct pipe_inode_info;
+struct poll_table_struct;
+struct kstatfs;
+struct vm_area_struct;
+struct vfsmount;
+struct cred;
+struct swap_info_struct;
 
-struct inodes_stat_t {
-        int nr_inodes;
-        int nr_unused;
-        int dummy[5];           /* padding for sysctl ABI compatibility */
-};
+extern void __init inode_init(void);
+extern void __init inode_init_early(void);
+extern void __init files_init(unsigned long);
 
+extern struct files_stat_struct files_stat;
+extern unsigned long get_max_files(void);
+extern int sysctl_nr_open;
+extern struct inodes_stat_t inodes_stat;
+extern int leases_enable, lease_break_time;
+extern int sysctl_protected_symlinks;
+extern int sysctl_protected_hardlinks;
 
-#define NR_FILE  8192   /* this can well be larger on a larger system */
+struct buffer_head;
+typedef int (get_block_t)(struct inode *inode, sector_t iblock,
+                        struct buffer_head *bh_result, int create);
+typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
+                        ssize_t bytes, void *private, int ret,
+                        bool is_async);
 
 #define MAY_EXEC                0x00000001
 #define MAY_WRITE               0x00000002
@@ -118,6 +124,14 @@ struct inodes_stat_t {
 #define FMODE_NONOTIFY          ((__force fmode_t)0x1000000)
 
 /*
+ * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector
+ * that indicates that they should check the contents of the iovec are
+ * valid, but not check the memory that the iovec elements
+ * points too.
+ */
+#define CHECK_IOVEC_ONLY -1
+
+/*
  * The below are the various read and write types that we support. Some of
  * them include behavioral modifiers that send information down to the
  * block layer and IO scheduler. Terminology:
@@ -175,282 +189,6 @@ struct inodes_stat_t {
 #define WRITE_FUA               (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FUA)
 #define WRITE_FLUSH_FUA         (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
 
-
-/*
- * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector
- * that indicates that they should check the contents of the iovec are
- * valid, but not check the memory that the iovec elements
- * points too.
- */
-#define CHECK_IOVEC_ONLY -1
-
-#define SEL_IN          1
-#define SEL_OUT         2
-#define SEL_EX          4
-
-/* public flags for file_system_type */
-#define FS_REQUIRES_DEV 1 
-#define FS_BINARY_MOUNTDATA 2
-#define FS_HAS_SUBTYPE 4
-#define FS_REVAL_DOT    16384   /* Check the paths ".", ".." for staleness */
-#define FS_RENAME_DOES_D_MOVE   32768   /* FS will handle d_move()
-                                         * during rename() internally.
-                                         */
-
-/*
- * These are the fs-independent mount-flags: up to 32 flags are supported
- */
-#define MS_RDONLY        1      /* Mount read-only */
-#define MS_NOSUID        2      /* Ignore suid and sgid bits */
-#define MS_NODEV         4      /* Disallow access to device special files */
-#define MS_NOEXEC        8      /* Disallow program execution */
-#define MS_SYNCHRONOUS  16      /* Writes are synced at once */
-#define MS_REMOUNT      32      /* Alter flags of a mounted FS */
-#define MS_MANDLOCK     64      /* Allow mandatory locks on an FS */
-#define MS_DIRSYNC      128     /* Directory modifications are synchronous */
-#define MS_NOATIME      1024    /* Do not update access times. */
-#define MS_NODIRATIME   2048    /* Do not update directory access times */
-#define MS_BIND         4096
-#define MS_MOVE         8192
-#define MS_REC          16384
-#define MS_VERBOSE      32768   /* War is peace. Verbosity is silence.
-                                   MS_VERBOSE is deprecated. */
-#define MS_SILENT       32768
-#define MS_POSIXACL     (1<<16) /* VFS does not apply the umask */
-#define MS_UNBINDABLE   (1<<17) /* change to unbindable */
-#define MS_PRIVATE      (1<<18) /* change to private */
-#define MS_SLAVE        (1<<19) /* change to slave */
-#define MS_SHARED       (1<<20) /* change to shared */
-#define MS_RELATIME     (1<<21) /* Update atime relative to mtime/ctime. */
-#define MS_KERNMOUNT    (1<<22) /* this is a kern_mount call */
-#define MS_I_VERSION    (1<<23) /* Update inode I_version field */
-#define MS_STRICTATIME  (1<<24) /* Always perform atime updates */
-#define MS_NOSEC        (1<<28)
-#define MS_BORN         (1<<29)
-#define MS_ACTIVE       (1<<30)
-#define MS_NOUSER       (1<<31)
-
-/*
- * Superblock flags that can be altered by MS_REMOUNT
- */
-#define MS_RMT_MASK     (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
-
-/*
- * Old magic mount flag and mask
- */
-#define MS_MGC_VAL 0xC0ED0000
-#define MS_MGC_MSK 0xffff0000
-
-/* Inode flags - they have nothing to superblock flags now */
-
-#define S_SYNC          1       /* Writes are synced at once */
-#define S_NOATIME       2       /* Do not update access times */
-#define S_APPEND        4       /* Append-only file */
-#define S_IMMUTABLE     8       /* Immutable file */
-#define S_DEAD          16      /* removed, but still open directory */
-#define S_NOQUOTA       32      /* Inode is not counted to quota */
-#define S_DIRSYNC       64      /* Directory modifications are synchronous */
-#define S_NOCMTIME      128     /* Do not update file c/mtime */
-#define S_SWAPFILE      256     /* Do not truncate: swapon got its bmaps */
-#define S_PRIVATE       512     /* Inode is fs-internal */
-#define S_IMA           1024    /* Inode has an associated IMA struct */
-#define S_AUTOMOUNT     2048    /* Automount/referral quasi-directory */
-#define S_NOSEC         4096    /* no suid or xattr security attributes */
-
-/*
- * Note that nosuid etc flags are inode-specific: setting some file-system
- * flags just means all the inodes inherit those flags by default. It might be
- * possible to override it selectively if you really wanted to with some
- * ioctl() that is not currently implemented.
- *
- * Exception: MS_RDONLY is always applied to the entire file system.
- *
- * Unfortunately, it is possible to change a filesystems flags with it mounted
- * with files in use.  This means that all of the inodes will not have their
- * i_flags updated.  Hence, i_flags no longer inherit the superblock mount
- * flags, so these have to be checked separately. -- rmk@arm.uk.linux.org
- */
-#define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
-
-#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
-#define IS_SYNC(inode)          (__IS_FLG(inode, MS_SYNCHRONOUS) || \
-                                        ((inode)->i_flags & S_SYNC))
-#define IS_DIRSYNC(inode)       (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
-                                        ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
-#define IS_MANDLOCK(inode)      __IS_FLG(inode, MS_MANDLOCK)
-#define IS_NOATIME(inode)   __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
-#define IS_I_VERSION(inode)   __IS_FLG(inode, MS_I_VERSION)
-
-#define IS_NOQUOTA(inode)       ((inode)->i_flags & S_NOQUOTA)
-#define IS_APPEND(inode)        ((inode)->i_flags & S_APPEND)
-#define IS_IMMUTABLE(inode)     ((inode)->i_flags & S_IMMUTABLE)
-#define IS_POSIXACL(inode)      __IS_FLG(inode, MS_POSIXACL)
-
-#define IS_DEADDIR(inode)       ((inode)->i_flags & S_DEAD)
-#define IS_NOCMTIME(inode)      ((inode)->i_flags & S_NOCMTIME)
-#define IS_SWAPFILE(inode)      ((inode)->i_flags & S_SWAPFILE)
-#define IS_PRIVATE(inode)       ((inode)->i_flags & S_PRIVATE)
-#define IS_IMA(inode)           ((inode)->i_flags & S_IMA)
-#define IS_AUTOMOUNT(inode)     ((inode)->i_flags & S_AUTOMOUNT)
-#define IS_NOSEC(inode)         ((inode)->i_flags & S_NOSEC)
-
-/* the read-only stuff doesn't really belong here, but any other place is
-   probably as bad and I don't want to create yet another include file. */
-
-#define BLKROSET   _IO(0x12,93) /* set device read-only (0 = read-write) */
-#define BLKROGET   _IO(0x12,94) /* get read-only status (0 = read_write) */
-#define BLKRRPART  _IO(0x12,95) /* re-read partition table */
-#define BLKGETSIZE _IO(0x12,96) /* return device size /512 (long *arg) */
-#define BLKFLSBUF  _IO(0x12,97) /* flush buffer cache */
-#define BLKRASET   _IO(0x12,98) /* set read ahead for block device */
-#define BLKRAGET   _IO(0x12,99) /* get current read ahead setting */
-#define BLKFRASET  _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-#define BLKFRAGET  _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */
-#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
-#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
-#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-#if 0
-#define BLKPG      _IO(0x12,105)/* See blkpg.h */
-
-/* Some people are morons.  Do not use sizeof! */
-
-#define BLKELVGET  _IOR(0x12,106,size_t)/* elevator get */
-#define BLKELVSET  _IOW(0x12,107,size_t)/* elevator set */
-/* This was here just to show that the number is taken -
-   probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */
-#endif
-/* A jump here: 108-111 have been used for various private purposes. */
-#define BLKBSZGET  _IOR(0x12,112,size_t)
-#define BLKBSZSET  _IOW(0x12,113,size_t)
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)      /* return device size in bytes (u64 *arg) */
-#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
-#define BLKTRACESTART _IO(0x12,116)
-#define BLKTRACESTOP _IO(0x12,117)
-#define BLKTRACETEARDOWN _IO(0x12,118)
-#define BLKDISCARD _IO(0x12,119)
-#define BLKIOMIN _IO(0x12,120)
-#define BLKIOOPT _IO(0x12,121)
-#define BLKALIGNOFF _IO(0x12,122)
-#define BLKPBSZGET _IO(0x12,123)
-#define BLKDISCARDZEROES _IO(0x12,124)
-#define BLKSECDISCARD _IO(0x12,125)
-#define BLKROTATIONAL _IO(0x12,126)
-
-#define BMAP_IOCTL 1            /* obsolete - kept for compatibility */
-#define FIBMAP     _IO(0x00,1)  /* bmap access */
-#define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
-#define FIFREEZE        _IOWR('X', 119, int)    /* Freeze */
-#define FITHAW          _IOWR('X', 120, int)    /* Thaw */
-#define FITRIM          _IOWR('X', 121, struct fstrim_range)    /* Trim */
-
-#define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
-#define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
-#define FS_IOC_GETVERSION               _IOR('v', 1, long)
-#define FS_IOC_SETVERSION               _IOW('v', 2, long)
-#define FS_IOC_FIEMAP                   _IOWR('f', 11, struct fiemap)
-#define FS_IOC32_GETFLAGS               _IOR('f', 1, int)
-#define FS_IOC32_SETFLAGS               _IOW('f', 2, int)
-#define FS_IOC32_GETVERSION             _IOR('v', 1, int)
-#define FS_IOC32_SETVERSION             _IOW('v', 2, int)
-
-/*
- * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
- */
-#define FS_SECRM_FL                     0x00000001 /* Secure deletion */
-#define FS_UNRM_FL                      0x00000002 /* Undelete */
-#define FS_COMPR_FL                     0x00000004 /* Compress file */
-#define FS_SYNC_FL                      0x00000008 /* Synchronous updates */
-#define FS_IMMUTABLE_FL                 0x00000010 /* Immutable file */
-#define FS_APPEND_FL                    0x00000020 /* writes to file may only append */
-#define FS_NODUMP_FL                    0x00000040 /* do not dump file */
-#define FS_NOATIME_FL                   0x00000080 /* do not update atime */
-/* Reserved for compression usage... */
-#define FS_DIRTY_FL                     0x00000100
-#define FS_COMPRBLK_FL                  0x00000200 /* One or more compressed clusters */
-#define FS_NOCOMP_FL                    0x00000400 /* Don't compress */
-#define FS_ECOMPR_FL                    0x00000800 /* Compression error */
-/* End compression flags --- maybe not all used */
-#define FS_BTREE_FL                     0x00001000 /* btree format dir */
-#define FS_INDEX_FL                     0x00001000 /* hash-indexed directory */
-#define FS_IMAGIC_FL                    0x00002000 /* AFS directory */
-#define FS_JOURNAL_DATA_FL              0x00004000 /* Reserved for ext3 */
-#define FS_NOTAIL_FL                    0x00008000 /* file tail should not be merged */
-#define FS_DIRSYNC_FL                   0x00010000 /* dirsync behaviour (directories only) */
-#define FS_TOPDIR_FL                    0x00020000 /* Top of directory hierarchies*/
-#define FS_EXTENT_FL                    0x00080000 /* Extents */
-#define FS_DIRECTIO_FL                  0x00100000 /* Use direct i/o */
-#define FS_NOCOW_FL                     0x00800000 /* Do not cow file */
-#define FS_RESERVED_FL                  0x80000000 /* reserved for ext2 lib */
-
-#define FS_FL_USER_VISIBLE              0x0003DFFF /* User visible flags */
-#define FS_FL_USER_MODIFIABLE           0x000380FF /* User modifiable flags */
-
-
-#define SYNC_FILE_RANGE_WAIT_BEFORE     1
-#define SYNC_FILE_RANGE_WRITE           2
-#define SYNC_FILE_RANGE_WAIT_AFTER      4
-
-#ifdef __KERNEL__
-
-#include <linux/linkage.h>
-#include <linux/wait.h>
-#include <linux/kdev_t.h>
-#include <linux/dcache.h>
-#include <linux/path.h>
-#include <linux/stat.h>
-#include <linux/cache.h>
-#include <linux/list.h>
-#include <linux/radix-tree.h>
-#include <linux/prio_tree.h>
-#include <linux/init.h>
-#include <linux/pid.h>
-#include <linux/bug.h>
-#include <linux/mutex.h>
-#include <linux/capability.h>
-#include <linux/semaphore.h>
-#include <linux/fiemap.h>
-#include <linux/rculist_bl.h>
-#include <linux/atomic.h>
-#include <linux/shrinker.h>
-#include <linux/migrate_mode.h>
-#include <linux/uidgid.h>
-#include <linux/lockdep.h>
-
-#include <asm/byteorder.h>
-
-struct export_operations;
-struct hd_geometry;
-struct iovec;
-struct nameidata;
-struct kiocb;
-struct kobject;
-struct pipe_inode_info;
-struct poll_table_struct;
-struct kstatfs;
-struct vm_area_struct;
-struct vfsmount;
-struct cred;
-struct swap_info_struct;
-
-extern void __init inode_init(void);
-extern void __init inode_init_early(void);
-extern void __init files_init(unsigned long);
-
-extern struct files_stat_struct files_stat;
-extern unsigned long get_max_files(void);
-extern int sysctl_nr_open;
-extern struct inodes_stat_t inodes_stat;
-extern int leases_enable, lease_break_time;
-extern int sysctl_protected_symlinks;
-extern int sysctl_protected_hardlinks;
-
-struct buffer_head;
-typedef int (get_block_t)(struct inode *inode, sector_t iblock,
-                        struct buffer_head *bh_result, int create);
-typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
-                        ssize_t bytes, void *private, int ret,
-                        bool is_async);
-
 /*
  * Attribute flags.  These should be or-ed together to figure out what
  * has been changed!
@@ -669,7 +407,7 @@ struct address_space {
         struct radix_tree_root  page_tree;      /* radix tree of all pages */
         spinlock_t              tree_lock;      /* and lock protecting it */
         unsigned int            i_mmap_writable;/* count VM_SHARED mappings */
-        struct prio_tree_root   i_mmap;         /* tree of private and shared mappings */
+        struct rb_root          i_mmap;         /* tree of private and shared mappings */
         struct list_head        i_mmap_nonlinear;/*list VM_NONLINEAR mappings */
         struct mutex            i_mmap_mutex;   /* protect tree, count, list */
         /* Protected by tree_lock together with the radix tree */
@@ -724,6 +462,8 @@ struct block_device {
         int                     bd_fsfreeze_count;
         /* Mutex for freeze */
         struct mutex            bd_fsfreeze_mutex;
+        /* A semaphore that prevents I/O while block size is being changed */
+        struct percpu_rw_semaphore      bd_block_size_semaphore;
 };
 
 /*
@@ -741,7 +481,7 @@ int mapping_tagged(struct address_space *mapping, int tag);
  */
 static inline int mapping_mapped(struct address_space *mapping)
 {
-        return  !prio_tree_empty(&mapping->i_mmap) ||
+        return  !RB_EMPTY_ROOT(&mapping->i_mmap) ||
                 !list_empty(&mapping->i_mmap_nonlinear);
 }
 
@@ -1132,7 +872,7 @@ static inline int file_check_writeable(struct file *filp)
 #if BITS_PER_LONG==32
 #define MAX_LFS_FILESIZE        (((loff_t)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) 
 #elif BITS_PER_LONG==64
-#define MAX_LFS_FILESIZE        ((loff_t)0x7fffffffffffffff)
+#define MAX_LFS_FILESIZE        ((loff_t)0x7fffffffffffffffLL)
 #endif
 
 #define FL_POSIX        1
@@ -1507,7 +1247,6 @@ struct super_block {
         unsigned long           s_magic;
         struct dentry           *s_root;
         struct rw_semaphore     s_umount;
-        struct mutex            s_lock;
         int                     s_count;
         atomic_t                s_active;
 #ifdef CONFIG_SECURITY
@@ -1885,6 +1624,60 @@ struct super_operations {
 };
 
 /*
+ * Inode flags - they have no relation to superblock flags now
+ */
+#define S_SYNC          1       /* Writes are synced at once */
+#define S_NOATIME       2       /* Do not update access times */
+#define S_APPEND        4       /* Append-only file */
+#define S_IMMUTABLE     8       /* Immutable file */
+#define S_DEAD          16      /* removed, but still open directory */
+#define S_NOQUOTA       32      /* Inode is not counted to quota */
+#define S_DIRSYNC       64      /* Directory modifications are synchronous */
+#define S_NOCMTIME      128     /* Do not update file c/mtime */
+#define S_SWAPFILE      256     /* Do not truncate: swapon got its bmaps */
+#define S_PRIVATE       512     /* Inode is fs-internal */
+#define S_IMA           1024    /* Inode has an associated IMA struct */
+#define S_AUTOMOUNT     2048    /* Automount/referral quasi-directory */
+#define S_NOSEC         4096    /* no suid or xattr security attributes */
+
+/*
+ * Note that nosuid etc flags are inode-specific: setting some file-system
+ * flags just means all the inodes inherit those flags by default. It might be
+ * possible to override it selectively if you really wanted to with some
+ * ioctl() that is not currently implemented.
+ *
+ * Exception: MS_RDONLY is always applied to the entire file system.
+ *
+ * Unfortunately, it is possible to change a filesystems flags with it mounted
+ * with files in use.  This means that all of the inodes will not have their
+ * i_flags updated.  Hence, i_flags no longer inherit the superblock mount
+ * flags, so these have to be checked separately. -- rmk@arm.uk.linux.org
+ */
+#define __IS_FLG(inode, flg)    ((inode)->i_sb->s_flags & (flg))
+
+#define IS_RDONLY(inode)        ((inode)->i_sb->s_flags & MS_RDONLY)
+#define IS_SYNC(inode)          (__IS_FLG(inode, MS_SYNCHRONOUS) || \
+                                        ((inode)->i_flags & S_SYNC))
+#define IS_DIRSYNC(inode)       (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
+                                        ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
+#define IS_MANDLOCK(inode)      __IS_FLG(inode, MS_MANDLOCK)
+#define IS_NOATIME(inode)       __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
+#define IS_I_VERSION(inode)     __IS_FLG(inode, MS_I_VERSION)
+
+#define IS_NOQUOTA(inode)       ((inode)->i_flags & S_NOQUOTA)
+#define IS_APPEND(inode)        ((inode)->i_flags & S_APPEND)
+#define IS_IMMUTABLE(inode)     ((inode)->i_flags & S_IMMUTABLE)
+#define IS_POSIXACL(inode)      __IS_FLG(inode, MS_POSIXACL)
+
+#define IS_DEADDIR(inode)       ((inode)->i_flags & S_DEAD)
+#define IS_NOCMTIME(inode)      ((inode)->i_flags & S_NOCMTIME)
+#define IS_SWAPFILE(inode)      ((inode)->i_flags & S_SWAPFILE)
+#define IS_PRIVATE(inode)       ((inode)->i_flags & S_PRIVATE)
+#define IS_IMA(inode)           ((inode)->i_flags & S_IMA)
+#define IS_AUTOMOUNT(inode)     ((inode)->i_flags & S_AUTOMOUNT)
+#define IS_NOSEC(inode)         ((inode)->i_flags & S_NOSEC)
+
+/*
  * Inode state bits.  Protected by inode->i_lock
  *
  * Three bits determine the dirty state of the inode, I_DIRTY_SYNC,
@@ -2016,6 +1809,11 @@ int sync_inode_metadata(struct inode *inode, int wait);
 struct file_system_type {
         const char *name;
         int fs_flags;
+#define FS_REQUIRES_DEV         1 
+#define FS_BINARY_MOUNTDATA     2
+#define FS_HAS_SUBTYPE          4
+#define FS_REVAL_DOT            16384   /* Check the paths ".", ".." for staleness */
+#define FS_RENAME_DOES_D_MOVE   32768   /* FS will handle d_move() during rename() internally. */
         struct dentry *(*mount) (struct file_system_type *, int,
                        const char *, void *);
         void (*kill_sb) (struct super_block *);
@@ -2076,7 +1874,7 @@ extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data);
 extern void kern_unmount(struct vfsmount *mnt);
 extern int may_umount_tree(struct vfsmount *);
 extern int may_umount(struct vfsmount *);
-extern long do_mount(char *, char *, char *, unsigned long, void *);
+extern long do_mount(const char *, const char *, const char *, unsigned long, void *);
 extern struct vfsmount *collect_mounts(struct path *);
 extern void drop_collected_mounts(struct vfsmount *);
 extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,
@@ -2193,6 +1991,13 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
 #endif /* CONFIG_FILE_LOCKING */
 
 /* fs/open.c */
+struct audit_names;
+struct filename {
+        const char              *name;  /* pointer to actual string */
+        const __user char       *uptr;  /* original userland pointer */
+        struct audit_names      *aname;
+        bool                    separate; /* should "name" be freed? */
+};
 
 extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
                        struct file *filp);
@@ -2200,12 +2005,15 @@ extern int do_fallocate(struct file *file, int mode, loff_t offset,
                         loff_t len);
 extern long do_sys_open(int dfd, const char __user *filename, int flags,
                         umode_t mode);
+extern struct file *file_open_name(struct filename *, int, umode_t);
 extern struct file *filp_open(const char *, int, umode_t);
 extern struct file *file_open_root(struct dentry *, struct vfsmount *,
                                    const char *, int);
 extern struct file * dentry_open(const struct path *, int, const struct cred *);
 extern int filp_close(struct file *, fl_owner_t id);
-extern char * getname(const char __user *);
+
+extern struct filename *getname(const char __user *);
+
 enum {
         FILE_CREATED = 1,
         FILE_OPENED = 2
@@ -2225,13 +2033,14 @@ extern void __init vfs_caches_init(unsigned long);
 
 extern struct kmem_cache *names_cachep;
 
-#define __getname_gfp(gfp)      kmem_cache_alloc(names_cachep, (gfp))
-#define __getname()             __getname_gfp(GFP_KERNEL)
+extern void final_putname(struct filename *name);
+
+#define __getname()             kmem_cache_alloc(names_cachep, GFP_KERNEL)
 #define __putname(name)         kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
-#define putname(name)   __putname(name)
+#define putname(name)           final_putname(name)
 #else
-extern void putname(const char *name);
+extern void putname(struct filename *name);
 #endif
 
 #ifdef CONFIG_BLOCK
@@ -2552,6 +2361,8 @@ extern int sb_min_blocksize(struct super_block *, int);
 
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
+extern int generic_file_remap_pages(struct vm_area_struct *, unsigned long addr,
+                unsigned long size, pgoff_t pgoff);
 extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
 int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
 extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
@@ -2568,6 +2379,8 @@ extern int generic_segment_checks(const struct iovec *iov,
                 unsigned long *nr_segs, size_t *count, int access_flags);
 
 /* fs/block_dev.c */
+extern ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov,
+                               unsigned long nr_segs, loff_t pos);
 extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
                                 unsigned long nr_segs, loff_t pos);
 extern int blkdev_fsync(struct file *filp, loff_t start, loff_t end,
@@ -2859,5 +2672,4 @@ static inline void inode_has_no_xattr(struct inode *inode)
                 inode->i_flags |= S_NOSEC;
 }
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_FS_H */
diff --git a/include/linux/fsl_hypervisor.h b/include/linux/fsl_hypervisor.h
index 1cebaeeeef57..2a707d7fb32c 100644
--- a/include/linux/fsl_hypervisor.h
+++ b/include/linux/fsl_hypervisor.h
@@ -36,187 +36,11 @@
  * also be included by applications that need to communicate with the driver
  * via the ioctl interface.
  */
-
 #ifndef FSL_HYPERVISOR_H
 #define FSL_HYPERVISOR_H
 
-#include <linux/types.h>
-
-/**
- * struct fsl_hv_ioctl_restart - restart a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to restart, or -1 for the
- *             calling partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_RESTART
- */
-struct fsl_hv_ioctl_restart {
-        __u32 ret;
-        __u32 partition;
-};
+#include <uapi/linux/fsl_hypervisor.h>
 
-/**
- * struct fsl_hv_ioctl_status - get a partition's status
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to query, or -1 for the
- *             calling partition
- * @status: The returned status of the partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_GET_STATUS
- *
- * Values of 'status':
- *    0 = Stopped
- *    1 = Running
- *    2 = Starting
- *    3 = Stopping
- */
-struct fsl_hv_ioctl_status {
-        __u32 ret;
-        __u32 partition;
-        __u32 status;
-};
-
-/**
- * struct fsl_hv_ioctl_start - start a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to control
- * @entry_point: The offset within the guest IMA to start execution
- * @load: If non-zero, reload the partition's images before starting
- *
- * Used by FSL_HV_IOCTL_PARTITION_START
- */
-struct fsl_hv_ioctl_start {
-        __u32 ret;
-        __u32 partition;
-        __u32 entry_point;
-        __u32 load;
-};
-
-/**
- * struct fsl_hv_ioctl_stop - stop a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to stop, or -1 for the calling
- *             partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_STOP
- */
-struct fsl_hv_ioctl_stop {
-        __u32 ret;
-        __u32 partition;
-};
-
-/**
- * struct fsl_hv_ioctl_memcpy - copy memory between partitions
- * @ret: return error code from the hypervisor
- * @source: the partition ID of the source partition, or -1 for this
- *          partition
- * @target: the partition ID of the target partition, or -1 for this
- *          partition
- * @reserved: reserved, must be set to 0
- * @local_addr: user-space virtual address of a buffer in the local
- *              partition
- * @remote_addr: guest physical address of a buffer in the
- *           remote partition
- * @count: the number of bytes to copy.  Both the local and remote
- *         buffers must be at least 'count' bytes long
- *
- * Used by FSL_HV_IOCTL_MEMCPY
- *
- * The 'local' partition is the partition that calls this ioctl.  The
- * 'remote' partition is a different partition.  The data is copied from
- * the 'source' paritition' to the 'target' partition.
- *
- * The buffer in the remote partition must be guest physically
- * contiguous.
- *
- * This ioctl does not support copying memory between two remote
- * partitions or within the same partition, so either 'source' or
- * 'target' (but not both) must be -1.  In other words, either
- *
- *      source == local and target == remote
- * or
- *      source == remote and target == local
- */
-struct fsl_hv_ioctl_memcpy {
-        __u32 ret;
-        __u32 source;
-        __u32 target;
-        __u32 reserved; /* padding to ensure local_vaddr is aligned */
-        __u64 local_vaddr;
-        __u64 remote_paddr;
-        __u64 count;
-};
-
-/**
- * struct fsl_hv_ioctl_doorbell - ring a doorbell
- * @ret: return error code from the hypervisor
- * @doorbell: the handle of the doorbell to ring doorbell
- *
- * Used by FSL_HV_IOCTL_DOORBELL
- */
-struct fsl_hv_ioctl_doorbell {
-        __u32 ret;
-        __u32 doorbell;
-};
-
-/**
- * struct fsl_hv_ioctl_prop - get/set a device tree property
- * @ret: return error code from the hypervisor
- * @handle: handle of partition whose tree to access
- * @path: virtual address of path name of node to access
- * @propname: virtual address of name of property to access
- * @propval: virtual address of property data buffer
- * @proplen: Size of property data buffer
- * @reserved: reserved, must be set to 0
- *
- * Used by FSL_HV_IOCTL_DOORBELL
- */
-struct fsl_hv_ioctl_prop {
-        __u32 ret;
-        __u32 handle;
-        __u64 path;
-        __u64 propname;
-        __u64 propval;
-        __u32 proplen;
-        __u32 reserved; /* padding to ensure structure is aligned */
-};
-
-/* The ioctl type, documented in ioctl-number.txt */
-#define FSL_HV_IOCTL_TYPE       0xAF
-
-/* Restart another partition */
-#define FSL_HV_IOCTL_PARTITION_RESTART \
-        _IOWR(FSL_HV_IOCTL_TYPE, 1, struct fsl_hv_ioctl_restart)
-
-/* Get a partition's status */
-#define FSL_HV_IOCTL_PARTITION_GET_STATUS \
-        _IOWR(FSL_HV_IOCTL_TYPE, 2, struct fsl_hv_ioctl_status)
-
-/* Boot another partition */
-#define FSL_HV_IOCTL_PARTITION_START \
-        _IOWR(FSL_HV_IOCTL_TYPE, 3, struct fsl_hv_ioctl_start)
-
-/* Stop this or another partition */
-#define FSL_HV_IOCTL_PARTITION_STOP \
-        _IOWR(FSL_HV_IOCTL_TYPE, 4, struct fsl_hv_ioctl_stop)
-
-/* Copy data from one partition to another */
-#define FSL_HV_IOCTL_MEMCPY \
-        _IOWR(FSL_HV_IOCTL_TYPE, 5, struct fsl_hv_ioctl_memcpy)
-
-/* Ring a doorbell */
-#define FSL_HV_IOCTL_DOORBELL \
-        _IOWR(FSL_HV_IOCTL_TYPE, 6, struct fsl_hv_ioctl_doorbell)
-
-/* Get a property from another guest's device tree */
-#define FSL_HV_IOCTL_GETPROP \
-        _IOWR(FSL_HV_IOCTL_TYPE, 7, struct fsl_hv_ioctl_prop)
-
-/* Set a property in another guest's device tree */
-#define FSL_HV_IOCTL_SETPROP \
-        _IOWR(FSL_HV_IOCTL_TYPE, 8, struct fsl_hv_ioctl_prop)
-
-#ifdef __KERNEL__
 
 /**
  * fsl_hv_event_register() - register a callback for failover events
@@ -237,5 +61,3 @@ int fsl_hv_failover_register(struct notifier_block *nb);
 int fsl_hv_failover_unregister(struct notifier_block *nb);
 
 #endif
-
-#endif
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index a6dfe6944564..0fbfb4646d1b 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -109,7 +109,7 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
 
         if (source)
                 fsnotify(source, FS_MOVE_SELF, moved->d_inode, FSNOTIFY_EVENT_INODE, NULL, 0);
-        audit_inode_child(moved, new_dir);
+        audit_inode_child(new_dir, moved, AUDIT_TYPE_CHILD_CREATE);
 }
 
 /*
@@ -155,7 +155,7 @@ static inline void fsnotify_inoderemove(struct inode *inode)
  */
 static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 {
-        audit_inode_child(dentry, inode);
+        audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
 
         fsnotify(inode, FS_CREATE, dentry->d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
 }
@@ -168,7 +168,7 @@ static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
 {
         fsnotify_link_count(inode);
-        audit_inode_child(new_dentry, dir);
+        audit_inode_child(dir, new_dentry, AUDIT_TYPE_CHILD_CREATE);
 
         fsnotify(dir, FS_CREATE, inode, FSNOTIFY_EVENT_INODE, new_dentry->d_name.name, 0);
 }
@@ -181,7 +181,7 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
         __u32 mask = (FS_CREATE | FS_ISDIR);
         struct inode *d_inode = dentry->d_inode;
 
-        audit_inode_child(dentry, inode);
+        audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
 
         fsnotify(inode, mask, d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
 }
diff --git a/include/linux/futex.h b/include/linux/futex.h
index 1e5a26d79232..b0d95cac826e 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -1,129 +1,8 @@
 #ifndef _LINUX_FUTEX_H
 #define _LINUX_FUTEX_H
 
-#include <linux/compiler.h>
-#include <linux/types.h>
+#include <uapi/linux/futex.h>
 
-/* Second argument to futex syscall */
-
-
-#define FUTEX_WAIT              0
-#define FUTEX_WAKE              1
-#define FUTEX_FD                2
-#define FUTEX_REQUEUE           3
-#define FUTEX_CMP_REQUEUE       4
-#define FUTEX_WAKE_OP           5
-#define FUTEX_LOCK_PI           6
-#define FUTEX_UNLOCK_PI         7
-#define FUTEX_TRYLOCK_PI        8
-#define FUTEX_WAIT_BITSET       9
-#define FUTEX_WAKE_BITSET       10
-#define FUTEX_WAIT_REQUEUE_PI   11
-#define FUTEX_CMP_REQUEUE_PI    12
-
-#define FUTEX_PRIVATE_FLAG      128
-#define FUTEX_CLOCK_REALTIME    256
-#define FUTEX_CMD_MASK          ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME)
-
-#define FUTEX_WAIT_PRIVATE      (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_PRIVATE      (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_REQUEUE_PRIVATE   (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_OP_PRIVATE   (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
-#define FUTEX_LOCK_PI_PRIVATE   (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAIT_BITSET_PRIVATE       (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_BITSET_PRIVATE       (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAIT_REQUEUE_PI_PRIVATE   (FUTEX_WAIT_REQUEUE_PI | \
-                                         FUTEX_PRIVATE_FLAG)
-#define FUTEX_CMP_REQUEUE_PI_PRIVATE    (FUTEX_CMP_REQUEUE_PI | \
-                                         FUTEX_PRIVATE_FLAG)
-
-/*
- * Support for robust futexes: the kernel cleans up held futexes at
- * thread exit time.
- */
-
-/*
- * Per-lock list entry - embedded in user-space locks, somewhere close
- * to the futex field. (Note: user-space uses a double-linked list to
- * achieve O(1) list add and remove, but the kernel only needs to know
- * about the forward link)
- *
- * NOTE: this structure is part of the syscall ABI, and must not be
- * changed.
- */
-struct robust_list {
-        struct robust_list __user *next;
-};
-
-/*
- * Per-thread list head:
- *
- * NOTE: this structure is part of the syscall ABI, and must only be
- * changed if the change is first communicated with the glibc folks.
- * (When an incompatible change is done, we'll increase the structure
- *  size, which glibc will detect)
- */
-struct robust_list_head {
-        /*
-         * The head of the list. Points back to itself if empty:
-         */
-        struct robust_list list;
-
-        /*
-         * This relative offset is set by user-space, it gives the kernel
-         * the relative position of the futex field to examine. This way
-         * we keep userspace flexible, to freely shape its data-structure,
-         * without hardcoding any particular offset into the kernel:
-         */
-        long futex_offset;
-
-        /*
-         * The death of the thread may race with userspace setting
-         * up a lock's links. So to handle this race, userspace first
-         * sets this field to the address of the to-be-taken lock,
-         * then does the lock acquire, and then adds itself to the
-         * list, and then clears this field. Hence the kernel will
-         * always have full knowledge of all locks that the thread
-         * _might_ have taken. We check the owner TID in any case,
-         * so only truly owned locks will be handled.
-         */
-        struct robust_list __user *list_op_pending;
-};
-
-/*
- * Are there any waiters for this robust futex:
- */
-#define FUTEX_WAITERS           0x80000000
-
-/*
- * The kernel signals via this bit that a thread holding a futex
- * has exited without unlocking the futex. The kernel also does
- * a FUTEX_WAKE on such futexes, after setting the bit, to wake
- * up any possible waiters:
- */
-#define FUTEX_OWNER_DIED        0x40000000
-
-/*
- * The rest of the robust-futex field is for the TID:
- */
-#define FUTEX_TID_MASK          0x3fffffff
-
-/*
- * This limit protects against a deliberately circular list.
- * (Not worth introducing an rlimit for it)
- */
-#define ROBUST_LIST_LIMIT       2048
-
-/*
- * bitset with all bits set for the FUTEX_xxx_BITSET OPs to request a
- * match of any bit.
- */
-#define FUTEX_BITSET_MATCH_ANY  0xffffffff
-
-#ifdef __KERNEL__
 struct inode;
 struct mm_struct;
 struct task_struct;
@@ -185,31 +64,4 @@ static inline void exit_pi_state_list(struct task_struct *curr)
 {
 }
 #endif
-#endif /* __KERNEL__ */
-
-#define FUTEX_OP_SET            0       /* *(int *)UADDR2 = OPARG; */
-#define FUTEX_OP_ADD            1       /* *(int *)UADDR2 += OPARG; */
-#define FUTEX_OP_OR             2       /* *(int *)UADDR2 |= OPARG; */
-#define FUTEX_OP_ANDN           3       /* *(int *)UADDR2 &= ~OPARG; */
-#define FUTEX_OP_XOR            4       /* *(int *)UADDR2 ^= OPARG; */
-
-#define FUTEX_OP_OPARG_SHIFT    8       /* Use (1 << OPARG) instead of OPARG.  */
-
-#define FUTEX_OP_CMP_EQ         0       /* if (oldval == CMPARG) wake */
-#define FUTEX_OP_CMP_NE         1       /* if (oldval != CMPARG) wake */
-#define FUTEX_OP_CMP_LT         2       /* if (oldval < CMPARG) wake */
-#define FUTEX_OP_CMP_LE         3       /* if (oldval <= CMPARG) wake */
-#define FUTEX_OP_CMP_GT         4       /* if (oldval > CMPARG) wake */
-#define FUTEX_OP_CMP_GE         5       /* if (oldval >= CMPARG) wake */
-
-/* FUTEX_WAKE_OP will perform atomically
-   int oldval = *(int *)UADDR2;
-   *(int *)UADDR2 = oldval OP OPARG;
-   if (oldval CMP CMPARG)
-     wake UADDR2;  */
-
-#define FUTEX_OP(op, oparg, cmp, cmparg) \
-  (((op & 0xf) << 28) | ((cmp & 0xf) << 24)             \
-   | ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
-
 #endif
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index b986be513406..bb7de09e8d57 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -1,6 +1,3 @@
-#ifndef _GAMEPORT_H
-#define _GAMEPORT_H
-
 /*
  *  Copyright (c) 1999-2002 Vojtech Pavlik
  *
@@ -8,8 +5,9 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
+#ifndef _GAMEPORT_H
+#define _GAMEPORT_H
 
-#ifdef __KERNEL__
 #include <asm/io.h>
 #include <linux/types.h>
 #include <linux/list.h>
@@ -17,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
+#include <uapi/linux/gameport.h>
 
 struct gameport {
 
@@ -166,24 +165,6 @@ void gameport_unregister_driver(struct gameport_driver *drv);
         module_driver(__gameport_driver, gameport_register_driver, \
                        gameport_unregister_driver)
 
-#endif /* __KERNEL__ */
-
-#define GAMEPORT_MODE_DISABLED          0
-#define GAMEPORT_MODE_RAW               1
-#define GAMEPORT_MODE_COOKED            2
-
-#define GAMEPORT_ID_VENDOR_ANALOG       0x0001
-#define GAMEPORT_ID_VENDOR_MADCATZ      0x0002
-#define GAMEPORT_ID_VENDOR_LOGITECH     0x0003
-#define GAMEPORT_ID_VENDOR_CREATIVE     0x0004
-#define GAMEPORT_ID_VENDOR_GENIUS       0x0005
-#define GAMEPORT_ID_VENDOR_INTERACT     0x0006
-#define GAMEPORT_ID_VENDOR_MICROSOFT    0x0007
-#define GAMEPORT_ID_VENDOR_THRUSTMASTER 0x0008
-#define GAMEPORT_ID_VENDOR_GRAVIS       0x0009
-#define GAMEPORT_ID_VENDOR_GUILLEMOT    0x000a
-
-#ifdef __KERNEL__
 
 static inline void gameport_trigger(struct gameport *gameport)
 {
@@ -235,5 +216,4 @@ static inline void gameport_set_poll_interval(struct gameport *gameport, unsigne
 void gameport_start_polling(struct gameport *gameport);
 void gameport_stop_polling(struct gameport *gameport);
 
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 5e98eeb2af3b..dd7c569aacad 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -29,6 +29,20 @@
 
 #ifndef __GENALLOC_H__
 #define __GENALLOC_H__
+/**
+ * Allocation callback function type definition
+ * @map: Pointer to bitmap
+ * @size: The bitmap size in bits
+ * @start: The bitnumber to start searching at
+ * @nr: The number of zeroed bits we're looking for
+ * @data: optional additional data used by @genpool_algo_t
+ */
+typedef unsigned long (*genpool_algo_t)(unsigned long *map,
+                        unsigned long size,
+                        unsigned long start,
+                        unsigned int nr,
+                        void *data);
+
 /*
  *  General purpose special memory pool descriptor.
  */
@@ -36,6 +50,9 @@ struct gen_pool {
         spinlock_t lock;
         struct list_head chunks;        /* list of chunks in this pool */
         int min_alloc_order;            /* minimum allocation order */
+
+        genpool_algo_t algo;            /* allocation function */
+        void *data;
 };
 
 /*
@@ -78,4 +95,14 @@ extern void gen_pool_for_each_chunk(struct gen_pool *,
         void (*)(struct gen_pool *, struct gen_pool_chunk *, void *), void *);
 extern size_t gen_pool_avail(struct gen_pool *);
 extern size_t gen_pool_size(struct gen_pool *);
+
+extern void gen_pool_set_algo(struct gen_pool *pool, genpool_algo_t algo,
+                void *data);
+
+extern unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data);
+
+extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data);
+
 #endif /* __GENALLOC_H__ */
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 5ab61c1eb6bf..55b685719d52 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -1,86 +1,8 @@
 #ifndef __LINUX_GENERIC_NETLINK_H
 #define __LINUX_GENERIC_NETLINK_H
 
-#include <linux/types.h>
-#include <linux/netlink.h>
+#include <uapi/linux/genetlink.h>
 
-#define GENL_NAMSIZ     16      /* length of family name */
-
-#define GENL_MIN_ID     NLMSG_MIN_TYPE
-#define GENL_MAX_ID     1023
-
-struct genlmsghdr {
-        __u8    cmd;
-        __u8    version;
-        __u16   reserved;
-};
-
-#define GENL_HDRLEN     NLMSG_ALIGN(sizeof(struct genlmsghdr))
-
-#define GENL_ADMIN_PERM         0x01
-#define GENL_CMD_CAP_DO         0x02
-#define GENL_CMD_CAP_DUMP       0x04
-#define GENL_CMD_CAP_HASPOL     0x08
-
-/*
- * List of reserved static generic netlink identifiers:
- */
-#define GENL_ID_GENERATE        0
-#define GENL_ID_CTRL            NLMSG_MIN_TYPE
-
-/**************************************************************************
- * Controller
- **************************************************************************/
-
-enum {
-        CTRL_CMD_UNSPEC,
-        CTRL_CMD_NEWFAMILY,
-        CTRL_CMD_DELFAMILY,
-        CTRL_CMD_GETFAMILY,
-        CTRL_CMD_NEWOPS,
-        CTRL_CMD_DELOPS,
-        CTRL_CMD_GETOPS,
-        CTRL_CMD_NEWMCAST_GRP,
-        CTRL_CMD_DELMCAST_GRP,
-        CTRL_CMD_GETMCAST_GRP, /* unused */
-        __CTRL_CMD_MAX,
-};
-
-#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
-
-enum {
-        CTRL_ATTR_UNSPEC,
-        CTRL_ATTR_FAMILY_ID,
-        CTRL_ATTR_FAMILY_NAME,
-        CTRL_ATTR_VERSION,
-        CTRL_ATTR_HDRSIZE,
-        CTRL_ATTR_MAXATTR,
-        CTRL_ATTR_OPS,
-        CTRL_ATTR_MCAST_GROUPS,
-        __CTRL_ATTR_MAX,
-};
-
-#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
-
-enum {
-        CTRL_ATTR_OP_UNSPEC,
-        CTRL_ATTR_OP_ID,
-        CTRL_ATTR_OP_FLAGS,
-        __CTRL_ATTR_OP_MAX,
-};
-
-#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
-
-enum {
-        CTRL_ATTR_MCAST_GRP_UNSPEC,
-        CTRL_ATTR_MCAST_GRP_NAME,
-        CTRL_ATTR_MCAST_GRP_ID,
-        __CTRL_ATTR_MCAST_GRP_MAX,
-};
-
-#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
-
-#ifdef __KERNEL__
 
 /* All generic netlink requests are serialized by a global lock.  */
 extern void genl_lock(void);
@@ -113,6 +35,4 @@ extern int lockdep_genl_is_held(void);
 #define MODULE_ALIAS_GENL_FAMILY(family)\
  MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)
 
-#endif /* __KERNEL__ */
-
 #endif  /* __LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 4883f393f50a..02c1c9710be0 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -30,12 +30,7 @@ struct vm_area_struct;
 #define ___GFP_HARDWALL         0x20000u
 #define ___GFP_THISNODE         0x40000u
 #define ___GFP_RECLAIMABLE      0x80000u
-#ifdef CONFIG_KMEMCHECK
 #define ___GFP_NOTRACK          0x200000u
-#else
-#define ___GFP_NOTRACK          0
-#endif
-#define ___GFP_NO_KSWAPD        0x400000u
 #define ___GFP_OTHER_NODE       0x800000u
 #define ___GFP_WRITE            0x1000000u
 
@@ -90,7 +85,6 @@ struct vm_area_struct;
 #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */
 #define __GFP_NOTRACK   ((__force gfp_t)___GFP_NOTRACK)  /* Don't track with kmemcheck */
 
-#define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
 #define __GFP_WRITE     ((__force gfp_t)___GFP_WRITE)   /* Allocator intends to dirty page */
 
@@ -120,8 +114,7 @@ struct vm_area_struct;
                                  __GFP_MOVABLE)
 #define GFP_IOFS        (__GFP_IO | __GFP_FS)
 #define GFP_TRANSHUGE   (GFP_HIGHUSER_MOVABLE | __GFP_COMP | \
-                         __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN | \
-                         __GFP_NO_KSWAPD)
+                         __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN)
 
 #ifdef CONFIG_NUMA
 #define GFP_THISNODE    (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index ee275c8b3df1..1acb1445e05f 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -7,24 +7,14 @@
  * under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
  */
-
 #ifndef __HDLC_H
 #define __HDLC_H
 
 
-#define HDLC_MAX_MTU 1500       /* Ethernet 1500 bytes */
-#if 0
-#define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */
-#else
-#define HDLC_MAX_MRU 1600 /* as required for FR network */
-#endif
-
-
-#ifdef __KERNEL__
-
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/hdlc/ioctl.h>
+#include <uapi/linux/hdlc.h>
 
 /* This structure is a private property of HDLC protocols.
    Hardware drivers have no interest here */
@@ -127,5 +117,4 @@ static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
                 return htons(ETH_P_HDLC);
 }
 
-#endif /* __KERNEL */
 #endif /* __HDLC_H */
diff --git a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h
index c010b4a785b8..be3be25bb898 100644
--- a/include/linux/hdlcdrv.h
+++ b/include/linux/hdlcdrv.h
@@ -3,110 +3,14 @@
  * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
  * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA
  */
-
 #ifndef _HDLCDRV_H
 #define _HDLCDRV_H
 
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct hdlcdrv_params {
-        int iobase;
-        int irq;
-        int dma;
-        int dma2;
-        int seriobase;
-        int pariobase;
-        int midiiobase;
-};      
-
-struct hdlcdrv_channel_params {
-        int tx_delay;  /* the transmitter keyup delay in 10ms units */
-        int tx_tail;   /* the transmitter keyoff delay in 10ms units */
-        int slottime;  /* the slottime in 10ms; usually 10 = 100ms */
-        int ppersist;  /* the p-persistence 0..255 */
-        int fulldup;   /* some driver do not support full duplex, setting */
-                       /* this just makes them send even if DCD is on */
-};      
-
-struct hdlcdrv_old_channel_state {
-        int ptt;
-        int dcd;
-        int ptt_keyed;
-};
-
-struct hdlcdrv_channel_state {
-        int ptt;
-        int dcd;
-        int ptt_keyed;
-        unsigned long tx_packets;
-        unsigned long tx_errors;
-        unsigned long rx_packets;
-        unsigned long rx_errors;
-};
-
-struct hdlcdrv_ioctl {
-        int cmd;
-        union {
-                struct hdlcdrv_params mp;
-                struct hdlcdrv_channel_params cp;
-                struct hdlcdrv_channel_state cs;
-                struct hdlcdrv_old_channel_state ocs;
-                unsigned int calibrate;
-                unsigned char bits;
-                char modename[128];
-                char drivername[32];
-        } data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * ioctl values
- */
-#define HDLCDRVCTL_GETMODEMPAR       0
-#define HDLCDRVCTL_SETMODEMPAR       1
-#define HDLCDRVCTL_MODEMPARMASK      2  /* not handled by hdlcdrv */
-#define HDLCDRVCTL_GETCHANNELPAR    10
-#define HDLCDRVCTL_SETCHANNELPAR    11
-#define HDLCDRVCTL_OLDGETSTAT       20
-#define HDLCDRVCTL_CALIBRATE        21
-#define HDLCDRVCTL_GETSTAT          22
-
-/*
- * these are mainly for debugging purposes
- */
-#define HDLCDRVCTL_GETSAMPLES       30
-#define HDLCDRVCTL_GETBITS          31
-
-/*
- * not handled by hdlcdrv, but by its depending drivers
- */
-#define HDLCDRVCTL_GETMODE          40
-#define HDLCDRVCTL_SETMODE          41
-#define HDLCDRVCTL_MODELIST         42
-#define HDLCDRVCTL_DRIVERNAME       43
-
-/*
- * mask of needed modem parameters, returned by HDLCDRVCTL_MODEMPARMASK
- */
-#define HDLCDRV_PARMASK_IOBASE      (1<<0)
-#define HDLCDRV_PARMASK_IRQ         (1<<1)
-#define HDLCDRV_PARMASK_DMA         (1<<2)
-#define HDLCDRV_PARMASK_DMA2        (1<<3)
-#define HDLCDRV_PARMASK_SERIOBASE   (1<<4)
-#define HDLCDRV_PARMASK_PARIOBASE   (1<<5)
-#define HDLCDRV_PARMASK_MIDIIOBASE  (1<<6)
-
-/* -------------------------------------------------------------------- */
-
-#ifdef __KERNEL__
 
 #include <linux/netdevice.h>
 #include <linux/if.h>
 #include <linux/spinlock.h>
+#include <uapi/linux/hdlcdrv.h>
 
 #define HDLCDRV_MAGIC      0x5ac6e778
 #define HDLCDRV_HDLCBUFFER  32 /* should be a power of 2 for speed reasons */
@@ -368,10 +272,4 @@ void hdlcdrv_unregister(struct net_device *dev);
 
 
 
-#endif /* __KERNEL__ */
-
-/* -------------------------------------------------------------------- */
-
 #endif /* _HDLCDRV_H */
-
-/* -------------------------------------------------------------------- */
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 7e1f37db7582..c076041a069e 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -1,12 +1,8 @@
-#ifndef __HID_H
-#define __HID_H
-
 /*
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2001 Vojtech Pavlik
  *  Copyright (c) 2006-2007 Jiri Kosina
  */
-
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,43 +22,9 @@
  * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
  */
+#ifndef __HID_H
+#define __HID_H
 
-/*
- * USB HID (Human Interface Device) interface class code
- */
-
-#define USB_INTERFACE_CLASS_HID         3
-
-/*
- * USB HID interface subclass and protocol codes
- */
-
-#define USB_INTERFACE_SUBCLASS_BOOT     1
-#define USB_INTERFACE_PROTOCOL_KEYBOARD 1
-#define USB_INTERFACE_PROTOCOL_MOUSE    2
-
-/*
- * HID class requests
- */
-
-#define HID_REQ_GET_REPORT              0x01
-#define HID_REQ_GET_IDLE                0x02
-#define HID_REQ_GET_PROTOCOL            0x03
-#define HID_REQ_SET_REPORT              0x09
-#define HID_REQ_SET_IDLE                0x0A
-#define HID_REQ_SET_PROTOCOL            0x0B
-
-/*
- * HID class descriptor types
- */
-
-#define HID_DT_HID                      (USB_TYPE_CLASS | 0x01)
-#define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
-#define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
-
-#define HID_MAX_DESCRIPTOR_SIZE         4096
-
-#ifdef __KERNEL__
 
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -73,6 +35,7 @@
 #include <linux/input.h>
 #include <linux/semaphore.h>
 #include <linux/power_supply.h>
+#include <uapi/linux/hid.h>
 
 /*
  * We parse each description item into this structure. Short items data
@@ -943,7 +906,4 @@ do {									\
 #define hid_dbg(hid, fmt, arg...)                       \
         dev_dbg(&(hid)->dev, fmt, ##arg)
 
-#endif /* __KERNEL__ */
-
 #endif
-
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index a3f481a3063b..a5dd8148660b 100644
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -1,12 +1,8 @@
-#ifndef _HIDDEV_H
-#define _HIDDEV_H
-
 /*
  *  Copyright (c) 1999-2000 Vojtech Pavlik
  *
  *  Sponsored by SuSE
  */
-
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,190 +22,11 @@
  * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
  * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
  */
+#ifndef _HIDDEV_H
+#define _HIDDEV_H
 
-#include <linux/types.h>
-
-/*
- * The event structure itself
- */
-
-struct hiddev_event {
-        unsigned hid;
-        signed int value;
-};
-
-struct hiddev_devinfo {
-        __u32 bustype;
-        __u32 busnum;
-        __u32 devnum;
-        __u32 ifnum;
-        __s16 vendor;
-        __s16 product;
-        __s16 version;
-        __u32 num_applications;
-};
-
-struct hiddev_collection_info {
-        __u32 index;
-        __u32 type;
-        __u32 usage;
-        __u32 level;
-};
-
-#define HID_STRING_SIZE 256
-struct hiddev_string_descriptor {
-        __s32 index;
-        char value[HID_STRING_SIZE];
-};
-
-struct hiddev_report_info {
-        __u32 report_type;
-        __u32 report_id;
-        __u32 num_fields;
-};
-
-/* To do a GUSAGE/SUSAGE, fill in at least usage_code,  report_type and 
- * report_id.  Set report_id to REPORT_ID_UNKNOWN if the rest of the fields 
- * are unknown.  Otherwise use a usage_ref struct filled in from a previous 
- * successful GUSAGE call to save time.  To actually send a value to the
- * device, perform a SUSAGE first, followed by a SREPORT.  An INITREPORT or a
- * GREPORT isn't necessary for a GUSAGE to return valid data.
- */
-#define HID_REPORT_ID_UNKNOWN 0xffffffff
-#define HID_REPORT_ID_FIRST   0x00000100
-#define HID_REPORT_ID_NEXT    0x00000200
-#define HID_REPORT_ID_MASK    0x000000ff
-#define HID_REPORT_ID_MAX     0x000000ff
-
-#define HID_REPORT_TYPE_INPUT   1
-#define HID_REPORT_TYPE_OUTPUT  2
-#define HID_REPORT_TYPE_FEATURE 3
-#define HID_REPORT_TYPE_MIN     1
-#define HID_REPORT_TYPE_MAX     3
-
-struct hiddev_field_info {
-        __u32 report_type;
-        __u32 report_id;
-        __u32 field_index;
-        __u32 maxusage;
-        __u32 flags;
-        __u32 physical;         /* physical usage for this field */
-        __u32 logical;          /* logical usage for this field */
-        __u32 application;              /* application usage for this field */
-        __s32 logical_minimum;
-        __s32 logical_maximum;
-        __s32 physical_minimum;
-        __s32 physical_maximum;
-        __u32 unit_exponent;
-        __u32 unit;
-};
-
-/* Fill in report_type, report_id and field_index to get the information on a
- * field.
- */
-#define HID_FIELD_CONSTANT              0x001
-#define HID_FIELD_VARIABLE              0x002
-#define HID_FIELD_RELATIVE              0x004
-#define HID_FIELD_WRAP                  0x008   
-#define HID_FIELD_NONLINEAR             0x010
-#define HID_FIELD_NO_PREFERRED          0x020
-#define HID_FIELD_NULL_STATE            0x040
-#define HID_FIELD_VOLATILE              0x080
-#define HID_FIELD_BUFFERED_BYTE         0x100
-
-struct hiddev_usage_ref {
-        __u32 report_type;
-        __u32 report_id;
-        __u32 field_index;
-        __u32 usage_index;
-        __u32 usage_code;
-        __s32 value;
-};
-
-/* hiddev_usage_ref_multi is used for sending multiple bytes to a control.
- * It really manifests itself as setting the value of consecutive usages */
-#define HID_MAX_MULTI_USAGES 1024
-struct hiddev_usage_ref_multi {
-        struct hiddev_usage_ref uref;
-        __u32 num_values;
-        __s32 values[HID_MAX_MULTI_USAGES];
-};
-
-/* FIELD_INDEX_NONE is returned in read() data from the kernel when flags
- * is set to (HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT) and a new report has
- * been sent by the device 
- */
-#define HID_FIELD_INDEX_NONE 0xffffffff
-
-/*
- * Protocol version.
- */
-
-#define HID_VERSION             0x010004
-
-/*
- * IOCTLs (0x00 - 0x7f)
- */
-
-#define HIDIOCGVERSION          _IOR('H', 0x01, int)
-#define HIDIOCAPPLICATION       _IO('H', 0x02)
-#define HIDIOCGDEVINFO          _IOR('H', 0x03, struct hiddev_devinfo)
-#define HIDIOCGSTRING           _IOR('H', 0x04, struct hiddev_string_descriptor)
-#define HIDIOCINITREPORT        _IO('H', 0x05)
-#define HIDIOCGNAME(len)        _IOC(_IOC_READ, 'H', 0x06, len)
-#define HIDIOCGREPORT           _IOW('H', 0x07, struct hiddev_report_info)
-#define HIDIOCSREPORT           _IOW('H', 0x08, struct hiddev_report_info)
-#define HIDIOCGREPORTINFO       _IOWR('H', 0x09, struct hiddev_report_info)
-#define HIDIOCGFIELDINFO        _IOWR('H', 0x0A, struct hiddev_field_info)
-#define HIDIOCGUSAGE            _IOWR('H', 0x0B, struct hiddev_usage_ref)
-#define HIDIOCSUSAGE            _IOW('H', 0x0C, struct hiddev_usage_ref)
-#define HIDIOCGUCODE            _IOWR('H', 0x0D, struct hiddev_usage_ref)
-#define HIDIOCGFLAG             _IOR('H', 0x0E, int)
-#define HIDIOCSFLAG             _IOW('H', 0x0F, int)
-#define HIDIOCGCOLLECTIONINDEX  _IOW('H', 0x10, struct hiddev_usage_ref)
-#define HIDIOCGCOLLECTIONINFO   _IOWR('H', 0x11, struct hiddev_collection_info)
-#define HIDIOCGPHYS(len)        _IOC(_IOC_READ, 'H', 0x12, len)
-
-/* For writing/reading to multiple/consecutive usages */
-#define HIDIOCGUSAGES           _IOWR('H', 0x13, struct hiddev_usage_ref_multi)
-#define HIDIOCSUSAGES           _IOW('H', 0x14, struct hiddev_usage_ref_multi)
-
-/* 
- * Flags to be used in HIDIOCSFLAG
- */
-#define HIDDEV_FLAG_UREF        0x1
-#define HIDDEV_FLAG_REPORT      0x2
-#define HIDDEV_FLAGS            0x3
-
-/* To traverse the input report descriptor info for a HID device, perform the 
- * following:
- *
- * rinfo.report_type = HID_REPORT_TYPE_INPUT;
- * rinfo.report_id = HID_REPORT_ID_FIRST;
- * ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
- *
- * while (ret >= 0) {
- *      for (i = 0; i < rinfo.num_fields; i++) {
- *              finfo.report_type = rinfo.report_type;
- *              finfo.report_id = rinfo.report_id;
- *              finfo.field_index = i;
- *              ioctl(fd, HIDIOCGFIELDINFO, &finfo);
- *              for (j = 0; j < finfo.maxusage; j++) {
- *                      uref.report_type = rinfo.report_type;
- *                      uref.report_id = rinfo.report_id;
- *                      uref.field_index = i;
- *                      uref.usage_index = j;
- *                      ioctl(fd, HIDIOCGUCODE, &uref);
- *                      ioctl(fd, HIDIOCGUSAGE, &uref);
- *              }
- *      }
- *      rinfo.report_id |= HID_REPORT_ID_NEXT;
- *      ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
- * }
- */
-
+#include <uapi/linux/hiddev.h>
 
-#ifdef __KERNEL__
 
 /*
  * In-kernel definitions.
@@ -237,4 +54,3 @@ static inline void hiddev_report_event(struct hid_device *hid, struct hid_report
 #endif
 
 #endif
-#endif
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
index 45e9fcb8d877..2451662c728a 100644
--- a/include/linux/hidraw.h
+++ b/include/linux/hidraw.h
@@ -1,10 +1,6 @@
-#ifndef _HIDRAW_H
-#define _HIDRAW_H
-
 /*
  *  Copyright (c) 2007 Jiri Kosina
  */
-
 /*
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -14,39 +10,11 @@
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifndef _HIDRAW_H
+#define _HIDRAW_H
 
-#include <linux/hid.h>
-#include <linux/types.h>
-
-struct hidraw_report_descriptor {
-        __u32 size;
-        __u8 value[HID_MAX_DESCRIPTOR_SIZE];
-};
-
-struct hidraw_devinfo {
-        __u32 bustype;
-        __s16 vendor;
-        __s16 product;
-};
-
-/* ioctl interface */
-#define HIDIOCGRDESCSIZE        _IOR('H', 0x01, int)
-#define HIDIOCGRDESC            _IOR('H', 0x02, struct hidraw_report_descriptor)
-#define HIDIOCGRAWINFO          _IOR('H', 0x03, struct hidraw_devinfo)
-#define HIDIOCGRAWNAME(len)     _IOC(_IOC_READ, 'H', 0x04, len)
-#define HIDIOCGRAWPHYS(len)     _IOC(_IOC_READ, 'H', 0x05, len)
-/* The first byte of SFEATURE and GFEATURE is the report number */
-#define HIDIOCSFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
-#define HIDIOCGFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)
-
-#define HIDRAW_FIRST_MINOR 0
-#define HIDRAW_MAX_DEVICES 64
-/* number of reports to buffer */
-#define HIDRAW_BUFFER_SIZE 64
-
+#include <uapi/linux/hidraw.h>
 
-/* kernel-only API declarations */
-#ifdef __KERNEL__
 
 struct hidraw {
         unsigned int minor;
@@ -88,5 +56,3 @@ static inline void hidraw_disconnect(struct hid_device *hid) { }
 #endif
 
 #endif
-
-#endif
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 219ca4f6bea6..9427ab4e01c3 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -1,9 +1,8 @@
 #ifndef __HPET__
 #define __HPET__ 1
 
-#include <linux/compiler.h>
+#include <uapi/linux/hpet.h>
 
-#ifdef __KERNEL__
 
 /*
  * Offsets into HPET Registers
@@ -108,24 +107,4 @@ static inline void hpet_reserve_timer(struct hpet_data *hd, int timer)
 
 int hpet_alloc(struct hpet_data *);
 
-#endif /* __KERNEL__ */
-
-struct hpet_info {
-        unsigned long hi_ireqfreq;      /* Hz */
-        unsigned long hi_flags; /* information */
-        unsigned short hi_hpet;
-        unsigned short hi_timer;
-};
-
-#define HPET_INFO_PERIODIC      0x0010  /* periodic-capable comparator */
-
-#define HPET_IE_ON      _IO('h', 0x01)  /* interrupt on */
-#define HPET_IE_OFF     _IO('h', 0x02)  /* interrupt off */
-#define HPET_INFO       _IOR('h', 0x03, struct hpet_info)
-#define HPET_EPI        _IO('h', 0x04)  /* enable periodic */
-#define HPET_DPI        _IO('h', 0x05)  /* disable periodic */
-#define HPET_IRQFREQ    _IOW('h', 0x6, unsigned long)   /* IRQFREQ usec */
-
-#define MAX_HPET_TBS    8               /* maximum hpet timer blocks */
-
 #endif                          /* !__HPET__ */
diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild
index 271a770b4784..e69de29bb2d1 100644
--- a/include/linux/hsi/Kbuild
+++ b/include/linux/hsi/Kbuild
@@ -1 +0,0 @@
-header-y += hsi_char.h
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 4c59b1131187..b31cb7da0346 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -11,8 +11,7 @@ extern int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 extern int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
                                unsigned long address, pmd_t *pmd,
                                pmd_t orig_pmd);
-extern pgtable_t get_pmd_huge_pte(struct mm_struct *mm);
-extern struct page *follow_trans_huge_pmd(struct mm_struct *mm,
+extern struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
                                           unsigned long addr,
                                           pmd_t *pmd,
                                           unsigned int flags);
diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h
index 1364d62e2fbe..a3c3ecd59f08 100644
--- a/include/linux/i2c-algo-pca.h
+++ b/include/linux/i2c-algo-pca.h
@@ -62,6 +62,7 @@ struct i2c_algo_pca_data {
          * 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000
          * For PCA9665, use the frequency you want here. */
         unsigned int                    i2c_clock;
+        unsigned int                    chip;
 };
 
 int i2c_pca_add_bus(struct i2c_adapter *);
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index 8a7406b2114d..79727144c5cd 100644
--- a/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
@@ -19,57 +19,10 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     MA 02110-1301 USA.
 */
-
 #ifndef _LINUX_I2C_DEV_H
 #define _LINUX_I2C_DEV_H
 
-#include <linux/types.h>
-#include <linux/compiler.h>
-
-/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
- * unsigned long, except for:
- *      - I2C_FUNCS, takes pointer to an unsigned long
- *      - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
- *      - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
- */
-#define I2C_RETRIES     0x0701  /* number of times a device address should
-                                   be polled when not acknowledging */
-#define I2C_TIMEOUT     0x0702  /* set timeout in units of 10 ms */
-
-/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
- * are NOT supported! (due to code brokenness)
- */
-#define I2C_SLAVE       0x0703  /* Use this slave address */
-#define I2C_SLAVE_FORCE 0x0706  /* Use this slave address, even if it
-                                   is already in use by a driver! */
-#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit */
-
-#define I2C_FUNCS       0x0705  /* Get the adapter functionality mask */
-
-#define I2C_RDWR        0x0707  /* Combined R/W transfer (one STOP only) */
-
-#define I2C_PEC         0x0708  /* != 0 to use PEC with SMBus */
-#define I2C_SMBUS       0x0720  /* SMBus transfer */
+#include <uapi/linux/i2c-dev.h>
 
-
-/* This is the structure as used in the I2C_SMBUS ioctl call */
-struct i2c_smbus_ioctl_data {
-        __u8 read_write;
-        __u8 command;
-        __u32 size;
-        union i2c_smbus_data __user *data;
-};
-
-/* This is the structure as used in the I2C_RDWR ioctl call */
-struct i2c_rdwr_ioctl_data {
-        struct i2c_msg __user *msgs;    /* pointers to i2c_msgs */
-        __u32 nmsgs;                    /* number of i2c_msgs */
-};
-
-#define  I2C_RDRW_IOCTL_MAX_MSGS        42
-
-#ifdef __KERNEL__
 #define I2C_MAJOR       89              /* Device major number          */
-#endif
-
 #endif /* _LINUX_I2C_DEV_H */
diff --git a/include/linux/i2c-mux-gpio.h b/include/linux/i2c-mux-gpio.h
index a36343a37ebc..4406108201fe 100644
--- a/include/linux/i2c-mux-gpio.h
+++ b/include/linux/i2c-mux-gpio.h
@@ -21,6 +21,9 @@
  * @values: Array of bitmasks of GPIO settings (low/high) for each
  *      position
  * @n_values: Number of multiplexer positions (busses to instantiate)
+ * @classes: Optional I2C auto-detection classes
+ * @gpio_chip: Optional GPIO chip name; if set, GPIO pin numbers are given
+ *      relative to the base GPIO number of that chip
  * @gpios: Array of GPIO numbers used to control MUX
  * @n_gpios: Number of GPIOs used to control MUX
  * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used
@@ -30,6 +33,8 @@ struct i2c_mux_gpio_platform_data {
         int base_nr;
         const unsigned *values;
         int n_values;
+        const unsigned *classes;
+        char *gpio_chip;
         const unsigned *gpios;
         int n_gpios;
         unsigned idle;
diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index c79083830014..40cb05a97b46 100644
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -36,6 +36,7 @@
 struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
                                 struct device *mux_dev,
                                 void *mux_priv, u32 force_nr, u32 chan_id,
+                                unsigned int class,
                                 int (*select) (struct i2c_adapter *,
                                                void *mux_dev, u32 chan_id),
                                 int (*deselect) (struct i2c_adapter *,
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h
index 92a0dc75bc74..df804ba73e0b 100644
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
@@ -34,7 +34,6 @@ struct omap_i2c_bus_platform_data {
         u32             clkrate;
         u32             rev;
         u32             flags;
-        void            (*set_mpu_wkup_lat)(struct device *dev, long set);
 };
 
 #endif
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 5970266930a2..800de224336b 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -23,18 +23,16 @@
 
 /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
    Frodo Looijaard <frodol@dds.nl> */
-
 #ifndef _LINUX_I2C_H
 #define _LINUX_I2C_H
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/mod_devicetable.h>
 #include <linux/device.h>       /* for struct device */
 #include <linux/sched.h>        /* for completion */
 #include <linux/mutex.h>
 #include <linux/of.h>           /* for struct device_node */
 #include <linux/swab.h>         /* for swab16 */
+#include <uapi/linux/i2c.h>
 
 extern struct bus_type i2c_bus_type;
 extern struct device_type i2c_adapter_type;
@@ -144,7 +142,7 @@ extern s32 i2c_smbus_write_i2c_block_data(const struct i2c_client *client,
  * The driver.owner field should be set to the module owner of this driver.
  * The driver.name field should be set to the name of this driver.
  *
- * For automatic device detection, both @detect and @address_data must
+ * For automatic device detection, both @detect and @address_list must
  * be defined. @class should also be set, otherwise only devices forced
  * with module parameters will be created. The detect function must
  * fill at least the name field of the i2c_board_info structure it is
@@ -503,125 +501,4 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
                         i2c_del_driver)
 
 #endif /* I2C */
-#endif /* __KERNEL__ */
-
-/**
- * struct i2c_msg - an I2C transaction segment beginning with START
- * @addr: Slave address, either seven or ten bits.  When this is a ten
- *      bit address, I2C_M_TEN must be set in @flags and the adapter
- *      must support I2C_FUNC_10BIT_ADDR.
- * @flags: I2C_M_RD is handled by all adapters.  No other flags may be
- *      provided unless the adapter exported the relevant I2C_FUNC_*
- *      flags through i2c_check_functionality().
- * @len: Number of data bytes in @buf being read from or written to the
- *      I2C slave address.  For read transactions where I2C_M_RECV_LEN
- *      is set, the caller guarantees that this buffer can hold up to
- *      32 bytes in addition to the initial length byte sent by the
- *      slave (plus, if used, the SMBus PEC); and this value will be
- *      incremented by the number of block data bytes received.
- * @buf: The buffer into which data is read, or from which it's written.
- *
- * An i2c_msg is the low level representation of one segment of an I2C
- * transaction.  It is visible to drivers in the @i2c_transfer() procedure,
- * to userspace from i2c-dev, and to I2C adapter drivers through the
- * @i2c_adapter.@master_xfer() method.
- *
- * Except when I2C "protocol mangling" is used, all I2C adapters implement
- * the standard rules for I2C transactions.  Each transaction begins with a
- * START.  That is followed by the slave address, and a bit encoding read
- * versus write.  Then follow all the data bytes, possibly including a byte
- * with SMBus PEC.  The transfer terminates with a NAK, or when all those
- * bytes have been transferred and ACKed.  If this is the last message in a
- * group, it is followed by a STOP.  Otherwise it is followed by the next
- * @i2c_msg transaction segment, beginning with a (repeated) START.
- *
- * Alternatively, when the adapter supports I2C_FUNC_PROTOCOL_MANGLING then
- * passing certain @flags may have changed those standard protocol behaviors.
- * Those flags are only for use with broken/nonconforming slaves, and with
- * adapters which are known to support the specific mangling options they
- * need (one or more of IGNORE_NAK, NO_RD_ACK, NOSTART, and REV_DIR_ADDR).
- */
-struct i2c_msg {
-        __u16 addr;     /* slave address                        */
-        __u16 flags;
-#define I2C_M_TEN               0x0010  /* this is a ten bit chip address */
-#define I2C_M_RD                0x0001  /* read data, from slave to master */
-#define I2C_M_STOP              0x8000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_NOSTART           0x4000  /* if I2C_FUNC_NOSTART */
-#define I2C_M_REV_DIR_ADDR      0x2000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_IGNORE_NAK        0x1000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_NO_RD_ACK         0x0800  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_RECV_LEN          0x0400  /* length will be first received byte */
-        __u16 len;              /* msg length                           */
-        __u8 *buf;              /* pointer to msg data                  */
-};
-
-/* To determine what functionality is present */
-
-#define I2C_FUNC_I2C                    0x00000001
-#define I2C_FUNC_10BIT_ADDR             0x00000002
-#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_IGNORE_NAK etc. */
-#define I2C_FUNC_SMBUS_PEC              0x00000008
-#define I2C_FUNC_NOSTART                0x00000010 /* I2C_M_NOSTART */
-#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_QUICK            0x00010000
-#define I2C_FUNC_SMBUS_READ_BYTE        0x00020000
-#define I2C_FUNC_SMBUS_WRITE_BYTE       0x00040000
-#define I2C_FUNC_SMBUS_READ_BYTE_DATA   0x00080000
-#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA  0x00100000
-#define I2C_FUNC_SMBUS_READ_WORD_DATA   0x00200000
-#define I2C_FUNC_SMBUS_WRITE_WORD_DATA  0x00400000
-#define I2C_FUNC_SMBUS_PROC_CALL        0x00800000
-#define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000
-#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
-#define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* I2C-like block xfer  */
-#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* w/ 1-byte reg. addr. */
-
-#define I2C_FUNC_SMBUS_BYTE             (I2C_FUNC_SMBUS_READ_BYTE | \
-                                         I2C_FUNC_SMBUS_WRITE_BYTE)
-#define I2C_FUNC_SMBUS_BYTE_DATA        (I2C_FUNC_SMBUS_READ_BYTE_DATA | \
-                                         I2C_FUNC_SMBUS_WRITE_BYTE_DATA)
-#define I2C_FUNC_SMBUS_WORD_DATA        (I2C_FUNC_SMBUS_READ_WORD_DATA | \
-                                         I2C_FUNC_SMBUS_WRITE_WORD_DATA)
-#define I2C_FUNC_SMBUS_BLOCK_DATA       (I2C_FUNC_SMBUS_READ_BLOCK_DATA | \
-                                         I2C_FUNC_SMBUS_WRITE_BLOCK_DATA)
-#define I2C_FUNC_SMBUS_I2C_BLOCK        (I2C_FUNC_SMBUS_READ_I2C_BLOCK | \
-                                         I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)
-
-#define I2C_FUNC_SMBUS_EMUL             (I2C_FUNC_SMBUS_QUICK | \
-                                         I2C_FUNC_SMBUS_BYTE | \
-                                         I2C_FUNC_SMBUS_BYTE_DATA | \
-                                         I2C_FUNC_SMBUS_WORD_DATA | \
-                                         I2C_FUNC_SMBUS_PROC_CALL | \
-                                         I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
-                                         I2C_FUNC_SMBUS_I2C_BLOCK | \
-                                         I2C_FUNC_SMBUS_PEC)
-
-/*
- * Data for SMBus Messages
- */
-#define I2C_SMBUS_BLOCK_MAX     32      /* As specified in SMBus standard */
-union i2c_smbus_data {
-        __u8 byte;
-        __u16 word;
-        __u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */
-                               /* and one more for user-space compatibility */
-};
-
-/* i2c_smbus_xfer read or write markers */
-#define I2C_SMBUS_READ  1
-#define I2C_SMBUS_WRITE 0
-
-/* SMBus transaction types (size parameter in the above functions)
-   Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */
-#define I2C_SMBUS_QUICK             0
-#define I2C_SMBUS_BYTE              1
-#define I2C_SMBUS_BYTE_DATA         2
-#define I2C_SMBUS_WORD_DATA         3
-#define I2C_SMBUS_PROC_CALL         4
-#define I2C_SMBUS_BLOCK_DATA        5
-#define I2C_SMBUS_I2C_BLOCK_BROKEN  6
-#define I2C_SMBUS_BLOCK_PROC_CALL   7           /* SMBus 2.0 */
-#define I2C_SMBUS_I2C_BLOCK_DATA    8
-
 #endif /* _LINUX_I2C_H */
diff --git a/include/linux/i2c/i2c-rcar.h b/include/linux/i2c/i2c-rcar.h
new file mode 100644
index 000000000000..496f5c2b23c9
--- /dev/null
+++ b/include/linux/i2c/i2c-rcar.h
@@ -0,0 +1,10 @@
+#ifndef __I2C_R_CAR_H__
+#define __I2C_R_CAR_H__
+
+#include <linux/platform_device.h>
+
+struct i2c_rcar_platform_data {
+        u32 bus_speed;
+};
+
+#endif /* __I2C_R_CAR_H__ */
diff --git a/include/linux/i2c/pca954x.h b/include/linux/i2c/pca954x.h
index 28f1f8d5ab1f..1712677d5904 100644
--- a/include/linux/i2c/pca954x.h
+++ b/include/linux/i2c/pca954x.h
@@ -36,6 +36,7 @@
 struct pca954x_platform_mode {
         int             adap_id;
         unsigned int    deselect_on_exit:1;
+        unsigned int    class;
 };
 
 /* Per mux/switch data, used with i2c_register_board_info */
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index a12a38107c1a..9a5e28462324 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -188,6 +188,7 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 int twl_get_type(void);
 int twl_get_version(void);
+int twl_get_hfclk_rate(void);
 
 int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
 int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
@@ -663,7 +664,7 @@ struct twl4030_codec_data {
         unsigned int check_defaults:1;
         unsigned int reset_registers:1;
         unsigned int hs_extmute:1;
-        void (*set_hs_extmute)(int mute);
+        int hs_extmute_gpio;
 };
 
 struct twl4030_vibra_data {
diff --git a/include/linux/icmp.h b/include/linux/icmp.h
index 474f2a51cf0a..efc18490627a 100644
--- a/include/linux/icmp.h
+++ b/include/linux/icmp.h
@@ -17,89 +17,11 @@
 #ifndef _LINUX_ICMP_H
 #define _LINUX_ICMP_H
 
-#include <linux/types.h>
-
-#define ICMP_ECHOREPLY          0       /* Echo Reply                   */
-#define ICMP_DEST_UNREACH       3       /* Destination Unreachable      */
-#define ICMP_SOURCE_QUENCH      4       /* Source Quench                */
-#define ICMP_REDIRECT           5       /* Redirect (change route)      */
-#define ICMP_ECHO               8       /* Echo Request                 */
-#define ICMP_TIME_EXCEEDED      11      /* Time Exceeded                */
-#define ICMP_PARAMETERPROB      12      /* Parameter Problem            */
-#define ICMP_TIMESTAMP          13      /* Timestamp Request            */
-#define ICMP_TIMESTAMPREPLY     14      /* Timestamp Reply              */
-#define ICMP_INFO_REQUEST       15      /* Information Request          */
-#define ICMP_INFO_REPLY         16      /* Information Reply            */
-#define ICMP_ADDRESS            17      /* Address Mask Request         */
-#define ICMP_ADDRESSREPLY       18      /* Address Mask Reply           */
-#define NR_ICMP_TYPES           18
-
-
-/* Codes for UNREACH. */
-#define ICMP_NET_UNREACH        0       /* Network Unreachable          */
-#define ICMP_HOST_UNREACH       1       /* Host Unreachable             */
-#define ICMP_PROT_UNREACH       2       /* Protocol Unreachable         */
-#define ICMP_PORT_UNREACH       3       /* Port Unreachable             */
-#define ICMP_FRAG_NEEDED        4       /* Fragmentation Needed/DF set  */
-#define ICMP_SR_FAILED          5       /* Source Route failed          */
-#define ICMP_NET_UNKNOWN        6
-#define ICMP_HOST_UNKNOWN       7
-#define ICMP_HOST_ISOLATED      8
-#define ICMP_NET_ANO            9
-#define ICMP_HOST_ANO           10
-#define ICMP_NET_UNR_TOS        11
-#define ICMP_HOST_UNR_TOS       12
-#define ICMP_PKT_FILTERED       13      /* Packet filtered */
-#define ICMP_PREC_VIOLATION     14      /* Precedence violation */
-#define ICMP_PREC_CUTOFF        15      /* Precedence cut off */
-#define NR_ICMP_UNREACH         15      /* instead of hardcoding immediate value */
-
-/* Codes for REDIRECT. */
-#define ICMP_REDIR_NET          0       /* Redirect Net                 */
-#define ICMP_REDIR_HOST         1       /* Redirect Host                */
-#define ICMP_REDIR_NETTOS       2       /* Redirect Net for TOS         */
-#define ICMP_REDIR_HOSTTOS      3       /* Redirect Host for TOS        */
-
-/* Codes for TIME_EXCEEDED. */
-#define ICMP_EXC_TTL            0       /* TTL count exceeded           */
-#define ICMP_EXC_FRAGTIME       1       /* Fragment Reass time exceeded */
-
-
-struct icmphdr {
-  __u8          type;
-  __u8          code;
-  __sum16       checksum;
-  union {
-        struct {
-                __be16  id;
-                __be16  sequence;
-        } echo;
-        __be32  gateway;
-        struct {
-                __be16  __unused;
-                __be16  mtu;
-        } frag;
-  } un;
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/icmp.h>
 
 static inline struct icmphdr *icmp_hdr(const struct sk_buff *skb)
 {
         return (struct icmphdr *)skb_transport_header(skb);
 }
-#endif
-
-/*
- *      constants for (set|get)sockopt
- */
-
-#define ICMP_FILTER                     1
-
-struct icmp_filter {
-        __u32           data;
-};
-
-
 #endif  /* _LINUX_ICMP_H */
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index ba45e6bc0764..b4f6c29caced 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -1,174 +1,13 @@
 #ifndef _LINUX_ICMPV6_H
 #define _LINUX_ICMPV6_H
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-struct icmp6hdr {
-
-        __u8            icmp6_type;
-        __u8            icmp6_code;
-        __sum16         icmp6_cksum;
-
-
-        union {
-                __be32                  un_data32[1];
-                __be16                  un_data16[2];
-                __u8                    un_data8[4];
-
-                struct icmpv6_echo {
-                        __be16          identifier;
-                        __be16          sequence;
-                } u_echo;
-
-                struct icmpv6_nd_advt {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                        __u32           reserved:5,
-                                        override:1,
-                                        solicited:1,
-                                        router:1,
-                                        reserved2:24;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                        __u32           router:1,
-                                        solicited:1,
-                                        override:1,
-                                        reserved:29;
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif                                          
-                } u_nd_advt;
-
-                struct icmpv6_nd_ra {
-                        __u8            hop_limit;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                        __u8            reserved:3,
-                                        router_pref:2,
-                                        home_agent:1,
-                                        other:1,
-                                        managed:1;
-
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                        __u8            managed:1,
-                                        other:1,
-                                        home_agent:1,
-                                        router_pref:2,
-                                        reserved:3;
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif
-                        __be16          rt_lifetime;
-                } u_nd_ra;
-
-        } icmp6_dataun;
-
-#define icmp6_identifier        icmp6_dataun.u_echo.identifier
-#define icmp6_sequence          icmp6_dataun.u_echo.sequence
-#define icmp6_pointer           icmp6_dataun.un_data32[0]
-#define icmp6_mtu               icmp6_dataun.un_data32[0]
-#define icmp6_unused            icmp6_dataun.un_data32[0]
-#define icmp6_maxdelay          icmp6_dataun.un_data16[0]
-#define icmp6_router            icmp6_dataun.u_nd_advt.router
-#define icmp6_solicited         icmp6_dataun.u_nd_advt.solicited
-#define icmp6_override          icmp6_dataun.u_nd_advt.override
-#define icmp6_ndiscreserved     icmp6_dataun.u_nd_advt.reserved
-#define icmp6_hop_limit         icmp6_dataun.u_nd_ra.hop_limit
-#define icmp6_addrconf_managed  icmp6_dataun.u_nd_ra.managed
-#define icmp6_addrconf_other    icmp6_dataun.u_nd_ra.other
-#define icmp6_rt_lifetime       icmp6_dataun.u_nd_ra.rt_lifetime
-#define icmp6_router_pref       icmp6_dataun.u_nd_ra.router_pref
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/icmpv6.h>
 
 static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb)
 {
         return (struct icmp6hdr *)skb_transport_header(skb);
 }
-#endif
-
-#define ICMPV6_ROUTER_PREF_LOW          0x3
-#define ICMPV6_ROUTER_PREF_MEDIUM       0x0
-#define ICMPV6_ROUTER_PREF_HIGH         0x1
-#define ICMPV6_ROUTER_PREF_INVALID      0x2
-
-#define ICMPV6_DEST_UNREACH             1
-#define ICMPV6_PKT_TOOBIG               2
-#define ICMPV6_TIME_EXCEED              3
-#define ICMPV6_PARAMPROB                4
-
-#define ICMPV6_INFOMSG_MASK             0x80
-
-#define ICMPV6_ECHO_REQUEST             128
-#define ICMPV6_ECHO_REPLY               129
-#define ICMPV6_MGM_QUERY                130
-#define ICMPV6_MGM_REPORT               131
-#define ICMPV6_MGM_REDUCTION            132
-
-#define ICMPV6_NI_QUERY                 139
-#define ICMPV6_NI_REPLY                 140
-
-#define ICMPV6_MLD2_REPORT              143
-
-#define ICMPV6_DHAAD_REQUEST            144
-#define ICMPV6_DHAAD_REPLY              145
-#define ICMPV6_MOBILE_PREFIX_SOL        146
-#define ICMPV6_MOBILE_PREFIX_ADV        147
-
-/*
- *      Codes for Destination Unreachable
- */
-#define ICMPV6_NOROUTE                  0
-#define ICMPV6_ADM_PROHIBITED           1
-#define ICMPV6_NOT_NEIGHBOUR            2
-#define ICMPV6_ADDR_UNREACH             3
-#define ICMPV6_PORT_UNREACH             4
-
-/*
- *      Codes for Time Exceeded
- */
-#define ICMPV6_EXC_HOPLIMIT             0
-#define ICMPV6_EXC_FRAGTIME             1
-
-/*
- *      Codes for Parameter Problem
- */
-#define ICMPV6_HDR_FIELD                0
-#define ICMPV6_UNK_NEXTHDR              1
-#define ICMPV6_UNK_OPTION               2
-
-/*
- *      constants for (set|get)sockopt
- */
-
-#define ICMPV6_FILTER                   1
-
-/*
- *      ICMPV6 filter
- */
-
-#define ICMPV6_FILTER_BLOCK             1
-#define ICMPV6_FILTER_PASS              2
-#define ICMPV6_FILTER_BLOCKOTHERS       3
-#define ICMPV6_FILTER_PASSONLY          4
-
-struct icmp6_filter {
-        __u32           data[8];
-};
-
-/*
- *      Definitions for MLDv2
- */
-#define MLD2_MODE_IS_INCLUDE    1
-#define MLD2_MODE_IS_EXCLUDE    2
-#define MLD2_CHANGE_TO_INCLUDE  3
-#define MLD2_CHANGE_TO_EXCLUDE  4
-#define MLD2_ALLOW_NEW_SOURCES  5
-#define MLD2_BLOCK_OLD_SOURCES  6
-
-#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } }
-
-#ifdef __KERNEL__
 
 #include <linux/netdevice.h>
 
@@ -192,5 +31,3 @@ extern void				icmpv6_flow_init(struct sock *sk,
                                                          const struct in6_addr *daddr,
                                                          int oif);
 #endif
-
-#endif
diff --git a/include/linux/idr.h b/include/linux/idr.h
index 255491cf522e..87259a44c251 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -38,15 +38,15 @@
 #define IDR_SIZE (1 << IDR_BITS)
 #define IDR_MASK ((1 << IDR_BITS)-1)
 
-#define MAX_ID_SHIFT (sizeof(int)*8 - 1)
-#define MAX_ID_BIT (1U << MAX_ID_SHIFT)
-#define MAX_ID_MASK (MAX_ID_BIT - 1)
+#define MAX_IDR_SHIFT (sizeof(int)*8 - 1)
+#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
+#define MAX_IDR_MASK (MAX_IDR_BIT - 1)
 
 /* Leave the possibility of an incomplete final layer */
-#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
+#define MAX_IDR_LEVEL ((MAX_IDR_SHIFT + IDR_BITS - 1) / IDR_BITS)
 
 /* Number of id_layer structs to leave in free list */
-#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
+#define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)
 
 struct idr_layer {
         unsigned long            bitmap; /* A zero bit means "space here" */
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 9adcc29f084a..89b4614a4722 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -23,140 +23,8 @@
 #ifndef _LINUX_IF_ARP_H
 #define _LINUX_IF_ARP_H
 
-#include <linux/netdevice.h>
-
-/* ARP protocol HARDWARE identifiers. */
-#define ARPHRD_NETROM   0               /* from KA9Q: NET/ROM pseudo    */
-#define ARPHRD_ETHER    1               /* Ethernet 10Mbps              */
-#define ARPHRD_EETHER   2               /* Experimental Ethernet        */
-#define ARPHRD_AX25     3               /* AX.25 Level 2                */
-#define ARPHRD_PRONET   4               /* PROnet token ring            */
-#define ARPHRD_CHAOS    5               /* Chaosnet                     */
-#define ARPHRD_IEEE802  6               /* IEEE 802.2 Ethernet/TR/TB    */
-#define ARPHRD_ARCNET   7               /* ARCnet                       */
-#define ARPHRD_APPLETLK 8               /* APPLEtalk                    */
-#define ARPHRD_DLCI     15              /* Frame Relay DLCI             */
-#define ARPHRD_ATM      19              /* ATM                          */
-#define ARPHRD_METRICOM 23              /* Metricom STRIP (new IANA id) */
-#define ARPHRD_IEEE1394 24              /* IEEE 1394 IPv4 - RFC 2734    */
-#define ARPHRD_EUI64    27              /* EUI-64                       */
-#define ARPHRD_INFINIBAND 32            /* InfiniBand                   */
-
-/* Dummy types for non ARP hardware */
-#define ARPHRD_SLIP     256
-#define ARPHRD_CSLIP    257
-#define ARPHRD_SLIP6    258
-#define ARPHRD_CSLIP6   259
-#define ARPHRD_RSRVD    260             /* Notional KISS type           */
-#define ARPHRD_ADAPT    264
-#define ARPHRD_ROSE     270
-#define ARPHRD_X25      271             /* CCITT X.25                   */
-#define ARPHRD_HWX25    272             /* Boards with X.25 in firmware */
-#define ARPHRD_CAN      280             /* Controller Area Network      */
-#define ARPHRD_PPP      512
-#define ARPHRD_CISCO    513             /* Cisco HDLC                   */
-#define ARPHRD_HDLC     ARPHRD_CISCO
-#define ARPHRD_LAPB     516             /* LAPB                         */
-#define ARPHRD_DDCMP    517             /* Digital's DDCMP protocol     */
-#define ARPHRD_RAWHDLC  518             /* Raw HDLC                     */
-
-#define ARPHRD_TUNNEL   768             /* IPIP tunnel                  */
-#define ARPHRD_TUNNEL6  769             /* IP6IP6 tunnel                */
-#define ARPHRD_FRAD     770             /* Frame Relay Access Device    */
-#define ARPHRD_SKIP     771             /* SKIP vif                     */
-#define ARPHRD_LOOPBACK 772             /* Loopback device              */
-#define ARPHRD_LOCALTLK 773             /* Localtalk device             */
-#define ARPHRD_FDDI     774             /* Fiber Distributed Data Interface */
-#define ARPHRD_BIF      775             /* AP1000 BIF                   */
-#define ARPHRD_SIT      776             /* sit0 device - IPv6-in-IPv4   */
-#define ARPHRD_IPDDP    777             /* IP over DDP tunneller        */
-#define ARPHRD_IPGRE    778             /* GRE over IP                  */
-#define ARPHRD_PIMREG   779             /* PIMSM register interface     */
-#define ARPHRD_HIPPI    780             /* High Performance Parallel Interface */
-#define ARPHRD_ASH      781             /* Nexus 64Mbps Ash             */
-#define ARPHRD_ECONET   782             /* Acorn Econet                 */
-#define ARPHRD_IRDA     783             /* Linux-IrDA                   */
-/* ARP works differently on different FC media .. so  */
-#define ARPHRD_FCPP     784             /* Point to point fibrechannel  */
-#define ARPHRD_FCAL     785             /* Fibrechannel arbitrated loop */
-#define ARPHRD_FCPL     786             /* Fibrechannel public loop     */
-#define ARPHRD_FCFABRIC 787             /* Fibrechannel fabric          */
-        /* 787->799 reserved for fibrechannel media types */
-#define ARPHRD_IEEE802_TR 800           /* Magic type ident for TR      */
-#define ARPHRD_IEEE80211 801            /* IEEE 802.11                  */
-#define ARPHRD_IEEE80211_PRISM 802      /* IEEE 802.11 + Prism2 header  */
-#define ARPHRD_IEEE80211_RADIOTAP 803   /* IEEE 802.11 + radiotap header */
-#define ARPHRD_IEEE802154         804
-#define ARPHRD_IEEE802154_MONITOR 805   /* IEEE 802.15.4 network monitor */
-
-#define ARPHRD_PHONET   820             /* PhoNet media type            */
-#define ARPHRD_PHONET_PIPE 821          /* PhoNet pipe header           */
-#define ARPHRD_CAIF     822             /* CAIF media type              */
-#define ARPHRD_IP6GRE   823             /* GRE over IPv6                */
-
-#define ARPHRD_VOID       0xFFFF        /* Void type, nothing is known */
-#define ARPHRD_NONE       0xFFFE        /* zero header length */
-
-/* ARP protocol opcodes. */
-#define ARPOP_REQUEST   1               /* ARP request                  */
-#define ARPOP_REPLY     2               /* ARP reply                    */
-#define ARPOP_RREQUEST  3               /* RARP request                 */
-#define ARPOP_RREPLY    4               /* RARP reply                   */
-#define ARPOP_InREQUEST 8               /* InARP request                */
-#define ARPOP_InREPLY   9               /* InARP reply                  */
-#define ARPOP_NAK       10              /* (ATM)ARP NAK                 */
-
-
-/* ARP ioctl request. */
-struct arpreq {
-  struct sockaddr       arp_pa;         /* protocol address             */
-  struct sockaddr       arp_ha;         /* hardware address             */
-  int                   arp_flags;      /* flags                        */
-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-  char                  arp_dev[16];
-};
-
-struct arpreq_old {
-  struct sockaddr       arp_pa;         /* protocol address             */
-  struct sockaddr       arp_ha;         /* hardware address             */
-  int                   arp_flags;      /* flags                        */
-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-};
-
-/* ARP Flag values. */
-#define ATF_COM         0x02            /* completed entry (ha valid)   */
-#define ATF_PERM        0x04            /* permanent entry              */
-#define ATF_PUBL        0x08            /* publish entry                */
-#define ATF_USETRAILERS 0x10            /* has requested trailers       */
-#define ATF_NETMASK     0x20            /* want to use a netmask (only
-                                           for proxy entries) */
-#define ATF_DONTPUB     0x40            /* don't answer this addresses  */
-
-/*
- *      This structure defines an ethernet arp header.
- */
-
-struct arphdr {
-        __be16          ar_hrd;         /* format of hardware address   */
-        __be16          ar_pro;         /* format of protocol address   */
-        unsigned char   ar_hln;         /* length of hardware address   */
-        unsigned char   ar_pln;         /* length of protocol address   */
-        __be16          ar_op;          /* ARP opcode (command)         */
-
-#if 0
-         /*
-          *      Ethernet looks like this : This bit is variable sized however...
-          */
-        unsigned char           ar_sha[ETH_ALEN];       /* sender hardware address      */
-        unsigned char           ar_sip[4];              /* sender IP address            */
-        unsigned char           ar_tha[ETH_ALEN];       /* target hardware address      */
-        unsigned char           ar_tip[4];              /* target IP address            */
-#endif
-
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/if_arp.h>
 
 static inline struct arphdr *arp_hdr(const struct sk_buff *skb)
 {
@@ -168,6 +36,4 @@ static inline int arp_hdr_len(struct net_device *dev)
         /* ARP header, plus 2 device addresses, plus 2 IP addresses. */
         return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2;
 }
-#endif
-
 #endif  /* _LINUX_IF_ARP_H */
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index dd3f20139640..1085ffeef956 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -9,97 +9,12 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IF_BRIDGE_H
 #define _LINUX_IF_BRIDGE_H
 
-#include <linux/types.h>
-
-#define SYSFS_BRIDGE_ATTR       "bridge"
-#define SYSFS_BRIDGE_FDB        "brforward"
-#define SYSFS_BRIDGE_PORT_SUBDIR "brif"
-#define SYSFS_BRIDGE_PORT_ATTR  "brport"
-#define SYSFS_BRIDGE_PORT_LINK  "bridge"
-
-#define BRCTL_VERSION 1
-
-#define BRCTL_GET_VERSION 0
-#define BRCTL_GET_BRIDGES 1
-#define BRCTL_ADD_BRIDGE 2
-#define BRCTL_DEL_BRIDGE 3
-#define BRCTL_ADD_IF 4
-#define BRCTL_DEL_IF 5
-#define BRCTL_GET_BRIDGE_INFO 6
-#define BRCTL_GET_PORT_LIST 7
-#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
-#define BRCTL_SET_BRIDGE_HELLO_TIME 9
-#define BRCTL_SET_BRIDGE_MAX_AGE 10
-#define BRCTL_SET_AGEING_TIME 11
-#define BRCTL_SET_GC_INTERVAL 12
-#define BRCTL_GET_PORT_INFO 13
-#define BRCTL_SET_BRIDGE_STP_STATE 14
-#define BRCTL_SET_BRIDGE_PRIORITY 15
-#define BRCTL_SET_PORT_PRIORITY 16
-#define BRCTL_SET_PATH_COST 17
-#define BRCTL_GET_FDB_ENTRIES 18
-
-#define BR_STATE_DISABLED 0
-#define BR_STATE_LISTENING 1
-#define BR_STATE_LEARNING 2
-#define BR_STATE_FORWARDING 3
-#define BR_STATE_BLOCKING 4
-
-struct __bridge_info {
-        __u64 designated_root;
-        __u64 bridge_id;
-        __u32 root_path_cost;
-        __u32 max_age;
-        __u32 hello_time;
-        __u32 forward_delay;
-        __u32 bridge_max_age;
-        __u32 bridge_hello_time;
-        __u32 bridge_forward_delay;
-        __u8 topology_change;
-        __u8 topology_change_detected;
-        __u8 root_port;
-        __u8 stp_enabled;
-        __u32 ageing_time;
-        __u32 gc_interval;
-        __u32 hello_timer_value;
-        __u32 tcn_timer_value;
-        __u32 topology_change_timer_value;
-        __u32 gc_timer_value;
-};
-
-struct __port_info {
-        __u64 designated_root;
-        __u64 designated_bridge;
-        __u16 port_id;
-        __u16 designated_port;
-        __u32 path_cost;
-        __u32 designated_cost;
-        __u8 state;
-        __u8 top_change_ack;
-        __u8 config_pending;
-        __u8 unused0;
-        __u32 message_age_timer_value;
-        __u32 forward_delay_timer_value;
-        __u32 hold_timer_value;
-};
-
-struct __fdb_entry {
-        __u8 mac_addr[6];
-        __u8 port_no;
-        __u8 is_local;
-        __u32 ageing_timer_value;
-        __u8 port_hi;
-        __u8 pad0;
-        __u16 unused;
-};
-
-#ifdef __KERNEL__
 
 #include <linux/netdevice.h>
+#include <uapi/linux/if_bridge.h>
 
 extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
 
@@ -107,5 +22,3 @@ typedef int br_should_route_hook_t(struct sk_buff *skb);
 extern br_should_route_hook_t __rcu *br_should_route_hook;
 
 #endif
-
-#endif
diff --git a/include/linux/if_eql.h b/include/linux/if_eql.h
index 18a5d02a8644..d984694c384d 100644
--- a/include/linux/if_eql.h
+++ b/include/linux/if_eql.h
@@ -15,28 +15,13 @@
  *    McLean VA 22101
  *    Phone: 1-703-847-0040 ext 103
  */
-
 #ifndef _LINUX_IF_EQL_H
 #define _LINUX_IF_EQL_H
 
-#define EQL_DEFAULT_SLAVE_PRIORITY 28800
-#define EQL_DEFAULT_MAX_SLAVES     4
-#define EQL_DEFAULT_MTU            576
-#define EQL_DEFAULT_RESCHED_IVAL   HZ
-
-#define EQL_ENSLAVE     (SIOCDEVPRIVATE)
-#define EQL_EMANCIPATE  (SIOCDEVPRIVATE + 1)
-
-#define EQL_GETSLAVECFG (SIOCDEVPRIVATE + 2)
-#define EQL_SETSLAVECFG (SIOCDEVPRIVATE + 3)
-
-#define EQL_GETMASTRCFG (SIOCDEVPRIVATE + 4)
-#define EQL_SETMASTRCFG (SIOCDEVPRIVATE + 5)
-
-#ifdef __KERNEL__
 
 #include <linux/timer.h>
 #include <linux/spinlock.h>
+#include <uapi/linux/if_eql.h>
 
 typedef struct slave {
         struct list_head        list;
@@ -61,23 +46,4 @@ typedef struct equalizer {
         struct timer_list       timer;
 } equalizer_t;  
 
-#endif /* __KERNEL__ */
-
-typedef struct master_config {
-        char    master_name[16];
-        int     max_slaves;
-        int     min_slaves;
-} master_config_t;
-
-typedef struct slave_config {
-        char    slave_name[16];
-        long    priority;
-} slave_config_t;
-
-typedef struct slaving_request {
-        char    slave_name[16];
-        long    priority;
-} slaving_request_t;
-
-
 #endif /* _LINUX_EQL_H */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 167ce5b363d2..12b4d55a02af 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -17,122 +17,11 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IF_ETHER_H
 #define _LINUX_IF_ETHER_H
 
-#include <linux/types.h>
-
-/*
- *      IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
- *      and FCS/CRC (frame check sequence).
- */
-
-#define ETH_ALEN        6               /* Octets in one ethernet addr   */
-#define ETH_HLEN        14              /* Total octets in header.       */
-#define ETH_ZLEN        60              /* Min. octets in frame sans FCS */
-#define ETH_DATA_LEN    1500            /* Max. octets in payload        */
-#define ETH_FRAME_LEN   1514            /* Max. octets in frame sans FCS */
-#define ETH_FCS_LEN     4               /* Octets in the FCS             */
-
-/*
- *      These are the defined Ethernet Protocol ID's.
- */
-
-#define ETH_P_LOOP      0x0060          /* Ethernet Loopback packet     */
-#define ETH_P_PUP       0x0200          /* Xerox PUP packet             */
-#define ETH_P_PUPAT     0x0201          /* Xerox PUP Addr Trans packet  */
-#define ETH_P_IP        0x0800          /* Internet Protocol packet     */
-#define ETH_P_X25       0x0805          /* CCITT X.25                   */
-#define ETH_P_ARP       0x0806          /* Address Resolution packet    */
-#define ETH_P_BPQ       0x08FF          /* G8BPQ AX.25 Ethernet Packet  [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_IEEEPUP   0x0a00          /* Xerox IEEE802.3 PUP packet */
-#define ETH_P_IEEEPUPAT 0x0a01          /* Xerox IEEE802.3 PUP Addr Trans packet */
-#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
-#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
-#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
-#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
-#define ETH_P_LAT       0x6004          /* DEC LAT                      */
-#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
-#define ETH_P_CUST      0x6006          /* DEC Customer use             */
-#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
-#define ETH_P_TEB       0x6558          /* Trans Ether Bridging         */
-#define ETH_P_RARP      0x8035          /* Reverse Addr Res packet      */
-#define ETH_P_ATALK     0x809B          /* Appletalk DDP                */
-#define ETH_P_AARP      0x80F3          /* Appletalk AARP               */
-#define ETH_P_8021Q     0x8100          /* 802.1Q VLAN Extended Header  */
-#define ETH_P_IPX       0x8137          /* IPX over DIX                 */
-#define ETH_P_IPV6      0x86DD          /* IPv6 over bluebook           */
-#define ETH_P_PAUSE     0x8808          /* IEEE Pause frames. See 802.3 31B */
-#define ETH_P_SLOW      0x8809          /* Slow Protocol. See 802.3ad 43B */
-#define ETH_P_WCCP      0x883E          /* Web-cache coordination protocol
-                                         * defined in draft-wilson-wrec-wccp-v2-00.txt */
-#define ETH_P_PPP_DISC  0x8863          /* PPPoE discovery messages     */
-#define ETH_P_PPP_SES   0x8864          /* PPPoE session messages       */
-#define ETH_P_MPLS_UC   0x8847          /* MPLS Unicast traffic         */
-#define ETH_P_MPLS_MC   0x8848          /* MPLS Multicast traffic       */
-#define ETH_P_ATMMPOA   0x884c          /* MultiProtocol Over ATM       */
-#define ETH_P_LINK_CTL  0x886c          /* HPNA, wlan link local tunnel */
-#define ETH_P_ATMFATE   0x8884          /* Frame-based ATM Transport
-                                         * over Ethernet
-                                         */
-#define ETH_P_PAE       0x888E          /* Port Access Entity (IEEE 802.1X) */
-#define ETH_P_AOE       0x88A2          /* ATA over Ethernet            */
-#define ETH_P_8021AD    0x88A8          /* 802.1ad Service VLAN         */
-#define ETH_P_802_EX1   0x88B5          /* 802.1 Local Experimental 1.  */
-#define ETH_P_TIPC      0x88CA          /* TIPC                         */
-#define ETH_P_8021AH    0x88E7          /* 802.1ah Backbone Service Tag */
-#define ETH_P_1588      0x88F7          /* IEEE 1588 Timesync */
-#define ETH_P_FCOE      0x8906          /* Fibre Channel over Ethernet  */
-#define ETH_P_TDLS      0x890D          /* TDLS */
-#define ETH_P_FIP       0x8914          /* FCoE Initialization Protocol */
-#define ETH_P_QINQ1     0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_QINQ2     0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_QINQ3     0x9300          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_EDSA      0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_AF_IUCV   0xFBFB          /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
-
-/*
- *      Non DIX types. Won't clash for 1500 types.
- */
-
-#define ETH_P_802_3     0x0001          /* Dummy type for 802.3 frames  */
-#define ETH_P_AX25      0x0002          /* Dummy protocol id for AX.25  */
-#define ETH_P_ALL       0x0003          /* Every packet (be careful!!!) */
-#define ETH_P_802_2     0x0004          /* 802.2 frames                 */
-#define ETH_P_SNAP      0x0005          /* Internal only                */
-#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
-#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
-#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
-#define ETH_P_LOCALTALK 0x0009          /* Localtalk pseudo type        */
-#define ETH_P_CAN       0x000C          /* CAN: Controller Area Network */
-#define ETH_P_CANFD     0x000D          /* CANFD: CAN flexible data rate*/
-#define ETH_P_PPPTALK   0x0010          /* Dummy type for Atalk over PPP*/
-#define ETH_P_TR_802_2  0x0011          /* 802.2 frames                 */
-#define ETH_P_MOBITEX   0x0015          /* Mobitex (kaz@cafe.net)       */
-#define ETH_P_CONTROL   0x0016          /* Card specific control frames */
-#define ETH_P_IRDA      0x0017          /* Linux-IrDA                   */
-#define ETH_P_ECONET    0x0018          /* Acorn Econet                 */
-#define ETH_P_HDLC      0x0019          /* HDLC frames                  */
-#define ETH_P_ARCNET    0x001A          /* 1A for ArcNet :-)            */
-#define ETH_P_DSA       0x001B          /* Distributed Switch Arch.     */
-#define ETH_P_TRAILER   0x001C          /* Trailer switch tagging       */
-#define ETH_P_PHONET    0x00F5          /* Nokia Phonet frames          */
-#define ETH_P_IEEE802154 0x00F6         /* IEEE802.15.4 frame           */
-#define ETH_P_CAIF      0x00F7          /* ST-Ericsson CAIF protocol    */
-
-/*
- *      This is an Ethernet frame header.
- */
-
-struct ethhdr {
-        unsigned char   h_dest[ETH_ALEN];       /* destination eth addr */
-        unsigned char   h_source[ETH_ALEN];     /* source ether addr    */
-        __be16          h_proto;                /* packet type ID field */
-} __attribute__((packed));
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/if_ether.h>
 
 static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
 {
@@ -144,6 +33,4 @@ int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
 int mac_pton(const char *s, u8 *mac);
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
-#endif
-
 #endif  /* _LINUX_IF_ETHER_H */
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index e6dc11e7f9a5..f5550b3eeeab 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -24,84 +24,8 @@
 #ifndef _LINUX_IF_FDDI_H
 #define _LINUX_IF_FDDI_H
 
-#include <linux/types.h>
-
-/*
- *  Define max and min legal sizes.  The frame sizes do not include
- *  4 byte FCS/CRC (frame check sequence).
- */
-#define FDDI_K_ALEN                     6               /* Octets in one FDDI address */
-#define FDDI_K_8022_HLEN        16              /* Total octets in 802.2 header */
-#define FDDI_K_SNAP_HLEN        21              /* Total octets in 802.2 SNAP header */
-#define FDDI_K_8022_ZLEN        16              /* Min octets in 802.2 frame sans FCS */
-#define FDDI_K_SNAP_ZLEN        21              /* Min octets in 802.2 SNAP frame sans FCS */
-#define FDDI_K_8022_DLEN        4475    /* Max octets in 802.2 payload */
-#define FDDI_K_SNAP_DLEN        4470    /* Max octets in 802.2 SNAP payload */
-#define FDDI_K_LLC_ZLEN         13              /* Min octets in LLC frame sans FCS */
-#define FDDI_K_LLC_LEN          4491    /* Max octets in LLC frame sans FCS */
-
-/* Define FDDI Frame Control (FC) Byte values */
-#define FDDI_FC_K_VOID                                  0x00    
-#define FDDI_FC_K_NON_RESTRICTED_TOKEN  0x80    
-#define FDDI_FC_K_RESTRICTED_TOKEN              0xC0    
-#define FDDI_FC_K_SMT_MIN                               0x41
-#define FDDI_FC_K_SMT_MAX                               0x4F
-#define FDDI_FC_K_MAC_MIN                               0xC1
-#define FDDI_FC_K_MAC_MAX                               0xCF    
-#define FDDI_FC_K_ASYNC_LLC_MIN                 0x50
-#define FDDI_FC_K_ASYNC_LLC_DEF                 0x54
-#define FDDI_FC_K_ASYNC_LLC_MAX                 0x5F
-#define FDDI_FC_K_SYNC_LLC_MIN                  0xD0
-#define FDDI_FC_K_SYNC_LLC_MAX                  0xD7
-#define FDDI_FC_K_IMPLEMENTOR_MIN               0x60
-#define FDDI_FC_K_IMPLEMENTOR_MAX               0x6F
-#define FDDI_FC_K_RESERVED_MIN                  0x70
-#define FDDI_FC_K_RESERVED_MAX                  0x7F
-
-/* Define LLC and SNAP constants */
-#define FDDI_EXTENDED_SAP       0xAA
-#define FDDI_UI_CMD                     0x03
-
-/* Define 802.2 Type 1 header */
-struct fddi_8022_1_hdr {
-        __u8    dsap;                                   /* destination service access point */
-        __u8    ssap;                                   /* source service access point */
-        __u8    ctrl;                                   /* control byte #1 */
-} __attribute__((packed));
-
-/* Define 802.2 Type 2 header */
-struct fddi_8022_2_hdr {
-        __u8    dsap;                                   /* destination service access point */
-        __u8    ssap;                                   /* source service access point */
-        __u8    ctrl_1;                                 /* control byte #1 */
-        __u8    ctrl_2;                                 /* control byte #2 */
-} __attribute__((packed));
-
-/* Define 802.2 SNAP header */
-#define FDDI_K_OUI_LEN  3
-struct fddi_snap_hdr {
-        __u8    dsap;                                   /* always 0xAA */
-        __u8    ssap;                                   /* always 0xAA */
-        __u8    ctrl;                                   /* always 0x03 */
-        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
-        __be16  ethertype;                              /* packet type ID field */
-} __attribute__((packed));
-
-/* Define FDDI LLC frame header */
-struct fddihdr {
-        __u8    fc;                                             /* frame control */
-        __u8    daddr[FDDI_K_ALEN];             /* destination address */
-        __u8    saddr[FDDI_K_ALEN];             /* source address */
-        union
-                {
-                struct fddi_8022_1_hdr          llc_8022_1;
-                struct fddi_8022_2_hdr          llc_8022_2;
-                struct fddi_snap_hdr            llc_snap;
-                } hdr;
-} __attribute__((packed));
-
-#ifdef __KERNEL__
 #include <linux/netdevice.h>
+#include <uapi/linux/if_fddi.h>
 
 /* Define FDDI statistics structure */
 struct fddi_statistics {
@@ -194,6 +118,4 @@ struct fddi_statistics {
         __u32   port_ler_flag[2];
         __u32   port_hardware_present[2];
 };
-#endif /* __KERNEL__ */
-
 #endif  /* _LINUX_IF_FDDI_H */
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 191ee0869bc1..4316aa173dde 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -20,105 +20,11 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  */
-
 #ifndef _FRAD_H_
 #define _FRAD_H_
 
-#include <linux/if.h>
-
-/* Structures and constants associated with the DLCI device driver */
-
-struct dlci_add
-{
-   char  devname[IFNAMSIZ];
-   short dlci;
-};
-
-#define DLCI_GET_CONF   (SIOCDEVPRIVATE + 2)
-#define DLCI_SET_CONF   (SIOCDEVPRIVATE + 3)
-
-/* 
- * These are related to the Sangoma SDLA and should remain in order. 
- * Code within the SDLA module is based on the specifics of this 
- * structure.  Change at your own peril.
- */
-struct dlci_conf {
-   short flags;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd; 
-
-/* these are part of the status read */
-   short Tc_fwd;
-   short Tc_bwd;
-   short Tf_max;
-   short Tb_max;
-
-/* add any new fields here above is a mirror of sdla_dlci_conf */
-};
-
-#define DLCI_GET_SLAVE  (SIOCDEVPRIVATE + 4)
-
-/* configuration flags for DLCI */
-#define DLCI_IGNORE_CIR_OUT     0x0001
-#define DLCI_ACCOUNT_CIR_IN     0x0002
-#define DLCI_BUFFER_IF          0x0008
-
-#define DLCI_VALID_FLAGS        0x000B
+#include <uapi/linux/if_frad.h>
 
-/* defines for the actual Frame Relay hardware */
-#define FRAD_GET_CONF   (SIOCDEVPRIVATE)
-#define FRAD_SET_CONF   (SIOCDEVPRIVATE + 1)
-
-#define FRAD_LAST_IOCTL FRAD_SET_CONF
-
-/*
- * Based on the setup for the Sangoma SDLA.  If changes are 
- * necessary to this structure, a routine will need to be 
- * added to that module to copy fields.
- */
-struct frad_conf 
-{
-   short station;
-   short flags;
-   short kbaud;
-   short clocking;
-   short mtu;
-   short T391;
-   short T392;
-   short N391;
-   short N392;
-   short N393;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd;
-
-/* Add new fields here, above is a mirror of the sdla_conf */
-
-};
-
-#define FRAD_STATION_CPE        0x0000
-#define FRAD_STATION_NODE       0x0001
-
-#define FRAD_TX_IGNORE_CIR      0x0001
-#define FRAD_RX_ACCOUNT_CIR     0x0002
-#define FRAD_DROP_ABORTED       0x0004
-#define FRAD_BUFFERIF           0x0008
-#define FRAD_STATS              0x0010
-#define FRAD_MCI                0x0100
-#define FRAD_AUTODLCI           0x8000
-#define FRAD_VALID_FLAGS        0x811F
-
-#define FRAD_CLOCK_INT          0x0001
-#define FRAD_CLOCK_EXT          0x0000
-
-#ifdef __KERNEL__
 
 #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
 
@@ -188,6 +94,4 @@ struct frad_local
 
 extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index e4dad4ddf085..c3f817c3eb45 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -1,335 +1,8 @@
 #ifndef _LINUX_IF_LINK_H
 #define _LINUX_IF_LINK_H
 
-#include <linux/types.h>
-#include <linux/netlink.h>
+#include <uapi/linux/if_link.h>
 
-/* This struct should be in sync with struct rtnl_link_stats64 */
-struct rtnl_link_stats {
-        __u32   rx_packets;             /* total packets received       */
-        __u32   tx_packets;             /* total packets transmitted    */
-        __u32   rx_bytes;               /* total bytes received         */
-        __u32   tx_bytes;               /* total bytes transmitted      */
-        __u32   rx_errors;              /* bad packets received         */
-        __u32   tx_errors;              /* packet transmit problems     */
-        __u32   rx_dropped;             /* no space in linux buffers    */
-        __u32   tx_dropped;             /* no space available in linux  */
-        __u32   multicast;              /* multicast packets received   */
-        __u32   collisions;
-
-        /* detailed rx_errors: */
-        __u32   rx_length_errors;
-        __u32   rx_over_errors;         /* receiver ring buff overflow  */
-        __u32   rx_crc_errors;          /* recved pkt with crc error    */
-        __u32   rx_frame_errors;        /* recv'd frame alignment error */
-        __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
-        __u32   rx_missed_errors;       /* receiver missed packet       */
-
-        /* detailed tx_errors */
-        __u32   tx_aborted_errors;
-        __u32   tx_carrier_errors;
-        __u32   tx_fifo_errors;
-        __u32   tx_heartbeat_errors;
-        __u32   tx_window_errors;
-
-        /* for cslip etc */
-        __u32   rx_compressed;
-        __u32   tx_compressed;
-};
-
-/* The main device statistics structure */
-struct rtnl_link_stats64 {
-        __u64   rx_packets;             /* total packets received       */
-        __u64   tx_packets;             /* total packets transmitted    */
-        __u64   rx_bytes;               /* total bytes received         */
-        __u64   tx_bytes;               /* total bytes transmitted      */
-        __u64   rx_errors;              /* bad packets received         */
-        __u64   tx_errors;              /* packet transmit problems     */
-        __u64   rx_dropped;             /* no space in linux buffers    */
-        __u64   tx_dropped;             /* no space available in linux  */
-        __u64   multicast;              /* multicast packets received   */
-        __u64   collisions;
-
-        /* detailed rx_errors: */
-        __u64   rx_length_errors;
-        __u64   rx_over_errors;         /* receiver ring buff overflow  */
-        __u64   rx_crc_errors;          /* recved pkt with crc error    */
-        __u64   rx_frame_errors;        /* recv'd frame alignment error */
-        __u64   rx_fifo_errors;         /* recv'r fifo overrun          */
-        __u64   rx_missed_errors;       /* receiver missed packet       */
-
-        /* detailed tx_errors */
-        __u64   tx_aborted_errors;
-        __u64   tx_carrier_errors;
-        __u64   tx_fifo_errors;
-        __u64   tx_heartbeat_errors;
-        __u64   tx_window_errors;
-
-        /* for cslip etc */
-        __u64   rx_compressed;
-        __u64   tx_compressed;
-};
-
-/* The struct should be in sync with struct ifmap */
-struct rtnl_link_ifmap {
-        __u64   mem_start;
-        __u64   mem_end;
-        __u64   base_addr;
-        __u16   irq;
-        __u8    dma;
-        __u8    port;
-};
-
-/*
- * IFLA_AF_SPEC
- *   Contains nested attributes for address family specific attributes.
- *   Each address family may create a attribute with the address family
- *   number as type and create its own attribute structure in it.
- *
- *   Example:
- *   [IFLA_AF_SPEC] = {
- *       [AF_INET] = {
- *           [IFLA_INET_CONF] = ...,
- *       },
- *       [AF_INET6] = {
- *           [IFLA_INET6_FLAGS] = ...,
- *           [IFLA_INET6_CONF] = ...,
- *       }
- *   }
- */
-
-enum {
-        IFLA_UNSPEC,
-        IFLA_ADDRESS,
-        IFLA_BROADCAST,
-        IFLA_IFNAME,
-        IFLA_MTU,
-        IFLA_LINK,
-        IFLA_QDISC,
-        IFLA_STATS,
-        IFLA_COST,
-#define IFLA_COST IFLA_COST
-        IFLA_PRIORITY,
-#define IFLA_PRIORITY IFLA_PRIORITY
-        IFLA_MASTER,
-#define IFLA_MASTER IFLA_MASTER
-        IFLA_WIRELESS,          /* Wireless Extension event - see wireless.h */
-#define IFLA_WIRELESS IFLA_WIRELESS
-        IFLA_PROTINFO,          /* Protocol specific information for a link */
-#define IFLA_PROTINFO IFLA_PROTINFO
-        IFLA_TXQLEN,
-#define IFLA_TXQLEN IFLA_TXQLEN
-        IFLA_MAP,
-#define IFLA_MAP IFLA_MAP
-        IFLA_WEIGHT,
-#define IFLA_WEIGHT IFLA_WEIGHT
-        IFLA_OPERSTATE,
-        IFLA_LINKMODE,
-        IFLA_LINKINFO,
-#define IFLA_LINKINFO IFLA_LINKINFO
-        IFLA_NET_NS_PID,
-        IFLA_IFALIAS,
-        IFLA_NUM_VF,            /* Number of VFs if device is SR-IOV PF */
-        IFLA_VFINFO_LIST,
-        IFLA_STATS64,
-        IFLA_VF_PORTS,
-        IFLA_PORT_SELF,
-        IFLA_AF_SPEC,
-        IFLA_GROUP,             /* Group the device belongs to */
-        IFLA_NET_NS_FD,
-        IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */
-        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */
-#define IFLA_PROMISCUITY IFLA_PROMISCUITY
-        IFLA_NUM_TX_QUEUES,
-        IFLA_NUM_RX_QUEUES,
-        __IFLA_MAX
-};
-
-
-#define IFLA_MAX (__IFLA_MAX - 1)
-
-/* backwards compatibility for userspace */
-#ifndef __KERNEL__
-#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
-#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
-#endif
-
-enum {
-        IFLA_INET_UNSPEC,
-        IFLA_INET_CONF,
-        __IFLA_INET_MAX,
-};
-
-#define IFLA_INET_MAX (__IFLA_INET_MAX - 1)
-
-/* ifi_flags.
-
-   IFF_* flags.
-
-   The only change is:
-   IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
-   more not changeable by user. They describe link media
-   characteristics and set by device driver.
-
-   Comments:
-   - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
-   - If neither of these three flags are set;
-     the interface is NBMA.
-
-   - IFF_MULTICAST does not mean anything special:
-   multicasts can be used on all not-NBMA links.
-   IFF_MULTICAST means that this media uses special encapsulation
-   for multicast frames. Apparently, all IFF_POINTOPOINT and
-   IFF_BROADCAST devices are able to use multicasts too.
- */
-
-/* IFLA_LINK.
-   For usual devices it is equal ifi_index.
-   If it is a "virtual interface" (f.e. tunnel), ifi_link
-   can point to real physical interface (f.e. for bandwidth calculations),
-   or maybe 0, what means, that real media is unknown (usual
-   for IPIP tunnels, when route to endpoint is allowed to change)
- */
-
-/* Subtype attributes for IFLA_PROTINFO */
-enum {
-        IFLA_INET6_UNSPEC,
-        IFLA_INET6_FLAGS,       /* link flags                   */
-        IFLA_INET6_CONF,        /* sysctl parameters            */
-        IFLA_INET6_STATS,       /* statistics                   */
-        IFLA_INET6_MCAST,       /* MC things. What of them?     */
-        IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
-        IFLA_INET6_ICMP6STATS,  /* statistics (icmpv6)          */
-        __IFLA_INET6_MAX
-};
-
-#define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
-
-struct ifla_cacheinfo {
-        __u32   max_reasm_len;
-        __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
-        __u32   reachable_time;
-        __u32   retrans_time;
-};
-
-enum {
-        IFLA_INFO_UNSPEC,
-        IFLA_INFO_KIND,
-        IFLA_INFO_DATA,
-        IFLA_INFO_XSTATS,
-        __IFLA_INFO_MAX,
-};
-
-#define IFLA_INFO_MAX   (__IFLA_INFO_MAX - 1)
-
-/* VLAN section */
-
-enum {
-        IFLA_VLAN_UNSPEC,
-        IFLA_VLAN_ID,
-        IFLA_VLAN_FLAGS,
-        IFLA_VLAN_EGRESS_QOS,
-        IFLA_VLAN_INGRESS_QOS,
-        __IFLA_VLAN_MAX,
-};
-
-#define IFLA_VLAN_MAX   (__IFLA_VLAN_MAX - 1)
-
-struct ifla_vlan_flags {
-        __u32   flags;
-        __u32   mask;
-};
-
-enum {
-        IFLA_VLAN_QOS_UNSPEC,
-        IFLA_VLAN_QOS_MAPPING,
-        __IFLA_VLAN_QOS_MAX
-};
-
-#define IFLA_VLAN_QOS_MAX       (__IFLA_VLAN_QOS_MAX - 1)
-
-struct ifla_vlan_qos_mapping {
-        __u32 from;
-        __u32 to;
-};
-
-/* MACVLAN section */
-enum {
-        IFLA_MACVLAN_UNSPEC,
-        IFLA_MACVLAN_MODE,
-        IFLA_MACVLAN_FLAGS,
-        __IFLA_MACVLAN_MAX,
-};
-
-#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
-
-enum macvlan_mode {
-        MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
-        MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
-        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
-        MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */
-};
-
-#define MACVLAN_FLAG_NOPROMISC  1
-
-/* VXLAN section */
-enum {
-        IFLA_VXLAN_UNSPEC,
-        IFLA_VXLAN_ID,
-        IFLA_VXLAN_GROUP,
-        IFLA_VXLAN_LINK,
-        IFLA_VXLAN_LOCAL,
-        IFLA_VXLAN_TTL,
-        IFLA_VXLAN_TOS,
-        IFLA_VXLAN_LEARNING,
-        IFLA_VXLAN_AGEING,
-        IFLA_VXLAN_LIMIT,
-        __IFLA_VXLAN_MAX
-};
-#define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
-
-/* SR-IOV virtual function management section */
-
-enum {
-        IFLA_VF_INFO_UNSPEC,
-        IFLA_VF_INFO,
-        __IFLA_VF_INFO_MAX,
-};
-
-#define IFLA_VF_INFO_MAX (__IFLA_VF_INFO_MAX - 1)
-
-enum {
-        IFLA_VF_UNSPEC,
-        IFLA_VF_MAC,            /* Hardware queue specific attributes */
-        IFLA_VF_VLAN,
-        IFLA_VF_TX_RATE,        /* TX Bandwidth Allocation */
-        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
-        __IFLA_VF_MAX,
-};
-
-#define IFLA_VF_MAX (__IFLA_VF_MAX - 1)
-
-struct ifla_vf_mac {
-        __u32 vf;
-        __u8 mac[32]; /* MAX_ADDR_LEN */
-};
-
-struct ifla_vf_vlan {
-        __u32 vf;
-        __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
-        __u32 qos;
-};
-
-struct ifla_vf_tx_rate {
-        __u32 vf;
-        __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
-};
-
-struct ifla_vf_spoofchk {
-        __u32 vf;
-        __u32 setting;
-};
-#ifdef __KERNEL__
 
 /* We don't want this structure exposed to user space */
 struct ifla_vf_info {
@@ -340,96 +13,4 @@ struct ifla_vf_info {
         __u32 tx_rate;
         __u32 spoofchk;
 };
-#endif
-
-/* VF ports management section
- *
- *      Nested layout of set/get msg is:
- *
- *              [IFLA_NUM_VF]
- *              [IFLA_VF_PORTS]
- *                      [IFLA_VF_PORT]
- *                              [IFLA_PORT_*], ...
- *                      [IFLA_VF_PORT]
- *                              [IFLA_PORT_*], ...
- *                      ...
- *              [IFLA_PORT_SELF]
- *                      [IFLA_PORT_*], ...
- */
-
-enum {
-        IFLA_VF_PORT_UNSPEC,
-        IFLA_VF_PORT,                   /* nest */
-        __IFLA_VF_PORT_MAX,
-};
-
-#define IFLA_VF_PORT_MAX (__IFLA_VF_PORT_MAX - 1)
-
-enum {
-        IFLA_PORT_UNSPEC,
-        IFLA_PORT_VF,                   /* __u32 */
-        IFLA_PORT_PROFILE,              /* string */
-        IFLA_PORT_VSI_TYPE,             /* 802.1Qbg (pre-)standard VDP */
-        IFLA_PORT_INSTANCE_UUID,        /* binary UUID */
-        IFLA_PORT_HOST_UUID,            /* binary UUID */
-        IFLA_PORT_REQUEST,              /* __u8 */
-        IFLA_PORT_RESPONSE,             /* __u16, output only */
-        __IFLA_PORT_MAX,
-};
-
-#define IFLA_PORT_MAX (__IFLA_PORT_MAX - 1)
-
-#define PORT_PROFILE_MAX        40
-#define PORT_UUID_MAX           16
-#define PORT_SELF_VF            -1
-
-enum {
-        PORT_REQUEST_PREASSOCIATE = 0,
-        PORT_REQUEST_PREASSOCIATE_RR,
-        PORT_REQUEST_ASSOCIATE,
-        PORT_REQUEST_DISASSOCIATE,
-};
-
-enum {
-        PORT_VDP_RESPONSE_SUCCESS = 0,
-        PORT_VDP_RESPONSE_INVALID_FORMAT,
-        PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES,
-        PORT_VDP_RESPONSE_UNUSED_VTID,
-        PORT_VDP_RESPONSE_VTID_VIOLATION,
-        PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION,
-        PORT_VDP_RESPONSE_OUT_OF_SYNC,
-        /* 0x08-0xFF reserved for future VDP use */
-        PORT_PROFILE_RESPONSE_SUCCESS = 0x100,
-        PORT_PROFILE_RESPONSE_INPROGRESS,
-        PORT_PROFILE_RESPONSE_INVALID,
-        PORT_PROFILE_RESPONSE_BADSTATE,
-        PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES,
-        PORT_PROFILE_RESPONSE_ERROR,
-};
-
-struct ifla_port_vsi {
-        __u8 vsi_mgr_id;
-        __u8 vsi_type_id[3];
-        __u8 vsi_type_version;
-        __u8 pad[3];
-};
-
-
-/* IPoIB section */
-
-enum {
-        IFLA_IPOIB_UNSPEC,
-        IFLA_IPOIB_PKEY,
-        IFLA_IPOIB_MODE,
-        IFLA_IPOIB_UMCAST,
-        __IFLA_IPOIB_MAX
-};
-
-enum {
-        IPOIB_MODE_DATAGRAM  = 0, /* using unreliable datagram QPs */
-        IPOIB_MODE_CONNECTED = 1, /* using connected QPs */
-};
-
-#define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
-
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h
index 76525760ba48..81e434c50790 100644
--- a/include/linux/if_ltalk.h
+++ b/include/linux/if_ltalk.h
@@ -1,12 +1,7 @@
 #ifndef __LINUX_LTALK_H
 #define __LINUX_LTALK_H
 
-#define LTALK_HLEN              1
-#define LTALK_MTU               600
-#define LTALK_ALEN              1
+#include <uapi/linux/if_ltalk.h>
 
-#ifdef __KERNEL__
 extern struct net_device *alloc_ltalkdev(int sizeof_priv);
 #endif
-
-#endif
diff --git a/include/linux/if_phonet.h b/include/linux/if_phonet.h
index d70034bcec05..bbcdb0a767d8 100644
--- a/include/linux/if_phonet.h
+++ b/include/linux/if_phonet.h
@@ -8,12 +8,7 @@
 #ifndef LINUX_IF_PHONET_H
 #define LINUX_IF_PHONET_H
 
-#define PHONET_MIN_MTU          6       /* pn_length = 0 */
-#define PHONET_MAX_MTU          65541   /* pn_length = 0xffff */
-#define PHONET_DEV_MTU          PHONET_MAX_MTU
+#include <uapi/linux/if_phonet.h>
 
-#ifdef __KERNEL__
 extern struct header_ops phonet_header_ops;
 #endif
-
-#endif
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index b4775418d525..0fb71e532b2c 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -11,98 +11,11 @@
  *              2 of the License, or (at your option) any later version.
  *
  */
-
 #ifndef __LINUX_IF_PPPOL2TP_H
 #define __LINUX_IF_PPPOL2TP_H
 
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 #include <linux/in.h>
 #include <linux/in6.h>
-#endif
-
-/* Structure used to connect() the socket to a particular tunnel UDP
- * socket over IPv4.
- */
-struct pppol2tp_addr {
-        __kernel_pid_t  pid;            /* pid that owns the fd.
-                                         * 0 => current */
-        int     fd;                     /* FD of UDP socket to use */
-
-        struct sockaddr_in addr;        /* IP address and port to send to */
-
-        __u16 s_tunnel, s_session;      /* For matching incoming packets */
-        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
-};
-
-/* Structure used to connect() the socket to a particular tunnel UDP
- * socket over IPv6.
- */
-struct pppol2tpin6_addr {
-        __kernel_pid_t  pid;            /* pid that owns the fd.
-                                         * 0 => current */
-        int     fd;                     /* FD of UDP socket to use */
-
-        __u16 s_tunnel, s_session;      /* For matching incoming packets */
-        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
-
-        struct sockaddr_in6 addr;       /* IP address and port to send to */
-};
-
-/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
- * bits. So we need a different sockaddr structure.
- */
-struct pppol2tpv3_addr {
-        __kernel_pid_t  pid;            /* pid that owns the fd.
-                                         * 0 => current */
-        int     fd;                     /* FD of UDP or IP socket to use */
-
-        struct sockaddr_in addr;        /* IP address and port to send to */
-
-        __u32 s_tunnel, s_session;      /* For matching incoming packets */
-        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
-};
-
-struct pppol2tpv3in6_addr {
-        __kernel_pid_t  pid;            /* pid that owns the fd.
-                                         * 0 => current */
-        int     fd;                     /* FD of UDP or IP socket to use */
-
-        __u32 s_tunnel, s_session;      /* For matching incoming packets */
-        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
-
-        struct sockaddr_in6 addr;       /* IP address and port to send to */
-};
-
-/* Socket options:
- * DEBUG        - bitmask of debug message categories
- * SENDSEQ      - 0 => don't send packets with sequence numbers
- *                1 => send packets with sequence numbers
- * RECVSEQ      - 0 => receive packet sequence numbers are optional
- *                1 => drop receive packets without sequence numbers
- * LNSMODE      - 0 => act as LAC.
- *                1 => act as LNS.
- * REORDERTO    - reorder timeout (in millisecs). If 0, don't try to reorder.
- */
-enum {
-        PPPOL2TP_SO_DEBUG       = 1,
-        PPPOL2TP_SO_RECVSEQ     = 2,
-        PPPOL2TP_SO_SENDSEQ     = 3,
-        PPPOL2TP_SO_LNSMODE     = 4,
-        PPPOL2TP_SO_REORDERTO   = 5,
-};
-
-/* Debug message categories for the DEBUG socket option */
-enum {
-        PPPOL2TP_MSG_DEBUG      = (1 << 0),     /* verbose debug (if
-                                                 * compiled in) */
-        PPPOL2TP_MSG_CONTROL    = (1 << 1),     /* userspace - kernel
-                                                 * interface */
-        PPPOL2TP_MSG_SEQ        = (1 << 2),     /* sequence numbers */
-        PPPOL2TP_MSG_DATA       = (1 << 3),     /* data packets */
-};
-
-
+#include <uapi/linux/if_pppol2tp.h>
 
 #endif
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 09c474c480cd..aff7ad8a4ea3 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -12,153 +12,14 @@
  *              2 of the License, or (at your option) any later version.
  *
  */
-
 #ifndef __LINUX_IF_PPPOX_H
 #define __LINUX_IF_PPPOX_H
 
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-#include <linux/socket.h>
-#include <linux/if_ether.h>
-#ifdef  __KERNEL__
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/ppp_channel.h>
-#endif /* __KERNEL__ */
-#include <linux/if_pppol2tp.h>
-
-/* For user-space programs to pick up these definitions
- * which they wouldn't get otherwise without defining __KERNEL__
- */
-#ifndef AF_PPPOX
-#define AF_PPPOX        24
-#define PF_PPPOX        AF_PPPOX
-#endif /* !(AF_PPPOX) */
-
-/************************************************************************ 
- * PPPoE addressing definition 
- */ 
-typedef __be16 sid_t;
-struct pppoe_addr {
-        sid_t         sid;                    /* Session identifier */
-        unsigned char remote[ETH_ALEN];       /* Remote address */
-        char          dev[IFNAMSIZ];          /* Local device to use */
-}; 
- 
-/************************************************************************ 
- * PPTP addressing definition
- */
-struct pptp_addr {
-        __be16          call_id;
-        struct in_addr  sin_addr;
-};
-
-/************************************************************************
- * Protocols supported by AF_PPPOX
- */
-#define PX_PROTO_OE    0 /* Currently just PPPoE */
-#define PX_PROTO_OL2TP 1 /* Now L2TP also */
-#define PX_PROTO_PPTP  2
-#define PX_MAX_PROTO   3
-
-struct sockaddr_pppox {
-        __kernel_sa_family_t sa_family;       /* address family, AF_PPPOX */
-        unsigned int    sa_protocol;          /* protocol identifier */
-        union {
-                struct pppoe_addr  pppoe;
-                struct pptp_addr   pptp;
-        } sa_addr;
-} __packed;
-
-/* The use of the above union isn't viable because the size of this
- * struct must stay fixed over time -- applications use sizeof(struct
- * sockaddr_pppox) to fill it. We use a protocol specific sockaddr
- * type instead.
- */
-struct sockaddr_pppol2tp {
-        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-        unsigned int    sa_protocol;    /* protocol identifier */
-        struct pppol2tp_addr pppol2tp;
-} __packed;
-
-struct sockaddr_pppol2tpin6 {
-        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-        unsigned int    sa_protocol;    /* protocol identifier */
-        struct pppol2tpin6_addr pppol2tp;
-} __packed;
-
-/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
- * bits. So we need a different sockaddr structure.
- */
-struct sockaddr_pppol2tpv3 {
-        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-        unsigned int    sa_protocol;    /* protocol identifier */
-        struct pppol2tpv3_addr pppol2tp;
-} __packed;
-
-struct sockaddr_pppol2tpv3in6 {
-        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-        unsigned int    sa_protocol;    /* protocol identifier */
-        struct pppol2tpv3in6_addr pppol2tp;
-} __packed;
-
-/*********************************************************************
- *
- * ioctl interface for defining forwarding of connections
- *
- ********************************************************************/
-
-#define PPPOEIOCSFWD    _IOW(0xB1 ,0, size_t)
-#define PPPOEIOCDFWD    _IO(0xB1 ,1)
-/*#define PPPOEIOCGFWD  _IOWR(0xB1,2, size_t)*/
-
-/* Codes to identify message types */
-#define PADI_CODE       0x09
-#define PADO_CODE       0x07
-#define PADR_CODE       0x19
-#define PADS_CODE       0x65
-#define PADT_CODE       0xa7
-struct pppoe_tag {
-        __be16 tag_type;
-        __be16 tag_len;
-        char tag_data[0];
-} __attribute__ ((packed));
-
-/* Tag identifiers */
-#define PTT_EOL         __cpu_to_be16(0x0000)
-#define PTT_SRV_NAME    __cpu_to_be16(0x0101)
-#define PTT_AC_NAME     __cpu_to_be16(0x0102)
-#define PTT_HOST_UNIQ   __cpu_to_be16(0x0103)
-#define PTT_AC_COOKIE   __cpu_to_be16(0x0104)
-#define PTT_VENDOR      __cpu_to_be16(0x0105)
-#define PTT_RELAY_SID   __cpu_to_be16(0x0110)
-#define PTT_SRV_ERR     __cpu_to_be16(0x0201)
-#define PTT_SYS_ERR     __cpu_to_be16(0x0202)
-#define PTT_GEN_ERR     __cpu_to_be16(0x0203)
-
-struct pppoe_hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 ver : 4;
-        __u8 type : 4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8 type : 4;
-        __u8 ver : 4;
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif
-        __u8 code;
-        __be16 sid;
-        __be16 length;
-        struct pppoe_tag tag[0];
-} __packed;
-
-/* Length of entire PPPoE + PPP header */
-#define PPPOE_SES_HLEN  8
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/if_pppox.h>
 
 static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
 {
@@ -232,6 +93,4 @@ enum {
     PPPOX_DEAD          = 16  /* dead, useless, please clean me up!*/
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* !(__LINUX_IF_PPPOX_H) */
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 6d88a7f57680..0245def2aa93 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -7,14 +7,13 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
-
 #ifndef _LINUX_IF_TEAM_H_
 #define _LINUX_IF_TEAM_H_
 
-#ifdef __KERNEL__
 
 #include <linux/netpoll.h>
 #include <net/sch_generic.h>
+#include <uapi/linux/if_team.h>
 
 struct team_pcpu_stats {
         u64                     rx_packets;
@@ -251,98 +250,4 @@ extern void team_mode_unregister(const struct team_mode *mode);
 #define TEAM_DEFAULT_NUM_TX_QUEUES 16
 #define TEAM_DEFAULT_NUM_RX_QUEUES 16
 
-#endif /* __KERNEL__ */
-
-#define TEAM_STRING_MAX_LEN 32
-
-/**********************************
- * NETLINK_GENERIC netlink family.
- **********************************/
-
-enum {
-        TEAM_CMD_NOOP,
-        TEAM_CMD_OPTIONS_SET,
-        TEAM_CMD_OPTIONS_GET,
-        TEAM_CMD_PORT_LIST_GET,
-
-        __TEAM_CMD_MAX,
-        TEAM_CMD_MAX = (__TEAM_CMD_MAX - 1),
-};
-
-enum {
-        TEAM_ATTR_UNSPEC,
-        TEAM_ATTR_TEAM_IFINDEX,         /* u32 */
-        TEAM_ATTR_LIST_OPTION,          /* nest */
-        TEAM_ATTR_LIST_PORT,            /* nest */
-
-        __TEAM_ATTR_MAX,
-        TEAM_ATTR_MAX = __TEAM_ATTR_MAX - 1,
-};
-
-/* Nested layout of get/set msg:
- *
- *      [TEAM_ATTR_LIST_OPTION]
- *              [TEAM_ATTR_ITEM_OPTION]
- *                      [TEAM_ATTR_OPTION_*], ...
- *              [TEAM_ATTR_ITEM_OPTION]
- *                      [TEAM_ATTR_OPTION_*], ...
- *              ...
- *      [TEAM_ATTR_LIST_PORT]
- *              [TEAM_ATTR_ITEM_PORT]
- *                      [TEAM_ATTR_PORT_*], ...
- *              [TEAM_ATTR_ITEM_PORT]
- *                      [TEAM_ATTR_PORT_*], ...
- *              ...
- */
-
-enum {
-        TEAM_ATTR_ITEM_OPTION_UNSPEC,
-        TEAM_ATTR_ITEM_OPTION,          /* nest */
-
-        __TEAM_ATTR_ITEM_OPTION_MAX,
-        TEAM_ATTR_ITEM_OPTION_MAX = __TEAM_ATTR_ITEM_OPTION_MAX - 1,
-};
-
-enum {
-        TEAM_ATTR_OPTION_UNSPEC,
-        TEAM_ATTR_OPTION_NAME,          /* string */
-        TEAM_ATTR_OPTION_CHANGED,       /* flag */
-        TEAM_ATTR_OPTION_TYPE,          /* u8 */
-        TEAM_ATTR_OPTION_DATA,          /* dynamic */
-        TEAM_ATTR_OPTION_REMOVED,       /* flag */
-        TEAM_ATTR_OPTION_PORT_IFINDEX,  /* u32 */ /* for per-port options */
-        TEAM_ATTR_OPTION_ARRAY_INDEX,   /* u32 */ /* for array options */
-
-        __TEAM_ATTR_OPTION_MAX,
-        TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
-};
-
-enum {
-        TEAM_ATTR_ITEM_PORT_UNSPEC,
-        TEAM_ATTR_ITEM_PORT,            /* nest */
-
-        __TEAM_ATTR_ITEM_PORT_MAX,
-        TEAM_ATTR_ITEM_PORT_MAX = __TEAM_ATTR_ITEM_PORT_MAX - 1,
-};
-
-enum {
-        TEAM_ATTR_PORT_UNSPEC,
-        TEAM_ATTR_PORT_IFINDEX,         /* u32 */
-        TEAM_ATTR_PORT_CHANGED,         /* flag */
-        TEAM_ATTR_PORT_LINKUP,          /* flag */
-        TEAM_ATTR_PORT_SPEED,           /* u32 */
-        TEAM_ATTR_PORT_DUPLEX,          /* u8 */
-        TEAM_ATTR_PORT_REMOVED,         /* flag */
-
-        __TEAM_ATTR_PORT_MAX,
-        TEAM_ATTR_PORT_MAX = __TEAM_ATTR_PORT_MAX - 1,
-};
-
-/*
- * NETLINK_GENERIC related info
- */
-#define TEAM_GENL_NAME "team"
-#define TEAM_GENL_VERSION 0x1
-#define TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME "change_event"
-
 #endif /* _LINUX_IF_TEAM_H_ */
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 06b1829731fd..ed6da2e6df90 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -12,86 +12,11 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  */
-
 #ifndef __IF_TUN_H
 #define __IF_TUN_H
 
-#include <linux/types.h>
-#include <linux/if_ether.h>
-#include <linux/filter.h>
-
-/* Read queue size */
-#define TUN_READQ_SIZE  500
-
-/* TUN device flags */
-#define TUN_TUN_DEV     0x0001  
-#define TUN_TAP_DEV     0x0002
-#define TUN_TYPE_MASK   0x000f
-
-#define TUN_FASYNC      0x0010
-#define TUN_NOCHECKSUM  0x0020
-#define TUN_NO_PI       0x0040
-#define TUN_ONE_QUEUE   0x0080
-#define TUN_PERSIST     0x0100  
-#define TUN_VNET_HDR    0x0200
-
-/* Ioctl defines */
-#define TUNSETNOCSUM  _IOW('T', 200, int) 
-#define TUNSETDEBUG   _IOW('T', 201, int) 
-#define TUNSETIFF     _IOW('T', 202, int) 
-#define TUNSETPERSIST _IOW('T', 203, int) 
-#define TUNSETOWNER   _IOW('T', 204, int)
-#define TUNSETLINK    _IOW('T', 205, int)
-#define TUNSETGROUP   _IOW('T', 206, int)
-#define TUNGETFEATURES _IOR('T', 207, unsigned int)
-#define TUNSETOFFLOAD  _IOW('T', 208, unsigned int)
-#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
-#define TUNGETIFF      _IOR('T', 210, unsigned int)
-#define TUNGETSNDBUF   _IOR('T', 211, int)
-#define TUNSETSNDBUF   _IOW('T', 212, int)
-#define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog)
-#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
-#define TUNGETVNETHDRSZ _IOR('T', 215, int)
-#define TUNSETVNETHDRSZ _IOW('T', 216, int)
-
-/* TUNSETIFF ifr flags */
-#define IFF_TUN         0x0001
-#define IFF_TAP         0x0002
-#define IFF_NO_PI       0x1000
-#define IFF_ONE_QUEUE   0x2000
-#define IFF_VNET_HDR    0x4000
-#define IFF_TUN_EXCL    0x8000
-
-/* Features for GSO (TUNSETOFFLOAD). */
-#define TUN_F_CSUM      0x01    /* You can hand me unchecksummed packets. */
-#define TUN_F_TSO4      0x02    /* I can handle TSO for IPv4 packets */
-#define TUN_F_TSO6      0x04    /* I can handle TSO for IPv6 packets */
-#define TUN_F_TSO_ECN   0x08    /* I can handle TSO with ECN bits. */
-#define TUN_F_UFO       0x10    /* I can handle UFO packets */
-
-/* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
-#define TUN_PKT_STRIP   0x0001
-struct tun_pi {
-        __u16  flags;
-        __be16 proto;
-};
-
-/*
- * Filter spec (used for SETXXFILTER ioctls)
- * This stuff is applicable only to the TAP (Ethernet) devices.
- * If the count is zero the filter is disabled and the driver accepts
- * all packets (promisc mode).
- * If the filter is enabled in order to accept broadcast packets
- * broadcast addr must be explicitly included in the addr list.
- */
-#define TUN_FLT_ALLMULTI 0x0001 /* Accept all multicast packets */
-struct tun_filter {
-        __u16  flags; /* TUN_FLT_ flags see above */
-        __u16  count; /* Number of addresses */
-        __u8   addr[0][ETH_ALEN];
-};
+#include <uapi/linux/if_tun.h>
 
-#ifdef __KERNEL__
 #if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)
 struct socket *tun_get_socket(struct file *);
 #else
@@ -104,5 +29,4 @@ static inline struct socket *tun_get_socket(struct file *f)
         return ERR_PTR(-EINVAL);
 }
 #endif /* CONFIG_TUN */
-#endif /* __KERNEL__ */
 #endif /* __IF_TUN_H */
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 8c5035ac3142..1cc595a67cc9 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -1,100 +1,8 @@
 #ifndef _IF_TUNNEL_H_
 #define _IF_TUNNEL_H_
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-#ifdef __KERNEL__
 #include <linux/ip.h>
 #include <linux/in6.h>
-#endif
-
-#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
-#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
-#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
-#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
-#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
-#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
-#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
-#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
-#define SIOCGET6RD      (SIOCDEVPRIVATE + 8)
-#define SIOCADD6RD      (SIOCDEVPRIVATE + 9)
-#define SIOCDEL6RD      (SIOCDEVPRIVATE + 10)
-#define SIOCCHG6RD      (SIOCDEVPRIVATE + 11)
-
-#define GRE_CSUM        __cpu_to_be16(0x8000)
-#define GRE_ROUTING     __cpu_to_be16(0x4000)
-#define GRE_KEY         __cpu_to_be16(0x2000)
-#define GRE_SEQ         __cpu_to_be16(0x1000)
-#define GRE_STRICT      __cpu_to_be16(0x0800)
-#define GRE_REC         __cpu_to_be16(0x0700)
-#define GRE_FLAGS       __cpu_to_be16(0x00F8)
-#define GRE_VERSION     __cpu_to_be16(0x0007)
-
-struct ip_tunnel_parm {
-        char                    name[IFNAMSIZ];
-        int                     link;
-        __be16                  i_flags;
-        __be16                  o_flags;
-        __be32                  i_key;
-        __be32                  o_key;
-        struct iphdr            iph;
-};
-
-/* SIT-mode i_flags */
-#define SIT_ISATAP      0x0001
-
-struct ip_tunnel_prl {
-        __be32                  addr;
-        __u16                   flags;
-        __u16                   __reserved;
-        __u32                   datalen;
-        __u32                   __reserved2;
-        /* data follows */
-};
-
-/* PRL flags */
-#define PRL_DEFAULT             0x0001
-
-struct ip_tunnel_6rd {
-        struct in6_addr         prefix;
-        __be32                  relay_prefix;
-        __u16                   prefixlen;
-        __u16                   relay_prefixlen;
-};
-
-enum {
-        IFLA_GRE_UNSPEC,
-        IFLA_GRE_LINK,
-        IFLA_GRE_IFLAGS,
-        IFLA_GRE_OFLAGS,
-        IFLA_GRE_IKEY,
-        IFLA_GRE_OKEY,
-        IFLA_GRE_LOCAL,
-        IFLA_GRE_REMOTE,
-        IFLA_GRE_TTL,
-        IFLA_GRE_TOS,
-        IFLA_GRE_PMTUDISC,
-        IFLA_GRE_ENCAP_LIMIT,
-        IFLA_GRE_FLOWINFO,
-        IFLA_GRE_FLAGS,
-        __IFLA_GRE_MAX,
-};
-
-#define IFLA_GRE_MAX    (__IFLA_GRE_MAX - 1)
-
-/* VTI-mode i_flags */
-#define VTI_ISVTI 0x0001
-
-enum {
-        IFLA_VTI_UNSPEC,
-        IFLA_VTI_LINK,
-        IFLA_VTI_IKEY,
-        IFLA_VTI_OKEY,
-        IFLA_VTI_LOCAL,
-        IFLA_VTI_REMOTE,
-        __IFLA_VTI_MAX,
-};
+#include <uapi/linux/if_tunnel.h>
 
-#define IFLA_VTI_MAX    (__IFLA_VTI_MAX - 1)
 #endif /* _IF_TUNNEL_H_ */
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index e6ff12dd717b..d06cc5c8f58c 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -9,15 +9,14 @@
  *              2 of the License, or (at your option) any later version.
  *
  */
-
 #ifndef _LINUX_IF_VLAN_H_
 #define _LINUX_IF_VLAN_H_
 
-#ifdef __KERNEL__
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/bug.h>
+#include <uapi/linux/if_vlan.h>
 
 #define VLAN_HLEN       4               /* The additional bytes required by VLAN
                                          * (in addition to the Ethernet header)
@@ -80,6 +79,8 @@ static inline int is_vlan_dev(struct net_device *dev)
 }
 
 #define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
+#define vlan_tx_nonzero_tag_present(__skb) \
+        (vlan_tx_tag_present(__skb) && ((__skb)->vlan_tci & VLAN_VID_MASK))
 #define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
@@ -89,7 +90,7 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
 extern u16 vlan_dev_vlan_id(const struct net_device *dev);
 
-extern bool vlan_do_receive(struct sk_buff **skb, bool last_handler);
+extern bool vlan_do_receive(struct sk_buff **skb);
 extern struct sk_buff *vlan_untag(struct sk_buff *skb);
 
 extern int vlan_vid_add(struct net_device *dev, unsigned short vid);
@@ -120,10 +121,8 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
         return 0;
 }
 
-static inline bool vlan_do_receive(struct sk_buff **skb, bool last_handler)
+static inline bool vlan_do_receive(struct sk_buff **skb)
 {
-        if (((*skb)->vlan_tci & VLAN_VID_MASK) && last_handler)
-                (*skb)->pkt_type = PACKET_OTHERHOST;
         return false;
 }
 
@@ -361,52 +360,4 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                  */
                 skb->protocol = htons(ETH_P_802_2);
 }
-#endif /* __KERNEL__ */
-
-/* VLAN IOCTLs are found in sockios.h */
-
-/* Passed in vlan_ioctl_args structure to determine behaviour. */
-enum vlan_ioctl_cmds {
-        ADD_VLAN_CMD,
-        DEL_VLAN_CMD,
-        SET_VLAN_INGRESS_PRIORITY_CMD,
-        SET_VLAN_EGRESS_PRIORITY_CMD,
-        GET_VLAN_INGRESS_PRIORITY_CMD,
-        GET_VLAN_EGRESS_PRIORITY_CMD,
-        SET_VLAN_NAME_TYPE_CMD,
-        SET_VLAN_FLAG_CMD,
-        GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-        GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-};
-
-enum vlan_flags {
-        VLAN_FLAG_REORDER_HDR   = 0x1,
-        VLAN_FLAG_GVRP          = 0x2,
-        VLAN_FLAG_LOOSE_BINDING = 0x4,
-};
-
-enum vlan_name_types {
-        VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-        VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-        VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-        VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-        VLAN_NAME_TYPE_HIGHEST
-};
-
-struct vlan_ioctl_args {
-        int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-        char device1[24];
-
-        union {
-                char device2[24];
-                int VID;
-                unsigned int skb_priority;
-                unsigned int name_type;
-                unsigned int bind_type;
-                unsigned int flag; /* Matches vlan_dev_priv flags */
-        } u;
-
-        short vlan_qos;   
-};
-
 #endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 82de336b8155..7f2bf1518480 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -12,123 +12,13 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IGMP_H
 #define _LINUX_IGMP_H
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*
- *      IGMP protocol structures
- */
-
-/*
- *      Header in on cable format
- */
-
-struct igmphdr {
-        __u8 type;
-        __u8 code;              /* For newer IGMP */
-        __sum16 csum;
-        __be32 group;
-};
-
-/* V3 group record types [grec_type] */
-#define IGMPV3_MODE_IS_INCLUDE          1
-#define IGMPV3_MODE_IS_EXCLUDE          2
-#define IGMPV3_CHANGE_TO_INCLUDE        3
-#define IGMPV3_CHANGE_TO_EXCLUDE        4
-#define IGMPV3_ALLOW_NEW_SOURCES        5
-#define IGMPV3_BLOCK_OLD_SOURCES        6
-
-struct igmpv3_grec {
-        __u8    grec_type;
-        __u8    grec_auxwords;
-        __be16  grec_nsrcs;
-        __be32  grec_mca;
-        __be32  grec_src[0];
-};
-
-struct igmpv3_report {
-        __u8 type;
-        __u8 resv1;
-        __be16 csum;
-        __be16 resv2;
-        __be16 ngrec;
-        struct igmpv3_grec grec[0];
-};
-
-struct igmpv3_query {
-        __u8 type;
-        __u8 code;
-        __be16 csum;
-        __be32 group;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 qrv:3,
-             suppress:1,
-             resv:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8 resv:4,
-             suppress:1,
-             qrv:3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        __u8 qqic;
-        __be16 nsrcs;
-        __be32 srcs[0];
-};
-
-#define IGMP_HOST_MEMBERSHIP_QUERY      0x11    /* From RFC1112 */
-#define IGMP_HOST_MEMBERSHIP_REPORT     0x12    /* Ditto */
-#define IGMP_DVMRP                      0x13    /* DVMRP routing */
-#define IGMP_PIM                        0x14    /* PIM routing */
-#define IGMP_TRACE                      0x15
-#define IGMPV2_HOST_MEMBERSHIP_REPORT   0x16    /* V2 version of 0x12 */
-#define IGMP_HOST_LEAVE_MESSAGE         0x17
-#define IGMPV3_HOST_MEMBERSHIP_REPORT   0x22    /* V3 version of 0x12 */
-
-#define IGMP_MTRACE_RESP                0x1e
-#define IGMP_MTRACE                     0x1f
-
-
-/*
- *      Use the BSD names for these for compatibility
- */
-
-#define IGMP_DELAYING_MEMBER            0x01
-#define IGMP_IDLE_MEMBER                0x02
-#define IGMP_LAZY_MEMBER                0x03
-#define IGMP_SLEEPING_MEMBER            0x04
-#define IGMP_AWAKENING_MEMBER           0x05
-
-#define IGMP_MINLEN                     8
-
-#define IGMP_MAX_HOST_REPORT_DELAY      10      /* max delay for response to */
-                                                /* query (in seconds)   */
-
-#define IGMP_TIMER_SCALE                10      /* denotes that the igmphdr->timer field */
-                                                /* specifies time in 10th of seconds     */
-
-#define IGMP_AGE_THRESHOLD              400     /* If this host don't hear any IGMP V1  */
-                                                /* message in this period of time,      */
-                                                /* revert to IGMP v2 router.            */
-
-#define IGMP_ALL_HOSTS          htonl(0xE0000001L)
-#define IGMP_ALL_ROUTER         htonl(0xE0000002L)
-#define IGMPV3_ALL_MCR          htonl(0xE0000016L)
-#define IGMP_LOCAL_GROUP        htonl(0xE0000000L)
-#define IGMP_LOCAL_GROUP_MASK   htonl(0xFFFFFF00L)
-
-/*
- * struct for keeping the multicast list in
- */
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
 #include <linux/timer.h>
 #include <linux/in.h>
+#include <uapi/linux/igmp.h>
 
 static inline struct igmphdr *igmp_hdr(const struct sk_buff *skb)
 {
@@ -241,4 +131,3 @@ extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
 extern void ip_mc_rejoin_groups(struct in_device *in_dev);
 
 #endif
-#endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index c0ae76ac4e0b..7806c24e5bc8 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -618,4 +618,20 @@ static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
 };
 #endif
 
+/**
+ * IIO_DEGREE_TO_RAD() - Convert degree to rad
+ * @deg: A value in degree
+ *
+ * Returns the given value converted from degree to rad
+ */
+#define IIO_DEGREE_TO_RAD(deg) (((deg) * 314159ULL + 9000000ULL) / 18000000ULL)
+
+/**
+ * IIO_G_TO_M_S_2() - Convert g to meter / second**2
+ * @g: A value in g
+ *
+ * Returns the given value converted from g to meter / second**2
+ */
+#define IIO_G_TO_M_S_2(g) ((g) * 980665ULL / 100000ULL)
+
 #endif /* _INDUSTRIAL_IO_H_ */
diff --git a/include/linux/in.h b/include/linux/in.h
index e0337f11d92e..31b493734763 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -18,240 +18,9 @@
 #ifndef _LINUX_IN_H
 #define _LINUX_IN_H
 
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/* Standard well-defined IP protocols.  */
-enum {
-  IPPROTO_IP = 0,               /* Dummy protocol for TCP               */
-  IPPROTO_ICMP = 1,             /* Internet Control Message Protocol    */
-  IPPROTO_IGMP = 2,             /* Internet Group Management Protocol   */
-  IPPROTO_IPIP = 4,             /* IPIP tunnels (older KA9Q tunnels use 94) */
-  IPPROTO_TCP = 6,              /* Transmission Control Protocol        */
-  IPPROTO_EGP = 8,              /* Exterior Gateway Protocol            */
-  IPPROTO_PUP = 12,             /* PUP protocol                         */
-  IPPROTO_UDP = 17,             /* User Datagram Protocol               */
-  IPPROTO_IDP = 22,             /* XNS IDP protocol                     */
-  IPPROTO_DCCP = 33,            /* Datagram Congestion Control Protocol */
-  IPPROTO_RSVP = 46,            /* RSVP protocol                        */
-  IPPROTO_GRE = 47,             /* Cisco GRE tunnels (rfc 1701,1702)    */
-
-  IPPROTO_IPV6   = 41,          /* IPv6-in-IPv4 tunnelling              */
-
-  IPPROTO_ESP = 50,            /* Encapsulation Security Payload protocol */
-  IPPROTO_AH = 51,             /* Authentication Header protocol       */
-  IPPROTO_BEETPH = 94,         /* IP option pseudo header for BEET */
-  IPPROTO_PIM    = 103,         /* Protocol Independent Multicast       */
-
-  IPPROTO_COMP   = 108,                /* Compression Header protocol */
-  IPPROTO_SCTP   = 132,         /* Stream Control Transport Protocol    */
-  IPPROTO_UDPLITE = 136,        /* UDP-Lite (RFC 3828)                  */
-
-  IPPROTO_RAW    = 255,         /* Raw IP packets                       */
-  IPPROTO_MAX
-};
-
-
-/* Internet address. */
-struct in_addr {
-        __be32  s_addr;
-};
-
-#define IP_TOS          1
-#define IP_TTL          2
-#define IP_HDRINCL      3
-#define IP_OPTIONS      4
-#define IP_ROUTER_ALERT 5
-#define IP_RECVOPTS     6
-#define IP_RETOPTS      7
-#define IP_PKTINFO      8
-#define IP_PKTOPTIONS   9
-#define IP_MTU_DISCOVER 10
-#define IP_RECVERR      11
-#define IP_RECVTTL      12
-#define IP_RECVTOS      13
-#define IP_MTU          14
-#define IP_FREEBIND     15
-#define IP_IPSEC_POLICY 16
-#define IP_XFRM_POLICY  17
-#define IP_PASSSEC      18
-#define IP_TRANSPARENT  19
-
-/* BSD compatibility */
-#define IP_RECVRETOPTS  IP_RETOPTS
-
-/* TProxy original addresses */
-#define IP_ORIGDSTADDR       20
-#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
-
-#define IP_MINTTL       21
-#define IP_NODEFRAG     22
-
-/* IP_MTU_DISCOVER values */
-#define IP_PMTUDISC_DONT                0       /* Never send DF frames */
-#define IP_PMTUDISC_WANT                1       /* Use per route hints  */
-#define IP_PMTUDISC_DO                  2       /* Always DF            */
-#define IP_PMTUDISC_PROBE               3       /* Ignore dst pmtu      */
-
-#define IP_MULTICAST_IF                 32
-#define IP_MULTICAST_TTL                33
-#define IP_MULTICAST_LOOP               34
-#define IP_ADD_MEMBERSHIP               35
-#define IP_DROP_MEMBERSHIP              36
-#define IP_UNBLOCK_SOURCE               37
-#define IP_BLOCK_SOURCE                 38
-#define IP_ADD_SOURCE_MEMBERSHIP        39
-#define IP_DROP_SOURCE_MEMBERSHIP       40
-#define IP_MSFILTER                     41
-#define MCAST_JOIN_GROUP                42
-#define MCAST_BLOCK_SOURCE              43
-#define MCAST_UNBLOCK_SOURCE            44
-#define MCAST_LEAVE_GROUP               45
-#define MCAST_JOIN_SOURCE_GROUP         46
-#define MCAST_LEAVE_SOURCE_GROUP        47
-#define MCAST_MSFILTER                  48
-#define IP_MULTICAST_ALL                49
-#define IP_UNICAST_IF                   50
-
-#define MCAST_EXCLUDE   0
-#define MCAST_INCLUDE   1
-
-/* These need to appear somewhere around here */
-#define IP_DEFAULT_MULTICAST_TTL        1
-#define IP_DEFAULT_MULTICAST_LOOP       1
-
-/* Request struct for multicast socket ops */
-
-struct ip_mreq  {
-        struct in_addr imr_multiaddr;   /* IP multicast address of group */
-        struct in_addr imr_interface;   /* local IP address of interface */
-};
-
-struct ip_mreqn {
-        struct in_addr  imr_multiaddr;          /* IP multicast address of group */
-        struct in_addr  imr_address;            /* local IP address of interface */
-        int             imr_ifindex;            /* Interface index */
-};
-
-struct ip_mreq_source {
-        __be32          imr_multiaddr;
-        __be32          imr_interface;
-        __be32          imr_sourceaddr;
-};
-
-struct ip_msfilter {
-        __be32          imsf_multiaddr;
-        __be32          imsf_interface;
-        __u32           imsf_fmode;
-        __u32           imsf_numsrc;
-        __be32          imsf_slist[1];
-};
-
-#define IP_MSFILTER_SIZE(numsrc) \
-        (sizeof(struct ip_msfilter) - sizeof(__u32) \
-        + (numsrc) * sizeof(__u32))
-
-struct group_req {
-        __u32                            gr_interface;  /* interface index */
-        struct __kernel_sockaddr_storage gr_group;      /* group address */
-};
-
-struct group_source_req {
-        __u32                            gsr_interface; /* interface index */
-        struct __kernel_sockaddr_storage gsr_group;     /* group address */
-        struct __kernel_sockaddr_storage gsr_source;    /* source address */
-};
-
-struct group_filter {
-        __u32                            gf_interface;  /* interface index */
-        struct __kernel_sockaddr_storage gf_group;      /* multicast address */
-        __u32                            gf_fmode;      /* filter mode */
-        __u32                            gf_numsrc;     /* number of sources */
-        struct __kernel_sockaddr_storage gf_slist[1];   /* interface index */
-};
-
-#define GROUP_FILTER_SIZE(numsrc) \
-        (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
-        + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
-
-struct in_pktinfo {
-        int             ipi_ifindex;
-        struct in_addr  ipi_spec_dst;
-        struct in_addr  ipi_addr;
-};
-
-/* Structure describing an Internet (IP) socket address. */
-#define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
-struct sockaddr_in {
-  __kernel_sa_family_t  sin_family;     /* Address family               */
-  __be16                sin_port;       /* Port number                  */
-  struct in_addr        sin_addr;       /* Internet address             */
-
-  /* Pad to size of `struct sockaddr'. */
-  unsigned char         __pad[__SOCK_SIZE__ - sizeof(short int) -
-                        sizeof(unsigned short int) - sizeof(struct in_addr)];
-};
-#define sin_zero        __pad           /* for BSD UNIX comp. -FvK      */
-
-
-/*
- * Definitions of the bits in an Internet address integer.
- * On subnets, host and network parts are found according
- * to the subnet mask, not these masks.
- */
-#define IN_CLASSA(a)            ((((long int) (a)) & 0x80000000) == 0)
-#define IN_CLASSA_NET           0xff000000
-#define IN_CLASSA_NSHIFT        24
-#define IN_CLASSA_HOST          (0xffffffff & ~IN_CLASSA_NET)
-#define IN_CLASSA_MAX           128
-
-#define IN_CLASSB(a)            ((((long int) (a)) & 0xc0000000) == 0x80000000)
-#define IN_CLASSB_NET           0xffff0000
-#define IN_CLASSB_NSHIFT        16
-#define IN_CLASSB_HOST          (0xffffffff & ~IN_CLASSB_NET)
-#define IN_CLASSB_MAX           65536
-
-#define IN_CLASSC(a)            ((((long int) (a)) & 0xe0000000) == 0xc0000000)
-#define IN_CLASSC_NET           0xffffff00
-#define IN_CLASSC_NSHIFT        8
-#define IN_CLASSC_HOST          (0xffffffff & ~IN_CLASSC_NET)
-
-#define IN_CLASSD(a)            ((((long int) (a)) & 0xf0000000) == 0xe0000000)
-#define IN_MULTICAST(a)         IN_CLASSD(a)
-#define IN_MULTICAST_NET        0xF0000000
-
-#define IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-#define IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
-
-/* Address to accept any incoming messages. */
-#define INADDR_ANY              ((unsigned long int) 0x00000000)
-
-/* Address to send to all hosts. */
-#define INADDR_BROADCAST        ((unsigned long int) 0xffffffff)
-
-/* Address indicating an error return. */
-#define INADDR_NONE             ((unsigned long int) 0xffffffff)
-
-/* Network number for local host loopback. */
-#define IN_LOOPBACKNET          127
-
-/* Address to loopback in software to local host.  */
-#define INADDR_LOOPBACK         0x7f000001      /* 127.0.0.1   */
-#define IN_LOOPBACK(a)          ((((long int) (a)) & 0xff000000) == 0x7f000000)
-
-/* Defines for Multicast INADDR */
-#define INADDR_UNSPEC_GROUP     0xe0000000U     /* 224.0.0.0   */
-#define INADDR_ALLHOSTS_GROUP   0xe0000001U     /* 224.0.0.1   */
-#define INADDR_ALLRTRS_GROUP    0xe0000002U     /* 224.0.0.2 */
-#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU     /* 224.0.0.255 */
-
-
-/* <asm/byteorder.h> contains the htonl type stuff.. */
-#include <asm/byteorder.h> 
-
-#ifdef __KERNEL__
 
 #include <linux/errno.h>
+#include <uapi/linux/in.h>
 
 static inline int proto_ports_offset(int proto)
 {
@@ -332,6 +101,4 @@ static inline bool ipv4_is_test_198(__be32 addr)
 {
         return (addr & htonl(0xfffe0000)) == htonl(0xc6120000);
 }
-#endif
-
 #endif  /* _LINUX_IN_H */
diff --git a/include/linux/in6.h b/include/linux/in6.h
index cba469ba11a4..9e2ae26fb598 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -17,32 +17,11 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IN6_H
 #define _LINUX_IN6_H
 
-#include <linux/types.h>
-
-/*
- *      IPv6 address structure
- */
-
-struct in6_addr {
-        union {
-                __u8            u6_addr8[16];
-                __be16          u6_addr16[8];
-                __be32          u6_addr32[4];
-        } in6_u;
-#define s6_addr                 in6_u.u6_addr8
-#define s6_addr16               in6_u.u6_addr16
-#define s6_addr32               in6_u.u6_addr32
-};
+#include <uapi/linux/in6.h>
 
-/* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553
- * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
- * in network byte order, not in host byte order as are the IPv4 equivalents
- */
-#ifdef __KERNEL__
 extern const struct in6_addr in6addr_any;
 #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
 extern const struct in6_addr in6addr_loopback;
@@ -54,238 +33,3 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
 #define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
                 { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
 #endif
-
-struct sockaddr_in6 {
-        unsigned short int      sin6_family;    /* AF_INET6 */
-        __be16                  sin6_port;      /* Transport layer port # */
-        __be32                  sin6_flowinfo;  /* IPv6 flow information */
-        struct in6_addr         sin6_addr;      /* IPv6 address */
-        __u32                   sin6_scope_id;  /* scope id (new in RFC2553) */
-};
-
-struct ipv6_mreq {
-        /* IPv6 multicast address of group */
-        struct in6_addr ipv6mr_multiaddr;
-
-        /* local IPv6 address of interface */
-        int             ipv6mr_ifindex;
-};
-
-#define ipv6mr_acaddr   ipv6mr_multiaddr
-
-struct in6_flowlabel_req {
-        struct in6_addr flr_dst;
-        __be32  flr_label;
-        __u8    flr_action;
-        __u8    flr_share;
-        __u16   flr_flags;
-        __u16   flr_expires;
-        __u16   flr_linger;
-        __u32   __flr_pad;
-        /* Options in format of IPV6_PKTOPTIONS */
-};
-
-#define IPV6_FL_A_GET   0
-#define IPV6_FL_A_PUT   1
-#define IPV6_FL_A_RENEW 2
-
-#define IPV6_FL_F_CREATE        1
-#define IPV6_FL_F_EXCL          2
-
-#define IPV6_FL_S_NONE          0
-#define IPV6_FL_S_EXCL          1
-#define IPV6_FL_S_PROCESS       2
-#define IPV6_FL_S_USER          3
-#define IPV6_FL_S_ANY           255
-
-
-/*
- *      Bitmask constant declarations to help applications select out the 
- *      flow label and priority fields.
- *
- *      Note that this are in host byte order while the flowinfo field of
- *      sockaddr_in6 is in network byte order.
- */
-
-#define IPV6_FLOWINFO_FLOWLABEL         0x000fffff
-#define IPV6_FLOWINFO_PRIORITY          0x0ff00000
-
-/* These definitions are obsolete */
-#define IPV6_PRIORITY_UNCHARACTERIZED   0x0000
-#define IPV6_PRIORITY_FILLER            0x0100
-#define IPV6_PRIORITY_UNATTENDED        0x0200
-#define IPV6_PRIORITY_RESERVED1         0x0300
-#define IPV6_PRIORITY_BULK              0x0400
-#define IPV6_PRIORITY_RESERVED2         0x0500
-#define IPV6_PRIORITY_INTERACTIVE       0x0600
-#define IPV6_PRIORITY_CONTROL           0x0700
-#define IPV6_PRIORITY_8                 0x0800
-#define IPV6_PRIORITY_9                 0x0900
-#define IPV6_PRIORITY_10                0x0a00
-#define IPV6_PRIORITY_11                0x0b00
-#define IPV6_PRIORITY_12                0x0c00
-#define IPV6_PRIORITY_13                0x0d00
-#define IPV6_PRIORITY_14                0x0e00
-#define IPV6_PRIORITY_15                0x0f00
-
-/*
- *      IPV6 extension headers
- */
-#define IPPROTO_HOPOPTS         0       /* IPv6 hop-by-hop options      */
-#define IPPROTO_ROUTING         43      /* IPv6 routing header          */
-#define IPPROTO_FRAGMENT        44      /* IPv6 fragmentation header    */
-#define IPPROTO_ICMPV6          58      /* ICMPv6                       */
-#define IPPROTO_NONE            59      /* IPv6 no next header          */
-#define IPPROTO_DSTOPTS         60      /* IPv6 destination options     */
-#define IPPROTO_MH              135     /* IPv6 mobility header         */
-
-/*
- *      IPv6 TLV options.
- */
-#define IPV6_TLV_PAD1           0
-#define IPV6_TLV_PADN           1
-#define IPV6_TLV_ROUTERALERT    5
-#define IPV6_TLV_JUMBO          194
-#define IPV6_TLV_HAO            201     /* home address option */
-
-/*
- *      IPV6 socket options
- */
-
-#define IPV6_ADDRFORM           1
-#define IPV6_2292PKTINFO        2
-#define IPV6_2292HOPOPTS        3
-#define IPV6_2292DSTOPTS        4
-#define IPV6_2292RTHDR          5
-#define IPV6_2292PKTOPTIONS     6
-#define IPV6_CHECKSUM           7
-#define IPV6_2292HOPLIMIT       8
-#define IPV6_NEXTHOP            9
-#define IPV6_AUTHHDR            10      /* obsolete */
-#define IPV6_FLOWINFO           11
-
-#define IPV6_UNICAST_HOPS       16
-#define IPV6_MULTICAST_IF       17
-#define IPV6_MULTICAST_HOPS     18
-#define IPV6_MULTICAST_LOOP     19
-#define IPV6_ADD_MEMBERSHIP     20
-#define IPV6_DROP_MEMBERSHIP    21
-#define IPV6_ROUTER_ALERT       22
-#define IPV6_MTU_DISCOVER       23
-#define IPV6_MTU                24
-#define IPV6_RECVERR            25
-#define IPV6_V6ONLY             26
-#define IPV6_JOIN_ANYCAST       27
-#define IPV6_LEAVE_ANYCAST      28
-
-/* IPV6_MTU_DISCOVER values */
-#define IPV6_PMTUDISC_DONT              0
-#define IPV6_PMTUDISC_WANT              1
-#define IPV6_PMTUDISC_DO                2
-#define IPV6_PMTUDISC_PROBE             3
-
-/* Flowlabel */
-#define IPV6_FLOWLABEL_MGR      32
-#define IPV6_FLOWINFO_SEND      33
-
-#define IPV6_IPSEC_POLICY       34
-#define IPV6_XFRM_POLICY        35
-
-/*
- * Multicast:
- * Following socket options are shared between IPv4 and IPv6.
- *
- * MCAST_JOIN_GROUP             42
- * MCAST_BLOCK_SOURCE           43
- * MCAST_UNBLOCK_SOURCE         44
- * MCAST_LEAVE_GROUP            45
- * MCAST_JOIN_SOURCE_GROUP      46
- * MCAST_LEAVE_SOURCE_GROUP     47
- * MCAST_MSFILTER               48
- */
-
-/*
- * Advanced API (RFC3542) (1)
- *
- * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
- */
-
-#define IPV6_RECVPKTINFO        49
-#define IPV6_PKTINFO            50
-#define IPV6_RECVHOPLIMIT       51
-#define IPV6_HOPLIMIT           52
-#define IPV6_RECVHOPOPTS        53
-#define IPV6_HOPOPTS            54
-#define IPV6_RTHDRDSTOPTS       55
-#define IPV6_RECVRTHDR          56
-#define IPV6_RTHDR              57
-#define IPV6_RECVDSTOPTS        58
-#define IPV6_DSTOPTS            59
-#define IPV6_RECVPATHMTU        60
-#define IPV6_PATHMTU            61
-#define IPV6_DONTFRAG           62
-#if 0   /* not yet */
-#define IPV6_USE_MIN_MTU        63
-#endif
-
-/*
- * Netfilter (1)
- *
- * Following socket options are used in ip6_tables;
- * see include/linux/netfilter_ipv6/ip6_tables.h.
- *
- * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO               64
- * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES       65
- */
-
-/*
- * Advanced API (RFC3542) (2)
- */
-#define IPV6_RECVTCLASS         66
-#define IPV6_TCLASS             67
-
-/*
- * Netfilter (2)
- *
- * Following socket options are used in ip6_tables;
- * see include/linux/netfilter_ipv6/ip6_tables.h.
- *
- * IP6T_SO_GET_REVISION_MATCH   68
- * IP6T_SO_GET_REVISION_TARGET  69
- */
-
-/* RFC5014: Source address selection */
-#define IPV6_ADDR_PREFERENCES   72
-
-#define IPV6_PREFER_SRC_TMP             0x0001
-#define IPV6_PREFER_SRC_PUBLIC          0x0002
-#define IPV6_PREFER_SRC_PUBTMP_DEFAULT  0x0100
-#define IPV6_PREFER_SRC_COA             0x0004
-#define IPV6_PREFER_SRC_HOME            0x0400
-#define IPV6_PREFER_SRC_CGA             0x0008
-#define IPV6_PREFER_SRC_NONCGA          0x0800
-
-/* RFC5082: Generalized Ttl Security Mechanism */
-#define IPV6_MINHOPCOUNT                73
-
-#define IPV6_ORIGDSTADDR        74
-#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
-#define IPV6_TRANSPARENT        75
-#define IPV6_UNICAST_IF         76
-
-/*
- * Multicast Routing:
- * see include/linux/mroute6.h.
- *
- * MRT6_INIT                    200
- * MRT6_DONE                    201
- * MRT6_ADD_MIF                 202
- * MRT6_DEL_MIF                 203
- * MRT6_ADD_MFC                 204
- * MRT6_DEL_MFC                 205
- * MRT6_VERSION                 206
- * MRT6_ASSERT                  207
- * MRT6_PIM                     208
- * (reserved)                   209
- */
-#endif
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index e788c186ed3a..46da02410a09 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -1,138 +1,8 @@
 #ifndef _INET_DIAG_H_
 #define _INET_DIAG_H_ 1
 
-#include <linux/types.h>
+#include <uapi/linux/inet_diag.h>
 
-/* Just some random number */
-#define TCPDIAG_GETSOCK 18
-#define DCCPDIAG_GETSOCK 19
-
-#define INET_DIAG_GETSOCK_MAX 24
-
-/* Socket identity */
-struct inet_diag_sockid {
-        __be16  idiag_sport;
-        __be16  idiag_dport;
-        __be32  idiag_src[4];
-        __be32  idiag_dst[4];
-        __u32   idiag_if;
-        __u32   idiag_cookie[2];
-#define INET_DIAG_NOCOOKIE (~0U)
-};
-
-/* Request structure */
-
-struct inet_diag_req {
-        __u8    idiag_family;           /* Family of addresses. */
-        __u8    idiag_src_len;
-        __u8    idiag_dst_len;
-        __u8    idiag_ext;              /* Query extended information */
-
-        struct inet_diag_sockid id;
-
-        __u32   idiag_states;           /* States to dump */
-        __u32   idiag_dbs;              /* Tables to dump (NI) */
-};
-
-struct inet_diag_req_v2 {
-        __u8    sdiag_family;
-        __u8    sdiag_protocol;
-        __u8    idiag_ext;
-        __u8    pad;
-        __u32   idiag_states;
-        struct inet_diag_sockid id;
-};
-
-enum {
-        INET_DIAG_REQ_NONE,
-        INET_DIAG_REQ_BYTECODE,
-};
-
-#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE
-
-/* Bytecode is sequence of 4 byte commands followed by variable arguments.
- * All the commands identified by "code" are conditional jumps forward:
- * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
- * length of the command and its arguments.
- */
- 
-struct inet_diag_bc_op {
-        unsigned char   code;
-        unsigned char   yes;
-        unsigned short  no;
-};
-
-enum {
-        INET_DIAG_BC_NOP,
-        INET_DIAG_BC_JMP,
-        INET_DIAG_BC_S_GE,
-        INET_DIAG_BC_S_LE,
-        INET_DIAG_BC_D_GE,
-        INET_DIAG_BC_D_LE,
-        INET_DIAG_BC_AUTO,
-        INET_DIAG_BC_S_COND,
-        INET_DIAG_BC_D_COND,
-};
-
-struct inet_diag_hostcond {
-        __u8    family;
-        __u8    prefix_len;
-        int     port;
-        __be32  addr[0];
-};
-
-/* Base info structure. It contains socket identity (addrs/ports/cookie)
- * and, alas, the information shown by netstat. */
-struct inet_diag_msg {
-        __u8    idiag_family;
-        __u8    idiag_state;
-        __u8    idiag_timer;
-        __u8    idiag_retrans;
-
-        struct inet_diag_sockid id;
-
-        __u32   idiag_expires;
-        __u32   idiag_rqueue;
-        __u32   idiag_wqueue;
-        __u32   idiag_uid;
-        __u32   idiag_inode;
-};
-
-/* Extensions */
-
-enum {
-        INET_DIAG_NONE,
-        INET_DIAG_MEMINFO,
-        INET_DIAG_INFO,
-        INET_DIAG_VEGASINFO,
-        INET_DIAG_CONG,
-        INET_DIAG_TOS,
-        INET_DIAG_TCLASS,
-        INET_DIAG_SKMEMINFO,
-};
-
-#define INET_DIAG_MAX INET_DIAG_SKMEMINFO
-
-
-/* INET_DIAG_MEM */
-
-struct inet_diag_meminfo {
-        __u32   idiag_rmem;
-        __u32   idiag_wmem;
-        __u32   idiag_fmem;
-        __u32   idiag_tmem;
-};
-
-/* INET_DIAG_VEGASINFO */
-
-struct tcpvegas_info {
-        __u32   tcpv_enabled;
-        __u32   tcpv_rttcnt;
-        __u32   tcpv_rtt;
-        __u32   tcpv_minrtt;
-};
-
-#ifdef __KERNEL__
 struct sock;
 struct inet_hashinfo;
 struct nlattr;
@@ -173,6 +43,4 @@ int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);
 
 extern int  inet_diag_register(const struct inet_diag_handler *handler);
 extern void inet_diag_unregister(const struct inet_diag_handler *handler);
-#endif /* __KERNEL__ */
-
 #endif /* _INET_DIAG_H_ */
diff --git a/include/linux/init.h b/include/linux/init.h
index 5e664f671615..e59041e21df3 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -43,11 +43,22 @@
    discard it in modules) */
 #define __init          __section(.init.text) __cold notrace
 #define __initdata      __section(.init.data)
-#define __initconst     __section(.init.rodata)
+#define __initconst     __constsection(.init.rodata)
 #define __exitdata      __section(.exit.data)
 #define __exit_call     __used __section(.exitcall.exit)
 
 /*
+ * Some architecture have tool chains which do not handle rodata attributes
+ * correctly. For those disable special sections for const, so that other
+ * architectures can annotate correctly.
+ */
+#ifdef CONFIG_BROKEN_RODATA
+#define __constsection(x)
+#else
+#define __constsection(x) __section(x)
+#endif
+
+/*
  * modpost check for section mismatches during the kernel build.
  * A section mismatch happens when there are references from a
  * code or data section to an init section (both code or data).
@@ -66,7 +77,7 @@
  */
 #define __ref            __section(.ref.text) noinline
 #define __refdata        __section(.ref.data)
-#define __refconst       __section(.ref.rodata)
+#define __refconst       __constsection(.ref.rodata)
 
 /* compatibility defines */
 #define __init_refok     __ref
@@ -85,26 +96,26 @@
 /* Used for HOTPLUG */
 #define __devinit        __section(.devinit.text) __cold notrace
 #define __devinitdata    __section(.devinit.data)
-#define __devinitconst   __section(.devinit.rodata)
+#define __devinitconst   __constsection(.devinit.rodata)
 #define __devexit        __section(.devexit.text) __exitused __cold notrace
 #define __devexitdata    __section(.devexit.data)
-#define __devexitconst   __section(.devexit.rodata)
+#define __devexitconst   __constsection(.devexit.rodata)
 
 /* Used for HOTPLUG_CPU */
 #define __cpuinit        __section(.cpuinit.text) __cold notrace
 #define __cpuinitdata    __section(.cpuinit.data)
-#define __cpuinitconst   __section(.cpuinit.rodata)
+#define __cpuinitconst   __constsection(.cpuinit.rodata)
 #define __cpuexit        __section(.cpuexit.text) __exitused __cold notrace
 #define __cpuexitdata    __section(.cpuexit.data)
-#define __cpuexitconst   __section(.cpuexit.rodata)
+#define __cpuexitconst   __constsection(.cpuexit.rodata)
 
 /* Used for MEMORY_HOTPLUG */
 #define __meminit        __section(.meminit.text) __cold notrace
 #define __meminitdata    __section(.meminit.data)
-#define __meminitconst   __section(.meminit.rodata)
+#define __meminitconst   __constsection(.meminit.rodata)
 #define __memexit        __section(.memexit.text) __exitused __cold notrace
 #define __memexitdata    __section(.memexit.data)
-#define __memexitconst   __section(.memexit.rodata)
+#define __memexitconst   __constsection(.memexit.rodata)
 
 /* For assembly routines */
 #define __HEAD          .section        ".head.text","ax"
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index d33041e2a42a..23aede0b5843 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -3,75 +3,12 @@
  *
  * Copyright (C) 2005 John McCutchan
  */
-
 #ifndef _LINUX_INOTIFY_H
 #define _LINUX_INOTIFY_H
 
-/* For O_CLOEXEC and O_NONBLOCK */
-#include <linux/fcntl.h>
-#include <linux/types.h>
-
-/*
- * struct inotify_event - structure read from the inotify device for each event
- *
- * When you are watching a directory, you will receive the filename for events
- * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
- */
-struct inotify_event {
-        __s32           wd;             /* watch descriptor */
-        __u32           mask;           /* watch mask */
-        __u32           cookie;         /* cookie to synchronize two events */
-        __u32           len;            /* length (including nulls) of name */
-        char            name[0];        /* stub for possible name */
-};
-
-/* the following are legal, implemented events that user-space can watch for */
-#define IN_ACCESS               0x00000001      /* File was accessed */
-#define IN_MODIFY               0x00000002      /* File was modified */
-#define IN_ATTRIB               0x00000004      /* Metadata changed */
-#define IN_CLOSE_WRITE          0x00000008      /* Writtable file was closed */
-#define IN_CLOSE_NOWRITE        0x00000010      /* Unwrittable file closed */
-#define IN_OPEN                 0x00000020      /* File was opened */
-#define IN_MOVED_FROM           0x00000040      /* File was moved from X */
-#define IN_MOVED_TO             0x00000080      /* File was moved to Y */
-#define IN_CREATE               0x00000100      /* Subfile was created */
-#define IN_DELETE               0x00000200      /* Subfile was deleted */
-#define IN_DELETE_SELF          0x00000400      /* Self was deleted */
-#define IN_MOVE_SELF            0x00000800      /* Self was moved */
-
-/* the following are legal events.  they are sent as needed to any watch */
-#define IN_UNMOUNT              0x00002000      /* Backing fs was unmounted */
-#define IN_Q_OVERFLOW           0x00004000      /* Event queued overflowed */
-#define IN_IGNORED              0x00008000      /* File was ignored */
-
-/* helper events */
-#define IN_CLOSE                (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
-#define IN_MOVE                 (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
-
-/* special flags */
-#define IN_ONLYDIR              0x01000000      /* only watch the path if it is a directory */
-#define IN_DONT_FOLLOW          0x02000000      /* don't follow a sym link */
-#define IN_EXCL_UNLINK          0x04000000      /* exclude events on unlinked objects */
-#define IN_MASK_ADD             0x20000000      /* add to the mask of an already existing watch */
-#define IN_ISDIR                0x40000000      /* event occurred against dir */
-#define IN_ONESHOT              0x80000000      /* only send event once */
-
-/*
- * All of the events - we build the list by hand so that we can add flags in
- * the future and not break backward compatibility.  Apps will get only the
- * events that they originally wanted.  Be sure to add new events here!
- */
-#define IN_ALL_EVENTS   (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
-                         IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
-                         IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
-                         IN_MOVE_SELF)
-
-/* Flags for sys_inotify_init1.  */
-#define IN_CLOEXEC O_CLOEXEC
-#define IN_NONBLOCK O_NONBLOCK
-
-#ifdef __KERNEL__
 #include <linux/sysctl.h>
+#include <uapi/linux/inotify.h>
+
 extern struct ctl_table inotify_table[]; /* for sysctl */
 
 #define ALL_INOTIFY_BITS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
@@ -82,6 +19,4 @@ extern struct ctl_table inotify_table[]; /* for sysctl */
                           IN_DONT_FOLLOW | IN_EXCL_UNLINK | IN_MASK_ADD | \
                           IN_ISDIR | IN_ONESHOT)
 
-#endif
-
 #endif  /* _LINUX_INOTIFY_H */
diff --git a/include/linux/input.h b/include/linux/input.h
index ba4874302939..cab994ba6d91 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1,6 +1,3 @@
-#ifndef _INPUT_H
-#define _INPUT_H
-
 /*
  * Copyright (c) 1999-2002 Vojtech Pavlik
  *
@@ -8,1156 +5,15 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
+#ifndef _INPUT_H
+#define _INPUT_H
 
-#ifdef __KERNEL__
 #include <linux/time.h>
 #include <linux/list.h>
-#else
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <linux/types.h>
-#endif
-
-/*
- * The event structure itself
- */
-
-struct input_event {
-        struct timeval time;
-        __u16 type;
-        __u16 code;
-        __s32 value;
-};
-
-/*
- * Protocol version.
- */
-
-#define EV_VERSION              0x010001
-
-/*
- * IOCTLs (0x00 - 0x7f)
- */
-
-struct input_id {
-        __u16 bustype;
-        __u16 vendor;
-        __u16 product;
-        __u16 version;
-};
-
-/**
- * struct input_absinfo - used by EVIOCGABS/EVIOCSABS ioctls
- * @value: latest reported value for the axis.
- * @minimum: specifies minimum value for the axis.
- * @maximum: specifies maximum value for the axis.
- * @fuzz: specifies fuzz value that is used to filter noise from
- *      the event stream.
- * @flat: values that are within this value will be discarded by
- *      joydev interface and reported as 0 instead.
- * @resolution: specifies resolution for the values reported for
- *      the axis.
- *
- * Note that input core does not clamp reported values to the
- * [minimum, maximum] limits, such task is left to userspace.
- *
- * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
- * units per millimeter (units/mm), resolution for rotational axes
- * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
- */
-struct input_absinfo {
-        __s32 value;
-        __s32 minimum;
-        __s32 maximum;
-        __s32 fuzz;
-        __s32 flat;
-        __s32 resolution;
-};
-
-/**
- * struct input_keymap_entry - used by EVIOCGKEYCODE/EVIOCSKEYCODE ioctls
- * @scancode: scancode represented in machine-endian form.
- * @len: length of the scancode that resides in @scancode buffer.
- * @index: index in the keymap, may be used instead of scancode
- * @flags: allows to specify how kernel should handle the request. For
- *      example, setting INPUT_KEYMAP_BY_INDEX flag indicates that kernel
- *      should perform lookup in keymap by @index instead of @scancode
- * @keycode: key code assigned to this scancode
- *
- * The structure is used to retrieve and modify keymap data. Users have
- * option of performing lookup either by @scancode itself or by @index
- * in keymap entry. EVIOCGKEYCODE will also return scancode or index
- * (depending on which element was used to perform lookup).
- */
-struct input_keymap_entry {
-#define INPUT_KEYMAP_BY_INDEX   (1 << 0)
-        __u8  flags;
-        __u8  len;
-        __u16 index;
-        __u32 keycode;
-        __u8  scancode[32];
-};
-
-#define EVIOCGVERSION           _IOR('E', 0x01, int)                    /* get driver version */
-#define EVIOCGID                _IOR('E', 0x02, struct input_id)        /* get device ID */
-#define EVIOCGREP               _IOR('E', 0x03, unsigned int[2])        /* get repeat settings */
-#define EVIOCSREP               _IOW('E', 0x03, unsigned int[2])        /* set repeat settings */
-
-#define EVIOCGKEYCODE           _IOR('E', 0x04, unsigned int[2])        /* get keycode */
-#define EVIOCGKEYCODE_V2        _IOR('E', 0x04, struct input_keymap_entry)
-#define EVIOCSKEYCODE           _IOW('E', 0x04, unsigned int[2])        /* set keycode */
-#define EVIOCSKEYCODE_V2        _IOW('E', 0x04, struct input_keymap_entry)
-
-#define EVIOCGNAME(len)         _IOC(_IOC_READ, 'E', 0x06, len)         /* get device name */
-#define EVIOCGPHYS(len)         _IOC(_IOC_READ, 'E', 0x07, len)         /* get physical location */
-#define EVIOCGUNIQ(len)         _IOC(_IOC_READ, 'E', 0x08, len)         /* get unique identifier */
-#define EVIOCGPROP(len)         _IOC(_IOC_READ, 'E', 0x09, len)         /* get device properties */
-
-/**
- * EVIOCGMTSLOTS(len) - get MT slot values
- * @len: size of the data buffer in bytes
- *
- * The ioctl buffer argument should be binary equivalent to
- *
- * struct input_mt_request_layout {
- *      __u32 code;
- *      __s32 values[num_slots];
- * };
- *
- * where num_slots is the (arbitrary) number of MT slots to extract.
- *
- * The ioctl size argument (len) is the size of the buffer, which
- * should satisfy len = (num_slots + 1) * sizeof(__s32).  If len is
- * too small to fit all available slots, the first num_slots are
- * returned.
- *
- * Before the call, code is set to the wanted ABS_MT event type. On
- * return, values[] is filled with the slot values for the specified
- * ABS_MT code.
- *
- * If the request code is not an ABS_MT value, -EINVAL is returned.
- */
-#define EVIOCGMTSLOTS(len)      _IOC(_IOC_READ, 'E', 0x0a, len)
-
-#define EVIOCGKEY(len)          _IOC(_IOC_READ, 'E', 0x18, len)         /* get global key state */
-#define EVIOCGLED(len)          _IOC(_IOC_READ, 'E', 0x19, len)         /* get all LEDs */
-#define EVIOCGSND(len)          _IOC(_IOC_READ, 'E', 0x1a, len)         /* get all sounds status */
-#define EVIOCGSW(len)           _IOC(_IOC_READ, 'E', 0x1b, len)         /* get all switch states */
-
-#define EVIOCGBIT(ev,len)       _IOC(_IOC_READ, 'E', 0x20 + (ev), len)  /* get event bits */
-#define EVIOCGABS(abs)          _IOR('E', 0x40 + (abs), struct input_absinfo)   /* get abs value/limits */
-#define EVIOCSABS(abs)          _IOW('E', 0xc0 + (abs), struct input_absinfo)   /* set abs value/limits */
-
-#define EVIOCSFF                _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))   /* send a force effect to a force feedback device */
-#define EVIOCRMFF               _IOW('E', 0x81, int)                    /* Erase a force effect */
-#define EVIOCGEFFECTS           _IOR('E', 0x84, int)                    /* Report number of effects playable at the same time */
-
-#define EVIOCGRAB               _IOW('E', 0x90, int)                    /* Grab/Release device */
-
-#define EVIOCSCLOCKID           _IOW('E', 0xa0, int)                    /* Set clockid to be used for timestamps */
-
-/*
- * Device properties and quirks
- */
-
-#define INPUT_PROP_POINTER              0x00    /* needs a pointer */
-#define INPUT_PROP_DIRECT               0x01    /* direct input devices */
-#define INPUT_PROP_BUTTONPAD            0x02    /* has button(s) under pad */
-#define INPUT_PROP_SEMI_MT              0x03    /* touch rectangle only */
-
-#define INPUT_PROP_MAX                  0x1f
-#define INPUT_PROP_CNT                  (INPUT_PROP_MAX + 1)
-
-/*
- * Event types
- */
-
-#define EV_SYN                  0x00
-#define EV_KEY                  0x01
-#define EV_REL                  0x02
-#define EV_ABS                  0x03
-#define EV_MSC                  0x04
-#define EV_SW                   0x05
-#define EV_LED                  0x11
-#define EV_SND                  0x12
-#define EV_REP                  0x14
-#define EV_FF                   0x15
-#define EV_PWR                  0x16
-#define EV_FF_STATUS            0x17
-#define EV_MAX                  0x1f
-#define EV_CNT                  (EV_MAX+1)
-
-/*
- * Synchronization events.
- */
-
-#define SYN_REPORT              0
-#define SYN_CONFIG              1
-#define SYN_MT_REPORT           2
-#define SYN_DROPPED             3
-
-/*
- * Keys and buttons
- *
- * Most of the keys/buttons are modeled after USB HUT 1.12
- * (see http://www.usb.org/developers/hidpage).
- * Abbreviations in the comments:
- * AC - Application Control
- * AL - Application Launch Button
- * SC - System Control
- */
-
-#define KEY_RESERVED            0
-#define KEY_ESC                 1
-#define KEY_1                   2
-#define KEY_2                   3
-#define KEY_3                   4
-#define KEY_4                   5
-#define KEY_5                   6
-#define KEY_6                   7
-#define KEY_7                   8
-#define KEY_8                   9
-#define KEY_9                   10
-#define KEY_0                   11
-#define KEY_MINUS               12
-#define KEY_EQUAL               13
-#define KEY_BACKSPACE           14
-#define KEY_TAB                 15
-#define KEY_Q                   16
-#define KEY_W                   17
-#define KEY_E                   18
-#define KEY_R                   19
-#define KEY_T                   20
-#define KEY_Y                   21
-#define KEY_U                   22
-#define KEY_I                   23
-#define KEY_O                   24
-#define KEY_P                   25
-#define KEY_LEFTBRACE           26
-#define KEY_RIGHTBRACE          27
-#define KEY_ENTER               28
-#define KEY_LEFTCTRL            29
-#define KEY_A                   30
-#define KEY_S                   31
-#define KEY_D                   32
-#define KEY_F                   33
-#define KEY_G                   34
-#define KEY_H                   35
-#define KEY_J                   36
-#define KEY_K                   37
-#define KEY_L                   38
-#define KEY_SEMICOLON           39
-#define KEY_APOSTROPHE          40
-#define KEY_GRAVE               41
-#define KEY_LEFTSHIFT           42
-#define KEY_BACKSLASH           43
-#define KEY_Z                   44
-#define KEY_X                   45
-#define KEY_C                   46
-#define KEY_V                   47
-#define KEY_B                   48
-#define KEY_N                   49
-#define KEY_M                   50
-#define KEY_COMMA               51
-#define KEY_DOT                 52
-#define KEY_SLASH               53
-#define KEY_RIGHTSHIFT          54
-#define KEY_KPASTERISK          55
-#define KEY_LEFTALT             56
-#define KEY_SPACE               57
-#define KEY_CAPSLOCK            58
-#define KEY_F1                  59
-#define KEY_F2                  60
-#define KEY_F3                  61
-#define KEY_F4                  62
-#define KEY_F5                  63
-#define KEY_F6                  64
-#define KEY_F7                  65
-#define KEY_F8                  66
-#define KEY_F9                  67
-#define KEY_F10                 68
-#define KEY_NUMLOCK             69
-#define KEY_SCROLLLOCK          70
-#define KEY_KP7                 71
-#define KEY_KP8                 72
-#define KEY_KP9                 73
-#define KEY_KPMINUS             74
-#define KEY_KP4                 75
-#define KEY_KP5                 76
-#define KEY_KP6                 77
-#define KEY_KPPLUS              78
-#define KEY_KP1                 79
-#define KEY_KP2                 80
-#define KEY_KP3                 81
-#define KEY_KP0                 82
-#define KEY_KPDOT               83
-
-#define KEY_ZENKAKUHANKAKU      85
-#define KEY_102ND               86
-#define KEY_F11                 87
-#define KEY_F12                 88
-#define KEY_RO                  89
-#define KEY_KATAKANA            90
-#define KEY_HIRAGANA            91
-#define KEY_HENKAN              92
-#define KEY_KATAKANAHIRAGANA    93
-#define KEY_MUHENKAN            94
-#define KEY_KPJPCOMMA           95
-#define KEY_KPENTER             96
-#define KEY_RIGHTCTRL           97
-#define KEY_KPSLASH             98
-#define KEY_SYSRQ               99
-#define KEY_RIGHTALT            100
-#define KEY_LINEFEED            101
-#define KEY_HOME                102
-#define KEY_UP                  103
-#define KEY_PAGEUP              104
-#define KEY_LEFT                105
-#define KEY_RIGHT               106
-#define KEY_END                 107
-#define KEY_DOWN                108
-#define KEY_PAGEDOWN            109
-#define KEY_INSERT              110
-#define KEY_DELETE              111
-#define KEY_MACRO               112
-#define KEY_MUTE                113
-#define KEY_VOLUMEDOWN          114
-#define KEY_VOLUMEUP            115
-#define KEY_POWER               116     /* SC System Power Down */
-#define KEY_KPEQUAL             117
-#define KEY_KPPLUSMINUS         118
-#define KEY_PAUSE               119
-#define KEY_SCALE               120     /* AL Compiz Scale (Expose) */
-
-#define KEY_KPCOMMA             121
-#define KEY_HANGEUL             122
-#define KEY_HANGUEL             KEY_HANGEUL
-#define KEY_HANJA               123
-#define KEY_YEN                 124
-#define KEY_LEFTMETA            125
-#define KEY_RIGHTMETA           126
-#define KEY_COMPOSE             127
-
-#define KEY_STOP                128     /* AC Stop */
-#define KEY_AGAIN               129
-#define KEY_PROPS               130     /* AC Properties */
-#define KEY_UNDO                131     /* AC Undo */
-#define KEY_FRONT               132
-#define KEY_COPY                133     /* AC Copy */
-#define KEY_OPEN                134     /* AC Open */
-#define KEY_PASTE               135     /* AC Paste */
-#define KEY_FIND                136     /* AC Search */
-#define KEY_CUT                 137     /* AC Cut */
-#define KEY_HELP                138     /* AL Integrated Help Center */
-#define KEY_MENU                139     /* Menu (show menu) */
-#define KEY_CALC                140     /* AL Calculator */
-#define KEY_SETUP               141
-#define KEY_SLEEP               142     /* SC System Sleep */
-#define KEY_WAKEUP              143     /* System Wake Up */
-#define KEY_FILE                144     /* AL Local Machine Browser */
-#define KEY_SENDFILE            145
-#define KEY_DELETEFILE          146
-#define KEY_XFER                147
-#define KEY_PROG1               148
-#define KEY_PROG2               149
-#define KEY_WWW                 150     /* AL Internet Browser */
-#define KEY_MSDOS               151
-#define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
-#define KEY_SCREENLOCK          KEY_COFFEE
-#define KEY_DIRECTION           153
-#define KEY_CYCLEWINDOWS        154
-#define KEY_MAIL                155
-#define KEY_BOOKMARKS           156     /* AC Bookmarks */
-#define KEY_COMPUTER            157
-#define KEY_BACK                158     /* AC Back */
-#define KEY_FORWARD             159     /* AC Forward */
-#define KEY_CLOSECD             160
-#define KEY_EJECTCD             161
-#define KEY_EJECTCLOSECD        162
-#define KEY_NEXTSONG            163
-#define KEY_PLAYPAUSE           164
-#define KEY_PREVIOUSSONG        165
-#define KEY_STOPCD              166
-#define KEY_RECORD              167
-#define KEY_REWIND              168
-#define KEY_PHONE               169     /* Media Select Telephone */
-#define KEY_ISO                 170
-#define KEY_CONFIG              171     /* AL Consumer Control Configuration */
-#define KEY_HOMEPAGE            172     /* AC Home */
-#define KEY_REFRESH             173     /* AC Refresh */
-#define KEY_EXIT                174     /* AC Exit */
-#define KEY_MOVE                175
-#define KEY_EDIT                176
-#define KEY_SCROLLUP            177
-#define KEY_SCROLLDOWN          178
-#define KEY_KPLEFTPAREN         179
-#define KEY_KPRIGHTPAREN        180
-#define KEY_NEW                 181     /* AC New */
-#define KEY_REDO                182     /* AC Redo/Repeat */
-
-#define KEY_F13                 183
-#define KEY_F14                 184
-#define KEY_F15                 185
-#define KEY_F16                 186
-#define KEY_F17                 187
-#define KEY_F18                 188
-#define KEY_F19                 189
-#define KEY_F20                 190
-#define KEY_F21                 191
-#define KEY_F22                 192
-#define KEY_F23                 193
-#define KEY_F24                 194
-
-#define KEY_PLAYCD              200
-#define KEY_PAUSECD             201
-#define KEY_PROG3               202
-#define KEY_PROG4               203
-#define KEY_DASHBOARD           204     /* AL Dashboard */
-#define KEY_SUSPEND             205
-#define KEY_CLOSE               206     /* AC Close */
-#define KEY_PLAY                207
-#define KEY_FASTFORWARD         208
-#define KEY_BASSBOOST           209
-#define KEY_PRINT               210     /* AC Print */
-#define KEY_HP                  211
-#define KEY_CAMERA              212
-#define KEY_SOUND               213
-#define KEY_QUESTION            214
-#define KEY_EMAIL               215
-#define KEY_CHAT                216
-#define KEY_SEARCH              217
-#define KEY_CONNECT             218
-#define KEY_FINANCE             219     /* AL Checkbook/Finance */
-#define KEY_SPORT               220
-#define KEY_SHOP                221
-#define KEY_ALTERASE            222
-#define KEY_CANCEL              223     /* AC Cancel */
-#define KEY_BRIGHTNESSDOWN      224
-#define KEY_BRIGHTNESSUP        225
-#define KEY_MEDIA               226
-
-#define KEY_SWITCHVIDEOMODE     227     /* Cycle between available video
-                                           outputs (Monitor/LCD/TV-out/etc) */
-#define KEY_KBDILLUMTOGGLE      228
-#define KEY_KBDILLUMDOWN        229
-#define KEY_KBDILLUMUP          230
-
-#define KEY_SEND                231     /* AC Send */
-#define KEY_REPLY               232     /* AC Reply */
-#define KEY_FORWARDMAIL         233     /* AC Forward Msg */
-#define KEY_SAVE                234     /* AC Save */
-#define KEY_DOCUMENTS           235
-
-#define KEY_BATTERY             236
-
-#define KEY_BLUETOOTH           237
-#define KEY_WLAN                238
-#define KEY_UWB                 239
-
-#define KEY_UNKNOWN             240
-
-#define KEY_VIDEO_NEXT          241     /* drive next video source */
-#define KEY_VIDEO_PREV          242     /* drive previous video source */
-#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
-#define KEY_BRIGHTNESS_ZERO     244     /* brightness off, use ambient */
-#define KEY_DISPLAY_OFF         245     /* display device to off state */
-
-#define KEY_WIMAX               246
-#define KEY_RFKILL              247     /* Key that controls all radios */
-
-#define KEY_MICMUTE             248     /* Mute / unmute the microphone */
-
-/* Code 255 is reserved for special needs of AT keyboard driver */
-
-#define BTN_MISC                0x100
-#define BTN_0                   0x100
-#define BTN_1                   0x101
-#define BTN_2                   0x102
-#define BTN_3                   0x103
-#define BTN_4                   0x104
-#define BTN_5                   0x105
-#define BTN_6                   0x106
-#define BTN_7                   0x107
-#define BTN_8                   0x108
-#define BTN_9                   0x109
-
-#define BTN_MOUSE               0x110
-#define BTN_LEFT                0x110
-#define BTN_RIGHT               0x111
-#define BTN_MIDDLE              0x112
-#define BTN_SIDE                0x113
-#define BTN_EXTRA               0x114
-#define BTN_FORWARD             0x115
-#define BTN_BACK                0x116
-#define BTN_TASK                0x117
-
-#define BTN_JOYSTICK            0x120
-#define BTN_TRIGGER             0x120
-#define BTN_THUMB               0x121
-#define BTN_THUMB2              0x122
-#define BTN_TOP                 0x123
-#define BTN_TOP2                0x124
-#define BTN_PINKIE              0x125
-#define BTN_BASE                0x126
-#define BTN_BASE2               0x127
-#define BTN_BASE3               0x128
-#define BTN_BASE4               0x129
-#define BTN_BASE5               0x12a
-#define BTN_BASE6               0x12b
-#define BTN_DEAD                0x12f
-
-#define BTN_GAMEPAD             0x130
-#define BTN_A                   0x130
-#define BTN_B                   0x131
-#define BTN_C                   0x132
-#define BTN_X                   0x133
-#define BTN_Y                   0x134
-#define BTN_Z                   0x135
-#define BTN_TL                  0x136
-#define BTN_TR                  0x137
-#define BTN_TL2                 0x138
-#define BTN_TR2                 0x139
-#define BTN_SELECT              0x13a
-#define BTN_START               0x13b
-#define BTN_MODE                0x13c
-#define BTN_THUMBL              0x13d
-#define BTN_THUMBR              0x13e
-
-#define BTN_DIGI                0x140
-#define BTN_TOOL_PEN            0x140
-#define BTN_TOOL_RUBBER         0x141
-#define BTN_TOOL_BRUSH          0x142
-#define BTN_TOOL_PENCIL         0x143
-#define BTN_TOOL_AIRBRUSH       0x144
-#define BTN_TOOL_FINGER         0x145
-#define BTN_TOOL_MOUSE          0x146
-#define BTN_TOOL_LENS           0x147
-#define BTN_TOOL_QUINTTAP       0x148   /* Five fingers on trackpad */
-#define BTN_TOUCH               0x14a
-#define BTN_STYLUS              0x14b
-#define BTN_STYLUS2             0x14c
-#define BTN_TOOL_DOUBLETAP      0x14d
-#define BTN_TOOL_TRIPLETAP      0x14e
-#define BTN_TOOL_QUADTAP        0x14f   /* Four fingers on trackpad */
-
-#define BTN_WHEEL               0x150
-#define BTN_GEAR_DOWN           0x150
-#define BTN_GEAR_UP             0x151
-
-#define KEY_OK                  0x160
-#define KEY_SELECT              0x161
-#define KEY_GOTO                0x162
-#define KEY_CLEAR               0x163
-#define KEY_POWER2              0x164
-#define KEY_OPTION              0x165
-#define KEY_INFO                0x166   /* AL OEM Features/Tips/Tutorial */
-#define KEY_TIME                0x167
-#define KEY_VENDOR              0x168
-#define KEY_ARCHIVE             0x169
-#define KEY_PROGRAM             0x16a   /* Media Select Program Guide */
-#define KEY_CHANNEL             0x16b
-#define KEY_FAVORITES           0x16c
-#define KEY_EPG                 0x16d
-#define KEY_PVR                 0x16e   /* Media Select Home */
-#define KEY_MHP                 0x16f
-#define KEY_LANGUAGE            0x170
-#define KEY_TITLE               0x171
-#define KEY_SUBTITLE            0x172
-#define KEY_ANGLE               0x173
-#define KEY_ZOOM                0x174
-#define KEY_MODE                0x175
-#define KEY_KEYBOARD            0x176
-#define KEY_SCREEN              0x177
-#define KEY_PC                  0x178   /* Media Select Computer */
-#define KEY_TV                  0x179   /* Media Select TV */
-#define KEY_TV2                 0x17a   /* Media Select Cable */
-#define KEY_VCR                 0x17b   /* Media Select VCR */
-#define KEY_VCR2                0x17c   /* VCR Plus */
-#define KEY_SAT                 0x17d   /* Media Select Satellite */
-#define KEY_SAT2                0x17e
-#define KEY_CD                  0x17f   /* Media Select CD */
-#define KEY_TAPE                0x180   /* Media Select Tape */
-#define KEY_RADIO               0x181
-#define KEY_TUNER               0x182   /* Media Select Tuner */
-#define KEY_PLAYER              0x183
-#define KEY_TEXT                0x184
-#define KEY_DVD                 0x185   /* Media Select DVD */
-#define KEY_AUX                 0x186
-#define KEY_MP3                 0x187
-#define KEY_AUDIO               0x188   /* AL Audio Browser */
-#define KEY_VIDEO               0x189   /* AL Movie Browser */
-#define KEY_DIRECTORY           0x18a
-#define KEY_LIST                0x18b
-#define KEY_MEMO                0x18c   /* Media Select Messages */
-#define KEY_CALENDAR            0x18d
-#define KEY_RED                 0x18e
-#define KEY_GREEN               0x18f
-#define KEY_YELLOW              0x190
-#define KEY_BLUE                0x191
-#define KEY_CHANNELUP           0x192   /* Channel Increment */
-#define KEY_CHANNELDOWN         0x193   /* Channel Decrement */
-#define KEY_FIRST               0x194
-#define KEY_LAST                0x195   /* Recall Last */
-#define KEY_AB                  0x196
-#define KEY_NEXT                0x197
-#define KEY_RESTART             0x198
-#define KEY_SLOW                0x199
-#define KEY_SHUFFLE             0x19a
-#define KEY_BREAK               0x19b
-#define KEY_PREVIOUS            0x19c
-#define KEY_DIGITS              0x19d
-#define KEY_TEEN                0x19e
-#define KEY_TWEN                0x19f
-#define KEY_VIDEOPHONE          0x1a0   /* Media Select Video Phone */
-#define KEY_GAMES               0x1a1   /* Media Select Games */
-#define KEY_ZOOMIN              0x1a2   /* AC Zoom In */
-#define KEY_ZOOMOUT             0x1a3   /* AC Zoom Out */
-#define KEY_ZOOMRESET           0x1a4   /* AC Zoom */
-#define KEY_WORDPROCESSOR       0x1a5   /* AL Word Processor */
-#define KEY_EDITOR              0x1a6   /* AL Text Editor */
-#define KEY_SPREADSHEET         0x1a7   /* AL Spreadsheet */
-#define KEY_GRAPHICSEDITOR      0x1a8   /* AL Graphics Editor */
-#define KEY_PRESENTATION        0x1a9   /* AL Presentation App */
-#define KEY_DATABASE            0x1aa   /* AL Database App */
-#define KEY_NEWS                0x1ab   /* AL Newsreader */
-#define KEY_VOICEMAIL           0x1ac   /* AL Voicemail */
-#define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
-#define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
-#define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
-#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
-#define KEY_LOGOFF              0x1b1   /* AL Logoff */
-
-#define KEY_DOLLAR              0x1b2
-#define KEY_EURO                0x1b3
-
-#define KEY_FRAMEBACK           0x1b4   /* Consumer - transport controls */
-#define KEY_FRAMEFORWARD        0x1b5
-#define KEY_CONTEXT_MENU        0x1b6   /* GenDesc - system context menu */
-#define KEY_MEDIA_REPEAT        0x1b7   /* Consumer - transport control */
-#define KEY_10CHANNELSUP        0x1b8   /* 10 channels up (10+) */
-#define KEY_10CHANNELSDOWN      0x1b9   /* 10 channels down (10-) */
-#define KEY_IMAGES              0x1ba   /* AL Image Browser */
-
-#define KEY_DEL_EOL             0x1c0
-#define KEY_DEL_EOS             0x1c1
-#define KEY_INS_LINE            0x1c2
-#define KEY_DEL_LINE            0x1c3
-
-#define KEY_FN                  0x1d0
-#define KEY_FN_ESC              0x1d1
-#define KEY_FN_F1               0x1d2
-#define KEY_FN_F2               0x1d3
-#define KEY_FN_F3               0x1d4
-#define KEY_FN_F4               0x1d5
-#define KEY_FN_F5               0x1d6
-#define KEY_FN_F6               0x1d7
-#define KEY_FN_F7               0x1d8
-#define KEY_FN_F8               0x1d9
-#define KEY_FN_F9               0x1da
-#define KEY_FN_F10              0x1db
-#define KEY_FN_F11              0x1dc
-#define KEY_FN_F12              0x1dd
-#define KEY_FN_1                0x1de
-#define KEY_FN_2                0x1df
-#define KEY_FN_D                0x1e0
-#define KEY_FN_E                0x1e1
-#define KEY_FN_F                0x1e2
-#define KEY_FN_S                0x1e3
-#define KEY_FN_B                0x1e4
-
-#define KEY_BRL_DOT1            0x1f1
-#define KEY_BRL_DOT2            0x1f2
-#define KEY_BRL_DOT3            0x1f3
-#define KEY_BRL_DOT4            0x1f4
-#define KEY_BRL_DOT5            0x1f5
-#define KEY_BRL_DOT6            0x1f6
-#define KEY_BRL_DOT7            0x1f7
-#define KEY_BRL_DOT8            0x1f8
-#define KEY_BRL_DOT9            0x1f9
-#define KEY_BRL_DOT10           0x1fa
-
-#define KEY_NUMERIC_0           0x200   /* used by phones, remote controls, */
-#define KEY_NUMERIC_1           0x201   /* and other keypads */
-#define KEY_NUMERIC_2           0x202
-#define KEY_NUMERIC_3           0x203
-#define KEY_NUMERIC_4           0x204
-#define KEY_NUMERIC_5           0x205
-#define KEY_NUMERIC_6           0x206
-#define KEY_NUMERIC_7           0x207
-#define KEY_NUMERIC_8           0x208
-#define KEY_NUMERIC_9           0x209
-#define KEY_NUMERIC_STAR        0x20a
-#define KEY_NUMERIC_POUND       0x20b
-
-#define KEY_CAMERA_FOCUS        0x210
-#define KEY_WPS_BUTTON          0x211   /* WiFi Protected Setup key */
-
-#define KEY_TOUCHPAD_TOGGLE     0x212   /* Request switch touchpad on or off */
-#define KEY_TOUCHPAD_ON         0x213
-#define KEY_TOUCHPAD_OFF        0x214
-
-#define KEY_CAMERA_ZOOMIN       0x215
-#define KEY_CAMERA_ZOOMOUT      0x216
-#define KEY_CAMERA_UP           0x217
-#define KEY_CAMERA_DOWN         0x218
-#define KEY_CAMERA_LEFT         0x219
-#define KEY_CAMERA_RIGHT        0x21a
-
-#define BTN_TRIGGER_HAPPY               0x2c0
-#define BTN_TRIGGER_HAPPY1              0x2c0
-#define BTN_TRIGGER_HAPPY2              0x2c1
-#define BTN_TRIGGER_HAPPY3              0x2c2
-#define BTN_TRIGGER_HAPPY4              0x2c3
-#define BTN_TRIGGER_HAPPY5              0x2c4
-#define BTN_TRIGGER_HAPPY6              0x2c5
-#define BTN_TRIGGER_HAPPY7              0x2c6
-#define BTN_TRIGGER_HAPPY8              0x2c7
-#define BTN_TRIGGER_HAPPY9              0x2c8
-#define BTN_TRIGGER_HAPPY10             0x2c9
-#define BTN_TRIGGER_HAPPY11             0x2ca
-#define BTN_TRIGGER_HAPPY12             0x2cb
-#define BTN_TRIGGER_HAPPY13             0x2cc
-#define BTN_TRIGGER_HAPPY14             0x2cd
-#define BTN_TRIGGER_HAPPY15             0x2ce
-#define BTN_TRIGGER_HAPPY16             0x2cf
-#define BTN_TRIGGER_HAPPY17             0x2d0
-#define BTN_TRIGGER_HAPPY18             0x2d1
-#define BTN_TRIGGER_HAPPY19             0x2d2
-#define BTN_TRIGGER_HAPPY20             0x2d3
-#define BTN_TRIGGER_HAPPY21             0x2d4
-#define BTN_TRIGGER_HAPPY22             0x2d5
-#define BTN_TRIGGER_HAPPY23             0x2d6
-#define BTN_TRIGGER_HAPPY24             0x2d7
-#define BTN_TRIGGER_HAPPY25             0x2d8
-#define BTN_TRIGGER_HAPPY26             0x2d9
-#define BTN_TRIGGER_HAPPY27             0x2da
-#define BTN_TRIGGER_HAPPY28             0x2db
-#define BTN_TRIGGER_HAPPY29             0x2dc
-#define BTN_TRIGGER_HAPPY30             0x2dd
-#define BTN_TRIGGER_HAPPY31             0x2de
-#define BTN_TRIGGER_HAPPY32             0x2df
-#define BTN_TRIGGER_HAPPY33             0x2e0
-#define BTN_TRIGGER_HAPPY34             0x2e1
-#define BTN_TRIGGER_HAPPY35             0x2e2
-#define BTN_TRIGGER_HAPPY36             0x2e3
-#define BTN_TRIGGER_HAPPY37             0x2e4
-#define BTN_TRIGGER_HAPPY38             0x2e5
-#define BTN_TRIGGER_HAPPY39             0x2e6
-#define BTN_TRIGGER_HAPPY40             0x2e7
-
-/* We avoid low common keys in module aliases so they don't get huge. */
-#define KEY_MIN_INTERESTING     KEY_MUTE
-#define KEY_MAX                 0x2ff
-#define KEY_CNT                 (KEY_MAX+1)
-
-/*
- * Relative axes
- */
-
-#define REL_X                   0x00
-#define REL_Y                   0x01
-#define REL_Z                   0x02
-#define REL_RX                  0x03
-#define REL_RY                  0x04
-#define REL_RZ                  0x05
-#define REL_HWHEEL              0x06
-#define REL_DIAL                0x07
-#define REL_WHEEL               0x08
-#define REL_MISC                0x09
-#define REL_MAX                 0x0f
-#define REL_CNT                 (REL_MAX+1)
-
-/*
- * Absolute axes
- */
-
-#define ABS_X                   0x00
-#define ABS_Y                   0x01
-#define ABS_Z                   0x02
-#define ABS_RX                  0x03
-#define ABS_RY                  0x04
-#define ABS_RZ                  0x05
-#define ABS_THROTTLE            0x06
-#define ABS_RUDDER              0x07
-#define ABS_WHEEL               0x08
-#define ABS_GAS                 0x09
-#define ABS_BRAKE               0x0a
-#define ABS_HAT0X               0x10
-#define ABS_HAT0Y               0x11
-#define ABS_HAT1X               0x12
-#define ABS_HAT1Y               0x13
-#define ABS_HAT2X               0x14
-#define ABS_HAT2Y               0x15
-#define ABS_HAT3X               0x16
-#define ABS_HAT3Y               0x17
-#define ABS_PRESSURE            0x18
-#define ABS_DISTANCE            0x19
-#define ABS_TILT_X              0x1a
-#define ABS_TILT_Y              0x1b
-#define ABS_TOOL_WIDTH          0x1c
-
-#define ABS_VOLUME              0x20
-
-#define ABS_MISC                0x28
-
-#define ABS_MT_SLOT             0x2f    /* MT slot being modified */
-#define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
-#define ABS_MT_TOUCH_MINOR      0x31    /* Minor axis (omit if circular) */
-#define ABS_MT_WIDTH_MAJOR      0x32    /* Major axis of approaching ellipse */
-#define ABS_MT_WIDTH_MINOR      0x33    /* Minor axis (omit if circular) */
-#define ABS_MT_ORIENTATION      0x34    /* Ellipse orientation */
-#define ABS_MT_POSITION_X       0x35    /* Center X touch position */
-#define ABS_MT_POSITION_Y       0x36    /* Center Y touch position */
-#define ABS_MT_TOOL_TYPE        0x37    /* Type of touching device */
-#define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
-#define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
-#define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
-#define ABS_MT_DISTANCE         0x3b    /* Contact hover distance */
-#define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
-#define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
-
-#ifdef __KERNEL__
+#include <uapi/linux/input.h>
 /* Implementation details, userspace should not care about these */
 #define ABS_MT_FIRST            ABS_MT_TOUCH_MAJOR
 #define ABS_MT_LAST             ABS_MT_TOOL_Y
-#endif
-
-#define ABS_MAX                 0x3f
-#define ABS_CNT                 (ABS_MAX+1)
-
-/*
- * Switch events
- */
-
-#define SW_LID                  0x00  /* set = lid shut */
-#define SW_TABLET_MODE          0x01  /* set = tablet mode */
-#define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
-#define SW_RFKILL_ALL           0x03  /* rfkill master switch, type "any"
-                                         set = radio enabled */
-#define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
-#define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
-#define SW_DOCK                 0x05  /* set = plugged into dock */
-#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
-#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
-#define SW_VIDEOOUT_INSERT      0x08  /* set = inserted */
-#define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
-#define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
-#define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
-#define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
-#define SW_LINEIN_INSERT        0x0d  /* set = inserted */
-#define SW_MAX                  0x0f
-#define SW_CNT                  (SW_MAX+1)
-
-/*
- * Misc events
- */
-
-#define MSC_SERIAL              0x00
-#define MSC_PULSELED            0x01
-#define MSC_GESTURE             0x02
-#define MSC_RAW                 0x03
-#define MSC_SCAN                0x04
-#define MSC_MAX                 0x07
-#define MSC_CNT                 (MSC_MAX+1)
-
-/*
- * LEDs
- */
-
-#define LED_NUML                0x00
-#define LED_CAPSL               0x01
-#define LED_SCROLLL             0x02
-#define LED_COMPOSE             0x03
-#define LED_KANA                0x04
-#define LED_SLEEP               0x05
-#define LED_SUSPEND             0x06
-#define LED_MUTE                0x07
-#define LED_MISC                0x08
-#define LED_MAIL                0x09
-#define LED_CHARGING            0x0a
-#define LED_MAX                 0x0f
-#define LED_CNT                 (LED_MAX+1)
-
-/*
- * Autorepeat values
- */
-
-#define REP_DELAY               0x00
-#define REP_PERIOD              0x01
-#define REP_MAX                 0x01
-#define REP_CNT                 (REP_MAX+1)
-
-/*
- * Sounds
- */
-
-#define SND_CLICK               0x00
-#define SND_BELL                0x01
-#define SND_TONE                0x02
-#define SND_MAX                 0x07
-#define SND_CNT                 (SND_MAX+1)
-
-/*
- * IDs.
- */
-
-#define ID_BUS                  0
-#define ID_VENDOR               1
-#define ID_PRODUCT              2
-#define ID_VERSION              3
-
-#define BUS_PCI                 0x01
-#define BUS_ISAPNP              0x02
-#define BUS_USB                 0x03
-#define BUS_HIL                 0x04
-#define BUS_BLUETOOTH           0x05
-#define BUS_VIRTUAL             0x06
-
-#define BUS_ISA                 0x10
-#define BUS_I8042               0x11
-#define BUS_XTKBD               0x12
-#define BUS_RS232               0x13
-#define BUS_GAMEPORT            0x14
-#define BUS_PARPORT             0x15
-#define BUS_AMIGA               0x16
-#define BUS_ADB                 0x17
-#define BUS_I2C                 0x18
-#define BUS_HOST                0x19
-#define BUS_GSC                 0x1A
-#define BUS_ATARI               0x1B
-#define BUS_SPI                 0x1C
-
-/*
- * MT_TOOL types
- */
-#define MT_TOOL_FINGER          0
-#define MT_TOOL_PEN             1
-#define MT_TOOL_MAX             1
-
-/*
- * Values describing the status of a force-feedback effect
- */
-#define FF_STATUS_STOPPED       0x00
-#define FF_STATUS_PLAYING       0x01
-#define FF_STATUS_MAX           0x01
-
-/*
- * Structures used in ioctls to upload effects to a device
- * They are pieces of a bigger structure (called ff_effect)
- */
-
-/*
- * All duration values are expressed in ms. Values above 32767 ms (0x7fff)
- * should not be used and have unspecified results.
- */
-
-/**
- * struct ff_replay - defines scheduling of the force-feedback effect
- * @length: duration of the effect
- * @delay: delay before effect should start playing
- */
-struct ff_replay {
-        __u16 length;
-        __u16 delay;
-};
-
-/**
- * struct ff_trigger - defines what triggers the force-feedback effect
- * @button: number of the button triggering the effect
- * @interval: controls how soon the effect can be re-triggered
- */
-struct ff_trigger {
-        __u16 button;
-        __u16 interval;
-};
-
-/**
- * struct ff_envelope - generic force-feedback effect envelope
- * @attack_length: duration of the attack (ms)
- * @attack_level: level at the beginning of the attack
- * @fade_length: duration of fade (ms)
- * @fade_level: level at the end of fade
- *
- * The @attack_level and @fade_level are absolute values; when applying
- * envelope force-feedback core will convert to positive/negative
- * value based on polarity of the default level of the effect.
- * Valid range for the attack and fade levels is 0x0000 - 0x7fff
- */
-struct ff_envelope {
-        __u16 attack_length;
-        __u16 attack_level;
-        __u16 fade_length;
-        __u16 fade_level;
-};
-
-/**
- * struct ff_constant_effect - defines parameters of a constant force-feedback effect
- * @level: strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_constant_effect {
-        __s16 level;
-        struct ff_envelope envelope;
-};
-
-/**
- * struct ff_ramp_effect - defines parameters of a ramp force-feedback effect
- * @start_level: beginning strength of the effect; may be negative
- * @end_level: final strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_ramp_effect {
-        __s16 start_level;
-        __s16 end_level;
-        struct ff_envelope envelope;
-};
-
-/**
- * struct ff_condition_effect - defines a spring or friction force-feedback effect
- * @right_saturation: maximum level when joystick moved all way to the right
- * @left_saturation: same for the left side
- * @right_coeff: controls how fast the force grows when the joystick moves
- *      to the right
- * @left_coeff: same for the left side
- * @deadband: size of the dead zone, where no force is produced
- * @center: position of the dead zone
- */
-struct ff_condition_effect {
-        __u16 right_saturation;
-        __u16 left_saturation;
-
-        __s16 right_coeff;
-        __s16 left_coeff;
-
-        __u16 deadband;
-        __s16 center;
-};
-
-/**
- * struct ff_periodic_effect - defines parameters of a periodic force-feedback effect
- * @waveform: kind of the effect (wave)
- * @period: period of the wave (ms)
- * @magnitude: peak value
- * @offset: mean value of the wave (roughly)
- * @phase: 'horizontal' shift
- * @envelope: envelope data
- * @custom_len: number of samples (FF_CUSTOM only)
- * @custom_data: buffer of samples (FF_CUSTOM only)
- *
- * Known waveforms - FF_SQUARE, FF_TRIANGLE, FF_SINE, FF_SAW_UP,
- * FF_SAW_DOWN, FF_CUSTOM. The exact syntax FF_CUSTOM is undefined
- * for the time being as no driver supports it yet.
- *
- * Note: the data pointed by custom_data is copied by the driver.
- * You can therefore dispose of the memory after the upload/update.
- */
-struct ff_periodic_effect {
-        __u16 waveform;
-        __u16 period;
-        __s16 magnitude;
-        __s16 offset;
-        __u16 phase;
-
-        struct ff_envelope envelope;
-
-        __u32 custom_len;
-        __s16 __user *custom_data;
-};
-
-/**
- * struct ff_rumble_effect - defines parameters of a periodic force-feedback effect
- * @strong_magnitude: magnitude of the heavy motor
- * @weak_magnitude: magnitude of the light one
- *
- * Some rumble pads have two motors of different weight. Strong_magnitude
- * represents the magnitude of the vibration generated by the heavy one.
- */
-struct ff_rumble_effect {
-        __u16 strong_magnitude;
-        __u16 weak_magnitude;
-};
-
-/**
- * struct ff_effect - defines force feedback effect
- * @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
- *      FF_FRICTION, FF_DAMPER, FF_RUMBLE, FF_INERTIA, or FF_CUSTOM)
- * @id: an unique id assigned to an effect
- * @direction: direction of the effect
- * @trigger: trigger conditions (struct ff_trigger)
- * @replay: scheduling of the effect (struct ff_replay)
- * @u: effect-specific structure (one of ff_constant_effect, ff_ramp_effect,
- *      ff_periodic_effect, ff_condition_effect, ff_rumble_effect) further
- *      defining effect parameters
- *
- * This structure is sent through ioctl from the application to the driver.
- * To create a new effect application should set its @id to -1; the kernel
- * will return assigned @id which can later be used to update or delete
- * this effect.
- *
- * Direction of the effect is encoded as follows:
- *      0 deg -> 0x0000 (down)
- *      90 deg -> 0x4000 (left)
- *      180 deg -> 0x8000 (up)
- *      270 deg -> 0xC000 (right)
- */
-struct ff_effect {
-        __u16 type;
-        __s16 id;
-        __u16 direction;
-        struct ff_trigger trigger;
-        struct ff_replay replay;
-
-        union {
-                struct ff_constant_effect constant;
-                struct ff_ramp_effect ramp;
-                struct ff_periodic_effect periodic;
-                struct ff_condition_effect condition[2]; /* One for each axis */
-                struct ff_rumble_effect rumble;
-        } u;
-};
-
-/*
- * Force feedback effect types
- */
-
-#define FF_RUMBLE       0x50
-#define FF_PERIODIC     0x51
-#define FF_CONSTANT     0x52
-#define FF_SPRING       0x53
-#define FF_FRICTION     0x54
-#define FF_DAMPER       0x55
-#define FF_INERTIA      0x56
-#define FF_RAMP         0x57
-
-#define FF_EFFECT_MIN   FF_RUMBLE
-#define FF_EFFECT_MAX   FF_RAMP
-
-/*
- * Force feedback periodic effect types
- */
-
-#define FF_SQUARE       0x58
-#define FF_TRIANGLE     0x59
-#define FF_SINE         0x5a
-#define FF_SAW_UP       0x5b
-#define FF_SAW_DOWN     0x5c
-#define FF_CUSTOM       0x5d
-
-#define FF_WAVEFORM_MIN FF_SQUARE
-#define FF_WAVEFORM_MAX FF_CUSTOM
-
-/*
- * Set ff device properties
- */
-
-#define FF_GAIN         0x60
-#define FF_AUTOCENTER   0x61
-
-#define FF_MAX          0x7f
-#define FF_CNT          (FF_MAX+1)
-
-#ifdef __KERNEL__
 
 /*
  * In-kernel definitions.
@@ -1396,8 +252,8 @@ struct input_handle;
  * @start: starts handler for given handle. This function is called by
  *      input core right after connect() method and also when a process
  *      that "grabbed" a device releases it
- * @fops: file operations this driver implements
- * @minor: beginning of range of 32 minors for devices this driver
+ * @legacy_minors: set to %true by drivers using legacy minor ranges
+ * @minor: beginning of range of 32 legacy minors for devices this driver
  *      can provide
  * @name: name of the handler, to be shown in /proc/bus/input/handlers
  * @id_table: pointer to a table of input_device_ids this driver can
@@ -1431,7 +287,7 @@ struct input_handler {
         void (*disconnect)(struct input_handle *handle);
         void (*start)(struct input_handle *handle);
 
-        const struct file_operations *fops;
+        bool legacy_minors;
         int minor;
         const char *name;
 
@@ -1499,6 +355,10 @@ void input_reset_device(struct input_dev *);
 int __must_check input_register_handler(struct input_handler *);
 void input_unregister_handler(struct input_handler *);
 
+int __must_check input_get_new_minor(int legacy_base, unsigned int legacy_num,
+                                     bool allow_dynamic);
+void input_free_minor(unsigned int minor);
+
 int input_handler_for_each_handle(struct input_handler *, void *data,
                                   int (*fn)(struct input_handle *, void *));
 
@@ -1664,4 +524,3 @@ int input_ff_create_memless(struct input_dev *dev, void *data,
                 int (*play_effect)(struct input_dev *, void *, struct ff_effect *));
 
 #endif
-#endif
diff --git a/include/linux/interval_tree.h b/include/linux/interval_tree.h
new file mode 100644
index 000000000000..724556aa3c95
--- /dev/null
+++ b/include/linux/interval_tree.h
@@ -0,0 +1,27 @@
+#ifndef _LINUX_INTERVAL_TREE_H
+#define _LINUX_INTERVAL_TREE_H
+
+#include <linux/rbtree.h>
+
+struct interval_tree_node {
+        struct rb_node rb;
+        unsigned long start;    /* Start of interval */
+        unsigned long last;     /* Last location _in_ interval */
+        unsigned long __subtree_last;
+};
+
+extern void
+interval_tree_insert(struct interval_tree_node *node, struct rb_root *root);
+
+extern void
+interval_tree_remove(struct interval_tree_node *node, struct rb_root *root);
+
+extern struct interval_tree_node *
+interval_tree_iter_first(struct rb_root *root,
+                         unsigned long start, unsigned long last);
+
+extern struct interval_tree_node *
+interval_tree_iter_next(struct interval_tree_node *node,
+                        unsigned long start, unsigned long last);
+
+#endif  /* _LINUX_INTERVAL_TREE_H */
diff --git a/include/linux/interval_tree_generic.h b/include/linux/interval_tree_generic.h
new file mode 100644
index 000000000000..58370e1862ad
--- /dev/null
+++ b/include/linux/interval_tree_generic.h
@@ -0,0 +1,191 @@
+/*
+  Interval Trees
+  (C) 2012  Michel Lespinasse <walken@google.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+  include/linux/interval_tree_generic.h
+*/
+
+#include <linux/rbtree_augmented.h>
+
+/*
+ * Template for implementing interval trees
+ *
+ * ITSTRUCT:   struct type of the interval tree nodes
+ * ITRB:       name of struct rb_node field within ITSTRUCT
+ * ITTYPE:     type of the interval endpoints
+ * ITSUBTREE:  name of ITTYPE field within ITSTRUCT holding last-in-subtree
+ * ITSTART(n): start endpoint of ITSTRUCT node n
+ * ITLAST(n):  last endpoint of ITSTRUCT node n
+ * ITSTATIC:   'static' or empty
+ * ITPREFIX:   prefix to use for the inline tree definitions
+ *
+ * Note - before using this, please consider if non-generic version
+ * (interval_tree.h) would work for you...
+ */
+
+#define INTERVAL_TREE_DEFINE(ITSTRUCT, ITRB, ITTYPE, ITSUBTREE,               \
+                             ITSTART, ITLAST, ITSTATIC, ITPREFIX)             \
+                                                                              \
+/* Callbacks for augmented rbtree insert and remove */                        \
+                                                                              \
+static inline ITTYPE ITPREFIX ## _compute_subtree_last(ITSTRUCT *node)        \
+{                                                                             \
+        ITTYPE max = ITLAST(node), subtree_last;                              \
+        if (node->ITRB.rb_left) {                                             \
+                subtree_last = rb_entry(node->ITRB.rb_left,                   \
+                                        ITSTRUCT, ITRB)->ITSUBTREE;           \
+                if (max < subtree_last)                                       \
+                        max = subtree_last;                                   \
+        }                                                                     \
+        if (node->ITRB.rb_right) {                                            \
+                subtree_last = rb_entry(node->ITRB.rb_right,                  \
+                                        ITSTRUCT, ITRB)->ITSUBTREE;           \
+                if (max < subtree_last)                                       \
+                        max = subtree_last;                                   \
+        }                                                                     \
+        return max;                                                           \
+}                                                                             \
+                                                                              \
+RB_DECLARE_CALLBACKS(static, ITPREFIX ## _augment, ITSTRUCT, ITRB,            \
+                     ITTYPE, ITSUBTREE, ITPREFIX ## _compute_subtree_last)    \
+                                                                              \
+/* Insert / remove interval nodes from the tree */                            \
+                                                                              \
+ITSTATIC void ITPREFIX ## _insert(ITSTRUCT *node, struct rb_root *root)       \
+{                                                                             \
+        struct rb_node **link = &root->rb_node, *rb_parent = NULL;            \
+        ITTYPE start = ITSTART(node), last = ITLAST(node);                    \
+        ITSTRUCT *parent;                                                     \
+                                                                              \
+        while (*link) {                                                       \
+                rb_parent = *link;                                            \
+                parent = rb_entry(rb_parent, ITSTRUCT, ITRB);                 \
+                if (parent->ITSUBTREE < last)                                 \
+                        parent->ITSUBTREE = last;                             \
+                if (start < ITSTART(parent))                                  \
+                        link = &parent->ITRB.rb_left;                         \
+                else                                                          \
+                        link = &parent->ITRB.rb_right;                        \
+        }                                                                     \
+                                                                              \
+        node->ITSUBTREE = last;                                               \
+        rb_link_node(&node->ITRB, rb_parent, link);                           \
+        rb_insert_augmented(&node->ITRB, root, &ITPREFIX ## _augment);        \
+}                                                                             \
+                                                                              \
+ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node, struct rb_root *root)       \
+{                                                                             \
+        rb_erase_augmented(&node->ITRB, root, &ITPREFIX ## _augment);         \
+}                                                                             \
+                                                                              \
+/*                                                                            \
+ * Iterate over intervals intersecting [start;last]                           \
+ *                                                                            \
+ * Note that a node's interval intersects [start;last] iff:                   \
+ *   Cond1: ITSTART(node) <= last                                             \
+ * and                                                                        \
+ *   Cond2: start <= ITLAST(node)                                             \
+ */                                                                           \
+                                                                              \
+static ITSTRUCT *                                                             \
+ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)        \
+{                                                                             \
+        while (true) {                                                        \
+                /*                                                            \
+                 * Loop invariant: start <= node->ITSUBTREE                   \
+                 * (Cond2 is satisfied by one of the subtree nodes)           \
+                 */                                                           \
+                if (node->ITRB.rb_left) {                                     \
+                        ITSTRUCT *left = rb_entry(node->ITRB.rb_left,         \
+                                                  ITSTRUCT, ITRB);            \
+                        if (start <= left->ITSUBTREE) {                       \
+                                /*                                            \
+                                 * Some nodes in left subtree satisfy Cond2.  \
+                                 * Iterate to find the leftmost such node N.  \
+                                 * If it also satisfies Cond1, that's the     \
+                                 * match we are looking for. Otherwise, there \
+                                 * is no matching interval as nodes to the    \
+                                 * right of N can't satisfy Cond1 either.     \
+                                 */                                           \
+                                node = left;                                  \
+                                continue;                                     \
+                        }                                                     \
+                }                                                             \
+                if (ITSTART(node) <= last) {            /* Cond1 */           \
+                        if (start <= ITLAST(node))      /* Cond2 */           \
+                                return node;    /* node is leftmost match */  \
+                        if (node->ITRB.rb_right) {                            \
+                                node = rb_entry(node->ITRB.rb_right,          \
+                                                ITSTRUCT, ITRB);              \
+                                if (start <= node->ITSUBTREE)                 \
+                                        continue;                             \
+                        }                                                     \
+                }                                                             \
+                return NULL;    /* No match */                                \
+        }                                                                     \
+}                                                                             \
+                                                                              \
+ITSTATIC ITSTRUCT *                                                           \
+ITPREFIX ## _iter_first(struct rb_root *root, ITTYPE start, ITTYPE last)      \
+{                                                                             \
+        ITSTRUCT *node;                                                       \
+                                                                              \
+        if (!root->rb_node)                                                   \
+                return NULL;                                                  \
+        node = rb_entry(root->rb_node, ITSTRUCT, ITRB);                       \
+        if (node->ITSUBTREE < start)                                          \
+                return NULL;                                                  \
+        return ITPREFIX ## _subtree_search(node, start, last);                \
+}                                                                             \
+                                                                              \
+ITSTATIC ITSTRUCT *                                                           \
+ITPREFIX ## _iter_next(ITSTRUCT *node, ITTYPE start, ITTYPE last)             \
+{                                                                             \
+        struct rb_node *rb = node->ITRB.rb_right, *prev;                      \
+                                                                              \
+        while (true) {                                                        \
+                /*                                                            \
+                 * Loop invariants:                                           \
+                 *   Cond1: ITSTART(node) <= last                             \
+                 *   rb == node->ITRB.rb_right                                \
+                 *                                                            \
+                 * First, search right subtree if suitable                    \
+                 */                                                           \
+                if (rb) {                                                     \
+                        ITSTRUCT *right = rb_entry(rb, ITSTRUCT, ITRB);       \
+                        if (start <= right->ITSUBTREE)                        \
+                                return ITPREFIX ## _subtree_search(right,     \
+                                                                start, last); \
+                }                                                             \
+                                                                              \
+                /* Move up the tree until we come from a node's left child */ \
+                do {                                                          \
+                        rb = rb_parent(&node->ITRB);                          \
+                        if (!rb)                                              \
+                                return NULL;                                  \
+                        prev = &node->ITRB;                                   \
+                        node = rb_entry(rb, ITSTRUCT, ITRB);                  \
+                        rb = node->ITRB.rb_right;                             \
+                } while (prev == rb);                                         \
+                                                                              \
+                /* Check if the node intersects [start;last] */               \
+                if (last < ITSTART(node))               /* !Cond1 */          \
+                        return NULL;                                          \
+                else if (start <= ITLAST(node))         /* Cond2 */           \
+                        return node;                                          \
+        }                                                                     \
+}
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 589e0e75efae..85ac9b9b72a2 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -29,8 +29,9 @@ struct resource {
 #define IORESOURCE_BITS         0x000000ff      /* Bus-specific bits */
 
 #define IORESOURCE_TYPE_BITS    0x00001f00      /* Resource type */
-#define IORESOURCE_IO           0x00000100
+#define IORESOURCE_IO           0x00000100      /* PCI/ISA I/O ports */
 #define IORESOURCE_MEM          0x00000200
+#define IORESOURCE_REG          0x00000300      /* Register offsets */
 #define IORESOURCE_IRQ          0x00000400
 #define IORESOURCE_DMA          0x00000800
 #define IORESOURCE_BUS          0x00001000
diff --git a/include/linux/ip.h b/include/linux/ip.h
index bd0a2a8631c6..58b82a22a52b 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -16,96 +16,9 @@
  */
 #ifndef _LINUX_IP_H
 #define _LINUX_IP_H
-#include <linux/types.h>
-#include <asm/byteorder.h>
 
-#define IPTOS_TOS_MASK          0x1E
-#define IPTOS_TOS(tos)          ((tos)&IPTOS_TOS_MASK)
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-#define IPTOS_MINCOST           0x02
-
-#define IPTOS_PREC_MASK         0xE0
-#define IPTOS_PREC(tos)         ((tos)&IPTOS_PREC_MASK)
-#define IPTOS_PREC_NETCONTROL           0xe0
-#define IPTOS_PREC_INTERNETCONTROL      0xc0
-#define IPTOS_PREC_CRITIC_ECP           0xa0
-#define IPTOS_PREC_FLASHOVERRIDE        0x80
-#define IPTOS_PREC_FLASH                0x60
-#define IPTOS_PREC_IMMEDIATE            0x40
-#define IPTOS_PREC_PRIORITY             0x20
-#define IPTOS_PREC_ROUTINE              0x00
-
-
-/* IP options */
-#define IPOPT_COPY              0x80
-#define IPOPT_CLASS_MASK        0x60
-#define IPOPT_NUMBER_MASK       0x1f
-
-#define IPOPT_COPIED(o)         ((o)&IPOPT_COPY)
-#define IPOPT_CLASS(o)          ((o)&IPOPT_CLASS_MASK)
-#define IPOPT_NUMBER(o)         ((o)&IPOPT_NUMBER_MASK)
-
-#define IPOPT_CONTROL           0x00
-#define IPOPT_RESERVED1         0x20
-#define IPOPT_MEASUREMENT       0x40
-#define IPOPT_RESERVED2         0x60
-
-#define IPOPT_END       (0 |IPOPT_CONTROL)
-#define IPOPT_NOOP      (1 |IPOPT_CONTROL)
-#define IPOPT_SEC       (2 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_LSRR      (3 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
-#define IPOPT_CIPSO     (6 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_RR        (7 |IPOPT_CONTROL)
-#define IPOPT_SID       (8 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_SSRR      (9 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_RA        (20|IPOPT_CONTROL|IPOPT_COPY)
-
-#define IPVERSION       4
-#define MAXTTL          255
-#define IPDEFTTL        64
-
-#define IPOPT_OPTVAL 0
-#define IPOPT_OLEN   1
-#define IPOPT_OFFSET 2
-#define IPOPT_MINOFF 4
-#define MAX_IPOPTLEN 40
-#define IPOPT_NOP IPOPT_NOOP
-#define IPOPT_EOL IPOPT_END
-#define IPOPT_TS  IPOPT_TIMESTAMP
-
-#define IPOPT_TS_TSONLY         0               /* timestamps only */
-#define IPOPT_TS_TSANDADDR      1               /* timestamps and addresses */
-#define IPOPT_TS_PRESPEC        3               /* specified modules only */
-
-#define IPV4_BEET_PHMAXLEN 8
-
-struct iphdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8    ihl:4,
-                version:4;
-#elif defined (__BIG_ENDIAN_BITFIELD)
-        __u8    version:4,
-                ihl:4;
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif
-        __u8    tos;
-        __be16  tot_len;
-        __be16  id;
-        __be16  frag_off;
-        __u8    ttl;
-        __u8    protocol;
-        __sum16 check;
-        __be32  saddr;
-        __be32  daddr;
-        /*The options start here. */
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/ip.h>
 
 static inline struct iphdr *ip_hdr(const struct sk_buff *skb)
 {
@@ -116,34 +29,4 @@ static inline struct iphdr *ipip_hdr(const struct sk_buff *skb)
 {
         return (struct iphdr *)skb_transport_header(skb);
 }
-#endif
-
-struct ip_auth_hdr {
-        __u8  nexthdr;
-        __u8  hdrlen;           /* This one is measured in 32 bit units! */
-        __be16 reserved;
-        __be32 spi;
-        __be32 seq_no;          /* Sequence number */
-        __u8  auth_data[0];     /* Variable len but >=4. Mind the 64 bit alignment! */
-};
-
-struct ip_esp_hdr {
-        __be32 spi;
-        __be32 seq_no;          /* Sequence number */
-        __u8  enc_data[0];      /* Variable len but >=8. Mind the 64 bit alignment! */
-};
-
-struct ip_comp_hdr {
-        __u8 nexthdr;
-        __u8 flags;
-        __be16 cpi;
-};
-
-struct ip_beet_phdr {
-        __u8 nexthdr;
-        __u8 hdrlen;
-        __u8 padlen;
-        __u8 reserved;
-};
-
 #endif  /* _LINUX_IP_H */
diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index ca833fdc3138..8d861b2651f7 100644
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -1,85 +1,9 @@
 #ifndef _LINUX_IPC_H
 #define _LINUX_IPC_H
 
-#include <linux/types.h>
-
-#define IPC_PRIVATE ((__kernel_key_t) 0)  
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct ipc_perm
-{
-        __kernel_key_t  key;
-        __kernel_uid_t  uid;
-        __kernel_gid_t  gid;
-        __kernel_uid_t  cuid;
-        __kernel_gid_t  cgid;
-        __kernel_mode_t mode; 
-        unsigned short  seq;
-};
-
-/* Include the definition of ipc64_perm */
-#include <asm/ipcbuf.h>
-
-/* resource get request flags */
-#define IPC_CREAT  00001000   /* create if key is nonexistent */
-#define IPC_EXCL   00002000   /* fail if key exists */
-#define IPC_NOWAIT 00004000   /* return error on wait */
-
-/* these fields are used by the DIPC package so the kernel as standard
-   should avoid using them if possible */
-   
-#define IPC_DIPC 00010000  /* make it distributed */
-#define IPC_OWN  00020000  /* this machine is the DIPC owner */
-
-/* 
- * Control commands used with semctl, msgctl and shmctl 
- * see also specific commands in sem.h, msg.h and shm.h
- */
-#define IPC_RMID 0     /* remove resource */
-#define IPC_SET  1     /* set ipc_perm options */
-#define IPC_STAT 2     /* get ipc_perm options */
-#define IPC_INFO 3     /* see ipcs */
-
-/*
- * Version flags for semctl, msgctl, and shmctl commands
- * These are passed as bitflags or-ed with the actual command
- */
-#define IPC_OLD 0       /* Old version (no 32-bit UID support on many
-                           architectures) */
-#define IPC_64  0x0100  /* New version (support 32-bit UIDs, bigger
-                           message sizes, etc. */
-
-/*
- * These are used to wrap system calls.
- *
- * See architecture code for ugly details..
- */
-struct ipc_kludge {
-        struct msgbuf __user *msgp;
-        long msgtyp;
-};
-
-#define SEMOP            1
-#define SEMGET           2
-#define SEMCTL           3
-#define SEMTIMEDOP       4
-#define MSGSND          11
-#define MSGRCV          12
-#define MSGGET          13
-#define MSGCTL          14
-#define SHMAT           21
-#define SHMDT           22
-#define SHMGET          23
-#define SHMCTL          24
-
-/* Used by the DIPC package, try and avoid reusing it */
-#define DIPC            25
-
-#define IPCCALL(version,op)     ((version)<<16 | (op))
-
-#ifdef __KERNEL__
 #include <linux/spinlock.h>
 #include <linux/uidgid.h>
+#include <uapi/linux/ipc.h>
 
 #define IPCMNI 32768  /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
 
@@ -99,6 +23,4 @@ struct kern_ipc_perm
         void            *security;
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_IPC_H */
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 48dcba9b2065..1487e7906bbd 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -30,191 +30,11 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #ifndef __LINUX_IPMI_H
 #define __LINUX_IPMI_H
 
-#include <linux/ipmi_msgdefs.h>
-#include <linux/compiler.h>
-
-/*
- * This file describes an interface to an IPMI driver.  You have to
- * have a fairly good understanding of IPMI to use this, so go read
- * the specs first before actually trying to do anything.
- *
- * With that said, this driver provides a multi-user interface to the
- * IPMI driver, and it allows multiple IPMI physical interfaces below
- * the driver.  The physical interfaces bind as a lower layer on the
- * driver.  They appear as interfaces to the application using this
- * interface.
- *
- * Multi-user means that multiple applications may use the driver,
- * send commands, receive responses, etc.  The driver keeps track of
- * commands the user sends and tracks the responses.  The responses
- * will go back to the application that send the command.  If the
- * response doesn't come back in time, the driver will return a
- * timeout error response to the application.  Asynchronous events
- * from the BMC event queue will go to all users bound to the driver.
- * The incoming event queue in the BMC will automatically be flushed
- * if it becomes full and it is queried once a second to see if
- * anything is in it.  Incoming commands to the driver will get
- * delivered as commands.
- *
- * This driver provides two main interfaces: one for in-kernel
- * applications and another for userland applications.  The
- * capabilities are basically the same for both interface, although
- * the interfaces are somewhat different.  The stuff in the
- * #ifdef __KERNEL__ below is the in-kernel interface.  The userland
- * interface is defined later in the file.  */
-
-
-
-/*
- * This is an overlay for all the address types, so it's easy to
- * determine the actual address type.  This is kind of like addresses
- * work for sockets.
- */
-#define IPMI_MAX_ADDR_SIZE 32
-struct ipmi_addr {
-         /* Try to take these from the "Channel Medium Type" table
-            in section 6.5 of the IPMI 1.5 manual. */
-        int   addr_type;
-        short channel;
-        char  data[IPMI_MAX_ADDR_SIZE];
-};
-
-/*
- * When the address is not used, the type will be set to this value.
- * The channel is the BMC's channel number for the channel (usually
- * 0), or IPMC_BMC_CHANNEL if communicating directly with the BMC.
- */
-#define IPMI_SYSTEM_INTERFACE_ADDR_TYPE 0x0c
-struct ipmi_system_interface_addr {
-        int           addr_type;
-        short         channel;
-        unsigned char lun;
-};
-
-/* An IPMB Address. */
-#define IPMI_IPMB_ADDR_TYPE             0x01
-/* Used for broadcast get device id as described in section 17.9 of the
-   IPMI 1.5 manual. */
-#define IPMI_IPMB_BROADCAST_ADDR_TYPE   0x41
-struct ipmi_ipmb_addr {
-        int           addr_type;
-        short         channel;
-        unsigned char slave_addr;
-        unsigned char lun;
-};
-
-/*
- * A LAN Address.  This is an address to/from a LAN interface bridged
- * by the BMC, not an address actually out on the LAN.
- *
- * A conscious decision was made here to deviate slightly from the IPMI
- * spec.  We do not use rqSWID and rsSWID like it shows in the
- * message.  Instead, we use remote_SWID and local_SWID.  This means
- * that any message (a request or response) from another device will
- * always have exactly the same address.  If you didn't do this,
- * requests and responses from the same device would have different
- * addresses, and that's not too cool.
- *
- * In this address, the remote_SWID is always the SWID the remote
- * message came from, or the SWID we are sending the message to.
- * local_SWID is always our SWID.  Note that having our SWID in the
- * message is a little weird, but this is required.
- */
-#define IPMI_LAN_ADDR_TYPE              0x04
-struct ipmi_lan_addr {
-        int           addr_type;
-        short         channel;
-        unsigned char privilege;
-        unsigned char session_handle;
-        unsigned char remote_SWID;
-        unsigned char local_SWID;
-        unsigned char lun;
-};
-
-
-/*
- * Channel for talking directly with the BMC.  When using this
- * channel, This is for the system interface address type only.  FIXME
- * - is this right, or should we use -1?
- */
-#define IPMI_BMC_CHANNEL  0xf
-#define IPMI_NUM_CHANNELS 0x10
-
-/*
- * Used to signify an "all channel" bitmask.  This is more than the
- * actual number of channels because this is used in userland and
- * will cover us if the number of channels is extended.
- */
-#define IPMI_CHAN_ALL     (~0)
-
-
-/*
- * A raw IPMI message without any addressing.  This covers both
- * commands and responses.  The completion code is always the first
- * byte of data in the response (as the spec shows the messages laid
- * out).
- */
-struct ipmi_msg {
-        unsigned char  netfn;
-        unsigned char  cmd;
-        unsigned short data_len;
-        unsigned char  __user *data;
-};
-
-struct kernel_ipmi_msg {
-        unsigned char  netfn;
-        unsigned char  cmd;
-        unsigned short data_len;
-        unsigned char  *data;
-};
-
-/*
- * Various defines that are useful for IPMI applications.
- */
-#define IPMI_INVALID_CMD_COMPLETION_CODE        0xC1
-#define IPMI_TIMEOUT_COMPLETION_CODE            0xC3
-#define IPMI_UNKNOWN_ERR_COMPLETION_CODE        0xff
-
+#include <uapi/linux/ipmi.h>
 
-/*
- * Receive types for messages coming from the receive interface.  This
- * is used for the receive in-kernel interface and in the receive
- * IOCTL.
- *
- * The "IPMI_RESPONSE_RESPNOSE_TYPE" is a little strange sounding, but
- * it allows you to get the message results when you send a response
- * message.
- */
-#define IPMI_RESPONSE_RECV_TYPE         1 /* A response to a command */
-#define IPMI_ASYNC_EVENT_RECV_TYPE      2 /* Something from the event queue */
-#define IPMI_CMD_RECV_TYPE              3 /* A command from somewhere else */
-#define IPMI_RESPONSE_RESPONSE_TYPE     4 /* The response for
-                                              a sent response, giving any
-                                              error status for sending the
-                                              response.  When you send a
-                                              response message, this will
-                                              be returned. */
-#define IPMI_OEM_RECV_TYPE              5 /* The response for OEM Channels */
-
-/* Note that async events and received commands do not have a completion
-   code as the first byte of the incoming data, unlike a response. */
-
-
-/*
- * Modes for ipmi_set_maint_mode() and the userland IOCTL.  The AUTO
- * setting is the default and means it will be set on certain
- * commands.  Hard setting it on and off will override automatic
- * operation.
- */
-#define IPMI_MAINTENANCE_MODE_AUTO      0
-#define IPMI_MAINTENANCE_MODE_OFF       1
-#define IPMI_MAINTENANCE_MODE_ON        2
-
-#ifdef __KERNEL__
 
 /*
  * The in-kernel interface.
@@ -493,244 +313,4 @@ struct ipmi_smi_info {
 /* This is to get the private info of ipmi_smi_t */
 extern int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data);
 
-#endif /* __KERNEL__ */
-
-
-/*
- * The userland interface
- */
-
-/*
- * The userland interface for the IPMI driver is a standard character
- * device, with each instance of an interface registered as a minor
- * number under the major character device.
- *
- * The read and write calls do not work, to get messages in and out
- * requires ioctl calls because of the complexity of the data.  select
- * and poll do work, so you can wait for input using the file
- * descriptor, you just can use read to get it.
- *
- * In general, you send a command down to the interface and receive
- * responses back.  You can use the msgid value to correlate commands
- * and responses, the driver will take care of figuring out which
- * incoming messages are for which command and find the proper msgid
- * value to report.  You will only receive reponses for commands you
- * send.  Asynchronous events, however, go to all open users, so you
- * must be ready to handle these (or ignore them if you don't care).
- *
- * The address type depends upon the channel type.  When talking
- * directly to the BMC (IPMC_BMC_CHANNEL), the address is ignored
- * (IPMI_UNUSED_ADDR_TYPE).  When talking to an IPMB channel, you must
- * supply a valid IPMB address with the addr_type set properly.
- *
- * When talking to normal channels, the driver takes care of the
- * details of formatting and sending messages on that channel.  You do
- * not, for instance, have to format a send command, you just send
- * whatever command you want to the channel, the driver will create
- * the send command, automatically issue receive command and get even
- * commands, and pass those up to the proper user.
- */
-
-
-/* The magic IOCTL value for this interface. */
-#define IPMI_IOC_MAGIC 'i'
-
-
-/* Messages sent to the interface are this format. */
-struct ipmi_req {
-        unsigned char __user *addr; /* Address to send the message to. */
-        unsigned int  addr_len;
-
-        long    msgid; /* The sequence number for the message.  This
-                          exact value will be reported back in the
-                          response to this request if it is a command.
-                          If it is a response, this will be used as
-                          the sequence value for the response.  */
-
-        struct ipmi_msg msg;
-};
-/*
- * Send a message to the interfaces.  error values are:
- *   - EFAULT - an address supplied was invalid.
- *   - EINVAL - The address supplied was not valid, or the command
- *              was not allowed.
- *   - EMSGSIZE - The message to was too large.
- *   - ENOMEM - Buffers could not be allocated for the command.
- */
-#define IPMICTL_SEND_COMMAND            _IOR(IPMI_IOC_MAGIC, 13,        \
-                                             struct ipmi_req)
-
-/* Messages sent to the interface with timing parameters are this
-   format. */
-struct ipmi_req_settime {
-        struct ipmi_req req;
-
-        /* See ipmi_request_settime() above for details on these
-           values. */
-        int          retries;
-        unsigned int retry_time_ms;
-};
-/*
- * Send a message to the interfaces with timing parameters.  error values
- * are:
- *   - EFAULT - an address supplied was invalid.
- *   - EINVAL - The address supplied was not valid, or the command
- *              was not allowed.
- *   - EMSGSIZE - The message to was too large.
- *   - ENOMEM - Buffers could not be allocated for the command.
- */
-#define IPMICTL_SEND_COMMAND_SETTIME    _IOR(IPMI_IOC_MAGIC, 21,        \
-                                             struct ipmi_req_settime)
-
-/* Messages received from the interface are this format. */
-struct ipmi_recv {
-        int     recv_type; /* Is this a command, response or an
-                              asyncronous event. */
-
-        unsigned char __user *addr;    /* Address the message was from is put
-                                   here.  The caller must supply the
-                                   memory. */
-        unsigned int  addr_len; /* The size of the address buffer.
-                                   The caller supplies the full buffer
-                                   length, this value is updated to
-                                   the actual message length when the
-                                   message is received. */
-
-        long    msgid; /* The sequence number specified in the request
-                          if this is a response.  If this is a command,
-                          this will be the sequence number from the
-                          command. */
-
-        struct ipmi_msg msg; /* The data field must point to a buffer.
-                                The data_size field must be set to the
-                                size of the message buffer.  The
-                                caller supplies the full buffer
-                                length, this value is updated to the
-                                actual message length when the message
-                                is received. */
-};
-
-/*
- * Receive a message.  error values:
- *  - EAGAIN - no messages in the queue.
- *  - EFAULT - an address supplied was invalid.
- *  - EINVAL - The address supplied was not valid.
- *  - EMSGSIZE - The message to was too large to fit into the message buffer,
- *               the message will be left in the buffer. */
-#define IPMICTL_RECEIVE_MSG             _IOWR(IPMI_IOC_MAGIC, 12,       \
-                                              struct ipmi_recv)
-
-/*
- * Like RECEIVE_MSG, but if the message won't fit in the buffer, it
- * will truncate the contents instead of leaving the data in the
- * buffer.
- */
-#define IPMICTL_RECEIVE_MSG_TRUNC       _IOWR(IPMI_IOC_MAGIC, 11,       \
-                                              struct ipmi_recv)
-
-/* Register to get commands from other entities on this interface. */
-struct ipmi_cmdspec {
-        unsigned char netfn;
-        unsigned char cmd;
-};
-
-/*
- * Register to receive a specific command.  error values:
- *   - EFAULT - an address supplied was invalid.
- *   - EBUSY - The netfn/cmd supplied was already in use.
- *   - ENOMEM - could not allocate memory for the entry.
- */
-#define IPMICTL_REGISTER_FOR_CMD        _IOR(IPMI_IOC_MAGIC, 14,        \
-                                             struct ipmi_cmdspec)
-/*
- * Unregister a regsitered command.  error values:
- *  - EFAULT - an address supplied was invalid.
- *  - ENOENT - The netfn/cmd was not found registered for this user.
- */
-#define IPMICTL_UNREGISTER_FOR_CMD      _IOR(IPMI_IOC_MAGIC, 15,        \
-                                             struct ipmi_cmdspec)
-
-/*
- * Register to get commands from other entities on specific channels.
- * This way, you can only listen on specific channels, or have messages
- * from some channels go to one place and other channels to someplace
- * else.  The chans field is a bitmask, (1 << channel) for each channel.
- * It may be IPMI_CHAN_ALL for all channels.
- */
-struct ipmi_cmdspec_chans {
-        unsigned int netfn;
-        unsigned int cmd;
-        unsigned int chans;
-};
-
-/*
- * Register to receive a specific command on specific channels.  error values:
- *   - EFAULT - an address supplied was invalid.
- *   - EBUSY - One of the netfn/cmd/chans supplied was already in use.
- *   - ENOMEM - could not allocate memory for the entry.
- */
-#define IPMICTL_REGISTER_FOR_CMD_CHANS  _IOR(IPMI_IOC_MAGIC, 28,        \
-                                             struct ipmi_cmdspec_chans)
-/*
- * Unregister some netfn/cmd/chans.  error values:
- *  - EFAULT - an address supplied was invalid.
- *  - ENOENT - None of the netfn/cmd/chans were found registered for this user.
- */
-#define IPMICTL_UNREGISTER_FOR_CMD_CHANS _IOR(IPMI_IOC_MAGIC, 29,       \
-                                             struct ipmi_cmdspec_chans)
-
-/*
- * Set whether this interface receives events.  Note that the first
- * user registered for events will get all pending events for the
- * interface.  error values:
- *  - EFAULT - an address supplied was invalid.
- */
-#define IPMICTL_SET_GETS_EVENTS_CMD     _IOR(IPMI_IOC_MAGIC, 16, int)
-
-/*
- * Set and get the slave address and LUN that we will use for our
- * source messages.  Note that this affects the interface, not just
- * this user, so it will affect all users of this interface.  This is
- * so some initialization code can come in and do the OEM-specific
- * things it takes to determine your address (if not the BMC) and set
- * it for everyone else.  You should probably leave the LUN alone.
- */
-struct ipmi_channel_lun_address_set {
-        unsigned short channel;
-        unsigned char  value;
-};
-#define IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD \
-        _IOR(IPMI_IOC_MAGIC, 24, struct ipmi_channel_lun_address_set)
-#define IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD \
-        _IOR(IPMI_IOC_MAGIC, 25, struct ipmi_channel_lun_address_set)
-#define IPMICTL_SET_MY_CHANNEL_LUN_CMD \
-        _IOR(IPMI_IOC_MAGIC, 26, struct ipmi_channel_lun_address_set)
-#define IPMICTL_GET_MY_CHANNEL_LUN_CMD \
-        _IOR(IPMI_IOC_MAGIC, 27, struct ipmi_channel_lun_address_set)
-/* Legacy interfaces, these only set IPMB 0. */
-#define IPMICTL_SET_MY_ADDRESS_CMD      _IOR(IPMI_IOC_MAGIC, 17, unsigned int)
-#define IPMICTL_GET_MY_ADDRESS_CMD      _IOR(IPMI_IOC_MAGIC, 18, unsigned int)
-#define IPMICTL_SET_MY_LUN_CMD          _IOR(IPMI_IOC_MAGIC, 19, unsigned int)
-#define IPMICTL_GET_MY_LUN_CMD          _IOR(IPMI_IOC_MAGIC, 20, unsigned int)
-
-/*
- * Get/set the default timing values for an interface.  You shouldn't
- * generally mess with these.
- */
-struct ipmi_timing_parms {
-        int          retries;
-        unsigned int retry_time_ms;
-};
-#define IPMICTL_SET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 22, \
-                                             struct ipmi_timing_parms)
-#define IPMICTL_GET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 23, \
-                                             struct ipmi_timing_parms)
-
-/*
- * Set the maintenance mode.  See ipmi_set_maintenance_mode() above
- * for a description of what this does.
- */
-#define IPMICTL_GET_MAINTENANCE_MODE_CMD        _IOR(IPMI_IOC_MAGIC, 30, int)
-#define IPMICTL_SET_MAINTENANCE_MODE_CMD        _IOW(IPMI_IOC_MAGIC, 31, int)
-
 #endif /* __LINUX_IPMI_H */
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 0b94e91ed685..bcba48a97868 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -1,134 +1,9 @@
 #ifndef _IPV6_H
 #define _IPV6_H
 
-#include <linux/types.h>
-#include <linux/in6.h>
-#include <asm/byteorder.h>
+#include <uapi/linux/ipv6.h>
 
-/* The latest drafts declared increase in minimal mtu up to 1280. */
-
-#define IPV6_MIN_MTU    1280
-
-/*
- *      Advanced API
- *      source interface/address selection, source routing, etc...
- *      *under construction*
- */
-
-
-struct in6_pktinfo {
-        struct in6_addr ipi6_addr;
-        int             ipi6_ifindex;
-};
-
-struct ip6_mtuinfo {
-        struct sockaddr_in6     ip6m_addr;
-        __u32                   ip6m_mtu;
-};
-
-struct in6_ifreq {
-        struct in6_addr ifr6_addr;
-        __u32           ifr6_prefixlen;
-        int             ifr6_ifindex; 
-};
-
-#define IPV6_SRCRT_STRICT       0x01    /* Deprecated; will be removed */
-#define IPV6_SRCRT_TYPE_0       0       /* Deprecated; will be removed */
-#define IPV6_SRCRT_TYPE_2       2       /* IPv6 type 2 Routing Header   */
-
-/*
- *      routing header
- */
-struct ipv6_rt_hdr {
-        __u8            nexthdr;
-        __u8            hdrlen;
-        __u8            type;
-        __u8            segments_left;
-
-        /*
-         *      type specific data
-         *      variable length field
-         */
-};
-
-
-struct ipv6_opt_hdr {
-        __u8            nexthdr;
-        __u8            hdrlen;
-        /* 
-         * TLV encoded option data follows.
-         */
-} __attribute__((packed));      /* required for some archs */
-
-#define ipv6_destopt_hdr ipv6_opt_hdr
-#define ipv6_hopopt_hdr  ipv6_opt_hdr
-
-#ifdef __KERNEL__
 #define ipv6_optlen(p)  (((p)->hdrlen+1) << 3)
-#endif
-
-/*
- *      routing header type 0 (used in cmsghdr struct)
- */
-
-struct rt0_hdr {
-        struct ipv6_rt_hdr      rt_hdr;
-        __u32                   reserved;
-        struct in6_addr         addr[0];
-
-#define rt0_type                rt_hdr.type
-};
-
-/*
- *      routing header type 2
- */
-
-struct rt2_hdr {
-        struct ipv6_rt_hdr      rt_hdr;
-        __u32                   reserved;
-        struct in6_addr         addr;
-
-#define rt2_type                rt_hdr.type
-};
-
-/*
- *      home address option in destination options header
- */
-
-struct ipv6_destopt_hao {
-        __u8                    type;
-        __u8                    length;
-        struct in6_addr         addr;
-} __attribute__((packed));
-
-/*
- *      IPv6 fixed header
- *
- *      BEWARE, it is incorrect. The first 4 bits of flow_lbl
- *      are glued to priority now, forming "class".
- */
-
-struct ipv6hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8                    priority:4,
-                                version:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8                    version:4,
-                                priority:4;
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif
-        __u8                    flow_lbl[3];
-
-        __be16                  payload_len;
-        __u8                    nexthdr;
-        __u8                    hop_limit;
-
-        struct  in6_addr        saddr;
-        struct  in6_addr        daddr;
-};
-
-#ifdef __KERNEL__
 /*
  * This structure contains configuration options per IPv6 link.
  */
@@ -180,43 +55,6 @@ struct ipv6_params {
         __s32 autoconf;
 };
 extern struct ipv6_params ipv6_defaults;
-#endif
-
-/* index values for the variables in ipv6_devconf */
-enum {
-        DEVCONF_FORWARDING = 0,
-        DEVCONF_HOPLIMIT,
-        DEVCONF_MTU6,
-        DEVCONF_ACCEPT_RA,
-        DEVCONF_ACCEPT_REDIRECTS,
-        DEVCONF_AUTOCONF,
-        DEVCONF_DAD_TRANSMITS,
-        DEVCONF_RTR_SOLICITS,
-        DEVCONF_RTR_SOLICIT_INTERVAL,
-        DEVCONF_RTR_SOLICIT_DELAY,
-        DEVCONF_USE_TEMPADDR,
-        DEVCONF_TEMP_VALID_LFT,
-        DEVCONF_TEMP_PREFERED_LFT,
-        DEVCONF_REGEN_MAX_RETRY,
-        DEVCONF_MAX_DESYNC_FACTOR,
-        DEVCONF_MAX_ADDRESSES,
-        DEVCONF_FORCE_MLD_VERSION,
-        DEVCONF_ACCEPT_RA_DEFRTR,
-        DEVCONF_ACCEPT_RA_PINFO,
-        DEVCONF_ACCEPT_RA_RTR_PREF,
-        DEVCONF_RTR_PROBE_INTERVAL,
-        DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
-        DEVCONF_PROXY_NDP,
-        DEVCONF_OPTIMISTIC_DAD,
-        DEVCONF_ACCEPT_SOURCE_ROUTE,
-        DEVCONF_MC_FORWARDING,
-        DEVCONF_DISABLE_IPV6,
-        DEVCONF_ACCEPT_DAD,
-        DEVCONF_FORCE_TLLAO,
-        DEVCONF_MAX
-};
-
-#ifdef __KERNEL__
 #include <linux/icmpv6.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
@@ -541,6 +379,4 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
          (ipv6_addr_equal(&inet6_twsk(__sk)->tw_v6_rcv_saddr, (__daddr))) && \
          (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 
-#endif /* __KERNEL__ */
-
 #endif /* _IPV6_H */
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index 1e7d8af2defe..25b5f1f5e780 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -9,54 +9,11 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
-
 #ifndef _LINUX_IPV6_ROUTE_H
 #define _LINUX_IPV6_ROUTE_H
 
-#include <linux/types.h>
-
-#define RTF_DEFAULT     0x00010000      /* default - learned via ND     */
-#define RTF_ALLONLINK   0x00020000      /* (deprecated and will be removed)
-                                           fallback, no routers on link */
-#define RTF_ADDRCONF    0x00040000      /* addrconf route - RA          */
-#define RTF_PREFIX_RT   0x00080000      /* A prefix only route - RA     */
-#define RTF_ANYCAST     0x00100000      /* Anycast                      */
-
-#define RTF_NONEXTHOP   0x00200000      /* route with no nexthop        */
-#define RTF_EXPIRES     0x00400000
-
-#define RTF_ROUTEINFO   0x00800000      /* route information - RA       */
-
-#define RTF_CACHE       0x01000000      /* cache entry                  */
-#define RTF_FLOW        0x02000000      /* flow significant route       */
-#define RTF_POLICY      0x04000000      /* policy route                 */
-
-#define RTF_PREF(pref)  ((pref) << 27)
-#define RTF_PREF_MASK   0x18000000
+#include <uapi/linux/ipv6_route.h>
 
-#define RTF_LOCAL       0x80000000
-
-#ifdef __KERNEL__
 #define IPV6_EXTRACT_PREF(flag) (((flag) & RTF_PREF_MASK) >> 27)
 #define IPV6_DECODE_PREF(pref)  ((pref) ^ 2)    /* 1:low,2:med,3:high */
 #endif
-
-struct in6_rtmsg {
-        struct in6_addr         rtmsg_dst;
-        struct in6_addr         rtmsg_src;
-        struct in6_addr         rtmsg_gateway;
-        __u32                   rtmsg_type;
-        __u16                   rtmsg_dst_len;
-        __u16                   rtmsg_src_len;
-        __u32                   rtmsg_metric;
-        unsigned long           rtmsg_info;
-        __u32                   rtmsg_flags;
-        int                     rtmsg_ifindex;
-};
-
-#define RTMSG_NEWDEVICE         0x11
-#define RTMSG_DELDEVICE         0x12
-#define RTMSG_NEWROUTE          0x21
-#define RTMSG_DELROUTE          0x22
-
-#endif
diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 3bc4dcab6e82..0a2dc46cdaf6 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -1,10 +1,8 @@
 #ifndef _LINUX_IRQNR_H
 #define _LINUX_IRQNR_H
 
-/*
- * Generic irq_desc iterators:
- */
-#ifdef __KERNEL__
+#include <uapi/linux/irqnr.h>
+
 
 #ifndef CONFIG_GENERIC_HARDIRQS
 #include <asm/irq.h>
@@ -57,6 +55,4 @@ unsigned int irq_get_next_irq(unsigned int offset);
 #define for_each_irq_nr(irq)                   \
        for (irq = 0; irq < nr_irqs; irq++)
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 215c41602af8..1e9a0f2a8626 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -10,136 +10,9 @@
  * of the GNU General Public License, incorporated herein by reference.
  *
  */
-
 #ifndef __ISDN_H__
 #define __ISDN_H__
 
-#include <linux/ioctl.h>
-#include <linux/tty.h>
-
-#define ISDN_MAX_DRIVERS    32
-#define ISDN_MAX_CHANNELS   64
-
-/* New ioctl-codes */
-#define IIOCNETAIF  _IO('I',1)
-#define IIOCNETDIF  _IO('I',2)
-#define IIOCNETSCF  _IO('I',3)
-#define IIOCNETGCF  _IO('I',4)
-#define IIOCNETANM  _IO('I',5)
-#define IIOCNETDNM  _IO('I',6)
-#define IIOCNETGNM  _IO('I',7)
-#define IIOCGETSET  _IO('I',8) /* no longer supported */
-#define IIOCSETSET  _IO('I',9) /* no longer supported */
-#define IIOCSETVER  _IO('I',10)
-#define IIOCNETHUP  _IO('I',11)
-#define IIOCSETGST  _IO('I',12)
-#define IIOCSETBRJ  _IO('I',13)
-#define IIOCSIGPRF  _IO('I',14)
-#define IIOCGETPRF  _IO('I',15)
-#define IIOCSETPRF  _IO('I',16)
-#define IIOCGETMAP  _IO('I',17)
-#define IIOCSETMAP  _IO('I',18)
-#define IIOCNETASL  _IO('I',19)
-#define IIOCNETDIL  _IO('I',20)
-#define IIOCGETCPS  _IO('I',21)
-#define IIOCGETDVR  _IO('I',22)
-#define IIOCNETLCR  _IO('I',23) /* dwabc ioctl for LCR from isdnlog */
-#define IIOCNETDWRSET  _IO('I',24) /* dwabc ioctl to reset abc-values to default on a net-interface */
-
-#define IIOCNETALN  _IO('I',32)
-#define IIOCNETDLN  _IO('I',33)
-
-#define IIOCNETGPN  _IO('I',34)
-
-#define IIOCDBGVAR  _IO('I',127)
-
-#define IIOCDRVCTL  _IO('I',128)
-
-/* cisco hdlck device private ioctls */
-#define SIOCGKEEPPERIOD (SIOCDEVPRIVATE + 0)
-#define SIOCSKEEPPERIOD (SIOCDEVPRIVATE + 1)
-#define SIOCGDEBSERINT  (SIOCDEVPRIVATE + 2)
-#define SIOCSDEBSERINT  (SIOCDEVPRIVATE + 3)
-
-/* Packet encapsulations for net-interfaces */
-#define ISDN_NET_ENCAP_ETHER      0
-#define ISDN_NET_ENCAP_RAWIP      1
-#define ISDN_NET_ENCAP_IPTYP      2
-#define ISDN_NET_ENCAP_CISCOHDLC  3 /* Without SLARP and keepalive */
-#define ISDN_NET_ENCAP_SYNCPPP    4
-#define ISDN_NET_ENCAP_UIHDLC     5
-#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive    */
-#define ISDN_NET_ENCAP_X25IFACE   7 /* Documentation/networking/x25-iface.txt */
-#define ISDN_NET_ENCAP_MAX_ENCAP  ISDN_NET_ENCAP_X25IFACE
-
-/* Facility which currently uses an ISDN-channel */
-#define ISDN_USAGE_NONE       0
-#define ISDN_USAGE_RAW        1
-#define ISDN_USAGE_MODEM      2
-#define ISDN_USAGE_NET        3
-#define ISDN_USAGE_VOICE      4
-#define ISDN_USAGE_FAX        5
-#define ISDN_USAGE_MASK       7 /* Mask to get plain usage */
-#define ISDN_USAGE_DISABLED  32 /* This bit is set, if channel is disabled */
-#define ISDN_USAGE_EXCLUSIVE 64 /* This bit is set, if channel is exclusive */
-#define ISDN_USAGE_OUTGOING 128 /* This bit is set, if channel is outgoing  */
-
-#define ISDN_MODEM_NUMREG    24        /* Number of Modem-Registers        */
-#define ISDN_LMSNLEN         255 /* Length of tty's Listen-MSN string */
-#define ISDN_CMSGLEN         50  /* Length of CONNECT-Message to add for Modem */
-
-#define ISDN_MSNLEN          32
-#define NET_DV 0x06  /* Data version for isdn_net_ioctl_cfg   */
-#define TTY_DV 0x06  /* Data version for iprofd etc.          */
-
-#define INF_DV 0x01  /* Data version for /dev/isdninfo        */
-
-typedef struct {
-  char drvid[25];
-  unsigned long arg;
-} isdn_ioctl_struct;
-
-typedef struct {
-  char name[10];
-  char phone[ISDN_MSNLEN];
-  int  outgoing;
-} isdn_net_ioctl_phone;
-
-typedef struct {
-  char name[10];     /* Name of interface                     */
-  char master[10];   /* Name of Master for Bundling           */
-  char slave[10];    /* Name of Slave for Bundling            */
-  char eaz[256];     /* EAZ/MSN                               */
-  char drvid[25];    /* DriverId for Bindings                 */
-  int  onhtime;      /* Hangup-Timeout                        */
-  int  charge;       /* Charge-Units                          */
-  int  l2_proto;     /* Layer-2 protocol                      */
-  int  l3_proto;     /* Layer-3 protocol                      */
-  int  p_encap;      /* Encapsulation                         */
-  int  exclusive;    /* Channel, if bound exclusive           */
-  int  dialmax;      /* Dial Retry-Counter                    */
-  int  slavedelay;   /* Delay until slave starts up           */
-  int  cbdelay;      /* Delay before Callback                 */
-  int  chargehup;    /* Flag: Charge-Hangup                   */
-  int  ihup;         /* Flag: Hangup-Timeout on incoming line */
-  int  secure;       /* Flag: Secure                          */
-  int  callback;     /* Flag: Callback                        */
-  int  cbhup;        /* Flag: Reject Call before Callback     */
-  int  pppbind;      /* ippp device for bindings              */
-  int  chargeint;    /* Use fixed charge interval length      */
-  int  triggercps;   /* BogoCPS needed for triggering slave   */
-  int  dialtimeout;  /* Dial-Timeout                          */
-  int  dialwait;     /* Time to wait after failed dial        */
-  int  dialmode;     /* Flag: off / on / auto                 */
-} isdn_net_ioctl_cfg;
-
-#define ISDN_NET_DIALMODE_MASK  0xC0    /* bits for status                */
-#define ISDN_NET_DM_OFF         0x00    /* this interface is stopped      */
-#define ISDN_NET_DM_MANUAL      0x40    /* this interface is on (manual)  */
-#define ISDN_NET_DM_AUTO        0x80    /* this interface is autodial     */
-#define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK)
-
-#ifdef __KERNEL__
 
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -163,6 +36,7 @@ typedef struct {
 #include <linux/skbuff.h>
 #include <linux/tcp.h>
 #include <linux/mutex.h>
+#include <uapi/linux/isdn.h>
 
 #define ISDN_TTY_MAJOR    43
 #define ISDN_TTYAUX_MAJOR 44
@@ -595,6 +469,4 @@ typedef struct isdn_devt {
 extern isdn_dev *dev;
 
 
-#endif /* __KERNEL__ */
-
 #endif /* __ISDN_H__ */
diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
deleted file mode 100644
index 991cdb29ab2e..000000000000
--- a/include/linux/isdn/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += capicmd.h
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h
index a5a50f523807..19ab361f9f07 100644
--- a/include/linux/isdn_divertif.h
+++ b/include/linux/isdn_divertif.h
@@ -9,26 +9,12 @@
  * of the GNU General Public License, incorporated herein by reference.
  *
  */
-
 #ifndef _LINUX_ISDN_DIVERTIF_H
 #define _LINUX_ISDN_DIVERTIF_H
 
-/***********************************************************/
-/* magic value is also used to control version information */
-/***********************************************************/
-#define DIVERT_IF_MAGIC 0x25873401
-#define DIVERT_CMD_REG  0x00  /* register command */
-#define DIVERT_CMD_REL  0x01  /* release command */
-#define DIVERT_NO_ERR   0x00  /* return value no error */
-#define DIVERT_CMD_ERR  0x01  /* invalid cmd */
-#define DIVERT_VER_ERR  0x02  /* magic/version invalid */
-#define DIVERT_REG_ERR  0x03  /* module already registered */
-#define DIVERT_REL_ERR  0x04  /* module not registered */
-#define DIVERT_REG_NAME isdn_register_divert
-
-#ifdef __KERNEL__
 #include <linux/isdnif.h>
 #include <linux/types.h>
+#include <uapi/linux/isdn_divertif.h>
 
 /***************************************************************/
 /* structure exchanging data between isdn hl and divert module */
@@ -46,6 +32,4 @@ typedef struct
 /* function register */
 /*********************/
 extern int DIVERT_REG_NAME(isdn_divert_if *);
-#endif
-
 #endif /* _LINUX_ISDN_DIVERTIF_H */
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index 8687a7dc0632..d5f62bc5f4be 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -9,68 +9,16 @@
  * of the GNU General Public License, incorporated herein by reference.
  *
  */
-
 #ifndef _LINUX_ISDN_PPP_H
 #define _LINUX_ISDN_PPP_H
 
-#define CALLTYPE_INCOMING 0x1
-#define CALLTYPE_OUTGOING 0x2
-#define CALLTYPE_CALLBACK 0x4
-
-#define IPPP_VERSION    "2.2.0"
-
-struct pppcallinfo
-{
-  int calltype;
-  unsigned char local_num[64];
-  unsigned char remote_num[64];
-  int charge_units;
-};
-
-#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo)
-#define PPPIOCBUNDLE   _IOW('t',129,int)
-#define PPPIOCGMPFLAGS _IOR('t',130,int)
-#define PPPIOCSMPFLAGS _IOW('t',131,int)
-#define PPPIOCSMPMTU   _IOW('t',132,int)
-#define PPPIOCSMPMRU   _IOW('t',133,int)
-#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long [8])
-#define PPPIOCSCOMPRESSOR _IOW('t',135,int)
-#define PPPIOCGIFNAME      _IOR('t',136, char [IFNAMSIZ] )
-
-
-#define SC_MP_PROT       0x00000200
-#define SC_REJ_MP_PROT   0x00000400
-#define SC_OUT_SHORT_SEQ 0x00000800
-#define SC_IN_SHORT_SEQ  0x00004000
-
-#define SC_DECOMP_ON            0x01
-#define SC_COMP_ON              0x02
-#define SC_DECOMP_DISCARD       0x04
-#define SC_COMP_DISCARD         0x08
-#define SC_LINK_DECOMP_ON       0x10
-#define SC_LINK_COMP_ON         0x20
-#define SC_LINK_DECOMP_DISCARD  0x40
-#define SC_LINK_COMP_DISCARD    0x80
-
-#define ISDN_PPP_COMP_MAX_OPTIONS 16
-
-#define IPPP_COMP_FLAG_XMIT 0x1
-#define IPPP_COMP_FLAG_LINK 0x2
-
-struct isdn_ppp_comp_data {
-  int num;
-  unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS];
-  int optlen;
-  int flags;
-};
-
-#ifdef __KERNEL__
 
 
 
 #ifdef CONFIG_IPPP_FILTER
 #include <linux/filter.h>
 #endif
+#include <uapi/linux/isdn_ppp.h>
 
 #define DECOMP_ERR_NOMEM        (-10)
 
@@ -244,5 +192,4 @@ struct ippp_struct {
   unsigned long compflags;
 };
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_ISDN_PPP_H */
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index b8c23f88dd54..0fc6ff276221 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -10,51 +10,12 @@
  * of the GNU General Public License, incorporated herein by reference.
  *
  */
-
 #ifndef __ISDNIF_H__
 #define __ISDNIF_H__
 
 
-/*
- * Values for general protocol-selection
- */
-#define ISDN_PTYPE_UNKNOWN   0   /* Protocol undefined   */
-#define ISDN_PTYPE_1TR6      1   /* german 1TR6-protocol */
-#define ISDN_PTYPE_EURO      2   /* EDSS1-protocol       */
-#define ISDN_PTYPE_LEASED    3   /* for leased lines     */
-#define ISDN_PTYPE_NI1       4   /* US NI-1 protocol     */
-#define ISDN_PTYPE_MAX       7   /* Max. 8 Protocols     */
-
-/*
- * Values for Layer-2-protocol-selection
- */
-#define ISDN_PROTO_L2_X75I   0   /* X75/LAPB with I-Frames            */
-#define ISDN_PROTO_L2_X75UI  1   /* X75/LAPB with UI-Frames           */
-#define ISDN_PROTO_L2_X75BUI 2   /* X75/LAPB with UI-Frames           */
-#define ISDN_PROTO_L2_HDLC   3   /* HDLC                              */
-#define ISDN_PROTO_L2_TRANS  4   /* Transparent (Voice)               */
-#define ISDN_PROTO_L2_X25DTE 5   /* X25/LAPB DTE mode                 */
-#define ISDN_PROTO_L2_X25DCE 6   /* X25/LAPB DCE mode                 */
-#define ISDN_PROTO_L2_V11096 7   /* V.110 bitrate adaption 9600 Baud  */
-#define ISDN_PROTO_L2_V11019 8   /* V.110 bitrate adaption 19200 Baud */
-#define ISDN_PROTO_L2_V11038 9   /* V.110 bitrate adaption 38400 Baud */
-#define ISDN_PROTO_L2_MODEM  10  /* Analog Modem on Board */
-#define ISDN_PROTO_L2_FAX    11  /* Fax Group 2/3         */
-#define ISDN_PROTO_L2_HDLC_56K 12   /* HDLC 56k                          */
-#define ISDN_PROTO_L2_MAX    15  /* Max. 16 Protocols                 */
-
-/*
- * Values for Layer-3-protocol-selection
- */
-#define ISDN_PROTO_L3_TRANS     0       /* Transparent */
-#define ISDN_PROTO_L3_TRANSDSP  1       /* Transparent with DSP */
-#define ISDN_PROTO_L3_FCLASS2   2       /* Fax Group 2/3 CLASS 2 */
-#define ISDN_PROTO_L3_FCLASS1   3       /* Fax Group 2/3 CLASS 1 */
-#define ISDN_PROTO_L3_MAX       7       /* Max. 8 Protocols */
-
-#ifdef __KERNEL__
-
 #include <linux/skbuff.h>
+#include <uapi/linux/isdnif.h>
 
 /***************************************************************************/
 /* Extensions made by Werner Cornelius (werner@ikt.de)                     */
@@ -541,6 +502,4 @@ typedef struct {
 extern int register_isdn(isdn_if*);
 #include <asm/uaccess.h>
 
-#endif /* __KERNEL__ */
-
 #endif /* __ISDNIF_H__ */
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 05e3c2c7a8cf..6b87413da9d6 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -51,31 +51,17 @@
 #define SH_DIV(NOM,DEN,LSH) (   (((NOM) / (DEN)) << (LSH))              \
                              + ((((NOM) % (DEN)) << (LSH)) + (DEN) / 2) / (DEN))
 
-#ifdef CLOCK_TICK_RATE
 /* LATCH is used in the interval timer and ftape setup. */
-# define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ)  /* For divider */
+#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ)   /* For divider */
 
-/*
- * HZ is the requested value. However the CLOCK_TICK_RATE may not allow
- * for exactly HZ. So SHIFTED_HZ is high res HZ ("<< 8" is for accuracy)
- */
-# define SHIFTED_HZ (SH_DIV(CLOCK_TICK_RATE, LATCH, 8))
-#else
-# define SHIFTED_HZ (HZ << 8)
-#endif
+extern int register_refined_jiffies(long clock_tick_rate);
 
 /* TICK_NSEC is the time between ticks in nsec assuming SHIFTED_HZ */
-#define TICK_NSEC (SH_DIV(1000000UL * 1000, SHIFTED_HZ, 8))
+#define TICK_NSEC ((NSEC_PER_SEC+HZ/2)/HZ)
 
 /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
 #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
 
-/*
- * TICK_USEC_TO_NSEC is the time between ticks in nsec assuming SHIFTED_HZ and
- * a value TUSEC for TICK_USEC (can be set bij adjtimex)
- */
-#define TICK_USEC_TO_NSEC(TUSEC) (SH_DIV(TUSEC * USER_HZ * 1000, SHIFTED_HZ, 8))
-
 /* some arch's have a small-data section that can be accessed register-relative
  * but that can only take up to, say, 4-byte variables. jiffies being part of
  * an 8-byte variable may not be correctly accessed unless we force the issue
diff --git a/include/linux/joystick.h b/include/linux/joystick.h
index 47199b13e0eb..cbf2aa9e93b9 100644
--- a/include/linux/joystick.h
+++ b/include/linux/joystick.h
@@ -1,12 +1,8 @@
-#ifndef _LINUX_JOYSTICK_H
-#define _LINUX_JOYSTICK_H
-
 /*
  *  Copyright (C) 1996-2000 Vojtech Pavlik
  *
  *  Sponsored by SuSE
  */
-
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,113 +22,11 @@
  * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
  * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
  */
+#ifndef _LINUX_JOYSTICK_H
+#define _LINUX_JOYSTICK_H
 
-#include <linux/types.h>
-#include <linux/input.h>
-
-/*
- * Version
- */
-
-#define JS_VERSION              0x020100
-
-/*
- * Types and constants for reading from /dev/js
- */
-
-#define JS_EVENT_BUTTON         0x01    /* button pressed/released */
-#define JS_EVENT_AXIS           0x02    /* joystick moved */
-#define JS_EVENT_INIT           0x80    /* initial state of device */
-
-struct js_event {
-        __u32 time;     /* event timestamp in milliseconds */
-        __s16 value;    /* value */
-        __u8 type;      /* event type */
-        __u8 number;    /* axis/button number */
-};
-
-/*
- * IOCTL commands for joystick driver
- */
-
-#define JSIOCGVERSION           _IOR('j', 0x01, __u32)                          /* get driver version */
-
-#define JSIOCGAXES              _IOR('j', 0x11, __u8)                           /* get number of axes */
-#define JSIOCGBUTTONS           _IOR('j', 0x12, __u8)                           /* get number of buttons */
-#define JSIOCGNAME(len)         _IOC(_IOC_READ, 'j', 0x13, len)                 /* get identifier string */
-
-#define JSIOCSCORR              _IOW('j', 0x21, struct js_corr)                 /* set correction values */
-#define JSIOCGCORR              _IOR('j', 0x22, struct js_corr)                 /* get correction values */
-
-#define JSIOCSAXMAP             _IOW('j', 0x31, __u8[ABS_CNT])                  /* set axis mapping */
-#define JSIOCGAXMAP             _IOR('j', 0x32, __u8[ABS_CNT])                  /* get axis mapping */
-#define JSIOCSBTNMAP            _IOW('j', 0x33, __u16[KEY_MAX - BTN_MISC + 1])  /* set button mapping */
-#define JSIOCGBTNMAP            _IOR('j', 0x34, __u16[KEY_MAX - BTN_MISC + 1])  /* get button mapping */
-
-/*
- * Types and constants for get/set correction
- */
-
-#define JS_CORR_NONE            0x00    /* returns raw values */
-#define JS_CORR_BROKEN          0x01    /* broken line */
-
-struct js_corr {
-        __s32 coef[8];
-        __s16 prec;
-        __u16 type;
-};
-
-/*
- * v0.x compatibility definitions
- */
-
-#define JS_RETURN               sizeof(struct JS_DATA_TYPE)
-#define JS_TRUE                 1
-#define JS_FALSE                0
-#define JS_X_0                  0x01
-#define JS_Y_0                  0x02
-#define JS_X_1                  0x04
-#define JS_Y_1                  0x08
-#define JS_MAX                  2
-
-#define JS_DEF_TIMEOUT          0x1300
-#define JS_DEF_CORR             0
-#define JS_DEF_TIMELIMIT        10L
-
-#define JS_SET_CAL              1
-#define JS_GET_CAL              2
-#define JS_SET_TIMEOUT          3
-#define JS_GET_TIMEOUT          4
-#define JS_SET_TIMELIMIT        5
-#define JS_GET_TIMELIMIT        6
-#define JS_GET_ALL              7
-#define JS_SET_ALL              8
-
-struct JS_DATA_TYPE {
-        __s32 buttons;
-        __s32 x;
-        __s32 y;
-};
-
-struct JS_DATA_SAVE_TYPE_32 {
-        __s32 JS_TIMEOUT;
-        __s32 BUSY;
-        __s32 JS_EXPIRETIME;
-        __s32 JS_TIMELIMIT;
-        struct JS_DATA_TYPE JS_SAVE;
-        struct JS_DATA_TYPE JS_CORR;
-};
-
-struct JS_DATA_SAVE_TYPE_64 {
-        __s32 JS_TIMEOUT;
-        __s32 BUSY;
-        __s64 JS_EXPIRETIME;
-        __s64 JS_TIMELIMIT;
-        struct JS_DATA_TYPE JS_SAVE;
-        struct JS_DATA_TYPE JS_CORR;
-};
+#include <uapi/linux/joystick.h>
 
-#ifdef __KERNEL__
 #if BITS_PER_LONG == 64
 #define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
 #elif BITS_PER_LONG == 32
@@ -140,6 +34,4 @@ struct JS_DATA_SAVE_TYPE_64 {
 #else
 #error Unexpected BITS_PER_LONG
 #endif
-#endif
-
 #endif /* _LINUX_JOYSTICK_H */
diff --git a/include/linux/kd.h b/include/linux/kd.h
index c36d8476db55..25bd17fad239 100644
--- a/include/linux/kd.h
+++ b/include/linux/kd.h
@@ -1,186 +1,7 @@
 #ifndef _LINUX_KD_H
 #define _LINUX_KD_H
-#include <linux/types.h>
-#include <linux/compiler.h>
 
-/* 0x4B is 'K', to avoid collision with termios and vt */
+#include <uapi/linux/kd.h>
 
-#define GIO_FONT        0x4B60  /* gets font in expanded form */
-#define PIO_FONT        0x4B61  /* use font in expanded form */
-
-#define GIO_FONTX       0x4B6B  /* get font using struct consolefontdesc */
-#define PIO_FONTX       0x4B6C  /* set font using struct consolefontdesc */
-struct consolefontdesc {
-        unsigned short charcount;       /* characters in font (256 or 512) */
-        unsigned short charheight;      /* scan lines per character (1-32) */
-        char __user *chardata;          /* font data in expanded form */
-};
-
-#define PIO_FONTRESET   0x4B6D  /* reset to default font */
-
-#define GIO_CMAP        0x4B70  /* gets colour palette on VGA+ */
-#define PIO_CMAP        0x4B71  /* sets colour palette on VGA+ */
-
-#define KIOCSOUND       0x4B2F  /* start sound generation (0 for off) */
-#define KDMKTONE        0x4B30  /* generate tone */
-
-#define KDGETLED        0x4B31  /* return current led state */
-#define KDSETLED        0x4B32  /* set led state [lights, not flags] */
-#define         LED_SCR         0x01    /* scroll lock led */
-#define         LED_NUM         0x02    /* num lock led */
-#define         LED_CAP         0x04    /* caps lock led */
-
-#define KDGKBTYPE       0x4B33  /* get keyboard type */
-#define         KB_84           0x01
-#define         KB_101          0x02    /* this is what we always answer */
-#define         KB_OTHER        0x03
-
-#define KDADDIO         0x4B34  /* add i/o port as valid */
-#define KDDELIO         0x4B35  /* del i/o port as valid */
-#define KDENABIO        0x4B36  /* enable i/o to video board */
-#define KDDISABIO       0x4B37  /* disable i/o to video board */
-
-#define KDSETMODE       0x4B3A  /* set text/graphics mode */
-#define         KD_TEXT         0x00
-#define         KD_GRAPHICS     0x01
-#define         KD_TEXT0        0x02    /* obsolete */
-#define         KD_TEXT1        0x03    /* obsolete */
-#define KDGETMODE       0x4B3B  /* get current mode */
-
-#define KDMAPDISP       0x4B3C  /* map display into address space */
-#define KDUNMAPDISP     0x4B3D  /* unmap display from address space */
-
-typedef char scrnmap_t;
-#define         E_TABSZ         256
-#define GIO_SCRNMAP     0x4B40  /* get screen mapping from kernel */
-#define PIO_SCRNMAP     0x4B41  /* put screen mapping table in kernel */
-#define GIO_UNISCRNMAP  0x4B69  /* get full Unicode screen mapping */
-#define PIO_UNISCRNMAP  0x4B6A  /* set full Unicode screen mapping */
-
-#define GIO_UNIMAP      0x4B66  /* get unicode-to-font mapping from kernel */
-struct unipair {
-        unsigned short unicode;
-        unsigned short fontpos;
-};
-struct unimapdesc {
-        unsigned short entry_ct;
-        struct unipair __user *entries;
-};
-#define PIO_UNIMAP      0x4B67  /* put unicode-to-font mapping in kernel */
-#define PIO_UNIMAPCLR   0x4B68  /* clear table, possibly advise hash algorithm */
-struct unimapinit {
-        unsigned short advised_hashsize;  /* 0 if no opinion */
-        unsigned short advised_hashstep;  /* 0 if no opinion */
-        unsigned short advised_hashlevel; /* 0 if no opinion */
-};
-
-#define UNI_DIRECT_BASE 0xF000  /* start of Direct Font Region */
-#define UNI_DIRECT_MASK 0x01FF  /* Direct Font Region bitmask */
-
-#define         K_RAW           0x00
-#define         K_XLATE         0x01
-#define         K_MEDIUMRAW     0x02
-#define         K_UNICODE       0x03
-#define         K_OFF           0x04
-#define KDGKBMODE       0x4B44  /* gets current keyboard mode */
-#define KDSKBMODE       0x4B45  /* sets current keyboard mode */
-
-#define         K_METABIT       0x03
-#define         K_ESCPREFIX     0x04
-#define KDGKBMETA       0x4B62  /* gets meta key handling mode */
-#define KDSKBMETA       0x4B63  /* sets meta key handling mode */
-
-#define         K_SCROLLLOCK    0x01
-#define         K_NUMLOCK       0x02
-#define         K_CAPSLOCK      0x04
-#define KDGKBLED        0x4B64  /* get led flags (not lights) */
-#define KDSKBLED        0x4B65  /* set led flags (not lights) */
-
-struct kbentry {
-        unsigned char kb_table;
-        unsigned char kb_index;
-        unsigned short kb_value;
-};
-#define         K_NORMTAB       0x00
-#define         K_SHIFTTAB      0x01
-#define         K_ALTTAB        0x02
-#define         K_ALTSHIFTTAB   0x03
-
-#define KDGKBENT        0x4B46  /* gets one entry in translation table */
-#define KDSKBENT        0x4B47  /* sets one entry in translation table */
-
-struct kbsentry {
-        unsigned char kb_func;
-        unsigned char kb_string[512];
-};
-#define KDGKBSENT       0x4B48  /* gets one function key string entry */
-#define KDSKBSENT       0x4B49  /* sets one function key string entry */
-
-struct kbdiacr {
-        unsigned char diacr, base, result;
-};
-struct kbdiacrs {
-        unsigned int kb_cnt;    /* number of entries in following array */
-        struct kbdiacr kbdiacr[256];    /* MAX_DIACR from keyboard.h */
-};
-#define KDGKBDIACR      0x4B4A  /* read kernel accent table */
-#define KDSKBDIACR      0x4B4B  /* write kernel accent table */
-
-struct kbdiacruc {
-        unsigned int diacr, base, result;
-};
-struct kbdiacrsuc {
-        unsigned int kb_cnt;    /* number of entries in following array */
-        struct kbdiacruc kbdiacruc[256];    /* MAX_DIACR from keyboard.h */
-};
-#define KDGKBDIACRUC    0x4BFA  /* read kernel accent table - UCS */
-#define KDSKBDIACRUC    0x4BFB  /* write kernel accent table - UCS */
-
-struct kbkeycode {
-        unsigned int scancode, keycode;
-};
-#define KDGETKEYCODE    0x4B4C  /* read kernel keycode table entry */
-#define KDSETKEYCODE    0x4B4D  /* write kernel keycode table entry */
-
-#define KDSIGACCEPT     0x4B4E  /* accept kbd generated signals */
-
-struct kbd_repeat {
-        int delay;      /* in msec; <= 0: don't change */
-        int period;     /* in msec; <= 0: don't change */
-                        /* earlier this field was misnamed "rate" */
-};
-
-#define KDKBDREP        0x4B52  /* set keyboard delay/repeat rate;
-                                 * actually used values are returned */
-
-#define KDFONTOP        0x4B72  /* font operations */
-
-struct console_font_op {
-        unsigned int op;        /* operation code KD_FONT_OP_* */
-        unsigned int flags;     /* KD_FONT_FLAG_* */
-        unsigned int width, height;     /* font size */
-        unsigned int charcount;
-        unsigned char __user *data;     /* font data with height fixed to 32 */
-};
-
-struct console_font {
-        unsigned int width, height;     /* font size */
-        unsigned int charcount;
-        unsigned char *data;    /* font data with height fixed to 32 */
-};
-
-#define KD_FONT_OP_SET          0       /* Set font */
-#define KD_FONT_OP_GET          1       /* Get font */
-#define KD_FONT_OP_SET_DEFAULT  2       /* Set font to default, data points to name / NULL */
-#define KD_FONT_OP_COPY         3       /* Copy from another console */
-
-#define KD_FONT_FLAG_DONT_RECALC        1       /* Don't recalculate hw charcell size [compat] */
-#ifdef __KERNEL__
 #define KD_FONT_FLAG_OLD                0x80000000      /* Invoked via old interface [compat] */
-#endif
-
-/* note: 0x4B00-0x4B4E all have had a value at some time;
-   don't reuse for the time being */
-/* note: 0x4B60-0x4B6D, 0x4B70-0x4B72 used above */
-
 #endif /* _LINUX_KD_H */
diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h
index 2dacab8beccb..c838abe3ee0a 100644
--- a/include/linux/kdev_t.h
+++ b/include/linux/kdev_t.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_KDEV_T_H
 #define _LINUX_KDEV_T_H
-#ifdef __KERNEL__
+
+#include <uapi/linux/kdev_t.h>
+
 #define MINORBITS       20
 #define MINORMASK       ((1U << MINORBITS) - 1)
 
@@ -87,14 +89,4 @@ static inline unsigned sysv_minor(u32 dev)
         return dev & 0x3ffff;
 }
 
-#else /* __KERNEL__ */
-
-/*
-Some programs want their definitions of MAJOR and MINOR and MKDEV
-from the kernel sources. These must be the externally visible ones.
-*/
-#define MAJOR(dev)      ((dev)>>8)
-#define MINOR(dev)      ((dev) & 0xff)
-#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h
index a1bdf6966357..546eb6a76934 100644
--- a/include/linux/kernel-page-flags.h
+++ b/include/linux/kernel-page-flags.h
@@ -1,38 +1,8 @@
 #ifndef LINUX_KERNEL_PAGE_FLAGS_H
 #define LINUX_KERNEL_PAGE_FLAGS_H
 
-/*
- * Stable page flag bits exported to user space
- */
-
-#define KPF_LOCKED              0
-#define KPF_ERROR               1
-#define KPF_REFERENCED          2
-#define KPF_UPTODATE            3
-#define KPF_DIRTY               4
-#define KPF_LRU                 5
-#define KPF_ACTIVE              6
-#define KPF_SLAB                7
-#define KPF_WRITEBACK           8
-#define KPF_RECLAIM             9
-#define KPF_BUDDY               10
-
-/* 11-20: new additions in 2.6.31 */
-#define KPF_MMAP                11
-#define KPF_ANON                12
-#define KPF_SWAPCACHE           13
-#define KPF_SWAPBACKED          14
-#define KPF_COMPOUND_HEAD       15
-#define KPF_COMPOUND_TAIL       16
-#define KPF_HUGE                17
-#define KPF_UNEVICTABLE         18
-#define KPF_HWPOISON            19
-#define KPF_NOPAGE              20
+#include <uapi/linux/kernel-page-flags.h>
 
-#define KPF_KSM                 21
-#define KPF_THP                 22
-
-#ifdef __KERNEL__
 
 /* kernel hacking assistances
  * WARNING: subject to change, never rely on them!
@@ -46,6 +16,4 @@
 #define KPF_ARCH                38
 #define KPF_UNCACHED            39
 
-#endif /* __KERNEL__ */
-
 #endif /* LINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 2451f1f7a1d9..a123b13b70fd 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -1,15 +1,6 @@
 #ifndef _LINUX_KERNEL_H
 #define _LINUX_KERNEL_H
 
-#include <linux/sysinfo.h>
-
-/*
- * 'kernel.h' contains some often-used function prototypes etc
- */
-#define __ALIGN_KERNEL(x, a)            __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_KERNEL_MASK(x, mask)    (((x) + (mask)) & ~(mask))
-
-#ifdef __KERNEL__
 
 #include <stdarg.h>
 #include <linux/linkage.h>
@@ -22,6 +13,7 @@
 #include <linux/printk.h>
 #include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
+#include <uapi/linux/kernel.h>
 
 #define USHRT_MAX       ((u16)(~0U))
 #define SHRT_MAX        ((s16)(USHRT_MAX>>1))
@@ -716,6 +708,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 
 extern int do_sysinfo(struct sysinfo *info);
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index 9c2683929fd3..9be37da93680 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -6,49 +6,15 @@
  * (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
  * 
  */
-
 #ifndef __KERNELCAPI_H__
 #define __KERNELCAPI_H__
 
-#define CAPI_MAXAPPL    240     /* maximum number of applications  */
-#define CAPI_MAXCONTR   32      /* maximum number of controller    */
-#define CAPI_MAXDATAWINDOW      8
-
-
-typedef struct kcapi_flagdef {
-        int contr;
-        int flag;
-} kcapi_flagdef;
-
-typedef struct kcapi_carddef {
-        char            driver[32];
-        unsigned int    port;
-        unsigned        irq;
-        unsigned int    membase;
-        int             cardnr;
-} kcapi_carddef;
-
-/* new ioctls >= 10 */
-#define KCAPI_CMD_TRACE         10
-#define KCAPI_CMD_ADDCARD       11      /* OBSOLETE */
-
-/* 
- * flag > 2 => trace also data
- * flag & 1 => show trace
- */
-#define KCAPI_TRACE_OFF                 0
-#define KCAPI_TRACE_SHORT_NO_DATA       1
-#define KCAPI_TRACE_FULL_NO_DATA        2
-#define KCAPI_TRACE_SHORT               3
-#define KCAPI_TRACE_FULL                4
-
-
-#ifdef __KERNEL__
 
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/notifier.h>
+#include <uapi/linux/kernelcapi.h>
 
 struct capi20_appl {
         u16 applid;
@@ -150,6 +116,4 @@ typedef enum {
         CapiCallGivenToOtherApplication                 = 0x3304,
 } CAPI_REASON;
 
-#endif                          /* __KERNEL__ */
-
 #endif                          /* __KERNELCAPI_H__ */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 37c5f7261142..d0b8458a703a 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -1,57 +1,8 @@
 #ifndef LINUX_KEXEC_H
 #define LINUX_KEXEC_H
 
-/* kexec system call -  It loads the new kernel to boot into.
- * kexec does not sync, or unmount filesystems so if you need
- * that to happen you need to do that yourself.
- */
-
-#include <linux/types.h>
-
-/* kexec flags for different usage scenarios */
-#define KEXEC_ON_CRASH          0x00000001
-#define KEXEC_PRESERVE_CONTEXT  0x00000002
-#define KEXEC_ARCH_MASK         0xffff0000
-
-/* These values match the ELF architecture values.
- * Unless there is a good reason that should continue to be the case.
- */
-#define KEXEC_ARCH_DEFAULT ( 0 << 16)
-#define KEXEC_ARCH_386     ( 3 << 16)
-#define KEXEC_ARCH_X86_64  (62 << 16)
-#define KEXEC_ARCH_PPC     (20 << 16)
-#define KEXEC_ARCH_PPC64   (21 << 16)
-#define KEXEC_ARCH_IA_64   (50 << 16)
-#define KEXEC_ARCH_ARM     (40 << 16)
-#define KEXEC_ARCH_S390    (22 << 16)
-#define KEXEC_ARCH_SH      (42 << 16)
-#define KEXEC_ARCH_MIPS_LE (10 << 16)
-#define KEXEC_ARCH_MIPS    ( 8 << 16)
-
-/* The artificial cap on the number of segments passed to kexec_load. */
-#define KEXEC_SEGMENT_MAX 16
-
-#ifndef __KERNEL__
-/*
- * This structure is used to hold the arguments that are used when
- * loading  kernel binaries.
- */
-struct kexec_segment {
-        const void *buf;
-        size_t bufsz;
-        const void *mem;
-        size_t memsz;
-};
-
-/* Load a new kernel image as described by the kexec_segment array
- * consisting of passed number of segments at the entry-point address.
- * The flags allow different useage types.
- */
-extern int kexec_load(void *, size_t, struct kexec_segment *,
-                unsigned long int);
-#endif /* __KERNEL__ */
+#include <uapi/linux/kexec.h>
 
-#ifdef __KERNEL__
 #ifdef CONFIG_KEXEC
 #include <linux/list.h>
 #include <linux/linkage.h>
@@ -258,5 +209,4 @@ struct task_struct;
 static inline void crash_kexec(struct pt_regs *regs) { }
 static inline int kexec_should_crash(struct task_struct *p) { return 0; }
 #endif /* CONFIG_KEXEC */
-#endif /* __KERNEL__ */
 #endif /* LINUX_KEXEC_H */
diff --git a/include/linux/key-type.h b/include/linux/key-type.h
index f0c651cda7b0..518a53afb9ea 100644
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
@@ -26,6 +26,27 @@ struct key_construction {
         struct key      *authkey;/* authorisation for key being constructed */
 };
 
+/*
+ * Pre-parsed payload, used by key add, update and instantiate.
+ *
+ * This struct will be cleared and data and datalen will be set with the data
+ * and length parameters from the caller and quotalen will be set from
+ * def_datalen from the key type.  Then if the preparse() op is provided by the
+ * key type, that will be called.  Then the struct will be passed to the
+ * instantiate() or the update() op.
+ *
+ * If the preparse() op is given, the free_preparse() op will be called to
+ * clear the contents.
+ */
+struct key_preparsed_payload {
+        char            *description;   /* Proposed key description (or NULL) */
+        void            *type_data[2];  /* Private key-type data */
+        void            *payload;       /* Proposed payload */
+        const void      *data;          /* Raw data */
+        size_t          datalen;        /* Raw datalen */
+        size_t          quotalen;       /* Quota length for proposed payload */
+};
+
 typedef int (*request_key_actor_t)(struct key_construction *key,
                                    const char *op, void *aux);
 
@@ -45,18 +66,28 @@ struct key_type {
         /* vet a description */
         int (*vet_description)(const char *description);
 
+        /* Preparse the data blob from userspace that is to be the payload,
+         * generating a proposed description and payload that will be handed to
+         * the instantiate() and update() ops.
+         */
+        int (*preparse)(struct key_preparsed_payload *prep);
+
+        /* Free a preparse data structure.
+         */
+        void (*free_preparse)(struct key_preparsed_payload *prep);
+
         /* instantiate a key of this type
          * - this method should call key_payload_reserve() to determine if the
          *   user's quota will hold the payload
          */
-        int (*instantiate)(struct key *key, const void *data, size_t datalen);
+        int (*instantiate)(struct key *key, struct key_preparsed_payload *prep);
 
         /* update a key of this type (optional)
          * - this method should call key_payload_reserve() to recalculate the
          *   quota consumption
          * - the key must be locked against read when modifying
          */
-        int (*update)(struct key *key, const void *data, size_t datalen);
+        int (*update)(struct key *key, struct key_preparsed_payload *prep);
 
         /* match a key against a description */
         int (*match)(const struct key *key, const void *desc);
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h
index 86e5214ae735..131ed5146521 100644
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
@@ -1,28 +1,8 @@
 #ifndef __LINUX_KEYBOARD_H
 #define __LINUX_KEYBOARD_H
 
-#include <linux/wait.h>
+#include <uapi/linux/keyboard.h>
 
-#define KG_SHIFT        0
-#define KG_CTRL         2
-#define KG_ALT          3
-#define KG_ALTGR        1
-#define KG_SHIFTL       4
-#define KG_KANASHIFT    4
-#define KG_SHIFTR       5
-#define KG_CTRLL        6
-#define KG_CTRLR        7
-#define KG_CAPSSHIFT    8
-
-#define NR_SHIFT        9
-
-#define NR_KEYS         256
-#define MAX_NR_KEYMAPS  256
-/* This means 128Kb if all keymaps are allocated. Only the superuser
-        may increase the number of keymaps beyond MAX_NR_OF_USER_KEYMAPS. */
-#define MAX_NR_OF_USER_KEYMAPS 256      /* should be at least 7 */
-
-#ifdef __KERNEL__
 struct notifier_block;
 extern unsigned short *key_maps[MAX_NR_KEYMAPS];
 extern unsigned short plain_map[NR_KEYS];
@@ -38,422 +18,3 @@ struct keyboard_notifier_param {
 extern int register_keyboard_notifier(struct notifier_block *nb);
 extern int unregister_keyboard_notifier(struct notifier_block *nb);
 #endif
-
-#define MAX_NR_FUNC     256     /* max nr of strings assigned to keys */
-
-#define KT_LATIN        0       /* we depend on this being zero */
-#define KT_LETTER       11      /* symbol that can be acted upon by CapsLock */
-#define KT_FN           1
-#define KT_SPEC         2
-#define KT_PAD          3
-#define KT_DEAD         4
-#define KT_CONS         5
-#define KT_CUR          6
-#define KT_SHIFT        7
-#define KT_META         8
-#define KT_ASCII        9
-#define KT_LOCK         10
-#define KT_SLOCK        12
-#define KT_DEAD2        13
-#define KT_BRL          14
-
-#define K(t,v)          (((t)<<8)|(v))
-#define KTYP(x)         ((x) >> 8)
-#define KVAL(x)         ((x) & 0xff)
-
-#define K_F1            K(KT_FN,0)
-#define K_F2            K(KT_FN,1)
-#define K_F3            K(KT_FN,2)
-#define K_F4            K(KT_FN,3)
-#define K_F5            K(KT_FN,4)
-#define K_F6            K(KT_FN,5)
-#define K_F7            K(KT_FN,6)
-#define K_F8            K(KT_FN,7)
-#define K_F9            K(KT_FN,8)
-#define K_F10           K(KT_FN,9)
-#define K_F11           K(KT_FN,10)
-#define K_F12           K(KT_FN,11)
-#define K_F13           K(KT_FN,12)
-#define K_F14           K(KT_FN,13)
-#define K_F15           K(KT_FN,14)
-#define K_F16           K(KT_FN,15)
-#define K_F17           K(KT_FN,16)
-#define K_F18           K(KT_FN,17)
-#define K_F19           K(KT_FN,18)
-#define K_F20           K(KT_FN,19)
-#define K_FIND          K(KT_FN,20)
-#define K_INSERT        K(KT_FN,21)
-#define K_REMOVE        K(KT_FN,22)
-#define K_SELECT        K(KT_FN,23)
-#define K_PGUP          K(KT_FN,24) /* PGUP is a synonym for PRIOR */
-#define K_PGDN          K(KT_FN,25) /* PGDN is a synonym for NEXT */
-#define K_MACRO         K(KT_FN,26)
-#define K_HELP          K(KT_FN,27)
-#define K_DO            K(KT_FN,28)
-#define K_PAUSE         K(KT_FN,29)
-#define K_F21           K(KT_FN,30)
-#define K_F22           K(KT_FN,31)
-#define K_F23           K(KT_FN,32)
-#define K_F24           K(KT_FN,33)
-#define K_F25           K(KT_FN,34)
-#define K_F26           K(KT_FN,35)
-#define K_F27           K(KT_FN,36)
-#define K_F28           K(KT_FN,37)
-#define K_F29           K(KT_FN,38)
-#define K_F30           K(KT_FN,39)
-#define K_F31           K(KT_FN,40)
-#define K_F32           K(KT_FN,41)
-#define K_F33           K(KT_FN,42)
-#define K_F34           K(KT_FN,43)
-#define K_F35           K(KT_FN,44)
-#define K_F36           K(KT_FN,45)
-#define K_F37           K(KT_FN,46)
-#define K_F38           K(KT_FN,47)
-#define K_F39           K(KT_FN,48)
-#define K_F40           K(KT_FN,49)
-#define K_F41           K(KT_FN,50)
-#define K_F42           K(KT_FN,51)
-#define K_F43           K(KT_FN,52)
-#define K_F44           K(KT_FN,53)
-#define K_F45           K(KT_FN,54)
-#define K_F46           K(KT_FN,55)
-#define K_F47           K(KT_FN,56)
-#define K_F48           K(KT_FN,57)
-#define K_F49           K(KT_FN,58)
-#define K_F50           K(KT_FN,59)
-#define K_F51           K(KT_FN,60)
-#define K_F52           K(KT_FN,61)
-#define K_F53           K(KT_FN,62)
-#define K_F54           K(KT_FN,63)
-#define K_F55           K(KT_FN,64)
-#define K_F56           K(KT_FN,65)
-#define K_F57           K(KT_FN,66)
-#define K_F58           K(KT_FN,67)
-#define K_F59           K(KT_FN,68)
-#define K_F60           K(KT_FN,69)
-#define K_F61           K(KT_FN,70)
-#define K_F62           K(KT_FN,71)
-#define K_F63           K(KT_FN,72)
-#define K_F64           K(KT_FN,73)
-#define K_F65           K(KT_FN,74)
-#define K_F66           K(KT_FN,75)
-#define K_F67           K(KT_FN,76)
-#define K_F68           K(KT_FN,77)
-#define K_F69           K(KT_FN,78)
-#define K_F70           K(KT_FN,79)
-#define K_F71           K(KT_FN,80)
-#define K_F72           K(KT_FN,81)
-#define K_F73           K(KT_FN,82)
-#define K_F74           K(KT_FN,83)
-#define K_F75           K(KT_FN,84)
-#define K_F76           K(KT_FN,85)
-#define K_F77           K(KT_FN,86)
-#define K_F78           K(KT_FN,87)
-#define K_F79           K(KT_FN,88)
-#define K_F80           K(KT_FN,89)
-#define K_F81           K(KT_FN,90)
-#define K_F82           K(KT_FN,91)
-#define K_F83           K(KT_FN,92)
-#define K_F84           K(KT_FN,93)
-#define K_F85           K(KT_FN,94)
-#define K_F86           K(KT_FN,95)
-#define K_F87           K(KT_FN,96)
-#define K_F88           K(KT_FN,97)
-#define K_F89           K(KT_FN,98)
-#define K_F90           K(KT_FN,99)
-#define K_F91           K(KT_FN,100)
-#define K_F92           K(KT_FN,101)
-#define K_F93           K(KT_FN,102)
-#define K_F94           K(KT_FN,103)
-#define K_F95           K(KT_FN,104)
-#define K_F96           K(KT_FN,105)
-#define K_F97           K(KT_FN,106)
-#define K_F98           K(KT_FN,107)
-#define K_F99           K(KT_FN,108)
-#define K_F100          K(KT_FN,109)
-#define K_F101          K(KT_FN,110)
-#define K_F102          K(KT_FN,111)
-#define K_F103          K(KT_FN,112)
-#define K_F104          K(KT_FN,113)
-#define K_F105          K(KT_FN,114)
-#define K_F106          K(KT_FN,115)
-#define K_F107          K(KT_FN,116)
-#define K_F108          K(KT_FN,117)
-#define K_F109          K(KT_FN,118)
-#define K_F110          K(KT_FN,119)
-#define K_F111          K(KT_FN,120)
-#define K_F112          K(KT_FN,121)
-#define K_F113          K(KT_FN,122)
-#define K_F114          K(KT_FN,123)
-#define K_F115          K(KT_FN,124)
-#define K_F116          K(KT_FN,125)
-#define K_F117          K(KT_FN,126)
-#define K_F118          K(KT_FN,127)
-#define K_F119          K(KT_FN,128)
-#define K_F120          K(KT_FN,129)
-#define K_F121          K(KT_FN,130)
-#define K_F122          K(KT_FN,131)
-#define K_F123          K(KT_FN,132)
-#define K_F124          K(KT_FN,133)
-#define K_F125          K(KT_FN,134)
-#define K_F126          K(KT_FN,135)
-#define K_F127          K(KT_FN,136)
-#define K_F128          K(KT_FN,137)
-#define K_F129          K(KT_FN,138)
-#define K_F130          K(KT_FN,139)
-#define K_F131          K(KT_FN,140)
-#define K_F132          K(KT_FN,141)
-#define K_F133          K(KT_FN,142)
-#define K_F134          K(KT_FN,143)
-#define K_F135          K(KT_FN,144)
-#define K_F136          K(KT_FN,145)
-#define K_F137          K(KT_FN,146)
-#define K_F138          K(KT_FN,147)
-#define K_F139          K(KT_FN,148)
-#define K_F140          K(KT_FN,149)
-#define K_F141          K(KT_FN,150)
-#define K_F142          K(KT_FN,151)
-#define K_F143          K(KT_FN,152)
-#define K_F144          K(KT_FN,153)
-#define K_F145          K(KT_FN,154)
-#define K_F146          K(KT_FN,155)
-#define K_F147          K(KT_FN,156)
-#define K_F148          K(KT_FN,157)
-#define K_F149          K(KT_FN,158)
-#define K_F150          K(KT_FN,159)
-#define K_F151          K(KT_FN,160)
-#define K_F152          K(KT_FN,161)
-#define K_F153          K(KT_FN,162)
-#define K_F154          K(KT_FN,163)
-#define K_F155          K(KT_FN,164)
-#define K_F156          K(KT_FN,165)
-#define K_F157          K(KT_FN,166)
-#define K_F158          K(KT_FN,167)
-#define K_F159          K(KT_FN,168)
-#define K_F160          K(KT_FN,169)
-#define K_F161          K(KT_FN,170)
-#define K_F162          K(KT_FN,171)
-#define K_F163          K(KT_FN,172)
-#define K_F164          K(KT_FN,173)
-#define K_F165          K(KT_FN,174)
-#define K_F166          K(KT_FN,175)
-#define K_F167          K(KT_FN,176)
-#define K_F168          K(KT_FN,177)
-#define K_F169          K(KT_FN,178)
-#define K_F170          K(KT_FN,179)
-#define K_F171          K(KT_FN,180)
-#define K_F172          K(KT_FN,181)
-#define K_F173          K(KT_FN,182)
-#define K_F174          K(KT_FN,183)
-#define K_F175          K(KT_FN,184)
-#define K_F176          K(KT_FN,185)
-#define K_F177          K(KT_FN,186)
-#define K_F178          K(KT_FN,187)
-#define K_F179          K(KT_FN,188)
-#define K_F180          K(KT_FN,189)
-#define K_F181          K(KT_FN,190)
-#define K_F182          K(KT_FN,191)
-#define K_F183          K(KT_FN,192)
-#define K_F184          K(KT_FN,193)
-#define K_F185          K(KT_FN,194)
-#define K_F186          K(KT_FN,195)
-#define K_F187          K(KT_FN,196)
-#define K_F188          K(KT_FN,197)
-#define K_F189          K(KT_FN,198)
-#define K_F190          K(KT_FN,199)
-#define K_F191          K(KT_FN,200)
-#define K_F192          K(KT_FN,201)
-#define K_F193          K(KT_FN,202)
-#define K_F194          K(KT_FN,203)
-#define K_F195          K(KT_FN,204)
-#define K_F196          K(KT_FN,205)
-#define K_F197          K(KT_FN,206)
-#define K_F198          K(KT_FN,207)
-#define K_F199          K(KT_FN,208)
-#define K_F200          K(KT_FN,209)
-#define K_F201          K(KT_FN,210)
-#define K_F202          K(KT_FN,211)
-#define K_F203          K(KT_FN,212)
-#define K_F204          K(KT_FN,213)
-#define K_F205          K(KT_FN,214)
-#define K_F206          K(KT_FN,215)
-#define K_F207          K(KT_FN,216)
-#define K_F208          K(KT_FN,217)
-#define K_F209          K(KT_FN,218)
-#define K_F210          K(KT_FN,219)
-#define K_F211          K(KT_FN,220)
-#define K_F212          K(KT_FN,221)
-#define K_F213          K(KT_FN,222)
-#define K_F214          K(KT_FN,223)
-#define K_F215          K(KT_FN,224)
-#define K_F216          K(KT_FN,225)
-#define K_F217          K(KT_FN,226)
-#define K_F218          K(KT_FN,227)
-#define K_F219          K(KT_FN,228)
-#define K_F220          K(KT_FN,229)
-#define K_F221          K(KT_FN,230)
-#define K_F222          K(KT_FN,231)
-#define K_F223          K(KT_FN,232)
-#define K_F224          K(KT_FN,233)
-#define K_F225          K(KT_FN,234)
-#define K_F226          K(KT_FN,235)
-#define K_F227          K(KT_FN,236)
-#define K_F228          K(KT_FN,237)
-#define K_F229          K(KT_FN,238)
-#define K_F230          K(KT_FN,239)
-#define K_F231          K(KT_FN,240)
-#define K_F232          K(KT_FN,241)
-#define K_F233          K(KT_FN,242)
-#define K_F234          K(KT_FN,243)
-#define K_F235          K(KT_FN,244)
-#define K_F236          K(KT_FN,245)
-#define K_F237          K(KT_FN,246)
-#define K_F238          K(KT_FN,247)
-#define K_F239          K(KT_FN,248)
-#define K_F240          K(KT_FN,249)
-#define K_F241          K(KT_FN,250)
-#define K_F242          K(KT_FN,251)
-#define K_F243          K(KT_FN,252)
-#define K_F244          K(KT_FN,253)
-#define K_F245          K(KT_FN,254)
-#define K_UNDO          K(KT_FN,255)
-
-
-#define K_HOLE          K(KT_SPEC,0)
-#define K_ENTER         K(KT_SPEC,1)
-#define K_SH_REGS       K(KT_SPEC,2)
-#define K_SH_MEM        K(KT_SPEC,3)
-#define K_SH_STAT       K(KT_SPEC,4)
-#define K_BREAK         K(KT_SPEC,5)
-#define K_CONS          K(KT_SPEC,6)
-#define K_CAPS          K(KT_SPEC,7)
-#define K_NUM           K(KT_SPEC,8)
-#define K_HOLD          K(KT_SPEC,9)
-#define K_SCROLLFORW    K(KT_SPEC,10)
-#define K_SCROLLBACK    K(KT_SPEC,11)
-#define K_BOOT          K(KT_SPEC,12)
-#define K_CAPSON        K(KT_SPEC,13)
-#define K_COMPOSE       K(KT_SPEC,14)
-#define K_SAK           K(KT_SPEC,15)
-#define K_DECRCONSOLE   K(KT_SPEC,16)
-#define K_INCRCONSOLE   K(KT_SPEC,17)
-#define K_SPAWNCONSOLE  K(KT_SPEC,18)
-#define K_BARENUMLOCK   K(KT_SPEC,19)
-
-#define K_ALLOCATED     K(KT_SPEC,126) /* dynamically allocated keymap */
-#define K_NOSUCHMAP     K(KT_SPEC,127) /* returned by KDGKBENT */
-
-#define K_P0            K(KT_PAD,0)
-#define K_P1            K(KT_PAD,1)
-#define K_P2            K(KT_PAD,2)
-#define K_P3            K(KT_PAD,3)
-#define K_P4            K(KT_PAD,4)
-#define K_P5            K(KT_PAD,5)
-#define K_P6            K(KT_PAD,6)
-#define K_P7            K(KT_PAD,7)
-#define K_P8            K(KT_PAD,8)
-#define K_P9            K(KT_PAD,9)
-#define K_PPLUS         K(KT_PAD,10)    /* key-pad plus */
-#define K_PMINUS        K(KT_PAD,11)    /* key-pad minus */
-#define K_PSTAR         K(KT_PAD,12)    /* key-pad asterisk (star) */
-#define K_PSLASH        K(KT_PAD,13)    /* key-pad slash */
-#define K_PENTER        K(KT_PAD,14)    /* key-pad enter */
-#define K_PCOMMA        K(KT_PAD,15)    /* key-pad comma: kludge... */
-#define K_PDOT          K(KT_PAD,16)    /* key-pad dot (period): kludge... */
-#define K_PPLUSMINUS    K(KT_PAD,17)    /* key-pad plus/minus */
-#define K_PPARENL       K(KT_PAD,18)    /* key-pad left parenthesis */
-#define K_PPARENR       K(KT_PAD,19)    /* key-pad right parenthesis */
-
-#define NR_PAD          20
-
-#define K_DGRAVE        K(KT_DEAD,0)
-#define K_DACUTE        K(KT_DEAD,1)
-#define K_DCIRCM        K(KT_DEAD,2)
-#define K_DTILDE        K(KT_DEAD,3)
-#define K_DDIERE        K(KT_DEAD,4)
-#define K_DCEDIL        K(KT_DEAD,5)
-
-#define NR_DEAD         6
-
-#define K_DOWN          K(KT_CUR,0)
-#define K_LEFT          K(KT_CUR,1)
-#define K_RIGHT         K(KT_CUR,2)
-#define K_UP            K(KT_CUR,3)
-
-#define K_SHIFT         K(KT_SHIFT,KG_SHIFT)
-#define K_CTRL          K(KT_SHIFT,KG_CTRL)
-#define K_ALT           K(KT_SHIFT,KG_ALT)
-#define K_ALTGR         K(KT_SHIFT,KG_ALTGR)
-#define K_SHIFTL        K(KT_SHIFT,KG_SHIFTL)
-#define K_SHIFTR        K(KT_SHIFT,KG_SHIFTR)
-#define K_CTRLL         K(KT_SHIFT,KG_CTRLL)
-#define K_CTRLR         K(KT_SHIFT,KG_CTRLR)
-#define K_CAPSSHIFT     K(KT_SHIFT,KG_CAPSSHIFT)
-
-#define K_ASC0          K(KT_ASCII,0)
-#define K_ASC1          K(KT_ASCII,1)
-#define K_ASC2          K(KT_ASCII,2)
-#define K_ASC3          K(KT_ASCII,3)
-#define K_ASC4          K(KT_ASCII,4)
-#define K_ASC5          K(KT_ASCII,5)
-#define K_ASC6          K(KT_ASCII,6)
-#define K_ASC7          K(KT_ASCII,7)
-#define K_ASC8          K(KT_ASCII,8)
-#define K_ASC9          K(KT_ASCII,9)
-#define K_HEX0          K(KT_ASCII,10)
-#define K_HEX1          K(KT_ASCII,11)
-#define K_HEX2          K(KT_ASCII,12)
-#define K_HEX3          K(KT_ASCII,13)
-#define K_HEX4          K(KT_ASCII,14)
-#define K_HEX5          K(KT_ASCII,15)
-#define K_HEX6          K(KT_ASCII,16)
-#define K_HEX7          K(KT_ASCII,17)
-#define K_HEX8          K(KT_ASCII,18)
-#define K_HEX9          K(KT_ASCII,19)
-#define K_HEXa          K(KT_ASCII,20)
-#define K_HEXb          K(KT_ASCII,21)
-#define K_HEXc          K(KT_ASCII,22)
-#define K_HEXd          K(KT_ASCII,23)
-#define K_HEXe          K(KT_ASCII,24)
-#define K_HEXf          K(KT_ASCII,25)
-
-#define NR_ASCII        26
-
-#define K_SHIFTLOCK     K(KT_LOCK,KG_SHIFT)
-#define K_CTRLLOCK      K(KT_LOCK,KG_CTRL)
-#define K_ALTLOCK       K(KT_LOCK,KG_ALT)
-#define K_ALTGRLOCK     K(KT_LOCK,KG_ALTGR)
-#define K_SHIFTLLOCK    K(KT_LOCK,KG_SHIFTL)
-#define K_SHIFTRLOCK    K(KT_LOCK,KG_SHIFTR)
-#define K_CTRLLLOCK     K(KT_LOCK,KG_CTRLL)
-#define K_CTRLRLOCK     K(KT_LOCK,KG_CTRLR)
-#define K_CAPSSHIFTLOCK K(KT_LOCK,KG_CAPSSHIFT)
-
-#define K_SHIFT_SLOCK   K(KT_SLOCK,KG_SHIFT)
-#define K_CTRL_SLOCK    K(KT_SLOCK,KG_CTRL)
-#define K_ALT_SLOCK     K(KT_SLOCK,KG_ALT)
-#define K_ALTGR_SLOCK   K(KT_SLOCK,KG_ALTGR)
-#define K_SHIFTL_SLOCK  K(KT_SLOCK,KG_SHIFTL)
-#define K_SHIFTR_SLOCK  K(KT_SLOCK,KG_SHIFTR)
-#define K_CTRLL_SLOCK   K(KT_SLOCK,KG_CTRLL)
-#define K_CTRLR_SLOCK   K(KT_SLOCK,KG_CTRLR)
-#define K_CAPSSHIFT_SLOCK       K(KT_SLOCK,KG_CAPSSHIFT)
-
-#define NR_LOCK         9
-
-#define K_BRL_BLANK     K(KT_BRL, 0)
-#define K_BRL_DOT1      K(KT_BRL, 1)
-#define K_BRL_DOT2      K(KT_BRL, 2)
-#define K_BRL_DOT3      K(KT_BRL, 3)
-#define K_BRL_DOT4      K(KT_BRL, 4)
-#define K_BRL_DOT5      K(KT_BRL, 5)
-#define K_BRL_DOT6      K(KT_BRL, 6)
-#define K_BRL_DOT7      K(KT_BRL, 7)
-#define K_BRL_DOT8      K(KT_BRL, 8)
-#define K_BRL_DOT9      K(KT_BRL, 9)
-#define K_BRL_DOT10     K(KT_BRL, 10)
-
-#define NR_BRL          11
-
-#define MAX_DIACR       256
-#endif
diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index ff476ddaf310..00a97bb905db 100644
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -1,31 +1,8 @@
 #ifndef __LINUX_KVM_PARA_H
 #define __LINUX_KVM_PARA_H
 
-/*
- * This header file provides a method for making a hypercall to the host
- * Architectures should define:
- * - kvm_hypercall0, kvm_hypercall1...
- * - kvm_arch_para_features
- * - kvm_para_available
- */
+#include <uapi/linux/kvm_para.h>
 
-/* Return values for hypercalls */
-#define KVM_ENOSYS              1000
-#define KVM_EFAULT              EFAULT
-#define KVM_E2BIG               E2BIG
-#define KVM_EPERM               EPERM
-
-#define KVM_HC_VAPIC_POLL_IRQ           1
-#define KVM_HC_MMU_OP                   2
-#define KVM_HC_FEATURES                 3
-#define KVM_HC_PPC_MAP_MAGIC_PAGE       4
-
-/*
- * hypercalls use architecture specific
- */
-#include <asm/kvm_para.h>
-
-#ifdef __KERNEL__
 
 static inline int kvm_para_has_feature(unsigned int feature)
 {
@@ -33,5 +10,4 @@ static inline int kvm_para_has_feature(unsigned int feature)
                 return 1;
         return 0;
 }
-#endif /* __KERNEL__ */
 #endif /* __LINUX_KVM_PARA_H */
diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index 7eab668f60f3..bffdb962f1a6 100644
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -3,181 +3,11 @@
  *
  * Author: James Chapman <jchapman@katalix.com>
  */
-
 #ifndef _LINUX_L2TP_H_
 #define _LINUX_L2TP_H_
 
-#include <linux/types.h>
-#include <linux/socket.h>
-#ifdef __KERNEL__
 #include <linux/in.h>
 #include <linux/in6.h>
-#else
-#include <netinet/in.h>
-#endif
-
-#define IPPROTO_L2TP            115
-
-/**
- * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets
- * @l2tp_family:  address family number AF_L2TPIP.
- * @l2tp_addr:    protocol specific address information
- * @l2tp_conn_id: connection id of tunnel
- */
-#define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
-struct sockaddr_l2tpip {
-        /* The first fields must match struct sockaddr_in */
-        __kernel_sa_family_t l2tp_family; /* AF_INET */
-        __be16          l2tp_unused;    /* INET port number (unused) */
-        struct in_addr  l2tp_addr;      /* Internet address */
-
-        __u32           l2tp_conn_id;   /* Connection ID of tunnel */
-
-        /* Pad to size of `struct sockaddr'. */
-        unsigned char   __pad[sizeof(struct sockaddr) -
-                              sizeof(__kernel_sa_family_t) -
-                              sizeof(__be16) - sizeof(struct in_addr) -
-                              sizeof(__u32)];
-};
-
-/**
- * struct sockaddr_l2tpip6 - the sockaddr structure for L2TP-over-IPv6 sockets
- * @l2tp_family:  address family number AF_L2TPIP.
- * @l2tp_addr:    protocol specific address information
- * @l2tp_conn_id: connection id of tunnel
- */
-struct sockaddr_l2tpip6 {
-        /* The first fields must match struct sockaddr_in6 */
-        __kernel_sa_family_t l2tp_family; /* AF_INET6 */
-        __be16          l2tp_unused;    /* INET port number (unused) */
-        __be32          l2tp_flowinfo;  /* IPv6 flow information */
-        struct in6_addr l2tp_addr;      /* IPv6 address */
-        __u32           l2tp_scope_id;  /* scope id (new in RFC2553) */
-        __u32           l2tp_conn_id;   /* Connection ID of tunnel */
-};
-
-/*****************************************************************************
- *  NETLINK_GENERIC netlink family.
- *****************************************************************************/
-
-/*
- * Commands.
- * Valid TLVs of each command are:-
- * TUNNEL_CREATE        - CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid
- * TUNNEL_DELETE        - CONN_ID
- * TUNNEL_MODIFY        - CONN_ID, udpcsum
- * TUNNEL_GETSTATS      - CONN_ID, (stats)
- * TUNNEL_GET           - CONN_ID, (...)
- * SESSION_CREATE       - SESSION_ID, PW_TYPE, offset, data_seq, cookie, peer_cookie, offset, l2spec
- * SESSION_DELETE       - SESSION_ID
- * SESSION_MODIFY       - SESSION_ID, data_seq
- * SESSION_GET          - SESSION_ID, (...)
- * SESSION_GETSTATS     - SESSION_ID, (stats)
- *
- */
-enum {
-        L2TP_CMD_NOOP,
-        L2TP_CMD_TUNNEL_CREATE,
-        L2TP_CMD_TUNNEL_DELETE,
-        L2TP_CMD_TUNNEL_MODIFY,
-        L2TP_CMD_TUNNEL_GET,
-        L2TP_CMD_SESSION_CREATE,
-        L2TP_CMD_SESSION_DELETE,
-        L2TP_CMD_SESSION_MODIFY,
-        L2TP_CMD_SESSION_GET,
-        __L2TP_CMD_MAX,
-};
-
-#define L2TP_CMD_MAX                    (__L2TP_CMD_MAX - 1)
-
-/*
- * ATTR types defined for L2TP
- */
-enum {
-        L2TP_ATTR_NONE,                 /* no data */
-        L2TP_ATTR_PW_TYPE,              /* u16, enum l2tp_pwtype */
-        L2TP_ATTR_ENCAP_TYPE,           /* u16, enum l2tp_encap_type */
-        L2TP_ATTR_OFFSET,               /* u16 */
-        L2TP_ATTR_DATA_SEQ,             /* u16 */
-        L2TP_ATTR_L2SPEC_TYPE,          /* u8, enum l2tp_l2spec_type */
-        L2TP_ATTR_L2SPEC_LEN,           /* u8, enum l2tp_l2spec_type */
-        L2TP_ATTR_PROTO_VERSION,        /* u8 */
-        L2TP_ATTR_IFNAME,               /* string */
-        L2TP_ATTR_CONN_ID,              /* u32 */
-        L2TP_ATTR_PEER_CONN_ID,         /* u32 */
-        L2TP_ATTR_SESSION_ID,           /* u32 */
-        L2TP_ATTR_PEER_SESSION_ID,      /* u32 */
-        L2TP_ATTR_UDP_CSUM,             /* u8 */
-        L2TP_ATTR_VLAN_ID,              /* u16 */
-        L2TP_ATTR_COOKIE,               /* 0, 4 or 8 bytes */
-        L2TP_ATTR_PEER_COOKIE,          /* 0, 4 or 8 bytes */
-        L2TP_ATTR_DEBUG,                /* u32 */
-        L2TP_ATTR_RECV_SEQ,             /* u8 */
-        L2TP_ATTR_SEND_SEQ,             /* u8 */
-        L2TP_ATTR_LNS_MODE,             /* u8 */
-        L2TP_ATTR_USING_IPSEC,          /* u8 */
-        L2TP_ATTR_RECV_TIMEOUT,         /* msec */
-        L2TP_ATTR_FD,                   /* int */
-        L2TP_ATTR_IP_SADDR,             /* u32 */
-        L2TP_ATTR_IP_DADDR,             /* u32 */
-        L2TP_ATTR_UDP_SPORT,            /* u16 */
-        L2TP_ATTR_UDP_DPORT,            /* u16 */
-        L2TP_ATTR_MTU,                  /* u16 */
-        L2TP_ATTR_MRU,                  /* u16 */
-        L2TP_ATTR_STATS,                /* nested */
-        L2TP_ATTR_IP6_SADDR,            /* struct in6_addr */
-        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
-        __L2TP_ATTR_MAX,
-};
-
-#define L2TP_ATTR_MAX                   (__L2TP_ATTR_MAX - 1)
-
-/* Nested in L2TP_ATTR_STATS */
-enum {
-        L2TP_ATTR_STATS_NONE,           /* no data */
-        L2TP_ATTR_TX_PACKETS,           /* u64 */
-        L2TP_ATTR_TX_BYTES,             /* u64 */
-        L2TP_ATTR_TX_ERRORS,            /* u64 */
-        L2TP_ATTR_RX_PACKETS,           /* u64 */
-        L2TP_ATTR_RX_BYTES,             /* u64 */
-        L2TP_ATTR_RX_SEQ_DISCARDS,      /* u64 */
-        L2TP_ATTR_RX_OOS_PACKETS,       /* u64 */
-        L2TP_ATTR_RX_ERRORS,            /* u64 */
-        __L2TP_ATTR_STATS_MAX,
-};
-
-#define L2TP_ATTR_STATS_MAX             (__L2TP_ATTR_STATS_MAX - 1)
-
-enum l2tp_pwtype {
-        L2TP_PWTYPE_NONE = 0x0000,
-        L2TP_PWTYPE_ETH_VLAN = 0x0004,
-        L2TP_PWTYPE_ETH = 0x0005,
-        L2TP_PWTYPE_PPP = 0x0007,
-        L2TP_PWTYPE_PPP_AC = 0x0008,
-        L2TP_PWTYPE_IP = 0x000b,
-        __L2TP_PWTYPE_MAX
-};
-
-enum l2tp_l2spec_type {
-        L2TP_L2SPECTYPE_NONE,
-        L2TP_L2SPECTYPE_DEFAULT,
-};
-
-enum l2tp_encap_type {
-        L2TP_ENCAPTYPE_UDP,
-        L2TP_ENCAPTYPE_IP,
-};
-
-enum l2tp_seqmode {
-        L2TP_SEQ_NONE = 0,
-        L2TP_SEQ_IP = 1,
-        L2TP_SEQ_ALL = 2,
-};
-
-/*
- * NETLINK_GENERIC related info
- */
-#define L2TP_GENL_NAME          "l2tp"
-#define L2TP_GENL_VERSION       0x1
+#include <uapi/linux/l2tp.h>
 
 #endif
diff --git a/include/linux/leds-lp5523.h b/include/linux/leds-lp5523.h
index 2694289babd0..727877fb406d 100644
--- a/include/linux/leds-lp5523.h
+++ b/include/linux/leds-lp5523.h
@@ -26,6 +26,7 @@
 /* See Documentation/leds/leds-lp5523.txt */
 
 struct lp5523_led_config {
+        const char      *name;
         u8              chan_nr;
         u8              led_current; /* mA x10, 0 if led is not connected */
         u8              max_current;
diff --git a/include/linux/leds.h b/include/linux/leds.h
index c6f8dad2ceb0..6e53bb31c220 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -16,6 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/timer.h>
+#include <linux/workqueue.h>
 
 struct device;
 /*
@@ -69,6 +70,9 @@ struct led_classdev {
         struct timer_list        blink_timer;
         int                      blink_brightness;
 
+        struct work_struct      set_brightness_work;
+        int                     delayed_set_value;
+
 #ifdef CONFIG_LEDS_TRIGGERS
         /* Protects the trigger data below */
         struct rw_semaphore      trigger_lock;
diff --git a/include/linux/lglock.h b/include/linux/lglock.h
index f01e5f6d1f07..0d24e932db0b 100644
--- a/include/linux/lglock.h
+++ b/include/linux/lglock.h
@@ -32,20 +32,13 @@
 #define br_write_lock(name)     lg_global_lock(name)
 #define br_write_unlock(name)   lg_global_unlock(name)
 
-#define DEFINE_BRLOCK(name)     DEFINE_LGLOCK(name)
+#define DEFINE_BRLOCK(name)             DEFINE_LGLOCK(name)
+#define DEFINE_STATIC_BRLOCK(name)      DEFINE_STATIC_LGLOCK(name)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 #define LOCKDEP_INIT_MAP lockdep_init_map
-
-#define DEFINE_LGLOCK_LOCKDEP(name)                                     \
- struct lock_class_key name##_lock_key;                                 \
- struct lockdep_map name##_lock_dep_map;                                \
- EXPORT_SYMBOL(name##_lock_dep_map)
-
 #else
 #define LOCKDEP_INIT_MAP(a, b, c, d)
-
-#define DEFINE_LGLOCK_LOCKDEP(name)
 #endif
 
 struct lglock {
@@ -57,11 +50,15 @@ struct lglock {
 };
 
 #define DEFINE_LGLOCK(name)                                             \
-        DEFINE_LGLOCK_LOCKDEP(name);                                    \
-        DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)                  \
+        static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
         = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
         struct lglock name = { .lock = &name ## _lock }
 
+#define DEFINE_STATIC_LGLOCK(name)                                      \
+        static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
+        = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
+        static struct lglock name = { .lock = &name ## _lock }
+
 void lg_lock_init(struct lglock *lg, char *name);
 void lg_local_lock(struct lglock *lg);
 void lg_local_unlock(struct lglock *lg);
diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
index a0c3bf6c9edb..4c0306c69b4e 100644
--- a/include/linux/libfdt.h
+++ b/include/linux/libfdt.h
@@ -2,7 +2,7 @@
 #define _INCLUDE_LIBFDT_H_
 
 #include <linux/libfdt_env.h>
-#include <>
-#include <>
+#include "../../scripts/dtc/libfdt/fdt.h"
+#include "../../scripts/dtc/libfdt/libfdt.h"
 
 #endif /* _INCLUDE_LIBFDT_H_ */
diff --git a/include/linux/llc.h b/include/linux/llc.h
index a2418ae13ee9..b965314d017f 100644
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -1,5 +1,3 @@
-#ifndef __LINUX_LLC_H
-#define __LINUX_LLC_H
 /*
  * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
  *
@@ -12,80 +10,14 @@
  *
  * See the GNU General Public License for more details.
  */
+#ifndef __LINUX_LLC_H
+#define __LINUX_LLC_H
 
-#include <linux/socket.h>
-
-#define __LLC_SOCK_SIZE__ 16    /* sizeof(sockaddr_llc), word align. */
-struct sockaddr_llc {
-        __kernel_sa_family_t sllc_family; /* AF_LLC */
-        __kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
-        unsigned char   sllc_test;
-        unsigned char   sllc_xid;
-        unsigned char   sllc_ua;        /* UA data, only for SOCK_STREAM. */
-        unsigned char   sllc_sap;
-        unsigned char   sllc_mac[IFHWADDRLEN];
-        unsigned char   __pad[__LLC_SOCK_SIZE__ -
-                              sizeof(__kernel_sa_family_t) * 2 -
-                              sizeof(unsigned char) * 4 - IFHWADDRLEN];
-};
-
-/* sockopt definitions. */
-enum llc_sockopts {
-        LLC_OPT_UNKNOWN = 0,
-        LLC_OPT_RETRY,          /* max retrans attempts. */
-        LLC_OPT_SIZE,           /* max PDU size (octets). */
-        LLC_OPT_ACK_TMR_EXP,    /* ack expire time (secs). */
-        LLC_OPT_P_TMR_EXP,      /* pf cycle expire time (secs). */
-        LLC_OPT_REJ_TMR_EXP,    /* rej sent expire time (secs). */
-        LLC_OPT_BUSY_TMR_EXP,   /* busy state expire time (secs). */
-        LLC_OPT_TX_WIN,         /* tx window size. */
-        LLC_OPT_RX_WIN,         /* rx window size. */
-        LLC_OPT_PKTINFO,        /* ancillary packet information. */
-        LLC_OPT_MAX
-};
-
-#define LLC_OPT_MAX_RETRY        100
-#define LLC_OPT_MAX_SIZE        4196
-#define LLC_OPT_MAX_WIN          127
-#define LLC_OPT_MAX_ACK_TMR_EXP   60
-#define LLC_OPT_MAX_P_TMR_EXP     60
-#define LLC_OPT_MAX_REJ_TMR_EXP   60
-#define LLC_OPT_MAX_BUSY_TMR_EXP  60
-
-/* LLC SAP types. */
-#define LLC_SAP_NULL    0x00            /* NULL SAP.                    */
-#define LLC_SAP_LLC     0x02            /* LLC Sublayer Management.     */
-#define LLC_SAP_SNA     0x04            /* SNA Path Control.            */
-#define LLC_SAP_PNM     0x0E            /* Proway Network Management.   */      
-#define LLC_SAP_IP      0x06            /* TCP/IP.                      */
-#define LLC_SAP_BSPAN   0x42            /* Bridge Spanning Tree Proto   */
-#define LLC_SAP_MMS     0x4E            /* Manufacturing Message Srv.   */
-#define LLC_SAP_8208    0x7E            /* ISO 8208                     */
-#define LLC_SAP_3COM    0x80            /* 3COM.                        */
-#define LLC_SAP_PRO     0x8E            /* Proway Active Station List   */
-#define LLC_SAP_SNAP    0xAA            /* SNAP.                        */
-#define LLC_SAP_BANYAN  0xBC            /* Banyan.                      */
-#define LLC_SAP_IPX     0xE0            /* IPX/SPX.                     */
-#define LLC_SAP_NETBEUI 0xF0            /* NetBEUI.                     */
-#define LLC_SAP_LANMGR  0xF4            /* LanManager.                  */
-#define LLC_SAP_IMPL    0xF8            /* IMPL                         */
-#define LLC_SAP_DISC    0xFC            /* Discovery                    */
-#define LLC_SAP_OSI     0xFE            /* OSI Network Layers.          */
-#define LLC_SAP_LAR     0xDC            /* LAN Address Resolution       */
-#define LLC_SAP_RM      0xD4            /* Resource Management          */
-#define LLC_SAP_GLOBAL  0xFF            /* Global SAP.                  */
-
-struct llc_pktinfo {
-        int lpi_ifindex;
-        unsigned char lpi_sap;
-        unsigned char lpi_mac[IFHWADDRLEN];
-};
+#include <uapi/linux/llc.h>
 
-#ifdef __KERNEL__
 #define LLC_SAP_DYN_START       0xC0
 #define LLC_SAP_DYN_STOP        0xDE
 #define LLC_SAP_DYN_TRIES       4
 
 #define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0]))
-#endif /* __KERNEL__ */
 #endif /* __LINUX_LLC_H */
diff --git a/include/linux/loop.h b/include/linux/loop.h
index 9635116dd830..6492181bcb1d 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -1,6 +1,3 @@
-#ifndef _LINUX_LOOP_H
-#define _LINUX_LOOP_H
-
 /*
  * include/linux/loop.h
  *
@@ -9,15 +6,14 @@
  * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
  * permitted under the GNU General Public License.
  */
+#ifndef _LINUX_LOOP_H
+#define _LINUX_LOOP_H
 
-#define LO_NAME_SIZE    64
-#define LO_KEY_SIZE     32
-
-#ifdef __KERNEL__
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
+#include <uapi/linux/loop.h>
 
 /* Possible states of device */
 enum {
@@ -66,69 +62,6 @@ struct loop_device {
         struct gendisk          *lo_disk;
 };
 
-#endif /* __KERNEL__ */
-
-/*
- * Loop flags
- */
-enum {
-        LO_FLAGS_READ_ONLY      = 1,
-        LO_FLAGS_AUTOCLEAR      = 4,
-        LO_FLAGS_PARTSCAN       = 8,
-};
-
-#include <asm/posix_types.h>    /* for __kernel_old_dev_t */
-#include <linux/types.h>        /* for __u64 */
-
-/* Backwards compatibility version */
-struct loop_info {
-        int                lo_number;           /* ioctl r/o */
-        __kernel_old_dev_t lo_device;           /* ioctl r/o */
-        unsigned long      lo_inode;            /* ioctl r/o */
-        __kernel_old_dev_t lo_rdevice;          /* ioctl r/o */
-        int                lo_offset;
-        int                lo_encrypt_type;
-        int                lo_encrypt_key_size;         /* ioctl w/o */
-        int                lo_flags;                    /* ioctl r/o */
-        char               lo_name[LO_NAME_SIZE];
-        unsigned char      lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-        unsigned long      lo_init[2];
-        char               reserved[4];
-};
-
-struct loop_info64 {
-        __u64              lo_device;                   /* ioctl r/o */
-        __u64              lo_inode;                    /* ioctl r/o */
-        __u64              lo_rdevice;                  /* ioctl r/o */
-        __u64              lo_offset;
-        __u64              lo_sizelimit;/* bytes, 0 == max available */
-        __u32              lo_number;                   /* ioctl r/o */
-        __u32              lo_encrypt_type;
-        __u32              lo_encrypt_key_size;         /* ioctl w/o */
-        __u32              lo_flags;                    /* ioctl r/o */
-        __u8               lo_file_name[LO_NAME_SIZE];
-        __u8               lo_crypt_name[LO_NAME_SIZE];
-        __u8               lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-        __u64              lo_init[2];
-};
-
-/*
- * Loop filter types
- */
-
-#define LO_CRYPT_NONE           0
-#define LO_CRYPT_XOR            1
-#define LO_CRYPT_DES            2
-#define LO_CRYPT_FISH2          3    /* Twofish encryption */
-#define LO_CRYPT_BLOW           4
-#define LO_CRYPT_CAST128        5
-#define LO_CRYPT_IDEA           6
-#define LO_CRYPT_DUMMY          9
-#define LO_CRYPT_SKIPJACK       10
-#define LO_CRYPT_CRYPTOAPI      18
-#define MAX_LO_CRYPT            20
-
-#ifdef __KERNEL__
 /* Support for loadable transfer modules */
 struct loop_func_table {
         int number;     /* filter type */ 
@@ -147,21 +80,3 @@ int loop_register_transfer(struct loop_func_table *funcs);
 int loop_unregister_transfer(int number); 
 
 #endif
-/*
- * IOCTL commands --- we will commandeer 0x4C ('L')
- */
-
-#define LOOP_SET_FD             0x4C00
-#define LOOP_CLR_FD             0x4C01
-#define LOOP_SET_STATUS         0x4C02
-#define LOOP_GET_STATUS         0x4C03
-#define LOOP_SET_STATUS64       0x4C04
-#define LOOP_GET_STATUS64       0x4C05
-#define LOOP_CHANGE_FD          0x4C06
-#define LOOP_SET_CAPACITY       0x4C07
-
-/* /dev/loop-control interface */
-#define LOOP_CTL_ADD            0x4C80
-#define LOOP_CTL_REMOVE         0x4C81
-#define LOOP_CTL_GET_FREE       0x4C82
-#endif
diff --git a/include/linux/lp.h b/include/linux/lp.h
index 0df024bfd6f0..0dd276af9e4e 100644
--- a/include/linux/lp.h
+++ b/include/linux/lp.h
@@ -1,105 +1,16 @@
-#ifndef _LINUX_LP_H
-#define _LINUX_LP_H
-
 /*
  * usr/include/linux/lp.h c.1991-1992 James Wiegand
  * many modifications copyright (C) 1992 Michael K. Johnson
  * Interrupt support added 1993 Nigel Gamble
  * Removed 8255 status defines from inside __KERNEL__ Marcelo Tosatti 
  */
+#ifndef _LINUX_LP_H
+#define _LINUX_LP_H
 
-/*
- * Per POSIX guidelines, this module reserves the LP and lp prefixes
- * These are the lp_table[minor].flags flags...
- */
-#define LP_EXIST 0x0001
-#define LP_SELEC 0x0002
-#define LP_BUSY  0x0004
-#define LP_BUSY_BIT_POS 2
-#define LP_OFFL  0x0008
-#define LP_NOPA  0x0010
-#define LP_ERR   0x0020
-#define LP_ABORT 0x0040
-#define LP_CAREFUL 0x0080 /* obsoleted -arca */
-#define LP_ABORTOPEN 0x0100
-
-#define LP_TRUST_IRQ_  0x0200 /* obsolete */
-#define LP_NO_REVERSE  0x0400 /* No reverse mode available. */
-#define LP_DATA_AVAIL  0x0800 /* Data is available. */
-
-/* 
- * bit defines for 8255 status port
- * base + 1
- * accessed with LP_S(minor), which gets the byte...
- */
-#define LP_PBUSY        0x80  /* inverted input, active high */
-#define LP_PACK         0x40  /* unchanged input, active low */
-#define LP_POUTPA       0x20  /* unchanged input, active high */
-#define LP_PSELECD      0x10  /* unchanged input, active high */
-#define LP_PERRORP      0x08  /* unchanged input, active low */
-
-/* timeout for each character.  This is relative to bus cycles -- it
- * is the count in a busy loop.  THIS IS THE VALUE TO CHANGE if you
- * have extremely slow printing, or if the machine seems to slow down
- * a lot when you print.  If you have slow printing, increase this
- * number and recompile, and if your system gets bogged down, decrease
- * this number.  This can be changed with the tunelp(8) command as well.
- */
-
-#define LP_INIT_CHAR 1000
-
-/* The parallel port specs apparently say that there needs to be
- * a .5usec wait before and after the strobe.
- */
-
-#define LP_INIT_WAIT 1
-
-/* This is the amount of time that the driver waits for the printer to
- * catch up when the printer's buffer appears to be filled.  If you
- * want to tune this and have a fast printer (i.e. HPIIIP), decrease
- * this number, and if you have a slow printer, increase this number.
- * This is in hundredths of a second, the default 2 being .05 second.
- * Or use the tunelp(8) command, which is especially nice if you want
- * change back and forth between character and graphics printing, which
- * are wildly different...
- */
-
-#define LP_INIT_TIME 2
-
-/* IOCTL numbers */
-#define LPCHAR   0x0601  /* corresponds to LP_INIT_CHAR */
-#define LPTIME   0x0602  /* corresponds to LP_INIT_TIME */
-#define LPABORT  0x0604  /* call with TRUE arg to abort on error,
-                            FALSE to retry.  Default is retry.  */
-#define LPSETIRQ 0x0605  /* call with new IRQ number,
-                            or 0 for polling (no IRQ) */
-#define LPGETIRQ 0x0606  /* get the current IRQ number */
-#define LPWAIT   0x0608  /* corresponds to LP_INIT_WAIT */
-/* NOTE: LPCAREFUL is obsoleted and it' s always the default right now -arca */
-#define LPCAREFUL   0x0609  /* call with TRUE arg to require out-of-paper, off-
-                            line, and error indicators good on all writes,
-                            FALSE to ignore them.  Default is ignore. */
-#define LPABORTOPEN 0x060a  /* call with TRUE arg to abort open() on error,
-                            FALSE to ignore error.  Default is ignore.  */
-#define LPGETSTATUS 0x060b  /* return LP_S(minor) */
-#define LPRESET     0x060c  /* reset printer */
-#ifdef LP_STATS
-#define LPGETSTATS  0x060d  /* get statistics (struct lp_stats) */
-#endif
-#define LPGETFLAGS  0x060e  /* get status flags */
-#define LPSETTIMEOUT 0x060f /* set parport timeout */
-
-/* timeout for printk'ing a timeout, in jiffies (100ths of a second).
-   This is also used for re-checking error conditions if LP_ABORT is
-   not set.  This is the default behavior. */
-
-#define LP_TIMEOUT_INTERRUPT    (60 * HZ)
-#define LP_TIMEOUT_POLLED       (10 * HZ)
-
-#ifdef __KERNEL__
 
 #include <linux/wait.h>
 #include <linux/mutex.h>
+#include <uapi/linux/lp.h>
 
 /* Magic numbers for defining port-device mappings */
 #define LP_PARPORT_UNSPEC -4
@@ -187,5 +98,3 @@ struct lp_struct {
 #define LP_DELAY        50
 
 #endif
-
-#endif
diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 6c406845f7e2..3d15c838116c 100644
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -6,295 +6,11 @@
  * under the terms of the GNU General Public License version 2 as published
  * by the Free Software Foundation, incorporated herein by reference.
  */
-
 #ifndef __LINUX_MDIO_H__
 #define __LINUX_MDIO_H__
 
-#include <linux/types.h>
-#include <linux/mii.h>
-
-/* MDIO Manageable Devices (MMDs). */
-#define MDIO_MMD_PMAPMD         1       /* Physical Medium Attachment/
-                                         * Physical Medium Dependent */
-#define MDIO_MMD_WIS            2       /* WAN Interface Sublayer */
-#define MDIO_MMD_PCS            3       /* Physical Coding Sublayer */
-#define MDIO_MMD_PHYXS          4       /* PHY Extender Sublayer */
-#define MDIO_MMD_DTEXS          5       /* DTE Extender Sublayer */
-#define MDIO_MMD_TC             6       /* Transmission Convergence */
-#define MDIO_MMD_AN             7       /* Auto-Negotiation */
-#define MDIO_MMD_C22EXT         29      /* Clause 22 extension */
-#define MDIO_MMD_VEND1          30      /* Vendor specific 1 */
-#define MDIO_MMD_VEND2          31      /* Vendor specific 2 */
-
-/* Generic MDIO registers. */
-#define MDIO_CTRL1              MII_BMCR
-#define MDIO_STAT1              MII_BMSR
-#define MDIO_DEVID1             MII_PHYSID1
-#define MDIO_DEVID2             MII_PHYSID2
-#define MDIO_SPEED              4       /* Speed ability */
-#define MDIO_DEVS1              5       /* Devices in package */
-#define MDIO_DEVS2              6
-#define MDIO_CTRL2              7       /* 10G control 2 */
-#define MDIO_STAT2              8       /* 10G status 2 */
-#define MDIO_PMA_TXDIS          9       /* 10G PMA/PMD transmit disable */
-#define MDIO_PMA_RXDET          10      /* 10G PMA/PMD receive signal detect */
-#define MDIO_PMA_EXTABLE        11      /* 10G PMA/PMD extended ability */
-#define MDIO_PKGID1             14      /* Package identifier */
-#define MDIO_PKGID2             15
-#define MDIO_AN_ADVERTISE       16      /* AN advertising (base page) */
-#define MDIO_AN_LPA             19      /* AN LP abilities (base page) */
-#define MDIO_PCS_EEE_ABLE       20      /* EEE Capability register */
-#define MDIO_PCS_EEE_WK_ERR     22      /* EEE wake error counter */
-#define MDIO_PHYXS_LNSTAT       24      /* PHY XGXS lane state */
-#define MDIO_AN_EEE_ADV         60      /* EEE advertisement */
-#define MDIO_AN_EEE_LPABLE      61      /* EEE link partner ability */
-
-/* Media-dependent registers. */
-#define MDIO_PMA_10GBT_SWAPPOL  130     /* 10GBASE-T pair swap & polarity */
-#define MDIO_PMA_10GBT_TXPWR    131     /* 10GBASE-T TX power control */
-#define MDIO_PMA_10GBT_SNR      133     /* 10GBASE-T SNR margin, lane A.
-                                         * Lanes B-D are numbered 134-136. */
-#define MDIO_PMA_10GBR_FECABLE  170     /* 10GBASE-R FEC ability */
-#define MDIO_PCS_10GBX_STAT1    24      /* 10GBASE-X PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT1   32      /* 10GBASE-R/-T PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT2   33      /* 10GBASE-R/-T PCS status 2 */
-#define MDIO_AN_10GBT_CTRL      32      /* 10GBASE-T auto-negotiation control */
-#define MDIO_AN_10GBT_STAT      33      /* 10GBASE-T auto-negotiation status */
-
-/* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */
-#define MDIO_PMA_LASI_RXCTRL    0x9000  /* RX_ALARM control */
-#define MDIO_PMA_LASI_TXCTRL    0x9001  /* TX_ALARM control */
-#define MDIO_PMA_LASI_CTRL      0x9002  /* LASI control */
-#define MDIO_PMA_LASI_RXSTAT    0x9003  /* RX_ALARM status */
-#define MDIO_PMA_LASI_TXSTAT    0x9004  /* TX_ALARM status */
-#define MDIO_PMA_LASI_STAT      0x9005  /* LASI status */
-
-/* Control register 1. */
-/* Enable extended speed selection */
-#define MDIO_CTRL1_SPEEDSELEXT          (BMCR_SPEED1000 | BMCR_SPEED100)
-/* All speed selection bits */
-#define MDIO_CTRL1_SPEEDSEL             (MDIO_CTRL1_SPEEDSELEXT | 0x003c)
-#define MDIO_CTRL1_FULLDPLX             BMCR_FULLDPLX
-#define MDIO_CTRL1_LPOWER               BMCR_PDOWN
-#define MDIO_CTRL1_RESET                BMCR_RESET
-#define MDIO_PMA_CTRL1_LOOPBACK         0x0001
-#define MDIO_PMA_CTRL1_SPEED1000        BMCR_SPEED1000
-#define MDIO_PMA_CTRL1_SPEED100         BMCR_SPEED100
-#define MDIO_PCS_CTRL1_LOOPBACK         BMCR_LOOPBACK
-#define MDIO_PHYXS_CTRL1_LOOPBACK       BMCR_LOOPBACK
-#define MDIO_AN_CTRL1_RESTART           BMCR_ANRESTART
-#define MDIO_AN_CTRL1_ENABLE            BMCR_ANENABLE
-#define MDIO_AN_CTRL1_XNP               0x2000  /* Enable extended next page */
-#define MDIO_PCS_CTRL1_CLKSTOP_EN       0x400   /* Stop the clock during LPI */
-
-/* 10 Gb/s */
-#define MDIO_CTRL1_SPEED10G             (MDIO_CTRL1_SPEEDSELEXT | 0x00)
-/* 10PASS-TS/2BASE-TL */
-#define MDIO_CTRL1_SPEED10P2B           (MDIO_CTRL1_SPEEDSELEXT | 0x04)
-
-/* Status register 1. */
-#define MDIO_STAT1_LPOWERABLE           0x0002  /* Low-power ability */
-#define MDIO_STAT1_LSTATUS              BMSR_LSTATUS
-#define MDIO_STAT1_FAULT                0x0080  /* Fault */
-#define MDIO_AN_STAT1_LPABLE            0x0001  /* Link partner AN ability */
-#define MDIO_AN_STAT1_ABLE              BMSR_ANEGCAPABLE
-#define MDIO_AN_STAT1_RFAULT            BMSR_RFAULT
-#define MDIO_AN_STAT1_COMPLETE          BMSR_ANEGCOMPLETE
-#define MDIO_AN_STAT1_PAGE              0x0040  /* Page received */
-#define MDIO_AN_STAT1_XNP               0x0080  /* Extended next page status */
-
-/* Speed register. */
-#define MDIO_SPEED_10G                  0x0001  /* 10G capable */
-#define MDIO_PMA_SPEED_2B               0x0002  /* 2BASE-TL capable */
-#define MDIO_PMA_SPEED_10P              0x0004  /* 10PASS-TS capable */
-#define MDIO_PMA_SPEED_1000             0x0010  /* 1000M capable */
-#define MDIO_PMA_SPEED_100              0x0020  /* 100M capable */
-#define MDIO_PMA_SPEED_10               0x0040  /* 10M capable */
-#define MDIO_PCS_SPEED_10P2B            0x0002  /* 10PASS-TS/2BASE-TL capable */
-
-/* Device present registers. */
-#define MDIO_DEVS_PRESENT(devad)        (1 << (devad))
-#define MDIO_DEVS_PMAPMD                MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)
-#define MDIO_DEVS_WIS                   MDIO_DEVS_PRESENT(MDIO_MMD_WIS)
-#define MDIO_DEVS_PCS                   MDIO_DEVS_PRESENT(MDIO_MMD_PCS)
-#define MDIO_DEVS_PHYXS                 MDIO_DEVS_PRESENT(MDIO_MMD_PHYXS)
-#define MDIO_DEVS_DTEXS                 MDIO_DEVS_PRESENT(MDIO_MMD_DTEXS)
-#define MDIO_DEVS_TC                    MDIO_DEVS_PRESENT(MDIO_MMD_TC)
-#define MDIO_DEVS_AN                    MDIO_DEVS_PRESENT(MDIO_MMD_AN)
-#define MDIO_DEVS_C22EXT                MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)
-
-/* Control register 2. */
-#define MDIO_PMA_CTRL2_TYPE             0x000f  /* PMA/PMD type selection */
-#define MDIO_PMA_CTRL2_10GBCX4          0x0000  /* 10GBASE-CX4 type */
-#define MDIO_PMA_CTRL2_10GBEW           0x0001  /* 10GBASE-EW type */
-#define MDIO_PMA_CTRL2_10GBLW           0x0002  /* 10GBASE-LW type */
-#define MDIO_PMA_CTRL2_10GBSW           0x0003  /* 10GBASE-SW type */
-#define MDIO_PMA_CTRL2_10GBLX4          0x0004  /* 10GBASE-LX4 type */
-#define MDIO_PMA_CTRL2_10GBER           0x0005  /* 10GBASE-ER type */
-#define MDIO_PMA_CTRL2_10GBLR           0x0006  /* 10GBASE-LR type */
-#define MDIO_PMA_CTRL2_10GBSR           0x0007  /* 10GBASE-SR type */
-#define MDIO_PMA_CTRL2_10GBLRM          0x0008  /* 10GBASE-LRM type */
-#define MDIO_PMA_CTRL2_10GBT            0x0009  /* 10GBASE-T type */
-#define MDIO_PMA_CTRL2_10GBKX4          0x000a  /* 10GBASE-KX4 type */
-#define MDIO_PMA_CTRL2_10GBKR           0x000b  /* 10GBASE-KR type */
-#define MDIO_PMA_CTRL2_1000BT           0x000c  /* 1000BASE-T type */
-#define MDIO_PMA_CTRL2_1000BKX          0x000d  /* 1000BASE-KX type */
-#define MDIO_PMA_CTRL2_100BTX           0x000e  /* 100BASE-TX type */
-#define MDIO_PMA_CTRL2_10BT             0x000f  /* 10BASE-T type */
-#define MDIO_PCS_CTRL2_TYPE             0x0003  /* PCS type selection */
-#define MDIO_PCS_CTRL2_10GBR            0x0000  /* 10GBASE-R type */
-#define MDIO_PCS_CTRL2_10GBX            0x0001  /* 10GBASE-X type */
-#define MDIO_PCS_CTRL2_10GBW            0x0002  /* 10GBASE-W type */
-#define MDIO_PCS_CTRL2_10GBT            0x0003  /* 10GBASE-T type */
-
-/* Status register 2. */
-#define MDIO_STAT2_RXFAULT              0x0400  /* Receive fault */
-#define MDIO_STAT2_TXFAULT              0x0800  /* Transmit fault */
-#define MDIO_STAT2_DEVPRST              0xc000  /* Device present */
-#define MDIO_STAT2_DEVPRST_VAL          0x8000  /* Device present value */
-#define MDIO_PMA_STAT2_LBABLE           0x0001  /* PMA loopback ability */
-#define MDIO_PMA_STAT2_10GBEW           0x0002  /* 10GBASE-EW ability */
-#define MDIO_PMA_STAT2_10GBLW           0x0004  /* 10GBASE-LW ability */
-#define MDIO_PMA_STAT2_10GBSW           0x0008  /* 10GBASE-SW ability */
-#define MDIO_PMA_STAT2_10GBLX4          0x0010  /* 10GBASE-LX4 ability */
-#define MDIO_PMA_STAT2_10GBER           0x0020  /* 10GBASE-ER ability */
-#define MDIO_PMA_STAT2_10GBLR           0x0040  /* 10GBASE-LR ability */
-#define MDIO_PMA_STAT2_10GBSR           0x0080  /* 10GBASE-SR ability */
-#define MDIO_PMD_STAT2_TXDISAB          0x0100  /* PMD TX disable ability */
-#define MDIO_PMA_STAT2_EXTABLE          0x0200  /* Extended abilities */
-#define MDIO_PMA_STAT2_RXFLTABLE        0x1000  /* Receive fault ability */
-#define MDIO_PMA_STAT2_TXFLTABLE        0x2000  /* Transmit fault ability */
-#define MDIO_PCS_STAT2_10GBR            0x0001  /* 10GBASE-R capable */
-#define MDIO_PCS_STAT2_10GBX            0x0002  /* 10GBASE-X capable */
-#define MDIO_PCS_STAT2_10GBW            0x0004  /* 10GBASE-W capable */
-#define MDIO_PCS_STAT2_RXFLTABLE        0x1000  /* Receive fault ability */
-#define MDIO_PCS_STAT2_TXFLTABLE        0x2000  /* Transmit fault ability */
-
-/* Transmit disable register. */
-#define MDIO_PMD_TXDIS_GLOBAL           0x0001  /* Global PMD TX disable */
-#define MDIO_PMD_TXDIS_0                0x0002  /* PMD TX disable 0 */
-#define MDIO_PMD_TXDIS_1                0x0004  /* PMD TX disable 1 */
-#define MDIO_PMD_TXDIS_2                0x0008  /* PMD TX disable 2 */
-#define MDIO_PMD_TXDIS_3                0x0010  /* PMD TX disable 3 */
-
-/* Receive signal detect register. */
-#define MDIO_PMD_RXDET_GLOBAL           0x0001  /* Global PMD RX signal detect */
-#define MDIO_PMD_RXDET_0                0x0002  /* PMD RX signal detect 0 */
-#define MDIO_PMD_RXDET_1                0x0004  /* PMD RX signal detect 1 */
-#define MDIO_PMD_RXDET_2                0x0008  /* PMD RX signal detect 2 */
-#define MDIO_PMD_RXDET_3                0x0010  /* PMD RX signal detect 3 */
-
-/* Extended abilities register. */
-#define MDIO_PMA_EXTABLE_10GCX4         0x0001  /* 10GBASE-CX4 ability */
-#define MDIO_PMA_EXTABLE_10GBLRM        0x0002  /* 10GBASE-LRM ability */
-#define MDIO_PMA_EXTABLE_10GBT          0x0004  /* 10GBASE-T ability */
-#define MDIO_PMA_EXTABLE_10GBKX4        0x0008  /* 10GBASE-KX4 ability */
-#define MDIO_PMA_EXTABLE_10GBKR         0x0010  /* 10GBASE-KR ability */
-#define MDIO_PMA_EXTABLE_1000BT         0x0020  /* 1000BASE-T ability */
-#define MDIO_PMA_EXTABLE_1000BKX        0x0040  /* 1000BASE-KX ability */
-#define MDIO_PMA_EXTABLE_100BTX         0x0080  /* 100BASE-TX ability */
-#define MDIO_PMA_EXTABLE_10BT           0x0100  /* 10BASE-T ability */
-
-/* PHY XGXS lane state register. */
-#define MDIO_PHYXS_LNSTAT_SYNC0         0x0001
-#define MDIO_PHYXS_LNSTAT_SYNC1         0x0002
-#define MDIO_PHYXS_LNSTAT_SYNC2         0x0004
-#define MDIO_PHYXS_LNSTAT_SYNC3         0x0008
-#define MDIO_PHYXS_LNSTAT_ALIGN         0x1000
-
-/* PMA 10GBASE-T pair swap & polarity */
-#define MDIO_PMA_10GBT_SWAPPOL_ABNX     0x0001  /* Pair A/B uncrossed */
-#define MDIO_PMA_10GBT_SWAPPOL_CDNX     0x0002  /* Pair C/D uncrossed */
-#define MDIO_PMA_10GBT_SWAPPOL_AREV     0x0100  /* Pair A polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_BREV     0x0200  /* Pair B polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_CREV     0x0400  /* Pair C polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_DREV     0x0800  /* Pair D polarity reversed */
-
-/* PMA 10GBASE-T TX power register. */
-#define MDIO_PMA_10GBT_TXPWR_SHORT      0x0001  /* Short-reach mode */
-
-/* PMA 10GBASE-T SNR registers. */
-/* Value is SNR margin in dB, clamped to range [-127, 127], plus 0x8000. */
-#define MDIO_PMA_10GBT_SNR_BIAS         0x8000
-#define MDIO_PMA_10GBT_SNR_MAX          127
-
-/* PMA 10GBASE-R FEC ability register. */
-#define MDIO_PMA_10GBR_FECABLE_ABLE     0x0001  /* FEC ability */
-#define MDIO_PMA_10GBR_FECABLE_ERRABLE  0x0002  /* FEC error indic. ability */
-
-/* PCS 10GBASE-R/-T status register 1. */
-#define MDIO_PCS_10GBRT_STAT1_BLKLK     0x0001  /* Block lock attained */
-
-/* PCS 10GBASE-R/-T status register 2. */
-#define MDIO_PCS_10GBRT_STAT2_ERR       0x00ff
-#define MDIO_PCS_10GBRT_STAT2_BER       0x3f00
-
-/* AN 10GBASE-T control register. */
-#define MDIO_AN_10GBT_CTRL_ADV10G       0x1000  /* Advertise 10GBASE-T */
-
-/* AN 10GBASE-T status register. */
-#define MDIO_AN_10GBT_STAT_LPTRR        0x0200  /* LP training reset req. */
-#define MDIO_AN_10GBT_STAT_LPLTABLE     0x0400  /* LP loop timing ability */
-#define MDIO_AN_10GBT_STAT_LP10G        0x0800  /* LP is 10GBT capable */
-#define MDIO_AN_10GBT_STAT_REMOK        0x1000  /* Remote OK */
-#define MDIO_AN_10GBT_STAT_LOCOK        0x2000  /* Local OK */
-#define MDIO_AN_10GBT_STAT_MS           0x4000  /* Master/slave config */
-#define MDIO_AN_10GBT_STAT_MSFLT        0x8000  /* Master/slave config fault */
-
-/* EEE Supported/Advertisement/LP Advertisement registers.
- *
- * EEE capability Register (3.20), Advertisement (7.60) and
- * Link partner ability (7.61) registers have and can use the same identical
- * bit masks.
- */
-#define MDIO_AN_EEE_ADV_100TX   0x0002  /* Advertise 100TX EEE cap */
-#define MDIO_AN_EEE_ADV_1000T   0x0004  /* Advertise 1000T EEE cap */
-/* Note: the two defines above can be potentially used by the user-land
- * and cannot remove them now.
- * So, we define the new generic MDIO_EEE_100TX and MDIO_EEE_1000T macros
- * using the previous ones (that can be considered obsolete).
- */
-#define MDIO_EEE_100TX          MDIO_AN_EEE_ADV_100TX   /* 100TX EEE cap */
-#define MDIO_EEE_1000T          MDIO_AN_EEE_ADV_1000T   /* 1000T EEE cap */
-#define MDIO_EEE_10GT           0x0008  /* 10GT EEE cap */
-#define MDIO_EEE_1000KX         0x0010  /* 1000KX EEE cap */
-#define MDIO_EEE_10GKX4         0x0020  /* 10G KX4 EEE cap */
-#define MDIO_EEE_10GKR          0x0040  /* 10G KR EEE cap */
-
-/* LASI RX_ALARM control/status registers. */
-#define MDIO_PMA_LASI_RX_PHYXSLFLT      0x0001  /* PHY XS RX local fault */
-#define MDIO_PMA_LASI_RX_PCSLFLT        0x0008  /* PCS RX local fault */
-#define MDIO_PMA_LASI_RX_PMALFLT        0x0010  /* PMA/PMD RX local fault */
-#define MDIO_PMA_LASI_RX_OPTICPOWERFLT  0x0020  /* RX optical power fault */
-#define MDIO_PMA_LASI_RX_WISLFLT        0x0200  /* WIS local fault */
-
-/* LASI TX_ALARM control/status registers. */
-#define MDIO_PMA_LASI_TX_PHYXSLFLT      0x0001  /* PHY XS TX local fault */
-#define MDIO_PMA_LASI_TX_PCSLFLT        0x0008  /* PCS TX local fault */
-#define MDIO_PMA_LASI_TX_PMALFLT        0x0010  /* PMA/PMD TX local fault */
-#define MDIO_PMA_LASI_TX_LASERPOWERFLT  0x0080  /* Laser output power fault */
-#define MDIO_PMA_LASI_TX_LASERTEMPFLT   0x0100  /* Laser temperature fault */
-#define MDIO_PMA_LASI_TX_LASERBICURRFLT 0x0200  /* Laser bias current fault */
-
-/* LASI control/status registers. */
-#define MDIO_PMA_LASI_LSALARM           0x0001  /* LS_ALARM enable/status */
-#define MDIO_PMA_LASI_TXALARM           0x0002  /* TX_ALARM enable/status */
-#define MDIO_PMA_LASI_RXALARM           0x0004  /* RX_ALARM enable/status */
-
-/* Mapping between MDIO PRTAD/DEVAD and mii_ioctl_data::phy_id */
-
-#define MDIO_PHY_ID_C45                 0x8000
-#define MDIO_PHY_ID_PRTAD               0x03e0
-#define MDIO_PHY_ID_DEVAD               0x001f
-#define MDIO_PHY_ID_C45_MASK                                            \
-        (MDIO_PHY_ID_C45 | MDIO_PHY_ID_PRTAD | MDIO_PHY_ID_DEVAD)
-
-static inline __u16 mdio_phy_id_c45(int prtad, int devad)
-{
-        return MDIO_PHY_ID_C45 | (prtad << 5) | devad;
-}
+#include <uapi/linux/mdio.h>
 
-#ifdef __KERNEL__
 
 static inline bool mdio_phy_id_is_c45(int phy_id)
 {
@@ -460,5 +176,4 @@ static inline u16 ethtool_adv_to_mmd_eee_adv_t(u32 adv)
         return reg;
 }
 
-#endif /* __KERNEL__ */
 #endif /* __LINUX_MDIO_H__ */
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 19dc455b4f3d..d452ee191066 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -57,6 +57,7 @@ int memblock_add(phys_addr_t base, phys_addr_t size);
 int memblock_remove(phys_addr_t base, phys_addr_t size);
 int memblock_free(phys_addr_t base, phys_addr_t size);
 int memblock_reserve(phys_addr_t base, phys_addr_t size);
+void memblock_trim_memory(phys_addr_t align);
 
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
@@ -70,8 +71,7 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
  * @p_end: ptr to ulong for end pfn of the range, can be %NULL
  * @p_nid: ptr to int for nid of the range, can be %NULL
  *
- * Walks over configured memory ranges.  Available after early_node_map is
- * populated.
+ * Walks over configured memory ranges.
  */
 #define for_each_mem_pfn_range(i, nid, p_start, p_end, p_nid)           \
         for (i = -1, __next_mem_pfn_range(&i, nid, p_start, p_end, p_nid); \
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 8d9489fdab2e..11ddc7ffeba8 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -84,14 +84,14 @@ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
 
 static inline
-int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
 {
-        struct mem_cgroup *memcg;
-        int match;
+        struct mem_cgroup *task_memcg;
+        bool match;
 
         rcu_read_lock();
-        memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
-        match = __mem_cgroup_same_or_subtree(cgroup, memcg);
+        task_memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
+        match = __mem_cgroup_same_or_subtree(memcg, task_memcg);
         rcu_read_unlock();
         return match;
 }
@@ -258,10 +258,10 @@ static inline struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm
         return NULL;
 }
 
-static inline int mm_match_cgroup(struct mm_struct *mm,
+static inline bool mm_match_cgroup(struct mm_struct *mm,
                 struct mem_cgroup *memcg)
 {
-        return 1;
+        return true;
 }
 
 static inline int task_in_mem_cgroup(struct task_struct *task,
@@ -396,7 +396,7 @@ enum {
 };
 
 struct sock;
-#ifdef CONFIG_MEMCG_KMEM
+#if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
 void sock_update_memcg(struct sock *sk);
 void sock_release_memcg(struct sock *sk);
 #else
@@ -406,6 +406,6 @@ static inline void sock_update_memcg(struct sock *sk)
 static inline void sock_release_memcg(struct sock *sk)
 {
 }
-#endif /* CONFIG_MEMCG_KMEM */
+#endif /* CONFIG_INET && CONFIG_MEMCG_KMEM */
 #endif /* _LINUX_MEMCONTROL_H */
 
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 910550f3b70e..95573ec4ee6c 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -10,6 +10,7 @@ struct page;
 struct zone;
 struct pglist_data;
 struct mem_section;
+struct memory_block;
 
 #ifdef CONFIG_MEMORY_HOTPLUG
 
@@ -233,6 +234,8 @@ static inline int is_mem_section_removable(unsigned long pfn,
 extern int mem_online_node(int nid);
 extern int add_memory(int nid, u64 start, u64 size);
 extern int arch_add_memory(int nid, u64 start, u64 size);
+extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
+extern int offline_memory_block(struct memory_block *mem);
 extern int remove_memory(u64 start, u64 size);
 extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
                                                                 int nr_pages);
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 95b738c7abff..e5ccb9ddd90e 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -1,66 +1,10 @@
-#ifndef _LINUX_MEMPOLICY_H
-#define _LINUX_MEMPOLICY_H 1
-
-#include <linux/errno.h>
-
 /*
  * NUMA memory policies for Linux.
  * Copyright 2003,2004 Andi Kleen SuSE Labs
  */
+#ifndef _LINUX_MEMPOLICY_H
+#define _LINUX_MEMPOLICY_H 1
 
-/*
- * Both the MPOL_* mempolicy mode and the MPOL_F_* optional mode flags are
- * passed by the user to either set_mempolicy() or mbind() in an 'int' actual.
- * The MPOL_MODE_FLAGS macro determines the legal set of optional mode flags.
- */
-
-/* Policies */
-enum {
-        MPOL_DEFAULT,
-        MPOL_PREFERRED,
-        MPOL_BIND,
-        MPOL_INTERLEAVE,
-        MPOL_MAX,       /* always last member of enum */
-};
-
-enum mpol_rebind_step {
-        MPOL_REBIND_ONCE,       /* do rebind work at once(not by two step) */
-        MPOL_REBIND_STEP1,      /* first step(set all the newly nodes) */
-        MPOL_REBIND_STEP2,      /* second step(clean all the disallowed nodes)*/
-        MPOL_REBIND_NSTEP,
-};
-
-/* Flags for set_mempolicy */
-#define MPOL_F_STATIC_NODES     (1 << 15)
-#define MPOL_F_RELATIVE_NODES   (1 << 14)
-
-/*
- * MPOL_MODE_FLAGS is the union of all possible optional mode flags passed to
- * either set_mempolicy() or mbind().
- */
-#define MPOL_MODE_FLAGS (MPOL_F_STATIC_NODES | MPOL_F_RELATIVE_NODES)
-
-/* Flags for get_mempolicy */
-#define MPOL_F_NODE     (1<<0)  /* return next IL mode instead of node mask */
-#define MPOL_F_ADDR     (1<<1)  /* look up vma using address */
-#define MPOL_F_MEMS_ALLOWED (1<<2) /* return allowed memories */
-
-/* Flags for mbind */
-#define MPOL_MF_STRICT  (1<<0)  /* Verify existing pages in the mapping */
-#define MPOL_MF_MOVE    (1<<1)  /* Move pages owned by this process to conform to mapping */
-#define MPOL_MF_MOVE_ALL (1<<2) /* Move every page to conform to mapping */
-#define MPOL_MF_INTERNAL (1<<3) /* Internal flags start here */
-
-/*
- * Internal flags that share the struct mempolicy flags word with
- * "mode flags".  These flags are allocated from bit 0 up, as they
- * are never OR'ed into the mode in mempolicy API arguments.
- */
-#define MPOL_F_SHARED  (1 << 0) /* identify shared policies */
-#define MPOL_F_LOCAL   (1 << 1) /* preferred local allocation */
-#define MPOL_F_REBINDING (1 << 2)       /* identify policies in rebinding */
-
-#ifdef __KERNEL__
 
 #include <linux/mmzone.h>
 #include <linux/slab.h>
@@ -68,6 +12,7 @@ enum mpol_rebind_step {
 #include <linux/spinlock.h>
 #include <linux/nodemask.h>
 #include <linux/pagemap.h>
+#include <uapi/linux/mempolicy.h>
 
 struct mm_struct;
 
@@ -188,7 +133,7 @@ struct sp_node {
 
 struct shared_policy {
         struct rb_root root;
-        spinlock_t lock;
+        struct mutex mutex;
 };
 
 void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol);
@@ -239,7 +184,7 @@ extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
 /* Check if a vma is migratable */
 static inline int vma_migratable(struct vm_area_struct *vma)
 {
-        if (vma->vm_flags & (VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED))
+        if (vma->vm_flags & (VM_IO | VM_HUGETLB | VM_PFNMAP))
                 return 0;
         /*
          * Migration allocates pages in the highest zone. If we cannot
@@ -379,6 +324,4 @@ static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
 }
 
 #endif /* CONFIG_NUMA */
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h
index 7b24943779fa..cd97530205c2 100644
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@ -34,27 +34,26 @@ enum {
         PM8606_ID_MAX,
 };
 
-enum {
-        PM8606_BACKLIGHT1 = 0,
-        PM8606_BACKLIGHT2,
-        PM8606_BACKLIGHT3,
-};
-
-enum {
-        PM8606_LED1_RED = 0,
-        PM8606_LED1_GREEN,
-        PM8606_LED1_BLUE,
-        PM8606_LED2_RED,
-        PM8606_LED2_GREEN,
-        PM8606_LED2_BLUE,
-        PM8607_LED_VIBRATOR,
-};
-
 
 /* 8606 Registers */
 #define PM8606_DCM_BOOST                (0x00)
 #define PM8606_PWM                      (0x01)
 
+#define PM8607_MISC2                    (0x42)
+
+/* Power Up Log Register */
+#define PM8607_POWER_UP_LOG             (0x3F)
+
+/* Charger Control Registers */
+#define PM8607_CCNT                     (0x47)
+#define PM8607_CHG_CTRL1                (0x48)
+#define PM8607_CHG_CTRL2                (0x49)
+#define PM8607_CHG_CTRL3                (0x4A)
+#define PM8607_CHG_CTRL4                (0x4B)
+#define PM8607_CHG_CTRL5                (0x4C)
+#define PM8607_CHG_CTRL6                (0x4D)
+#define PM8607_CHG_CTRL7                (0x4E)
+
 /* Backlight Registers */
 #define PM8606_WLED1A                   (0x02)
 #define PM8606_WLED1B                   (0x03)
@@ -205,6 +204,71 @@ enum {
 #define PM8607_PD_PREBIAS               (0x56)  /* prebias time */
 #define PM8607_GPADC_MISC1              (0x57)
 
+/* bit definitions of  MEAS_EN1*/
+#define PM8607_MEAS_EN1_VBAT            (1 << 0)
+#define PM8607_MEAS_EN1_VCHG            (1 << 1)
+#define PM8607_MEAS_EN1_VSYS            (1 << 2)
+#define PM8607_MEAS_EN1_TINT            (1 << 3)
+#define PM8607_MEAS_EN1_RFTMP           (1 << 4)
+#define PM8607_MEAS_EN1_TBAT            (1 << 5)
+#define PM8607_MEAS_EN1_GPADC2          (1 << 6)
+#define PM8607_MEAS_EN1_GPADC3          (1 << 7)
+
+/* Battery Monitor Registers */
+#define PM8607_GP_BIAS2                 (0x5A)
+#define PM8607_VBAT_LOWTH               (0x5B)
+#define PM8607_VCHG_LOWTH               (0x5C)
+#define PM8607_VSYS_LOWTH               (0x5D)
+#define PM8607_TINT_LOWTH               (0x5E)
+#define PM8607_GPADC0_LOWTH             (0x5F)
+#define PM8607_GPADC1_LOWTH             (0x60)
+#define PM8607_GPADC2_LOWTH             (0x61)
+#define PM8607_GPADC3_LOWTH             (0x62)
+#define PM8607_VBAT_HIGHTH              (0x63)
+#define PM8607_VCHG_HIGHTH              (0x64)
+#define PM8607_VSYS_HIGHTH              (0x65)
+#define PM8607_TINT_HIGHTH              (0x66)
+#define PM8607_GPADC0_HIGHTH            (0x67)
+#define PM8607_GPADC1_HIGHTH            (0x68)
+#define PM8607_GPADC2_HIGHTH            (0x69)
+#define PM8607_GPADC3_HIGHTH            (0x6A)
+#define PM8607_IBAT_MEAS1               (0x6B)
+#define PM8607_IBAT_MEAS2               (0x6C)
+#define PM8607_VBAT_MEAS1               (0x6D)
+#define PM8607_VBAT_MEAS2               (0x6E)
+#define PM8607_VCHG_MEAS1               (0x6F)
+#define PM8607_VCHG_MEAS2               (0x70)
+#define PM8607_VSYS_MEAS1               (0x71)
+#define PM8607_VSYS_MEAS2               (0x72)
+#define PM8607_TINT_MEAS1               (0x73)
+#define PM8607_TINT_MEAS2               (0x74)
+#define PM8607_GPADC0_MEAS1             (0x75)
+#define PM8607_GPADC0_MEAS2             (0x76)
+#define PM8607_GPADC1_MEAS1             (0x77)
+#define PM8607_GPADC1_MEAS2             (0x78)
+#define PM8607_GPADC2_MEAS1             (0x79)
+#define PM8607_GPADC2_MEAS2             (0x7A)
+#define PM8607_GPADC3_MEAS1             (0x7B)
+#define PM8607_GPADC3_MEAS2             (0x7C)
+#define PM8607_CCNT_MEAS1               (0x95)
+#define PM8607_CCNT_MEAS2               (0x96)
+#define PM8607_VBAT_AVG                 (0x97)
+#define PM8607_VCHG_AVG                 (0x98)
+#define PM8607_VSYS_AVG                 (0x99)
+#define PM8607_VBAT_MIN                 (0x9A)
+#define PM8607_VCHG_MIN                 (0x9B)
+#define PM8607_VSYS_MIN                 (0x9C)
+#define PM8607_VBAT_MAX                 (0x9D)
+#define PM8607_VCHG_MAX                 (0x9E)
+#define PM8607_VSYS_MAX                 (0x9F)
+
+#define PM8607_GPADC_MISC2              (0x59)
+#define PM8607_GPADC0_GP_BIAS_A0        (1 << 0)
+#define PM8607_GPADC1_GP_BIAS_A1        (1 << 1)
+#define PM8607_GPADC2_GP_BIAS_A2        (1 << 2)
+#define PM8607_GPADC3_GP_BIAS_A3        (1 << 3)
+#define PM8607_GPADC2_GP_BIAS_OUT2      (1 << 6)
+
 /* RTC Control Registers */
 #define PM8607_RTC1                     (0xA0)
 #define PM8607_RTC_COUNTER1             (0xA1)
@@ -322,7 +386,7 @@ struct pm860x_chip {
         struct regmap           *regmap_companion;
 
         int                     buck3_double;   /* DVC ramp slope double */
-        unsigned short          companion_addr;
+        int                     companion_addr;
         unsigned short          osc_vote;
         int                     id;
         int                     irq_mode;
@@ -340,16 +404,12 @@ enum {
 };
 
 struct pm860x_backlight_pdata {
-        int             id;
         int             pwm;
         int             iset;
-        unsigned long   flags;
 };
 
 struct pm860x_led_pdata {
-        int             id;
         int             iset;
-        unsigned long   flags;
 };
 
 struct pm860x_rtc_pdata {
@@ -370,7 +430,8 @@ struct pm860x_touch_pdata {
 };
 
 struct pm860x_power_pdata {
-        unsigned        fast_charge;    /* charge current */
+        int             max_capacity;
+        int             resistor;
 };
 
 struct pm860x_platform_data {
@@ -379,15 +440,30 @@ struct pm860x_platform_data {
         struct pm860x_rtc_pdata         *rtc;
         struct pm860x_touch_pdata       *touch;
         struct pm860x_power_pdata       *power;
-        struct regulator_init_data      *regulator;
-
-        unsigned short  companion_addr; /* I2C address of companion chip */
+        struct regulator_init_data      *buck1;
+        struct regulator_init_data      *buck2;
+        struct regulator_init_data      *buck3;
+        struct regulator_init_data      *ldo1;
+        struct regulator_init_data      *ldo2;
+        struct regulator_init_data      *ldo3;
+        struct regulator_init_data      *ldo4;
+        struct regulator_init_data      *ldo5;
+        struct regulator_init_data      *ldo6;
+        struct regulator_init_data      *ldo7;
+        struct regulator_init_data      *ldo8;
+        struct regulator_init_data      *ldo9;
+        struct regulator_init_data      *ldo10;
+        struct regulator_init_data      *ldo12;
+        struct regulator_init_data      *ldo_vibrator;
+        struct regulator_init_data      *ldo14;
+        struct charger_desc             *chg_desc;
+
+        int             companion_addr; /* I2C address of companion chip */
         int             i2c_port;       /* Controlled by GI2C or PI2C */
         int             irq_mode;       /* Clear interrupt by read/write(0/1) */
         int             irq_base;       /* IRQ base number of 88pm860x */
         int             num_leds;
         int             num_backlights;
-        int             num_regulators;
 };
 
 extern int pm8606_osc_enable(struct pm860x_chip *, unsigned short);
@@ -408,8 +484,4 @@ extern int pm860x_page_bulk_write(struct i2c_client *, int, int,
 extern int pm860x_page_set_bits(struct i2c_client *, int, unsigned char,
                                 unsigned char);
 
-extern int pm860x_device_init(struct pm860x_chip *chip,
-                              struct pm860x_platform_data *pdata) __devinit ;
-extern void pm860x_device_exit(struct pm860x_chip *chip) __devexit ;
-
 #endif /* __LINUX_MFD_88PM860X_H */
diff --git a/include/linux/mfd/ab3100.h b/include/linux/mfd/ab3100.h
new file mode 100644
index 000000000000..afd3080bde24
--- /dev/null
+++ b/include/linux/mfd/ab3100.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2007-2009 ST-Ericsson AB
+ * License terms: GNU General Public License (GPL) version 2
+ * AB3100 core access functions
+ * Author: Linus Walleij <linus.walleij@stericsson.com>
+ *
+ */
+
+#include <linux/regulator/machine.h>
+
+struct device;
+
+#ifndef MFD_AB3100_H
+#define MFD_AB3100_H
+
+
+#define AB3100_P1A      0xc0
+#define AB3100_P1B      0xc1
+#define AB3100_P1C      0xc2
+#define AB3100_P1D      0xc3
+#define AB3100_P1E      0xc4
+#define AB3100_P1F      0xc5
+#define AB3100_P1G      0xc6
+#define AB3100_R2A      0xc7
+#define AB3100_R2B      0xc8
+
+/*
+ * AB3100, EVENTA1, A2 and A3 event register flags
+ * these are catenated into a single 32-bit flag in the code
+ * for event notification broadcasts.
+ */
+#define AB3100_EVENTA1_ONSWA                            (0x01<<16)
+#define AB3100_EVENTA1_ONSWB                            (0x02<<16)
+#define AB3100_EVENTA1_ONSWC                            (0x04<<16)
+#define AB3100_EVENTA1_DCIO                             (0x08<<16)
+#define AB3100_EVENTA1_OVER_TEMP                        (0x10<<16)
+#define AB3100_EVENTA1_SIM_OFF                          (0x20<<16)
+#define AB3100_EVENTA1_VBUS                             (0x40<<16)
+#define AB3100_EVENTA1_VSET_USB                         (0x80<<16)
+
+#define AB3100_EVENTA2_READY_TX                         (0x01<<8)
+#define AB3100_EVENTA2_READY_RX                         (0x02<<8)
+#define AB3100_EVENTA2_OVERRUN_ERROR                    (0x04<<8)
+#define AB3100_EVENTA2_FRAMING_ERROR                    (0x08<<8)
+#define AB3100_EVENTA2_CHARG_OVERCURRENT                (0x10<<8)
+#define AB3100_EVENTA2_MIDR                             (0x20<<8)
+#define AB3100_EVENTA2_BATTERY_REM                      (0x40<<8)
+#define AB3100_EVENTA2_ALARM                            (0x80<<8)
+
+#define AB3100_EVENTA3_ADC_TRIG5                        (0x01)
+#define AB3100_EVENTA3_ADC_TRIG4                        (0x02)
+#define AB3100_EVENTA3_ADC_TRIG3                        (0x04)
+#define AB3100_EVENTA3_ADC_TRIG2                        (0x08)
+#define AB3100_EVENTA3_ADC_TRIGVBAT                     (0x10)
+#define AB3100_EVENTA3_ADC_TRIGVTX                      (0x20)
+#define AB3100_EVENTA3_ADC_TRIG1                        (0x40)
+#define AB3100_EVENTA3_ADC_TRIG0                        (0x80)
+
+/* AB3100, STR register flags */
+#define AB3100_STR_ONSWA                                (0x01)
+#define AB3100_STR_ONSWB                                (0x02)
+#define AB3100_STR_ONSWC                                (0x04)
+#define AB3100_STR_DCIO                                 (0x08)
+#define AB3100_STR_BOOT_MODE                            (0x10)
+#define AB3100_STR_SIM_OFF                              (0x20)
+#define AB3100_STR_BATT_REMOVAL                         (0x40)
+#define AB3100_STR_VBUS                                 (0x80)
+
+/*
+ * AB3100 contains 8 regulators, one external regulator controller
+ * and a buck converter, further the LDO E and buck converter can
+ * have separate settings if they are in sleep mode, this is
+ * modeled as a separate regulator.
+ */
+#define AB3100_NUM_REGULATORS                           10
+
+/**
+ * struct ab3100
+ * @access_mutex: lock out concurrent accesses to the AB3100 registers
+ * @dev: pointer to the containing device
+ * @i2c_client: I2C client for this chip
+ * @testreg_client: secondary client for test registers
+ * @chip_name: name of this chip variant
+ * @chip_id: 8 bit chip ID for this chip variant
+ * @event_subscribers: event subscribers are listed here
+ * @startup_events: a copy of the first reading of the event registers
+ * @startup_events_read: whether the first events have been read
+ *
+ * This struct is PRIVATE and devices using it should NOT
+ * access ANY fields. It is used as a token for calling the
+ * AB3100 functions.
+ */
+struct ab3100 {
+        struct mutex access_mutex;
+        struct device *dev;
+        struct i2c_client *i2c_client;
+        struct i2c_client *testreg_client;
+        char chip_name[32];
+        u8 chip_id;
+        struct blocking_notifier_head event_subscribers;
+        u8 startup_events[3];
+        bool startup_events_read;
+};
+
+/**
+ * struct ab3100_platform_data
+ * Data supplied to initialize board connections to the AB3100
+ * @reg_constraints: regulator constraints for target board
+ *     the order of these constraints are: LDO A, C, D, E,
+ *     F, G, H, K, EXT and BUCK.
+ * @reg_initvals: initial values for the regulator registers
+ *     plus two sleep settings for LDO E and the BUCK converter.
+ *     exactly AB3100_NUM_REGULATORS+2 values must be sent in.
+ *     Order: LDO A, C, E, E sleep, F, G, H, K, EXT, BUCK,
+ *     BUCK sleep, LDO D. (LDO D need to be initialized last.)
+ * @external_voltage: voltage level of the external regulator.
+ */
+struct ab3100_platform_data {
+        struct regulator_init_data reg_constraints[AB3100_NUM_REGULATORS];
+        u8 reg_initvals[AB3100_NUM_REGULATORS+2];
+        int external_voltage;
+};
+
+int ab3100_event_register(struct ab3100 *ab3100,
+                          struct notifier_block *nb);
+int ab3100_event_unregister(struct ab3100 *ab3100,
+                            struct notifier_block *nb);
+
+#endif /*  MFD_AB3100_H */
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 1318ca622633..5d5298d56026 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -1,12 +1,9 @@
 /*
  * Copyright (C) 2007-2009 ST-Ericsson AB
  * License terms: GNU General Public License (GPL) version 2
- * AB3100 core access functions
- * Author: Linus Walleij <linus.walleij@stericsson.com>
  *
  * ABX500 core access functions.
- * The abx500 interface is used for the Analog Baseband chip
- * ab3100 and ab8500.
+ * The abx500 interface is used for the Analog Baseband chips.
  *
  * Author: Mattias Wallin <mattias.wallin@stericsson.com>
  * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
@@ -21,118 +18,6 @@ struct device;
 #ifndef MFD_ABX500_H
 #define MFD_ABX500_H
 
-#define AB3100_P1A      0xc0
-#define AB3100_P1B      0xc1
-#define AB3100_P1C      0xc2
-#define AB3100_P1D      0xc3
-#define AB3100_P1E      0xc4
-#define AB3100_P1F      0xc5
-#define AB3100_P1G      0xc6
-#define AB3100_R2A      0xc7
-#define AB3100_R2B      0xc8
-
-/*
- * AB3100, EVENTA1, A2 and A3 event register flags
- * these are catenated into a single 32-bit flag in the code
- * for event notification broadcasts.
- */
-#define AB3100_EVENTA1_ONSWA                            (0x01<<16)
-#define AB3100_EVENTA1_ONSWB                            (0x02<<16)
-#define AB3100_EVENTA1_ONSWC                            (0x04<<16)
-#define AB3100_EVENTA1_DCIO                             (0x08<<16)
-#define AB3100_EVENTA1_OVER_TEMP                        (0x10<<16)
-#define AB3100_EVENTA1_SIM_OFF                          (0x20<<16)
-#define AB3100_EVENTA1_VBUS                             (0x40<<16)
-#define AB3100_EVENTA1_VSET_USB                         (0x80<<16)
-
-#define AB3100_EVENTA2_READY_TX                         (0x01<<8)
-#define AB3100_EVENTA2_READY_RX                         (0x02<<8)
-#define AB3100_EVENTA2_OVERRUN_ERROR                    (0x04<<8)
-#define AB3100_EVENTA2_FRAMING_ERROR                    (0x08<<8)
-#define AB3100_EVENTA2_CHARG_OVERCURRENT                (0x10<<8)
-#define AB3100_EVENTA2_MIDR                             (0x20<<8)
-#define AB3100_EVENTA2_BATTERY_REM                      (0x40<<8)
-#define AB3100_EVENTA2_ALARM                            (0x80<<8)
-
-#define AB3100_EVENTA3_ADC_TRIG5                        (0x01)
-#define AB3100_EVENTA3_ADC_TRIG4                        (0x02)
-#define AB3100_EVENTA3_ADC_TRIG3                        (0x04)
-#define AB3100_EVENTA3_ADC_TRIG2                        (0x08)
-#define AB3100_EVENTA3_ADC_TRIGVBAT                     (0x10)
-#define AB3100_EVENTA3_ADC_TRIGVTX                      (0x20)
-#define AB3100_EVENTA3_ADC_TRIG1                        (0x40)
-#define AB3100_EVENTA3_ADC_TRIG0                        (0x80)
-
-/* AB3100, STR register flags */
-#define AB3100_STR_ONSWA                                (0x01)
-#define AB3100_STR_ONSWB                                (0x02)
-#define AB3100_STR_ONSWC                                (0x04)
-#define AB3100_STR_DCIO                                 (0x08)
-#define AB3100_STR_BOOT_MODE                            (0x10)
-#define AB3100_STR_SIM_OFF                              (0x20)
-#define AB3100_STR_BATT_REMOVAL                         (0x40)
-#define AB3100_STR_VBUS                                 (0x80)
-
-/*
- * AB3100 contains 8 regulators, one external regulator controller
- * and a buck converter, further the LDO E and buck converter can
- * have separate settings if they are in sleep mode, this is
- * modeled as a separate regulator.
- */
-#define AB3100_NUM_REGULATORS                           10
-
-/**
- * struct ab3100
- * @access_mutex: lock out concurrent accesses to the AB3100 registers
- * @dev: pointer to the containing device
- * @i2c_client: I2C client for this chip
- * @testreg_client: secondary client for test registers
- * @chip_name: name of this chip variant
- * @chip_id: 8 bit chip ID for this chip variant
- * @event_subscribers: event subscribers are listed here
- * @startup_events: a copy of the first reading of the event registers
- * @startup_events_read: whether the first events have been read
- *
- * This struct is PRIVATE and devices using it should NOT
- * access ANY fields. It is used as a token for calling the
- * AB3100 functions.
- */
-struct ab3100 {
-        struct mutex access_mutex;
-        struct device *dev;
-        struct i2c_client *i2c_client;
-        struct i2c_client *testreg_client;
-        char chip_name[32];
-        u8 chip_id;
-        struct blocking_notifier_head event_subscribers;
-        u8 startup_events[3];
-        bool startup_events_read;
-};
-
-/**
- * struct ab3100_platform_data
- * Data supplied to initialize board connections to the AB3100
- * @reg_constraints: regulator constraints for target board
- *     the order of these constraints are: LDO A, C, D, E,
- *     F, G, H, K, EXT and BUCK.
- * @reg_initvals: initial values for the regulator registers
- *     plus two sleep settings for LDO E and the BUCK converter.
- *     exactly AB3100_NUM_REGULATORS+2 values must be sent in.
- *     Order: LDO A, C, E, E sleep, F, G, H, K, EXT, BUCK,
- *     BUCK sleep, LDO D. (LDO D need to be initialized last.)
- * @external_voltage: voltage level of the external regulator.
- */
-struct ab3100_platform_data {
-        struct regulator_init_data reg_constraints[AB3100_NUM_REGULATORS];
-        u8 reg_initvals[AB3100_NUM_REGULATORS+2];
-        int external_voltage;
-};
-
-int ab3100_event_register(struct ab3100 *ab3100,
-                          struct notifier_block *nb);
-int ab3100_event_unregister(struct ab3100 *ab3100,
-                            struct notifier_block *nb);
-
 /**
  * struct abx500_init_setting
  * Initial value of the registers for driver to use during setup.
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 3764cb6759e3..1491044efa10 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -341,6 +341,4 @@ static inline int is_ab8500_2p0(struct ab8500 *ab)
         return (is_ab8500(ab) && (ab->chip_id == AB8500_CUT2P0));
 }
 
-int ab8500_irq_get_virq(struct ab8500 *ab8500, int irq);
-
 #endif /* MFD_AB8500_H */
diff --git a/include/linux/mfd/anatop.h b/include/linux/mfd/anatop.h
deleted file mode 100644
index 7f92acf03d9e..000000000000
--- a/include/linux/mfd/anatop.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * anatop.h - Anatop MFD driver
- *
- *  Copyright (C) 2012 Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
- *  Copyright (C) 2012 Linaro
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_MFD_ANATOP_H
-#define __LINUX_MFD_ANATOP_H
-
-#include <linux/spinlock.h>
-
-/**
- * anatop - MFD data
- * @ioreg: ioremap register
- * @reglock: spinlock for register read/write
- */
-struct anatop {
-        void *ioreg;
-        spinlock_t reglock;
-};
-
-extern u32 anatop_read_reg(struct anatop *, u32);
-extern void anatop_write_reg(struct anatop *, u32, u32, u32);
-
-#endif /*  __LINUX_MFD_ANATOP_H */
diff --git a/include/linux/mfd/da9055/core.h b/include/linux/mfd/da9055/core.h
new file mode 100644
index 000000000000..c96ad682c59e
--- /dev/null
+++ b/include/linux/mfd/da9055/core.h
@@ -0,0 +1,94 @@
+/*
+ * da9055 declarations for DA9055 PMICs.
+ *
+ * Copyright(c) 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: David Dajun Chen <dchen@diasemi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef __DA9055_CORE_H
+#define __DA9055_CORE_H
+
+#include <linux/interrupt.h>
+#include <linux/regmap.h>
+
+/*
+ * PMIC IRQ
+ */
+#define DA9055_IRQ_ALARM        0x01
+#define DA9055_IRQ_TICK         0x02
+#define DA9055_IRQ_NONKEY       0x00
+#define DA9055_IRQ_REGULATOR    0x0B
+#define DA9055_IRQ_HWMON        0x03
+
+struct da9055_pdata;
+
+struct da9055 {
+        struct regmap *regmap;
+        struct regmap_irq_chip_data *irq_data;
+        struct device *dev;
+        struct i2c_client *i2c_client;
+
+        int irq_base;
+        int chip_irq;
+};
+
+/* Device I/O */
+static inline int da9055_reg_read(struct da9055 *da9055, unsigned char reg)
+{
+        int val, ret;
+
+        ret = regmap_read(da9055->regmap, reg, &val);
+        if (ret < 0)
+                return ret;
+
+        return val;
+}
+
+static inline int da9055_reg_write(struct da9055 *da9055, unsigned char reg,
+                                    unsigned char val)
+{
+        return regmap_write(da9055->regmap, reg, val);
+}
+
+static inline int da9055_group_read(struct da9055 *da9055, unsigned char reg,
+                                     unsigned reg_cnt, unsigned char *val)
+{
+        return regmap_bulk_read(da9055->regmap, reg, val, reg_cnt);
+}
+
+static inline int da9055_group_write(struct da9055 *da9055, unsigned char reg,
+                                      unsigned reg_cnt, unsigned char *val)
+{
+        return regmap_raw_write(da9055->regmap, reg, val, reg_cnt);
+}
+
+static inline int da9055_reg_update(struct da9055 *da9055, unsigned char reg,
+                                     unsigned char bit_mask,
+                                     unsigned char reg_val)
+{
+        return regmap_update_bits(da9055->regmap, reg, bit_mask, reg_val);
+}
+
+/* Generic Device API */
+int da9055_device_init(struct da9055 *da9055);
+void da9055_device_exit(struct da9055 *da9055);
+
+extern struct regmap_config da9055_regmap_config;
+
+#endif /* __DA9055_CORE_H */
diff --git a/include/linux/mfd/da9055/pdata.h b/include/linux/mfd/da9055/pdata.h
new file mode 100644
index 000000000000..147293b4471d
--- /dev/null
+++ b/include/linux/mfd/da9055/pdata.h
@@ -0,0 +1,32 @@
+/* Copyright (C) 2012 Dialog Semiconductor Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ */
+#ifndef __DA9055_PDATA_H
+#define __DA9055_PDATA_H
+
+#define DA9055_MAX_REGULATORS   8
+
+struct da9055;
+
+enum gpio_select {
+        NO_GPIO = 0,
+        GPIO_1,
+        GPIO_2
+};
+
+struct da9055_pdata {
+        int (*init) (struct da9055 *da9055);
+        int irq_base;
+        int gpio_base;
+
+        struct regulator_init_data *regulators[DA9055_MAX_REGULATORS];
+        bool reset_enable;              /* Enable RTC in RESET Mode */
+        enum gpio_select *gpio_rsel;    /* Select regulator set thru GPIO 1/2 */
+        enum gpio_select *gpio_ren;     /* Enable regulator thru GPIO 1/2 */
+};
+#endif /* __DA9055_PDATA_H */
diff --git a/include/linux/mfd/da9055/reg.h b/include/linux/mfd/da9055/reg.h
new file mode 100644
index 000000000000..df237ee54803
--- /dev/null
+++ b/include/linux/mfd/da9055/reg.h
@@ -0,0 +1,699 @@
+/*
+ * DA9055 declarations for DA9055 PMICs.
+ *
+ * Copyright(c) 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: David Dajun Chen <dchen@diasemi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef __DA9055_REG_H
+#define __DA9055_REG_H
+
+/*
+ * PMIC registers
+ */
+ /* PAGE0 */
+#define DA9055_REG_PAGE_CON             0x00
+
+/* System Control and Event Registers */
+#define DA9055_REG_STATUS_A             0x01
+#define DA9055_REG_STATUS_B             0x02
+#define DA9055_REG_FAULT_LOG            0x03
+#define DA9055_REG_EVENT_A              0x04
+#define DA9055_REG_EVENT_B              0x05
+#define DA9055_REG_EVENT_C              0x06
+#define DA9055_REG_IRQ_MASK_A           0x07
+#define DA9055_REG_IRQ_MASK_B           0x08
+#define DA9055_REG_IRQ_MASK_C           0x09
+#define DA9055_REG_CONTROL_A            0x0A
+#define DA9055_REG_CONTROL_B            0x0B
+#define DA9055_REG_CONTROL_C            0x0C
+#define DA9055_REG_CONTROL_D            0x0D
+#define DA9055_REG_CONTROL_E            0x0E
+#define DA9055_REG_PD_DIS               0x0F
+
+/* GPIO Control Registers */
+#define DA9055_REG_GPIO0_1              0x10
+#define DA9055_REG_GPIO2                0x11
+#define DA9055_REG_GPIO_MODE0_2         0x12
+
+/* Regulator Control Registers */
+#define DA9055_REG_BCORE_CONT           0x13
+#define DA9055_REG_BMEM_CONT            0x14
+#define DA9055_REG_LDO1_CONT            0x15
+#define DA9055_REG_LDO2_CONT            0x16
+#define DA9055_REG_LDO3_CONT            0x17
+#define DA9055_REG_LDO4_CONT            0x18
+#define DA9055_REG_LDO5_CONT            0x19
+#define DA9055_REG_LDO6_CONT            0x1A
+
+/* GP-ADC Control Registers */
+#define DA9055_REG_ADC_MAN              0x1B
+#define DA9055_REG_ADC_CONT             0x1C
+#define DA9055_REG_VSYS_MON             0x1D
+#define DA9055_REG_ADC_RES_L            0x1E
+#define DA9055_REG_ADC_RES_H            0x1F
+#define DA9055_REG_VSYS_RES             0x20
+#define DA9055_REG_ADCIN1_RES           0x21
+#define DA9055_REG_ADCIN2_RES           0x22
+#define DA9055_REG_ADCIN3_RES           0x23
+
+/* Sequencer Control Registers */
+#define DA9055_REG_EN_32K               0x35
+
+/* Regulator Setting Registers */
+#define DA9055_REG_BUCK_LIM             0x37
+#define DA9055_REG_BCORE_MODE           0x38
+#define DA9055_REG_VBCORE_A             0x39
+#define DA9055_REG_VBMEM_A              0x3A
+#define DA9055_REG_VLDO1_A              0x3B
+#define DA9055_REG_VLDO2_A              0x3C
+#define DA9055_REG_VLDO3_A              0x3D
+#define DA9055_REG_VLDO4_A              0x3E
+#define DA9055_REG_VLDO5_A              0x3F
+#define DA9055_REG_VLDO6_A              0x40
+#define DA9055_REG_VBCORE_B             0x41
+#define DA9055_REG_VBMEM_B              0x42
+#define DA9055_REG_VLDO1_B              0x43
+#define DA9055_REG_VLDO2_B              0x44
+#define DA9055_REG_VLDO3_B              0x45
+#define DA9055_REG_VLDO4_B              0x46
+#define DA9055_REG_VLDO5_B              0x47
+#define DA9055_REG_VLDO6_B              0x48
+
+/* GP-ADC Threshold Registers */
+#define DA9055_REG_AUTO1_HIGH           0x49
+#define DA9055_REG_AUTO1_LOW            0x4A
+#define DA9055_REG_AUTO2_HIGH           0x4B
+#define DA9055_REG_AUTO2_LOW            0x4C
+#define DA9055_REG_AUTO3_HIGH           0x4D
+#define DA9055_REG_AUTO3_LOW            0x4E
+
+/* OTP */
+#define DA9055_REG_OPT_COUNT            0x50
+#define DA9055_REG_OPT_ADDR             0x51
+#define DA9055_REG_OPT_DATA             0x52
+
+/* RTC Calendar and Alarm Registers */
+#define DA9055_REG_COUNT_S              0x53
+#define DA9055_REG_COUNT_MI             0x54
+#define DA9055_REG_COUNT_H              0x55
+#define DA9055_REG_COUNT_D              0x56
+#define DA9055_REG_COUNT_MO             0x57
+#define DA9055_REG_COUNT_Y              0x58
+#define DA9055_REG_ALARM_MI             0x59
+#define DA9055_REG_ALARM_H              0x5A
+#define DA9055_REG_ALARM_D              0x5B
+#define DA9055_REG_ALARM_MO             0x5C
+#define DA9055_REG_ALARM_Y              0x5D
+#define DA9055_REG_SECOND_A             0x5E
+#define DA9055_REG_SECOND_B             0x5F
+#define DA9055_REG_SECOND_C             0x60
+#define DA9055_REG_SECOND_D             0x61
+
+/* Customer Trim and Configuration */
+#define DA9055_REG_T_OFFSET             0x63
+#define DA9055_REG_INTERFACE            0x64
+#define DA9055_REG_CONFIG_A             0x65
+#define DA9055_REG_CONFIG_B             0x66
+#define DA9055_REG_CONFIG_C             0x67
+#define DA9055_REG_CONFIG_D             0x68
+#define DA9055_REG_CONFIG_E             0x69
+#define DA9055_REG_TRIM_CLDR            0x6F
+
+/* General Purpose Registers */
+#define DA9055_REG_GP_ID_0              0x70
+#define DA9055_REG_GP_ID_1              0x71
+#define DA9055_REG_GP_ID_2              0x72
+#define DA9055_REG_GP_ID_3              0x73
+#define DA9055_REG_GP_ID_4              0x74
+#define DA9055_REG_GP_ID_5              0x75
+#define DA9055_REG_GP_ID_6              0x76
+#define DA9055_REG_GP_ID_7              0x77
+#define DA9055_REG_GP_ID_8              0x78
+#define DA9055_REG_GP_ID_9              0x79
+#define DA9055_REG_GP_ID_10             0x7A
+#define DA9055_REG_GP_ID_11             0x7B
+#define DA9055_REG_GP_ID_12             0x7C
+#define DA9055_REG_GP_ID_13             0x7D
+#define DA9055_REG_GP_ID_14             0x7E
+#define DA9055_REG_GP_ID_15             0x7F
+#define DA9055_REG_GP_ID_16             0x80
+#define DA9055_REG_GP_ID_17             0x81
+#define DA9055_REG_GP_ID_18             0x82
+#define DA9055_REG_GP_ID_19             0x83
+
+#define DA9055_MAX_REGISTER_CNT         DA9055_REG_GP_ID_19
+
+/*
+ * PMIC registers bits
+ */
+
+/* DA9055_REG_PAGE_CON (addr=0x00) */
+#define DA9055_PAGE_WRITE_MODE          (0<<6)
+#define DA9055_REPEAT_WRITE_MODE        (1<<6)
+
+/* DA9055_REG_STATUS_A (addr=0x01) */
+#define DA9055_NOKEY_STS                0x01
+#define DA9055_WAKE_STS                 0x02
+#define DA9055_DVC_BUSY_STS             0x04
+#define DA9055_COMP1V2_STS              0x08
+#define DA9055_NJIG_STS                 0x10
+#define DA9055_LDO5_LIM_STS             0x20
+#define DA9055_LDO6_LIM_STS             0x40
+
+/* DA9055_REG_STATUS_B (addr=0x02) */
+#define DA9055_GPI0_STS                 0x01
+#define DA9055_GPI1_STS                 0x02
+#define DA9055_GPI2_STS                 0x04
+
+/* DA9055_REG_FAULT_LOG (addr=0x03) */
+#define DA9055_TWD_ERROR_FLG            0x01
+#define DA9055_POR_FLG                  0x02
+#define DA9055_VDD_FAULT_FLG            0x04
+#define DA9055_VDD_START_FLG            0x08
+#define DA9055_TEMP_CRIT_FLG            0x10
+#define DA9055_KEY_RESET_FLG            0x20
+#define DA9055_WAIT_SHUT_FLG            0x80
+
+/* DA9055_REG_EVENT_A (addr=0x04) */
+#define DA9055_NOKEY_EINT               0x01
+#define DA9055_ALARM_EINT               0x02
+#define DA9055_TICK_EINT                0x04
+#define DA9055_ADC_RDY_EINT             0x08
+#define DA9055_SEQ_RDY_EINT             0x10
+#define DA9055_EVENTS_B_EINT            0x20
+#define DA9055_EVENTS_C_EINT            0x40
+
+/* DA9055_REG_EVENT_B (addr=0x05) */
+#define DA9055_E_WAKE_EINT              0x01
+#define DA9055_E_TEMP_EINT              0x02
+#define DA9055_E_COMP1V2_EINT           0x04
+#define DA9055_E_LDO_LIM_EINT           0x08
+#define DA9055_E_NJIG_EINT              0x20
+#define DA9055_E_VDD_MON_EINT           0x40
+#define DA9055_E_VDD_WARN_EINT          0x80
+
+/* DA9055_REG_EVENT_C (addr=0x06) */
+#define DA9055_E_GPI0_EINT              0x01
+#define DA9055_E_GPI1_EINT              0x02
+#define DA9055_E_GPI2_EINT              0x04
+
+/* DA9055_REG_IRQ_MASK_A (addr=0x07) */
+#define DA9055_M_NONKEY_EINT            0x01
+#define DA9055_M_ALARM_EINT             0x02
+#define DA9055_M_TICK_EINT              0x04
+#define DA9055_M_ADC_RDY_EINT           0x08
+#define DA9055_M_SEQ_RDY_EINT           0x10
+
+/* DA9055_REG_IRQ_MASK_B (addr=0x08) */
+#define DA9055_M_WAKE_EINT              0x01
+#define DA9055_M_TEMP_EINT              0x02
+#define DA9055_M_COMP_1V2_EINT          0x04
+#define DA9055_M_LDO_LIM_EINT           0x08
+#define DA9055_M_NJIG_EINT              0x20
+#define DA9055_M_VDD_MON_EINT           0x40
+#define DA9055_M_VDD_WARN_EINT          0x80
+
+/* DA9055_REG_IRQ_MASK_C (addr=0x09) */
+#define DA9055_M_GPI0_EINT              0x01
+#define DA9055_M_GPI1_EINT              0x02
+#define DA9055_M_GPI2_EINT              0x04
+
+/* DA9055_REG_CONTROL_A (addr=0xA) */
+#define DA9055_DEBOUNCING_SHIFT         0x00
+#define DA9055_DEBOUNCING_MASK          0x07
+#define DA9055_NRES_MODE_SHIFT          0x03
+#define DA9055_NRES_MODE_MASK           0x08
+#define DA9055_SLEW_RATE_SHIFT          0x04
+#define DA9055_SLEW_RATE_MASK           0x30
+#define DA9055_NOKEY_LOCK_SHIFT         0x06
+#define DA9055_NOKEY_LOCK_MASK          0x40
+
+/* DA9055_REG_CONTROL_B (addr=0xB) */
+#define DA9055_RTC_MODE_PD              0x01
+#define DA9055_RTC_MODE_SD_SHIFT        0x01
+#define DA9055_RTC_MODE_SD              0x02
+#define DA9055_RTC_EN                   0x04
+#define DA9055_ECO_MODE_SHIFT           0x03
+#define DA9055_ECO_MODE_MASK            0x08
+#define DA9055_TWDSCALE_SHIFT           4
+#define DA9055_TWDSCALE_MASK            0x70
+#define DA9055_V_LOCK_SHIFT             0x07
+#define DA9055_V_LOCK_MASK              0x80
+
+/* DA9055_REG_CONTROL_C (addr=0xC) */
+#define DA9055_SYSTEM_EN_SHIFT          0x00
+#define DA9055_SYSTEM_EN_MASK           0x01
+#define DA9055_POWERN_EN_SHIFT          0x01
+#define DA9055_POWERN_EN_MASK           0x02
+#define DA9055_POWER1_EN_SHIFT          0x02
+#define DA9055_POWER1_EN_MASK           0x04
+
+/* DA9055_REG_CONTROL_D (addr=0xD) */
+#define DA9055_STANDBY_SHIFT            0x02
+#define DA9055_STANDBY_MASK             0x08
+#define DA9055_AUTO_BOOT_SHIFT          0x03
+#define DA9055_AUTO_BOOT_MASK           0x04
+
+/* DA9055_REG_CONTROL_E (addr=0xE) */
+#define DA9055_WATCHDOG_SHIFT           0x00
+#define DA9055_WATCHDOG_MASK            0x01
+#define DA9055_SHUTDOWN_SHIFT           0x01
+#define DA9055_SHUTDOWN_MASK            0x02
+#define DA9055_WAKE_UP_SHIFT            0x02
+#define DA9055_WAKE_UP_MASK             0x04
+
+/* DA9055_REG_GPIO (addr=0x10/0x11) */
+#define DA9055_GPIO0_PIN_SHIFT          0x00
+#define DA9055_GPIO0_PIN_MASK           0x03
+#define DA9055_GPIO0_TYPE_SHIFT         0x02
+#define DA9055_GPIO0_TYPE_MASK          0x04
+#define DA9055_GPIO0_WEN_SHIFT          0x03
+#define DA9055_GPIO0_WEN_MASK           0x08
+#define DA9055_GPIO1_PIN_SHIFT          0x04
+#define DA9055_GPIO1_PIN_MASK           0x30
+#define DA9055_GPIO1_TYPE_SHIFT         0x06
+#define DA9055_GPIO1_TYPE_MASK          0x40
+#define DA9055_GPIO1_WEN_SHIFT          0x07
+#define DA9055_GPIO1_WEN_MASK           0x80
+#define DA9055_GPIO2_PIN_SHIFT          0x00
+#define DA9055_GPIO2_PIN_MASK           0x30
+#define DA9055_GPIO2_TYPE_SHIFT         0x02
+#define DA9055_GPIO2_TYPE_MASK          0x04
+#define DA9055_GPIO2_WEN_SHIFT          0x03
+#define DA9055_GPIO2_WEN_MASK           0x08
+
+/* DA9055_REG_GPIO_MODE (addr=0x12) */
+#define DA9055_GPIO0_MODE_SHIFT         0x00
+#define DA9055_GPIO0_MODE_MASK          0x01
+#define DA9055_GPIO1_MODE_SHIFT         0x01
+#define DA9055_GPIO1_MODE_MASK          0x02
+#define DA9055_GPIO2_MODE_SHIFT         0x02
+#define DA9055_GPIO2_MODE_MASK          0x04
+
+/* DA9055_REG_BCORE_CONT (addr=0x13) */
+#define DA9055_BCORE_EN_SHIFT           0x00
+#define DA9055_BCORE_EN_MASK            0x01
+#define DA9055_BCORE_GPI_SHIFT          0x01
+#define DA9055_BCORE_GPI_MASK           0x02
+#define DA9055_BCORE_PD_DIS_SHIFT       0x03
+#define DA9055_BCORE_PD_DIS_MASK        0x04
+#define DA9055_VBCORE_SEL_SHIFT         0x04
+#define DA9055_SEL_REG_A                0x0
+#define DA9055_SEL_REG_B                0x10
+#define DA9055_VBCORE_SEL_MASK          0x10
+#define DA9055_V_GPI_MASK               0x60
+#define DA9055_V_GPI_SHIFT              0x05
+#define DA9055_E_GPI_MASK               0x06
+#define DA9055_E_GPI_SHIFT              0x01
+#define DA9055_VBCORE_GPI_SHIFT         0x05
+#define DA9055_VBCORE_GPI_MASK          0x60
+#define DA9055_BCORE_CONF_SHIFT         0x07
+#define DA9055_BCORE_CONF_MASK          0x80
+
+/* DA9055_REG_BMEM_CONT (addr=0x14) */
+#define DA9055_BMEM_EN_SHIFT            0x00
+#define DA9055_BMEM_EN_MASK             0x01
+#define DA9055_BMEM_GPI_SHIFT           0x01
+#define DA9055_BMEM_GPI_MASK            0x06
+#define DA9055_BMEM_PD_DIS_SHIFT        0x03
+#define DA9055_BMEM_PD_DIS_MASK         0x08
+#define DA9055_VBMEM_SEL_SHIT           0x04
+#define DA9055_VBMEM_SEL_VBMEM_A        (0<<4)
+#define DA9055_VBMEM_SEL_VBMEM_B        (1<<4)
+#define DA9055_VBMEM_SEL_MASK           0x10
+#define DA9055_VBMEM_GPI_SHIFT          0x05
+#define DA9055_VBMEM_GPI_MASK           0x60
+#define DA9055_BMEM_CONF_SHIFT          0x07
+#define DA9055_BMEM_CONF_MASK           0x80
+
+/* DA9055_REG_LDO_CONT (addr=0x15-0x1A) */
+#define DA9055_LDO_EN_SHIFT             0x00
+#define DA9055_LDO_EN_MASK              0x01
+#define DA9055_LDO_GPI_SHIFT            0x01
+#define DA9055_LDO_GPI_MASK             0x06
+#define DA9055_LDO_PD_DIS_SHIFT         0x03
+#define DA9055_LDO_PD_DIS_MASK          0x08
+#define DA9055_VLDO_SEL_SHIFT           0x04
+#define DA9055_VLDO_SEL_MASK            0x10
+#define DA9055_VLDO_SEL_VLDO_A          0x00
+#define DA9055_VLDO_SEL_VLDO_B          0x01
+#define DA9055_VLDO_GPI_SHIFT           0x05
+#define DA9055_VLDO_GPI_MASK            0x60
+#define DA9055_LDO_CONF_SHIFT           0x07
+#define DA9055_LDO_CONF_MASK            0x80
+#define DA9055_REGUALTOR_SET_A          0x00
+#define DA9055_REGUALTOR_SET_B          0x10
+
+/* DA9055_REG_ADC_MAN (addr=0x1B) */
+#define DA9055_ADC_MUX_SHIFT            0
+#define DA9055_ADC_MUX_MASK             0xF
+#define DA9055_ADC_MUX_VSYS             0x0
+#define DA9055_ADC_MUX_ADCIN1           0x01
+#define DA9055_ADC_MUX_ADCIN2           0x02
+#define DA9055_ADC_MUX_ADCIN3           0x03
+#define DA9055_ADC_MUX_T_SENSE          0x04
+#define DA9055_ADC_MAN_SHIFT            0x04
+#define DA9055_ADC_MAN_CONV             0x10
+#define DA9055_ADC_LSB_MASK             0X03
+#define DA9055_ADC_MODE_MASK            0x20
+#define DA9055_ADC_MODE_SHIFT           5
+#define DA9055_ADC_MODE_1MS             (1<<5)
+#define DA9055_COMP1V2_EN_SHIFT         7
+
+/* DA9055_REG_ADC_CONT (addr=0x1C) */
+#define DA9055_ADC_AUTO_VSYS_EN_SHIFT   0
+#define DA9055_ADC_AUTO_AD1_EN_SHIFT    1
+#define DA9055_ADC_AUTO_AD2_EN_SHIFT    2
+#define DA9055_ADC_AUTO_AD3_EN_SHIFT    3
+#define DA9055_ADC_ISRC_EN_SHIFT        4
+#define DA9055_ADC_ADCIN1_DEB_SHIFT     5
+#define DA9055_ADC_ADCIN2_DEB_SHIFT     6
+#define DA9055_ADC_ADCIN3_DEB_SHIFT     7
+#define DA9055_AD1_ISRC_MASK            0x10
+#define DA9055_AD1_ISRC_SHIFT           4
+
+/* DA9055_REG_VSYS_MON (addr=0x1D) */
+#define DA9055_VSYS_VAL_SHIFT           0
+#define DA9055_VSYS_VAL_MASK            0xFF
+#define DA9055_VSYS_VAL_BASE            0x00
+#define DA9055_VSYS_VAL_MAX             DA9055_VSYS_VAL_MASK
+#define DA9055_VSYS_VOLT_BASE           2500
+#define DA9055_VSYS_VOLT_INC            10
+#define DA9055_VSYS_STEPS               255
+#define DA9055_VSYS_VOLT_MIN            2500
+
+/* DA9044_REG_XXX_RES (addr=0x20-0x23) */
+#define DA9055_ADC_VAL_SHIFT            0
+#define DA9055_ADC_VAL_MASK             0xFF
+#define DA9055_ADC_VAL_BASE             0x00
+#define DA9055_ADC_VAL_MAX              DA9055_ADC_VAL_MASK
+#define DA9055_ADC_VOLT_BASE            0
+#define DA9055_ADC_VSYS_VOLT_BASE       2500
+#define DA9055_ADC_VOLT_INC             10
+#define DA9055_ADC_VSYS_VOLT_INC        12
+#define DA9055_ADC_STEPS                255
+
+/* DA9055_REG_EN_32K  (addr=0x35)*/
+#define DA9055_STARTUP_TIME_MASK        0x07
+#define DA9055_STARTUP_TIME_0S          0x0
+#define DA9055_STARTUP_TIME_0_52S       0x1
+#define DA9055_STARTUP_TIME_1S          0x2
+#define DA9055_CRYSTAL_EN               0x08
+#define DA9055_DELAY_MODE_EN            0x10
+#define DA9055_OUT_CLCK_GATED           0x20
+#define DA9055_RTC_CLOCK_GATED          0x40
+#define DA9055_EN_32KOUT_BUF            0x80
+
+/* DA9055_REG_RESET (addr=0x36) */
+/* Timer up to 31.744 ms */
+#define DA9055_RESET_TIMER_VAL_SHIFT    0
+#define DA9055_RESET_LOW_VAL_MASK       0x3F
+#define DA9055_RESET_LOW_VAL_BASE       0
+#define DA9055_RESET_LOW_VAL_MAX        DA9055_RESET_LOW_VAL_MASK
+#define DA9055_RESET_US_LOW_BASE        1024 /* min val in units of us */
+#define DA9055_RESET_US_LOW_INC         1024 /* inc val in units of us */
+#define DA9055_RESET_US_LOW_STEP        30
+
+/* Timer up to 1048.576ms */
+#define DA9055_RESET_HIGH_VAL_MASK      0x3F
+#define DA9055_RESET_HIGH_VAL_BASE      0
+#define DA9055_RESET_HIGH_VAL_MAX       DA9055_RESET_HIGH_VAL_MASK
+#define DA9055_RESET_US_HIGH_BASE       32768 /* min val in units of us */
+#define DA9055_RESET_US_HIGH_INC        32768 /* inv val in units of us */
+#define DA9055_RESET_US_HIGH_STEP       31
+
+/* DA9055_REG_BUCK_ILIM (addr=0x37)*/
+#define DA9055_BMEM_ILIM_SHIFT          0
+#define DA9055_ILIM_MASK                0x3
+#define DA9055_ILIM_500MA               0x0
+#define DA9055_ILIM_600MA               0x1
+#define DA9055_ILIM_700MA               0x2
+#define DA9055_ILIM_800MA               0x3
+#define DA9055_BCORE_ILIM_SHIFT         2
+
+/* DA9055_REG_BCORE_MODE (addr=0x38) */
+#define DA9055_BMEM_MODE_SHIFT          0
+#define DA9055_MODE_MASK                0x3
+#define DA9055_MODE_AB                  0x0
+#define DA9055_MODE_SLEEP               0x1
+#define DA9055_MODE_SYNCHRO             0x2
+#define DA9055_MODE_AUTO                0x3
+#define DA9055_BCORE_MODE_SHIFT         2
+
+/* DA9055_REG_VBCORE_A/B (addr=0x39/0x41)*/
+#define DA9055_VBCORE_VAL_SHIFT         0
+#define DA9055_VBCORE_VAL_MASK          0x3F
+#define DA9055_VBCORE_VAL_BASE          0x09
+#define DA9055_VBCORE_VAL_MAX           DA9055_VBCORE_VAL_MASK
+#define DA9055_VBCORE_VOLT_BASE         750
+#define DA9055_VBCORE_VOLT_INC          25
+#define DA9055_VBCORE_STEPS             53
+#define DA9055_VBCORE_VOLT_MIN          DA9055_VBCORE_VOLT_BASE
+#define DA9055_BCORE_SL_SYNCHRO         (0<<7)
+#define DA9055_BCORE_SL_SLEEP           (1<<7)
+
+/* DA9055_REG_VBMEM_A/B (addr=0x3A/0x42)*/
+#define DA9055_VBMEM_VAL_SHIFT          0
+#define DA9055_VBMEM_VAL_MASK           0x3F
+#define DA9055_VBMEM_VAL_BASE           0x00
+#define DA9055_VBMEM_VAL_MAX            DA9055_VBMEM_VAL_MASK
+#define DA9055_VBMEM_VOLT_BASE          925
+#define DA9055_VBMEM_VOLT_INC           25
+#define DA9055_VBMEM_STEPS              63
+#define DA9055_VBMEM_VOLT_MIN           DA9055_VBMEM_VOLT_BASE
+#define DA9055_BCMEM_SL_SYNCHRO         (0<<7)
+#define DA9055_BCMEM_SL_SLEEP           (1<<7)
+
+
+/* DA9055_REG_VLDO (addr=0x3B-0x40/0x43-0x48)*/
+#define DA9055_VLDO_VAL_SHIFT           0
+#define DA9055_VLDO_VAL_MASK            0x3F
+#define DA9055_VLDO6_VAL_MASK           0x7F
+#define DA9055_VLDO_VAL_BASE            0x02
+#define DA9055_VLDO2_VAL_BASE           0x03
+#define DA9055_VLDO6_VAL_BASE           0x00
+#define DA9055_VLDO_VAL_MAX             DA9055_VLDO_VAL_MASK
+#define DA9055_VLDO6_VAL_MAX            DA9055_VLDO6_VAL_MASK
+#define DA9055_VLDO_VOLT_BASE           900
+#define DA9055_VLDO_VOLT_INC            50
+#define DA9055_VLDO6_VOLT_INC           20
+#define DA9055_VLDO_STEPS               48
+#define DA9055_VLDO5_STEPS              37
+#define DA9055_VLDO6_STEPS              120
+#define DA9055_VLDO_VOLT_MIN            DA9055_VLDO_VOLT_BASE
+#define DA9055_LDO_MODE_SHIFT           7
+#define DA9055_LDO_SL_NORMAL            0
+#define DA9055_LDO_SL_SLEEP             1
+
+/* DA9055_REG_OTP_CONT (addr=0x50) */
+#define DA9055_OTP_TIM_NORMAL           (0<<0)
+#define DA9055_OTP_TIM_MARGINAL         (1<<0)
+#define DA9055_OTP_GP_RD_SHIFT          1
+#define DA9055_OTP_APPS_RD_SHIFT        2
+#define DA9055_PC_DONE_SHIFT            3
+#define DA9055_OTP_GP_LOCK_SHIFT        4
+#define DA9055_OTP_APPS_LOCK_SHIFT      5
+#define DA9055_OTP_CONF_LOCK_SHIFT      6
+#define DA9055_OTP_WRITE_DIS_SHIFT      7
+
+/* DA9055_REG_COUNT_S (addr=0x53) */
+#define DA9055_RTC_SEC                  0x3F
+#define DA9055_RTC_MONITOR_EN           0x40
+#define DA9055_RTC_READ                 0x80
+
+/* DA9055_REG_COUNT_MI (addr=0x54) */
+#define DA9055_RTC_MIN                  0x3F
+
+/* DA9055_REG_COUNT_H (addr=0x55) */
+#define DA9055_RTC_HOUR                 0x1F
+
+/* DA9055_REG_COUNT_D (addr=0x56) */
+#define DA9055_RTC_DAY                  0x1F
+
+/* DA9055_REG_COUNT_MO (addr=0x57) */
+#define DA9055_RTC_MONTH                0x0F
+
+/* DA9055_REG_COUNT_Y (addr=0x58) */
+#define DA9055_RTC_YEAR                 0x3F
+#define DA9055_RTC_YEAR_BASE            2000
+
+/* DA9055_REG_ALARM_MI (addr=0x59) */
+#define DA9055_RTC_ALM_MIN              0x3F
+#define DA9055_ALARM_STATUS_SHIFT       6
+#define DA9055_ALARM_STATUS_MASK        0x3
+#define DA9055_ALARM_STATUS_NO_ALARM    0x0
+#define DA9055_ALARM_STATUS_TICK        0x1
+#define DA9055_ALARM_STATUS_TIMER_ALARM 0x2
+#define DA9055_ALARM_STATUS_BOTH        0x3
+
+/* DA9055_REG_ALARM_H (addr=0x5A) */
+#define DA9055_RTC_ALM_HOUR             0x1F
+
+/* DA9055_REG_ALARM_D (addr=0x5B) */
+#define DA9055_RTC_ALM_DAY              0x1F
+
+/* DA9055_REG_ALARM_MO (addr=0x5C) */
+#define DA9055_RTC_ALM_MONTH            0x0F
+#define DA9055_RTC_TICK_WAKE_MASK       0x20
+#define DA9055_RTC_TICK_WAKE_SHIFT      5
+#define DA9055_RTC_TICK_TYPE            0x10
+#define DA9055_RTC_TICK_TYPE_SHIFT      0x4
+#define DA9055_RTC_TICK_SEC             0x0
+#define DA9055_RTC_TICK_MIN             0x1
+#define DA9055_ALARAM_TICK_WAKE         0x20
+
+/* DA9055_REG_ALARM_Y (addr=0x5D) */
+#define DA9055_RTC_TICK_EN              0x80
+#define DA9055_RTC_ALM_EN               0x40
+#define DA9055_RTC_TICK_ALM_MASK        0xC0
+#define DA9055_RTC_ALM_YEAR             0x3F
+
+/* DA9055_REG_TRIM_CLDR (addr=0x62) */
+#define DA9055_TRIM_32K_SHIFT           0
+#define DA9055_TRIM_32K_MASK            0x7F
+#define DA9055_TRIM_DECREMENT           (1<<7)
+#define DA9055_TRIM_INCREMENT           (0<<7)
+#define DA9055_TRIM_VAL_BASE            0x0
+#define DA9055_TRIM_PPM_BASE            0x0 /* min val in units of 0.1PPM */
+#define DA9055_TRIM_PPM_INC             19 /* min inc in units of 0.1PPM */
+#define DA9055_TRIM_STEPS               127
+
+/* DA9055_REG_CONFIG_A (addr=0x65) */
+#define DA9055_PM_I_V_VDDCORE           (0<<0)
+#define DA9055_PM_I_V_VDD_IO            (1<<0)
+#define DA9055_VDD_FAULT_TYPE_ACT_LOW   (0<<1)
+#define DA9055_VDD_FAULT_TYPE_ACT_HIGH  (1<<1)
+#define DA9055_PM_O_TYPE_PUSH_PULL      (0<<2)
+#define DA9055_PM_O_TYPE_OPEN_DRAIN     (1<<2)
+#define DA9055_IRQ_TYPE_ACT_LOW         (0<<3)
+#define DA9055_IRQ_TYPE_ACT_HIGH        (1<<3)
+#define DA9055_NIRQ_MODE_IMM            (0<<4)
+#define DA9055_NIRQ_MODE_ACTIVE         (1<<4)
+#define DA9055_GPI_V_VDDCORE            (0<<5)
+#define DA9055_GPI_V_VDD_IO             (1<<5)
+#define DA9055_PM_IF_V_VDDCORE          (0<<6)
+#define DA9055_PM_IF_V_VDD_IO           (1<<6)
+
+/* DA9055_REG_CONFIG_B (addr=0x66) */
+#define DA9055_VDD_FAULT_VAL_SHIFT      0
+#define DA9055_VDD_FAULT_VAL_MASK       0xF
+#define DA9055_VDD_FAULT_VAL_BASE       0x0
+#define DA9055_VDD_FAULT_VAL_MAX        DA9055_VDD_FAULT_VAL_MASK
+#define DA9055_VDD_FAULT_VOLT_BASE      2500
+#define DA9055_VDD_FAULT_VOLT_INC       50
+#define DA9055_VDD_FAULT_STEPS          15
+
+#define DA9055_VDD_HYST_VAL_SHIFT       4
+#define DA9055_VDD_HYST_VAL_MASK        0x7
+#define DA9055_VDD_HYST_VAL_BASE        0x0
+#define DA9055_VDD_HYST_VAL_MAX         DA9055_VDD_HYST_VAL_MASK
+#define DA9055_VDD_HYST_VOLT_BASE       100
+#define DA9055_VDD_HYST_VOLT_INC        50
+#define DA9055_VDD_HYST_STEPS           7
+#define DA9055_VDD_HYST_VOLT_MIN        DA9055_VDD_HYST_VOLT_BASE
+
+#define DA9055_VDD_FAULT_EN_SHIFT       7
+
+/* DA9055_REG_CONFIG_C (addr=0x67) */
+#define DA9055_BCORE_CLK_INV_SHIFT      0
+#define DA9055_BMEM_CLK_INV_SHIFT       1
+#define DA9055_NFAULT_CONF_SHIFT        2
+#define DA9055_LDO_SD_SHIFT             4
+#define DA9055_LDO5_BYP_SHIFT           6
+#define DA9055_LDO6_BYP_SHIFT           7
+
+/* DA9055_REG_CONFIG_D (addr=0x68) */
+#define DA9055_NONKEY_PIN_SHIFT         0
+#define DA9055_NONKEY_PIN_MASK          0x3
+#define DA9055_NONKEY_PIN_PORT_MODE     0x0
+#define DA9055_NONKEY_PIN_KEY_MODE      0x1
+#define DA9055_NONKEY_PIN_MULTI_FUNC    0x2
+#define DA9055_NONKEY_PIN_DEDICT        0x3
+#define DA9055_NONKEY_SD_SHIFT          2
+#define DA9055_KEY_DELAY_SHIFT          3
+#define DA9055_KEY_DELAY_MASK           0x3
+#define DA9055_KEY_DELAY_4S             0x0
+#define DA9055_KEY_DELAY_6S             0x1
+#define DA9055_KEY_DELAY_8S             0x2
+#define DA9055_KEY_DELAY_10S            0x3
+
+/* DA9055_REG_CONFIG_E (addr=0x69) */
+#define DA9055_GPIO_PUPD_PULL_UP        0x0
+#define DA9055_GPIO_PUPD_OPEN_DRAIN     0x1
+#define DA9055_GPIO0_PUPD_SHIFT         0
+#define DA9055_GPIO1_PUPD_SHIFT         1
+#define DA9055_GPIO2_PUPD_SHIFT         2
+#define DA9055_UVOV_DELAY_SHIFT         4
+#define DA9055_UVOV_DELAY_MASK          0x3
+#define DA9055_RESET_DURATION_SHIFT     6
+#define DA9055_RESET_DURATION_MASK      0x3
+#define DA9055_RESET_DURATION_0MS       0x0
+#define DA9055_RESET_DURATION_100MS     0x1
+#define DA9055_RESET_DURATION_500MS     0x2
+#define DA9055_RESET_DURATION_1000MS    0x3
+
+/* DA9055_REG_MON_REG_1 (addr=0x6A) */
+#define DA9055_MON_THRES_SHIFT          0
+#define DA9055_MON_THRES_MASK           0x3
+#define DA9055_MON_RES_SHIFT            2
+#define DA9055_MON_DEB_SHIFT            3
+#define DA9055_MON_MODE_SHIFT           4
+#define DA9055_MON_MODE_MASK            0x3
+#define DA9055_START_MAX_SHIFT          6
+#define DA9055_START_MAX_MASK           0x3
+
+/* DA9055_REG_MON_REG_2 (addr=0x6B) */
+#define DA9055_LDO1_MON_EN_SHIFT        0
+#define DA9055_LDO2_MON_EN_SHIFT        1
+#define DA9055_LDO3_MON_EN_SHIFT        2
+#define DA9055_LDO4_MON_EN_SHIFT        3
+#define DA9055_LDO5_MON_EN_SHIFT        4
+#define DA9055_LDO6_MON_EN_SHIFT        5
+#define DA9055_BCORE_MON_EN_SHIFT       6
+#define DA9055_BMEM_MON_EN_SHIFT        7
+
+/* DA9055_REG_CONFIG_F (addr=0x6C) */
+#define DA9055_LDO1_DEF_SHIFT           0
+#define DA9055_LDO2_DEF_SHIFT           1
+#define DA9055_LDO3_DEF_SHIFT           2
+#define DA9055_LDO4_DEF_SHIFT           3
+#define DA9055_LDO5_DEF_SHIFT           4
+#define DA9055_LDO6_DEF_SHIFT           5
+#define DA9055_BCORE_DEF_SHIFT          6
+#define DA9055_BMEM_DEF_SHIFT           7
+
+/* DA9055_REG_MON_REG_4 (addr=0x6D) */
+#define DA9055_MON_A8_IDX_SHIFT         0
+#define DA9055_MON_A89_IDX_MASK         0x3
+#define DA9055_MON_A89_IDX_NONE         0x0
+#define DA9055_MON_A89_IDX_BUCKCORE     0x1
+#define DA9055_MON_A89_IDX_LDO3         0x2
+#define DA9055_MON_A9_IDX_SHIFT         5
+
+/* DA9055_REG_MON_REG_5 (addr=0x6E) */
+#define DA9055_MON_A10_IDX_SHIFT        0
+#define DA9055_MON_A10_IDX_MASK         0x3
+#define DA9055_MON_A10_IDX_NONE         0x0
+#define DA9055_MON_A10_IDX_LDO1         0x1
+#define DA9055_MON_A10_IDX_LDO2         0x2
+#define DA9055_MON_A10_IDX_LDO5         0x3
+#define DA9055_MON_A10_IDX_LDO6         0x4
+
+#endif /* __DA9055_REG_H */
diff --git a/include/linux/mfd/lp8788-isink.h b/include/linux/mfd/lp8788-isink.h
new file mode 100644
index 000000000000..f38262d21ff1
--- /dev/null
+++ b/include/linux/mfd/lp8788-isink.h
@@ -0,0 +1,52 @@
+/*
+ * TI LP8788 MFD - common definitions for current sinks
+ *
+ * Copyright 2012 Texas Instruments
+ *
+ * Author: Milo(Woogyom) Kim <milo.kim@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __ISINK_LP8788_H__
+#define __ISINK_LP8788_H__
+
+/* register address */
+#define LP8788_ISINK_CTRL               0x99
+#define LP8788_ISINK12_IOUT             0x9A
+#define LP8788_ISINK3_IOUT              0x9B
+#define LP8788_ISINK1_PWM               0x9C
+#define LP8788_ISINK2_PWM               0x9D
+#define LP8788_ISINK3_PWM               0x9E
+
+/* mask bits */
+#define LP8788_ISINK1_IOUT_M            0x0F    /* Addr 9Ah */
+#define LP8788_ISINK2_IOUT_M            0xF0
+#define LP8788_ISINK3_IOUT_M            0x0F    /* Addr 9Bh */
+
+/* 6 bits used for PWM code : Addr 9C ~ 9Eh */
+#define LP8788_ISINK_MAX_PWM            63
+#define LP8788_ISINK_SCALE_OFFSET       3
+
+static const u8 lp8788_iout_addr[] = {
+        LP8788_ISINK12_IOUT,
+        LP8788_ISINK12_IOUT,
+        LP8788_ISINK3_IOUT,
+};
+
+static const u8 lp8788_iout_mask[] = {
+        LP8788_ISINK1_IOUT_M,
+        LP8788_ISINK2_IOUT_M,
+        LP8788_ISINK3_IOUT_M,
+};
+
+static const u8 lp8788_pwm_addr[] = {
+        LP8788_ISINK1_PWM,
+        LP8788_ISINK2_PWM,
+        LP8788_ISINK3_PWM,
+};
+
+#endif
diff --git a/include/linux/mfd/lp8788.h b/include/linux/mfd/lp8788.h
new file mode 100644
index 000000000000..cec364bdccfa
--- /dev/null
+++ b/include/linux/mfd/lp8788.h
@@ -0,0 +1,364 @@
+/*
+ * TI LP8788 MFD Device
+ *
+ * Copyright 2012 Texas Instruments
+ *
+ * Author: Milo(Woogyom) Kim <milo.kim@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __MFD_LP8788_H__
+#define __MFD_LP8788_H__
+
+#include <linux/gpio.h>
+#include <linux/irqdomain.h>
+#include <linux/regmap.h>
+
+#define LP8788_DEV_BUCK         "lp8788-buck"
+#define LP8788_DEV_DLDO         "lp8788-dldo"
+#define LP8788_DEV_ALDO         "lp8788-aldo"
+#define LP8788_DEV_CHARGER      "lp8788-charger"
+#define LP8788_DEV_RTC          "lp8788-rtc"
+#define LP8788_DEV_BACKLIGHT    "lp8788-backlight"
+#define LP8788_DEV_VIBRATOR     "lp8788-vibrator"
+#define LP8788_DEV_KEYLED       "lp8788-keyled"
+#define LP8788_DEV_ADC          "lp8788-adc"
+
+#define LP8788_NUM_BUCKS        4
+#define LP8788_NUM_DLDOS        12
+#define LP8788_NUM_ALDOS        10
+#define LP8788_NUM_BUCK2_DVS    2
+
+#define LP8788_CHG_IRQ          "CHG_IRQ"
+#define LP8788_PRSW_IRQ         "PRSW_IRQ"
+#define LP8788_BATT_IRQ         "BATT_IRQ"
+#define LP8788_ALM_IRQ          "ALARM_IRQ"
+
+enum lp8788_int_id {
+        /* interrup register 1 : Addr 00h */
+        LP8788_INT_TSDL,
+        LP8788_INT_TSDH,
+        LP8788_INT_UVLO,
+        LP8788_INT_FLAGMON,
+        LP8788_INT_PWRON_TIME,
+        LP8788_INT_PWRON,
+        LP8788_INT_COMP1,
+        LP8788_INT_COMP2,
+
+        /* interrupt register 2 : Addr 01h */
+        LP8788_INT_CHG_INPUT_STATE,
+        LP8788_INT_CHG_STATE,
+        LP8788_INT_EOC,
+        LP8788_INT_CHG_RESTART,
+        LP8788_INT_RESTART_TIMEOUT,
+        LP8788_INT_FULLCHG_TIMEOUT,
+        LP8788_INT_PRECHG_TIMEOUT,
+
+        /* interrupt register 3 : Addr 02h */
+        LP8788_INT_RTC_ALARM1 = 17,
+        LP8788_INT_RTC_ALARM2,
+        LP8788_INT_ENTER_SYS_SUPPORT,
+        LP8788_INT_EXIT_SYS_SUPPORT,
+        LP8788_INT_BATT_LOW,
+        LP8788_INT_NO_BATT,
+
+        LP8788_INT_MAX = 24,
+};
+
+enum lp8788_dvs_sel {
+        DVS_SEL_V0,
+        DVS_SEL_V1,
+        DVS_SEL_V2,
+        DVS_SEL_V3,
+};
+
+enum lp8788_ext_ldo_en_id {
+        EN_ALDO1,
+        EN_ALDO234,
+        EN_ALDO5,
+        EN_ALDO7,
+        EN_DLDO7,
+        EN_DLDO911,
+        EN_LDOS_MAX,
+};
+
+enum lp8788_charger_event {
+        NO_CHARGER,
+        CHARGER_DETECTED,
+};
+
+enum lp8788_bl_ctrl_mode {
+        LP8788_BL_REGISTER_ONLY,
+        LP8788_BL_COMB_PWM_BASED,       /* PWM + I2C, changed by PWM input */
+        LP8788_BL_COMB_REGISTER_BASED,  /* PWM + I2C, changed by I2C */
+};
+
+enum lp8788_bl_dim_mode {
+        LP8788_DIM_EXPONENTIAL,
+        LP8788_DIM_LINEAR,
+};
+
+enum lp8788_bl_full_scale_current {
+        LP8788_FULLSCALE_5000uA,
+        LP8788_FULLSCALE_8500uA,
+        LP8788_FULLSCALE_1200uA,
+        LP8788_FULLSCALE_1550uA,
+        LP8788_FULLSCALE_1900uA,
+        LP8788_FULLSCALE_2250uA,
+        LP8788_FULLSCALE_2600uA,
+        LP8788_FULLSCALE_2950uA,
+};
+
+enum lp8788_bl_ramp_step {
+        LP8788_RAMP_8us,
+        LP8788_RAMP_1024us,
+        LP8788_RAMP_2048us,
+        LP8788_RAMP_4096us,
+        LP8788_RAMP_8192us,
+        LP8788_RAMP_16384us,
+        LP8788_RAMP_32768us,
+        LP8788_RAMP_65538us,
+};
+
+enum lp8788_bl_pwm_polarity {
+        LP8788_PWM_ACTIVE_HIGH,
+        LP8788_PWM_ACTIVE_LOW,
+};
+
+enum lp8788_isink_scale {
+        LP8788_ISINK_SCALE_100mA,
+        LP8788_ISINK_SCALE_120mA,
+};
+
+enum lp8788_isink_number {
+        LP8788_ISINK_1,
+        LP8788_ISINK_2,
+        LP8788_ISINK_3,
+};
+
+enum lp8788_alarm_sel {
+        LP8788_ALARM_1,
+        LP8788_ALARM_2,
+        LP8788_ALARM_MAX,
+};
+
+enum lp8788_adc_id {
+        LPADC_VBATT_5P5,
+        LPADC_VIN_CHG,
+        LPADC_IBATT,
+        LPADC_IC_TEMP,
+        LPADC_VBATT_6P0,
+        LPADC_VBATT_5P0,
+        LPADC_ADC1,
+        LPADC_ADC2,
+        LPADC_VDD,
+        LPADC_VCOIN,
+        LPADC_VDD_LDO,
+        LPADC_ADC3,
+        LPADC_ADC4,
+        LPADC_MAX,
+};
+
+struct lp8788;
+
+/*
+ * lp8788_buck1_dvs
+ * @gpio         : gpio pin number for dvs control
+ * @vsel         : dvs selector for buck v1 register
+ */
+struct lp8788_buck1_dvs {
+        int gpio;
+        enum lp8788_dvs_sel vsel;
+};
+
+/*
+ * lp8788_buck2_dvs
+ * @gpio         : two gpio pin numbers are used for dvs
+ * @vsel         : dvs selector for buck v2 register
+ */
+struct lp8788_buck2_dvs {
+        int gpio[LP8788_NUM_BUCK2_DVS];
+        enum lp8788_dvs_sel vsel;
+};
+
+/*
+ * struct lp8788_ldo_enable_pin
+ *
+ *   Basically, all LDOs are enabled through the I2C commands.
+ *   But ALDO 1 ~ 5, 7, DLDO 7, 9, 11 can be enabled by external gpio pins.
+ *
+ * @gpio         : gpio number which is used for enabling ldos
+ * @init_state   : initial gpio state (ex. GPIOF_OUT_INIT_LOW)
+ */
+struct lp8788_ldo_enable_pin {
+        int gpio;
+        int init_state;
+};
+
+/*
+ * struct lp8788_chg_param
+ * @addr         : charging control register address (range : 0x11 ~ 0x1C)
+ * @val          : charging parameter value
+ */
+struct lp8788_chg_param {
+        u8 addr;
+        u8 val;
+};
+
+/*
+ * struct lp8788_charger_platform_data
+ * @vbatt_adc         : adc selection id for battery voltage
+ * @batt_temp_adc     : adc selection id for battery temperature
+ * @max_vbatt_mv      : used for calculating battery capacity
+ * @chg_params        : initial charging parameters
+ * @num_chg_params    : numbers of charging parameters
+ * @charger_event     : the charger event can be reported to the platform side
+ */
+struct lp8788_charger_platform_data {
+        enum lp8788_adc_id vbatt_adc;
+        enum lp8788_adc_id batt_temp_adc;
+        unsigned int max_vbatt_mv;
+        struct lp8788_chg_param *chg_params;
+        int num_chg_params;
+        void (*charger_event) (struct lp8788 *lp,
+                                enum lp8788_charger_event event);
+};
+
+/*
+ * struct lp8788_bl_pwm_data
+ * @pwm_set_intensity     : set duty of pwm
+ * @pwm_get_intensity     : get current duty of pwm
+ */
+struct lp8788_bl_pwm_data {
+        void (*pwm_set_intensity) (int brightness, int max_brightness);
+        int (*pwm_get_intensity) (int max_brightness);
+};
+
+/*
+ * struct lp8788_backlight_platform_data
+ * @name                  : backlight driver name. (default: "lcd-backlight")
+ * @initial_brightness    : initial value of backlight brightness
+ * @bl_mode               : brightness control by pwm or lp8788 register
+ * @dim_mode              : dimming mode selection
+ * @full_scale            : full scale current setting
+ * @rise_time             : brightness ramp up step time
+ * @fall_time             : brightness ramp down step time
+ * @pwm_pol               : pwm polarity setting when bl_mode is pwm based
+ * @pwm_data              : platform specific pwm generation functions
+ *                          only valid when bl_mode is pwm based
+ */
+struct lp8788_backlight_platform_data {
+        char *name;
+        int initial_brightness;
+        enum lp8788_bl_ctrl_mode bl_mode;
+        enum lp8788_bl_dim_mode dim_mode;
+        enum lp8788_bl_full_scale_current full_scale;
+        enum lp8788_bl_ramp_step rise_time;
+        enum lp8788_bl_ramp_step fall_time;
+        enum lp8788_bl_pwm_polarity pwm_pol;
+        struct lp8788_bl_pwm_data pwm_data;
+};
+
+/*
+ * struct lp8788_led_platform_data
+ * @name         : led driver name. (default: "keyboard-backlight")
+ * @scale        : current scale
+ * @num          : current sink number
+ * @iout_code    : current output value (Addr 9Ah ~ 9Bh)
+ */
+struct lp8788_led_platform_data {
+        char *name;
+        enum lp8788_isink_scale scale;
+        enum lp8788_isink_number num;
+        int iout_code;
+};
+
+/*
+ * struct lp8788_vib_platform_data
+ * @name         : vibrator driver name
+ * @scale        : current scale
+ * @num          : current sink number
+ * @iout_code    : current output value (Addr 9Ah ~ 9Bh)
+ * @pwm_code     : PWM code value (Addr 9Ch ~ 9Eh)
+ */
+struct lp8788_vib_platform_data {
+        char *name;
+        enum lp8788_isink_scale scale;
+        enum lp8788_isink_number num;
+        int iout_code;
+        int pwm_code;
+};
+
+/*
+ * struct lp8788_platform_data
+ * @init_func    : used for initializing registers
+ *                 before mfd driver is registered
+ * @buck_data    : regulator initial data for buck
+ * @dldo_data    : regulator initial data for digital ldo
+ * @aldo_data    : regulator initial data for analog ldo
+ * @buck1_dvs    : gpio configurations for buck1 dvs
+ * @buck2_dvs    : gpio configurations for buck2 dvs
+ * @ldo_pin      : gpio configurations for enabling LDOs
+ * @chg_pdata    : platform data for charger driver
+ * @alarm_sel    : rtc alarm selection (1 or 2)
+ * @bl_pdata     : configurable data for backlight driver
+ * @led_pdata    : configurable data for led driver
+ * @vib_pdata    : configurable data for vibrator driver
+ * @adc_pdata    : iio map data for adc driver
+ */
+struct lp8788_platform_data {
+        /* general system information */
+        int (*init_func) (struct lp8788 *lp);
+
+        /* regulators */
+        struct regulator_init_data *buck_data[LP8788_NUM_BUCKS];
+        struct regulator_init_data *dldo_data[LP8788_NUM_DLDOS];
+        struct regulator_init_data *aldo_data[LP8788_NUM_ALDOS];
+        struct lp8788_buck1_dvs *buck1_dvs;
+        struct lp8788_buck2_dvs *buck2_dvs;
+        struct lp8788_ldo_enable_pin *ldo_pin[EN_LDOS_MAX];
+
+        /* charger */
+        struct lp8788_charger_platform_data *chg_pdata;
+
+        /* rtc alarm */
+        enum lp8788_alarm_sel alarm_sel;
+
+        /* backlight */
+        struct lp8788_backlight_platform_data *bl_pdata;
+
+        /* current sinks */
+        struct lp8788_led_platform_data *led_pdata;
+        struct lp8788_vib_platform_data *vib_pdata;
+
+        /* adc iio map data */
+        struct iio_map *adc_pdata;
+};
+
+/*
+ * struct lp8788
+ * @dev          : parent device pointer
+ * @regmap       : used for i2c communcation on accessing registers
+ * @irqdm        : interrupt domain for handling nested interrupt
+ * @irq          : pin number of IRQ_N
+ * @pdata        : lp8788 platform specific data
+ */
+struct lp8788 {
+        struct device *dev;
+        struct regmap *regmap;
+        struct irq_domain *irqdm;
+        int irq;
+        struct lp8788_platform_data *pdata;
+};
+
+int lp8788_irq_init(struct lp8788 *lp, int chip_irq);
+void lp8788_irq_exit(struct lp8788 *lp);
+int lp8788_read_byte(struct lp8788 *lp, u8 reg, u8 *data);
+int lp8788_read_multi_bytes(struct lp8788 *lp, u8 reg, u8 *data, size_t count);
+int lp8788_write_byte(struct lp8788 *lp, u8 reg, u8 data);
+int lp8788_update_bits(struct lp8788 *lp, u8 reg, u8 mask, u8 data);
+#endif
diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/lpc_ich.h
index fec5256c3f5d..3e1df644c407 100644
--- a/include/linux/mfd/lpc_ich.h
+++ b/include/linux/mfd/lpc_ich.h
@@ -43,6 +43,7 @@ struct lpc_ich_info {
         char name[32];
         unsigned int iTCO_version;
         unsigned int gpio_version;
+        u8 use_gpio;
 };
 
 #endif
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index 1d28ae90384e..fe03b2d35d4f 100644
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -30,7 +30,20 @@
 #ifndef __LINUX_MFD_MAX77693_H
 #define __LINUX_MFD_MAX77693_H
 
+struct max77693_reg_data {
+        u8 addr;
+        u8 data;
+};
+
+struct max77693_muic_platform_data {
+        struct max77693_reg_data *init_data;
+        int num_init_data;
+};
+
 struct max77693_platform_data {
         int wakeup;
+
+        /* muic data */
+        struct max77693_muic_platform_data *muic_data;
 };
 #endif  /* __LINUX_MFD_MAX77693_H */
diff --git a/include/linux/mfd/max8907.h b/include/linux/mfd/max8907.h
new file mode 100644
index 000000000000..b06f7a6a1e80
--- /dev/null
+++ b/include/linux/mfd/max8907.h
@@ -0,0 +1,252 @@
+/*
+ * Functions to access MAX8907 power management chip.
+ *
+ * Copyright (C) 2010 Gyungoh Yoo <jack.yoo@maxim-ic.com>
+ * Copyright (C) 2012, NVIDIA CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_MFD_MAX8907_H
+#define __LINUX_MFD_MAX8907_H
+
+#include <linux/mutex.h>
+#include <linux/pm.h>
+
+#define MAX8907_GEN_I2C_ADDR            (0x78 >> 1)
+#define MAX8907_ADC_I2C_ADDR            (0x8e >> 1)
+#define MAX8907_RTC_I2C_ADDR            (0xd0 >> 1)
+
+/* MAX8907 register map */
+#define MAX8907_REG_SYSENSEL            0x00
+#define MAX8907_REG_ON_OFF_IRQ1         0x01
+#define MAX8907_REG_ON_OFF_IRQ1_MASK    0x02
+#define MAX8907_REG_ON_OFF_STAT         0x03
+#define MAX8907_REG_SDCTL1              0x04
+#define MAX8907_REG_SDSEQCNT1           0x05
+#define MAX8907_REG_SDV1                0x06
+#define MAX8907_REG_SDCTL2              0x07
+#define MAX8907_REG_SDSEQCNT2           0x08
+#define MAX8907_REG_SDV2                0x09
+#define MAX8907_REG_SDCTL3              0x0A
+#define MAX8907_REG_SDSEQCNT3           0x0B
+#define MAX8907_REG_SDV3                0x0C
+#define MAX8907_REG_ON_OFF_IRQ2         0x0D
+#define MAX8907_REG_ON_OFF_IRQ2_MASK    0x0E
+#define MAX8907_REG_RESET_CNFG          0x0F
+#define MAX8907_REG_LDOCTL16            0x10
+#define MAX8907_REG_LDOSEQCNT16         0x11
+#define MAX8907_REG_LDO16VOUT           0x12
+#define MAX8907_REG_SDBYSEQCNT          0x13
+#define MAX8907_REG_LDOCTL17            0x14
+#define MAX8907_REG_LDOSEQCNT17         0x15
+#define MAX8907_REG_LDO17VOUT           0x16
+#define MAX8907_REG_LDOCTL1             0x18
+#define MAX8907_REG_LDOSEQCNT1          0x19
+#define MAX8907_REG_LDO1VOUT            0x1A
+#define MAX8907_REG_LDOCTL2             0x1C
+#define MAX8907_REG_LDOSEQCNT2          0x1D
+#define MAX8907_REG_LDO2VOUT            0x1E
+#define MAX8907_REG_LDOCTL3             0x20
+#define MAX8907_REG_LDOSEQCNT3          0x21
+#define MAX8907_REG_LDO3VOUT            0x22
+#define MAX8907_REG_LDOCTL4             0x24
+#define MAX8907_REG_LDOSEQCNT4          0x25
+#define MAX8907_REG_LDO4VOUT            0x26
+#define MAX8907_REG_LDOCTL5             0x28
+#define MAX8907_REG_LDOSEQCNT5          0x29
+#define MAX8907_REG_LDO5VOUT            0x2A
+#define MAX8907_REG_LDOCTL6             0x2C
+#define MAX8907_REG_LDOSEQCNT6          0x2D
+#define MAX8907_REG_LDO6VOUT            0x2E
+#define MAX8907_REG_LDOCTL7             0x30
+#define MAX8907_REG_LDOSEQCNT7          0x31
+#define MAX8907_REG_LDO7VOUT            0x32
+#define MAX8907_REG_LDOCTL8             0x34
+#define MAX8907_REG_LDOSEQCNT8          0x35
+#define MAX8907_REG_LDO8VOUT            0x36
+#define MAX8907_REG_LDOCTL9             0x38
+#define MAX8907_REG_LDOSEQCNT9          0x39
+#define MAX8907_REG_LDO9VOUT            0x3A
+#define MAX8907_REG_LDOCTL10            0x3C
+#define MAX8907_REG_LDOSEQCNT10         0x3D
+#define MAX8907_REG_LDO10VOUT           0x3E
+#define MAX8907_REG_LDOCTL11            0x40
+#define MAX8907_REG_LDOSEQCNT11         0x41
+#define MAX8907_REG_LDO11VOUT           0x42
+#define MAX8907_REG_LDOCTL12            0x44
+#define MAX8907_REG_LDOSEQCNT12         0x45
+#define MAX8907_REG_LDO12VOUT           0x46
+#define MAX8907_REG_LDOCTL13            0x48
+#define MAX8907_REG_LDOSEQCNT13         0x49
+#define MAX8907_REG_LDO13VOUT           0x4A
+#define MAX8907_REG_LDOCTL14            0x4C
+#define MAX8907_REG_LDOSEQCNT14         0x4D
+#define MAX8907_REG_LDO14VOUT           0x4E
+#define MAX8907_REG_LDOCTL15            0x50
+#define MAX8907_REG_LDOSEQCNT15         0x51
+#define MAX8907_REG_LDO15VOUT           0x52
+#define MAX8907_REG_OUT5VEN             0x54
+#define MAX8907_REG_OUT5VSEQ            0x55
+#define MAX8907_REG_OUT33VEN            0x58
+#define MAX8907_REG_OUT33VSEQ           0x59
+#define MAX8907_REG_LDOCTL19            0x5C
+#define MAX8907_REG_LDOSEQCNT19         0x5D
+#define MAX8907_REG_LDO19VOUT           0x5E
+#define MAX8907_REG_LBCNFG              0x60
+#define MAX8907_REG_SEQ1CNFG            0x64
+#define MAX8907_REG_SEQ2CNFG            0x65
+#define MAX8907_REG_SEQ3CNFG            0x66
+#define MAX8907_REG_SEQ4CNFG            0x67
+#define MAX8907_REG_SEQ5CNFG            0x68
+#define MAX8907_REG_SEQ6CNFG            0x69
+#define MAX8907_REG_SEQ7CNFG            0x6A
+#define MAX8907_REG_LDOCTL18            0x72
+#define MAX8907_REG_LDOSEQCNT18         0x73
+#define MAX8907_REG_LDO18VOUT           0x74
+#define MAX8907_REG_BBAT_CNFG           0x78
+#define MAX8907_REG_CHG_CNTL1           0x7C
+#define MAX8907_REG_CHG_CNTL2           0x7D
+#define MAX8907_REG_CHG_IRQ1            0x7E
+#define MAX8907_REG_CHG_IRQ2            0x7F
+#define MAX8907_REG_CHG_IRQ1_MASK       0x80
+#define MAX8907_REG_CHG_IRQ2_MASK       0x81
+#define MAX8907_REG_CHG_STAT            0x82
+#define MAX8907_REG_WLED_MODE_CNTL      0x84
+#define MAX8907_REG_ILED_CNTL           0x84
+#define MAX8907_REG_II1RR               0x8E
+#define MAX8907_REG_II2RR               0x8F
+#define MAX8907_REG_LDOCTL20            0x9C
+#define MAX8907_REG_LDOSEQCNT20         0x9D
+#define MAX8907_REG_LDO20VOUT           0x9E
+
+/* RTC register map */
+#define MAX8907_REG_RTC_SEC             0x00
+#define MAX8907_REG_RTC_MIN             0x01
+#define MAX8907_REG_RTC_HOURS           0x02
+#define MAX8907_REG_RTC_WEEKDAY         0x03
+#define MAX8907_REG_RTC_DATE            0x04
+#define MAX8907_REG_RTC_MONTH           0x05
+#define MAX8907_REG_RTC_YEAR1           0x06
+#define MAX8907_REG_RTC_YEAR2           0x07
+#define MAX8907_REG_ALARM0_SEC          0x08
+#define MAX8907_REG_ALARM0_MIN          0x09
+#define MAX8907_REG_ALARM0_HOURS        0x0A
+#define MAX8907_REG_ALARM0_WEEKDAY      0x0B
+#define MAX8907_REG_ALARM0_DATE         0x0C
+#define MAX8907_REG_ALARM0_MONTH        0x0D
+#define MAX8907_REG_ALARM0_YEAR1        0x0E
+#define MAX8907_REG_ALARM0_YEAR2        0x0F
+#define MAX8907_REG_ALARM1_SEC          0x10
+#define MAX8907_REG_ALARM1_MIN          0x11
+#define MAX8907_REG_ALARM1_HOURS        0x12
+#define MAX8907_REG_ALARM1_WEEKDAY      0x13
+#define MAX8907_REG_ALARM1_DATE         0x14
+#define MAX8907_REG_ALARM1_MONTH        0x15
+#define MAX8907_REG_ALARM1_YEAR1        0x16
+#define MAX8907_REG_ALARM1_YEAR2        0x17
+#define MAX8907_REG_ALARM0_CNTL         0x18
+#define MAX8907_REG_ALARM1_CNTL         0x19
+#define MAX8907_REG_RTC_STATUS          0x1A
+#define MAX8907_REG_RTC_CNTL            0x1B
+#define MAX8907_REG_RTC_IRQ             0x1C
+#define MAX8907_REG_RTC_IRQ_MASK        0x1D
+#define MAX8907_REG_MPL_CNTL            0x1E
+
+/* ADC and Touch Screen Controller register map */
+#define MAX8907_CTL                     0
+#define MAX8907_SEQCNT                  1
+#define MAX8907_VOUT                    2
+
+/* mask bit fields */
+#define MAX8907_MASK_LDO_SEQ            0x1C
+#define MAX8907_MASK_LDO_EN             0x01
+#define MAX8907_MASK_VBBATTCV           0x03
+#define MAX8907_MASK_OUT5V_VINEN        0x10
+#define MAX8907_MASK_OUT5V_ENSRC        0x0E
+#define MAX8907_MASK_OUT5V_EN           0x01
+#define MAX8907_MASK_POWER_OFF          0x40
+
+/* Regulator IDs */
+#define MAX8907_MBATT   0
+#define MAX8907_SD1     1
+#define MAX8907_SD2     2
+#define MAX8907_SD3     3
+#define MAX8907_LDO1    4
+#define MAX8907_LDO2    5
+#define MAX8907_LDO3    6
+#define MAX8907_LDO4    7
+#define MAX8907_LDO5    8
+#define MAX8907_LDO6    9
+#define MAX8907_LDO7    10
+#define MAX8907_LDO8    11
+#define MAX8907_LDO9    12
+#define MAX8907_LDO10   13
+#define MAX8907_LDO11   14
+#define MAX8907_LDO12   15
+#define MAX8907_LDO13   16
+#define MAX8907_LDO14   17
+#define MAX8907_LDO15   18
+#define MAX8907_LDO16   19
+#define MAX8907_LDO17   20
+#define MAX8907_LDO18   21
+#define MAX8907_LDO19   22
+#define MAX8907_LDO20   23
+#define MAX8907_OUT5V   24
+#define MAX8907_OUT33V  25
+#define MAX8907_BBAT    26
+#define MAX8907_SDBY    27
+#define MAX8907_VRTC    28
+#define MAX8907_NUM_REGULATORS (MAX8907_VRTC + 1)
+
+/* IRQ definitions */
+enum {
+        MAX8907_IRQ_VCHG_DC_OVP = 0,
+        MAX8907_IRQ_VCHG_DC_F,
+        MAX8907_IRQ_VCHG_DC_R,
+        MAX8907_IRQ_VCHG_THM_OK_R,
+        MAX8907_IRQ_VCHG_THM_OK_F,
+        MAX8907_IRQ_VCHG_MBATTLOW_F,
+        MAX8907_IRQ_VCHG_MBATTLOW_R,
+        MAX8907_IRQ_VCHG_RST,
+        MAX8907_IRQ_VCHG_DONE,
+        MAX8907_IRQ_VCHG_TOPOFF,
+        MAX8907_IRQ_VCHG_TMR_FAULT,
+
+        MAX8907_IRQ_GPM_RSTIN = 0,
+        MAX8907_IRQ_GPM_MPL,
+        MAX8907_IRQ_GPM_SW_3SEC,
+        MAX8907_IRQ_GPM_EXTON_F,
+        MAX8907_IRQ_GPM_EXTON_R,
+        MAX8907_IRQ_GPM_SW_1SEC,
+        MAX8907_IRQ_GPM_SW_F,
+        MAX8907_IRQ_GPM_SW_R,
+        MAX8907_IRQ_GPM_SYSCKEN_F,
+        MAX8907_IRQ_GPM_SYSCKEN_R,
+
+        MAX8907_IRQ_RTC_ALARM1 = 0,
+        MAX8907_IRQ_RTC_ALARM0,
+};
+
+struct max8907_platform_data {
+        struct regulator_init_data *init_data[MAX8907_NUM_REGULATORS];
+        bool pm_off;
+};
+
+struct regmap_irq_chips_data;
+
+struct max8907 {
+        struct device                   *dev;
+        struct mutex                    irq_lock;
+        struct i2c_client               *i2c_gen;
+        struct i2c_client               *i2c_rtc;
+        struct regmap                   *regmap_gen;
+        struct regmap                   *regmap_rtc;
+        struct regmap_irq_chip_data     *irqc_chg;
+        struct regmap_irq_chip_data     *irqc_on_off;
+        struct regmap_irq_chip_data     *irqc_rtc;
+};
+
+#endif
diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h
index 15b2392a56fb..74d8e2969630 100644
--- a/include/linux/mfd/max8925.h
+++ b/include/linux/mfd/max8925.h
@@ -158,8 +158,6 @@ enum {
 #define TSC_IRQ_MASK                    (0x03)
 #define RTC_IRQ_MASK                    (0x0c)
 
-#define MAX8925_MAX_REGULATOR           (23)
-
 #define MAX8925_NAME_SIZE               (32)
 
 /* IRQ definitions */
@@ -236,7 +234,29 @@ struct max8925_platform_data {
         struct max8925_backlight_pdata  *backlight;
         struct max8925_touch_pdata      *touch;
         struct max8925_power_pdata      *power;
-        struct regulator_init_data      *regulator[MAX8925_MAX_REGULATOR];
+        struct regulator_init_data      *sd1;
+        struct regulator_init_data      *sd2;
+        struct regulator_init_data      *sd3;
+        struct regulator_init_data      *ldo1;
+        struct regulator_init_data      *ldo2;
+        struct regulator_init_data      *ldo3;
+        struct regulator_init_data      *ldo4;
+        struct regulator_init_data      *ldo5;
+        struct regulator_init_data      *ldo6;
+        struct regulator_init_data      *ldo7;
+        struct regulator_init_data      *ldo8;
+        struct regulator_init_data      *ldo9;
+        struct regulator_init_data      *ldo10;
+        struct regulator_init_data      *ldo11;
+        struct regulator_init_data      *ldo12;
+        struct regulator_init_data      *ldo13;
+        struct regulator_init_data      *ldo14;
+        struct regulator_init_data      *ldo15;
+        struct regulator_init_data      *ldo16;
+        struct regulator_init_data      *ldo17;
+        struct regulator_init_data      *ldo18;
+        struct regulator_init_data      *ldo19;
+        struct regulator_init_data      *ldo20;
 
         int             irq_base;
         int             tsc_irq;
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 9cbc642d40ad..29f6616e12f0 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -23,6 +23,9 @@
 #define PALMAS_NUM_CLIENTS              3
 
 struct palmas_pmic;
+struct palmas_gpadc;
+struct palmas_resource;
+struct palmas_usb;
 
 struct palmas {
         struct device *dev;
@@ -41,6 +44,9 @@ struct palmas {
 
         /* Child Devices */
         struct palmas_pmic *pmic;
+        struct palmas_gpadc *gpadc;
+        struct palmas_resource *resource;
+        struct palmas_usb *usb;
 
         /* GPIO MUXing */
         u8 gpio_muxed;
@@ -48,6 +54,23 @@ struct palmas {
         u8 pwm_muxed;
 };
 
+struct palmas_gpadc_platform_data {
+        /* Channel 3 current source is only enabled during conversion */
+        int ch3_current;
+
+        /* Channel 0 current source can be used for battery detection.
+         * If used for battery detection this will cause a permanent current
+         * consumption depending on current level set here.
+         */
+        int ch0_current;
+
+        /* default BAT_REMOVAL_DAT setting on device probe */
+        int bat_removal;
+
+        /* Sets the START_POLARITY bit in the RT_CTRL register */
+        int start_polarity;
+};
+
 struct palmas_reg_init {
         /* warm_rest controls the voltage levels after a warm reset
          *
@@ -107,21 +130,94 @@ struct palmas_reg_init {
 
 };
 
+enum palmas_regulators {
+        /* SMPS regulators */
+        PALMAS_REG_SMPS12,
+        PALMAS_REG_SMPS123,
+        PALMAS_REG_SMPS3,
+        PALMAS_REG_SMPS45,
+        PALMAS_REG_SMPS457,
+        PALMAS_REG_SMPS6,
+        PALMAS_REG_SMPS7,
+        PALMAS_REG_SMPS8,
+        PALMAS_REG_SMPS9,
+        PALMAS_REG_SMPS10,
+        /* LDO regulators */
+        PALMAS_REG_LDO1,
+        PALMAS_REG_LDO2,
+        PALMAS_REG_LDO3,
+        PALMAS_REG_LDO4,
+        PALMAS_REG_LDO5,
+        PALMAS_REG_LDO6,
+        PALMAS_REG_LDO7,
+        PALMAS_REG_LDO8,
+        PALMAS_REG_LDO9,
+        PALMAS_REG_LDOLN,
+        PALMAS_REG_LDOUSB,
+        /* Total number of regulators */
+        PALMAS_NUM_REGS,
+};
+
 struct palmas_pmic_platform_data {
         /* An array of pointers to regulator init data indexed by regulator
          * ID
          */
-        struct regulator_init_data **reg_data;
+        struct regulator_init_data *reg_data[PALMAS_NUM_REGS];
 
         /* An array of pointers to structures containing sleep mode and DVS
          * configuration for regulators indexed by ID
          */
-        struct palmas_reg_init **reg_init;
+        struct palmas_reg_init *reg_init[PALMAS_NUM_REGS];
 
         /* use LDO6 for vibrator control */
         int ldo6_vibrator;
+};
 
+struct palmas_usb_platform_data {
+        /* Set this if platform wishes its own vbus control */
+        int no_control_vbus;
 
+        /* Do we enable the wakeup comparator on probe */
+        int wakeup;
+};
+
+struct palmas_resource_platform_data {
+        int regen1_mode_sleep;
+        int regen2_mode_sleep;
+        int sysen1_mode_sleep;
+        int sysen2_mode_sleep;
+
+        /* bitfield to be loaded to NSLEEP_RES_ASSIGN */
+        u8 nsleep_res;
+        /* bitfield to be loaded to NSLEEP_SMPS_ASSIGN */
+        u8 nsleep_smps;
+        /* bitfield to be loaded to NSLEEP_LDO_ASSIGN1 */
+        u8 nsleep_ldo1;
+        /* bitfield to be loaded to NSLEEP_LDO_ASSIGN2 */
+        u8 nsleep_ldo2;
+
+        /* bitfield to be loaded to ENABLE1_RES_ASSIGN */
+        u8 enable1_res;
+        /* bitfield to be loaded to ENABLE1_SMPS_ASSIGN */
+        u8 enable1_smps;
+        /* bitfield to be loaded to ENABLE1_LDO_ASSIGN1 */
+        u8 enable1_ldo1;
+        /* bitfield to be loaded to ENABLE1_LDO_ASSIGN2 */
+        u8 enable1_ldo2;
+
+        /* bitfield to be loaded to ENABLE2_RES_ASSIGN */
+        u8 enable2_res;
+        /* bitfield to be loaded to ENABLE2_SMPS_ASSIGN */
+        u8 enable2_smps;
+        /* bitfield to be loaded to ENABLE2_LDO_ASSIGN1 */
+        u8 enable2_ldo1;
+        /* bitfield to be loaded to ENABLE2_LDO_ASSIGN2 */
+        u8 enable2_ldo2;
+};
+
+struct palmas_clk_platform_data {
+        int clk32kg_mode_sleep;
+        int clk32kgaudio_mode_sleep;
 };
 
 struct palmas_platform_data {
@@ -138,8 +234,49 @@ struct palmas_platform_data {
         u8 pad1, pad2;
 
         struct palmas_pmic_platform_data *pmic_pdata;
+        struct palmas_gpadc_platform_data *gpadc_pdata;
+        struct palmas_usb_platform_data *usb_pdata;
+        struct palmas_resource_platform_data *resource_pdata;
+        struct palmas_clk_platform_data *clk_pdata;
+};
+
+struct palmas_gpadc_calibration {
+        s32 gain;
+        s32 gain_error;
+        s32 offset_error;
 };
 
+struct palmas_gpadc {
+        struct device *dev;
+        struct palmas *palmas;
+
+        int ch3_current;
+        int ch0_current;
+
+        int gpadc_force;
+
+        int bat_removal;
+
+        struct mutex reading_lock;
+        struct completion irq_complete;
+
+        int eoc_sw_irq;
+
+        struct palmas_gpadc_calibration *palmas_cal_tbl;
+
+        int conv0_channel;
+        int conv1_channel;
+        int rt_channel;
+};
+
+struct palmas_gpadc_result {
+        s32 raw_code;
+        s32 corrected_code;
+        s32 result;
+};
+
+#define PALMAS_MAX_CHANNELS 16
+
 /* Define the palmas IRQ numbers */
 enum palmas_irqs {
         /* INT1 registers */
@@ -182,34 +319,6 @@ enum palmas_irqs {
         PALMAS_NUM_IRQ,
 };
 
-enum palmas_regulators {
-        /* SMPS regulators */
-        PALMAS_REG_SMPS12,
-        PALMAS_REG_SMPS123,
-        PALMAS_REG_SMPS3,
-        PALMAS_REG_SMPS45,
-        PALMAS_REG_SMPS457,
-        PALMAS_REG_SMPS6,
-        PALMAS_REG_SMPS7,
-        PALMAS_REG_SMPS8,
-        PALMAS_REG_SMPS9,
-        PALMAS_REG_SMPS10,
-        /* LDO regulators */
-        PALMAS_REG_LDO1,
-        PALMAS_REG_LDO2,
-        PALMAS_REG_LDO3,
-        PALMAS_REG_LDO4,
-        PALMAS_REG_LDO5,
-        PALMAS_REG_LDO6,
-        PALMAS_REG_LDO7,
-        PALMAS_REG_LDO8,
-        PALMAS_REG_LDO9,
-        PALMAS_REG_LDOLN,
-        PALMAS_REG_LDOUSB,
-        /* Total number of regulators */
-        PALMAS_NUM_REGS,
-};
-
 struct palmas_pmic {
         struct palmas *palmas;
         struct device *dev;
@@ -223,6 +332,69 @@ struct palmas_pmic {
         int range[PALMAS_REG_SMPS10];
 };
 
+struct palmas_resource {
+        struct palmas *palmas;
+        struct device *dev;
+};
+
+struct palmas_usb {
+        struct palmas *palmas;
+        struct device *dev;
+
+        /* for vbus reporting with irqs disabled */
+        spinlock_t lock;
+
+        struct regulator *vbus_reg;
+
+        /* used to set vbus, in atomic path */
+        struct work_struct set_vbus_work;
+
+        int irq1;
+        int irq2;
+        int irq3;
+        int irq4;
+
+        int vbus_enable;
+
+        u8 linkstat;
+};
+
+#define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)
+
+enum usb_irq_events {
+        /* Wakeup events from INT3 */
+        PALMAS_USB_ID_WAKEPUP,
+        PALMAS_USB_VBUS_WAKEUP,
+
+        /* ID_OTG_EVENTS */
+        PALMAS_USB_ID_GND,
+        N_PALMAS_USB_ID_GND,
+        PALMAS_USB_ID_C,
+        N_PALMAS_USB_ID_C,
+        PALMAS_USB_ID_B,
+        N_PALMAS_USB_ID_B,
+        PALMAS_USB_ID_A,
+        N_PALMAS_USB_ID_A,
+        PALMAS_USB_ID_FLOAT,
+        N_PALMAS_USB_ID_FLOAT,
+
+        /* VBUS_OTG_EVENTS */
+        PALMAS_USB_VB_SESS_END,
+        N_PALMAS_USB_VB_SESS_END,
+        PALMAS_USB_VB_SESS_VLD,
+        N_PALMAS_USB_VB_SESS_VLD,
+        PALMAS_USB_VA_SESS_VLD,
+        N_PALMAS_USB_VA_SESS_VLD,
+        PALMAS_USB_VA_VBUS_VLD,
+        N_PALMAS_USB_VA_VBUS_VLD,
+        PALMAS_USB_VADP_SNS,
+        N_PALMAS_USB_VADP_SNS,
+        PALMAS_USB_VADP_PRB,
+        N_PALMAS_USB_VADP_PRB,
+        PALMAS_USB_VOTG_SESS_VLD,
+        N_PALMAS_USB_VOTG_SESS_VLD,
+};
+
 /* defines so we can store the mux settings */
 #define PALMAS_GPIO_0_MUXED                                     (1 << 0)
 #define PALMAS_GPIO_1_MUXED                                     (1 << 1)
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h
index 3661c59aa1e9..36c242e52ef1 100644
--- a/include/linux/mfd/rc5t583.h
+++ b/include/linux/mfd/rc5t583.h
@@ -146,6 +146,28 @@
 #define RC5T583_GPIO_MON_IOIN   0xAB
 #define RC5T583_GPIO_GPOFUNC    0xAC
 
+/* RTC registers */
+#define RC5T583_RTC_SEC         0xE0
+#define RC5T583_RTC_MIN         0xE1
+#define RC5T583_RTC_HOUR        0xE2
+#define RC5T583_RTC_WDAY        0xE3
+#define RC5T583_RTC_DAY         0xE4
+#define RC5T583_RTC_MONTH       0xE5
+#define RC5T583_RTC_YEAR        0xE6
+#define RC5T583_RTC_ADJ         0xE7
+#define RC5T583_RTC_AW_MIN      0xE8
+#define RC5T583_RTC_AW_HOUR     0xE9
+#define RC5T583_RTC_AW_WEEK     0xEA
+#define RC5T583_RTC_AD_MIN      0xEB
+#define RC5T583_RTC_AD_HOUR     0xEC
+#define RC5T583_RTC_CTL1        0xED
+#define RC5T583_RTC_CTL2        0xEE
+#define RC5T583_RTC_AY_MIN      0xF0
+#define RC5T583_RTC_AY_HOUR     0xF1
+#define RC5T583_RTC_AY_DAY      0xF2
+#define RC5T583_RTC_AY_MONTH 0xF3
+#define RC5T583_RTC_AY_YEAR     0xF4
+
 /* RICOH_RC5T583 IRQ definitions */
 enum {
         RC5T583_IRQ_ONKEY,
diff --git a/include/linux/mfd/smsc.h b/include/linux/mfd/smsc.h
new file mode 100644
index 000000000000..9747b29f356f
--- /dev/null
+++ b/include/linux/mfd/smsc.h
@@ -0,0 +1,109 @@
+/*
+ * SMSC ECE1099
+ *
+ * Copyright 2012 Texas Instruments Inc.
+ *
+ * Author: Sourav Poddar <sourav.poddar@ti.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under  the terms of the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __LINUX_MFD_SMSC_H
+#define __LINUX_MFD_SMSC_H
+
+#include <linux/regmap.h>
+
+#define SMSC_ID_ECE1099                 1
+#define SMSC_NUM_CLIENTS                2
+
+#define SMSC_BASE_ADDR                  0x38
+#define OMAP_GPIO_SMSC_IRQ              151
+
+#define SMSC_MAXGPIO         32
+#define SMSC_BANK(offs)      ((offs) >> 3)
+#define SMSC_BIT(offs)       (1u << ((offs) & 0x7))
+
+struct smsc {
+        struct device *dev;
+        struct i2c_client *i2c_clients[SMSC_NUM_CLIENTS];
+        struct regmap *regmap;
+        int clk;
+        /* Stored chip id */
+        int id;
+};
+
+struct smsc_gpio;
+struct smsc_keypad;
+
+static inline int smsc_read(struct device *child, unsigned int reg,
+        unsigned int *dest)
+{
+        struct smsc     *smsc = dev_get_drvdata(child->parent);
+
+        return regmap_read(smsc->regmap, reg, dest);
+}
+
+static inline int smsc_write(struct device *child, unsigned int reg,
+        unsigned int value)
+{
+        struct smsc     *smsc = dev_get_drvdata(child->parent);
+
+        return regmap_write(smsc->regmap, reg, value);
+}
+
+/* Registers for SMSC */
+#define SMSC_RESET                                              0xF5
+#define SMSC_GRP_INT                                            0xF9
+#define SMSC_CLK_CTRL                                           0xFA
+#define SMSC_WKUP_CTRL                                          0xFB
+#define SMSC_DEV_ID                                             0xFC
+#define SMSC_DEV_REV                                            0xFD
+#define SMSC_VEN_ID_L                                           0xFE
+#define SMSC_VEN_ID_H                                           0xFF
+
+/* CLK VALUE */
+#define SMSC_CLK_VALUE                                          0x13
+
+/* Registers for function GPIO INPUT */
+#define SMSC_GPIO_DATA_IN_START                                 0x00
+
+/* Registers for function GPIO OUPUT */
+#define SMSC_GPIO_DATA_OUT_START                                       0x05
+
+/* Definitions for SMSC GPIO CONFIGURATION REGISTER*/
+#define SMSC_GPIO_INPUT_LOW                                     0x01
+#define SMSC_GPIO_INPUT_RISING                                  0x09
+#define SMSC_GPIO_INPUT_FALLING                                 0x11
+#define SMSC_GPIO_INPUT_BOTH_EDGE                               0x19
+#define SMSC_GPIO_OUTPUT_PP                                     0x21
+#define SMSC_GPIO_OUTPUT_OP                                     0x31
+
+#define GRP_INT_STAT                                            0xf9
+#define SMSC_GPI_INT                                            0x0f
+#define SMSC_CFG_START                                          0x0A
+
+/* Registers for SMSC GPIO INTERRUPT STATUS REGISTER*/
+#define SMSC_GPIO_INT_STAT_START                                  0x32
+
+/* Registers for SMSC GPIO INTERRUPT MASK REGISTER*/
+#define SMSC_GPIO_INT_MASK_START                               0x37
+
+/* Registers for SMSC function KEYPAD*/
+#define SMSC_KP_OUT                                             0x40
+#define SMSC_KP_IN                                              0x41
+#define SMSC_KP_INT_STAT                                        0x42
+#define SMSC_KP_INT_MASK                                        0x43
+
+/* Definitions for keypad */
+#define SMSC_KP_KSO           0x70
+#define SMSC_KP_KSI           0x51
+#define SMSC_KSO_ALL_LOW        0x20
+#define SMSC_KP_SET_LOW_PWR        0x0B
+#define SMSC_KP_SET_HIGH           0xFF
+#define SMSC_KSO_EVAL           0x00
+
+#endif /*  __LINUX_MFD_SMSC_H */
diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h
new file mode 100644
index 000000000000..6aeb6b8da64d
--- /dev/null
+++ b/include/linux/mfd/syscon.h
@@ -0,0 +1,23 @@
+/*
+ * System Control Driver
+ *
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ * Copyright (C) 2012 Linaro Ltd.
+ *
+ * Author: Dong Aisheng <dong.aisheng@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_MFD_SYSCON_H__
+#define __LINUX_MFD_SYSCON_H__
+
+extern struct regmap *syscon_node_to_regmap(struct device_node *np);
+extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);
+extern struct regmap *syscon_regmap_lookup_by_phandle(
+                                        struct device_node *np,
+                                        const char *property);
+#endif /* __LINUX_MFD_SYSCON_H__ */
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
new file mode 100644
index 000000000000..dab34a1deb2c
--- /dev/null
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_IMX6Q_IOMUXC_GPR_H
+#define __LINUX_IMX6Q_IOMUXC_GPR_H
+
+#include <linux/bitops.h>
+
+#define IOMUXC_GPR0     0x00
+#define IOMUXC_GPR1     0x04
+#define IOMUXC_GPR2     0x08
+#define IOMUXC_GPR3     0x0c
+#define IOMUXC_GPR4     0x10
+#define IOMUXC_GPR5     0x14
+#define IOMUXC_GPR6     0x18
+#define IOMUXC_GPR7     0x1c
+#define IOMUXC_GPR8     0x20
+#define IOMUXC_GPR9     0x24
+#define IOMUXC_GPR10    0x28
+#define IOMUXC_GPR11    0x2c
+#define IOMUXC_GPR12    0x30
+#define IOMUXC_GPR13    0x34
+
+#define IMX6Q_GPR0_CLOCK_8_MUX_SEL_MASK         (0x3 << 30)
+#define IMX6Q_GPR0_CLOCK_8_MUX_SEL_AUDMUX_RXCLK_P7_MUXED        (0x0 << 30)
+#define IMX6Q_GPR0_CLOCK_8_MUX_SEL_AUDMUX_RXCLK_P7      (0x1 << 30)
+#define IMX6Q_GPR0_CLOCK_8_MUX_SEL_SSI3_SSI_SRCK        (0x2 << 30)
+#define IMX6Q_GPR0_CLOCK_8_MUX_SEL_SSI3_RX_BIT_CLK      (0x3 << 30)
+#define IMX6Q_GPR0_CLOCK_0_MUX_SEL_MASK         (0x3 << 28)
+#define IMX6Q_GPR0_CLOCK_0_MUX_SEL_ESAI1_IPP_IND_SCKR_MUXED     (0x0 << 28)
+#define IMX6Q_GPR0_CLOCK_0_MUX_SEL_ESAI1_IPP_IND_SCKR   (0x1 << 28)
+#define IMX6Q_GPR0_CLOCK_0_MUX_SEL_ESAI1_IPP_DO_SCKR    (0x2 << 28)
+#define IMX6Q_GPR0_CLOCK_B_MUX_SEL_MASK         (0x3 << 26)
+#define IMX6Q_GPR0_CLOCK_B_MUX_SEL_AUDMUX_TXCLK_P7_MUXED        (0x0 << 26)
+#define IMX6Q_GPR0_CLOCK_B_MUX_SEL_AUDMUX_TXCLK_P7      (0x1 << 26)
+#define IMX6Q_GPR0_CLOCK_B_MUX_SEL_SSI3_SSI_STCK        (0x2 << 26)
+#define IMX6Q_GPR0_CLOCK_B_MUX_SEL_SSI3_TX_BIT_CLK      (0x3 << 26)
+#define IMX6Q_GPR0_CLOCK_3_MUX_SEL_MASK         (0x3 << 24)
+#define IMX6Q_GPR0_CLOCK_3_MUX_SEL_AUDMUX_RXCLK_P7_MUXED        (0x3 << 24)
+#define IMX6Q_GPR0_CLOCK_3_MUX_SEL_AUDMUX_RXCLK_P7      (0x3 << 24)
+#define IMX6Q_GPR0_CLOCK_3_MUX_SEL_SSI3_SSI_SRCK        (0x3 << 24)
+#define IMX6Q_GPR0_CLOCK_3_MUX_SEL_SSI3_RX_BIT_CLK      (0x3 << 24)
+#define IMX6Q_GPR0_CLOCK_A_MUX_SEL_MASK         (0x3 << 22)
+#define IMX6Q_GPR0_CLOCK_A_MUX_SEL_AUDMUX_TXCLK_P2_MUXED        (0x0 << 22)
+#define IMX6Q_GPR0_CLOCK_A_MUX_SEL_AUDMUX_TXCLK_P2      (0x1 << 22)
+#define IMX6Q_GPR0_CLOCK_A_MUX_SEL_SSI2_SSI_STCK        (0x2 << 22)
+#define IMX6Q_GPR0_CLOCK_A_MUX_SEL_SSI2_TX_BIT_CLK      (0x3 << 22)
+#define IMX6Q_GPR0_CLOCK_2_MUX_SEL_MASK         (0x3 << 20)
+#define IMX6Q_GPR0_CLOCK_2_MUX_SEL_AUDMUX_RXCLK_P2_MUXED        (0x0 << 20)
+#define IMX6Q_GPR0_CLOCK_2_MUX_SEL_AUDMUX_RXCLK_P2      (0x1 << 20)
+#define IMX6Q_GPR0_CLOCK_2_MUX_SEL_SSI2_SSI_SRCK        (0x2 << 20)
+#define IMX6Q_GPR0_CLOCK_2_MUX_SEL_SSI2_RX_BIT_CLK      (0x3 << 20)
+#define IMX6Q_GPR0_CLOCK_9_MUX_SEL_MASK         (0x3 << 18)
+#define IMX6Q_GPR0_CLOCK_9_MUX_SEL_AUDMUX_TXCLK_P1_MUXED        (0x0 << 18)
+#define IMX6Q_GPR0_CLOCK_9_MUX_SEL_AUDMUX_TXCLK_P1      (0x1 << 18)
+#define IMX6Q_GPR0_CLOCK_9_MUX_SEL_SSI1_SSI_STCK        (0x2 << 18)
+#define IMX6Q_GPR0_CLOCK_9_MUX_SEL_SSI1_SSI_TX_BIT_CLK  (0x3 << 18)
+#define IMX6Q_GPR0_CLOCK_1_MUX_SEL_MASK         (0x3 << 16)
+#define IMX6Q_GPR0_CLOCK_1_MUX_SEL_AUDMUX_RXCLK_P1_MUXED        (0x0 << 16)
+#define IMX6Q_GPR0_CLOCK_1_MUX_SEL_AUDMUX_RXCLK_P1      (0x1 << 16)
+#define IMX6Q_GPR0_CLOCK_1_MUX_SEL_SSI1_SSI_SRCK        (0x2 << 16)
+#define IMX6Q_GPR0_CLOCK_1_MUX_SEL_SSI1_SSI_RX_BIT_CLK  (0x3 << 16)
+#define IMX6Q_GPR0_TX_CLK2_MUX_SEL_MASK         (0x3 << 14)
+#define IMX6Q_GPR0_TX_CLK2_MUX_SEL_ASRCK_CLK1   (0x0 << 14)
+#define IMX6Q_GPR0_TX_CLK2_MUX_SEL_ASRCK_CLK2   (0x1 << 14)
+#define IMX6Q_GPR0_TX_CLK2_MUX_SEL_ASRCK_CLK3   (0x2 << 14)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL7_MASK         BIT(7)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL7_SPDIF        0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL7_IOMUX        BIT(7)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL6_MASK         BIT(6)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL6_ESAI         0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL6_I2C3         BIT(6)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL5_MASK         BIT(5)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL5_ECSPI4       0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL5_EPIT2        BIT(5)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL4_MASK         BIT(4)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL4_ECSPI4       0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL4_I2C1         BIT(4)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL3_MASK         BIT(3)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL3_ECSPI2       0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL3_I2C1         BIT(3)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL2_MASK         BIT(2)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL2_ECSPI1       0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL2_I2C2         BIT(2)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL1_MASK         BIT(1)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL1_ECSPI1       0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL1_I2C3         BIT(1)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL0_MASK         BIT(0)
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL0_IPU1         0x0
+#define IMX6Q_GPR0_DMAREQ_MUX_SEL0_IOMUX        BIT(0)
+
+#define IMX6Q_GPR1_PCIE_REQ_MASK                (0x3 << 30)
+#define IMX6Q_GPR1_PCIE_EXIT_L1                 BIT(28)
+#define IMX6Q_GPR1_PCIE_RDY_L23                 BIT(27)
+#define IMX6Q_GPR1_PCIE_ENTER_L1                BIT(26)
+#define IMX6Q_GPR1_MIPI_COLOR_SW                BIT(25)
+#define IMX6Q_GPR1_DPI_OFF                      BIT(24)
+#define IMX6Q_GPR1_EXC_MON_MASK                 BIT(22)
+#define IMX6Q_GPR1_EXC_MON_OKAY                 0x0
+#define IMX6Q_GPR1_EXC_MON_SLVE                 BIT(22)
+#define IMX6Q_GPR1_MIPI_IPU2_SEL_MASK           BIT(21)
+#define IMX6Q_GPR1_MIPI_IPU2_SEL_GASKET         0x0
+#define IMX6Q_GPR1_MIPI_IPU2_SEL_IOMUX          BIT(21)
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_MASK           BIT(20)
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_GASKET         0x0
+#define IMX6Q_GPR1_MIPI_IPU1_MUX_IOMUX          BIT(20)
+#define IMX6Q_GPR1_MIPI_IPU2_MUX_MASK           BIT(19)
+#define IMX6Q_GPR1_MIPI_IPU2_MUX_GASKET         0x0
+#define IMX6Q_GPR1_MIPI_IPU2_MUX_IOMUX          BIT(19)
+#define IMX6Q_GPR1_PCIE_TEST_PD                 BIT(18)
+#define IMX6Q_GPR1_IPU_VPU_MUX_MASK             BIT(17)
+#define IMX6Q_GPR1_IPU_VPU_MUX_IPU1             0x0
+#define IMX6Q_GPR1_IPU_VPU_MUX_IPU2             BIT(17)
+#define IMX6Q_GPR1_PCIE_REF_CLK_EN              BIT(16)
+#define IMX6Q_GPR1_USB_EXP_MODE                 BIT(15)
+#define IMX6Q_GPR1_PCIE_INT                     BIT(14)
+#define IMX6Q_GPR1_USB_OTG_ID_SEL_MASK          BIT(13)
+#define IMX6Q_GPR1_USB_OTG_ID_SEL_ENET_RX_ER    0x0
+#define IMX6Q_GPR1_USB_OTG_ID_SEL_GPIO_1        BIT(13)
+#define IMX6Q_GPR1_GINT                         BIT(12)
+#define IMX6Q_GPR1_ADDRS3_MASK                  (0x3 << 10)
+#define IMX6Q_GPR1_ADDRS3_32MB                  (0x0 << 10)
+#define IMX6Q_GPR1_ADDRS3_64MB                  (0x1 << 10)
+#define IMX6Q_GPR1_ADDRS3_128MB                 (0x2 << 10)
+#define IMX6Q_GPR1_ACT_CS3                      BIT(9)
+#define IMX6Q_GPR1_ADDRS2_MASK                  (0x3 << 7)
+#define IMX6Q_GPR1_ACT_CS2                      BIT(6)
+#define IMX6Q_GPR1_ADDRS1_MASK                  (0x3 << 4)
+#define IMX6Q_GPR1_ACT_CS1                      BIT(3)
+#define IMX6Q_GPR1_ADDRS0_MASK                  (0x3 << 1)
+#define IMX6Q_GPR1_ACT_CS0                      BIT(0)
+
+#define IMX6Q_GPR2_COUNTER_RESET_VAL_MASK       (0x3 << 20)
+#define IMX6Q_GPR2_COUNTER_RESET_VAL_5          (0x0 << 20)
+#define IMX6Q_GPR2_COUNTER_RESET_VAL_3          (0x1 << 20)
+#define IMX6Q_GPR2_COUNTER_RESET_VAL_4          (0x2 << 20)
+#define IMX6Q_GPR2_COUNTER_RESET_VAL_6          (0x3 << 20)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_MASK          (0x7 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_0             (0x0 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_1             (0x1 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_2             (0x2 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_3             (0x3 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_4             (0x4 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_5             (0x5 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_6             (0x6 << 16)
+#define IMX6Q_GPR2_LVDS_CLK_SHIFT_7             (0x7 << 16)
+#define IMX6Q_GPR2_BGREF_RRMODE_MASK            BIT(15)
+#define IMX6Q_GPR2_BGREF_RRMODE_EXT_RESISTOR    0x0
+#define IMX6Q_GPR2_BGREF_RRMODE_INT_RESISTOR    BIT(15)
+#define IMX6Q_GPR2_DI1_VS_POLARITY_MASK         BIT(10)
+#define IMX6Q_GPR2_DI1_VS_POLARITY_ACTIVE_H     0x0
+#define IMX6Q_GPR2_DI1_VS_POLARITY_ACTIVE_L     BIT(10)
+#define IMX6Q_GPR2_DI0_VS_POLARITY_MASK         BIT(9)
+#define IMX6Q_GPR2_DI0_VS_POLARITY_ACTIVE_H     0x0
+#define IMX6Q_GPR2_DI0_VS_POLARITY_ACTIVE_L     BIT(9)
+#define IMX6Q_GPR2_BIT_MAPPING_CH1_MASK         BIT(8)
+#define IMX6Q_GPR2_BIT_MAPPING_CH1_SPWG         0x0
+#define IMX6Q_GPR2_BIT_MAPPING_CH1_JEIDA        BIT(8)
+#define IMX6Q_GPR2_DATA_WIDTH_CH1_MASK          BIT(7)
+#define IMX6Q_GPR2_DATA_WIDTH_CH1_18BIT         0x0
+#define IMX6Q_GPR2_DATA_WIDTH_CH1_24BIT         BIT(7)
+#define IMX6Q_GPR2_BIT_MAPPING_CH0_MASK         BIT(6)
+#define IMX6Q_GPR2_BIT_MAPPING_CH0_SPWG         0x0
+#define IMX6Q_GPR2_BIT_MAPPING_CH0_JEIDA        BIT(6)
+#define IMX6Q_GPR2_DATA_WIDTH_CH0_MASK          BIT(5)
+#define IMX6Q_GPR2_DATA_WIDTH_CH0_18BIT         0x0
+#define IMX6Q_GPR2_DATA_WIDTH_CH0_24BIT         BIT(5)
+#define IMX6Q_GPR2_SPLIT_MODE_EN                BIT(4)
+#define IMX6Q_GPR2_CH1_MODE_MASK                (0x3 << 2)
+#define IMX6Q_GPR2_CH1_MODE_DISABLE             (0x0 << 2)
+#define IMX6Q_GPR2_CH1_MODE_EN_ROUTE_DI0        (0x1 << 2)
+#define IMX6Q_GPR2_CH1_MODE_EN_ROUTE_DI1        (0x3 << 2)
+#define IMX6Q_GPR2_CH0_MODE_MASK                (0x3 << 0)
+#define IMX6Q_GPR2_CH0_MODE_DISABLE             (0x0 << 0)
+#define IMX6Q_GPR2_CH0_MODE_EN_ROUTE_DI0        (0x1 << 0)
+#define IMX6Q_GPR2_CH0_MODE_EN_ROUTE_DI1        (0x3 << 0)
+
+#define IMX6Q_GPR3_GPU_DBG_MASK                 (0x3 << 29)
+#define IMX6Q_GPR3_GPU_DBG_GPU3D                (0x0 << 29)
+#define IMX6Q_GPR3_GPU_DBG_GPU2D                (0x1 << 29)
+#define IMX6Q_GPR3_GPU_DBG_OPENVG               (0x2 << 29)
+#define IMX6Q_GPR3_BCH_WR_CACHE_CTL             BIT(28)
+#define IMX6Q_GPR3_BCH_RD_CACHE_CTL             BIT(27)
+#define IMX6Q_GPR3_USDHCX_WR_CACHE_CTL          BIT(26)
+#define IMX6Q_GPR3_USDHCX_RD_CACHE_CTL          BIT(25)
+#define IMX6Q_GPR3_OCRAM_CTL_MASK               (0xf << 21)
+#define IMX6Q_GPR3_OCRAM_STATUS_MASK            (0xf << 17)
+#define IMX6Q_GPR3_CORE3_DBG_ACK_EN             BIT(16)
+#define IMX6Q_GPR3_CORE2_DBG_ACK_EN             BIT(15)
+#define IMX6Q_GPR3_CORE1_DBG_ACK_EN             BIT(14)
+#define IMX6Q_GPR3_CORE0_DBG_ACK_EN             BIT(13)
+#define IMX6Q_GPR3_TZASC2_BOOT_LOCK             BIT(12)
+#define IMX6Q_GPR3_TZASC1_BOOT_LOCK             BIT(11)
+#define IMX6Q_GPR3_IPU_DIAG_MASK                BIT(10)
+#define IMX6Q_GPR3_LVDS1_MUX_CTL_MASK           (0x3 << 8)
+#define IMX6Q_GPR3_LVDS1_MUX_CTL_IPU1_DI0       (0x0 << 8)
+#define IMX6Q_GPR3_LVDS1_MUX_CTL_IPU1_DI1       (0x1 << 8)
+#define IMX6Q_GPR3_LVDS1_MUX_CTL_IPU2_DI0       (0x2 << 8)
+#define IMX6Q_GPR3_LVDS1_MUX_CTL_IPU2_DI1       (0x3 << 8)
+#define IMX6Q_GPR3_LVDS0_MUX_CTL_MASK           (0x3 << 6)
+#define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU1_DI0       (0x0 << 6)
+#define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU1_DI1       (0x1 << 6)
+#define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU2_DI0       (0x2 << 6)
+#define IMX6Q_GPR3_LVDS0_MUX_CTL_IPU2_DI1       (0x3 << 6)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_MASK            (0x3 << 4)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU1_DI0        (0x0 << 4)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU1_DI1        (0x1 << 4)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU2_DI0        (0x2 << 4)
+#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU2_DI1        (0x3 << 4)
+#define IMX6Q_GPR3_HDMI_MUX_CTL_MASK            (0x3 << 2)
+#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI0        (0x0 << 2)
+#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI1        (0x1 << 2)
+#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU2_DI0        (0x2 << 2)
+#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU2_DI1        (0x3 << 2)
+
+#define IMX6Q_GPR4_VDOA_WR_CACHE_SEL            BIT(31)
+#define IMX6Q_GPR4_VDOA_RD_CACHE_SEL            BIT(30)
+#define IMX6Q_GPR4_VDOA_WR_CACHE_VAL            BIT(29)
+#define IMX6Q_GPR4_VDOA_RD_CACHE_VAL            BIT(28)
+#define IMX6Q_GPR4_PCIE_WR_CACHE_SEL            BIT(27)
+#define IMX6Q_GPR4_PCIE_RD_CACHE_SEL            BIT(26)
+#define IMX6Q_GPR4_PCIE_WR_CACHE_VAL            BIT(25)
+#define IMX6Q_GPR4_PCIE_RD_CACHE_VAL            BIT(24)
+#define IMX6Q_GPR4_SDMA_STOP_ACK                BIT(19)
+#define IMX6Q_GPR4_CAN2_STOP_ACK                BIT(18)
+#define IMX6Q_GPR4_CAN1_STOP_ACK                BIT(17)
+#define IMX6Q_GPR4_ENET_STOP_ACK                BIT(16)
+#define IMX6Q_GPR4_SOC_VERSION_MASK             (0xff << 8)
+#define IMX6Q_GPR4_SOC_VERSION_OFF              0x8
+#define IMX6Q_GPR4_VPU_WR_CACHE_SEL             BIT(7)
+#define IMX6Q_GPR4_VPU_RD_CACHE_SEL             BIT(6)
+#define IMX6Q_GPR4_VPU_P_WR_CACHE_VAL           BIT(3)
+#define IMX6Q_GPR4_VPU_P_RD_CACHE_VAL_MASK      BIT(2)
+#define IMX6Q_GPR4_IPU_WR_CACHE_CTL             BIT(1)
+#define IMX6Q_GPR4_IPU_RD_CACHE_CTL             BIT(0)
+
+#define IMX6Q_GPR5_L2_CLK_STOP                  BIT(8)
+
+#define IMX6Q_GPR9_TZASC2_BYP                   BIT(1)
+#define IMX6Q_GPR9_TZASC1_BYP                   BIT(0)
+
+#define IMX6Q_GPR10_LOCK_DBG_EN                 BIT(29)
+#define IMX6Q_GPR10_LOCK_DBG_CLK_EN             BIT(28)
+#define IMX6Q_GPR10_LOCK_SEC_ERR_RESP           BIT(27)
+#define IMX6Q_GPR10_LOCK_OCRAM_TZ_ADDR          (0x3f << 21)
+#define IMX6Q_GPR10_LOCK_OCRAM_TZ_EN            BIT(20)
+#define IMX6Q_GPR10_LOCK_DCIC2_MUX_MASK         (0x3 << 18)
+#define IMX6Q_GPR10_LOCK_DCIC1_MUX_MASK         (0x3 << 16)
+#define IMX6Q_GPR10_DBG_EN                      BIT(13)
+#define IMX6Q_GPR10_DBG_CLK_EN                  BIT(12)
+#define IMX6Q_GPR10_SEC_ERR_RESP_MASK           BIT(11)
+#define IMX6Q_GPR10_SEC_ERR_RESP_OKEY           0x0
+#define IMX6Q_GPR10_SEC_ERR_RESP_SLVE           BIT(11)
+#define IMX6Q_GPR10_OCRAM_TZ_ADDR_MASK          (0x3f << 5)
+#define IMX6Q_GPR10_OCRAM_TZ_EN_MASK            BIT(4)
+#define IMX6Q_GPR10_DCIC2_MUX_CTL_MASK          (0x3 << 2)
+#define IMX6Q_GPR10_DCIC2_MUX_CTL_IPU1_DI0      (0x0 << 2)
+#define IMX6Q_GPR10_DCIC2_MUX_CTL_IPU1_DI1      (0x1 << 2)
+#define IMX6Q_GPR10_DCIC2_MUX_CTL_IPU2_DI0      (0x2 << 2)
+#define IMX6Q_GPR10_DCIC2_MUX_CTL_IPU2_DI1      (0x3 << 2)
+#define IMX6Q_GPR10_DCIC1_MUX_CTL_MASK          (0x3 << 0)
+#define IMX6Q_GPR10_DCIC1_MUX_CTL_IPU1_DI0      (0x0 << 0)
+#define IMX6Q_GPR10_DCIC1_MUX_CTL_IPU1_DI1      (0x1 << 0)
+#define IMX6Q_GPR10_DCIC1_MUX_CTL_IPU2_DI0      (0x2 << 0)
+#define IMX6Q_GPR10_DCIC1_MUX_CTL_IPU2_DI1      (0x3 << 0)
+
+#define IMX6Q_GPR12_ARMP_IPG_CLK_EN             BIT(27)
+#define IMX6Q_GPR12_ARMP_AHB_CLK_EN             BIT(26)
+#define IMX6Q_GPR12_ARMP_ATB_CLK_EN             BIT(25)
+#define IMX6Q_GPR12_ARMP_APB_CLK_EN             BIT(24)
+#define IMX6Q_GPR12_PCIE_CTL_2                  BIT(10)
+
+#define IMX6Q_GPR13_SDMA_STOP_REQ               BIT(30)
+#define IMX6Q_GPR13_CAN2_STOP_REQ               BIT(29)
+#define IMX6Q_GPR13_CAN1_STOP_REQ               BIT(28)
+#define IMX6Q_GPR13_ENET_STOP_REQ               BIT(27)
+#define IMX6Q_GPR13_SATA_PHY_8_MASK             (0x7 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_0_5_DB           (0x0 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_1_0_DB           (0x1 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_1_5_DB           (0x2 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_2_0_DB           (0x3 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_2_5_DB           (0x4 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_3_0_DB           (0x5 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_3_5_DB           (0x6 << 24)
+#define IMX6Q_GPR13_SATA_PHY_8_4_0_DB           (0x7 << 24)
+#define IMX6Q_GPR13_SATA_PHY_7_MASK             (0x1f << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA1I           (0x10 << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA1M           (0x10 << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA1X           (0x1a << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA2I           (0x12 << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA2M           (0x12 << 19)
+#define IMX6Q_GPR13_SATA_PHY_7_SATA2X           (0x1a << 19)
+#define IMX6Q_GPR13_SATA_PHY_6_MASK             (0x7 << 16)
+#define IMX6Q_GPR13_SATA_SPEED_MASK             BIT(15)
+#define IMX6Q_GPR13_SATA_SPEED_1P5G             0x0
+#define IMX6Q_GPR13_SATA_SPEED_3P0G             BIT(15)
+#define IMX6Q_GPR13_SATA_PHY_5                  BIT(14)
+#define IMX6Q_GPR13_SATA_PHY_4_MASK             (0x7 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_16_16            (0x0 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_14_16            (0x1 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_12_16            (0x2 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_10_16            (0x3 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_9_16             (0x4 << 11)
+#define IMX6Q_GPR13_SATA_PHY_4_8_16             (0x5 << 11)
+#define IMX6Q_GPR13_SATA_PHY_3_MASK             (0xf << 7)
+#define IMX6Q_GPR13_SATA_PHY_3_OFF              0x7
+#define IMX6Q_GPR13_SATA_PHY_2_MASK             (0x1f << 2)
+#define IMX6Q_GPR13_SATA_PHY_2_OFF              0x2
+#define IMX6Q_GPR13_SATA_PHY_1_MASK             (0x3 << 0)
+#define IMX6Q_GPR13_SATA_PHY_1_FAST             (0x0 << 0)
+#define IMX6Q_GPR13_SATA_PHY_1_MED              (0x1 << 0)
+#define IMX6Q_GPR13_SATA_PHY_1_SLOW             (0x2 << 0)
+
+#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
diff --git a/include/linux/mfd/tc3589x.h b/include/linux/mfd/tc3589x.h
index 3acb3a8e3af5..6b8e1ff4672b 100644
--- a/include/linux/mfd/tc3589x.h
+++ b/include/linux/mfd/tc3589x.h
@@ -117,6 +117,7 @@ struct tc3589x {
         struct mutex lock;
         struct device *dev;
         struct i2c_client *i2c;
+        struct irq_domain *domain;
 
         int irq_base;
         int num_gpio;
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
index 7cd83d826ed8..290762f93930 100644
--- a/include/linux/mfd/tps65217.h
+++ b/include/linux/mfd/tps65217.h
@@ -213,6 +213,23 @@ enum tps65217_regulator_id {
 /* Number of total regulators available */
 #define TPS65217_NUM_REGULATOR          (TPS65217_NUM_DCDC + TPS65217_NUM_LDO)
 
+enum tps65217_bl_isel {
+        TPS65217_BL_ISET1 = 1,
+        TPS65217_BL_ISET2,
+};
+
+enum tps65217_bl_fdim {
+        TPS65217_BL_FDIM_100HZ,
+        TPS65217_BL_FDIM_200HZ,
+        TPS65217_BL_FDIM_500HZ,
+        TPS65217_BL_FDIM_1000HZ,
+};
+
+struct tps65217_bl_pdata {
+        enum tps65217_bl_isel isel;
+        enum tps65217_bl_fdim fdim;
+};
+
 /**
  * struct tps65217_board - packages regulator init data
  * @tps65217_regulator_data: regulator initialization values
@@ -222,6 +239,7 @@ enum tps65217_regulator_id {
 struct tps65217_board {
         struct regulator_init_data *tps65217_init_data[TPS65217_NUM_REGULATOR];
         struct device_node *of_node[TPS65217_NUM_REGULATOR];
+        struct tps65217_bl_pdata *bl_pdata;
 };
 
 /**
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index 94514710a03f..2dd123194958 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -78,6 +78,7 @@ struct tps6586x_platform_data {
 
         int gpio_base;
         int irq_base;
+        bool pm_off;
 };
 
 /*
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 9bf8767818b4..02e894f3ff45 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -132,6 +132,16 @@
  *
  */
 
+/* RTC_CTRL_REG bitfields */
+#define TPS65910_RTC_CTRL_STOP_RTC                      0x01 /*0=stop, 1=run */
+#define TPS65910_RTC_CTRL_GET_TIME                      0x40
+
+/* RTC_STATUS_REG bitfields */
+#define TPS65910_RTC_STATUS_ALARM               0x40
+
+/* RTC_INTERRUPTS_REG bitfields */
+#define TPS65910_RTC_INTERRUPTS_EVERY           0x03
+#define TPS65910_RTC_INTERRUPTS_IT_ALARM        0x08
 
 /*Register BCK1  (0x80) register.RegisterDescription */
 #define BCK1_BCKUP_MASK                                 0xFF
@@ -366,6 +376,8 @@
 
 
 /*Register DEVCTRL  (0x80) register.RegisterDescription */
+#define DEVCTRL_PWR_OFF_MASK                            0x80
+#define DEVCTRL_PWR_OFF_SHIFT                           7
 #define DEVCTRL_RTC_PWDN_MASK                           0x40
 #define DEVCTRL_RTC_PWDN_SHIFT                          6
 #define DEVCTRL_CK32K_CTRL_MASK                         0x20
@@ -809,6 +821,7 @@ struct tps65910_board {
         int vmbch2_threshold;
         bool en_ck32k_xtal;
         bool en_dev_slp;
+        bool pm_off;
         struct tps65910_sleep_keepon_data *slp_keepon;
         bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO];
         unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS];
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index ba43d4806b83..a8eff4ad9be5 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -143,7 +143,7 @@
 
 #define TWL6040_GPO1                    0x01
 #define TWL6040_GPO2                    0x02
-#define TWL6040_GPO3                    0x03
+#define TWL6040_GPO3                    0x04
 
 /* ACCCTL (0x2D) fields */
 
@@ -158,7 +158,7 @@
 #define TWL6040_VIBROCDET               0x20
 #define TWL6040_TSHUTDET                0x40
 
-#define TWL6040_CELLS                   2
+#define TWL6040_CELLS                   3
 
 #define TWL6040_REV_ES1_0               0x00
 #define TWL6040_REV_ES1_1               0x01 /* Rev ES1.1 and ES1.2 */
@@ -176,6 +176,8 @@
 #define TWL6040_SYSCLK_SEL_LPPLL        0
 #define TWL6040_SYSCLK_SEL_HPPLL        1
 
+#define TWL6040_GPO_MAX 3
+
 struct twl6040_codec_data {
         u16 hs_left_step;
         u16 hs_right_step;
@@ -192,11 +194,16 @@ struct twl6040_vibra_data {
         int vddvibr_uV;                 /* VDDVIBR volt, set 0 for fixed reg */
 };
 
+struct twl6040_gpo_data {
+        int gpio_base;
+};
+
 struct twl6040_platform_data {
         int audpwron_gpio;      /* audio power-on gpio */
 
         struct twl6040_codec_data *codec;
         struct twl6040_vibra_data *vibra;
+        struct twl6040_gpo_data *gpo;
 };
 
 struct regmap;
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index f0361c031927..fc87be4fdc25 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -164,6 +164,10 @@ struct wm8994_pdata {
         int num_micd_rates;
         struct wm8958_micd_rate *micd_rates;
 
+        /* Power up delays to add after microphone bias power up (ms) */
+        int micb1_delay;
+        int micb2_delay;
+
         /* LINEOUT can be differential or single ended */
         unsigned int lineout1_diff:1;
         unsigned int lineout2_diff:1;
diff --git a/include/linux/mii.h b/include/linux/mii.h
index 8ef3a7a11592..47492c9631b3 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -4,163 +4,12 @@
  *
  * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
  */
-
 #ifndef __LINUX_MII_H__
 #define __LINUX_MII_H__
 
-#include <linux/types.h>
-#include <linux/ethtool.h>
-
-/* Generic MII registers. */
-#define MII_BMCR                0x00    /* Basic mode control register */
-#define MII_BMSR                0x01    /* Basic mode status register  */
-#define MII_PHYSID1             0x02    /* PHYS ID 1                   */
-#define MII_PHYSID2             0x03    /* PHYS ID 2                   */
-#define MII_ADVERTISE           0x04    /* Advertisement control reg   */
-#define MII_LPA                 0x05    /* Link partner ability reg    */
-#define MII_EXPANSION           0x06    /* Expansion register          */
-#define MII_CTRL1000            0x09    /* 1000BASE-T control          */
-#define MII_STAT1000            0x0a    /* 1000BASE-T status           */
-#define MII_MMD_CTRL            0x0d    /* MMD Access Control Register */
-#define MII_MMD_DATA            0x0e    /* MMD Access Data Register */
-#define MII_ESTATUS             0x0f    /* Extended Status             */
-#define MII_DCOUNTER            0x12    /* Disconnect counter          */
-#define MII_FCSCOUNTER          0x13    /* False carrier counter       */
-#define MII_NWAYTEST            0x14    /* N-way auto-neg test reg     */
-#define MII_RERRCOUNTER         0x15    /* Receive error counter       */
-#define MII_SREVISION           0x16    /* Silicon revision            */
-#define MII_RESV1               0x17    /* Reserved...                 */
-#define MII_LBRERROR            0x18    /* Lpback, rx, bypass error    */
-#define MII_PHYADDR             0x19    /* PHY address                 */
-#define MII_RESV2               0x1a    /* Reserved...                 */
-#define MII_TPISTATUS           0x1b    /* TPI status for 10mbps       */
-#define MII_NCONFIG             0x1c    /* Network interface config    */
-
-/* Basic mode control register. */
-#define BMCR_RESV               0x003f  /* Unused...                   */
-#define BMCR_SPEED1000          0x0040  /* MSB of Speed (1000)         */
-#define BMCR_CTST               0x0080  /* Collision test              */
-#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
-#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
-#define BMCR_ISOLATE            0x0400  /* Isolate data paths from MII */
-#define BMCR_PDOWN              0x0800  /* Enable low power state      */
-#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
-#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
-#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
-#define BMCR_RESET              0x8000  /* Reset to default state      */
-
-/* Basic mode status register. */
-#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
-#define BMSR_JCD                0x0002  /* Jabber detected             */
-#define BMSR_LSTATUS            0x0004  /* Link status                 */
-#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
-#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
-#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
-#define BMSR_RESV               0x00c0  /* Unused...                   */
-#define BMSR_ESTATEN            0x0100  /* Extended Status in R15      */
-#define BMSR_100HALF2           0x0200  /* Can do 100BASE-T2 HDX       */
-#define BMSR_100FULL2           0x0400  /* Can do 100BASE-T2 FDX       */
-#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
-#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
-#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
-#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
-#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
-
-/* Advertisement control register. */
-#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
-#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
-#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
-#define ADVERTISE_1000XFULL     0x0020  /* Try for 1000BASE-X full-duplex */
-#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
-#define ADVERTISE_1000XHALF     0x0040  /* Try for 1000BASE-X half-duplex */
-#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
-#define ADVERTISE_1000XPAUSE    0x0080  /* Try for 1000BASE-X pause    */
-#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
-#define ADVERTISE_1000XPSE_ASYM 0x0100  /* Try for 1000BASE-X asym pause */
-#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
-#define ADVERTISE_PAUSE_CAP     0x0400  /* Try for pause               */
-#define ADVERTISE_PAUSE_ASYM    0x0800  /* Try for asymetric pause     */
-#define ADVERTISE_RESV          0x1000  /* Unused...                   */
-#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
-#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
-#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
-
-#define ADVERTISE_FULL          (ADVERTISE_100FULL | ADVERTISE_10FULL | \
-                                  ADVERTISE_CSMA)
-#define ADVERTISE_ALL           (ADVERTISE_10HALF | ADVERTISE_10FULL | \
-                                  ADVERTISE_100HALF | ADVERTISE_100FULL)
-
-/* Link partner ability register. */
-#define LPA_SLCT                0x001f  /* Same as advertise selector  */
-#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
-#define LPA_1000XFULL           0x0020  /* Can do 1000BASE-X full-duplex */
-#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
-#define LPA_1000XHALF           0x0040  /* Can do 1000BASE-X half-duplex */
-#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
-#define LPA_1000XPAUSE          0x0080  /* Can do 1000BASE-X pause     */
-#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
-#define LPA_1000XPAUSE_ASYM     0x0100  /* Can do 1000BASE-X pause asym*/
-#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
-#define LPA_PAUSE_CAP           0x0400  /* Can pause                   */
-#define LPA_PAUSE_ASYM          0x0800  /* Can pause asymetrically     */
-#define LPA_RESV                0x1000  /* Unused...                   */
-#define LPA_RFAULT              0x2000  /* Link partner faulted        */
-#define LPA_LPACK               0x4000  /* Link partner acked us       */
-#define LPA_NPAGE               0x8000  /* Next page bit               */
-
-#define LPA_DUPLEX              (LPA_10FULL | LPA_100FULL)
-#define LPA_100                 (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
-
-/* Expansion register for auto-negotiation. */
-#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
-#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
-#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
-#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
-#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
-#define EXPANSION_RESV          0xffe0  /* Unused...                   */
-
-#define ESTATUS_1000_TFULL      0x2000  /* Can do 1000BT Full          */
-#define ESTATUS_1000_THALF      0x1000  /* Can do 1000BT Half          */
-
-/* N-way test register. */
-#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
-#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
-#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
-
-/* 1000BASE-T Control register */
-#define ADVERTISE_1000FULL      0x0200  /* Advertise 1000BASE-T full duplex */
-#define ADVERTISE_1000HALF      0x0100  /* Advertise 1000BASE-T half duplex */
-#define CTL1000_AS_MASTER       0x0800
-#define CTL1000_ENABLE_MASTER   0x1000
-
-/* 1000BASE-T Status register */
-#define LPA_1000LOCALRXOK       0x2000  /* Link partner local receiver status */
-#define LPA_1000REMRXOK         0x1000  /* Link partner remote receiver status */
-#define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
-#define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
-
-/* Flow control flags */
-#define FLOW_CTRL_TX            0x01
-#define FLOW_CTRL_RX            0x02
-
-/* MMD Access Control register fields */
-#define MII_MMD_CTRL_DEVAD_MASK 0x1f    /* Mask MMD DEVAD*/
-#define MII_MMD_CTRL_ADDR       0x0000  /* Address */
-#define MII_MMD_CTRL_NOINCR     0x4000  /* no post increment */
-#define MII_MMD_CTRL_INCR_RDWT  0x8000  /* post increment on reads & writes */
-#define MII_MMD_CTRL_INCR_ON_WT 0xC000  /* post increment on writes only */
-
-/* This structure is used in all SIOCxMIIxxx ioctl calls */
-struct mii_ioctl_data {
-        __u16           phy_id;
-        __u16           reg_num;
-        __u16           val_in;
-        __u16           val_out;
-};
-
-#ifdef __KERNEL__
 
 #include <linux/if.h>
+#include <uapi/linux/mii.h>
 
 struct ethtool_cmd;
 
@@ -487,5 +336,4 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv)
         return cap;
 }
 
-#endif /* __KERNEL__ */
 #endif /* __LINUX_MII_H__ */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 311be906b57d..fa0680402738 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -10,7 +10,6 @@
 #include <linux/list.h>
 #include <linux/mmzone.h>
 #include <linux/rbtree.h>
-#include <linux/prio_tree.h>
 #include <linux/atomic.h>
 #include <linux/debug_locks.h>
 #include <linux/mm_types.h>
@@ -21,6 +20,7 @@
 
 struct mempolicy;
 struct anon_vma;
+struct anon_vma_chain;
 struct file_ra_state;
 struct user_struct;
 struct writeback_control;
@@ -70,6 +70,8 @@ extern unsigned int kobjsize(const void *objp);
 /*
  * vm_flags in vm_area_struct, see mm_types.h.
  */
+#define VM_NONE         0x00000000
+
 #define VM_READ         0x00000001      /* currently active flags */
 #define VM_WRITE        0x00000002
 #define VM_EXEC         0x00000004
@@ -82,16 +84,9 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_MAYSHARE     0x00000080
 
 #define VM_GROWSDOWN    0x00000100      /* general info on the segment */
-#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
-#define VM_GROWSUP      0x00000200
-#else
-#define VM_GROWSUP      0x00000000
-#define VM_NOHUGEPAGE   0x00000200      /* MADV_NOHUGEPAGE marked this vma */
-#endif
 #define VM_PFNMAP       0x00000400      /* Page-ranges managed without "struct page", just pure PFN */
 #define VM_DENYWRITE    0x00000800      /* ETXTBSY on write attempts.. */
 
-#define VM_EXECUTABLE   0x00001000
 #define VM_LOCKED       0x00002000
 #define VM_IO           0x00004000      /* Memory mapped I/O or similar */
 
@@ -101,25 +96,34 @@ extern unsigned int kobjsize(const void *objp);
 
 #define VM_DONTCOPY     0x00020000      /* Do not copy this vma on fork */
 #define VM_DONTEXPAND   0x00040000      /* Cannot expand with mremap() */
-#define VM_RESERVED     0x00080000      /* Count as reserved_vm like IO */
 #define VM_ACCOUNT      0x00100000      /* Is a VM accounted object */
 #define VM_NORESERVE    0x00200000      /* should the VM suppress accounting */
 #define VM_HUGETLB      0x00400000      /* Huge TLB Page VM */
 #define VM_NONLINEAR    0x00800000      /* Is non-linear (remap_file_pages) */
-#ifndef CONFIG_TRANSPARENT_HUGEPAGE
-#define VM_MAPPED_COPY  0x01000000      /* T if mapped copy of data (nommu mmap) */
-#else
-#define VM_HUGEPAGE     0x01000000      /* MADV_HUGEPAGE marked this vma */
-#endif
-#define VM_INSERTPAGE   0x02000000      /* The vma has had "vm_insert_page()" done on it */
-#define VM_NODUMP       0x04000000      /* Do not include in the core dump */
+#define VM_ARCH_1       0x01000000      /* Architecture-specific flag */
+#define VM_DONTDUMP     0x04000000      /* Do not include in the core dump */
 
-#define VM_CAN_NONLINEAR 0x08000000     /* Has ->fault & does nonlinear pages */
 #define VM_MIXEDMAP     0x10000000      /* Can contain "struct page" and pure PFN pages */
-#define VM_SAO          0x20000000      /* Strong Access Ordering (powerpc) */
-#define VM_PFN_AT_MMAP  0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
+#define VM_HUGEPAGE     0x20000000      /* MADV_HUGEPAGE marked this vma */
+#define VM_NOHUGEPAGE   0x40000000      /* MADV_NOHUGEPAGE marked this vma */
 #define VM_MERGEABLE    0x80000000      /* KSM may merge identical pages */
 
+#if defined(CONFIG_X86)
+# define VM_PAT         VM_ARCH_1       /* PAT reserves whole VMA at once (x86) */
+#elif defined(CONFIG_PPC)
+# define VM_SAO         VM_ARCH_1       /* Strong Access Ordering (powerpc) */
+#elif defined(CONFIG_PARISC)
+# define VM_GROWSUP     VM_ARCH_1
+#elif defined(CONFIG_IA64)
+# define VM_GROWSUP     VM_ARCH_1
+#elif !defined(CONFIG_MMU)
+# define VM_MAPPED_COPY VM_ARCH_1       /* T if mapped copy of data (nommu mmap) */
+#endif
+
+#ifndef VM_GROWSUP
+# define VM_GROWSUP     VM_NONE
+#endif
+
 /* Bits set in the VMA until the stack is in its final location */
 #define VM_STACK_INCOMPLETE_SETUP       (VM_RAND_READ | VM_SEQ_READ)
 
@@ -143,7 +147,7 @@ extern unsigned int kobjsize(const void *objp);
  * Special vmas that are non-mergable, non-mlock()able.
  * Note: mm/huge_memory.c VM_NO_THP depends on this definition.
  */
-#define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)
+#define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_PFNMAP)
 
 /*
  * mapping from the currently active vm_flags protection bits (the
@@ -157,24 +161,7 @@ extern pgprot_t protection_map[16];
 #define FAULT_FLAG_ALLOW_RETRY  0x08    /* Retry fault if blocking */
 #define FAULT_FLAG_RETRY_NOWAIT 0x10    /* Don't drop mmap_sem and wait when retrying */
 #define FAULT_FLAG_KILLABLE     0x20    /* The fault task is in SIGKILL killable region */
-
-/*
- * This interface is used by x86 PAT code to identify a pfn mapping that is
- * linear over entire vma. This is to optimize PAT code that deals with
- * marking the physical region with a particular prot. This is not for generic
- * mm use. Note also that this check will not work if the pfn mapping is
- * linear for a vma starting at physical address 0. In which case PAT code
- * falls back to slow path of reserving physical range page by page.
- */
-static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)
-{
-        return !!(vma->vm_flags & VM_PFN_AT_MMAP);
-}
-
-static inline int is_pfn_mapping(struct vm_area_struct *vma)
-{
-        return !!(vma->vm_flags & VM_PFNMAP);
-}
+#define FAULT_FLAG_TRIED        0x40    /* second try */
 
 /*
  * vm_fault is filled by the the pagefault handler and passed to the vma's
@@ -182,8 +169,7 @@ static inline int is_pfn_mapping(struct vm_area_struct *vma)
  * of VM_FAULT_xxx flags that give details about how the fault was handled.
  *
  * pgoff should be used in favour of virtual_address, if possible. If pgoff
- * is used, one may set VM_CAN_NONLINEAR in the vma->vm_flags to get nonlinear
- * mapping support.
+ * is used, one may implement ->remap_pages to get nonlinear mapping support.
  */
 struct vm_fault {
         unsigned int flags;             /* FAULT_FLAG_xxx flags */
@@ -241,6 +227,9 @@ struct vm_operations_struct {
         int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from,
                 const nodemask_t *to, unsigned long flags);
 #endif
+        /* called by sys_remap_file_pages() to populate non-linear mapping */
+        int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
+                           unsigned long size, pgoff_t pgoff);
 };
 
 struct mmu_gather;
@@ -249,6 +238,18 @@ struct inode;
 #define page_private(page)              ((page)->private)
 #define set_page_private(page, v)       ((page)->private = (v))
 
+/* It's valid only if the page is free path or free_list */
+static inline void set_freepage_migratetype(struct page *page, int migratetype)
+{
+        page->index = migratetype;
+}
+
+/* It's valid only if the page is free path or free_list */
+static inline int get_freepage_migratetype(struct page *page)
+{
+        return page->index;
+}
+
 /*
  * FIXME: take this include out, include page-flags.h in
  * files which need it (119 of them)
@@ -454,6 +455,7 @@ void put_pages_list(struct list_head *pages);
 
 void split_page(struct page *page, unsigned int order);
 int split_free_page(struct page *page);
+int capture_free_page(struct page *page, int alloc_order, int migratetype);
 
 /*
  * Compound pages have a destructor function.  Provide a
@@ -1071,7 +1073,8 @@ vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
 
 extern unsigned long move_page_tables(struct vm_area_struct *vma,
                 unsigned long old_addr, struct vm_area_struct *new_vma,
-                unsigned long new_addr, unsigned long len);
+                unsigned long new_addr, unsigned long len,
+                bool need_rmap_locks);
 extern unsigned long do_mremap(unsigned long addr,
                                unsigned long old_len, unsigned long new_len,
                                unsigned long flags, unsigned long new_addr);
@@ -1366,24 +1369,45 @@ extern void zone_pcp_reset(struct zone *zone);
 extern atomic_long_t mmap_pages_allocated;
 extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t);
 
-/* prio_tree.c */
-void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old);
-void vma_prio_tree_insert(struct vm_area_struct *, struct prio_tree_root *);
-void vma_prio_tree_remove(struct vm_area_struct *, struct prio_tree_root *);
-struct vm_area_struct *vma_prio_tree_next(struct vm_area_struct *vma,
-        struct prio_tree_iter *iter);
-
-#define vma_prio_tree_foreach(vma, iter, root, begin, end)      \
-        for (prio_tree_iter_init(iter, root, begin, end), vma = NULL;   \
-                (vma = vma_prio_tree_next(vma, iter)); )
+/* interval_tree.c */
+void vma_interval_tree_insert(struct vm_area_struct *node,
+                              struct rb_root *root);
+void vma_interval_tree_insert_after(struct vm_area_struct *node,
+                                    struct vm_area_struct *prev,
+                                    struct rb_root *root);
+void vma_interval_tree_remove(struct vm_area_struct *node,
+                              struct rb_root *root);
+struct vm_area_struct *vma_interval_tree_iter_first(struct rb_root *root,
+                                unsigned long start, unsigned long last);
+struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node,
+                                unsigned long start, unsigned long last);
+
+#define vma_interval_tree_foreach(vma, root, start, last)               \
+        for (vma = vma_interval_tree_iter_first(root, start, last);     \
+             vma; vma = vma_interval_tree_iter_next(vma, start, last))
 
 static inline void vma_nonlinear_insert(struct vm_area_struct *vma,
                                         struct list_head *list)
 {
-        vma->shared.vm_set.parent = NULL;
-        list_add_tail(&vma->shared.vm_set.list, list);
+        list_add_tail(&vma->shared.nonlinear, list);
 }
 
+void anon_vma_interval_tree_insert(struct anon_vma_chain *node,
+                                   struct rb_root *root);
+void anon_vma_interval_tree_remove(struct anon_vma_chain *node,
+                                   struct rb_root *root);
+struct anon_vma_chain *anon_vma_interval_tree_iter_first(
+        struct rb_root *root, unsigned long start, unsigned long last);
+struct anon_vma_chain *anon_vma_interval_tree_iter_next(
+        struct anon_vma_chain *node, unsigned long start, unsigned long last);
+#ifdef CONFIG_DEBUG_VM_RB
+void anon_vma_interval_tree_verify(struct anon_vma_chain *node);
+#endif
+
+#define anon_vma_interval_tree_foreach(avc, root, start, last)           \
+        for (avc = anon_vma_interval_tree_iter_first(root, start, last); \
+             avc; avc = anon_vma_interval_tree_iter_next(avc, start, last))
+
 /* mmap.c */
 extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin);
 extern int vma_adjust(struct vm_area_struct *vma, unsigned long start,
@@ -1400,15 +1424,13 @@ extern void __vma_link_rb(struct mm_struct *, struct vm_area_struct *,
         struct rb_node **, struct rb_node *);
 extern void unlink_file_vma(struct vm_area_struct *);
 extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
-        unsigned long addr, unsigned long len, pgoff_t pgoff);
+        unsigned long addr, unsigned long len, pgoff_t pgoff,
+        bool *need_rmap_locks);
 extern void exit_mmap(struct mm_struct *);
 
 extern int mm_take_all_locks(struct mm_struct *mm);
 extern void mm_drop_all_locks(struct mm_struct *mm);
 
-/* From fs/proc/base.c. callers must _not_ hold the mm's exe_file_lock */
-extern void added_exe_file_vma(struct mm_struct *mm);
-extern void removed_exe_file_vma(struct mm_struct *mm);
 extern void set_mm_exe_file(struct mm_struct *mm, struct file *new_exe_file);
 extern struct file *get_mm_exe_file(struct mm_struct *mm);
 
@@ -1662,5 +1684,9 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
 static inline bool page_is_guard(struct page *page) { return false; }
 #endif /* CONFIG_DEBUG_PAGEALLOC */
 
+extern void reset_zone_present_pages(void);
+extern void fixup_zone_present_pages(int nid, unsigned long start_pfn,
+                                unsigned long end_pfn);
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index bf7867200b95..31f8a3af7d94 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -6,7 +6,6 @@
 #include <linux/threads.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
-#include <linux/prio_tree.h>
 #include <linux/rbtree.h>
 #include <linux/rwsem.h>
 #include <linux/completion.h>
@@ -240,18 +239,15 @@ struct vm_area_struct {
 
         /*
          * For areas with an address space and backing store,
-         * linkage into the address_space->i_mmap prio tree, or
-         * linkage to the list of like vmas hanging off its node, or
+         * linkage into the address_space->i_mmap interval tree, or
          * linkage of vma in the address_space->i_mmap_nonlinear list.
          */
         union {
                 struct {
-                        struct list_head list;
-                        void *parent;   /* aligns with prio_tree_node parent */
-                        struct vm_area_struct *head;
-                } vm_set;
-
-                struct raw_prio_tree_node prio_tree_node;
+                        struct rb_node rb;
+                        unsigned long rb_subtree_last;
+                } linear;
+                struct list_head nonlinear;
         } shared;
 
         /*
@@ -349,7 +345,6 @@ struct mm_struct {
         unsigned long shared_vm;        /* Shared pages (files) */
         unsigned long exec_vm;          /* VM_EXEC & ~VM_WRITE */
         unsigned long stack_vm;         /* VM_GROWSUP/DOWN */
-        unsigned long reserved_vm;      /* VM_RESERVED|VM_IO pages */
         unsigned long def_flags;
         unsigned long nr_ptes;          /* Page table pages */
         unsigned long start_code, end_code, start_data, end_data;
@@ -394,7 +389,6 @@ struct mm_struct {
 
         /* store ref to file /proc/<pid>/exe symlink points to */
         struct file *exe_file;
-        unsigned long num_exe_file_vmas;
 #ifdef CONFIG_MMU_NOTIFIER
         struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 8b74e9b1d0ad..d09dde1e57fb 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -1,20 +1,11 @@
 #ifndef _LINUX_MMAN_H
 #define _LINUX_MMAN_H
 
-#include <asm/mman.h>
-
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
-
-#define OVERCOMMIT_GUESS                0
-#define OVERCOMMIT_ALWAYS               1
-#define OVERCOMMIT_NEVER                2
-
-#ifdef __KERNEL__
 #include <linux/mm.h>
 #include <linux/percpu_counter.h>
 
 #include <linux/atomic.h>
+#include <uapi/linux/mman.h>
 
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
@@ -86,8 +77,6 @@ calc_vm_flag_bits(unsigned long flags)
 {
         return _calc_vm_trans(flags, MAP_GROWSDOWN,  VM_GROWSDOWN ) |
                _calc_vm_trans(flags, MAP_DENYWRITE,  VM_DENYWRITE ) |
-               _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
                _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    );
 }
-#endif /* __KERNEL__ */
 #endif /* _LINUX_MMAN_H */
diff --git a/include/linux/mmc/Kbuild b/include/linux/mmc/Kbuild
deleted file mode 100644
index 1fb26448faa9..000000000000
--- a/include/linux/mmc/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += ioctl.h
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 4b27f9f503e4..943550dfe9ea 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -57,6 +57,7 @@ struct mmc_ext_csd {
         unsigned int            sa_timeout;             /* Units: 100ns */
         unsigned int            generic_cmd6_time;      /* Units: 10ms */
         unsigned int            power_off_longtime;     /* Units: ms */
+        u8                      power_off_notification; /* state */
         unsigned int            hs_max_dtr;
 #define MMC_HIGH_26_MAX_DTR     26000000
 #define MMC_HIGH_52_MAX_DTR     52000000
@@ -76,10 +77,13 @@ struct mmc_ext_csd {
         bool                    hpi_en;                 /* HPI enablebit */
         bool                    hpi;                    /* HPI support bit */
         unsigned int            hpi_cmd;                /* cmd used as HPI */
+        bool                    bkops;          /* background support bit */
+        bool                    bkops_en;       /* background enable bit */
         unsigned int            data_sector_size;       /* 512 bytes or 4KB */
         unsigned int            data_tag_unit_size;     /* DATA TAG UNIT size */
         unsigned int            boot_ro_lock;           /* ro lock support */
         bool                    boot_ro_lockable;
+        u8                      raw_exception_status;   /* 53 */
         u8                      raw_partition_support;  /* 160 */
         u8                      raw_erased_mem_count;   /* 181 */
         u8                      raw_ext_csd_structure;  /* 194 */
@@ -93,6 +97,7 @@ struct mmc_ext_csd {
         u8                      raw_sec_erase_mult;     /* 230 */
         u8                      raw_sec_feature_support;/* 231 */
         u8                      raw_trim_mult;          /* 232 */
+        u8                      raw_bkops_status;       /* 246 */
         u8                      raw_sectors[4];         /* 212 - 4 bytes */
 
         unsigned int            feature_support;
@@ -225,7 +230,7 @@ struct mmc_card {
 #define MMC_CARD_SDXC           (1<<6)          /* card is SDXC */
 #define MMC_CARD_REMOVED        (1<<7)          /* card has been removed */
 #define MMC_STATE_HIGHSPEED_200 (1<<8)          /* card is in HS200 mode */
-#define MMC_STATE_SLEEP         (1<<9)          /* card is in sleep state */
+#define MMC_STATE_DOING_BKOPS   (1<<10)         /* card is doing BKOPS */
         unsigned int            quirks;         /* card quirks */
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
@@ -241,11 +246,6 @@ struct mmc_card {
 #define MMC_QUIRK_LONG_READ_TIME (1<<9)         /* Data read time > CSD says */
 #define MMC_QUIRK_SEC_ERASE_TRIM_BROKEN (1<<10) /* Skip secure for erase/trim */
                                                 /* byte mode */
-        unsigned int    poweroff_notify_state;  /* eMMC4.5 notify feature */
-#define MMC_NO_POWER_NOTIFICATION       0
-#define MMC_POWERED_ON                  1
-#define MMC_POWEROFF_SHORT              2
-#define MMC_POWEROFF_LONG               3
 
         unsigned int            erase_size;     /* erase size in sectors */
         unsigned int            erase_shift;    /* if erase unit is power 2 */
@@ -392,7 +392,7 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_sd_card_uhs(c)      ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
 #define mmc_card_removed(c)     ((c) && ((c)->state & MMC_CARD_REMOVED))
-#define mmc_card_is_sleep(c)    ((c)->state & MMC_STATE_SLEEP)
+#define mmc_card_doing_bkops(c) ((c)->state & MMC_STATE_DOING_BKOPS)
 
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
@@ -404,9 +404,9 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_sd_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_set_ext_capacity(c) ((c)->state |= MMC_CARD_SDXC)
 #define mmc_card_set_removed(c) ((c)->state |= MMC_CARD_REMOVED)
-#define mmc_card_set_sleep(c)   ((c)->state |= MMC_STATE_SLEEP)
+#define mmc_card_set_doing_bkops(c)     ((c)->state |= MMC_STATE_DOING_BKOPS)
+#define mmc_card_clr_doing_bkops(c)     ((c)->state &= ~MMC_STATE_DOING_BKOPS)
 
-#define mmc_card_clr_sleep(c)   ((c)->state &= ~MMC_STATE_SLEEP)
 /*
  * Quirk add/remove for MMC products.
  */
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 1b431c728b9a..9b9cdafc7737 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -134,6 +134,8 @@ struct mmc_host;
 struct mmc_card;
 struct mmc_async_req;
 
+extern int mmc_stop_bkops(struct mmc_card *);
+extern int mmc_read_bkops_status(struct mmc_card *);
 extern struct mmc_async_req *mmc_start_req(struct mmc_host *,
                                            struct mmc_async_req *, int *);
 extern int mmc_interrupt_hpi(struct mmc_card *);
@@ -142,6 +144,8 @@ extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
 extern int mmc_app_cmd(struct mmc_host *, struct mmc_card *);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
+extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
+extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
 
 #define MMC_ERASE_ARG           0x00000000
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 7a7ebd367cfd..7c6a1139d8fa 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -78,6 +78,10 @@ struct mmc_data;
  * @data_offset: Set the offset of DATA register according to VERID.
  * @dev: Device associated with the MMC controller.
  * @pdata: Platform data associated with the MMC controller.
+ * @drv_data: Driver specific data for identified variant of the controller
+ * @priv: Implementation defined private data.
+ * @biu_clk: Pointer to bus interface unit clock instance.
+ * @ciu_clk: Pointer to card interface unit clock instance.
  * @slot: Slots sharing this MMC controller.
  * @fifo_depth: depth of FIFO.
  * @data_shift: log2 of FIFO item size.
@@ -156,8 +160,12 @@ struct dw_mci {
         u32                     fifoth_val;
         u16                     verid;
         u16                     data_offset;
-        struct device           dev;
+        struct device           *dev;
         struct dw_mci_board     *pdata;
+        struct dw_mci_drv_data  *drv_data;
+        void                    *priv;
+        struct clk              *biu_clk;
+        struct clk              *ciu_clk;
         struct dw_mci_slot      *slot[MAX_MCI_SLOTS];
 
         /* FIFO push and pull */
@@ -201,7 +209,8 @@ struct dw_mci_dma_ops {
 #define DW_MCI_QUIRK_HIGHSPEED                  BIT(2)
 /* Unreliable card detection */
 #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION      BIT(3)
-
+/* Write Protect detection not available */
+#define DW_MCI_QUIRK_NO_WRITE_PROTECT           BIT(4)
 
 struct dma_pdata;
 
@@ -218,7 +227,7 @@ struct dw_mci_board {
         u32 num_slots;
 
         u32 quirks; /* Workaround / Quirk flags */
-        unsigned int bus_hz; /* Bus speed */
+        unsigned int bus_hz; /* Clock speed at the cclk_in pad */
 
         unsigned int caps;      /* Capabilities */
         unsigned int caps2;     /* More capabilities */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f578a71d82a6..7abb0e1f7bda 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -259,10 +259,6 @@ struct mmc_host {
 #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)       /* Write-protect signal active high */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
-        unsigned int        power_notify_type;
-#define MMC_HOST_PW_NOTIFY_NONE         0
-#define MMC_HOST_PW_NOTIFY_SHORT        1
-#define MMC_HOST_PW_NOTIFY_LONG         2
 
 #ifdef CONFIG_MMC_CLKGATE
         int                     clk_requests;   /* internal reference counter */
@@ -300,6 +296,7 @@ struct mmc_host {
 #endif
 
         int                     rescan_disable; /* disable card detection */
+        int                     rescan_entered; /* used with nonremovable devices */
 
         struct mmc_card         *card;          /* device attached to this host */
 
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index d425cab144d9..01e4b394029b 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -139,6 +139,7 @@ static inline bool mmc_op_multi(u32 opcode)
 #define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
 #define R1_SWITCH_ERROR         (1 << 7)        /* sx, c */
+#define R1_EXCEPTION_EVENT      (1 << 6)        /* sx, a */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 
 #define R1_STATE_IDLE   0
@@ -274,12 +275,15 @@ struct _mmc_csd {
 #define EXT_CSD_FLUSH_CACHE             32      /* W */
 #define EXT_CSD_CACHE_CTRL              33      /* R/W */
 #define EXT_CSD_POWER_OFF_NOTIFICATION  34      /* R/W */
+#define EXT_CSD_EXP_EVENTS_STATUS       54      /* RO */
 #define EXT_CSD_DATA_SECTOR_SIZE        61      /* R */
 #define EXT_CSD_GP_SIZE_MULT            143     /* R/W */
 #define EXT_CSD_PARTITION_ATTRIBUTE     156     /* R/W */
 #define EXT_CSD_PARTITION_SUPPORT       160     /* RO */
 #define EXT_CSD_HPI_MGMT                161     /* R/W */
 #define EXT_CSD_RST_N_FUNCTION          162     /* R/W */
+#define EXT_CSD_BKOPS_EN                163     /* R/W */
+#define EXT_CSD_BKOPS_START             164     /* W */
 #define EXT_CSD_SANITIZE_START          165     /* W */
 #define EXT_CSD_WR_REL_PARAM            166     /* RO */
 #define EXT_CSD_BOOT_WP                 173     /* R/W */
@@ -313,11 +317,13 @@ struct _mmc_csd {
 #define EXT_CSD_PWR_CL_200_360          237     /* RO */
 #define EXT_CSD_PWR_CL_DDR_52_195       238     /* RO */
 #define EXT_CSD_PWR_CL_DDR_52_360       239     /* RO */
+#define EXT_CSD_BKOPS_STATUS            246     /* RO */
 #define EXT_CSD_POWER_OFF_LONG_TIME     247     /* RO */
 #define EXT_CSD_GENERIC_CMD6_TIME       248     /* RO */
 #define EXT_CSD_CACHE_SIZE              249     /* RO, 4 bytes */
 #define EXT_CSD_TAG_UNIT_SIZE           498     /* RO */
 #define EXT_CSD_DATA_TAG_SUPPORT        499     /* RO */
+#define EXT_CSD_BKOPS_SUPPORT           502     /* RO */
 #define EXT_CSD_HPI_FEATURES            503     /* RO */
 
 /*
@@ -378,6 +384,19 @@ struct _mmc_csd {
 #define EXT_CSD_PWR_CL_8BIT_SHIFT       4
 #define EXT_CSD_PWR_CL_4BIT_SHIFT       0
 /*
+ * EXCEPTION_EVENT_STATUS field
+ */
+#define EXT_CSD_URGENT_BKOPS            BIT(0)
+#define EXT_CSD_DYNCAP_NEEDED           BIT(1)
+#define EXT_CSD_SYSPOOL_EXHAUSTED       BIT(2)
+#define EXT_CSD_PACKED_FAILURE          BIT(3)
+
+/*
+ * BKOPS status level
+ */
+#define EXT_CSD_BKOPS_LEVEL_2           0x2
+
+/*
  * MMC_SWITCH access modes
  */
 
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index ac83b105bedd..fa8529a859b8 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -97,7 +97,8 @@ struct sdhci_host {
 
         const struct sdhci_ops *ops;    /* Low level hw interface */
 
-        struct regulator *vmmc; /* Power regulator */
+        struct regulator *vmmc;         /* Power regulator (vmmc) */
+        struct regulator *vqmmc;        /* Signaling regulator (vccq) */
 
         /* Internal data */
         struct mmc_host *mmc;   /* MMC structure */
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index 1d1b1e13f79f..bc823c4c028b 100644
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -4,6 +4,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/mm_types.h>
+#include <linux/srcu.h>
 
 struct mmu_notifier;
 struct mmu_notifier_ops;
@@ -245,50 +246,6 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
                 __mmu_notifier_mm_destroy(mm);
 }
 
-/*
- * These two macros will sometime replace ptep_clear_flush.
- * ptep_clear_flush is implemented as macro itself, so this also is
- * implemented as a macro until ptep_clear_flush will converted to an
- * inline function, to diminish the risk of compilation failure. The
- * invalidate_page method over time can be moved outside the PT lock
- * and these two macros can be later removed.
- */
-#define ptep_clear_flush_notify(__vma, __address, __ptep)               \
-({                                                                      \
-        pte_t __pte;                                                    \
-        struct vm_area_struct *___vma = __vma;                          \
-        unsigned long ___address = __address;                           \
-        __pte = ptep_clear_flush(___vma, ___address, __ptep);           \
-        mmu_notifier_invalidate_page(___vma->vm_mm, ___address);        \
-        __pte;                                                          \
-})
-
-#define pmdp_clear_flush_notify(__vma, __address, __pmdp)               \
-({                                                                      \
-        pmd_t __pmd;                                                    \
-        struct vm_area_struct *___vma = __vma;                          \
-        unsigned long ___address = __address;                           \
-        VM_BUG_ON(__address & ~HPAGE_PMD_MASK);                         \
-        mmu_notifier_invalidate_range_start(___vma->vm_mm, ___address,  \
-                                            (__address)+HPAGE_PMD_SIZE);\
-        __pmd = pmdp_clear_flush(___vma, ___address, __pmdp);           \
-        mmu_notifier_invalidate_range_end(___vma->vm_mm, ___address,    \
-                                          (__address)+HPAGE_PMD_SIZE);  \
-        __pmd;                                                          \
-})
-
-#define pmdp_splitting_flush_notify(__vma, __address, __pmdp)           \
-({                                                                      \
-        struct vm_area_struct *___vma = __vma;                          \
-        unsigned long ___address = __address;                           \
-        VM_BUG_ON(__address & ~HPAGE_PMD_MASK);                         \
-        mmu_notifier_invalidate_range_start(___vma->vm_mm, ___address,  \
-                                            (__address)+HPAGE_PMD_SIZE);\
-        pmdp_splitting_flush(___vma, ___address, __pmdp);               \
-        mmu_notifier_invalidate_range_end(___vma->vm_mm, ___address,    \
-                                          (__address)+HPAGE_PMD_SIZE);  \
-})
-
 #define ptep_clear_flush_young_notify(__vma, __address, __ptep)         \
 ({                                                                      \
         int __young;                                                    \
@@ -311,14 +268,24 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
         __young;                                                        \
 })
 
+/*
+ * set_pte_at_notify() sets the pte _after_ running the notifier.
+ * This is safe to start by updating the secondary MMUs, because the primary MMU
+ * pte invalidate must have already happened with a ptep_clear_flush() before
+ * set_pte_at_notify() has been invoked.  Updating the secondary MMUs first is
+ * required when we change both the protection of the mapping from read-only to
+ * read-write and the pfn (like during copy on write page faults). Otherwise the
+ * old page would remain mapped readonly in the secondary MMUs after the new
+ * page is already writable by some CPU through the primary MMU.
+ */
 #define set_pte_at_notify(__mm, __address, __ptep, __pte)               \
 ({                                                                      \
         struct mm_struct *___mm = __mm;                                 \
         unsigned long ___address = __address;                           \
         pte_t ___pte = __pte;                                           \
                                                                         \
-        set_pte_at(___mm, ___address, __ptep, ___pte);                  \
         mmu_notifier_change_pte(___mm, ___address, ___pte);             \
+        set_pte_at(___mm, ___address, __ptep, ___pte);                  \
 })
 
 #else /* CONFIG_MMU_NOTIFIER */
@@ -369,9 +336,6 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 
 #define ptep_clear_flush_young_notify ptep_clear_flush_young
 #define pmdp_clear_flush_young_notify pmdp_clear_flush_young
-#define ptep_clear_flush_notify ptep_clear_flush
-#define pmdp_clear_flush_notify pmdp_clear_flush
-#define pmdp_splitting_flush_notify pmdp_splitting_flush
 #define set_pte_at_notify set_pte_at
 
 #endif /* CONFIG_MMU_NOTIFIER */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 2daa54f55db7..50aaca81f63d 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -142,6 +142,7 @@ enum zone_stat_item {
         NUMA_OTHER,             /* allocation from other node */
 #endif
         NR_ANON_TRANSPARENT_HUGEPAGES,
+        NR_FREE_CMA_PAGES,
         NR_VM_ZONE_STAT_ITEMS };
 
 /*
@@ -217,6 +218,8 @@ struct lruvec {
 #define ISOLATE_UNMAPPED        ((__force isolate_mode_t)0x2)
 /* Isolate for asynchronous migration */
 #define ISOLATE_ASYNC_MIGRATE   ((__force isolate_mode_t)0x4)
+/* Isolate unevictable pages */
+#define ISOLATE_UNEVICTABLE     ((__force isolate_mode_t)0x8)
 
 /* LRU Isolation modes. */
 typedef unsigned __bitwise__ isolate_mode_t;
@@ -369,8 +372,12 @@ struct zone {
         spinlock_t              lock;
         int                     all_unreclaimable; /* All pages pinned */
 #if defined CONFIG_COMPACTION || defined CONFIG_CMA
-        /* pfn where the last incremental compaction isolated free pages */
+        /* Set to true when the PG_migrate_skip bits should be cleared */
+        bool                    compact_blockskip_flush;
+
+        /* pfns where compaction scanners should start */
         unsigned long           compact_cached_free_pfn;
+        unsigned long           compact_cached_migrate_pfn;
 #endif
 #ifdef CONFIG_MEMORY_HOTPLUG
         /* see spanned/present_pages for more description */
@@ -704,6 +711,7 @@ typedef struct pglist_data {
         unsigned long node_spanned_pages; /* total size of physical page
                                              range, including holes */
         int node_id;
+        nodemask_t reclaim_nodes;       /* Nodes allowed to reclaim from */
         wait_queue_head_t kswapd_wait;
         wait_queue_head_t pfmemalloc_wait;
         struct task_struct *kswapd;     /* Protected by lock_memory_hotplug() */
diff --git a/include/linux/module.h b/include/linux/module.h
index fbcafe2ee13e..7760c6d344a3 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -21,6 +21,9 @@
 #include <linux/percpu.h>
 #include <asm/module.h>
 
+/* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
+#define MODULE_SIG_STRING "~Module signature appended~\n"
+
 /* Not Yet Implemented */
 #define MODULE_SUPPORTED_DEVICE(name)
 
@@ -260,6 +263,11 @@ struct module
         const unsigned long *unused_gpl_crcs;
 #endif
 
+#ifdef CONFIG_MODULE_SIG
+        /* Signature was verified. */
+        bool sig_ok;
+#endif
+
         /* symbols that will be GPL-only in the near future. */
         const struct kernel_symbol *gpl_future_syms;
         const unsigned long *gpl_future_crcs;
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index b2be02ebf453..560ca53a75fa 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -28,21 +28,49 @@ void *module_alloc(unsigned long size);
 /* Free memory returned from module_alloc. */
 void module_free(struct module *mod, void *module_region);
 
-/* Apply the given relocation to the (simplified) ELF.  Return -error
-   or 0. */
+/*
+ * Apply the given relocation to the (simplified) ELF.  Return -error
+ * or 0.
+ */
+#ifdef CONFIG_MODULES_USE_ELF_REL
 int apply_relocate(Elf_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
                    unsigned int relsec,
                    struct module *mod);
+#else
+static inline int apply_relocate(Elf_Shdr *sechdrs,
+                                 const char *strtab,
+                                 unsigned int symindex,
+                                 unsigned int relsec,
+                                 struct module *me)
+{
+        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        return -ENOEXEC;
+}
+#endif
 
-/* Apply the given add relocation to the (simplified) ELF.  Return
-   -error or 0 */
+/*
+ * Apply the given add relocation to the (simplified) ELF.  Return
+ * -error or 0
+ */
+#ifdef CONFIG_MODULES_USE_ELF_RELA
 int apply_relocate_add(Elf_Shdr *sechdrs,
                        const char *strtab,
                        unsigned int symindex,
                        unsigned int relsec,
                        struct module *mod);
+#else
+static inline int apply_relocate_add(Elf_Shdr *sechdrs,
+                                     const char *strtab,
+                                     unsigned int symindex,
+                                     unsigned int relsec,
+                                     struct module *me)
+{
+        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        return -ENOEXEC;
+}
+#endif
 
 /* Any final processing of module before access.  Return -error or 0. */
 int module_finalize(const Elf_Ehdr *hdr,
diff --git a/include/linux/mpi.h b/include/linux/mpi.h
index d02cca6cc8ce..5af1b81def49 100644
--- a/include/linux/mpi.h
+++ b/include/linux/mpi.h
@@ -76,6 +76,7 @@ void mpi_swap(MPI a, MPI b);
 
 /*-- mpicoder.c --*/
 MPI do_encode_md(const void *sha_buffer, unsigned nbits);
+MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes);
 MPI mpi_read_from_buffer(const void *buffer, unsigned *ret_nread);
 int mpi_fromstr(MPI val, const char *str);
 u32 mpi_get_keyid(MPI a, u32 *keyid);
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 46caaf44339d..ea00d9162ee5 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -1,138 +1,10 @@
 #ifndef __LINUX_MROUTE_H
 #define __LINUX_MROUTE_H
 
-#include <linux/sockios.h>
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/in.h>
-#endif
-
-/*
- *      Based on the MROUTING 3.5 defines primarily to keep
- *      source compatibility with BSD.
- *
- *      See the mrouted code for the original history.
- *
- *      Protocol Independent Multicast (PIM) data structures included
- *      Carlos Picoto (cap@di.fc.ul.pt)
- *
- */
-
-#define MRT_BASE        200
-#define MRT_INIT        (MRT_BASE)      /* Activate the kernel mroute code      */
-#define MRT_DONE        (MRT_BASE+1)    /* Shutdown the kernel mroute           */
-#define MRT_ADD_VIF     (MRT_BASE+2)    /* Add a virtual interface              */
-#define MRT_DEL_VIF     (MRT_BASE+3)    /* Delete a virtual interface           */
-#define MRT_ADD_MFC     (MRT_BASE+4)    /* Add a multicast forwarding entry     */
-#define MRT_DEL_MFC     (MRT_BASE+5)    /* Delete a multicast forwarding entry  */
-#define MRT_VERSION     (MRT_BASE+6)    /* Get the kernel multicast version     */
-#define MRT_ASSERT      (MRT_BASE+7)    /* Activate PIM assert mode             */
-#define MRT_PIM         (MRT_BASE+8)    /* enable PIM code                      */
-#define MRT_TABLE       (MRT_BASE+9)    /* Specify mroute table ID              */
-
-#define SIOCGETVIFCNT   SIOCPROTOPRIVATE        /* IP protocol privates */
-#define SIOCGETSGCNT    (SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF      (SIOCPROTOPRIVATE+2)
-
-#define MAXVIFS         32      
-typedef unsigned long vifbitmap_t;      /* User mode code depends on this lot */
-typedef unsigned short vifi_t;
-#define ALL_VIFS        ((vifi_t)(-1))
-
-/*
- *      Same idea as select
- */
- 
-#define VIFM_SET(n,m)   ((m)|=(1<<(n)))
-#define VIFM_CLR(n,m)   ((m)&=~(1<<(n)))
-#define VIFM_ISSET(n,m) ((m)&(1<<(n)))
-#define VIFM_CLRALL(m)  ((m)=0)
-#define VIFM_COPY(mfrom,mto)    ((mto)=(mfrom))
-#define VIFM_SAME(m1,m2)        ((m1)==(m2))
-
-/*
- *      Passed by mrouted for an MRT_ADD_VIF - again we use the
- *      mrouted 3.6 structures for compatibility
- */
- 
-struct vifctl {
-        vifi_t  vifc_vifi;              /* Index of VIF */
-        unsigned char vifc_flags;       /* VIFF_ flags */
-        unsigned char vifc_threshold;   /* ttl limit */
-        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
-        union {
-                struct in_addr vifc_lcl_addr;     /* Local interface address */
-                int            vifc_lcl_ifindex;  /* Local interface index   */
-        };
-        struct in_addr vifc_rmt_addr;   /* IPIP tunnel addr */
-};
-
-#define VIFF_TUNNEL             0x1     /* IPIP tunnel */
-#define VIFF_SRCRT              0x2     /* NI */
-#define VIFF_REGISTER           0x4     /* register vif */
-#define VIFF_USE_IFINDEX        0x8     /* use vifc_lcl_ifindex instead of
-                                           vifc_lcl_addr to find an interface */
-
-/*
- *      Cache manipulation structures for mrouted and PIMd
- */
- 
-struct mfcctl {
-        struct in_addr mfcc_origin;             /* Origin of mcast      */
-        struct in_addr mfcc_mcastgrp;           /* Group in question    */
-        vifi_t  mfcc_parent;                    /* Where it arrived     */
-        unsigned char mfcc_ttls[MAXVIFS];       /* Where it is going    */
-        unsigned int mfcc_pkt_cnt;              /* pkt count for src-grp */
-        unsigned int mfcc_byte_cnt;
-        unsigned int mfcc_wrong_if;
-        int          mfcc_expire;
-};
-
-/* 
- *      Group count retrieval for mrouted
- */
- 
-struct sioc_sg_req {
-        struct in_addr src;
-        struct in_addr grp;
-        unsigned long pktcnt;
-        unsigned long bytecnt;
-        unsigned long wrong_if;
-};
-
-/*
- *      To get vif packet counts
- */
-
-struct sioc_vif_req {
-        vifi_t  vifi;           /* Which iface */
-        unsigned long icount;   /* In packets */
-        unsigned long ocount;   /* Out packets */
-        unsigned long ibytes;   /* In bytes */
-        unsigned long obytes;   /* Out bytes */
-};
-
-/*
- *      This is the format the mroute daemon expects to see IGMP control
- *      data. Magically happens to be like an IP packet as per the original
- */
- 
-struct igmpmsg {
-        __u32 unused1,unused2;
-        unsigned char im_msgtype;               /* What is this */
-        unsigned char im_mbz;                   /* Must be zero */
-        unsigned char im_vif;                   /* Interface (this ought to be a vifi_t!) */
-        unsigned char unused3;
-        struct in_addr im_src,im_dst;
-};
-
-/*
- *      That's all usermode folks
- */
-
-#ifdef __KERNEL__
 #include <linux/pim.h>
 #include <net/sock.h>
+#include <uapi/linux/mroute.h>
 
 #ifdef CONFIG_IP_MROUTE
 static inline int ip_mroute_opt(int opt)
@@ -228,24 +100,8 @@ struct mfc_cache {
 #define MFC_HASH(a,b)   ((((__force u32)(__be32)a)^(((__force u32)(__be32)b)>>2))&(MFC_LINES-1))
 #endif          
 
-#endif
-
-
-#define MFC_ASSERT_THRESH (3*HZ)                /* Maximal freq. of asserts */
-
-/*
- *      Pseudo messages used by mrouted
- */
-
-#define IGMPMSG_NOCACHE         1               /* Kern cache fill request to mrouted */
-#define IGMPMSG_WRONGVIF        2               /* For PIM assert processing (unused) */
-#define IGMPMSG_WHOLEPKT        3               /* For PIM Register processing */
-
-#ifdef __KERNEL__
 struct rtmsg;
 extern int ipmr_get_route(struct net *net, struct sk_buff *skb,
                           __be32 saddr, __be32 daddr,
                           struct rtmsg *rtm, int nowait);
 #endif
-
-#endif
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 6d8c7251eb8d..a223561ba12e 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -1,123 +1,11 @@
 #ifndef __LINUX_MROUTE6_H
 #define __LINUX_MROUTE6_H
 
-#include <linux/types.h>
-#include <linux/sockios.h>
-
-/*
- *      Based on the MROUTING 3.5 defines primarily to keep
- *      source compatibility with BSD.
- *
- *      See the pim6sd code for the original history.
- *
- *      Protocol Independent Multicast (PIM) data structures included
- *      Carlos Picoto (cap@di.fc.ul.pt)
- *
- */
-
-#define MRT6_BASE       200
-#define MRT6_INIT       (MRT6_BASE)     /* Activate the kernel mroute code      */
-#define MRT6_DONE       (MRT6_BASE+1)   /* Shutdown the kernel mroute           */
-#define MRT6_ADD_MIF    (MRT6_BASE+2)   /* Add a virtual interface              */
-#define MRT6_DEL_MIF    (MRT6_BASE+3)   /* Delete a virtual interface           */
-#define MRT6_ADD_MFC    (MRT6_BASE+4)   /* Add a multicast forwarding entry     */
-#define MRT6_DEL_MFC    (MRT6_BASE+5)   /* Delete a multicast forwarding entry  */
-#define MRT6_VERSION    (MRT6_BASE+6)   /* Get the kernel multicast version     */
-#define MRT6_ASSERT     (MRT6_BASE+7)   /* Activate PIM assert mode             */
-#define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code                      */
-#define MRT6_TABLE      (MRT6_BASE+9)   /* Specify mroute table ID              */
-
-#define SIOCGETMIFCNT_IN6       SIOCPROTOPRIVATE        /* IP protocol privates */
-#define SIOCGETSGCNT_IN6        (SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF      (SIOCPROTOPRIVATE+2)
-
-#define MAXMIFS         32
-typedef unsigned long mifbitmap_t;      /* User mode code depends on this lot */
-typedef unsigned short mifi_t;
-#define ALL_MIFS        ((mifi_t)(-1))
-
-#ifndef IF_SETSIZE
-#define IF_SETSIZE      256
-#endif
-
-typedef __u32           if_mask;
-#define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
-
-#if !defined(__KERNEL__)
-#if !defined(DIV_ROUND_UP)
-#define DIV_ROUND_UP(x,y)       (((x) + ((y) - 1)) / (y))
-#endif
-#endif
-
-typedef struct if_set {
-        if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
-} if_set;
-
-#define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
-#define IF_CLR(n, p)    ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
-#define IF_ISSET(n, p)  ((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
-#define IF_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
-#define IF_ZERO(p)      bzero(p, sizeof(*(p)))
-
-/*
- *      Passed by mrouted for an MRT_ADD_MIF - again we use the
- *      mrouted 3.6 structures for compatibility
- */
-
-struct mif6ctl {
-        mifi_t  mif6c_mifi;             /* Index of MIF */
-        unsigned char mif6c_flags;      /* MIFF_ flags */
-        unsigned char vifc_threshold;   /* ttl limit */
-        __u16    mif6c_pifi;            /* the index of the physical IF */
-        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
-};
-
-#define MIFF_REGISTER   0x1     /* register vif */
-
-/*
- *      Cache manipulation structures for mrouted and PIMd
- */
-
-struct mf6cctl {
-        struct sockaddr_in6 mf6cc_origin;               /* Origin of mcast      */
-        struct sockaddr_in6 mf6cc_mcastgrp;             /* Group in question    */
-        mifi_t  mf6cc_parent;                   /* Where it arrived     */
-        struct if_set mf6cc_ifset;              /* Where it is going */
-};
-
-/*
- *      Group count retrieval for pim6sd
- */
-
-struct sioc_sg_req6 {
-        struct sockaddr_in6 src;
-        struct sockaddr_in6 grp;
-        unsigned long pktcnt;
-        unsigned long bytecnt;
-        unsigned long wrong_if;
-};
-
-/*
- *      To get vif packet counts
- */
-
-struct sioc_mif_req6 {
-        mifi_t  mifi;           /* Which iface */
-        unsigned long icount;   /* In packets */
-        unsigned long ocount;   /* Out packets */
-        unsigned long ibytes;   /* In bytes */
-        unsigned long obytes;   /* Out bytes */
-};
-
-/*
- *      That's all usermode folks
- */
-
-#ifdef __KERNEL__
 
 #include <linux/pim.h>
 #include <linux/skbuff.h>       /* for struct sk_buff_head */
 #include <net/net_namespace.h>
+#include <uapi/linux/mroute6.h>
 
 #ifdef CONFIG_IPV6_MROUTE
 static inline int ip6_mroute_opt(int opt)
@@ -225,9 +113,6 @@ struct mfc6_cache {
 
 #define MFC_ASSERT_THRESH (3*HZ)                /* Maximal freq. of asserts */
 
-#endif
-
-#ifdef __KERNEL__
 struct rtmsg;
 extern int ip6mr_get_route(struct net *net, struct sk_buff *skb,
                            struct rtmsg *rtm, int nowait);
@@ -246,24 +131,3 @@ static inline int ip6mr_sk_done(struct sock *sk)
 }
 #endif
 #endif
-
-/*
- * Structure used to communicate from kernel to multicast router.
- * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
- * used for IPv4 implementation). This is because this structure will be passed via an
- * IPv6 raw socket, on which an application will only receiver the payload i.e the data after
- * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
- */
-
-struct mrt6msg {
-#define MRT6MSG_NOCACHE         1
-#define MRT6MSG_WRONGMIF        2
-#define MRT6MSG_WHOLEPKT        3               /* used for use level encap */
-        __u8            im6_mbz;                /* must be zero            */
-        __u8            im6_msgtype;            /* what type of message    */
-        __u16           im6_mif;                /* mif rec'd on            */
-        __u32           im6_pad;                /* padding for 64 bit arch */
-        struct in6_addr im6_src, im6_dst;
-};
-
-#endif
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index 11cc2ac67e75..e1b163f912fb 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -1,174 +1,11 @@
 #ifndef _LINUX_MSDOS_FS_H
 #define _LINUX_MSDOS_FS_H
 
-#include <linux/types.h>
-#include <linux/magic.h>
-#include <asm/byteorder.h>
+#include <uapi/linux/msdos_fs.h>
 
-/*
- * The MS-DOS filesystem constants/structures
- */
-
-#define SECTOR_SIZE     512             /* sector size (bytes) */
-#define SECTOR_BITS     9               /* log2(SECTOR_SIZE) */
-#define MSDOS_DPB       (MSDOS_DPS)     /* dir entries per block */
-#define MSDOS_DPB_BITS  4               /* log2(MSDOS_DPB) */
-#define MSDOS_DPS       (SECTOR_SIZE / sizeof(struct msdos_dir_entry))
-#define MSDOS_DPS_BITS  4               /* log2(MSDOS_DPS) */
-#define MSDOS_LONGNAME  256             /* maximum name length */
-#define CF_LE_W(v)      le16_to_cpu(v)
-#define CF_LE_L(v)      le32_to_cpu(v)
-#define CT_LE_W(v)      cpu_to_le16(v)
-#define CT_LE_L(v)      cpu_to_le32(v)
-
-#define MSDOS_ROOT_INO   1      /* The root inode number */
-#define MSDOS_FSINFO_INO 2      /* Used for managing the FSINFO block */
-
-#define MSDOS_DIR_BITS  5       /* log2(sizeof(struct msdos_dir_entry)) */
-
-/* directory limit */
-#define FAT_MAX_DIR_ENTRIES     (65536)
-#define FAT_MAX_DIR_SIZE        (FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS)
-
-#define ATTR_NONE       0       /* no attribute bits */
-#define ATTR_RO         1       /* read-only */
-#define ATTR_HIDDEN     2       /* hidden */
-#define ATTR_SYS        4       /* system */
-#define ATTR_VOLUME     8       /* volume label */
-#define ATTR_DIR        16      /* directory */
-#define ATTR_ARCH       32      /* archived */
-
-/* attribute bits that are copied "as is" */
-#define ATTR_UNUSED     (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
-/* bits that are used by the Windows 95/Windows NT extended FAT */
-#define ATTR_EXT        (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
-
-#define CASE_LOWER_BASE 8       /* base is lower case */
-#define CASE_LOWER_EXT  16      /* extension is lower case */
-
-#define DELETED_FLAG    0xe5    /* marks file as deleted when in name[0] */
-#define IS_FREE(n)      (!*(n) || *(n) == DELETED_FLAG)
-
-#define FAT_LFN_LEN     255     /* maximum long name length */
-#define MSDOS_NAME      11      /* maximum name length */
-#define MSDOS_SLOTS     21      /* max # of slots for short and long names */
-#define MSDOS_DOT       ".          "   /* ".", padded to MSDOS_NAME chars */
-#define MSDOS_DOTDOT    "..         "   /* "..", padded to MSDOS_NAME chars */
-
-#define FAT_FIRST_ENT(s, x)     ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
-        MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
-
-/* start of data cluster's entry (number of reserved clusters) */
-#define FAT_START_ENT   2
-
-/* maximum number of clusters */
-#define MAX_FAT12       0xFF4
-#define MAX_FAT16       0xFFF4
-#define MAX_FAT32       0x0FFFFFF6
-#define MAX_FAT(s)      (MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : \
-        MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12)
-
-/* bad cluster mark */
-#define BAD_FAT12       0xFF7
-#define BAD_FAT16       0xFFF7
-#define BAD_FAT32       0x0FFFFFF7
-
-/* standard EOF */
-#define EOF_FAT12       0xFFF
-#define EOF_FAT16       0xFFFF
-#define EOF_FAT32       0x0FFFFFFF
-
-#define FAT_ENT_FREE    (0)
-#define FAT_ENT_BAD     (BAD_FAT32)
-#define FAT_ENT_EOF     (EOF_FAT32)
-
-#define FAT_FSINFO_SIG1 0x41615252
-#define FAT_FSINFO_SIG2 0x61417272
-#define IS_FSINFO(x)    (le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 \
-                         && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2)
-
-struct __fat_dirent {
-        long            d_ino;
-        __kernel_off_t  d_off;
-        unsigned short  d_reclen;
-        char            d_name[256]; /* We must not include limits.h! */
-};
-
-/*
- * ioctl commands
- */
-#define VFAT_IOCTL_READDIR_BOTH         _IOR('r', 1, struct __fat_dirent[2])
-#define VFAT_IOCTL_READDIR_SHORT        _IOR('r', 2, struct __fat_dirent[2])
-/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
-#define FAT_IOCTL_GET_ATTRIBUTES        _IOR('r', 0x10, __u32)
-#define FAT_IOCTL_SET_ATTRIBUTES        _IOW('r', 0x11, __u32)
-
-struct fat_boot_sector {
-        __u8    ignored[3];     /* Boot strap short or near jump */
-        __u8    system_id[8];   /* Name - can be used to special case
-                                   partition manager volumes */
-        __u8    sector_size[2]; /* bytes per logical sector */
-        __u8    sec_per_clus;   /* sectors/cluster */
-        __le16  reserved;       /* reserved sectors */
-        __u8    fats;           /* number of FATs */
-        __u8    dir_entries[2]; /* root directory entries */
-        __u8    sectors[2];     /* number of sectors */
-        __u8    media;          /* media code */
-        __le16  fat_length;     /* sectors/FAT */
-        __le16  secs_track;     /* sectors per track */
-        __le16  heads;          /* number of heads */
-        __le32  hidden;         /* hidden sectors (unused) */
-        __le32  total_sect;     /* number of sectors (if sectors == 0) */
-
-        /* The following fields are only used by FAT32 */
-        __le32  fat32_length;   /* sectors/FAT */
-        __le16  flags;          /* bit 8: fat mirroring, low 4: active fat */
-        __u8    version[2];     /* major, minor filesystem version */
-        __le32  root_cluster;   /* first cluster in root directory */
-        __le16  info_sector;    /* filesystem info sector */
-        __le16  backup_boot;    /* backup boot sector */
-        __le16  reserved2[6];   /* Unused */
-};
-
-struct fat_boot_fsinfo {
-        __le32   signature1;    /* 0x41615252L */
-        __le32   reserved1[120];        /* Nothing as far as I can tell */
-        __le32   signature2;    /* 0x61417272L */
-        __le32   free_clusters; /* Free cluster count.  -1 if unknown */
-        __le32   next_cluster;  /* Most recently allocated cluster */
-        __le32   reserved2[4];
-};
-
-struct msdos_dir_entry {
-        __u8    name[MSDOS_NAME];/* name and extension */
-        __u8    attr;           /* attribute bits */
-        __u8    lcase;          /* Case for base and extension */
-        __u8    ctime_cs;       /* Creation time, centiseconds (0-199) */
-        __le16  ctime;          /* Creation time */
-        __le16  cdate;          /* Creation date */
-        __le16  adate;          /* Last access date */
-        __le16  starthi;        /* High 16 bits of cluster in FAT32 */
-        __le16  time,date,start;/* time, date and first cluster */
-        __le32  size;           /* file size (in bytes) */
-};
-
-/* Up to 13 characters of the name */
-struct msdos_dir_slot {
-        __u8    id;             /* sequence number for slot */
-        __u8    name0_4[10];    /* first 5 characters in name */
-        __u8    attr;           /* attribute byte */
-        __u8    reserved;       /* always 0 */
-        __u8    alias_checksum; /* checksum for 8.3 alias */
-        __u8    name5_10[12];   /* 6 more characters in name */
-        __le16   start;         /* starting cluster number, 0 in long slots */
-        __u8    name11_12[4];   /* last 2 characters in name */
-};
-
-#ifdef __KERNEL__
 /* media of boot sector */
 static inline int fat_valid_media(u8 media)
 {
         return 0xf8 <= media || media == 0xf0;
 }
-#endif /* !__KERNEL__ */
 #endif /* !_LINUX_MSDOS_FS_H */
diff --git a/include/linux/msg.h b/include/linux/msg.h
index 56abf1558fdd..7a4b9e97d29a 100644
--- a/include/linux/msg.h
+++ b/include/linux/msg.h
@@ -1,78 +1,8 @@
 #ifndef _LINUX_MSG_H
 #define _LINUX_MSG_H
 
-#include <linux/ipc.h>
-
-/* ipcs ctl commands */
-#define MSG_STAT 11
-#define MSG_INFO 12
-
-/* msgrcv options */
-#define MSG_NOERROR     010000  /* no error if message is too big */
-#define MSG_EXCEPT      020000  /* recv any msg except of specified type.*/
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct msqid_ds {
-        struct ipc_perm msg_perm;
-        struct msg *msg_first;          /* first message on queue,unused  */
-        struct msg *msg_last;           /* last message in queue,unused */
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long  msg_lcbytes;     /* Reuse junk fields for 32 bit */
-        unsigned long  msg_lqbytes;     /* ditto */
-        unsigned short msg_cbytes;      /* current number of bytes on queue */
-        unsigned short msg_qnum;        /* number of messages in queue */
-        unsigned short msg_qbytes;      /* max number of bytes on queue */
-        __kernel_ipc_pid_t msg_lspid;   /* pid of last msgsnd */
-        __kernel_ipc_pid_t msg_lrpid;   /* last receive pid */
-};
-
-/* Include the definition of msqid64_ds */
-#include <asm/msgbuf.h>
-
-/* message buffer for msgsnd and msgrcv calls */
-struct msgbuf {
-        long mtype;         /* type of message */
-        char mtext[1];      /* message text */
-};
-
-/* buffer for msgctl calls IPC_INFO, MSG_INFO */
-struct msginfo {
-        int msgpool;
-        int msgmap; 
-        int msgmax; 
-        int msgmnb; 
-        int msgmni; 
-        int msgssz; 
-        int msgtql; 
-        unsigned short  msgseg; 
-};
-
-/*
- * Scaling factor to compute msgmni:
- * the memory dedicated to msg queues (msgmni * msgmnb) should occupy
- * at most 1/MSG_MEM_SCALE of the lowmem (see the formula in ipc/msg.c):
- * up to 8MB       : msgmni = 16 (MSGMNI)
- * 4 GB            : msgmni = 8K
- * more than 16 GB : msgmni = 32K (IPCMNI)
- */
-#define MSG_MEM_SCALE 32
-
-#define MSGMNI    16   /* <= IPCMNI */     /* max # of msg queue identifiers */
-#define MSGMAX  8192   /* <= INT_MAX */   /* max size of message (bytes) */
-#define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
-
-/* unused */
-#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
-#define MSGTQL  MSGMNB            /* number of system message headers */
-#define MSGMAP  MSGMNB            /* number of entries in message map */
-#define MSGSSZ  16                /* message segment size */
-#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
-#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
-
-#ifdef __KERNEL__
 #include <linux/list.h>
+#include <uapi/linux/msg.h>
 
 /* one msg_msg structure for each message */
 struct msg_msg {
@@ -107,6 +37,4 @@ extern long do_msgsnd(int msqid, long mtype, void __user *mtext,
 extern long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
                         size_t msgsz, long msgtyp, int msgflg);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_MSG_H */
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index 650ef352f045..211ff67e8b0d 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -78,8 +78,6 @@ struct nand_bbt_descr {
 #define NAND_BBT_LASTBLOCK      0x00000010
 /* The bbt is at the given page, else we must scan for the bbt */
 #define NAND_BBT_ABSPAGE        0x00000020
-/* The bbt is at the given page, else we must scan for the bbt */
-#define NAND_BBT_SEARCH         0x00000040
 /* bbt is stored per chip on multichip devices */
 #define NAND_BBT_PERCHIP        0x00000080
 /* bbt has a version counter at offset veroffs */
@@ -110,7 +108,10 @@ struct nand_bbt_descr {
  * OOB area. This option is passed to the default bad block table function.
  */
 #define NAND_BBT_USE_FLASH      0x00020000
-/* Do not store flash based bad block table in OOB area; store it in-band */
+/*
+ * Do not store flash based bad block table marker in the OOB area; store it
+ * in-band.
+ */
 #define NAND_BBT_NO_OOB         0x00040000
 /*
  * Do not write new bad block markers to OOB; useful, e.g., when ECC covers
diff --git a/include/linux/mtd/lpc32xx_mlc.h b/include/linux/mtd/lpc32xx_mlc.h
new file mode 100644
index 000000000000..d91b1e35631e
--- /dev/null
+++ b/include/linux/mtd/lpc32xx_mlc.h
@@ -0,0 +1,20 @@
+/*
+ * Platform data for LPC32xx SoC MLC NAND controller
+ *
+ * Copyright © 2012 Roland Stigge
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_MTD_LPC32XX_MLC_H
+#define __LINUX_MTD_LPC32XX_MLC_H
+
+#include <linux/dmaengine.h>
+
+struct lpc32xx_mlc_platform_data {
+        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
+};
+
+#endif  /* __LINUX_MTD_LPC32XX_MLC_H */
diff --git a/include/linux/mtd/lpc32xx_slc.h b/include/linux/mtd/lpc32xx_slc.h
new file mode 100644
index 000000000000..1169548a1535
--- /dev/null
+++ b/include/linux/mtd/lpc32xx_slc.h
@@ -0,0 +1,20 @@
+/*
+ * Platform data for LPC32xx SoC SLC NAND controller
+ *
+ * Copyright © 2012 Roland Stigge
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_MTD_LPC32XX_SLC_H
+#define __LINUX_MTD_LPC32XX_SLC_H
+
+#include <linux/dmaengine.h>
+
+struct lpc32xx_slc_platform_data {
+        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
+};
+
+#endif  /* __LINUX_MTD_LPC32XX_SLC_H */
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 63dadc0dfb62..81d61e704599 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -265,14 +265,7 @@ int mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
 int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
                     const u_char *buf);
 
-static inline int mtd_read_oob(struct mtd_info *mtd, loff_t from,
-                               struct mtd_oob_ops *ops)
-{
-        ops->retlen = ops->oobretlen = 0;
-        if (!mtd->_read_oob)
-                return -EOPNOTSUPP;
-        return mtd->_read_oob(mtd, from, ops);
-}
+int mtd_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops);
 
 static inline int mtd_write_oob(struct mtd_info *mtd, loff_t to,
                                 struct mtd_oob_ops *ops)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 57977c640529..24e915957e4f 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -56,7 +56,7 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
  * is supported now. If you add a chip with bigger oobsize/page
  * adjust this accordingly.
  */
-#define NAND_MAX_OOBSIZE        576
+#define NAND_MAX_OOBSIZE        640
 #define NAND_MAX_PAGESIZE       8192
 
 /*
@@ -92,6 +92,8 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
 #define NAND_CMD_READID         0x90
 #define NAND_CMD_ERASE2         0xd0
 #define NAND_CMD_PARAM          0xec
+#define NAND_CMD_GET_FEATURES   0xee
+#define NAND_CMD_SET_FEATURES   0xef
 #define NAND_CMD_RESET          0xff
 
 #define NAND_CMD_LOCK           0x2a
@@ -185,12 +187,6 @@ typedef enum {
  * This happens with the Renesas AG-AND chips, possibly others.
  */
 #define BBT_AUTO_REFRESH        0x00000080
-/*
- * Chip does not require ready check on read. True
- * for all large page devices, as they do not support
- * autoincrement.
- */
-#define NAND_NO_READRDY         0x00000100
 /* Chip does not allow subpage writes */
 #define NAND_NO_SUBPAGE_WRITE   0x00000200
 
@@ -200,6 +196,9 @@ typedef enum {
 /* Device behaves just like nand, but is readonly */
 #define NAND_ROM                0x00000800
 
+/* Device supports subpage reads */
+#define NAND_SUBPAGE_READ       0x00001000
+
 /* Options valid for Samsung large page devices */
 #define NAND_SAMSUNG_LP_OPTIONS \
         (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK)
@@ -208,12 +207,7 @@ typedef enum {
 #define NAND_MUST_PAD(chip) (!(chip->options & NAND_NO_PADDING))
 #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG))
 #define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK))
-/* Large page NAND with SOFT_ECC should support subpage reads */
-#define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \
-                                        && (chip->page_shift > 9))
-
-/* Mask to zero out the chip options, which come from the id table */
-#define NAND_CHIPOPTIONS_MSK    0x0000ffff
+#define NAND_HAS_SUBPAGE_READ(chip) ((chip->options & NAND_SUBPAGE_READ))
 
 /* Non chip related options */
 /* This option skips the bbt scan during initialization. */
@@ -237,6 +231,21 @@ typedef enum {
 /* Keep gcc happy */
 struct nand_chip;
 
+/* ONFI timing mode, used in both asynchronous and synchronous mode */
+#define ONFI_TIMING_MODE_0              (1 << 0)
+#define ONFI_TIMING_MODE_1              (1 << 1)
+#define ONFI_TIMING_MODE_2              (1 << 2)
+#define ONFI_TIMING_MODE_3              (1 << 3)
+#define ONFI_TIMING_MODE_4              (1 << 4)
+#define ONFI_TIMING_MODE_5              (1 << 5)
+#define ONFI_TIMING_MODE_UNKNOWN        (1 << 6)
+
+/* ONFI feature address */
+#define ONFI_FEATURE_ADDR_TIMING_MODE   0x1
+
+/* ONFI subfeature parameters length */
+#define ONFI_SUBFEATURE_PARAM_LEN       4
+
 struct nand_onfi_params {
         /* rev info and features block */
         /* 'O' 'N' 'F' 'I'  */
@@ -334,8 +343,10 @@ struct nand_hw_control {
  * @read_page_raw:      function to read a raw page without ECC
  * @write_page_raw:     function to write a raw page without ECC
  * @read_page:  function to read a page according to the ECC generator
- *              requirements.
- * @read_subpage:       function to read parts of the page covered by ECC.
+ *              requirements; returns maximum number of bitflips corrected in
+ *              any single ECC step, 0 if bitflips uncorrectable, -EIO hw error
+ * @read_subpage:       function to read parts of the page covered by ECC;
+ *                      returns same as read_page()
  * @write_page: function to write a page according to the ECC generator
  *              requirements.
  * @write_oob_raw:      function to write chip OOB data without ECC
@@ -361,13 +372,13 @@ struct nand_ecc_ctrl {
                         uint8_t *calc_ecc);
         int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
                         uint8_t *buf, int oob_required, int page);
-        void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
+        int (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
                         const uint8_t *buf, int oob_required);
         int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
                         uint8_t *buf, int oob_required, int page);
         int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
                         uint32_t offs, uint32_t len, uint8_t *buf);
-        void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
+        int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
                         const uint8_t *buf, int oob_required);
         int (*write_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
                         int page);
@@ -403,8 +414,6 @@ struct nand_buffers {
  * @read_word:          [REPLACEABLE] read one word from the chip
  * @write_buf:          [REPLACEABLE] write data from the buffer to the chip
  * @read_buf:           [REPLACEABLE] read data from the chip into the buffer
- * @verify_buf:         [REPLACEABLE] verify buffer contents against the chip
- *                      data.
  * @select_chip:        [REPLACEABLE] select chip nr
  * @block_bad:          [REPLACEABLE] check, if the block is bad
  * @block_markbad:      [REPLACEABLE] mark the block bad
@@ -462,6 +471,8 @@ struct nand_buffers {
  *                      non 0 if ONFI supported.
  * @onfi_params:        [INTERN] holds the ONFI page parameter when ONFI is
  *                      supported, 0 otherwise.
+ * @onfi_set_features   [REPLACEABLE] set the features for ONFI nand
+ * @onfi_get_features   [REPLACEABLE] get the features for ONFI nand
  * @ecclayout:          [REPLACEABLE] the default ECC placement scheme
  * @bbt:                [INTERN] bad block table pointer
  * @bbt_td:             [REPLACEABLE] bad block table descriptor for flash
@@ -487,7 +498,6 @@ struct nand_chip {
         u16 (*read_word)(struct mtd_info *mtd);
         void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
         void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
-        int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
         void (*select_chip)(struct mtd_info *mtd, int chip);
         int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);
         int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
@@ -505,6 +515,10 @@ struct nand_chip {
         int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
                         const uint8_t *buf, int oob_required, int page,
                         int cached, int raw);
+        int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
+                        int feature_addr, uint8_t *subfeature_para);
+        int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
+                        int feature_addr, uint8_t *subfeature_para);
 
         int chip_delay;
         unsigned int options;
@@ -559,6 +573,7 @@ struct nand_chip {
 #define NAND_MFR_MICRON         0x2c
 #define NAND_MFR_AMD            0x01
 #define NAND_MFR_MACRONIX       0xc2
+#define NAND_MFR_EON            0x92
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure
@@ -641,6 +656,7 @@ struct platform_device;
  *                      ALE/CLE/nCE. Also used to write command and address
  * @write_buf:          platform specific function for write buffer
  * @read_buf:           platform specific function for read buffer
+ * @read_byte:          platform specific function to read one byte from chip
  * @priv:               private data to transport driver specific settings
  *
  * All fields are optional and depend on the hardware driver requirements
@@ -677,4 +693,20 @@ struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
         return chip->priv;
 }
 
+/* return the supported asynchronous timing mode. */
+static inline int onfi_get_async_timing_mode(struct nand_chip *chip)
+{
+        if (!chip->onfi_version)
+                return ONFI_TIMING_MODE_UNKNOWN;
+        return le16_to_cpu(chip->onfi_params.async_timing_mode);
+}
+
+/* return the supported synchronous timing mode. */
+static inline int onfi_get_sync_timing_mode(struct nand_chip *chip)
+{
+        if (!chip->onfi_version)
+                return ONFI_TIMING_MODE_UNKNOWN;
+        return le16_to_cpu(chip->onfi_params.src_sync_timing_mode);
+}
+
 #endif /* __LINUX_MTD_NAND_H */
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index a38e1fa8af01..01e4b15b280e 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -49,7 +49,6 @@
 #define FLERRADR(f)             (f->reg + 0x98)
 
 /* FLCMNCR control bits */
-#define ECCPOS2         (0x1 << 25)
 #define _4ECCCNTEN      (0x1 << 24)
 #define _4ECCEN         (0x1 << 23)
 #define _4ECCCORRECT    (0x1 << 22)
@@ -59,9 +58,6 @@
 #define QTSEL_E         (0x1 << 17)
 #define ENDIAN          (0x1 << 16)     /* 1 = little endian */
 #define FCKSEL_E        (0x1 << 15)
-#define ECCPOS_00       (0x00 << 12)
-#define ECCPOS_01       (0x01 << 12)
-#define ECCPOS_02       (0x02 << 12)
 #define ACM_SACCES_MODE (0x01 << 10)
 #define NANWF_E         (0x1 << 9)
 #define SE_D            (0x1 << 8)      /* Spare area disable */
@@ -107,6 +103,14 @@
 #define DOCMD2_E        (0x1 << 17)     /* 2nd cmd stage execute */
 #define DOCMD1_E        (0x1 << 16)     /* 1st cmd stage execute */
 
+/* FLINTDMACR control bits */
+#define ESTERINTE       (0x1 << 24)     /* ECC error interrupt enable */
+#define AC1CLR          (0x1 << 19)     /* ECC FIFO clear */
+#define AC0CLR          (0x1 << 18)     /* Data FIFO clear */
+#define ECERB           (0x1 << 9)      /* ECC error */
+#define STERB           (0x1 << 8)      /* Status error */
+#define STERINTE        (0x1 << 4)      /* Status error enable */
+
 /* FLTRCR control bits */
 #define TRSTRT          (0x1 << 0)      /* translation start */
 #define TREND           (0x1 << 1)      /* translation end */
@@ -125,9 +129,15 @@
 #define _4ECCEND        (0x1 << 1)      /* 4 symbols end */
 #define _4ECCEXST       (0x1 << 0)      /* 4 symbols exist */
 
-#define INIT_FL4ECCRESULT_VAL   0x03FF03FF
 #define LOOP_TIMEOUT_MAX        0x00010000
 
+enum flctl_ecc_res_t {
+        FL_SUCCESS,
+        FL_REPAIRABLE,
+        FL_ERROR,
+        FL_TIMEOUT
+};
+
 struct sh_flctl {
         struct mtd_info         mtd;
         struct nand_chip        chip;
@@ -145,8 +155,7 @@ struct sh_flctl {
         uint32_t erase_ADRCNT;          /* bits of FLCMDCR in ERASE1 cmd */
         uint32_t rw_ADRCNT;     /* bits of FLCMDCR in READ WRITE cmd */
         uint32_t flcmncr_base;  /* base value of FLCMNCR */
-
-        int     hwecc_cant_correct[4];
+        uint32_t flintdmacr_base;       /* irq enable bits */
 
         unsigned page_size:1;   /* NAND page size (0 = 512, 1 = 2048) */
         unsigned hwecc:1;       /* Hardware ECC (0 = disabled, 1 = enabled) */
diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h
index 54b8e0d8d916..5d0b2a1dee69 100644
--- a/include/linux/n_r3964.h
+++ b/include/linux/n_r3964.h
@@ -43,15 +43,12 @@
  *
  *
  */
-
 #ifndef __LINUX_N_R3964_H__
 #define __LINUX_N_R3964_H__
 
-/* line disciplines for r3964 protocol */
-
-#ifdef __KERNEL__
 
 #include <linux/param.h>
+#include <uapi/linux/n_r3964.h>
 
 /*
  * Common ascii handshake characters:
@@ -73,32 +70,6 @@
 #define R3964_TO_RX_PANIC ((4000)*HZ/1000)
 #define R3964_MAX_RETRIES 5
 
-#endif
-
-/*
- * Ioctl-commands
- */
-
-#define R3964_ENABLE_SIGNALS      0x5301
-#define R3964_SETPRIORITY         0x5302
-#define R3964_USE_BCC             0x5303
-#define R3964_READ_TELEGRAM       0x5304
-
-/* Options for R3964_SETPRIORITY */
-#define R3964_MASTER   0
-#define R3964_SLAVE    1
-
-/* Options for R3964_ENABLE_SIGNALS */
-#define R3964_SIG_ACK   0x0001
-#define R3964_SIG_DATA  0x0002
-#define R3964_SIG_ALL   0x000f
-#define R3964_SIG_NONE  0x0000
-#define R3964_USE_SIGIO 0x1000
-
-/*
- * r3964 operation states:
- */
-#ifdef __KERNEL__
 
 enum { R3964_IDLE, 
            R3964_TX_REQUEST, R3964_TRANSMITTING, 
@@ -127,29 +98,6 @@ struct r3964_client_info {
 };
 
 
-#endif
-
-/* types for msg_id: */
-enum {R3964_MSG_ACK=1, R3964_MSG_DATA };
-
-#define R3964_MAX_MSG_COUNT 32
-
-/* error codes for client messages */
-#define R3964_OK 0        /* no error. */
-#define R3964_TX_FAIL -1  /* transmission error, block NOT sent */
-#define R3964_OVERFLOW -2 /* msg queue overflow */
-
-/* the client gets this struct when calling read(fd,...): */
-struct r3964_client_message {
-          int     msg_id;
-          int     arg;
-          int     error_code;
-};
-
-#define R3964_MTU      256
-
-
-#ifdef __KERNEL__
 
 struct r3964_block_header;
 
@@ -226,6 +174,4 @@ struct r3964_info {
         int nRetry;
 };
 
-#endif  
-
 #endif
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d146ca10c0f5..4871170a04a0 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -11,40 +11,13 @@
  * 2004/02/19 Paul Clements
  *            Removed PARANOIA, plus various cleanup and comments
  */
-
 #ifndef LINUX_NBD_H
 #define LINUX_NBD_H
 
-#include <linux/types.h>
-
-#define NBD_SET_SOCK    _IO( 0xab, 0 )
-#define NBD_SET_BLKSIZE _IO( 0xab, 1 )
-#define NBD_SET_SIZE    _IO( 0xab, 2 )
-#define NBD_DO_IT       _IO( 0xab, 3 )
-#define NBD_CLEAR_SOCK  _IO( 0xab, 4 )
-#define NBD_CLEAR_QUE   _IO( 0xab, 5 )
-#define NBD_PRINT_DEBUG _IO( 0xab, 6 )
-#define NBD_SET_SIZE_BLOCKS     _IO( 0xab, 7 )
-#define NBD_DISCONNECT  _IO( 0xab, 8 )
-#define NBD_SET_TIMEOUT _IO( 0xab, 9 )
-
-enum {
-        NBD_CMD_READ = 0,
-        NBD_CMD_WRITE = 1,
-        NBD_CMD_DISC = 2
-};
-
-#define nbd_cmd(req) ((req)->cmd[0])
-
-/* userspace doesn't need the nbd_device structure */
-#ifdef __KERNEL__
 
 #include <linux/wait.h>
 #include <linux/mutex.h>
-
-/* values for flags field */
-#define NBD_READ_ONLY 0x0001
-#define NBD_WRITE_NOCHK 0x0002
+#include <uapi/linux/nbd.h>
 
 struct request;
 
@@ -71,32 +44,3 @@ struct nbd_device {
 };
 
 #endif
-
-/* These are sent over the network in the request/reply magic fields */
-
-#define NBD_REQUEST_MAGIC 0x25609513
-#define NBD_REPLY_MAGIC 0x67446698
-/* Do *not* use magics: 0x12560953 0x96744668. */
-
-/*
- * This is the packet used for communication between client and
- * server. All data are in network byte order.
- */
-struct nbd_request {
-        __be32 magic;
-        __be32 type;    /* == READ || == WRITE  */
-        char handle[8];
-        __be64 from;
-        __be32 len;
-} __attribute__((packed));
-
-/*
- * This is the reply packet that nbd-server sends back to the client after
- * it has completed an I/O request (or an error occurs).
- */
-struct nbd_reply {
-        __be32 magic;
-        __be32 error;           /* 0 = ok, else error   */
-        char handle[8];         /* handle you got from request  */
-};
-#endif
diff --git a/include/linux/net.h b/include/linux/net.h
index 6ab31cabef7c..aa1673160a45 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -18,49 +18,13 @@
 #ifndef _LINUX_NET_H
 #define _LINUX_NET_H
 
-#include <linux/socket.h>
-#include <asm/socket.h>
-
-#define NPROTO          AF_MAX
-
-#define SYS_SOCKET      1               /* sys_socket(2)                */
-#define SYS_BIND        2               /* sys_bind(2)                  */
-#define SYS_CONNECT     3               /* sys_connect(2)               */
-#define SYS_LISTEN      4               /* sys_listen(2)                */
-#define SYS_ACCEPT      5               /* sys_accept(2)                */
-#define SYS_GETSOCKNAME 6               /* sys_getsockname(2)           */
-#define SYS_GETPEERNAME 7               /* sys_getpeername(2)           */
-#define SYS_SOCKETPAIR  8               /* sys_socketpair(2)            */
-#define SYS_SEND        9               /* sys_send(2)                  */
-#define SYS_RECV        10              /* sys_recv(2)                  */
-#define SYS_SENDTO      11              /* sys_sendto(2)                */
-#define SYS_RECVFROM    12              /* sys_recvfrom(2)              */
-#define SYS_SHUTDOWN    13              /* sys_shutdown(2)              */
-#define SYS_SETSOCKOPT  14              /* sys_setsockopt(2)            */
-#define SYS_GETSOCKOPT  15              /* sys_getsockopt(2)            */
-#define SYS_SENDMSG     16              /* sys_sendmsg(2)               */
-#define SYS_RECVMSG     17              /* sys_recvmsg(2)               */
-#define SYS_ACCEPT4     18              /* sys_accept4(2)               */
-#define SYS_RECVMMSG    19              /* sys_recvmmsg(2)              */
-#define SYS_SENDMMSG    20              /* sys_sendmmsg(2)              */
-
-typedef enum {
-        SS_FREE = 0,                    /* not allocated                */
-        SS_UNCONNECTED,                 /* unconnected to any socket    */
-        SS_CONNECTING,                  /* in process of connecting     */
-        SS_CONNECTED,                   /* connected to socket          */
-        SS_DISCONNECTING                /* in process of disconnecting  */
-} socket_state;
-
-#define __SO_ACCEPTCON  (1 << 16)       /* performed a listen           */
-
-#ifdef __KERNEL__
 #include <linux/stringify.h>
 #include <linux/random.h>
 #include <linux/wait.h>
 #include <linux/fcntl.h>        /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/kmemcheck.h>
 #include <linux/rcupdate.h>
+#include <uapi/linux/net.h>
 
 struct poll_table_struct;
 struct pipe_inode_info;
@@ -319,5 +283,4 @@ extern int kernel_sock_shutdown(struct socket *sock,
 #define MODULE_ALIAS_NET_PF_PROTO_NAME(pf, proto, name) \
         MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
                      name)
-#endif /* __KERNEL__ */
 #endif  /* _LINUX_NET_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 01646aa53b0e..f8eda0276f03 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -25,12 +25,6 @@
 #ifndef _LINUX_NETDEVICE_H
 #define _LINUX_NETDEVICE_H
 
-#include <linux/if.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-#include <linux/if_link.h>
-
-#ifdef __KERNEL__
 #include <linux/pm_qos.h>
 #include <linux/timer.h>
 #include <linux/bug.h>
@@ -55,6 +49,7 @@
 
 #include <linux/netdev_features.h>
 #include <linux/neighbour.h>
+#include <uapi/linux/netdevice.h>
 
 struct netpoll_info;
 struct device;
@@ -133,14 +128,6 @@ static inline bool dev_xmit_complete(int rc)
         return false;
 }
 
-#endif
-
-#define MAX_ADDR_LEN    32              /* Largest hardware address length */
-
-/* Initial net device group. All devices belong to group 0 by default. */
-#define INIT_NETDEV_GROUP       0
-
-#ifdef  __KERNEL__
 /*
  *      Compute the worst case header length according to the protocols
  *      used.
@@ -196,21 +183,6 @@ struct net_device_stats {
         unsigned long   tx_compressed;
 };
 
-#endif  /*  __KERNEL__  */
-
-
-/* Media selection options. */
-enum {
-        IF_PORT_UNKNOWN = 0,
-        IF_PORT_10BASE2,
-        IF_PORT_10BASET,
-        IF_PORT_AUI,
-        IF_PORT_100BASET,
-        IF_PORT_100BASETX,
-        IF_PORT_100BASEFX
-};
-
-#ifdef __KERNEL__
 
 #include <linux/cache.h>
 #include <linux/skbuff.h>
@@ -1497,19 +1469,25 @@ struct napi_gro_cb {
         /* This indicates where we are processing relative to skb->data. */
         int data_offset;
 
-        /* This is non-zero if the packet may be of the same flow. */
-        int same_flow;
-
         /* This is non-zero if the packet cannot be merged with the new skb. */
         int flush;
 
         /* Number of segments aggregated. */
-        int count;
+        u16     count;
+
+        /* This is non-zero if the packet may be of the same flow. */
+        u8      same_flow;
 
         /* Free the skb? */
-        int free;
+        u8      free;
 #define NAPI_GRO_FREE             1
 #define NAPI_GRO_FREE_STOLEN_HEAD 2
+
+        /* jiffies when first packet was created/queued */
+        unsigned long age;
+
+        /* Used in ipv6_gro_receive() */
+        int     proto;
 };
 
 #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
@@ -1663,7 +1641,6 @@ extern int		netpoll_trap(void);
 #endif
 extern int             skb_gro_receive(struct sk_buff **head,
                                        struct sk_buff *skb);
-extern void            skb_gro_reset_offset(struct sk_buff *skb);
 
 static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
 {
@@ -2157,7 +2134,7 @@ extern gro_result_t	dev_gro_receive(struct napi_struct *napi,
 extern gro_result_t     napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
 extern gro_result_t     napi_gro_receive(struct napi_struct *napi,
                                          struct sk_buff *skb);
-extern void             napi_gro_flush(struct napi_struct *napi);
+extern void             napi_gro_flush(struct napi_struct *napi, bool flush_old);
 extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
 extern gro_result_t     napi_frags_finish(struct napi_struct *napi,
                                           struct sk_buff *skb,
@@ -2839,6 +2816,4 @@ do {								\
 })
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif  /* _LINUX_NETDEVICE_H */
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 1dcf2a38e51f..ee142846f56a 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -1,7 +1,6 @@
 #ifndef __LINUX_NETFILTER_H
 #define __LINUX_NETFILTER_H
 
-#ifdef __KERNEL__
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/net.h>
@@ -10,75 +9,7 @@
 #include <linux/in6.h>
 #include <linux/wait.h>
 #include <linux/list.h>
-#endif
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/sysctl.h>
-
-/* Responses from hook functions. */
-#define NF_DROP 0
-#define NF_ACCEPT 1
-#define NF_STOLEN 2
-#define NF_QUEUE 3
-#define NF_REPEAT 4
-#define NF_STOP 5
-#define NF_MAX_VERDICT NF_STOP
-
-/* we overload the higher bits for encoding auxiliary data such as the queue
- * number or errno values. Not nice, but better than additional function
- * arguments. */
-#define NF_VERDICT_MASK 0x000000ff
-
-/* extra verdict flags have mask 0x0000ff00 */
-#define NF_VERDICT_FLAG_QUEUE_BYPASS    0x00008000
-
-/* queue number (NF_QUEUE) or errno (NF_DROP) */
-#define NF_VERDICT_QMASK 0xffff0000
-#define NF_VERDICT_QBITS 16
-
-#define NF_QUEUE_NR(x) ((((x) << 16) & NF_VERDICT_QMASK) | NF_QUEUE)
-
-#define NF_DROP_ERR(x) (((-x) << 16) | NF_DROP)
-
-/* only for userspace compatibility */
-#ifndef __KERNEL__
-/* Generic cache responses from hook functions.
-   <= 0x2000 is used for protocol-flags. */
-#define NFC_UNKNOWN 0x4000
-#define NFC_ALTERED 0x8000
-
-/* NF_VERDICT_BITS should be 8 now, but userspace might break if this changes */
-#define NF_VERDICT_BITS 16
-#endif
-
-enum nf_inet_hooks {
-        NF_INET_PRE_ROUTING,
-        NF_INET_LOCAL_IN,
-        NF_INET_FORWARD,
-        NF_INET_LOCAL_OUT,
-        NF_INET_POST_ROUTING,
-        NF_INET_NUMHOOKS
-};
-
-enum {
-        NFPROTO_UNSPEC =  0,
-        NFPROTO_IPV4   =  2,
-        NFPROTO_ARP    =  3,
-        NFPROTO_BRIDGE =  7,
-        NFPROTO_IPV6   = 10,
-        NFPROTO_DECNET = 12,
-        NFPROTO_NUMPROTO,
-};
-
-union nf_inet_addr {
-        __u32           all[4];
-        __be32          ip;
-        __be32          ip6[4];
-        struct in_addr  in;
-        struct in6_addr in6;
-};
-
-#ifdef __KERNEL__
+#include <uapi/linux/netfilter.h>
 #ifdef CONFIG_NETFILTER
 static inline int NF_DROP_GETERR(int verdict)
 {
@@ -411,5 +342,4 @@ extern struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook;
 static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}
 #endif
 
-#endif /*__KERNEL__*/
 #endif /*__LINUX_NETFILTER_H*/
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
deleted file mode 100644
index 874ae8f2706b..000000000000
--- a/include/linux/netfilter/Kbuild
+++ /dev/null
@@ -1,78 +0,0 @@
-header-y += ipset/
-
-header-y += nf_conntrack_common.h
-header-y += nf_conntrack_ftp.h
-header-y += nf_conntrack_sctp.h
-header-y += nf_conntrack_tcp.h
-header-y += nf_conntrack_tuple_common.h
-header-y += nf_nat.h
-header-y += nfnetlink.h
-header-y += nfnetlink_acct.h
-header-y += nfnetlink_compat.h
-header-y += nfnetlink_conntrack.h
-header-y += nfnetlink_cthelper.h
-header-y += nfnetlink_cttimeout.h
-header-y += nfnetlink_log.h
-header-y += nfnetlink_queue.h
-header-y += x_tables.h
-header-y += xt_AUDIT.h
-header-y += xt_CHECKSUM.h
-header-y += xt_CLASSIFY.h
-header-y += xt_CONNMARK.h
-header-y += xt_CONNSECMARK.h
-header-y += xt_CT.h
-header-y += xt_DSCP.h
-header-y += xt_IDLETIMER.h
-header-y += xt_LED.h
-header-y += xt_LOG.h
-header-y += xt_MARK.h
-header-y += xt_nfacct.h
-header-y += xt_NFLOG.h
-header-y += xt_NFQUEUE.h
-header-y += xt_RATEEST.h
-header-y += xt_SECMARK.h
-header-y += xt_TCPMSS.h
-header-y += xt_TCPOPTSTRIP.h
-header-y += xt_TEE.h
-header-y += xt_TPROXY.h
-header-y += xt_addrtype.h
-header-y += xt_cluster.h
-header-y += xt_comment.h
-header-y += xt_connbytes.h
-header-y += xt_connlimit.h
-header-y += xt_connmark.h
-header-y += xt_conntrack.h
-header-y += xt_cpu.h
-header-y += xt_dccp.h
-header-y += xt_devgroup.h
-header-y += xt_dscp.h
-header-y += xt_ecn.h
-header-y += xt_esp.h
-header-y += xt_hashlimit.h
-header-y += xt_helper.h
-header-y += xt_iprange.h
-header-y += xt_ipvs.h
-header-y += xt_length.h
-header-y += xt_limit.h
-header-y += xt_mac.h
-header-y += xt_mark.h
-header-y += xt_multiport.h
-header-y += xt_osf.h
-header-y += xt_owner.h
-header-y += xt_physdev.h
-header-y += xt_pkttype.h
-header-y += xt_policy.h
-header-y += xt_quota.h
-header-y += xt_rateest.h
-header-y += xt_realm.h
-header-y += xt_recent.h
-header-y += xt_set.h
-header-y += xt_sctp.h
-header-y += xt_socket.h
-header-y += xt_state.h
-header-y += xt_statistic.h
-header-y += xt_string.h
-header-y += xt_tcpmss.h
-header-y += xt_tcpudp.h
-header-y += xt_time.h
-header-y += xt_u32.h
diff --git a/include/linux/netfilter/ipset/Kbuild b/include/linux/netfilter/ipset/Kbuild
deleted file mode 100644
index 601fe71d34d5..000000000000
--- a/include/linux/netfilter/ipset/Kbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-header-y += ip_set.h
-header-y += ip_set_bitmap.h
-header-y += ip_set_hash.h
-header-y += ip_set_list.h
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 528697b3c152..7958e84a65af 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -1,6 +1,3 @@
-#ifndef _IP_SET_H
-#define _IP_SET_H
-
 /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
  *                         Patrick Schaaf <bof@bof.de>
  *                         Martin Josefsson <gandalf@wlug.westbo.se>
@@ -10,199 +7,9 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#ifndef _IP_SET_H
+#define _IP_SET_H
 
-#include <linux/types.h>
-
-/* The protocol version */
-#define IPSET_PROTOCOL          6
-
-/* The max length of strings including NUL: set and type identifiers */
-#define IPSET_MAXNAMELEN        32
-
-/* Message types and commands */
-enum ipset_cmd {
-        IPSET_CMD_NONE,
-        IPSET_CMD_PROTOCOL,     /* 1: Return protocol version */
-        IPSET_CMD_CREATE,       /* 2: Create a new (empty) set */
-        IPSET_CMD_DESTROY,      /* 3: Destroy a (empty) set */
-        IPSET_CMD_FLUSH,        /* 4: Remove all elements from a set */
-        IPSET_CMD_RENAME,       /* 5: Rename a set */
-        IPSET_CMD_SWAP,         /* 6: Swap two sets */
-        IPSET_CMD_LIST,         /* 7: List sets */
-        IPSET_CMD_SAVE,         /* 8: Save sets */
-        IPSET_CMD_ADD,          /* 9: Add an element to a set */
-        IPSET_CMD_DEL,          /* 10: Delete an element from a set */
-        IPSET_CMD_TEST,         /* 11: Test an element in a set */
-        IPSET_CMD_HEADER,       /* 12: Get set header data only */
-        IPSET_CMD_TYPE,         /* 13: Get set type */
-        IPSET_MSG_MAX,          /* Netlink message commands */
-
-        /* Commands in userspace: */
-        IPSET_CMD_RESTORE = IPSET_MSG_MAX, /* 14: Enter restore mode */
-        IPSET_CMD_HELP,         /* 15: Get help */
-        IPSET_CMD_VERSION,      /* 16: Get program version */
-        IPSET_CMD_QUIT,         /* 17: Quit from interactive mode */
-
-        IPSET_CMD_MAX,
-
-        IPSET_CMD_COMMIT = IPSET_CMD_MAX, /* 18: Commit buffered commands */
-};
-
-/* Attributes at command level */
-enum {
-        IPSET_ATTR_UNSPEC,
-        IPSET_ATTR_PROTOCOL,    /* 1: Protocol version */
-        IPSET_ATTR_SETNAME,     /* 2: Name of the set */
-        IPSET_ATTR_TYPENAME,    /* 3: Typename */
-        IPSET_ATTR_SETNAME2 = IPSET_ATTR_TYPENAME, /* Setname at rename/swap */
-        IPSET_ATTR_REVISION,    /* 4: Settype revision */
-        IPSET_ATTR_FAMILY,      /* 5: Settype family */
-        IPSET_ATTR_FLAGS,       /* 6: Flags at command level */
-        IPSET_ATTR_DATA,        /* 7: Nested attributes */
-        IPSET_ATTR_ADT,         /* 8: Multiple data containers */
-        IPSET_ATTR_LINENO,      /* 9: Restore lineno */
-        IPSET_ATTR_PROTOCOL_MIN, /* 10: Minimal supported version number */
-        IPSET_ATTR_REVISION_MIN = IPSET_ATTR_PROTOCOL_MIN, /* type rev min */
-        __IPSET_ATTR_CMD_MAX,
-};
-#define IPSET_ATTR_CMD_MAX      (__IPSET_ATTR_CMD_MAX - 1)
-
-/* CADT specific attributes */
-enum {
-        IPSET_ATTR_IP = IPSET_ATTR_UNSPEC + 1,
-        IPSET_ATTR_IP_FROM = IPSET_ATTR_IP,
-        IPSET_ATTR_IP_TO,       /* 2 */
-        IPSET_ATTR_CIDR,        /* 3 */
-        IPSET_ATTR_PORT,        /* 4 */
-        IPSET_ATTR_PORT_FROM = IPSET_ATTR_PORT,
-        IPSET_ATTR_PORT_TO,     /* 5 */
-        IPSET_ATTR_TIMEOUT,     /* 6 */
-        IPSET_ATTR_PROTO,       /* 7 */
-        IPSET_ATTR_CADT_FLAGS,  /* 8 */
-        IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO,     /* 9 */
-        /* Reserve empty slots */
-        IPSET_ATTR_CADT_MAX = 16,
-        /* Create-only specific attributes */
-        IPSET_ATTR_GC,
-        IPSET_ATTR_HASHSIZE,
-        IPSET_ATTR_MAXELEM,
-        IPSET_ATTR_NETMASK,
-        IPSET_ATTR_PROBES,
-        IPSET_ATTR_RESIZE,
-        IPSET_ATTR_SIZE,
-        /* Kernel-only */
-        IPSET_ATTR_ELEMENTS,
-        IPSET_ATTR_REFERENCES,
-        IPSET_ATTR_MEMSIZE,
-
-        __IPSET_ATTR_CREATE_MAX,
-};
-#define IPSET_ATTR_CREATE_MAX   (__IPSET_ATTR_CREATE_MAX - 1)
-
-/* ADT specific attributes */
-enum {
-        IPSET_ATTR_ETHER = IPSET_ATTR_CADT_MAX + 1,
-        IPSET_ATTR_NAME,
-        IPSET_ATTR_NAMEREF,
-        IPSET_ATTR_IP2,
-        IPSET_ATTR_CIDR2,
-        IPSET_ATTR_IP2_TO,
-        IPSET_ATTR_IFACE,
-        __IPSET_ATTR_ADT_MAX,
-};
-#define IPSET_ATTR_ADT_MAX      (__IPSET_ATTR_ADT_MAX - 1)
-
-/* IP specific attributes */
-enum {
-        IPSET_ATTR_IPADDR_IPV4 = IPSET_ATTR_UNSPEC + 1,
-        IPSET_ATTR_IPADDR_IPV6,
-        __IPSET_ATTR_IPADDR_MAX,
-};
-#define IPSET_ATTR_IPADDR_MAX   (__IPSET_ATTR_IPADDR_MAX - 1)
-
-/* Error codes */
-enum ipset_errno {
-        IPSET_ERR_PRIVATE = 4096,
-        IPSET_ERR_PROTOCOL,
-        IPSET_ERR_FIND_TYPE,
-        IPSET_ERR_MAX_SETS,
-        IPSET_ERR_BUSY,
-        IPSET_ERR_EXIST_SETNAME2,
-        IPSET_ERR_TYPE_MISMATCH,
-        IPSET_ERR_EXIST,
-        IPSET_ERR_INVALID_CIDR,
-        IPSET_ERR_INVALID_NETMASK,
-        IPSET_ERR_INVALID_FAMILY,
-        IPSET_ERR_TIMEOUT,
-        IPSET_ERR_REFERENCED,
-        IPSET_ERR_IPADDR_IPV4,
-        IPSET_ERR_IPADDR_IPV6,
-
-        /* Type specific error codes */
-        IPSET_ERR_TYPE_SPECIFIC = 4352,
-};
-
-/* Flags at command level */
-enum ipset_cmd_flags {
-        IPSET_FLAG_BIT_EXIST    = 0,
-        IPSET_FLAG_EXIST        = (1 << IPSET_FLAG_BIT_EXIST),
-        IPSET_FLAG_BIT_LIST_SETNAME = 1,
-        IPSET_FLAG_LIST_SETNAME = (1 << IPSET_FLAG_BIT_LIST_SETNAME),
-        IPSET_FLAG_BIT_LIST_HEADER = 2,
-        IPSET_FLAG_LIST_HEADER  = (1 << IPSET_FLAG_BIT_LIST_HEADER),
-        IPSET_FLAG_CMD_MAX = 15,        /* Lower half */
-};
-
-/* Flags at CADT attribute level */
-enum ipset_cadt_flags {
-        IPSET_FLAG_BIT_BEFORE   = 0,
-        IPSET_FLAG_BEFORE       = (1 << IPSET_FLAG_BIT_BEFORE),
-        IPSET_FLAG_BIT_PHYSDEV  = 1,
-        IPSET_FLAG_PHYSDEV      = (1 << IPSET_FLAG_BIT_PHYSDEV),
-        IPSET_FLAG_BIT_NOMATCH  = 2,
-        IPSET_FLAG_NOMATCH      = (1 << IPSET_FLAG_BIT_NOMATCH),
-        IPSET_FLAG_CADT_MAX     = 15,   /* Upper half */
-};
-
-/* Commands with settype-specific attributes */
-enum ipset_adt {
-        IPSET_ADD,
-        IPSET_DEL,
-        IPSET_TEST,
-        IPSET_ADT_MAX,
-        IPSET_CREATE = IPSET_ADT_MAX,
-        IPSET_CADT_MAX,
-};
-
-/* Sets are identified by an index in kernel space. Tweak with ip_set_id_t
- * and IPSET_INVALID_ID if you want to increase the max number of sets.
- */
-typedef __u16 ip_set_id_t;
-
-#define IPSET_INVALID_ID                65535
-
-enum ip_set_dim {
-        IPSET_DIM_ZERO = 0,
-        IPSET_DIM_ONE,
-        IPSET_DIM_TWO,
-        IPSET_DIM_THREE,
-        /* Max dimension in elements.
-         * If changed, new revision of iptables match/target is required.
-         */
-        IPSET_DIM_MAX = 6,
-        IPSET_BIT_RETURN_NOMATCH = 7,
-};
-
-/* Option flags for kernel operations */
-enum ip_set_kopt {
-        IPSET_INV_MATCH = (1 << IPSET_DIM_ZERO),
-        IPSET_DIM_ONE_SRC = (1 << IPSET_DIM_ONE),
-        IPSET_DIM_TWO_SRC = (1 << IPSET_DIM_TWO),
-        IPSET_DIM_THREE_SRC = (1 << IPSET_DIM_THREE),
-        IPSET_RETURN_NOMATCH = (1 << IPSET_BIT_RETURN_NOMATCH),
-};
-
-#ifdef __KERNEL__
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/netlink.h>
@@ -211,6 +18,7 @@ enum ip_set_kopt {
 #include <linux/stringify.h>
 #include <linux/vmalloc.h>
 #include <net/netlink.h>
+#include <uapi/linux/netfilter/ipset/ip_set.h>
 
 #define _IP_SET_MODULE_DESC(a, b, c)            \
         MODULE_DESCRIPTION(a " type of IP sets, revisions " b "-" c)
@@ -476,31 +284,4 @@ bitmap_bytes(u32 a, u32 b)
         return 4 * ((((b - a + 8) / 8) + 3) / 4);
 }
 
-#endif /* __KERNEL__ */
-
-/* Interface to iptables/ip6tables */
-
-#define SO_IP_SET               83
-
-union ip_set_name_index {
-        char name[IPSET_MAXNAMELEN];
-        ip_set_id_t index;
-};
-
-#define IP_SET_OP_GET_BYNAME    0x00000006      /* Get set index by name */
-struct ip_set_req_get_set {
-        unsigned int op;
-        unsigned int version;
-        union ip_set_name_index set;
-};
-
-#define IP_SET_OP_GET_BYINDEX   0x00000007      /* Get set name by index */
-/* Uses ip_set_req_get_set */
-
-#define IP_SET_OP_VERSION       0x00000100      /* Ask kernel version */
-struct ip_set_req_version {
-        unsigned int op;
-        unsigned int version;
-};
-
 #endif /*_IP_SET_H */
diff --git a/include/linux/netfilter/ipset/ip_set_bitmap.h b/include/linux/netfilter/ipset/ip_set_bitmap.h
index 61a9e8746c83..1a30646d5be8 100644
--- a/include/linux/netfilter/ipset/ip_set_bitmap.h
+++ b/include/linux/netfilter/ipset/ip_set_bitmap.h
@@ -1,15 +1,8 @@
 #ifndef __IP_SET_BITMAP_H
 #define __IP_SET_BITMAP_H
 
-/* Bitmap type specific error codes */
-enum {
-        /* The element is out of the range of the set */
-        IPSET_ERR_BITMAP_RANGE = IPSET_ERR_TYPE_SPECIFIC,
-        /* The range exceeds the size limit of the set type */
-        IPSET_ERR_BITMAP_RANGE_SIZE,
-};
+#include <uapi/linux/netfilter/ipset/ip_set_bitmap.h>
 
-#ifdef __KERNEL__
 #define IPSET_BITMAP_MAX_RANGE  0x0000FFFF
 
 /* Common functions */
@@ -26,6 +19,4 @@ range_to_mask(u32 from, u32 to, u8 *bits)
         return mask;
 }
 
-#endif /* __KERNEL__ */
-
 #endif /* __IP_SET_BITMAP_H */
diff --git a/include/linux/netfilter/ipset/ip_set_hash.h b/include/linux/netfilter/ipset/ip_set_hash.h
index e2a9fae767f6..f98ddfb094cb 100644
--- a/include/linux/netfilter/ipset/ip_set_hash.h
+++ b/include/linux/netfilter/ipset/ip_set_hash.h
@@ -1,23 +1,8 @@
 #ifndef __IP_SET_HASH_H
 #define __IP_SET_HASH_H
 
-/* Hash type specific error codes */
-enum {
-        /* Hash is full */
-        IPSET_ERR_HASH_FULL = IPSET_ERR_TYPE_SPECIFIC,
-        /* Null-valued element */
-        IPSET_ERR_HASH_ELEM,
-        /* Invalid protocol */
-        IPSET_ERR_INVALID_PROTO,
-        /* Protocol missing but must be specified */
-        IPSET_ERR_MISSING_PROTO,
-        /* Range not supported */
-        IPSET_ERR_HASH_RANGE_UNSUPPORTED,
-        /* Invalid range */
-        IPSET_ERR_HASH_RANGE,
-};
+#include <uapi/linux/netfilter/ipset/ip_set_hash.h>
 
-#ifdef __KERNEL__
 
 #define IPSET_DEFAULT_HASHSIZE          1024
 #define IPSET_MIMINAL_HASHSIZE          64
@@ -25,6 +10,4 @@ enum {
 #define IPSET_DEFAULT_PROBES            4
 #define IPSET_DEFAULT_RESIZE            100
 
-#endif /* __KERNEL__ */
-
 #endif /* __IP_SET_HASH_H */
diff --git a/include/linux/netfilter/ipset/ip_set_list.h b/include/linux/netfilter/ipset/ip_set_list.h
index 40a63f302613..68c2aea897f5 100644
--- a/include/linux/netfilter/ipset/ip_set_list.h
+++ b/include/linux/netfilter/ipset/ip_set_list.h
@@ -1,27 +1,10 @@
 #ifndef __IP_SET_LIST_H
 #define __IP_SET_LIST_H
 
-/* List type specific error codes */
-enum {
-        /* Set name to be added/deleted/tested does not exist. */
-        IPSET_ERR_NAME = IPSET_ERR_TYPE_SPECIFIC,
-        /* list:set type is not permitted to add */
-        IPSET_ERR_LOOP,
-        /* Missing reference set */
-        IPSET_ERR_BEFORE,
-        /* Reference set does not exist */
-        IPSET_ERR_NAMEREF,
-        /* Set is full */
-        IPSET_ERR_LIST_FULL,
-        /* Reference set is not added to the set */
-        IPSET_ERR_REF_EXIST,
-};
+#include <uapi/linux/netfilter/ipset/ip_set_list.h>
 
-#ifdef __KERNEL__
 
 #define IP_SET_LIST_DEFAULT_SIZE        8
 #define IP_SET_LIST_MIN_SIZE            4
 
-#endif /* __KERNEL__ */
-
 #endif /* __IP_SET_LIST_H */
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index d146872a0b91..127d0b90604f 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -1,119 +1,8 @@
 #ifndef _NF_CONNTRACK_COMMON_H
 #define _NF_CONNTRACK_COMMON_H
-/* Connection state tracking for netfilter.  This is separated from,
-   but required by, the NAT layer; it can also be used by an iptables
-   extension. */
-enum ip_conntrack_info {
-        /* Part of an established connection (either direction). */
-        IP_CT_ESTABLISHED,
 
-        /* Like NEW, but related to an existing connection, or ICMP error
-           (in either direction). */
-        IP_CT_RELATED,
+#include <uapi/linux/netfilter/nf_conntrack_common.h>
 
-        /* Started a new connection to track (only
-           IP_CT_DIR_ORIGINAL); may be a retransmission. */
-        IP_CT_NEW,
-
-        /* >= this indicates reply direction */
-        IP_CT_IS_REPLY,
-
-        IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,
-        IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,
-        IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,   
-        /* Number of distinct IP_CT types (no NEW in reply dirn). */
-        IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
-};
-
-/* Bitset representing status of connection. */
-enum ip_conntrack_status {
-        /* It's an expected connection: bit 0 set.  This bit never changed */
-        IPS_EXPECTED_BIT = 0,
-        IPS_EXPECTED = (1 << IPS_EXPECTED_BIT),
-
-        /* We've seen packets both ways: bit 1 set.  Can be set, not unset. */
-        IPS_SEEN_REPLY_BIT = 1,
-        IPS_SEEN_REPLY = (1 << IPS_SEEN_REPLY_BIT),
-
-        /* Conntrack should never be early-expired. */
-        IPS_ASSURED_BIT = 2,
-        IPS_ASSURED = (1 << IPS_ASSURED_BIT),
-
-        /* Connection is confirmed: originating packet has left box */
-        IPS_CONFIRMED_BIT = 3,
-        IPS_CONFIRMED = (1 << IPS_CONFIRMED_BIT),
-
-        /* Connection needs src nat in orig dir.  This bit never changed. */
-        IPS_SRC_NAT_BIT = 4,
-        IPS_SRC_NAT = (1 << IPS_SRC_NAT_BIT),
-
-        /* Connection needs dst nat in orig dir.  This bit never changed. */
-        IPS_DST_NAT_BIT = 5,
-        IPS_DST_NAT = (1 << IPS_DST_NAT_BIT),
-
-        /* Both together. */
-        IPS_NAT_MASK = (IPS_DST_NAT | IPS_SRC_NAT),
-
-        /* Connection needs TCP sequence adjusted. */
-        IPS_SEQ_ADJUST_BIT = 6,
-        IPS_SEQ_ADJUST = (1 << IPS_SEQ_ADJUST_BIT),
-
-        /* NAT initialization bits. */
-        IPS_SRC_NAT_DONE_BIT = 7,
-        IPS_SRC_NAT_DONE = (1 << IPS_SRC_NAT_DONE_BIT),
-
-        IPS_DST_NAT_DONE_BIT = 8,
-        IPS_DST_NAT_DONE = (1 << IPS_DST_NAT_DONE_BIT),
-
-        /* Both together */
-        IPS_NAT_DONE_MASK = (IPS_DST_NAT_DONE | IPS_SRC_NAT_DONE),
-
-        /* Connection is dying (removed from lists), can not be unset. */
-        IPS_DYING_BIT = 9,
-        IPS_DYING = (1 << IPS_DYING_BIT),
-
-        /* Connection has fixed timeout. */
-        IPS_FIXED_TIMEOUT_BIT = 10,
-        IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
-
-        /* Conntrack is a template */
-        IPS_TEMPLATE_BIT = 11,
-        IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT),
-
-        /* Conntrack is a fake untracked entry */
-        IPS_UNTRACKED_BIT = 12,
-        IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
-
-        /* Conntrack got a helper explicitly attached via CT target. */
-        IPS_HELPER_BIT = 13,
-        IPS_HELPER = (1 << IPS_HELPER_BIT),
-};
-
-/* Connection tracking event types */
-enum ip_conntrack_events {
-        IPCT_NEW,               /* new conntrack */
-        IPCT_RELATED,           /* related conntrack */
-        IPCT_DESTROY,           /* destroyed conntrack */
-        IPCT_REPLY,             /* connection has seen two-way traffic */
-        IPCT_ASSURED,           /* connection status has changed to assured */
-        IPCT_PROTOINFO,         /* protocol information has changed */
-        IPCT_HELPER,            /* new helper has been set */
-        IPCT_MARK,              /* new mark has been set */
-        IPCT_NATSEQADJ,         /* NAT is doing sequence adjustment */
-        IPCT_SECMARK,           /* new security mark has been set */
-};
-
-enum ip_conntrack_expect_events {
-        IPEXP_NEW,              /* new expectation */
-        IPEXP_DESTROY,          /* destroyed expectation */
-};
-
-/* expectation flags */
-#define NF_CT_EXPECT_PERMANENT          0x1
-#define NF_CT_EXPECT_INACTIVE           0x2
-#define NF_CT_EXPECT_USERSPACE          0x4
-
-#ifdef __KERNEL__
 struct ip_conntrack_stat {
         unsigned int searched;
         unsigned int found;
@@ -136,6 +25,4 @@ struct ip_conntrack_stat {
 /* call to create an explicit dependency on nf_conntrack. */
 extern void need_conntrack(void);
 
-#endif /* __KERNEL__ */
-
 #endif /* _NF_CONNTRACK_COMMON_H */
diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h
index 8faf3f792d13..5f818b01e035 100644
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
@@ -1,20 +1,8 @@
 #ifndef _NF_CONNTRACK_FTP_H
 #define _NF_CONNTRACK_FTP_H
-/* FTP tracking. */
 
-/* This enum is exposed to userspace */
-enum nf_ct_ftp_type {
-        /* PORT command from client */
-        NF_CT_FTP_PORT,
-        /* PASV response from server */
-        NF_CT_FTP_PASV,
-        /* EPRT command from client */
-        NF_CT_FTP_EPRT,
-        /* EPSV response from server */
-        NF_CT_FTP_EPSV,
-};
+#include <uapi/linux/netfilter/nf_conntrack_ftp.h>
 
-#ifdef __KERNEL__
 
 #define FTP_PORT        21
 
@@ -42,6 +30,4 @@ extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,
                                        unsigned int matchoff,
                                        unsigned int matchlen,
                                        struct nf_conntrack_expect *exp);
-#endif /* __KERNEL__ */
-
 #endif /* _NF_CONNTRACK_FTP_H */
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index e59868ae12d4..22db9614b584 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -1,53 +1,8 @@
 #ifndef _NF_CONNTRACK_TCP_H
 #define _NF_CONNTRACK_TCP_H
-/* TCP tracking. */
 
-#include <linux/types.h>
+#include <uapi/linux/netfilter/nf_conntrack_tcp.h>
 
-/* This is exposed to userspace (ctnetlink) */
-enum tcp_conntrack {
-        TCP_CONNTRACK_NONE,
-        TCP_CONNTRACK_SYN_SENT,
-        TCP_CONNTRACK_SYN_RECV,
-        TCP_CONNTRACK_ESTABLISHED,
-        TCP_CONNTRACK_FIN_WAIT,
-        TCP_CONNTRACK_CLOSE_WAIT,
-        TCP_CONNTRACK_LAST_ACK,
-        TCP_CONNTRACK_TIME_WAIT,
-        TCP_CONNTRACK_CLOSE,
-        TCP_CONNTRACK_LISTEN,   /* obsolete */
-#define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
-        TCP_CONNTRACK_MAX,
-        TCP_CONNTRACK_IGNORE,
-        TCP_CONNTRACK_RETRANS,
-        TCP_CONNTRACK_UNACK,
-        TCP_CONNTRACK_TIMEOUT_MAX
-};
-
-/* Window scaling is advertised by the sender */
-#define IP_CT_TCP_FLAG_WINDOW_SCALE             0x01
-
-/* SACK is permitted by the sender */
-#define IP_CT_TCP_FLAG_SACK_PERM                0x02
-
-/* This sender sent FIN first */
-#define IP_CT_TCP_FLAG_CLOSE_INIT               0x04
-
-/* Be liberal in window checking */
-#define IP_CT_TCP_FLAG_BE_LIBERAL               0x08
-
-/* Has unacknowledged data */
-#define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED      0x10
-
-/* The field td_maxack has been set */
-#define IP_CT_TCP_FLAG_MAXACK_SET               0x20
-
-struct nf_ct_tcp_flags {
-        __u8 flags;
-        __u8 mask;
-};
-
-#ifdef __KERNEL__
 
 struct ip_ct_tcp_state {
         u_int32_t       td_end;         /* max of seq + len */
@@ -74,6 +29,4 @@ struct ip_ct_tcp {
         u_int8_t        last_flags;     /* Last flags set */
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* _NF_CONNTRACK_TCP_H */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 18341cdb2443..4966ddec039b 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -1,63 +1,11 @@
 #ifndef _NFNETLINK_H
 #define _NFNETLINK_H
-#include <linux/types.h>
-#include <linux/netfilter/nfnetlink_compat.h>
 
-enum nfnetlink_groups {
-        NFNLGRP_NONE,
-#define NFNLGRP_NONE                    NFNLGRP_NONE
-        NFNLGRP_CONNTRACK_NEW,
-#define NFNLGRP_CONNTRACK_NEW           NFNLGRP_CONNTRACK_NEW
-        NFNLGRP_CONNTRACK_UPDATE,
-#define NFNLGRP_CONNTRACK_UPDATE        NFNLGRP_CONNTRACK_UPDATE
-        NFNLGRP_CONNTRACK_DESTROY,
-#define NFNLGRP_CONNTRACK_DESTROY       NFNLGRP_CONNTRACK_DESTROY
-        NFNLGRP_CONNTRACK_EXP_NEW,
-#define NFNLGRP_CONNTRACK_EXP_NEW       NFNLGRP_CONNTRACK_EXP_NEW
-        NFNLGRP_CONNTRACK_EXP_UPDATE,
-#define NFNLGRP_CONNTRACK_EXP_UPDATE    NFNLGRP_CONNTRACK_EXP_UPDATE
-        NFNLGRP_CONNTRACK_EXP_DESTROY,
-#define NFNLGRP_CONNTRACK_EXP_DESTROY   NFNLGRP_CONNTRACK_EXP_DESTROY
-        __NFNLGRP_MAX,
-};
-#define NFNLGRP_MAX     (__NFNLGRP_MAX - 1)
-
-/* General form of address family dependent message.
- */
-struct nfgenmsg {
-        __u8  nfgen_family;             /* AF_xxx */
-        __u8  version;          /* nfnetlink version */
-        __be16    res_id;               /* resource id */
-};
-
-#define NFNETLINK_V0    0
-
-/* netfilter netlink message types are split in two pieces:
- * 8 bit subsystem, 8bit operation.
- */
-
-#define NFNL_SUBSYS_ID(x)       ((x & 0xff00) >> 8)
-#define NFNL_MSG_TYPE(x)        (x & 0x00ff)
-
-/* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS()
- * won't work anymore */
-#define NFNL_SUBSYS_NONE                0
-#define NFNL_SUBSYS_CTNETLINK           1
-#define NFNL_SUBSYS_CTNETLINK_EXP       2
-#define NFNL_SUBSYS_QUEUE               3
-#define NFNL_SUBSYS_ULOG                4
-#define NFNL_SUBSYS_OSF                 5
-#define NFNL_SUBSYS_IPSET               6
-#define NFNL_SUBSYS_ACCT                7
-#define NFNL_SUBSYS_CTNETLINK_TIMEOUT   8
-#define NFNL_SUBSYS_CTHELPER            9
-#define NFNL_SUBSYS_COUNT               10
-
-#ifdef __KERNEL__
 
 #include <linux/netlink.h>
 #include <linux/capability.h>
 #include <net/netlink.h>
+#include <uapi/linux/netfilter/nfnetlink.h>
 
 struct nfnl_callback {
         int (*call)(struct sock *nl, struct sk_buff *skb, 
@@ -92,5 +40,4 @@ extern void nfnl_unlock(void);
 #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
         MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
 
-#endif  /* __KERNEL__ */
 #endif  /* _NFNETLINK_H */
diff --git a/include/linux/netfilter/nfnetlink_acct.h b/include/linux/netfilter/nfnetlink_acct.h
index 7c4279b4ae7a..bb4bbc9b7a18 100644
--- a/include/linux/netfilter/nfnetlink_acct.h
+++ b/include/linux/netfilter/nfnetlink_acct.h
@@ -1,29 +1,8 @@
 #ifndef _NFNL_ACCT_H_
 #define _NFNL_ACCT_H_
 
-#ifndef NFACCT_NAME_MAX
-#define NFACCT_NAME_MAX         32
-#endif
+#include <uapi/linux/netfilter/nfnetlink_acct.h>
 
-enum nfnl_acct_msg_types {
-        NFNL_MSG_ACCT_NEW,
-        NFNL_MSG_ACCT_GET,
-        NFNL_MSG_ACCT_GET_CTRZERO,
-        NFNL_MSG_ACCT_DEL,
-        NFNL_MSG_ACCT_MAX
-};
-
-enum nfnl_acct_type {
-        NFACCT_UNSPEC,
-        NFACCT_NAME,
-        NFACCT_PKTS,
-        NFACCT_BYTES,
-        NFACCT_USE,
-        __NFACCT_MAX
-};
-#define NFACCT_MAX (__NFACCT_MAX - 1)
-
-#ifdef __KERNEL__
 
 struct nf_acct;
 
@@ -31,6 +10,4 @@ extern struct nf_acct *nfnl_acct_find_get(const char *filter_name);
 extern void nfnl_acct_put(struct nf_acct *acct);
 extern void nfnl_acct_update(const struct sk_buff *skb, struct nf_acct *nfacct);
 
-#endif /* __KERNEL__ */
-
 #endif /* _NFNL_ACCT_H */
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 8d674a786744..dd49566315c6 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -1,191 +1,9 @@
 #ifndef _X_TABLES_H
 #define _X_TABLES_H
-#include <linux/kernel.h>
-#include <linux/types.h>
 
-#define XT_FUNCTION_MAXNAMELEN 30
-#define XT_EXTENSION_MAXNAMELEN 29
-#define XT_TABLE_MAXNAMELEN 32
-
-struct xt_entry_match {
-        union {
-                struct {
-                        __u16 match_size;
-
-                        /* Used by userspace */
-                        char name[XT_EXTENSION_MAXNAMELEN];
-                        __u8 revision;
-                } user;
-                struct {
-                        __u16 match_size;
-
-                        /* Used inside the kernel */
-                        struct xt_match *match;
-                } kernel;
-
-                /* Total length */
-                __u16 match_size;
-        } u;
-
-        unsigned char data[0];
-};
-
-struct xt_entry_target {
-        union {
-                struct {
-                        __u16 target_size;
-
-                        /* Used by userspace */
-                        char name[XT_EXTENSION_MAXNAMELEN];
-                        __u8 revision;
-                } user;
-                struct {
-                        __u16 target_size;
-
-                        /* Used inside the kernel */
-                        struct xt_target *target;
-                } kernel;
-
-                /* Total length */
-                __u16 target_size;
-        } u;
-
-        unsigned char data[0];
-};
-
-#define XT_TARGET_INIT(__name, __size)                                         \
-{                                                                              \
-        .target.u.user = {                                                     \
-                .target_size    = XT_ALIGN(__size),                            \
-                .name           = __name,                                      \
-        },                                                                     \
-}
-
-struct xt_standard_target {
-        struct xt_entry_target target;
-        int verdict;
-};
-
-struct xt_error_target {
-        struct xt_entry_target target;
-        char errorname[XT_FUNCTION_MAXNAMELEN];
-};
-
-/* The argument to IPT_SO_GET_REVISION_*.  Returns highest revision
- * kernel supports, if >= revision. */
-struct xt_get_revision {
-        char name[XT_EXTENSION_MAXNAMELEN];
-        __u8 revision;
-};
-
-/* CONTINUE verdict for targets */
-#define XT_CONTINUE 0xFFFFFFFF
-
-/* For standard target */
-#define XT_RETURN (-NF_REPEAT - 1)
-
-/* this is a dummy structure to find out the alignment requirement for a struct
- * containing all the fundamental data types that are used in ipt_entry,
- * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
- * personal pleasure to remove it -HW
- */
-struct _xt_align {
-        __u8 u8;
-        __u16 u16;
-        __u32 u32;
-        __u64 u64;
-};
-
-#define XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _xt_align))
-
-/* Standard return verdict, or do jump. */
-#define XT_STANDARD_TARGET ""
-/* Error verdict. */
-#define XT_ERROR_TARGET "ERROR"
-
-#define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
-#define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
-
-struct xt_counters {
-        __u64 pcnt, bcnt;                       /* Packet and byte counters */
-};
-
-/* The argument to IPT_SO_ADD_COUNTERS. */
-struct xt_counters_info {
-        /* Which table. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        unsigned int num_counters;
-
-        /* The counters (actually `number' of these). */
-        struct xt_counters counters[0];
-};
-
-#define XT_INV_PROTO            0x40    /* Invert the sense of PROTO. */
-
-#ifndef __KERNEL__
-/* fn returns 0 to continue iteration */
-#define XT_MATCH_ITERATE(type, e, fn, args...)                  \
-({                                                              \
-        unsigned int __i;                                       \
-        int __ret = 0;                                          \
-        struct xt_entry_match *__m;                             \
-                                                                \
-        for (__i = sizeof(type);                                \
-             __i < (e)->target_offset;                          \
-             __i += __m->u.match_size) {                        \
-                __m = (void *)e + __i;                          \
-                                                                \
-                __ret = fn(__m , ## args);                      \
-                if (__ret != 0)                                 \
-                        break;                                  \
-        }                                                       \
-        __ret;                                                  \
-})
-
-/* fn returns 0 to continue iteration */
-#define XT_ENTRY_ITERATE_CONTINUE(type, entries, size, n, fn, args...) \
-({                                                              \
-        unsigned int __i, __n;                                  \
-        int __ret = 0;                                          \
-        type *__entry;                                          \
-                                                                \
-        for (__i = 0, __n = 0; __i < (size);                    \
-             __i += __entry->next_offset, __n++) {              \
-                __entry = (void *)(entries) + __i;              \
-                if (__n < n)                                    \
-                        continue;                               \
-                                                                \
-                __ret = fn(__entry , ## args);                  \
-                if (__ret != 0)                                 \
-                        break;                                  \
-        }                                                       \
-        __ret;                                                  \
-})
-
-/* fn returns 0 to continue iteration */
-#define XT_ENTRY_ITERATE(type, entries, size, fn, args...) \
-        XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args)
-
-#endif /* !__KERNEL__ */
-
-/* pos is normally a struct ipt_entry/ip6t_entry/etc. */
-#define xt_entry_foreach(pos, ehead, esize) \
-        for ((pos) = (typeof(pos))(ehead); \
-             (pos) < (typeof(pos))((char *)(ehead) + (esize)); \
-             (pos) = (typeof(pos))((char *)(pos) + (pos)->next_offset))
-
-/* can only be xt_entry_match, so no use of typeof here */
-#define xt_ematch_foreach(pos, entry) \
-        for ((pos) = (struct xt_entry_match *)entry->elems; \
-             (pos) < (struct xt_entry_match *)((char *)(entry) + \
-                     (entry)->target_offset); \
-             (pos) = (struct xt_entry_match *)((char *)(pos) + \
-                     (pos)->u.match_size))
-
-#ifdef __KERNEL__
 
 #include <linux/netdevice.h>
+#include <uapi/linux/netfilter/x_tables.h>
 
 /**
  * struct xt_action_param - parameters for matches/targets
@@ -617,6 +435,4 @@ extern int xt_compat_target_to_user(const struct xt_entry_target *t,
                                     void __user **dstptr, unsigned int *size);
 
 #endif /* CONFIG_COMPAT */
-#endif /* __KERNEL__ */
-
 #endif /* _X_TABLES_H */
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
index c42e52f39f8f..074790c0cf74 100644
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -1,78 +1,9 @@
 #ifndef _XT_HASHLIMIT_H
 #define _XT_HASHLIMIT_H
 
-#include <linux/types.h>
+#include <uapi/linux/netfilter/xt_hashlimit.h>
 
-/* timings are in milliseconds. */
-#define XT_HASHLIMIT_SCALE 10000
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
- * seconds, or one packet every 59 hours.
- */
-
-/* packet length accounting is done in 16-byte steps */
-#define XT_HASHLIMIT_BYTE_SHIFT 4
-
-/* details of this structure hidden by the implementation */
-struct xt_hashlimit_htable;
-
-enum {
-        XT_HASHLIMIT_HASH_DIP = 1 << 0,
-        XT_HASHLIMIT_HASH_DPT = 1 << 1,
-        XT_HASHLIMIT_HASH_SIP = 1 << 2,
-        XT_HASHLIMIT_HASH_SPT = 1 << 3,
-        XT_HASHLIMIT_INVERT   = 1 << 4,
-        XT_HASHLIMIT_BYTES    = 1 << 5,
-};
-#ifdef __KERNEL__
 #define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP | XT_HASHLIMIT_HASH_DPT | \
                           XT_HASHLIMIT_HASH_SIP | XT_HASHLIMIT_HASH_SPT | \
                           XT_HASHLIMIT_INVERT | XT_HASHLIMIT_BYTES)
-#endif
-
-struct hashlimit_cfg {
-        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
-        __u32 avg;    /* Average secs between packets * scale */
-        __u32 burst;  /* Period multiplier for upper limit. */
-
-        /* user specified */
-        __u32 size;             /* how many buckets */
-        __u32 max;              /* max number of entries */
-        __u32 gc_interval;      /* gc interval */
-        __u32 expire;   /* when do entries expire? */
-};
-
-struct xt_hashlimit_info {
-        char name [IFNAMSIZ];           /* name */
-        struct hashlimit_cfg cfg;
-
-        /* Used internally by the kernel */
-        struct xt_hashlimit_htable *hinfo;
-        union {
-                void *ptr;
-                struct xt_hashlimit_info *master;
-        } u;
-};
-
-struct hashlimit_cfg1 {
-        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
-        __u32 avg;    /* Average secs between packets * scale */
-        __u32 burst;  /* Period multiplier for upper limit. */
-
-        /* user specified */
-        __u32 size;             /* how many buckets */
-        __u32 max;              /* max number of entries */
-        __u32 gc_interval;      /* gc interval */
-        __u32 expire;   /* when do entries expire? */
-
-        __u8 srcmask, dstmask;
-};
-
-struct xt_hashlimit_mtinfo1 {
-        char name[IFNAMSIZ];
-        struct hashlimit_cfg1 cfg;
-
-        /* Used internally by the kernel */
-        struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
-};
-
 #endif /*_XT_HASHLIMIT_H*/
diff --git a/include/linux/netfilter/xt_physdev.h b/include/linux/netfilter/xt_physdev.h
index 8555e399886d..5b5e41716d69 100644
--- a/include/linux/netfilter/xt_physdev.h
+++ b/include/linux/netfilter/xt_physdev.h
@@ -1,26 +1,7 @@
 #ifndef _XT_PHYSDEV_H
 #define _XT_PHYSDEV_H
 
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 #include <linux/if.h>
-#endif
-
-#define XT_PHYSDEV_OP_IN                0x01
-#define XT_PHYSDEV_OP_OUT               0x02
-#define XT_PHYSDEV_OP_BRIDGED           0x04
-#define XT_PHYSDEV_OP_ISIN              0x08
-#define XT_PHYSDEV_OP_ISOUT             0x10
-#define XT_PHYSDEV_OP_MASK              (0x20 - 1)
-
-struct xt_physdev_info {
-        char physindev[IFNAMSIZ];
-        char in_mask[IFNAMSIZ];
-        char physoutdev[IFNAMSIZ];
-        char out_mask[IFNAMSIZ];
-        __u8 invert;
-        __u8 bitmask;
-};
+#include <uapi/linux/netfilter/xt_physdev.h>
 
 #endif /*_XT_PHYSDEV_H*/
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
deleted file mode 100644
index b27439c71037..000000000000
--- a/include/linux/netfilter_arp/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-header-y += arp_tables.h
-header-y += arpt_mangle.h
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index e08565d45178..cfb7191e6efa 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -5,211 +5,14 @@
  *      network byte order.
  *      flags are stored in host byte order (of course).
  */
-
 #ifndef _ARPTABLES_H
 #define _ARPTABLES_H
 
-#ifdef __KERNEL__
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
-#endif
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/netfilter_arp.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#ifndef __KERNEL__
-#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define arpt_entry_target xt_entry_target
-#define arpt_standard_target xt_standard_target
-#define arpt_error_target xt_error_target
-#define ARPT_CONTINUE XT_CONTINUE
-#define ARPT_RETURN XT_RETURN
-#define arpt_counters_info xt_counters_info
-#define arpt_counters xt_counters
-#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET
-#define ARPT_ERROR_TARGET XT_ERROR_TARGET
-#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \
-        XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)
-#endif
-
-#define ARPT_DEV_ADDR_LEN_MAX 16
-
-struct arpt_devaddr_info {
-        char addr[ARPT_DEV_ADDR_LEN_MAX];
-        char mask[ARPT_DEV_ADDR_LEN_MAX];
-};
-
-/* Yes, Virginia, you have to zero the padding. */
-struct arpt_arp {
-        /* Source and target IP addr */
-        struct in_addr src, tgt;
-        /* Mask for src and target IP addr */
-        struct in_addr smsk, tmsk;
-
-        /* Device hw address length, src+target device addresses */
-        __u8 arhln, arhln_mask;
-        struct arpt_devaddr_info src_devaddr;
-        struct arpt_devaddr_info tgt_devaddr;
-
-        /* ARP operation code. */
-        __be16 arpop, arpop_mask;
-
-        /* ARP hardware address and protocol address format. */
-        __be16 arhrd, arhrd_mask;
-        __be16 arpro, arpro_mask;
-
-        /* The protocol address length is only accepted if it is 4
-         * so there is no use in offering a way to do filtering on it.
-         */
-
-        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-        /* Flags word */
-        __u8 flags;
-        /* Inverse flags */
-        __u16 invflags;
-};
-
-/* Values for "flag" field in struct arpt_ip (general arp structure).
- * No flags defined yet.
- */
-#define ARPT_F_MASK             0x00    /* All possible flag bits mask. */
-
-/* Values for "inv" field in struct arpt_arp. */
-#define ARPT_INV_VIA_IN         0x0001  /* Invert the sense of IN IFACE. */
-#define ARPT_INV_VIA_OUT        0x0002  /* Invert the sense of OUT IFACE */
-#define ARPT_INV_SRCIP          0x0004  /* Invert the sense of SRC IP. */
-#define ARPT_INV_TGTIP          0x0008  /* Invert the sense of TGT IP. */
-#define ARPT_INV_SRCDEVADDR     0x0010  /* Invert the sense of SRC DEV ADDR. */
-#define ARPT_INV_TGTDEVADDR     0x0020  /* Invert the sense of TGT DEV ADDR. */
-#define ARPT_INV_ARPOP          0x0040  /* Invert the sense of ARP OP. */
-#define ARPT_INV_ARPHRD         0x0080  /* Invert the sense of ARP HRD. */
-#define ARPT_INV_ARPPRO         0x0100  /* Invert the sense of ARP PRO. */
-#define ARPT_INV_ARPHLN         0x0200  /* Invert the sense of ARP HLN. */
-#define ARPT_INV_MASK           0x03FF  /* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general ARP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct arpt_entry
-{
-        struct arpt_arp arp;
-
-        /* Size of arpt_entry + matches */
-        __u16 target_offset;
-        /* Size of arpt_entry + matches + target */
-        __u16 next_offset;
-
-        /* Back pointer */
-        unsigned int comefrom;
-
-        /* Packet and byte counters. */
-        struct xt_counters counters;
-
-        /* The matches (if any), then the target. */
-        unsigned char elems[0];
-};
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in.h before adding new number here.
- */
-#define ARPT_BASE_CTL           96
-
-#define ARPT_SO_SET_REPLACE             (ARPT_BASE_CTL)
-#define ARPT_SO_SET_ADD_COUNTERS        (ARPT_BASE_CTL + 1)
-#define ARPT_SO_SET_MAX                 ARPT_SO_SET_ADD_COUNTERS
-
-#define ARPT_SO_GET_INFO                (ARPT_BASE_CTL)
-#define ARPT_SO_GET_ENTRIES             (ARPT_BASE_CTL + 1)
-/* #define ARPT_SO_GET_REVISION_MATCH   (APRT_BASE_CTL + 2) */
-#define ARPT_SO_GET_REVISION_TARGET     (ARPT_BASE_CTL + 3)
-#define ARPT_SO_GET_MAX                 (ARPT_SO_GET_REVISION_TARGET)
-
-/* The argument to ARPT_SO_GET_INFO */
-struct arpt_getinfo {
-        /* Which table: caller fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Kernel fills these in. */
-        /* Which hook entry points are valid: bitmask */
-        unsigned int valid_hooks;
-
-        /* Hook entry points: one per netfilter hook. */
-        unsigned int hook_entry[NF_ARP_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_ARP_NUMHOOKS];
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Size of entries. */
-        unsigned int size;
-};
-
-/* The argument to ARPT_SO_SET_REPLACE. */
-struct arpt_replace {
-        /* Which table. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-        unsigned int valid_hooks;
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Total size of new entries */
-        unsigned int size;
-
-        /* Hook entry points. */
-        unsigned int hook_entry[NF_ARP_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_ARP_NUMHOOKS];
-
-        /* Information about old entries: */
-        /* Number of counters (must be equal to current number of entries). */
-        unsigned int num_counters;
-        /* The old entries' counters. */
-        struct xt_counters __user *counters;
-
-        /* The entries (hang off end: not really an array). */
-        struct arpt_entry entries[0];
-};
-
-/* The argument to ARPT_SO_GET_ENTRIES. */
-struct arpt_get_entries {
-        /* Which table: user fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* User fills this in: total entry size. */
-        unsigned int size;
-
-        /* The entries. */
-        struct arpt_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
-{
-        return (void *)e + e->target_offset;
-}
-
-/*
- *      Main firewall chains definitions and global var's definitions.
- */
-#ifdef __KERNEL__
+#include <uapi/linux/netfilter_arp/arp_tables.h>
 
 /* Standard entry. */
 struct arpt_standard {
@@ -274,5 +77,4 @@ compat_arpt_get_target(struct compat_arpt_entry *e)
 }
 
 #endif /* CONFIG_COMPAT */
-#endif /*__KERNEL__*/
 #endif /* _ARPTABLES_H */
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 31d2844e6572..dfb4d9e52bcb 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -1,30 +1,8 @@
 #ifndef __LINUX_BRIDGE_NETFILTER_H
 #define __LINUX_BRIDGE_NETFILTER_H
 
-/* bridge-specific defines for netfilter. 
- */
-
-#include <linux/netfilter.h>
-#include <linux/if_ether.h>
-#include <linux/if_vlan.h>
-#include <linux/if_pppox.h>
-
-/* Bridge Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_BR_PRE_ROUTING       0
-/* If the packet is destined for this box. */
-#define NF_BR_LOCAL_IN          1
-/* If the packet is destined for another interface. */
-#define NF_BR_FORWARD           2
-/* Packets coming from a local process. */
-#define NF_BR_LOCAL_OUT         3
-/* Packets about to hit the wire. */
-#define NF_BR_POST_ROUTING      4
-/* Not really a hook, but used for the ebtables broute table */
-#define NF_BR_BROUTING          5
-#define NF_BR_NUMHOOKS          6
-
-#ifdef __KERNEL__
+#include <uapi/linux/netfilter_bridge.h>
+
 
 enum nf_br_hook_priorities {
         NF_BR_PRI_FIRST = INT_MIN,
@@ -118,5 +96,4 @@ static inline void br_drop_fake_rtable(struct sk_buff *skb)
 #define br_drop_fake_rtable(skb)                do { } while (0)
 #endif /* CONFIG_BRIDGE_NETFILTER */
 
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
deleted file mode 100644
index e48f1a3f5a4a..000000000000
--- a/include/linux/netfilter_bridge/Kbuild
+++ /dev/null
@@ -1,18 +0,0 @@
-header-y += ebt_802_3.h
-header-y += ebt_among.h
-header-y += ebt_arp.h
-header-y += ebt_arpreply.h
-header-y += ebt_ip.h
-header-y += ebt_ip6.h
-header-y += ebt_limit.h
-header-y += ebt_log.h
-header-y += ebt_mark_m.h
-header-y += ebt_mark_t.h
-header-y += ebt_nat.h
-header-y += ebt_nflog.h
-header-y += ebt_pkttype.h
-header-y += ebt_redirect.h
-header-y += ebt_stp.h
-header-y += ebt_ulog.h
-header-y += ebt_vlan.h
-header-y += ebtables.h
diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index be5be1577a56..e17e8bfb4e8b 100644
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -1,70 +1,11 @@
 #ifndef __LINUX_BRIDGE_EBT_802_3_H
 #define __LINUX_BRIDGE_EBT_802_3_H
 
-#include <linux/types.h>
-
-#define EBT_802_3_SAP 0x01
-#define EBT_802_3_TYPE 0x02
-
-#define EBT_802_3_MATCH "802_3"
-
-/*
- * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
- * to discover what kind of packet we're carrying. 
- */
-#define CHECK_TYPE 0xaa
-
-/*
- * Control field may be one or two bytes.  If the first byte has
- * the value 0x03 then the entire length is one byte, otherwise it is two.
- * One byte controls are used in Unnumbered Information frames.
- * Two byte controls are used in Numbered Information frames.
- */
-#define IS_UI 0x03
-
-#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
-
-/* ui has one byte ctrl, ni has two */
-struct hdr_ui {
-        __u8 dsap;
-        __u8 ssap;
-        __u8 ctrl;
-        __u8 orig[3];
-        __be16 type;
-};
-
-struct hdr_ni {
-        __u8 dsap;
-        __u8 ssap;
-        __be16 ctrl;
-        __u8  orig[3];
-        __be16 type;
-};
-
-struct ebt_802_3_hdr {
-        __u8  daddr[6];
-        __u8  saddr[6];
-        __be16 len;
-        union {
-                struct hdr_ui ui;
-                struct hdr_ni ni;
-        } llc;
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/netfilter_bridge/ebt_802_3.h>
 
 static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
 {
         return (struct ebt_802_3_hdr *)skb_mac_header(skb);
 }
 #endif
-
-struct ebt_802_3_info {
-        __u8  sap;
-        __be16 type;
-        __u8  bitmask;
-        __u8  invflags;
-};
-
-#endif
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index 4dd5bd6994a8..34e7a2b7f867 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -9,191 +9,11 @@
  *  This code is stongly inspired on the iptables code which is
  *  Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
  */
-
 #ifndef __LINUX_BRIDGE_EFF_H
 #define __LINUX_BRIDGE_EFF_H
-#include <linux/if.h>
-#include <linux/netfilter_bridge.h>
-#include <linux/if_ether.h>
-
-#define EBT_TABLE_MAXNAMELEN 32
-#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-
-/* verdicts >0 are "branches" */
-#define EBT_ACCEPT   -1
-#define EBT_DROP     -2
-#define EBT_CONTINUE -3
-#define EBT_RETURN   -4
-#define NUM_STANDARD_TARGETS   4
-/* ebtables target modules store the verdict inside an int. We can
- * reclaim a part of this int for backwards compatible extensions.
- * The 4 lsb are more than enough to store the verdict. */
-#define EBT_VERDICT_BITS 0x0000000F
-
-struct xt_match;
-struct xt_target;
-
-struct ebt_counter {
-        uint64_t pcnt;
-        uint64_t bcnt;
-};
 
-struct ebt_replace {
-        char name[EBT_TABLE_MAXNAMELEN];
-        unsigned int valid_hooks;
-        /* nr of rules in the table */
-        unsigned int nentries;
-        /* total size of the entries */
-        unsigned int entries_size;
-        /* start of the chains */
-        struct ebt_entries __user *hook_entry[NF_BR_NUMHOOKS];
-        /* nr of counters userspace expects back */
-        unsigned int num_counters;
-        /* where the kernel will put the old counters */
-        struct ebt_counter __user *counters;
-        char __user *entries;
-};
+#include <uapi/linux/netfilter_bridge/ebtables.h>
 
-struct ebt_replace_kernel {
-        char name[EBT_TABLE_MAXNAMELEN];
-        unsigned int valid_hooks;
-        /* nr of rules in the table */
-        unsigned int nentries;
-        /* total size of the entries */
-        unsigned int entries_size;
-        /* start of the chains */
-        struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
-        /* nr of counters userspace expects back */
-        unsigned int num_counters;
-        /* where the kernel will put the old counters */
-        struct ebt_counter *counters;
-        char *entries;
-};
-
-struct ebt_entries {
-        /* this field is always set to zero
-         * See EBT_ENTRY_OR_ENTRIES.
-         * Must be same size as ebt_entry.bitmask */
-        unsigned int distinguisher;
-        /* the chain name */
-        char name[EBT_CHAIN_MAXNAMELEN];
-        /* counter offset for this chain */
-        unsigned int counter_offset;
-        /* one standard (accept, drop, return) per hook */
-        int policy;
-        /* nr. of entries */
-        unsigned int nentries;
-        /* entry list */
-        char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-/* used for the bitmask of struct ebt_entry */
-
-/* This is a hack to make a difference between an ebt_entry struct and an
- * ebt_entries struct when traversing the entries from start to end.
- * Using this simplifies the code a lot, while still being able to use
- * ebt_entries.
- * Contrary, iptables doesn't use something like ebt_entries and therefore uses
- * different techniques for naming the policy and such. So, iptables doesn't
- * need a hack like this.
- */
-#define EBT_ENTRY_OR_ENTRIES 0x01
-/* these are the normal masks */
-#define EBT_NOPROTO 0x02
-#define EBT_802_3 0x04
-#define EBT_SOURCEMAC 0x08
-#define EBT_DESTMAC 0x10
-#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \
-   | EBT_ENTRY_OR_ENTRIES)
-
-#define EBT_IPROTO 0x01
-#define EBT_IIN 0x02
-#define EBT_IOUT 0x04
-#define EBT_ISOURCE 0x8
-#define EBT_IDEST 0x10
-#define EBT_ILOGICALIN 0x20
-#define EBT_ILOGICALOUT 0x40
-#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
-   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
-
-struct ebt_entry_match {
-        union {
-                char name[EBT_FUNCTION_MAXNAMELEN];
-                struct xt_match *match;
-        } u;
-        /* size of data */
-        unsigned int match_size;
-        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-struct ebt_entry_watcher {
-        union {
-                char name[EBT_FUNCTION_MAXNAMELEN];
-                struct xt_target *watcher;
-        } u;
-        /* size of data */
-        unsigned int watcher_size;
-        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-struct ebt_entry_target {
-        union {
-                char name[EBT_FUNCTION_MAXNAMELEN];
-                struct xt_target *target;
-        } u;
-        /* size of data */
-        unsigned int target_size;
-        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-#define EBT_STANDARD_TARGET "standard"
-struct ebt_standard_target {
-        struct ebt_entry_target target;
-        int verdict;
-};
-
-/* one entry */
-struct ebt_entry {
-        /* this needs to be the first field */
-        unsigned int bitmask;
-        unsigned int invflags;
-        __be16 ethproto;
-        /* the physical in-dev */
-        char in[IFNAMSIZ];
-        /* the logical in-dev */
-        char logical_in[IFNAMSIZ];
-        /* the physical out-dev */
-        char out[IFNAMSIZ];
-        /* the logical out-dev */
-        char logical_out[IFNAMSIZ];
-        unsigned char sourcemac[ETH_ALEN];
-        unsigned char sourcemsk[ETH_ALEN];
-        unsigned char destmac[ETH_ALEN];
-        unsigned char destmsk[ETH_ALEN];
-        /* sizeof ebt_entry + matches */
-        unsigned int watchers_offset;
-        /* sizeof ebt_entry + matches + watchers */
-        unsigned int target_offset;
-        /* sizeof ebt_entry + matches + watchers + target */
-        unsigned int next_offset;
-        unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-/* {g,s}etsockopt numbers */
-#define EBT_BASE_CTL            128
-
-#define EBT_SO_SET_ENTRIES      (EBT_BASE_CTL)
-#define EBT_SO_SET_COUNTERS     (EBT_SO_SET_ENTRIES+1)
-#define EBT_SO_SET_MAX          (EBT_SO_SET_COUNTERS+1)
-
-#define EBT_SO_GET_INFO         (EBT_BASE_CTL)
-#define EBT_SO_GET_ENTRIES      (EBT_SO_GET_INFO+1)
-#define EBT_SO_GET_INIT_INFO    (EBT_SO_GET_ENTRIES+1)
-#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
-#define EBT_SO_GET_MAX          (EBT_SO_GET_INIT_ENTRIES+1)
-
-#ifdef __KERNEL__
 
 /* return values for match() functions */
 #define EBT_MATCH 0
@@ -304,77 +124,4 @@ extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff *skb,
 /* True if the target is not a standard target */
 #define INVALID_TARGET (info->target < -NUM_STANDARD_TARGETS || info->target >= 0)
 
-#endif /* __KERNEL__ */
-
-/* blatently stolen from ip_tables.h
- * fn returns 0 to continue iteration */
-#define EBT_MATCH_ITERATE(e, fn, args...)                   \
-({                                                          \
-        unsigned int __i;                                   \
-        int __ret = 0;                                      \
-        struct ebt_entry_match *__match;                    \
-                                                            \
-        for (__i = sizeof(struct ebt_entry);                \
-             __i < (e)->watchers_offset;                    \
-             __i += __match->match_size +                   \
-             sizeof(struct ebt_entry_match)) {              \
-                __match = (void *)(e) + __i;                \
-                                                            \
-                __ret = fn(__match , ## args);              \
-                if (__ret != 0)                             \
-                        break;                              \
-        }                                                   \
-        if (__ret == 0) {                                   \
-                if (__i != (e)->watchers_offset)            \
-                        __ret = -EINVAL;                    \
-        }                                                   \
-        __ret;                                              \
-})
-
-#define EBT_WATCHER_ITERATE(e, fn, args...)                 \
-({                                                          \
-        unsigned int __i;                                   \
-        int __ret = 0;                                      \
-        struct ebt_entry_watcher *__watcher;                \
-                                                            \
-        for (__i = e->watchers_offset;                      \
-             __i < (e)->target_offset;                      \
-             __i += __watcher->watcher_size +               \
-             sizeof(struct ebt_entry_watcher)) {            \
-                __watcher = (void *)(e) + __i;              \
-                                                            \
-                __ret = fn(__watcher , ## args);            \
-                if (__ret != 0)                             \
-                        break;                              \
-        }                                                   \
-        if (__ret == 0) {                                   \
-                if (__i != (e)->target_offset)              \
-                        __ret = -EINVAL;                    \
-        }                                                   \
-        __ret;                                              \
-})
-
-#define EBT_ENTRY_ITERATE(entries, size, fn, args...)       \
-({                                                          \
-        unsigned int __i;                                   \
-        int __ret = 0;                                      \
-        struct ebt_entry *__entry;                          \
-                                                            \
-        for (__i = 0; __i < (size);) {                      \
-                __entry = (void *)(entries) + __i;          \
-                __ret = fn(__entry , ## args);              \
-                if (__ret != 0)                             \
-                        break;                              \
-                if (__entry->bitmask != 0)                  \
-                        __i += __entry->next_offset;        \
-                else                                        \
-                        __i += sizeof(struct ebt_entries);  \
-        }                                                   \
-        if (__ret == 0) {                                   \
-                if (__i != (size))                          \
-                        __ret = -EINVAL;                    \
-        }                                                   \
-        __ret;                                              \
-})
-
 #endif
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index b962dfc695ae..dfaf116b3e81 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -1,86 +1,12 @@
-#ifndef __LINUX_IP_NETFILTER_H
-#define __LINUX_IP_NETFILTER_H
-
 /* IPv4-specific defines for netfilter. 
  * (C)1998 Rusty Russell -- This code is GPL.
  */
+#ifndef __LINUX_IP_NETFILTER_H
+#define __LINUX_IP_NETFILTER_H
 
-#include <linux/netfilter.h>
-
-/* only for userspace compatibility */
-#ifndef __KERNEL__
-
-#include <limits.h> /* for INT_MIN, INT_MAX */
-
-/* IP Cache bits. */
-/* Src IP address. */
-#define NFC_IP_SRC              0x0001
-/* Dest IP address. */
-#define NFC_IP_DST              0x0002
-/* Input device. */
-#define NFC_IP_IF_IN            0x0004
-/* Output device. */
-#define NFC_IP_IF_OUT           0x0008
-/* TOS. */
-#define NFC_IP_TOS              0x0010
-/* Protocol. */
-#define NFC_IP_PROTO            0x0020
-/* IP options. */
-#define NFC_IP_OPTIONS          0x0040
-/* Frag & flags. */
-#define NFC_IP_FRAG             0x0080
-
-/* Per-protocol information: only matters if proto match. */
-/* TCP flags. */
-#define NFC_IP_TCPFLAGS         0x0100
-/* Source port. */
-#define NFC_IP_SRC_PT           0x0200
-/* Dest port. */
-#define NFC_IP_DST_PT           0x0400
-/* Something else about the proto */
-#define NFC_IP_PROTO_UNKNOWN    0x2000
-
-/* IP Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_IP_PRE_ROUTING       0
-/* If the packet is destined for this box. */
-#define NF_IP_LOCAL_IN          1
-/* If the packet is destined for another interface. */
-#define NF_IP_FORWARD           2
-/* Packets coming from a local process. */
-#define NF_IP_LOCAL_OUT         3
-/* Packets about to hit the wire. */
-#define NF_IP_POST_ROUTING      4
-#define NF_IP_NUMHOOKS          5
-#endif /* ! __KERNEL__ */
-
-enum nf_ip_hook_priorities {
-        NF_IP_PRI_FIRST = INT_MIN,
-        NF_IP_PRI_CONNTRACK_DEFRAG = -400,
-        NF_IP_PRI_RAW = -300,
-        NF_IP_PRI_SELINUX_FIRST = -225,
-        NF_IP_PRI_CONNTRACK = -200,
-        NF_IP_PRI_MANGLE = -150,
-        NF_IP_PRI_NAT_DST = -100,
-        NF_IP_PRI_FILTER = 0,
-        NF_IP_PRI_SECURITY = 50,
-        NF_IP_PRI_NAT_SRC = 100,
-        NF_IP_PRI_SELINUX_LAST = 225,
-        NF_IP_PRI_CONNTRACK_HELPER = 300,
-        NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
-        NF_IP_PRI_LAST = INT_MAX,
-};
-
-/* Arguments for setsockopt SOL_IP: */
-/* 2.0 firewalling went from 64 through 71 (and +256, +512, etc). */
-/* 2.2 firewalling (+ masq) went from 64 through 76 */
-/* 2.4 firewalling went 64 through 67. */
-#define SO_ORIGINAL_DST 80
+#include <uapi/linux/netfilter_ipv4.h>
 
-#ifdef __KERNEL__
 extern int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type);
 extern __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
                                    unsigned int dataoff, u_int8_t protocol);
-#endif /*__KERNEL__*/
-
 #endif /*__LINUX_IP_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
deleted file mode 100644
index 8ba0c5b72ea9..000000000000
--- a/include/linux/netfilter_ipv4/Kbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-header-y += ip_tables.h
-header-y += ipt_CLUSTERIP.h
-header-y += ipt_ECN.h
-header-y += ipt_LOG.h
-header-y += ipt_REJECT.h
-header-y += ipt_TTL.h
-header-y += ipt_ULOG.h
-header-y += ipt_ah.h
-header-y += ipt_ecn.h
-header-y += ipt_ttl.h
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index db79231914ce..901e84db847d 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -11,230 +11,17 @@
  *      flags are stored in host byte order (of course).
  *      Port numbers are stored in HOST byte order.
  */
-
 #ifndef _IPTABLES_H
 #define _IPTABLES_H
 
-#ifdef __KERNEL__
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-#endif
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/netfilter_ipv4.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#ifndef __KERNEL__
-#define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define ipt_match xt_match
-#define ipt_target xt_target
-#define ipt_table xt_table
-#define ipt_get_revision xt_get_revision
-#define ipt_entry_match xt_entry_match
-#define ipt_entry_target xt_entry_target
-#define ipt_standard_target xt_standard_target
-#define ipt_error_target xt_error_target
-#define ipt_counters xt_counters
-#define IPT_CONTINUE XT_CONTINUE
-#define IPT_RETURN XT_RETURN
-
-/* This group is older than old (iptables < v1.4.0-rc1~89) */
-#include <linux/netfilter/xt_tcpudp.h>
-#define ipt_udp xt_udp
-#define ipt_tcp xt_tcp
-#define IPT_TCP_INV_SRCPT       XT_TCP_INV_SRCPT
-#define IPT_TCP_INV_DSTPT       XT_TCP_INV_DSTPT
-#define IPT_TCP_INV_FLAGS       XT_TCP_INV_FLAGS
-#define IPT_TCP_INV_OPTION      XT_TCP_INV_OPTION
-#define IPT_TCP_INV_MASK        XT_TCP_INV_MASK
-#define IPT_UDP_INV_SRCPT       XT_UDP_INV_SRCPT
-#define IPT_UDP_INV_DSTPT       XT_UDP_INV_DSTPT
-#define IPT_UDP_INV_MASK        XT_UDP_INV_MASK
-
-/* The argument to IPT_SO_ADD_COUNTERS. */
-#define ipt_counters_info xt_counters_info
-/* Standard return verdict, or do jump. */
-#define IPT_STANDARD_TARGET XT_STANDARD_TARGET
-/* Error verdict. */
-#define IPT_ERROR_TARGET XT_ERROR_TARGET
-
-/* fn returns 0 to continue iteration */
-#define IPT_MATCH_ITERATE(e, fn, args...) \
-        XT_MATCH_ITERATE(struct ipt_entry, e, fn, ## args)
-
-/* fn returns 0 to continue iteration */
-#define IPT_ENTRY_ITERATE(entries, size, fn, args...) \
-        XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args)
-#endif
-
-/* Yes, Virginia, you have to zero the padding. */
-struct ipt_ip {
-        /* Source and destination IP addr */
-        struct in_addr src, dst;
-        /* Mask for src and dest IP addr */
-        struct in_addr smsk, dmsk;
-        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-        /* Protocol, 0 = ANY */
-        __u16 proto;
-
-        /* Flags word */
-        __u8 flags;
-        /* Inverse flags */
-        __u8 invflags;
-};
-
-/* Values for "flag" field in struct ipt_ip (general ip structure). */
-#define IPT_F_FRAG              0x01    /* Set if rule is a fragment rule */
-#define IPT_F_GOTO              0x02    /* Set if jump is a goto */
-#define IPT_F_MASK              0x03    /* All possible flag bits mask. */
-
-/* Values for "inv" field in struct ipt_ip. */
-#define IPT_INV_VIA_IN          0x01    /* Invert the sense of IN IFACE. */
-#define IPT_INV_VIA_OUT         0x02    /* Invert the sense of OUT IFACE */
-#define IPT_INV_TOS             0x04    /* Invert the sense of TOS. */
-#define IPT_INV_SRCIP           0x08    /* Invert the sense of SRC IP. */
-#define IPT_INV_DSTIP           0x10    /* Invert the sense of DST OP. */
-#define IPT_INV_FRAG            0x20    /* Invert the sense of FRAG. */
-#define IPT_INV_PROTO           XT_INV_PROTO
-#define IPT_INV_MASK            0x7F    /* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general IP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct ipt_entry {
-        struct ipt_ip ip;
-
-        /* Mark with fields that we care about. */
-        unsigned int nfcache;
-
-        /* Size of ipt_entry + matches */
-        __u16 target_offset;
-        /* Size of ipt_entry + matches + target */
-        __u16 next_offset;
-
-        /* Back pointer */
-        unsigned int comefrom;
-
-        /* Packet and byte counters. */
-        struct xt_counters counters;
-
-        /* The matches (if any), then the target. */
-        unsigned char elems[0];
-};
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in.h before adding new number here.
- */
-#define IPT_BASE_CTL            64
-
-#define IPT_SO_SET_REPLACE      (IPT_BASE_CTL)
-#define IPT_SO_SET_ADD_COUNTERS (IPT_BASE_CTL + 1)
-#define IPT_SO_SET_MAX          IPT_SO_SET_ADD_COUNTERS
-
-#define IPT_SO_GET_INFO                 (IPT_BASE_CTL)
-#define IPT_SO_GET_ENTRIES              (IPT_BASE_CTL + 1)
-#define IPT_SO_GET_REVISION_MATCH       (IPT_BASE_CTL + 2)
-#define IPT_SO_GET_REVISION_TARGET      (IPT_BASE_CTL + 3)
-#define IPT_SO_GET_MAX                  IPT_SO_GET_REVISION_TARGET
-
-/* ICMP matching stuff */
-struct ipt_icmp {
-        __u8 type;                              /* type to match */
-        __u8 code[2];                           /* range of code */
-        __u8 invflags;                          /* Inverse flags */
-};
-
-/* Values for "inv" field for struct ipt_icmp. */
-#define IPT_ICMP_INV    0x01    /* Invert the sense of type/code test */
-
-/* The argument to IPT_SO_GET_INFO */
-struct ipt_getinfo {
-        /* Which table: caller fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Kernel fills these in. */
-        /* Which hook entry points are valid: bitmask */
-        unsigned int valid_hooks;
-
-        /* Hook entry points: one per netfilter hook. */
-        unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_INET_NUMHOOKS];
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Size of entries. */
-        unsigned int size;
-};
-
-/* The argument to IPT_SO_SET_REPLACE. */
-struct ipt_replace {
-        /* Which table. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-        unsigned int valid_hooks;
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Total size of new entries */
-        unsigned int size;
-
-        /* Hook entry points. */
-        unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_INET_NUMHOOKS];
-
-        /* Information about old entries: */
-        /* Number of counters (must be equal to current number of entries). */
-        unsigned int num_counters;
-        /* The old entries' counters. */
-        struct xt_counters __user *counters;
-
-        /* The entries (hang off end: not really an array). */
-        struct ipt_entry entries[0];
-};
-
-/* The argument to IPT_SO_GET_ENTRIES. */
-struct ipt_get_entries {
-        /* Which table: user fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* User fills this in: total entry size. */
-        unsigned int size;
-
-        /* The entries. */
-        struct ipt_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *
-ipt_get_target(struct ipt_entry *e)
-{
-        return (void *)e + e->target_offset;
-}
-
-/*
- *      Main firewall chains definitions and global var's definitions.
- */
-#ifdef __KERNEL__
 
 #include <linux/init.h>
+#include <uapi/linux/netfilter_ipv4/ip_tables.h>
+
 extern void ipt_init(void) __init;
 
 extern struct xt_table *ipt_register_table(struct net *net,
@@ -303,5 +90,4 @@ compat_ipt_get_target(struct compat_ipt_entry *e)
 }
 
 #endif /* CONFIG_COMPAT */
-#endif /*__KERNEL__*/
 #endif /* _IPTABLES_H */
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 7c8a513ce7a3..98ffb54988b6 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -1,81 +1,14 @@
-#ifndef __LINUX_IP6_NETFILTER_H
-#define __LINUX_IP6_NETFILTER_H
-
 /* IPv6-specific defines for netfilter. 
  * (C)1998 Rusty Russell -- This code is GPL.
  * (C)1999 David Jeffery
  *   this header was blatantly ripped from netfilter_ipv4.h 
  *   it's amazing what adding a bunch of 6s can do =8^)
  */
+#ifndef __LINUX_IP6_NETFILTER_H
+#define __LINUX_IP6_NETFILTER_H
 
-#include <linux/netfilter.h>
-
-/* only for userspace compatibility */
-#ifndef __KERNEL__
-
-#include <limits.h> /* for INT_MIN, INT_MAX */
-
-/* IP Cache bits. */
-/* Src IP address. */
-#define NFC_IP6_SRC              0x0001
-/* Dest IP address. */
-#define NFC_IP6_DST              0x0002
-/* Input device. */
-#define NFC_IP6_IF_IN            0x0004
-/* Output device. */
-#define NFC_IP6_IF_OUT           0x0008
-/* TOS. */
-#define NFC_IP6_TOS              0x0010
-/* Protocol. */
-#define NFC_IP6_PROTO            0x0020
-/* IP options. */
-#define NFC_IP6_OPTIONS          0x0040
-/* Frag & flags. */
-#define NFC_IP6_FRAG             0x0080
-
-
-/* Per-protocol information: only matters if proto match. */
-/* TCP flags. */
-#define NFC_IP6_TCPFLAGS         0x0100
-/* Source port. */
-#define NFC_IP6_SRC_PT           0x0200
-/* Dest port. */
-#define NFC_IP6_DST_PT           0x0400
-/* Something else about the proto */
-#define NFC_IP6_PROTO_UNKNOWN    0x2000
-
-/* IP6 Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_IP6_PRE_ROUTING      0
-/* If the packet is destined for this box. */
-#define NF_IP6_LOCAL_IN         1
-/* If the packet is destined for another interface. */
-#define NF_IP6_FORWARD          2
-/* Packets coming from a local process. */
-#define NF_IP6_LOCAL_OUT                3
-/* Packets about to hit the wire. */
-#define NF_IP6_POST_ROUTING     4
-#define NF_IP6_NUMHOOKS         5
-#endif /* ! __KERNEL__ */
-
-
-enum nf_ip6_hook_priorities {
-        NF_IP6_PRI_FIRST = INT_MIN,
-        NF_IP6_PRI_CONNTRACK_DEFRAG = -400,
-        NF_IP6_PRI_RAW = -300,
-        NF_IP6_PRI_SELINUX_FIRST = -225,
-        NF_IP6_PRI_CONNTRACK = -200,
-        NF_IP6_PRI_MANGLE = -150,
-        NF_IP6_PRI_NAT_DST = -100,
-        NF_IP6_PRI_FILTER = 0,
-        NF_IP6_PRI_SECURITY = 50,
-        NF_IP6_PRI_NAT_SRC = 100,
-        NF_IP6_PRI_SELINUX_LAST = 225,
-        NF_IP6_PRI_CONNTRACK_HELPER = 300,
-        NF_IP6_PRI_LAST = INT_MAX,
-};
+#include <uapi/linux/netfilter_ipv6.h>
 
-#ifdef  __KERNEL__
 
 #ifdef CONFIG_NETFILTER
 extern int ip6_route_me_harder(struct sk_buff *skb);
@@ -89,6 +22,4 @@ static inline int ipv6_netfilter_init(void) { return 0; }
 static inline void ipv6_netfilter_fini(void) { return; }
 #endif /* CONFIG_NETFILTER */
 
-#endif /* __KERNEL__ */
-
 #endif /*__LINUX_IP6_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
deleted file mode 100644
index b88c0058bf73..000000000000
--- a/include/linux/netfilter_ipv6/Kbuild
+++ /dev/null
@@ -1,12 +0,0 @@
-header-y += ip6_tables.h
-header-y += ip6t_HL.h
-header-y += ip6t_LOG.h
-header-y += ip6t_NPT.h
-header-y += ip6t_REJECT.h
-header-y += ip6t_ah.h
-header-y += ip6t_frag.h
-header-y += ip6t_hl.h
-header-y += ip6t_ipv6header.h
-header-y += ip6t_mh.h
-header-y += ip6t_opts.h
-header-y += ip6t_rt.h
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 08c2cbbaa32b..5f84c6229dc6 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -11,268 +11,17 @@
  *      flags are stored in host byte order (of course).
  *      Port numbers are stored in HOST byte order.
  */
-
 #ifndef _IP6_TABLES_H
 #define _IP6_TABLES_H
 
-#ifdef __KERNEL__
 #include <linux/if.h>
 #include <linux/in6.h>
 #include <linux/ipv6.h>
 #include <linux/skbuff.h>
-#endif
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/netfilter_ipv6.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#ifndef __KERNEL__
-#define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define ip6t_match xt_match
-#define ip6t_target xt_target
-#define ip6t_table xt_table
-#define ip6t_get_revision xt_get_revision
-#define ip6t_entry_match xt_entry_match
-#define ip6t_entry_target xt_entry_target
-#define ip6t_standard_target xt_standard_target
-#define ip6t_error_target xt_error_target
-#define ip6t_counters xt_counters
-#define IP6T_CONTINUE XT_CONTINUE
-#define IP6T_RETURN XT_RETURN
-
-/* Pre-iptables-1.4.0 */
-#include <linux/netfilter/xt_tcpudp.h>
-#define ip6t_tcp xt_tcp
-#define ip6t_udp xt_udp
-#define IP6T_TCP_INV_SRCPT      XT_TCP_INV_SRCPT
-#define IP6T_TCP_INV_DSTPT      XT_TCP_INV_DSTPT
-#define IP6T_TCP_INV_FLAGS      XT_TCP_INV_FLAGS
-#define IP6T_TCP_INV_OPTION     XT_TCP_INV_OPTION
-#define IP6T_TCP_INV_MASK       XT_TCP_INV_MASK
-#define IP6T_UDP_INV_SRCPT      XT_UDP_INV_SRCPT
-#define IP6T_UDP_INV_DSTPT      XT_UDP_INV_DSTPT
-#define IP6T_UDP_INV_MASK       XT_UDP_INV_MASK
-
-#define ip6t_counters_info xt_counters_info
-#define IP6T_STANDARD_TARGET XT_STANDARD_TARGET
-#define IP6T_ERROR_TARGET XT_ERROR_TARGET
-#define IP6T_MATCH_ITERATE(e, fn, args...) \
-        XT_MATCH_ITERATE(struct ip6t_entry, e, fn, ## args)
-#define IP6T_ENTRY_ITERATE(entries, size, fn, args...) \
-        XT_ENTRY_ITERATE(struct ip6t_entry, entries, size, fn, ## args)
-#endif
-
-/* Yes, Virginia, you have to zero the padding. */
-struct ip6t_ip6 {
-        /* Source and destination IP6 addr */
-        struct in6_addr src, dst;               
-        /* Mask for src and dest IP6 addr */
-        struct in6_addr smsk, dmsk;
-        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-        /* Upper protocol number
-         * - The allowed value is 0 (any) or protocol number of last parsable
-         *   header, which is 50 (ESP), 59 (No Next Header), 135 (MH), or
-         *   the non IPv6 extension headers.
-         * - The protocol numbers of IPv6 extension headers except of ESP and
-         *   MH do not match any packets.
-         * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
-         */
-        __u16 proto;
-        /* TOS to match iff flags & IP6T_F_TOS */
-        __u8 tos;
-
-        /* Flags word */
-        __u8 flags;
-        /* Inverse flags */
-        __u8 invflags;
-};
-
-/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
-#define IP6T_F_PROTO            0x01    /* Set if rule cares about upper 
-                                           protocols */
-#define IP6T_F_TOS              0x02    /* Match the TOS. */
-#define IP6T_F_GOTO             0x04    /* Set if jump is a goto */
-#define IP6T_F_MASK             0x07    /* All possible flag bits mask. */
-
-/* Values for "inv" field in struct ip6t_ip6. */
-#define IP6T_INV_VIA_IN         0x01    /* Invert the sense of IN IFACE. */
-#define IP6T_INV_VIA_OUT                0x02    /* Invert the sense of OUT IFACE */
-#define IP6T_INV_TOS            0x04    /* Invert the sense of TOS. */
-#define IP6T_INV_SRCIP          0x08    /* Invert the sense of SRC IP. */
-#define IP6T_INV_DSTIP          0x10    /* Invert the sense of DST OP. */
-#define IP6T_INV_FRAG           0x20    /* Invert the sense of FRAG. */
-#define IP6T_INV_PROTO          XT_INV_PROTO
-#define IP6T_INV_MASK           0x7F    /* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general IP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct ip6t_entry {
-        struct ip6t_ip6 ipv6;
-
-        /* Mark with fields that we care about. */
-        unsigned int nfcache;
-
-        /* Size of ipt_entry + matches */
-        __u16 target_offset;
-        /* Size of ipt_entry + matches + target */
-        __u16 next_offset;
-
-        /* Back pointer */
-        unsigned int comefrom;
-
-        /* Packet and byte counters. */
-        struct xt_counters counters;
-
-        /* The matches (if any), then the target. */
-        unsigned char elems[0];
-};
-
-/* Standard entry */
-struct ip6t_standard {
-        struct ip6t_entry entry;
-        struct xt_standard_target target;
-};
-
-struct ip6t_error {
-        struct ip6t_entry entry;
-        struct xt_error_target target;
-};
-
-#define IP6T_ENTRY_INIT(__size)                                                \
-{                                                                              \
-        .target_offset  = sizeof(struct ip6t_entry),                           \
-        .next_offset    = (__size),                                            \
-}
-
-#define IP6T_STANDARD_INIT(__verdict)                                          \
-{                                                                              \
-        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_standard)),       \
-        .target         = XT_TARGET_INIT(XT_STANDARD_TARGET,                   \
-                                         sizeof(struct xt_standard_target)),   \
-        .target.verdict = -(__verdict) - 1,                                    \
-}
-
-#define IP6T_ERROR_INIT                                                        \
-{                                                                              \
-        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_error)),          \
-        .target         = XT_TARGET_INIT(XT_ERROR_TARGET,                      \
-                                         sizeof(struct xt_error_target)),      \
-        .target.errorname = "ERROR",                                           \
-}
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use
- * a raw socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in6.h before adding new number here.
- */
-#define IP6T_BASE_CTL                   64
-
-#define IP6T_SO_SET_REPLACE             (IP6T_BASE_CTL)
-#define IP6T_SO_SET_ADD_COUNTERS        (IP6T_BASE_CTL + 1)
-#define IP6T_SO_SET_MAX                 IP6T_SO_SET_ADD_COUNTERS
-
-#define IP6T_SO_GET_INFO                (IP6T_BASE_CTL)
-#define IP6T_SO_GET_ENTRIES             (IP6T_BASE_CTL + 1)
-#define IP6T_SO_GET_REVISION_MATCH      (IP6T_BASE_CTL + 4)
-#define IP6T_SO_GET_REVISION_TARGET     (IP6T_BASE_CTL + 5)
-#define IP6T_SO_GET_MAX                 IP6T_SO_GET_REVISION_TARGET
-
-/* ICMP matching stuff */
-struct ip6t_icmp {
-        __u8 type;                              /* type to match */
-        __u8 code[2];                           /* range of code */
-        __u8 invflags;                          /* Inverse flags */
-};
-
-/* Values for "inv" field for struct ipt_icmp. */
-#define IP6T_ICMP_INV   0x01    /* Invert the sense of type/code test */
-
-/* The argument to IP6T_SO_GET_INFO */
-struct ip6t_getinfo {
-        /* Which table: caller fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Kernel fills these in. */
-        /* Which hook entry points are valid: bitmask */
-        unsigned int valid_hooks;
-
-        /* Hook entry points: one per netfilter hook. */
-        unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_INET_NUMHOOKS];
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Size of entries. */
-        unsigned int size;
-};
-
-/* The argument to IP6T_SO_SET_REPLACE. */
-struct ip6t_replace {
-        /* Which table. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-        unsigned int valid_hooks;
-
-        /* Number of entries */
-        unsigned int num_entries;
-
-        /* Total size of new entries */
-        unsigned int size;
-
-        /* Hook entry points. */
-        unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-        /* Underflow points. */
-        unsigned int underflow[NF_INET_NUMHOOKS];
-
-        /* Information about old entries: */
-        /* Number of counters (must be equal to current number of entries). */
-        unsigned int num_counters;
-        /* The old entries' counters. */
-        struct xt_counters __user *counters;
-
-        /* The entries (hang off end: not really an array). */
-        struct ip6t_entry entries[0];
-};
-
-/* The argument to IP6T_SO_GET_ENTRIES. */
-struct ip6t_get_entries {
-        /* Which table: user fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-
-        /* User fills this in: total entry size. */
-        unsigned int size;
-
-        /* The entries. */
-        struct ip6t_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *
-ip6t_get_target(struct ip6t_entry *e)
-{
-        return (void *)e + e->target_offset;
-}
-
-/*
- *      Main firewall chains definitions and global var's definitions.
- */
-
-#ifdef __KERNEL__
 
 #include <linux/init.h>
+#include <uapi/linux/netfilter_ipv6/ip6_tables.h>
+
 extern void ip6t_init(void) __init;
 
 extern void *ip6t_alloc_initial_table(const struct xt_table *);
@@ -327,5 +76,4 @@ compat_ip6t_get_target(struct compat_ip6t_entry *e)
 }
 
 #endif /* CONFIG_COMPAT */
-#endif /*__KERNEL__*/
 #endif /* _IP6_TABLES_H */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index f80c56ac4d82..e0f746b7b95c 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -1,160 +1,12 @@
 #ifndef __LINUX_NETLINK_H
 #define __LINUX_NETLINK_H
 
-#include <linux/socket.h> /* for __kernel_sa_family_t */
-#include <linux/types.h>
-
-#define NETLINK_ROUTE           0       /* Routing/device hook                          */
-#define NETLINK_UNUSED          1       /* Unused number                                */
-#define NETLINK_USERSOCK        2       /* Reserved for user mode socket protocols      */
-#define NETLINK_FIREWALL        3       /* Unused number, formerly ip_queue             */
-#define NETLINK_SOCK_DIAG       4       /* socket monitoring                            */
-#define NETLINK_NFLOG           5       /* netfilter/iptables ULOG */
-#define NETLINK_XFRM            6       /* ipsec */
-#define NETLINK_SELINUX         7       /* SELinux event notifications */
-#define NETLINK_ISCSI           8       /* Open-iSCSI */
-#define NETLINK_AUDIT           9       /* auditing */
-#define NETLINK_FIB_LOOKUP      10      
-#define NETLINK_CONNECTOR       11
-#define NETLINK_NETFILTER       12      /* netfilter subsystem */
-#define NETLINK_IP6_FW          13
-#define NETLINK_DNRTMSG         14      /* DECnet routing messages */
-#define NETLINK_KOBJECT_UEVENT  15      /* Kernel messages to userspace */
-#define NETLINK_GENERIC         16
-/* leave room for NETLINK_DM (DM Events) */
-#define NETLINK_SCSITRANSPORT   18      /* SCSI Transports */
-#define NETLINK_ECRYPTFS        19
-#define NETLINK_RDMA            20
-#define NETLINK_CRYPTO          21      /* Crypto layer */
-
-#define NETLINK_INET_DIAG       NETLINK_SOCK_DIAG
-
-#define MAX_LINKS 32            
-
-struct sockaddr_nl {
-        __kernel_sa_family_t    nl_family;      /* AF_NETLINK   */
-        unsigned short  nl_pad;         /* zero         */
-        __u32           nl_pid;         /* port ID      */
-        __u32           nl_groups;      /* multicast groups mask */
-};
-
-struct nlmsghdr {
-        __u32           nlmsg_len;      /* Length of message including header */
-        __u16           nlmsg_type;     /* Message content */
-        __u16           nlmsg_flags;    /* Additional flags */
-        __u32           nlmsg_seq;      /* Sequence number */
-        __u32           nlmsg_pid;      /* Sending process port ID */
-};
-
-/* Flags values */
-
-#define NLM_F_REQUEST           1       /* It is request message.       */
-#define NLM_F_MULTI             2       /* Multipart message, terminated by NLMSG_DONE */
-#define NLM_F_ACK               4       /* Reply with ack, with zero or error code */
-#define NLM_F_ECHO              8       /* Echo this request            */
-#define NLM_F_DUMP_INTR         16      /* Dump was inconsistent due to sequence change */
-
-/* Modifiers to GET request */
-#define NLM_F_ROOT      0x100   /* specify tree root    */
-#define NLM_F_MATCH     0x200   /* return all matching  */
-#define NLM_F_ATOMIC    0x400   /* atomic GET           */
-#define NLM_F_DUMP      (NLM_F_ROOT|NLM_F_MATCH)
-
-/* Modifiers to NEW request */
-#define NLM_F_REPLACE   0x100   /* Override existing            */
-#define NLM_F_EXCL      0x200   /* Do not touch, if it exists   */
-#define NLM_F_CREATE    0x400   /* Create, if it does not exist */
-#define NLM_F_APPEND    0x800   /* Add to end of list           */
-
-/*
-   4.4BSD ADD           NLM_F_CREATE|NLM_F_EXCL
-   4.4BSD CHANGE        NLM_F_REPLACE
-
-   True CHANGE          NLM_F_CREATE|NLM_F_REPLACE
-   Append               NLM_F_CREATE
-   Check                NLM_F_EXCL
- */
-
-#define NLMSG_ALIGNTO   4U
-#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
-#define NLMSG_HDRLEN     ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
-#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN))
-#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
-#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
-#define NLMSG_NEXT(nlh,len)      ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
-                                  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
-                           (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
-                           (nlh)->nlmsg_len <= (len))
-#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
-
-#define NLMSG_NOOP              0x1     /* Nothing.             */
-#define NLMSG_ERROR             0x2     /* Error                */
-#define NLMSG_DONE              0x3     /* End of a dump        */
-#define NLMSG_OVERRUN           0x4     /* Data lost            */
-
-#define NLMSG_MIN_TYPE          0x10    /* < 0x10: reserved control messages */
-
-struct nlmsgerr {
-        int             error;
-        struct nlmsghdr msg;
-};
-
-#define NETLINK_ADD_MEMBERSHIP  1
-#define NETLINK_DROP_MEMBERSHIP 2
-#define NETLINK_PKTINFO         3
-#define NETLINK_BROADCAST_ERROR 4
-#define NETLINK_NO_ENOBUFS      5
-
-struct nl_pktinfo {
-        __u32   group;
-};
-
-#define NET_MAJOR 36            /* Major 36 is reserved for networking                                          */
-
-enum {
-        NETLINK_UNCONNECTED = 0,
-        NETLINK_CONNECTED,
-};
-
-/*
- *  <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)-->
- * +---------------------+- - -+- - - - - - - - - -+- - -+
- * |        Header       | Pad |     Payload       | Pad |
- * |   (struct nlattr)   | ing |                   | ing |
- * +---------------------+- - -+- - - - - - - - - -+- - -+
- *  <-------------- nlattr->nla_len -------------->
- */
-
-struct nlattr {
-        __u16           nla_len;
-        __u16           nla_type;
-};
-
-/*
- * nla_type (16 bits)
- * +---+---+-------------------------------+
- * | N | O | Attribute Type                |
- * +---+---+-------------------------------+
- * N := Carries nested attributes
- * O := Payload stored in network byte order
- *
- * Note: The N and O flag are mutually exclusive.
- */
-#define NLA_F_NESTED            (1 << 15)
-#define NLA_F_NET_BYTEORDER     (1 << 14)
-#define NLA_TYPE_MASK           ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
-
-#define NLA_ALIGNTO             4
-#define NLA_ALIGN(len)          (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
-#define NLA_HDRLEN              ((int) NLA_ALIGN(sizeof(struct nlattr)))
-
-#ifdef __KERNEL__
 
 #include <linux/capability.h>
 #include <linux/skbuff.h>
 #include <linux/export.h>
 #include <net/scm.h>
+#include <uapi/linux/netlink.h>
 
 struct net;
 
@@ -245,6 +97,8 @@ struct netlink_callback {
                                         struct netlink_callback *cb);
         int                     (*done)(struct netlink_callback *cb);
         void                    *data;
+        /* the module that dump function belong to */
+        struct module           *module;
         u16                     family;
         u16                     min_dump_alloc;
         unsigned int            prev_seq, seq;
@@ -262,15 +116,23 @@ __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int fla
 
 struct netlink_dump_control {
         int (*dump)(struct sk_buff *skb, struct netlink_callback *);
-        int (*done)(struct netlink_callback*);
+        int (*done)(struct netlink_callback *);
         void *data;
+        struct module *module;
         u16 min_dump_alloc;
 };
 
-extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
-                              const struct nlmsghdr *nlh,
-                              struct netlink_dump_control *control);
+extern int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+                                const struct nlmsghdr *nlh,
+                                struct netlink_dump_control *control);
+static inline int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+                                     const struct nlmsghdr *nlh,
+                                     struct netlink_dump_control *control)
+{
+        if (!control->module)
+                control->module = THIS_MODULE;
 
-#endif /* __KERNEL__ */
+        return __netlink_dump_start(ssk, skb, nlh, control);
+}
 
 #endif  /* __LINUX_NETLINK_H */
diff --git a/include/linux/nfs.h b/include/linux/nfs.h
index 6d1fb63f5922..3e794c12e90a 100644
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
@@ -7,130 +7,9 @@
 #ifndef _LINUX_NFS_H
 #define _LINUX_NFS_H
 
-#define NFS_PROGRAM     100003
-#define NFS_PORT        2049
-#define NFS_MAXDATA     8192
-#define NFS_MAXPATHLEN  1024
-#define NFS_MAXNAMLEN   255
-#define NFS_MAXGROUPS   16
-#define NFS_FHSIZE      32
-#define NFS_COOKIESIZE  4
-#define NFS_FIFO_DEV    (-1)
-#define NFSMODE_FMT     0170000
-#define NFSMODE_DIR     0040000
-#define NFSMODE_CHR     0020000
-#define NFSMODE_BLK     0060000
-#define NFSMODE_REG     0100000
-#define NFSMODE_LNK     0120000
-#define NFSMODE_SOCK    0140000
-#define NFSMODE_FIFO    0010000
-
-#define NFS_MNT_PROGRAM         100005
-#define NFS_MNT_VERSION         1
-#define NFS_MNT3_VERSION        3
-
-#define NFS_PIPE_DIRNAME "nfs"
-
-/*
- * NFS stats. The good thing with these values is that NFSv3 errors are
- * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
- * no-one uses anyway), so we can happily mix code as long as we make sure
- * no NFSv3 errors are returned to NFSv2 clients.
- * Error codes that have a `--' in the v2 column are not part of the
- * standard, but seem to be widely used nevertheless.
- */
- enum nfs_stat {
-        NFS_OK = 0,                     /* v2 v3 v4 */
-        NFSERR_PERM = 1,                /* v2 v3 v4 */
-        NFSERR_NOENT = 2,               /* v2 v3 v4 */
-        NFSERR_IO = 5,                  /* v2 v3 v4 */
-        NFSERR_NXIO = 6,                /* v2 v3 v4 */
-        NFSERR_EAGAIN = 11,             /* v2 v3 */
-        NFSERR_ACCES = 13,              /* v2 v3 v4 */
-        NFSERR_EXIST = 17,              /* v2 v3 v4 */
-        NFSERR_XDEV = 18,               /*    v3 v4 */
-        NFSERR_NODEV = 19,              /* v2 v3 v4 */
-        NFSERR_NOTDIR = 20,             /* v2 v3 v4 */
-        NFSERR_ISDIR = 21,              /* v2 v3 v4 */
-        NFSERR_INVAL = 22,              /* v2 v3 v4 */
-        NFSERR_FBIG = 27,               /* v2 v3 v4 */
-        NFSERR_NOSPC = 28,              /* v2 v3 v4 */
-        NFSERR_ROFS = 30,               /* v2 v3 v4 */
-        NFSERR_MLINK = 31,              /*    v3 v4 */
-        NFSERR_OPNOTSUPP = 45,          /* v2 v3 */
-        NFSERR_NAMETOOLONG = 63,        /* v2 v3 v4 */
-        NFSERR_NOTEMPTY = 66,           /* v2 v3 v4 */
-        NFSERR_DQUOT = 69,              /* v2 v3 v4 */
-        NFSERR_STALE = 70,              /* v2 v3 v4 */
-        NFSERR_REMOTE = 71,             /* v2 v3 */
-        NFSERR_WFLUSH = 99,             /* v2    */
-        NFSERR_BADHANDLE = 10001,       /*    v3 v4 */
-        NFSERR_NOT_SYNC = 10002,        /*    v3 */
-        NFSERR_BAD_COOKIE = 10003,      /*    v3 v4 */
-        NFSERR_NOTSUPP = 10004,         /*    v3 v4 */
-        NFSERR_TOOSMALL = 10005,        /*    v3 v4 */
-        NFSERR_SERVERFAULT = 10006,     /*    v3 v4 */
-        NFSERR_BADTYPE = 10007,         /*    v3 v4 */
-        NFSERR_JUKEBOX = 10008,         /*    v3 v4 */
-        NFSERR_SAME = 10009,            /*       v4 */
-        NFSERR_DENIED = 10010,          /*       v4 */
-        NFSERR_EXPIRED = 10011,         /*       v4 */
-        NFSERR_LOCKED = 10012,          /*       v4 */
-        NFSERR_GRACE = 10013,           /*       v4 */
-        NFSERR_FHEXPIRED = 10014,       /*       v4 */
-        NFSERR_SHARE_DENIED = 10015,    /*       v4 */
-        NFSERR_WRONGSEC = 10016,        /*       v4 */
-        NFSERR_CLID_INUSE = 10017,      /*       v4 */
-        NFSERR_RESOURCE = 10018,        /*       v4 */
-        NFSERR_MOVED = 10019,           /*       v4 */
-        NFSERR_NOFILEHANDLE = 10020,    /*       v4 */
-        NFSERR_MINOR_VERS_MISMATCH = 10021,   /* v4 */
-        NFSERR_STALE_CLIENTID = 10022,  /*       v4 */
-        NFSERR_STALE_STATEID = 10023,   /*       v4 */
-        NFSERR_OLD_STATEID = 10024,     /*       v4 */
-        NFSERR_BAD_STATEID = 10025,     /*       v4 */  
-        NFSERR_BAD_SEQID = 10026,       /*       v4 */
-        NFSERR_NOT_SAME = 10027,        /*       v4 */
-        NFSERR_LOCK_RANGE = 10028,      /*       v4 */
-        NFSERR_SYMLINK = 10029,         /*       v4 */
-        NFSERR_RESTOREFH = 10030,       /*       v4 */
-        NFSERR_LEASE_MOVED = 10031,     /*       v4 */
-        NFSERR_ATTRNOTSUPP = 10032,     /*       v4 */
-        NFSERR_NO_GRACE = 10033,        /*       v4 */
-        NFSERR_RECLAIM_BAD = 10034,     /*       v4 */
-        NFSERR_RECLAIM_CONFLICT = 10035,/*       v4 */
-        NFSERR_BAD_XDR = 10036,         /*       v4 */
-        NFSERR_LOCKS_HELD = 10037,      /*       v4 */
-        NFSERR_OPENMODE = 10038,       /*       v4 */
-        NFSERR_BADOWNER = 10039,       /*       v4 */
-        NFSERR_BADCHAR = 10040,        /*       v4 */
-        NFSERR_BADNAME = 10041,        /*       v4 */
-        NFSERR_BAD_RANGE = 10042,      /*       v4 */
-        NFSERR_LOCK_NOTSUPP = 10043,   /*       v4 */
-        NFSERR_OP_ILLEGAL = 10044,     /*       v4 */
-        NFSERR_DEADLOCK = 10045,       /*       v4 */
-        NFSERR_FILE_OPEN = 10046,      /*       v4 */
-        NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
-        NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-};
-
-/* NFSv2 file types - beware, these are not the same in NFSv3 */
-
-enum nfs_ftype {
-        NFNON = 0,
-        NFREG = 1,
-        NFDIR = 2,
-        NFBLK = 3,
-        NFCHR = 4,
-        NFLNK = 5,
-        NFSOCK = 6,
-        NFBAD = 7,
-        NFFIFO = 8
-};
-
-#ifdef __KERNEL__
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/string.h>
+#include <uapi/linux/nfs.h>
 
 /*
  * This is the kernel NFS client file handle representation
@@ -169,5 +48,4 @@ enum nfs3_stable_how {
         NFS_DATA_SYNC = 1,
         NFS_FILE_SYNC = 2
 };
-#endif /* __KERNEL__ */
 #endif /* _LINUX_NFS_H */
diff --git a/include/linux/nfs3.h b/include/linux/nfs3.h
index 6ccfe3b641e1..a778ad8e3afd 100644
--- a/include/linux/nfs3.h
+++ b/include/linux/nfs3.h
@@ -4,100 +4,10 @@
 #ifndef _LINUX_NFS3_H
 #define _LINUX_NFS3_H
 
-#define NFS3_PORT               2049
-#define NFS3_MAXDATA            32768
-#define NFS3_MAXPATHLEN         PATH_MAX
-#define NFS3_MAXNAMLEN          NAME_MAX
-#define NFS3_MAXGROUPS          16
-#define NFS3_FHSIZE             64
-#define NFS3_COOKIESIZE         4
-#define NFS3_CREATEVERFSIZE     8
-#define NFS3_COOKIEVERFSIZE     8
-#define NFS3_WRITEVERFSIZE      8
-#define NFS3_FIFO_DEV           (-1)
-#define NFS3MODE_FMT            0170000
-#define NFS3MODE_DIR            0040000
-#define NFS3MODE_CHR            0020000
-#define NFS3MODE_BLK            0060000
-#define NFS3MODE_REG            0100000
-#define NFS3MODE_LNK            0120000
-#define NFS3MODE_SOCK           0140000
-#define NFS3MODE_FIFO           0010000
+#include <uapi/linux/nfs3.h>
 
-/* Flags for access() call */
-#define NFS3_ACCESS_READ        0x0001
-#define NFS3_ACCESS_LOOKUP      0x0002
-#define NFS3_ACCESS_MODIFY      0x0004
-#define NFS3_ACCESS_EXTEND      0x0008
-#define NFS3_ACCESS_DELETE      0x0010
-#define NFS3_ACCESS_EXECUTE     0x0020
-#define NFS3_ACCESS_FULL        0x003f
-
-/* Flags for create mode */
-enum nfs3_createmode {
-        NFS3_CREATE_UNCHECKED = 0,
-        NFS3_CREATE_GUARDED = 1,
-        NFS3_CREATE_EXCLUSIVE = 2
-};
-
-/* NFSv3 file system properties */
-#define NFS3_FSF_LINK           0x0001
-#define NFS3_FSF_SYMLINK        0x0002
-#define NFS3_FSF_HOMOGENEOUS    0x0008
-#define NFS3_FSF_CANSETTIME     0x0010
-/* Some shorthands. See fs/nfsd/nfs3proc.c */
-#define NFS3_FSF_DEFAULT        0x001B
-#define NFS3_FSF_BILLYBOY       0x0018
-#define NFS3_FSF_READONLY       0x0008
-
-enum nfs3_ftype {
-        NF3NON  = 0,
-        NF3REG  = 1,
-        NF3DIR  = 2,
-        NF3BLK  = 3,
-        NF3CHR  = 4,
-        NF3LNK  = 5,
-        NF3SOCK = 6,
-        NF3FIFO = 7,    /* changed from NFSv2 (was 8) */
-        NF3BAD  = 8
-};
-
-struct nfs3_fh {
-        unsigned short size;
-        unsigned char  data[NFS3_FHSIZE];
-};
-
-#define NFS3_VERSION            3
-#define NFS3PROC_NULL           0
-#define NFS3PROC_GETATTR        1
-#define NFS3PROC_SETATTR        2
-#define NFS3PROC_LOOKUP         3
-#define NFS3PROC_ACCESS         4
-#define NFS3PROC_READLINK       5
-#define NFS3PROC_READ           6
-#define NFS3PROC_WRITE          7
-#define NFS3PROC_CREATE         8
-#define NFS3PROC_MKDIR          9
-#define NFS3PROC_SYMLINK        10
-#define NFS3PROC_MKNOD          11
-#define NFS3PROC_REMOVE         12
-#define NFS3PROC_RMDIR          13
-#define NFS3PROC_RENAME         14
-#define NFS3PROC_LINK           15
-#define NFS3PROC_READDIR        16
-#define NFS3PROC_READDIRPLUS    17
-#define NFS3PROC_FSSTAT         18
-#define NFS3PROC_FSINFO         19
-#define NFS3PROC_PATHCONF       20
-#define NFS3PROC_COMMIT         21
-
-#define NFS_MNT3_VERSION        3
- 
-
-#if defined(__KERNEL__)
 
 /* Number of 32bit words in post_op_attr */
 #define NFS3_POST_OP_ATTR_WORDS         22
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_NFS3_H */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index af2d2fa30eee..e111fa419a4e 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -9,168 +9,11 @@
  *  Kendrick Smith <kmsmith@umich.edu>
  *  Andy Adamson   <andros@umich.edu>
  */
-
 #ifndef _LINUX_NFS4_H
 #define _LINUX_NFS4_H
 
-#include <linux/types.h>
-
-#define NFS4_BITMAP_SIZE        2
-#define NFS4_VERIFIER_SIZE      8
-#define NFS4_STATEID_SEQID_SIZE 4
-#define NFS4_STATEID_OTHER_SIZE 12
-#define NFS4_STATEID_SIZE       (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE)
-#define NFS4_FHSIZE             128
-#define NFS4_MAXPATHLEN         PATH_MAX
-#define NFS4_MAXNAMLEN          NAME_MAX
-#define NFS4_OPAQUE_LIMIT       1024
-#define NFS4_MAX_SESSIONID_LEN  16
-
-#define NFS4_ACCESS_READ        0x0001
-#define NFS4_ACCESS_LOOKUP      0x0002
-#define NFS4_ACCESS_MODIFY      0x0004
-#define NFS4_ACCESS_EXTEND      0x0008
-#define NFS4_ACCESS_DELETE      0x0010
-#define NFS4_ACCESS_EXECUTE     0x0020
-
-#define NFS4_FH_PERSISTENT              0x0000
-#define NFS4_FH_NOEXPIRE_WITH_OPEN      0x0001
-#define NFS4_FH_VOLATILE_ANY            0x0002
-#define NFS4_FH_VOL_MIGRATION           0x0004
-#define NFS4_FH_VOL_RENAME              0x0008
-
-#define NFS4_OPEN_RESULT_CONFIRM 0x0002
-#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
-
-#define NFS4_SHARE_ACCESS_MASK  0x000F
-#define NFS4_SHARE_ACCESS_READ  0x0001
-#define NFS4_SHARE_ACCESS_WRITE 0x0002
-#define NFS4_SHARE_ACCESS_BOTH  0x0003
-#define NFS4_SHARE_DENY_READ    0x0001
-#define NFS4_SHARE_DENY_WRITE   0x0002
-#define NFS4_SHARE_DENY_BOTH    0x0003
-
-/* nfs41 */
-#define NFS4_SHARE_WANT_MASK            0xFF00
-#define NFS4_SHARE_WANT_NO_PREFERENCE   0x0000
-#define NFS4_SHARE_WANT_READ_DELEG      0x0100
-#define NFS4_SHARE_WANT_WRITE_DELEG     0x0200
-#define NFS4_SHARE_WANT_ANY_DELEG       0x0300
-#define NFS4_SHARE_WANT_NO_DELEG        0x0400
-#define NFS4_SHARE_WANT_CANCEL          0x0500
-
-#define NFS4_SHARE_WHEN_MASK            0xF0000
-#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL        0x10000
-#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED          0x20000
-
-#define NFS4_CDFC4_FORE 0x1
-#define NFS4_CDFC4_BACK 0x2
-#define NFS4_CDFC4_BOTH 0x3
-#define NFS4_CDFC4_FORE_OR_BOTH 0x3
-#define NFS4_CDFC4_BACK_OR_BOTH 0x7
-
-#define NFS4_CDFS4_FORE 0x1
-#define NFS4_CDFS4_BACK 0x2
-#define NFS4_CDFS4_BOTH 0x3
-
-#define NFS4_SET_TO_SERVER_TIME 0
-#define NFS4_SET_TO_CLIENT_TIME 1
-
-#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
-#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
-#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
-#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
-
-#define ACL4_SUPPORT_ALLOW_ACL 0x01
-#define ACL4_SUPPORT_DENY_ACL  0x02
-#define ACL4_SUPPORT_AUDIT_ACL 0x04
-#define ACL4_SUPPORT_ALARM_ACL 0x08
-
-#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
-#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
-#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
-#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
-#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
-#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
-#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
-
-#define NFS4_ACE_READ_DATA                    0x00000001
-#define NFS4_ACE_LIST_DIRECTORY               0x00000001
-#define NFS4_ACE_WRITE_DATA                   0x00000002
-#define NFS4_ACE_ADD_FILE                     0x00000002
-#define NFS4_ACE_APPEND_DATA                  0x00000004
-#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
-#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
-#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
-#define NFS4_ACE_EXECUTE                      0x00000020
-#define NFS4_ACE_DELETE_CHILD                 0x00000040
-#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
-#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
-#define NFS4_ACE_DELETE                       0x00010000
-#define NFS4_ACE_READ_ACL                     0x00020000
-#define NFS4_ACE_WRITE_ACL                    0x00040000
-#define NFS4_ACE_WRITE_OWNER                  0x00080000
-#define NFS4_ACE_SYNCHRONIZE                  0x00100000
-#define NFS4_ACE_GENERIC_READ                 0x00120081
-#define NFS4_ACE_GENERIC_WRITE                0x00160106
-#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
-#define NFS4_ACE_MASK_ALL                     0x001F01FF
-
-#define EXCHGID4_FLAG_SUPP_MOVED_REFER          0x00000001
-#define EXCHGID4_FLAG_SUPP_MOVED_MIGR           0x00000002
-#define EXCHGID4_FLAG_BIND_PRINC_STATEID        0x00000100
-
-#define EXCHGID4_FLAG_USE_NON_PNFS              0x00010000
-#define EXCHGID4_FLAG_USE_PNFS_MDS              0x00020000
-#define EXCHGID4_FLAG_USE_PNFS_DS               0x00040000
-#define EXCHGID4_FLAG_MASK_PNFS                 0x00070000
-
-#define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A       0x40000000
-#define EXCHGID4_FLAG_CONFIRMED_R               0x80000000
-/*
- * Since the validity of these bits depends on whether
- * they're set in the argument or response, have separate
- * invalid flag masks for arg (_A) and resp (_R).
- */
-#define EXCHGID4_FLAG_MASK_A                    0x40070103
-#define EXCHGID4_FLAG_MASK_R                    0x80070103
-
-#define SEQ4_STATUS_CB_PATH_DOWN                0x00000001
-#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING    0x00000002
-#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED     0x00000004
-#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED   0x00000008
-#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED  0x00000010
-#define SEQ4_STATUS_ADMIN_STATE_REVOKED         0x00000020
-#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED    0x00000040
-#define SEQ4_STATUS_LEASE_MOVED                 0x00000080
-#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED      0x00000100
-#define SEQ4_STATUS_CB_PATH_DOWN_SESSION        0x00000200
-#define SEQ4_STATUS_BACKCHANNEL_FAULT           0x00000400
-
-#define NFS4_SECINFO_STYLE4_CURRENT_FH  0
-#define NFS4_SECINFO_STYLE4_PARENT      1
-
-#define NFS4_MAX_UINT64 (~(u64)0)
-
-/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
- * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
- */
-#define NFS4_MAX_OPS   8
-
-/* Our NFS4 client back channel server only wants the cb_sequene and the
- * actual operation per compound
- */
-#define NFS4_MAX_BACK_CHANNEL_OPS 2
-
-enum nfs4_acl_whotype {
-        NFS4_ACL_WHO_NAMED = 0,
-        NFS4_ACL_WHO_OWNER,
-        NFS4_ACL_WHO_GROUP,
-        NFS4_ACL_WHO_EVERYONE,
-};
-
-#ifdef __KERNEL__
 #include <linux/list.h>
+#include <uapi/linux/nfs4.h>
 
 struct nfs4_ace {
         uint32_t        type;
@@ -673,10 +516,3 @@ struct nfs4_deviceid {
 };
 
 #endif
-#endif
-
-/*
- * Local variables:
- *  c-basic-offset: 8
- * End:
- */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 4b03f56e280e..1cc25682b20b 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -5,38 +5,11 @@
  *
  *  OS-specific nfs filesystem definitions and declarations
  */
-
 #ifndef _LINUX_NFS_FS_H
 #define _LINUX_NFS_FS_H
 
-#include <linux/magic.h>
-
-/* Default timeout values */
-#define NFS_DEF_UDP_TIMEO       (11)
-#define NFS_DEF_UDP_RETRANS     (3)
-#define NFS_DEF_TCP_TIMEO       (600)
-#define NFS_DEF_TCP_RETRANS     (2)
-
-#define NFS_MAX_UDP_TIMEOUT     (60*HZ)
-#define NFS_MAX_TCP_TIMEOUT     (600*HZ)
-
-#define NFS_DEF_ACREGMIN        (3)
-#define NFS_DEF_ACREGMAX        (60)
-#define NFS_DEF_ACDIRMIN        (30)
-#define NFS_DEF_ACDIRMAX        (60)
-
-/*
- * When flushing a cluster of dirty pages, there can be different
- * strategies:
- */
-#define FLUSH_SYNC              1       /* file being synced, or contention */
-#define FLUSH_STABLE            4       /* commit to stable storage */
-#define FLUSH_LOWPRI            8       /* low priority background flush */
-#define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
-#define FLUSH_COND_STABLE       32      /* conditional stable write - only stable
-                                         * if everything fits in one RPC */
+#include <uapi/linux/nfs_fs.h>
 
-#ifdef __KERNEL__
 
 /*
  * Enable dprintk() debugging support for nfs client.
@@ -81,12 +54,16 @@ struct nfs_access_entry {
         int                     mask;
 };
 
+struct nfs_lockowner {
+        fl_owner_t l_owner;
+        pid_t l_pid;
+};
+
 struct nfs_lock_context {
         atomic_t count;
         struct list_head list;
         struct nfs_open_context *open_context;
-        fl_owner_t lockowner;
-        pid_t pid;
+        struct nfs_lockowner lockowner;
 };
 
 struct nfs4_state;
@@ -99,6 +76,7 @@ struct nfs_open_context {
 
         unsigned long flags;
 #define NFS_CONTEXT_ERROR_WRITE         (0)
+#define NFS_CONTEXT_RESEND_WRITES       (1)
         int error;
 
         struct list_head list;
@@ -355,6 +333,8 @@ extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
 extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
+extern void nfs_access_set_mask(struct nfs_access_entry *, u32);
 extern int nfs_permission(struct inode *, int);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
@@ -606,29 +586,6 @@ nfs_fileid_to_ino_t(u64 fileid)
 
 #define NFS_JUKEBOX_RETRY_TIME (5 * HZ)
 
-#endif /* __KERNEL__ */
-
-/*
- * NFS debug flags
- */
-#define NFSDBG_VFS              0x0001
-#define NFSDBG_DIRCACHE         0x0002
-#define NFSDBG_LOOKUPCACHE      0x0004
-#define NFSDBG_PAGECACHE        0x0008
-#define NFSDBG_PROC             0x0010
-#define NFSDBG_XDR              0x0020
-#define NFSDBG_FILE             0x0040
-#define NFSDBG_ROOT             0x0080
-#define NFSDBG_CALLBACK         0x0100
-#define NFSDBG_CLIENT           0x0200
-#define NFSDBG_MOUNT            0x0400
-#define NFSDBG_FSCACHE          0x0800
-#define NFSDBG_PNFS             0x1000
-#define NFSDBG_PNFS_LD          0x2000
-#define NFSDBG_STATE            0x4000
-#define NFSDBG_ALL              0xFFFF
-
-#ifdef __KERNEL__
 
 # undef ifdebug
 # ifdef NFS_DEBUG
@@ -638,6 +595,4 @@ nfs_fileid_to_ino_t(u64 fileid)
 #  define ifdebug(fac)          if (0)
 #  define NFS_IFDEBUG(x)
 # endif
-#endif /* __KERNEL */
-
 #endif
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 310c63c8ab2c..a9e76ee1adca 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -39,6 +39,7 @@ struct nfs_client {
         unsigned long           cl_flags;       /* behavior switches */
 #define NFS_CS_NORESVPORT       0               /* - use ephemeral src port */
 #define NFS_CS_DISCRTRY         1               /* - disconnect on RPC retry */
+#define NFS_CS_MIGRATION        2               /* - transparent state migr */
         struct sockaddr_storage cl_addr;        /* server identifier */
         size_t                  cl_addrlen;
         char *                  cl_hostname;    /* hostname of server */
@@ -81,6 +82,7 @@ struct nfs_client {
         /* The flags used for obtaining the clientid during EXCHANGE_ID */
         u32                     cl_exchange_flags;
         struct nfs4_session     *cl_session;    /* shared session */
+        bool                    cl_preserve_clid;
         struct nfs41_server_owner *cl_serverowner;
         struct nfs41_server_scope *cl_serverscope;
         struct nfs41_impl_id    *cl_implid;
@@ -125,6 +127,7 @@ struct nfs_server {
         unsigned int            namelen;
         unsigned int            options;        /* extra options enabled by mount */
 #define NFS_OPTION_FSCACHE      0x00000001      /* - local caching enabled */
+#define NFS_OPTION_MIGRATION    0x00000002      /* - NFSv4 migration enabled */
 
         struct nfs_fsid         fsid;
         __u64                   maxfilesize;    /* maximum file size */
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index ece91c57ad79..2dcef3ab58b6 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -33,35 +33,11 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef NFS_IDMAP_H
 #define NFS_IDMAP_H
 
-#include <linux/types.h>
-
-/* XXX from bits/utmp.h  */
-#define IDMAP_NAMESZ  128
-
-#define IDMAP_TYPE_USER  0
-#define IDMAP_TYPE_GROUP 1
-
-#define IDMAP_CONV_IDTONAME 0
-#define IDMAP_CONV_NAMETOID 1
+#include <uapi/linux/nfs_idmap.h>
 
-#define IDMAP_STATUS_INVALIDMSG 0x01
-#define IDMAP_STATUS_AGAIN      0x02
-#define IDMAP_STATUS_LOOKUPFAIL 0x04
-#define IDMAP_STATUS_SUCCESS    0x08
-
-struct idmap_msg {
-        __u8  im_type;
-        __u8  im_conv;
-        char  im_name[IDMAP_NAMESZ];
-        __u32 im_id;
-        __u8  im_status;
-};
-
-#ifdef __KERNEL__
 
 /* Forward declaration to make this header independent of others */
 struct nfs_client;
@@ -97,6 +73,4 @@ int nfs_map_uid_to_name(const struct nfs_server *, __u32, char *, size_t);
 int nfs_map_gid_to_group(const struct nfs_server *, __u32, char *, size_t);
 
 extern unsigned int nfs_idmap_cache_timeout;
-#endif /* __KERNEL__ */
-
 #endif /* NFS_IDMAP_H */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index be9cf3c7e79e..a73ea89789d1 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -251,7 +251,6 @@ struct nfs4_layoutget_res {
 struct nfs4_layoutget {
         struct nfs4_layoutget_args args;
         struct nfs4_layoutget_res res;
-        struct pnfs_layout_segment **lsegpp;
         gfp_t gfp_flags;
 };
 
@@ -335,6 +334,7 @@ struct nfs_openargs {
         struct nfs_seqid *      seqid;
         int                     open_flags;
         fmode_t                 fmode;
+        u32                     access;
         __u64                   clientid;
         struct stateowner_id    id;
         union {
@@ -369,6 +369,9 @@ struct nfs_openres {
         struct nfs4_string      *owner;
         struct nfs4_string      *group_owner;
         struct nfs4_sequence_res        seq_res;
+        __u32                   access_request;
+        __u32                   access_supported;
+        __u32                   access_result;
 };
 
 /*
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index fabcb1e5c460..5e69e67b31ab 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -6,30 +6,10 @@
 #ifndef __LINUX_NFSACL_H
 #define __LINUX_NFSACL_H
 
-#define NFS_ACL_PROGRAM 100227
-
-#define ACLPROC2_GETACL         1
-#define ACLPROC2_SETACL         2
-#define ACLPROC2_GETATTR        3
-#define ACLPROC2_ACCESS         4
-
-#define ACLPROC3_GETACL         1
-#define ACLPROC3_SETACL         2
-
-
-/* Flags for the getacl/setacl mode */
-#define NFS_ACL                 0x0001
-#define NFS_ACLCNT              0x0002
-#define NFS_DFACL               0x0004
-#define NFS_DFACLCNT            0x0008
-
-/* Flag for Default ACL entries */
-#define NFS_ACL_DEFAULT         0x1000
-
-#ifdef __KERNEL__
 
 #include <linux/posix_acl.h>
 #include <linux/sunrpc/xdr.h>
+#include <uapi/linux/nfsacl.h>
 
 /* Maximum number of ACL entries over NFS */
 #define NFS_ACL_MAX_ENTRIES     1024
@@ -58,5 +38,4 @@ extern int
 nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,
               struct posix_acl **pacl);
 
-#endif /* __KERNEL__ */
 #endif  /* __LINUX_NFSACL_H */
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
deleted file mode 100644
index 5b7d84ac954a..000000000000
--- a/include/linux/nfsd/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-header-y += cld.h
-header-y += debug.h
-header-y += export.h
-header-y += nfsfh.h
-header-y += stats.h
diff --git a/include/linux/nfsd/debug.h b/include/linux/nfsd/debug.h
index ee4aa91788e7..19ef8375b577 100644
--- a/include/linux/nfsd/debug.h
+++ b/include/linux/nfsd/debug.h
@@ -5,44 +5,15 @@
  *
  * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef LINUX_NFSD_DEBUG_H
 #define LINUX_NFSD_DEBUG_H
 
-#include <linux/sunrpc/debug.h>
+#include <uapi/linux/nfsd/debug.h>
 
-/*
- * Enable debugging for nfsd.
- * Requires RPC_DEBUG.
- */
-#ifdef RPC_DEBUG
-# define NFSD_DEBUG             1
-#endif
-
-/*
- * knfsd debug flags
- */
-#define NFSDDBG_SOCK            0x0001
-#define NFSDDBG_FH              0x0002
-#define NFSDDBG_EXPORT          0x0004
-#define NFSDDBG_SVC             0x0008
-#define NFSDDBG_PROC            0x0010
-#define NFSDDBG_FILEOP          0x0020
-#define NFSDDBG_AUTH            0x0040
-#define NFSDDBG_REPCACHE        0x0080
-#define NFSDDBG_XDR             0x0100
-#define NFSDDBG_LOCKD           0x0200
-#define NFSDDBG_ALL             0x7FFF
-#define NFSDDBG_NOCHANGE        0xFFFF
-
-
-#ifdef __KERNEL__
 # undef ifdebug
 # ifdef NFSD_DEBUG
 #  define ifdebug(flag)         if (nfsd_debug & NFSDDBG_##flag)
 # else
 #  define ifdebug(flag)         if (0)
 # endif
-#endif /* __KERNEL__ */
-
 #endif /* LINUX_NFSD_DEBUG_H */
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index e33f747b173c..24c139288db4 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -6,58 +6,11 @@
  *
  * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef NFSD_EXPORT_H
 #define NFSD_EXPORT_H
 
-# include <linux/types.h>
-#ifdef __KERNEL__
 # include <linux/nfsd/nfsfh.h>
-#endif
-
-/*
- * Important limits for the exports stuff.
- */
-#define NFSCLNT_IDMAX           1024
-#define NFSCLNT_ADDRMAX         16
-#define NFSCLNT_KEYMAX          32
-
-/*
- * Export flags.
- */
-#define NFSEXP_READONLY         0x0001
-#define NFSEXP_INSECURE_PORT    0x0002
-#define NFSEXP_ROOTSQUASH       0x0004
-#define NFSEXP_ALLSQUASH        0x0008
-#define NFSEXP_ASYNC            0x0010
-#define NFSEXP_GATHERED_WRITES  0x0020
-/* 40 80 100 currently unused */
-#define NFSEXP_NOHIDE           0x0200
-#define NFSEXP_NOSUBTREECHECK   0x0400
-#define NFSEXP_NOAUTHNLM        0x0800          /* Don't authenticate NLM requests - just trust */
-#define NFSEXP_MSNFS            0x1000  /* do silly things that MS clients expect; no longer supported */
-#define NFSEXP_FSID             0x2000
-#define NFSEXP_CROSSMOUNT       0x4000
-#define NFSEXP_NOACL            0x8000  /* reserved for possible ACL related use */
-/*
- * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
- * clients, and only to the single directory that is the root of the
- * export; further lookup and readdir operations are treated as if every
- * subdirectory was a mountpoint, and ignored if they are not themselves
- * exported.  This is used by nfsd and mountd to construct the NFSv4
- * pseudofilesystem, which provides access only to paths leading to each
- * exported filesystem.
- */
-#define NFSEXP_V4ROOT           0x10000
-/* All flags that we claim to support.  (Note we don't support NOACL.) */
-#define NFSEXP_ALLFLAGS         0x17E3F
-
-/* The flags that may vary depending on security flavor: */
-#define NFSEXP_SECINFO_FLAGS    (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-                                        | NFSEXP_ALLSQUASH \
-                                        | NFSEXP_INSECURE_PORT)
-
-#ifdef __KERNEL__
+#include <uapi/linux/nfsd/export.h>
 
 /*
  * FS Locations
@@ -154,7 +107,4 @@ static inline void exp_get(struct svc_export *exp)
 }
 struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);
 
-#endif /* __KERNEL__ */
-
 #endif /* NFSD_EXPORT_H */
-
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index fa63048fecff..a93593f1fa4e 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -10,117 +10,11 @@
  *
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef _LINUX_NFSD_FH_H
 #define _LINUX_NFSD_FH_H
 
-#include <linux/types.h>
-#include <linux/nfs.h>
-#include <linux/nfs2.h>
-#include <linux/nfs3.h>
-#include <linux/nfs4.h>
-#ifdef __KERNEL__
 # include <linux/sunrpc/svc.h>
-#endif
-
-/*
- * This is the old "dentry style" Linux NFSv2 file handle.
- *
- * The xino and xdev fields are currently used to transport the
- * ino/dev of the exported inode.
- */
-struct nfs_fhbase_old {
-        __u32           fb_dcookie;     /* dentry cookie - always 0xfeebbaca */
-        __u32           fb_ino;         /* our inode number */
-        __u32           fb_dirino;      /* dir inode number, 0 for directories */
-        __u32           fb_dev;         /* our device */
-        __u32           fb_xdev;
-        __u32           fb_xino;
-        __u32           fb_generation;
-};
-
-/*
- * This is the new flexible, extensible style NFSv2/v3 file handle.
- * by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
- *
- * The file handle starts with a sequence of four-byte words.
- * The first word contains a version number (1) and three descriptor bytes
- * that tell how the remaining 3 variable length fields should be handled.
- * These three bytes are auth_type, fsid_type and fileid_type.
- *
- * All four-byte values are in host-byte-order.
- *
- * The auth_type field specifies how the filehandle can be authenticated
- * This might allow a file to be confirmed to be in a writable part of a
- * filetree without checking the path from it up to the root.
- * Current values:
- *     0  - No authentication.  fb_auth is 0 bytes long
- * Possible future values:
- *     1  - 4 bytes taken from MD5 hash of the remainer of the file handle
- *          prefixed by a secret and with the important export flags.
- *
- * The fsid_type identifies how the filesystem (or export point) is
- *    encoded.
- *  Current values:
- *     0  - 4 byte device id (ms-2-bytes major, ls-2-bytes minor), 4byte inode number
- *        NOTE: we cannot use the kdev_t device id value, because kdev_t.h
- *              says we mustn't.  We must break it up and reassemble.
- *     1  - 4 byte user specified identifier
- *     2  - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED
- *     3  - 4 byte device id, encoded for user-space, 4 byte inode number
- *     4  - 4 byte inode number and 4 byte uuid
- *     5  - 8 byte uuid
- *     6  - 16 byte uuid
- *     7  - 8 byte inode number and 16 byte uuid
- *
- * The fileid_type identified how the file within the filesystem is encoded.
- * This is (will be) passed to, and set by, the underlying filesystem if it supports
- * filehandle operations.  The filesystem must not use the value '0' or '0xff' and may
- * only use the values 1 and 2 as defined below:
- *  Current values:
- *    0   - The root, or export point, of the filesystem.  fb_fileid is 0 bytes.
- *    1   - 32bit inode number, 32 bit generation number.
- *    2   - 32bit inode number, 32 bit generation number, 32 bit parent directory inode number.
- *
- */
-struct nfs_fhbase_new {
-        __u8            fb_version;     /* == 1, even => nfs_fhbase_old */
-        __u8            fb_auth_type;
-        __u8            fb_fsid_type;
-        __u8            fb_fileid_type;
-        __u32           fb_auth[1];
-/*      __u32           fb_fsid[0]; floating */
-/*      __u32           fb_fileid[0]; floating */
-};
-
-struct knfsd_fh {
-        unsigned int    fh_size;        /* significant for NFSv3.
-                                         * Points to the current size while building
-                                         * a new file handle
-                                         */
-        union {
-                struct nfs_fhbase_old   fh_old;
-                __u32                   fh_pad[NFS4_FHSIZE/4];
-                struct nfs_fhbase_new   fh_new;
-        } fh_base;
-};
-
-#define ofh_dcookie             fh_base.fh_old.fb_dcookie
-#define ofh_ino                 fh_base.fh_old.fb_ino
-#define ofh_dirino              fh_base.fh_old.fb_dirino
-#define ofh_dev                 fh_base.fh_old.fb_dev
-#define ofh_xdev                fh_base.fh_old.fb_xdev
-#define ofh_xino                fh_base.fh_old.fb_xino
-#define ofh_generation          fh_base.fh_old.fb_generation
-
-#define fh_version              fh_base.fh_new.fb_version
-#define fh_fsid_type            fh_base.fh_new.fb_fsid_type
-#define fh_auth_type            fh_base.fh_new.fb_auth_type
-#define fh_fileid_type          fh_base.fh_new.fb_fileid_type
-#define fh_auth                 fh_base.fh_new.fb_auth
-#define fh_fsid                 fh_base.fh_new.fb_auth
-
-#ifdef __KERNEL__
+#include <uapi/linux/nfsd/nfsfh.h>
 
 static inline __u32 ino_t_to_u32(ino_t ino)
 {
@@ -166,7 +60,4 @@ typedef struct svc_fh {
 
 } svc_fh;
 
-#endif /* __KERNEL__ */
-
-
 #endif /* _LINUX_NFSD_FH_H */
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h
index 2693ef647df6..e75b2544ff12 100644
--- a/include/linux/nfsd/stats.h
+++ b/include/linux/nfsd/stats.h
@@ -5,16 +5,11 @@
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef LINUX_NFSD_STATS_H
 #define LINUX_NFSD_STATS_H
 
-#include <linux/nfs4.h>
-
-/* thread usage wraps very million seconds (approx one fortnight) */
-#define NFSD_USAGE_WRAP (HZ*1000000)
+#include <uapi/linux/nfsd/stats.h>
 
-#ifdef __KERNEL__
 
 struct nfsd_stats {
         unsigned int    rchits;         /* repcache hits */
@@ -47,5 +42,4 @@ extern struct svc_stat		nfsd_svcstats;
 void    nfsd_stat_init(void);
 void    nfsd_stat_shutdown(void);
 
-#endif /* __KERNEL__ */
 #endif /* LINUX_NFSD_STATS_H */
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index e137b3c486a7..a8696bbdfbc4 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -8,236 +8,12 @@
   Some of the constants in here are from the corresponding
   NetBSD/OpenBSD header file, by Allen Briggs.  We figured out the
   rest of them on our own. */
-
 #ifndef LINUX_NUBUS_H
 #define LINUX_NUBUS_H
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <asm/nubus.h>
-#endif
-
-enum nubus_category {
-        NUBUS_CAT_BOARD          = 0x0001,
-        NUBUS_CAT_DISPLAY        = 0x0003,
-        NUBUS_CAT_NETWORK        = 0x0004,
-        NUBUS_CAT_COMMUNICATIONS = 0x0006,
-        NUBUS_CAT_FONT           = 0x0009,
-        NUBUS_CAT_CPU            = 0x000A,
-        /* For lack of a better name */
-        NUBUS_CAT_DUODOCK        = 0x0020
-};
-
-enum nubus_type_network {
-        NUBUS_TYPE_ETHERNET      = 0x0001,
-        NUBUS_TYPE_RS232         = 0x0002
-};
-
-enum nubus_type_display {
-        NUBUS_TYPE_VIDEO         = 0x0001
-};
-
-enum nubus_type_cpu {
-        NUBUS_TYPE_68020         = 0x0003,
-        NUBUS_TYPE_68030         = 0x0004,
-        NUBUS_TYPE_68040         = 0x0005
-};
-
-/* Known <Cat,Type,SW,HW> tuples: (according to TattleTech and Slots)
- *  68030 motherboards: <10,4,0,24>
- *  68040 motherboards: <10,5,0,24>
- *  DuoDock Plus: <32,1,1,2>
- *
- *  Toby Frame Buffer card: <3,1,1,1>
- *  RBV built-in video (IIci): <3,1,1,24>
- *  Valkyrie built-in video (Q630): <3,1,1,46>
- *  Macintosh Display Card: <3,1,1,25>
- *  Sonora built-in video (P460): <3,1,1,34>
- *  Jet framebuffer (DuoDock Plus): <3,1,1,41>
- *
- *  SONIC comm-slot/on-board and DuoDock Ethernet: <4,1,1,272>
- *  SONIC LC-PDS Ethernet (Dayna, but like Apple 16-bit, sort of): <4,1,1,271>
- *  Apple SONIC LC-PDS Ethernet ("Apple Ethernet LC Twisted-Pair Card"): <4,1,0,281>
- *  Sonic Systems Ethernet A-Series Card: <4,1,268,256>
- *  Asante MacCon NuBus-A: <4,1,260,256> (alpha-1.0,1.1 revision)
- *   ROM on the above card: <2,1,0,0>
- *  Cabletron ethernet card: <4,1,1,265>
- *  Farallon ethernet card: <4,1,268,256> (identical to Sonic Systems card)
- *  Kinetics EtherPort IIN: <4,1,259,262>
- *  API Engineering EtherRun_LCa PDS enet card: <4,1,282,256>
- *
- *  Add your devices to the list!  You can obtain the "Slots" utility
- *  from Apple's FTP site at:
- *  ftp://dev.apple.com/devworld/Tool_Chest/Devices_-_Hardware/NuBus_Slot_Manager/
- *
- *  Alternately, TattleTech can be found at any Info-Mac mirror site.  
- *  or from its distribution site: ftp://ftp.decismkr.com/dms
- */
-
-/* DrSW: Uniquely identifies the software interface to a board.  This
-   is usually the one you want to look at when writing a driver.  It's
-   not as useful as you think, though, because as we should know by
-   now (duh), "Apple Compatible" can mean a lot of things... */
-
-/* Add known DrSW values here */
-enum nubus_drsw {
-        /* NUBUS_CAT_DISPLAY */
-        NUBUS_DRSW_APPLE        = 0x0001,
-        NUBUS_DRSW_APPLE_HIRES  = 0x0013, /* MacII HiRes card driver */
-        
-        /* NUBUS_CAT_NETWORK */
-        NUBUS_DRSW_3COM         = 0x0000,
-        NUBUS_DRSW_CABLETRON    = 0x0001,
-        NUBUS_DRSW_SONIC_LC     = 0x0001,
-        NUBUS_DRSW_KINETICS     = 0x0103,
-        NUBUS_DRSW_ASANTE       = 0x0104,
-        NUBUS_DRSW_TECHWORKS    = 0x0109,
-        NUBUS_DRSW_DAYNA        = 0x010b,
-        NUBUS_DRSW_FARALLON     = 0x010c,
-        NUBUS_DRSW_APPLE_SN     = 0x010f,
-        NUBUS_DRSW_DAYNA2       = 0x0115,
-        NUBUS_DRSW_FOCUS        = 0x011a,
-        NUBUS_DRSW_ASANTE_CS    = 0x011d, /* use asante SMC9194 driver */
-        NUBUS_DRSW_DAYNA_LC     = 0x011e,
-
-        /* NUBUS_CAT_CPU */
-        NUBUS_DRSW_NONE         = 0x0000,
-};
-
-/* DrHW: Uniquely identifies the hardware interface to a board (or at
-   least, it should...  some video cards are known to incorrectly
-   identify themselves as Toby cards) */
-
-/* Add known DrHW values here */
-enum nubus_drhw {
-        /* NUBUS_CAT_DISPLAY */
-        NUBUS_DRHW_APPLE_TFB      = 0x0001, /* Toby frame buffer card */
-        NUBUS_DRHW_APPLE_WVC      = 0x0006, /* Apple Workstation Video Card */
-        NUBUS_DRHW_SIGMA_CLRMAX   = 0x0007, /* Sigma Design ColorMax */
-        NUBUS_DRHW_APPLE_SE30     = 0x0009, /* Apple SE/30 video */
-        NUBUS_DRHW_APPLE_HRVC     = 0x0013, /* Mac II High-Res Video Card */
-        NUBUS_DRHW_APPLE_PVC      = 0x0017, /* Mac II Portrait Video Card */
-        NUBUS_DRHW_APPLE_RBV1     = 0x0018, /* IIci RBV video */
-        NUBUS_DRHW_APPLE_MDC      = 0x0019, /* Macintosh Display Card */
-        NUBUS_DRHW_APPLE_SONORA   = 0x0022, /* Sonora built-in video */
-        NUBUS_DRHW_APPLE_24AC     = 0x002b, /* Mac 24AC Video Card */
-        NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,
-        NUBUS_DRHW_APPLE_JET      = 0x0029, /* Jet framebuffer (DuoDock) */
-        NUBUS_DRHW_SMAC_GFX       = 0x0105, /* SuperMac GFX */
-        NUBUS_DRHW_RASTER_CB264   = 0x013B, /* RasterOps ColorBoard 264 */
-        NUBUS_DRHW_MICRON_XCEED   = 0x0146, /* Micron Exceed color */
-        NUBUS_DRHW_RDIUS_GSC      = 0x0153, /* Radius GS/C */
-        NUBUS_DRHW_SMAC_SPEC8     = 0x017B, /* SuperMac Spectrum/8 */
-        NUBUS_DRHW_SMAC_SPEC24    = 0x017C, /* SuperMac Spectrum/24 */
-        NUBUS_DRHW_RASTER_CB364   = 0x026F, /* RasterOps ColorBoard 364 */
-        NUBUS_DRHW_RDIUS_DCGX     = 0x027C, /* Radius DirectColor/GX */
-        NUBUS_DRHW_RDIUS_PC8      = 0x0291, /* Radius PrecisionColor 8 */
-        NUBUS_DRHW_LAPIS_PCS8     = 0x0292, /* Lapis ProColorServer 8 */
-        NUBUS_DRHW_RASTER_24XLI   = 0x02A0, /* RasterOps 8/24 XLi */
-        NUBUS_DRHW_RASTER_PBPGT   = 0x02A5, /* RasterOps PaintBoard Prism GT */
-        NUBUS_DRHW_EMACH_FSX      = 0x02AE, /* E-Machines Futura SX */
-        NUBUS_DRHW_RASTER_24XLTV  = 0x02B7, /* RasterOps 24XLTV */
-        NUBUS_DRHW_SMAC_THUND24   = 0x02CB, /* SuperMac Thunder/24 */
-        NUBUS_DRHW_SMAC_THUNDLGHT = 0x03D9, /* SuperMac ThunderLight */
-        NUBUS_DRHW_RDIUS_PC24XP   = 0x0406, /* Radius PrecisionColor 24Xp */
-        NUBUS_DRHW_RDIUS_PC24X    = 0x040A, /* Radius PrecisionColor 24X */
-        NUBUS_DRHW_RDIUS_PC8XJ    = 0x040B, /* Radius PrecisionColor 8XJ */
-        
-        /* NUBUS_CAT_NETWORK */
-        NUBUS_DRHW_INTERLAN       = 0x0100,
-        NUBUS_DRHW_SMC9194        = 0x0101,
-        NUBUS_DRHW_KINETICS       = 0x0106,
-        NUBUS_DRHW_CABLETRON      = 0x0109,
-        NUBUS_DRHW_ASANTE_LC      = 0x010f,
-        NUBUS_DRHW_SONIC          = 0x0110,
-        NUBUS_DRHW_TECHWORKS      = 0x0112,
-        NUBUS_DRHW_APPLE_SONIC_NB = 0x0118,
-        NUBUS_DRHW_APPLE_SONIC_LC = 0x0119,
-        NUBUS_DRHW_FOCUS          = 0x011c,
-        NUBUS_DRHW_SONNET         = 0x011d,
-};
+#include <uapi/linux/nubus.h>
 
-/* Resource IDs: These are the identifiers for the various weird and
-   wonderful tidbits of information that may or may not reside in the
-   NuBus ROM directory. */
-enum nubus_res_id {
-        NUBUS_RESID_TYPE         = 0x0001,
-        NUBUS_RESID_NAME         = 0x0002,
-        NUBUS_RESID_ICON         = 0x0003,
-        NUBUS_RESID_DRVRDIR      = 0x0004,
-        NUBUS_RESID_LOADREC      = 0x0005,
-        NUBUS_RESID_BOOTREC      = 0x0006,
-        NUBUS_RESID_FLAGS        = 0x0007,
-        NUBUS_RESID_HWDEVID      = 0x0008,
-        NUBUS_RESID_MINOR_BASEOS = 0x000a,
-        NUBUS_RESID_MINOR_LENGTH = 0x000b,
-        NUBUS_RESID_MAJOR_BASEOS = 0x000c,
-        NUBUS_RESID_MAJOR_LENGTH = 0x000d,
-        NUBUS_RESID_CICN         = 0x000f,
-        NUBUS_RESID_ICL8         = 0x0010,
-        NUBUS_RESID_ICL4         = 0x0011,
-};
-
-/* Category-specific resources. */
-enum nubus_board_res_id {
-        NUBUS_RESID_BOARDID      = 0x0020,
-        NUBUS_RESID_PRAMINITDATA = 0x0021,
-        NUBUS_RESID_PRIMARYINIT  = 0x0022,
-        NUBUS_RESID_TIMEOUTCONST = 0x0023,
-        NUBUS_RESID_VENDORINFO   = 0x0024,
-        NUBUS_RESID_BOARDFLAGS   = 0x0025,
-        NUBUS_RESID_SECONDINIT   = 0x0026,
-
-        /* Not sure why Apple put these next two in here */
-        NUBUS_RESID_VIDNAMES     = 0x0041,
-        NUBUS_RESID_VIDMODES     = 0x007e
-};
-
-/* Fields within the vendor info directory */
-enum nubus_vendor_res_id {
-        NUBUS_RESID_VEND_ID     = 0x0001,
-        NUBUS_RESID_VEND_SERIAL = 0x0002,
-        NUBUS_RESID_VEND_REV    = 0x0003,
-        NUBUS_RESID_VEND_PART   = 0x0004,
-        NUBUS_RESID_VEND_DATE   = 0x0005
-};
-
-enum nubus_net_res_id {
-        NUBUS_RESID_MAC_ADDRESS  = 0x0080
-};
-
-enum nubus_cpu_res_id {
-        NUBUS_RESID_MEMINFO      = 0x0081,
-        NUBUS_RESID_ROMINFO      = 0x0082
-};
-
-enum nubus_display_res_id {
-        NUBUS_RESID_GAMMADIR    = 0x0040,
-        NUBUS_RESID_FIRSTMODE   = 0x0080,
-        NUBUS_RESID_SECONDMODE  = 0x0081,
-        NUBUS_RESID_THIRDMODE   = 0x0082,
-        NUBUS_RESID_FOURTHMODE  = 0x0083,
-        NUBUS_RESID_FIFTHMODE   = 0x0084,
-        NUBUS_RESID_SIXTHMODE   = 0x0085
-};
-
-struct nubus_dir
-{
-        unsigned char *base;
-        unsigned char *ptr;
-        int done;
-        int mask;
-};
-
-struct nubus_dirent
-{
-        unsigned char *base;
-        unsigned char type;
-        __u32 data;     /* Actually 24bits used */
-        int mask;
-};
-
-#ifdef __KERNEL__
 struct nubus_board {
         struct nubus_board* next;
         struct nubus_dev* first_dev;
@@ -352,12 +128,4 @@ void nubus_get_rsrc_mem(void* dest,
 void nubus_get_rsrc_str(void* dest,
                         const struct nubus_dirent *dirent,
                         int maxlen);
-#endif /* __KERNEL__ */
-
-/* We'd like to get rid of this eventually.  Only daynaport.c uses it now. */
-static inline void *nubus_slot_addr(int slot)
-{
-        return (void *)(0xF0000000|(slot<<24));
-}
-
 #endif /* LINUX_NUBUS_H */
diff --git a/include/linux/nvram.h b/include/linux/nvram.h
index 9189829c131c..cf0ff555a6ac 100644
--- a/include/linux/nvram.h
+++ b/include/linux/nvram.h
@@ -1,18 +1,8 @@
 #ifndef _LINUX_NVRAM_H
 #define _LINUX_NVRAM_H
 
-#include <linux/ioctl.h>
+#include <uapi/linux/nvram.h>
 
-/* /dev/nvram ioctls */
-#define NVRAM_INIT      _IO('p', 0x40) /* initialize NVRAM and set checksum */
-#define NVRAM_SETCKS    _IO('p', 0x41) /* recalculate checksum */
-
-/* for all current systems, this is where NVRAM starts */
-#define NVRAM_FIRST_BYTE    14
-/* all these functions expect an NVRAM offset, not an absolute */
-#define NVRAM_OFFSET(x)   ((x)-NVRAM_FIRST_BYTE)
-
-#ifdef __KERNEL__
 /* __foo is foo without grabbing the rtc_lock - get it yourself */
 extern unsigned char __nvram_read_byte(int i);
 extern unsigned char nvram_read_byte(int i);
@@ -20,6 +10,4 @@ extern void __nvram_write_byte(unsigned char c, int i);
 extern void nvram_write_byte(unsigned char c, int i);
 extern int __nvram_check_checksum(void);
 extern int nvram_check_checksum(void);
-#endif
-
 #endif  /* _LINUX_NVRAM_H */
diff --git a/include/linux/of.h b/include/linux/of.h
index f594c528842f..b4e50d56fc74 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -317,6 +317,12 @@ static inline const char* of_node_full_name(struct device_node *np)
         return "<no-node>";
 }
 
+static inline struct device_node *of_find_node_by_name(struct device_node *from,
+        const char *name)
+{
+        return NULL;
+}
+
 static inline bool of_have_populated_dt(void)
 {
         return false;
@@ -325,6 +331,13 @@ static inline bool of_have_populated_dt(void)
 #define for_each_child_of_node(parent, child) \
         while (0)
 
+static inline struct device_node *of_get_child_by_name(
+                                        const struct device_node *node,
+                                        const char *name)
+{
+        return NULL;
+}
+
 static inline int of_get_child_count(const struct device_node *np)
 {
         return 0;
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index c3cdc1025c30..a1984dd037da 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -19,7 +19,7 @@ extern void __iomem *of_iomap(struct device_node *device, int index);
  * the address space flags too. The PCI version uses a BAR number
  * instead of an absolute index
  */
-extern const u32 *of_get_address(struct device_node *dev, int index,
+extern const __be32 *of_get_address(struct device_node *dev, int index,
                            u64 *size, unsigned int *flags);
 
 #ifndef pci_address_to_pio
@@ -44,7 +44,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 {
         return NULL;
 }
-static inline const u32 *of_get_address(struct device_node *dev, int index,
+static inline const __be32 *of_get_address(struct device_node *dev, int index,
                                         u64 *size, unsigned int *flags)
 {
         return NULL;
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index b8e241125201..535cecf1e02f 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -58,8 +58,8 @@ static inline int of_irq_map_oldworld(struct device_node *device, int index,
 #endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
 
 
-extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
-                          u32 ointsize, const u32 *addr,
+extern int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
+                          u32 ointsize, const __be32 *addr,
                           struct of_irq *out_irq);
 extern int of_irq_map_one(struct device_node *device, int index,
                           struct of_irq *out_irq);
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 6ef49b803efb..8163107b94b4 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -26,32 +26,32 @@ extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
 extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
 
 #else /* CONFIG_OF */
-int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
+static inline int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 {
         return -ENOSYS;
 }
 
-struct phy_device *of_phy_find_device(struct device_node *phy_np)
+static inline struct phy_device *of_phy_find_device(struct device_node *phy_np)
 {
         return NULL;
 }
 
-struct phy_device *of_phy_connect(struct net_device *dev,
-                                         struct device_node *phy_np,
-                                         void (*hndlr)(struct net_device *),
-                                         u32 flags, phy_interface_t iface)
+static inline struct phy_device *of_phy_connect(struct net_device *dev,
+                                                struct device_node *phy_np,
+                                                void (*hndlr)(struct net_device *),
+                                                u32 flags, phy_interface_t iface)
 {
         return NULL;
 }
 
-struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
-                                         void (*hndlr)(struct net_device *),
-                                         phy_interface_t iface)
+static inline struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
+                                                           void (*hndlr)(struct net_device *),
+                                                           phy_interface_t iface)
 {
         return NULL;
 }
 
-struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np)
+static inline struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np)
 {
         return NULL;
 }
diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h
new file mode 100644
index 000000000000..6926db724258
--- /dev/null
+++ b/include/linux/oid_registry.h
@@ -0,0 +1,92 @@
+/* ASN.1 Object identifier (OID) registry
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_OID_REGISTRY_H
+#define _LINUX_OID_REGISTRY_H
+
+#include <linux/types.h>
+
+/*
+ * OIDs are turned into these values if possible, or OID__NR if not held here.
+ *
+ * NOTE!  Do not mess with the format of each line as this is read by
+ *        build_OID_registry.pl to generate the data for look_up_OID().
+ */
+enum OID {
+        OID_id_dsa_with_sha1,           /* 1.2.840.10030.4.3 */
+        OID_id_dsa,                     /* 1.2.840.10040.4.1 */
+        OID_id_ecdsa_with_sha1,         /* 1.2.840.10045.4.1 */
+        OID_id_ecPublicKey,             /* 1.2.840.10045.2.1 */
+
+        /* PKCS#1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)} */
+        OID_rsaEncryption,              /* 1.2.840.113549.1.1.1 */
+        OID_md2WithRSAEncryption,       /* 1.2.840.113549.1.1.2 */
+        OID_md3WithRSAEncryption,       /* 1.2.840.113549.1.1.3 */
+        OID_md4WithRSAEncryption,       /* 1.2.840.113549.1.1.4 */
+        OID_sha1WithRSAEncryption,      /* 1.2.840.113549.1.1.5 */
+        OID_sha256WithRSAEncryption,    /* 1.2.840.113549.1.1.11 */
+        OID_sha384WithRSAEncryption,    /* 1.2.840.113549.1.1.12 */
+        OID_sha512WithRSAEncryption,    /* 1.2.840.113549.1.1.13 */
+        OID_sha224WithRSAEncryption,    /* 1.2.840.113549.1.1.14 */
+        /* PKCS#7 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-7(7)} */
+        OID_data,                       /* 1.2.840.113549.1.7.1 */
+        OID_signed_data,                /* 1.2.840.113549.1.7.2 */
+        /* PKCS#9 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)} */
+        OID_email_address,              /* 1.2.840.113549.1.9.1 */
+        OID_content_type,               /* 1.2.840.113549.1.9.3 */
+        OID_messageDigest,              /* 1.2.840.113549.1.9.4 */
+        OID_signingTime,                /* 1.2.840.113549.1.9.5 */
+        OID_smimeCapabilites,           /* 1.2.840.113549.1.9.15 */
+        OID_smimeAuthenticatedAttrs,    /* 1.2.840.113549.1.9.16.2.11 */
+
+        /* {iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2)} */
+        OID_md2,                        /* 1.2.840.113549.2.2 */
+        OID_md4,                        /* 1.2.840.113549.2.4 */
+        OID_md5,                        /* 1.2.840.113549.2.5 */
+
+        OID_certAuthInfoAccess,         /* 1.3.6.1.5.5.7.1.1 */
+        OID_msOutlookExpress,           /* 1.3.6.1.4.1.311.16.4 */
+        OID_sha1,                       /* 1.3.14.3.2.26 */
+
+        /* Distinguished Name attribute IDs [RFC 2256] */
+        OID_commonName,                 /* 2.5.4.3 */
+        OID_surname,                    /* 2.5.4.4 */
+        OID_countryName,                /* 2.5.4.6 */
+        OID_locality,                   /* 2.5.4.7 */
+        OID_stateOrProvinceName,        /* 2.5.4.8 */
+        OID_organizationName,           /* 2.5.4.10 */
+        OID_organizationUnitName,       /* 2.5.4.11 */
+        OID_title,                      /* 2.5.4.12 */
+        OID_description,                /* 2.5.4.13 */
+        OID_name,                       /* 2.5.4.41 */
+        OID_givenName,                  /* 2.5.4.42 */
+        OID_initials,                   /* 2.5.4.43 */
+        OID_generationalQualifier,      /* 2.5.4.44 */
+
+        /* Certificate extension IDs */
+        OID_subjectKeyIdentifier,       /* 2.5.29.14 */
+        OID_keyUsage,                   /* 2.5.29.15 */
+        OID_subjectAltName,             /* 2.5.29.17 */
+        OID_issuerAltName,              /* 2.5.29.18 */
+        OID_basicConstraints,           /* 2.5.29.19 */
+        OID_crlDistributionPoints,      /* 2.5.29.31 */
+        OID_certPolicies,               /* 2.5.29.32 */
+        OID_authorityKeyIdentifier,     /* 2.5.29.35 */
+        OID_extKeyUsage,                /* 2.5.29.37 */
+
+        OID__NR
+};
+
+extern enum OID look_up_OID(const void *data, size_t datasize);
+extern int sprint_oid(const void *, size_t, char *, size_t);
+extern int sprint_OID(enum OID, char *, size_t);
+
+#endif /* _LINUX_OID_REGISTRY_H */
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index 85af8184691a..d1f4dccaeede 100644
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -20,205 +20,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
 #ifndef __LINUX_OMAPFB_H__
 #define __LINUX_OMAPFB_H__
 
-#include <linux/fb.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/* IOCTL commands. */
-
-#define OMAP_IOW(num, dtype)    _IOW('O', num, dtype)
-#define OMAP_IOR(num, dtype)    _IOR('O', num, dtype)
-#define OMAP_IOWR(num, dtype)   _IOWR('O', num, dtype)
-#define OMAP_IO(num)            _IO('O', num)
-
-#define OMAPFB_MIRROR           OMAP_IOW(31, int)
-#define OMAPFB_SYNC_GFX         OMAP_IO(37)
-#define OMAPFB_VSYNC            OMAP_IO(38)
-#define OMAPFB_SET_UPDATE_MODE  OMAP_IOW(40, int)
-#define OMAPFB_GET_CAPS         OMAP_IOR(42, struct omapfb_caps)
-#define OMAPFB_GET_UPDATE_MODE  OMAP_IOW(43, int)
-#define OMAPFB_LCD_TEST         OMAP_IOW(45, int)
-#define OMAPFB_CTRL_TEST        OMAP_IOW(46, int)
-#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
-#define OMAPFB_SET_COLOR_KEY    OMAP_IOW(50, struct omapfb_color_key)
-#define OMAPFB_GET_COLOR_KEY    OMAP_IOW(51, struct omapfb_color_key)
-#define OMAPFB_SETUP_PLANE      OMAP_IOW(52, struct omapfb_plane_info)
-#define OMAPFB_QUERY_PLANE      OMAP_IOW(53, struct omapfb_plane_info)
-#define OMAPFB_UPDATE_WINDOW    OMAP_IOW(54, struct omapfb_update_window)
-#define OMAPFB_SETUP_MEM        OMAP_IOW(55, struct omapfb_mem_info)
-#define OMAPFB_QUERY_MEM        OMAP_IOW(56, struct omapfb_mem_info)
-#define OMAPFB_WAITFORVSYNC     OMAP_IO(57)
-#define OMAPFB_MEMORY_READ      OMAP_IOR(58, struct omapfb_memory_read)
-#define OMAPFB_GET_OVERLAY_COLORMODE OMAP_IOR(59, struct omapfb_ovl_colormode)
-#define OMAPFB_WAITFORGO        OMAP_IO(60)
-#define OMAPFB_GET_VRAM_INFO    OMAP_IOR(61, struct omapfb_vram_info)
-#define OMAPFB_SET_TEARSYNC     OMAP_IOW(62, struct omapfb_tearsync_info)
-#define OMAPFB_GET_DISPLAY_INFO OMAP_IOR(63, struct omapfb_display_info)
-
-#define OMAPFB_CAPS_GENERIC_MASK        0x00000fff
-#define OMAPFB_CAPS_LCDC_MASK           0x00fff000
-#define OMAPFB_CAPS_PANEL_MASK          0xff000000
-
-#define OMAPFB_CAPS_MANUAL_UPDATE       0x00001000
-#define OMAPFB_CAPS_TEARSYNC            0x00002000
-#define OMAPFB_CAPS_PLANE_RELOCATE_MEM  0x00004000
-#define OMAPFB_CAPS_PLANE_SCALE         0x00008000
-#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000
-#define OMAPFB_CAPS_WINDOW_SCALE        0x00020000
-#define OMAPFB_CAPS_WINDOW_OVERLAY      0x00040000
-#define OMAPFB_CAPS_WINDOW_ROTATE       0x00080000
-#define OMAPFB_CAPS_SET_BACKLIGHT       0x01000000
-
-/* Values from DSP must map to lower 16-bits */
-#define OMAPFB_FORMAT_MASK              0x00ff
-#define OMAPFB_FORMAT_FLAG_DOUBLE       0x0100
-#define OMAPFB_FORMAT_FLAG_TEARSYNC     0x0200
-#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC  0x0400
-#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY       0x0800
-#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY      0x1000
-
-#define OMAPFB_MEMTYPE_SDRAM            0
-#define OMAPFB_MEMTYPE_SRAM             1
-#define OMAPFB_MEMTYPE_MAX              1
-
-#define OMAPFB_MEM_IDX_ENABLED  0x80
-#define OMAPFB_MEM_IDX_MASK     0x7f
-
-enum omapfb_color_format {
-        OMAPFB_COLOR_RGB565 = 0,
-        OMAPFB_COLOR_YUV422,
-        OMAPFB_COLOR_YUV420,
-        OMAPFB_COLOR_CLUT_8BPP,
-        OMAPFB_COLOR_CLUT_4BPP,
-        OMAPFB_COLOR_CLUT_2BPP,
-        OMAPFB_COLOR_CLUT_1BPP,
-        OMAPFB_COLOR_RGB444,
-        OMAPFB_COLOR_YUY422,
-
-        OMAPFB_COLOR_ARGB16,
-        OMAPFB_COLOR_RGB24U,    /* RGB24, 32-bit container */
-        OMAPFB_COLOR_RGB24P,    /* RGB24, 24-bit container */
-        OMAPFB_COLOR_ARGB32,
-        OMAPFB_COLOR_RGBA32,
-        OMAPFB_COLOR_RGBX32,
-};
-
-struct omapfb_update_window {
-        __u32 x, y;
-        __u32 width, height;
-        __u32 format;
-        __u32 out_x, out_y;
-        __u32 out_width, out_height;
-        __u32 reserved[8];
-};
+#include <uapi/linux/omapfb.h>
 
-struct omapfb_update_window_old {
-        __u32 x, y;
-        __u32 width, height;
-        __u32 format;
-};
-
-enum omapfb_plane {
-        OMAPFB_PLANE_GFX = 0,
-        OMAPFB_PLANE_VID1,
-        OMAPFB_PLANE_VID2,
-};
-
-enum omapfb_channel_out {
-        OMAPFB_CHANNEL_OUT_LCD = 0,
-        OMAPFB_CHANNEL_OUT_DIGIT,
-};
-
-struct omapfb_plane_info {
-        __u32 pos_x;
-        __u32 pos_y;
-        __u8  enabled;
-        __u8  channel_out;
-        __u8  mirror;
-        __u8  mem_idx;
-        __u32 out_width;
-        __u32 out_height;
-        __u32 reserved2[12];
-};
-
-struct omapfb_mem_info {
-        __u32 size;
-        __u8  type;
-        __u8  reserved[3];
-};
-
-struct omapfb_caps {
-        __u32 ctrl;
-        __u32 plane_color;
-        __u32 wnd_color;
-};
-
-enum omapfb_color_key_type {
-        OMAPFB_COLOR_KEY_DISABLED = 0,
-        OMAPFB_COLOR_KEY_GFX_DST,
-        OMAPFB_COLOR_KEY_VID_SRC,
-};
-
-struct omapfb_color_key {
-        __u8  channel_out;
-        __u32 background;
-        __u32 trans_key;
-        __u8  key_type;
-};
-
-enum omapfb_update_mode {
-        OMAPFB_UPDATE_DISABLED = 0,
-        OMAPFB_AUTO_UPDATE,
-        OMAPFB_MANUAL_UPDATE
-};
-
-struct omapfb_memory_read {
-        __u16 x;
-        __u16 y;
-        __u16 w;
-        __u16 h;
-        size_t buffer_size;
-        void __user *buffer;
-};
-
-struct omapfb_ovl_colormode {
-        __u8 overlay_idx;
-        __u8 mode_idx;
-        __u32 bits_per_pixel;
-        __u32 nonstd;
-        struct fb_bitfield red;
-        struct fb_bitfield green;
-        struct fb_bitfield blue;
-        struct fb_bitfield transp;
-};
-
-struct omapfb_vram_info {
-        __u32 total;
-        __u32 free;
-        __u32 largest_free_block;
-        __u32 reserved[5];
-};
-
-struct omapfb_tearsync_info {
-        __u8 enabled;
-        __u8 reserved1[3];
-        __u16 line;
-        __u16 reserved2;
-};
-
-struct omapfb_display_info {
-        __u16 xres;
-        __u16 yres;
-        __u32 width;    /* phys width of the display in micrometers */
-        __u32 height;   /* phys height of the display in micrometers */
-        __u32 reserved[5];
-};
-
-#ifdef __KERNEL__
 
 struct omap_lcd_config {
         char panel_name[16];
@@ -233,6 +39,4 @@ struct omapfb_platform_data {
 
 void __init omapfb_set_lcd_config(const struct omap_lcd_config *config);
 
-#endif
-
 #endif /* __OMAPFB_H */
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 49a3031fda50..fb9826847b89 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -1,29 +1,11 @@
 #ifndef __INCLUDE_LINUX_OOM_H
 #define __INCLUDE_LINUX_OOM_H
 
-/*
- * /proc/<pid>/oom_adj is deprecated, see
- * Documentation/feature-removal-schedule.txt.
- *
- * /proc/<pid>/oom_adj set to -17 protects from the oom-killer
- */
-#define OOM_DISABLE (-17)
-/* inclusive */
-#define OOM_ADJUST_MIN (-16)
-#define OOM_ADJUST_MAX 15
-
-/*
- * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for
- * pid.
- */
-#define OOM_SCORE_ADJ_MIN       (-1000)
-#define OOM_SCORE_ADJ_MAX       1000
-
-#ifdef __KERNEL__
 
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/nodemask.h>
+#include <uapi/linux/oom.h>
 
 struct zonelist;
 struct notifier_block;
@@ -93,5 +75,4 @@ extern struct task_struct *find_lock_task_mm(struct task_struct *p);
 extern int sysctl_oom_dump_tasks;
 extern int sysctl_oom_kill_allocating_task;
 extern int sysctl_panic_on_oom;
-#endif /* __KERNEL__*/
 #endif /* _INCLUDE_LINUX_OOM_H */
diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index 105077aa7685..76a9539cfd3f 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -6,6 +6,10 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count);
 void set_pageblock_migratetype(struct page *page, int migratetype);
 int move_freepages_block(struct zone *zone, struct page *page,
                                 int migratetype);
+int move_freepages(struct zone *zone,
+                          struct page *start_page, struct page *end_page,
+                          int migratetype);
+
 /*
  * Changes migrate type in [start_pfn, end_pfn) to be MIGRATE_ISOLATE.
  * If specified range includes migrate types other than MOVABLE or CMA,
@@ -37,6 +41,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
  */
 int set_migratetype_isolate(struct page *page);
 void unset_migratetype_isolate(struct page *page, unsigned migratetype);
-
+struct page *alloc_migrate_target(struct page *page, unsigned long private,
+                                int **resultp);
 
 #endif
diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h
index 19ef95d293ae..be655e4a2a75 100644
--- a/include/linux/pageblock-flags.h
+++ b/include/linux/pageblock-flags.h
@@ -30,6 +30,9 @@ enum pageblock_bits {
         PB_migrate,
         PB_migrate_end = PB_migrate + 3 - 1,
                         /* 3 bits required for migrate types */
+#ifdef CONFIG_COMPACTION
+        PB_migrate_skip,/* If set the block is skipped by compaction */
+#endif /* CONFIG_COMPACTION */
         NR_PAGEBLOCK_BITS
 };
 
@@ -65,10 +68,22 @@ unsigned long get_pageblock_flags_group(struct page *page,
 void set_pageblock_flags_group(struct page *page, unsigned long flags,
                                         int start_bitidx, int end_bitidx);
 
+#ifdef CONFIG_COMPACTION
+#define get_pageblock_skip(page) \
+                        get_pageblock_flags_group(page, PB_migrate_skip,     \
+                                                        PB_migrate_skip)
+#define clear_pageblock_skip(page) \
+                        set_pageblock_flags_group(page, 0, PB_migrate_skip,  \
+                                                        PB_migrate_skip)
+#define set_pageblock_skip(page) \
+                        set_pageblock_flags_group(page, 1, PB_migrate_skip,  \
+                                                        PB_migrate_skip)
+#endif /* CONFIG_COMPACTION */
+
 #define get_pageblock_flags(page) \
-                        get_pageblock_flags_group(page, 0, NR_PAGEBLOCK_BITS-1)
+                        get_pageblock_flags_group(page, 0, PB_migrate_end)
 #define set_pageblock_flags(page, flags) \
                         set_pageblock_flags_group(page, flags,  \
-                                                  0, NR_PAGEBLOCK_BITS-1)
+                                                  0, PB_migrate_end)
 
 #endif  /* PAGEBLOCK_FLAGS_H */
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 106c2ca9440b..c22f12547324 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -3,96 +3,9 @@
  * the GNU Free Documentation License, Version 1.1 or any later version
  * published by the Free Software Foundation.
  */
-
 #ifndef _PARPORT_H_
 #define _PARPORT_H_
 
-/* Start off with user-visible constants */
-
-/* Maximum of 16 ports per machine */
-#define PARPORT_MAX  16
-
-/* Magic numbers */
-#define PARPORT_IRQ_NONE  -1
-#define PARPORT_DMA_NONE  -1
-#define PARPORT_IRQ_AUTO  -2
-#define PARPORT_DMA_AUTO  -2
-#define PARPORT_DMA_NOFIFO -3
-#define PARPORT_DISABLE   -2
-#define PARPORT_IRQ_PROBEONLY -3
-#define PARPORT_IOHI_AUTO -1
-
-#define PARPORT_CONTROL_STROBE    0x1
-#define PARPORT_CONTROL_AUTOFD    0x2
-#define PARPORT_CONTROL_INIT      0x4
-#define PARPORT_CONTROL_SELECT    0x8
-
-#define PARPORT_STATUS_ERROR      0x8
-#define PARPORT_STATUS_SELECT     0x10
-#define PARPORT_STATUS_PAPEROUT   0x20
-#define PARPORT_STATUS_ACK        0x40
-#define PARPORT_STATUS_BUSY       0x80
-
-/* Type classes for Plug-and-Play probe.  */
-typedef enum {
-        PARPORT_CLASS_LEGACY = 0,       /* Non-IEEE1284 device */
-        PARPORT_CLASS_PRINTER,
-        PARPORT_CLASS_MODEM,
-        PARPORT_CLASS_NET,
-        PARPORT_CLASS_HDC,              /* Hard disk controller */
-        PARPORT_CLASS_PCMCIA,
-        PARPORT_CLASS_MEDIA,            /* Multimedia device */
-        PARPORT_CLASS_FDC,              /* Floppy disk controller */
-        PARPORT_CLASS_PORTS,
-        PARPORT_CLASS_SCANNER,
-        PARPORT_CLASS_DIGCAM,
-        PARPORT_CLASS_OTHER,            /* Anything else */
-        PARPORT_CLASS_UNSPEC,           /* No CLS field in ID */
-        PARPORT_CLASS_SCSIADAPTER
-} parport_device_class;
-
-/* The "modes" entry in parport is a bit field representing the
-   capabilities of the hardware. */
-#define PARPORT_MODE_PCSPP      (1<<0) /* IBM PC registers available. */
-#define PARPORT_MODE_TRISTATE   (1<<1) /* Can tristate. */
-#define PARPORT_MODE_EPP        (1<<2) /* Hardware EPP. */
-#define PARPORT_MODE_ECP        (1<<3) /* Hardware ECP. */
-#define PARPORT_MODE_COMPAT     (1<<4) /* Hardware 'printer protocol'. */
-#define PARPORT_MODE_DMA        (1<<5) /* Hardware can DMA. */
-#define PARPORT_MODE_SAFEININT  (1<<6) /* SPP registers accessible in IRQ. */
-
-/* IEEE1284 modes: 
-   Nibble mode, byte mode, ECP, ECPRLE and EPP are their own
-   'extensibility request' values.  Others are special.
-   'Real' ECP modes must have the IEEE1284_MODE_ECP bit set.  */
-#define IEEE1284_MODE_NIBBLE             0
-#define IEEE1284_MODE_BYTE              (1<<0)
-#define IEEE1284_MODE_COMPAT            (1<<8)
-#define IEEE1284_MODE_BECP              (1<<9) /* Bounded ECP mode */
-#define IEEE1284_MODE_ECP               (1<<4)
-#define IEEE1284_MODE_ECPRLE            (IEEE1284_MODE_ECP | (1<<5))
-#define IEEE1284_MODE_ECPSWE            (1<<10) /* Software-emulated */
-#define IEEE1284_MODE_EPP               (1<<6)
-#define IEEE1284_MODE_EPPSL             (1<<11) /* EPP 1.7 */
-#define IEEE1284_MODE_EPPSWE            (1<<12) /* Software-emulated */
-#define IEEE1284_DEVICEID               (1<<2)  /* This is a flag */
-#define IEEE1284_EXT_LINK               (1<<14) /* This flag causes the
-                                                 * extensibility link to
-                                                 * be requested, using
-                                                 * bits 0-6. */
-
-/* For the benefit of parport_read/write, you can use these with
- * parport_negotiate to use address operations.  They have no effect
- * other than to make parport_read/write use address transfers. */
-#define IEEE1284_ADDR                   (1<<13) /* This is a flag */
-#define IEEE1284_DATA                    0      /* So is this */
-
-/* Flags for block transfer operations. */
-#define PARPORT_EPP_FAST                (1<<0) /* Unreliable counts. */
-#define PARPORT_W91284PIC               (1<<1) /* have a Warp9 w91284pic in the device */
-
-/* The rest is for the kernel only */
-#ifdef __KERNEL__
 
 #include <linux/jiffies.h>
 #include <linux/proc_fs.h>
@@ -101,6 +14,7 @@ typedef enum {
 #include <linux/irqreturn.h>
 #include <linux/semaphore.h>
 #include <asm/ptrace.h>
+#include <uapi/linux/parport.h>
 
 /* Define this later. */
 struct parport;
@@ -564,5 +478,4 @@ extern int parport_device_proc_unregister(struct pardevice *device);
 extern unsigned long parport_default_timeslice;
 extern int parport_default_spintime;
 
-#endif /* __KERNEL__ */
 #endif /* _PARPORT_H_ */
diff --git a/include/linux/patchkey.h b/include/linux/patchkey.h
index aefda0ec6e62..97a919fc9927 100644
--- a/include/linux/patchkey.h
+++ b/include/linux/patchkey.h
@@ -9,22 +9,12 @@
  * Do not include this file directly.  Please use <sys/soundcard.h> instead.
  * For kernel code, use <linux/soundcard.h>
  */
-
-#ifndef _LINUX_PATCHKEY_H_INDIRECT
-#error "patchkey.h included directly"
-#endif
-
 #ifndef _LINUX_PATCHKEY_H
 #define _LINUX_PATCHKEY_H
 
-/* Endian macros. */
-#ifdef __KERNEL__
 #  include <asm/byteorder.h>
-#else
-#  include <endian.h>
-#endif
+#include <uapi/linux/patchkey.h>
 
-#if defined(__KERNEL__)
 #  if defined(__BIG_ENDIAN)
 #    define _PATCHKEY(id) (0xfd00|id)
 #  elif defined(__LITTLE_ENDIAN)
@@ -32,16 +22,4 @@
 #  else
 #    error "could not determine byte order"
 #  endif
-#else
-#if defined(__BYTE_ORDER)
-#  if __BYTE_ORDER == __BIG_ENDIAN
-#    define _PATCHKEY(id) (0xfd00|id)
-#  elif __BYTE_ORDER == __LITTLE_ENDIAN
-#    define _PATCHKEY(id) ((id<<8)|0x00fd)
-#  else
-#    error "could not determine byte order"
-#  endif
-#endif
-#endif
-
 #endif /* _LINUX_PATCHKEY_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index be1de01de1c4..ee2179546c63 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -13,32 +13,9 @@
  *      PCI to PCI Bridge Specification
  *      PCI System Design Guide
  */
-
 #ifndef LINUX_PCI_H
 #define LINUX_PCI_H
 
-#include <linux/pci_regs.h>     /* The pci register defines */
-
-/*
- * The PCI interface treats multi-function devices as independent
- * devices.  The slot/function address of each device is encoded
- * in a single byte as follows:
- *
- *      7:3 = slot
- *      2:0 = function
- */
-#define PCI_DEVFN(slot, func)   ((((slot) & 0x1f) << 3) | ((func) & 0x07))
-#define PCI_SLOT(devfn)         (((devfn) >> 3) & 0x1f)
-#define PCI_FUNC(devfn)         ((devfn) & 0x07)
-
-/* Ioctls for /proc/bus/pci/X/Y nodes. */
-#define PCIIOC_BASE             ('P' << 24 | 'C' << 16 | 'I' << 8)
-#define PCIIOC_CONTROLLER       (PCIIOC_BASE | 0x00)    /* Get controller for PCI device. */
-#define PCIIOC_MMAP_IS_IO       (PCIIOC_BASE | 0x01)    /* Set mmap state to I/O space. */
-#define PCIIOC_MMAP_IS_MEM      (PCIIOC_BASE | 0x02)    /* Set mmap state to MEM space. */
-#define PCIIOC_WRITE_COMBINE    (PCIIOC_BASE | 0x03)    /* Enable/disable write-combining. */
-
-#ifdef __KERNEL__
 
 #include <linux/mod_devicetable.h>
 
@@ -53,6 +30,7 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/irqreturn.h>
+#include <uapi/linux/pci.h>
 
 /* Include the ID list */
 #include <linux/pci_ids.h>
@@ -1831,5 +1809,4 @@ static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev)
  */
 struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
 
-#endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 33880f6f4e51..9d36b829533a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1427,6 +1427,7 @@
 #define PCI_DEVICE_ID_VIA_CX700_IDE     0x0581
 #define PCI_DEVICE_ID_VIA_VX800         0x8353
 #define PCI_DEVICE_ID_VIA_VX855         0x8409
+#define PCI_DEVICE_ID_VIA_VX900         0x8410
 #define PCI_DEVICE_ID_VIA_8371_1        0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
 #define PCI_DEVICE_ID_VIA_838X_1        0xB188
diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h
new file mode 100644
index 000000000000..250a4acddb2b
--- /dev/null
+++ b/include/linux/percpu-rwsem.h
@@ -0,0 +1,83 @@
+#ifndef _LINUX_PERCPU_RWSEM_H
+#define _LINUX_PERCPU_RWSEM_H
+
+#include <linux/mutex.h>
+#include <linux/percpu.h>
+#include <linux/rcupdate.h>
+#include <linux/delay.h>
+
+struct percpu_rw_semaphore {
+        unsigned __percpu *counters;
+        bool locked;
+        struct mutex mtx;
+};
+
+#define light_mb()      barrier()
+#define heavy_mb()      synchronize_sched()
+
+static inline void percpu_down_read(struct percpu_rw_semaphore *p)
+{
+        rcu_read_lock_sched();
+        if (unlikely(p->locked)) {
+                rcu_read_unlock_sched();
+                mutex_lock(&p->mtx);
+                this_cpu_inc(*p->counters);
+                mutex_unlock(&p->mtx);
+                return;
+        }
+        this_cpu_inc(*p->counters);
+        rcu_read_unlock_sched();
+        light_mb(); /* A, between read of p->locked and read of data, paired with D */
+}
+
+static inline void percpu_up_read(struct percpu_rw_semaphore *p)
+{
+        light_mb(); /* B, between read of the data and write to p->counter, paired with C */
+        this_cpu_dec(*p->counters);
+}
+
+static inline unsigned __percpu_count(unsigned __percpu *counters)
+{
+        unsigned total = 0;
+        int cpu;
+
+        for_each_possible_cpu(cpu)
+                total += ACCESS_ONCE(*per_cpu_ptr(counters, cpu));
+
+        return total;
+}
+
+static inline void percpu_down_write(struct percpu_rw_semaphore *p)
+{
+        mutex_lock(&p->mtx);
+        p->locked = true;
+        synchronize_sched(); /* make sure that all readers exit the rcu_read_lock_sched region */
+        while (__percpu_count(p->counters))
+                msleep(1);
+        heavy_mb(); /* C, between read of p->counter and write to data, paired with B */
+}
+
+static inline void percpu_up_write(struct percpu_rw_semaphore *p)
+{
+        heavy_mb(); /* D, between write to data and write to p->locked, paired with A */
+        p->locked = false;
+        mutex_unlock(&p->mtx);
+}
+
+static inline int percpu_init_rwsem(struct percpu_rw_semaphore *p)
+{
+        p->counters = alloc_percpu(unsigned);
+        if (unlikely(!p->counters))
+                return -ENOMEM;
+        p->locked = false;
+        mutex_init(&p->mtx);
+        return 0;
+}
+
+static inline void percpu_free_rwsem(struct percpu_rw_semaphore *p)
+{
+        free_percpu(p->counters);
+        p->counters = NULL; /* catch use after free bugs */
+}
+
+#endif
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 2b9f82c037c9..cc88172c7d9a 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -107,7 +107,7 @@ enum pcpu_fc {
 
         PCPU_FC_NR,
 };
-extern const char *pcpu_fc_names[PCPU_FC_NR];
+extern const char * const pcpu_fc_names[PCPU_FC_NR];
 
 extern enum pcpu_fc pcpu_chosen_fc;
 
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 599afc4bb67e..6bfb2faa0b19 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -14,606 +14,9 @@
 #ifndef _LINUX_PERF_EVENT_H
 #define _LINUX_PERF_EVENT_H
 
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <asm/byteorder.h>
+#include <uapi/linux/perf_event.h>
 
 /*
- * User-space ABI bits:
- */
-
-/*
- * attr.type
- */
-enum perf_type_id {
-        PERF_TYPE_HARDWARE                      = 0,
-        PERF_TYPE_SOFTWARE                      = 1,
-        PERF_TYPE_TRACEPOINT                    = 2,
-        PERF_TYPE_HW_CACHE                      = 3,
-        PERF_TYPE_RAW                           = 4,
-        PERF_TYPE_BREAKPOINT                    = 5,
-
-        PERF_TYPE_MAX,                          /* non-ABI */
-};
-
-/*
- * Generalized performance event event_id types, used by the
- * attr.event_id parameter of the sys_perf_event_open()
- * syscall:
- */
-enum perf_hw_id {
-        /*
-         * Common hardware events, generalized by the kernel:
-         */
-        PERF_COUNT_HW_CPU_CYCLES                = 0,
-        PERF_COUNT_HW_INSTRUCTIONS              = 1,
-        PERF_COUNT_HW_CACHE_REFERENCES          = 2,
-        PERF_COUNT_HW_CACHE_MISSES              = 3,
-        PERF_COUNT_HW_BRANCH_INSTRUCTIONS       = 4,
-        PERF_COUNT_HW_BRANCH_MISSES             = 5,
-        PERF_COUNT_HW_BUS_CYCLES                = 6,
-        PERF_COUNT_HW_STALLED_CYCLES_FRONTEND   = 7,
-        PERF_COUNT_HW_STALLED_CYCLES_BACKEND    = 8,
-        PERF_COUNT_HW_REF_CPU_CYCLES            = 9,
-
-        PERF_COUNT_HW_MAX,                      /* non-ABI */
-};
-
-/*
- * Generalized hardware cache events:
- *
- *       { L1-D, L1-I, LLC, ITLB, DTLB, BPU, NODE } x
- *       { read, write, prefetch } x
- *       { accesses, misses }
- */
-enum perf_hw_cache_id {
-        PERF_COUNT_HW_CACHE_L1D                 = 0,
-        PERF_COUNT_HW_CACHE_L1I                 = 1,
-        PERF_COUNT_HW_CACHE_LL                  = 2,
-        PERF_COUNT_HW_CACHE_DTLB                = 3,
-        PERF_COUNT_HW_CACHE_ITLB                = 4,
-        PERF_COUNT_HW_CACHE_BPU                 = 5,
-        PERF_COUNT_HW_CACHE_NODE                = 6,
-
-        PERF_COUNT_HW_CACHE_MAX,                /* non-ABI */
-};
-
-enum perf_hw_cache_op_id {
-        PERF_COUNT_HW_CACHE_OP_READ             = 0,
-        PERF_COUNT_HW_CACHE_OP_WRITE            = 1,
-        PERF_COUNT_HW_CACHE_OP_PREFETCH         = 2,
-
-        PERF_COUNT_HW_CACHE_OP_MAX,             /* non-ABI */
-};
-
-enum perf_hw_cache_op_result_id {
-        PERF_COUNT_HW_CACHE_RESULT_ACCESS       = 0,
-        PERF_COUNT_HW_CACHE_RESULT_MISS         = 1,
-
-        PERF_COUNT_HW_CACHE_RESULT_MAX,         /* non-ABI */
-};
-
-/*
- * Special "software" events provided by the kernel, even if the hardware
- * does not support performance events. These events measure various
- * physical and sw events of the kernel (and allow the profiling of them as
- * well):
- */
-enum perf_sw_ids {
-        PERF_COUNT_SW_CPU_CLOCK                 = 0,
-        PERF_COUNT_SW_TASK_CLOCK                = 1,
-        PERF_COUNT_SW_PAGE_FAULTS               = 2,
-        PERF_COUNT_SW_CONTEXT_SWITCHES          = 3,
-        PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
-        PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
-        PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
-        PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
-        PERF_COUNT_SW_EMULATION_FAULTS          = 8,
-
-        PERF_COUNT_SW_MAX,                      /* non-ABI */
-};
-
-/*
- * Bits that can be set in attr.sample_type to request information
- * in the overflow packets.
- */
-enum perf_event_sample_format {
-        PERF_SAMPLE_IP                          = 1U << 0,
-        PERF_SAMPLE_TID                         = 1U << 1,
-        PERF_SAMPLE_TIME                        = 1U << 2,
-        PERF_SAMPLE_ADDR                        = 1U << 3,
-        PERF_SAMPLE_READ                        = 1U << 4,
-        PERF_SAMPLE_CALLCHAIN                   = 1U << 5,
-        PERF_SAMPLE_ID                          = 1U << 6,
-        PERF_SAMPLE_CPU                         = 1U << 7,
-        PERF_SAMPLE_PERIOD                      = 1U << 8,
-        PERF_SAMPLE_STREAM_ID                   = 1U << 9,
-        PERF_SAMPLE_RAW                         = 1U << 10,
-        PERF_SAMPLE_BRANCH_STACK                = 1U << 11,
-        PERF_SAMPLE_REGS_USER                   = 1U << 12,
-        PERF_SAMPLE_STACK_USER                  = 1U << 13,
-
-        PERF_SAMPLE_MAX = 1U << 14,             /* non-ABI */
-};
-
-/*
- * values to program into branch_sample_type when PERF_SAMPLE_BRANCH is set
- *
- * If the user does not pass priv level information via branch_sample_type,
- * the kernel uses the event's priv level. Branch and event priv levels do
- * not have to match. Branch priv level is checked for permissions.
- *
- * The branch types can be combined, however BRANCH_ANY covers all types
- * of branches and therefore it supersedes all the other types.
- */
-enum perf_branch_sample_type {
-        PERF_SAMPLE_BRANCH_USER         = 1U << 0, /* user branches */
-        PERF_SAMPLE_BRANCH_KERNEL       = 1U << 1, /* kernel branches */
-        PERF_SAMPLE_BRANCH_HV           = 1U << 2, /* hypervisor branches */
-
-        PERF_SAMPLE_BRANCH_ANY          = 1U << 3, /* any branch types */
-        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << 4, /* any call branch */
-        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << 5, /* any return branch */
-        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << 6, /* indirect calls */
-
-        PERF_SAMPLE_BRANCH_MAX          = 1U << 7, /* non-ABI */
-};
-
-#define PERF_SAMPLE_BRANCH_PLM_ALL \
-        (PERF_SAMPLE_BRANCH_USER|\
-         PERF_SAMPLE_BRANCH_KERNEL|\
-         PERF_SAMPLE_BRANCH_HV)
-
-/*
- * Values to determine ABI of the registers dump.
- */
-enum perf_sample_regs_abi {
-        PERF_SAMPLE_REGS_ABI_NONE       = 0,
-        PERF_SAMPLE_REGS_ABI_32         = 1,
-        PERF_SAMPLE_REGS_ABI_64         = 2,
-};
-
-/*
- * The format of the data returned by read() on a perf event fd,
- * as specified by attr.read_format:
- *
- * struct read_format {
- *      { u64           value;
- *        { u64         time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
- *        { u64         time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
- *        { u64         id;           } && PERF_FORMAT_ID
- *      } && !PERF_FORMAT_GROUP
- *
- *      { u64           nr;
- *        { u64         time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
- *        { u64         time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
- *        { u64         value;
- *          { u64       id;           } && PERF_FORMAT_ID
- *        }             cntr[nr];
- *      } && PERF_FORMAT_GROUP
- * };
- */
-enum perf_event_read_format {
-        PERF_FORMAT_TOTAL_TIME_ENABLED          = 1U << 0,
-        PERF_FORMAT_TOTAL_TIME_RUNNING          = 1U << 1,
-        PERF_FORMAT_ID                          = 1U << 2,
-        PERF_FORMAT_GROUP                       = 1U << 3,
-
-        PERF_FORMAT_MAX = 1U << 4,              /* non-ABI */
-};
-
-#define PERF_ATTR_SIZE_VER0     64      /* sizeof first published struct */
-#define PERF_ATTR_SIZE_VER1     72      /* add: config2 */
-#define PERF_ATTR_SIZE_VER2     80      /* add: branch_sample_type */
-#define PERF_ATTR_SIZE_VER3     96      /* add: sample_regs_user */
-                                        /* add: sample_stack_user */
-
-/*
- * Hardware event_id to monitor via a performance monitoring event:
- */
-struct perf_event_attr {
-
-        /*
-         * Major type: hardware/software/tracepoint/etc.
-         */
-        __u32                   type;
-
-        /*
-         * Size of the attr structure, for fwd/bwd compat.
-         */
-        __u32                   size;
-
-        /*
-         * Type specific configuration information.
-         */
-        __u64                   config;
-
-        union {
-                __u64           sample_period;
-                __u64           sample_freq;
-        };
-
-        __u64                   sample_type;
-        __u64                   read_format;
-
-        __u64                   disabled       :  1, /* off by default        */
-                                inherit        :  1, /* children inherit it   */
-                                pinned         :  1, /* must always be on PMU */
-                                exclusive      :  1, /* only group on PMU     */
-                                exclude_user   :  1, /* don't count user      */
-                                exclude_kernel :  1, /* ditto kernel          */
-                                exclude_hv     :  1, /* ditto hypervisor      */
-                                exclude_idle   :  1, /* don't count when idle */
-                                mmap           :  1, /* include mmap data     */
-                                comm           :  1, /* include comm data     */
-                                freq           :  1, /* use freq, not period  */
-                                inherit_stat   :  1, /* per task counts       */
-                                enable_on_exec :  1, /* next exec enables     */
-                                task           :  1, /* trace fork/exit       */
-                                watermark      :  1, /* wakeup_watermark      */
-                                /*
-                                 * precise_ip:
-                                 *
-                                 *  0 - SAMPLE_IP can have arbitrary skid
-                                 *  1 - SAMPLE_IP must have constant skid
-                                 *  2 - SAMPLE_IP requested to have 0 skid
-                                 *  3 - SAMPLE_IP must have 0 skid
-                                 *
-                                 *  See also PERF_RECORD_MISC_EXACT_IP
-                                 */
-                                precise_ip     :  2, /* skid constraint       */
-                                mmap_data      :  1, /* non-exec mmap data    */
-                                sample_id_all  :  1, /* sample_type all events */
-
-                                exclude_host   :  1, /* don't count in host   */
-                                exclude_guest  :  1, /* don't count in guest  */
-
-                                exclude_callchain_kernel : 1, /* exclude kernel callchains */
-                                exclude_callchain_user   : 1, /* exclude user callchains */
-
-                                __reserved_1   : 41;
-
-        union {
-                __u32           wakeup_events;    /* wakeup every n events */
-                __u32           wakeup_watermark; /* bytes before wakeup   */
-        };
-
-        __u32                   bp_type;
-        union {
-                __u64           bp_addr;
-                __u64           config1; /* extension of config */
-        };
-        union {
-                __u64           bp_len;
-                __u64           config2; /* extension of config1 */
-        };
-        __u64   branch_sample_type; /* enum perf_branch_sample_type */
-
-        /*
-         * Defines set of user regs to dump on samples.
-         * See asm/perf_regs.h for details.
-         */
-        __u64   sample_regs_user;
-
-        /*
-         * Defines size of the user stack to dump on samples.
-         */
-        __u32   sample_stack_user;
-
-        /* Align to u64. */
-        __u32   __reserved_2;
-};
-
-#define perf_flags(attr)        (*(&(attr)->read_format + 1))
-
-/*
- * Ioctls that can be done on a perf event fd:
- */
-#define PERF_EVENT_IOC_ENABLE           _IO ('$', 0)
-#define PERF_EVENT_IOC_DISABLE          _IO ('$', 1)
-#define PERF_EVENT_IOC_REFRESH          _IO ('$', 2)
-#define PERF_EVENT_IOC_RESET            _IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD           _IOW('$', 4, __u64)
-#define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
-#define PERF_EVENT_IOC_SET_FILTER       _IOW('$', 6, char *)
-
-enum perf_event_ioc_flags {
-        PERF_IOC_FLAG_GROUP             = 1U << 0,
-};
-
-/*
- * Structure of the page that can be mapped via mmap
- */
-struct perf_event_mmap_page {
-        __u32   version;                /* version number of this structure */
-        __u32   compat_version;         /* lowest version this is compat with */
-
-        /*
-         * Bits needed to read the hw events in user-space.
-         *
-         *   u32 seq, time_mult, time_shift, idx, width;
-         *   u64 count, enabled, running;
-         *   u64 cyc, time_offset;
-         *   s64 pmc = 0;
-         *
-         *   do {
-         *     seq = pc->lock;
-         *     barrier()
-         *
-         *     enabled = pc->time_enabled;
-         *     running = pc->time_running;
-         *
-         *     if (pc->cap_usr_time && enabled != running) {
-         *       cyc = rdtsc();
-         *       time_offset = pc->time_offset;
-         *       time_mult   = pc->time_mult;
-         *       time_shift  = pc->time_shift;
-         *     }
-         *
-         *     idx = pc->index;
-         *     count = pc->offset;
-         *     if (pc->cap_usr_rdpmc && idx) {
-         *       width = pc->pmc_width;
-         *       pmc = rdpmc(idx - 1);
-         *     }
-         *
-         *     barrier();
-         *   } while (pc->lock != seq);
-         *
-         * NOTE: for obvious reason this only works on self-monitoring
-         *       processes.
-         */
-        __u32   lock;                   /* seqlock for synchronization */
-        __u32   index;                  /* hardware event identifier */
-        __s64   offset;                 /* add to hardware event value */
-        __u64   time_enabled;           /* time event active */
-        __u64   time_running;           /* time event on cpu */
-        union {
-                __u64   capabilities;
-                __u64   cap_usr_time  : 1,
-                        cap_usr_rdpmc : 1,
-                        cap_____res   : 62;
-        };
-
-        /*
-         * If cap_usr_rdpmc this field provides the bit-width of the value
-         * read using the rdpmc() or equivalent instruction. This can be used
-         * to sign extend the result like:
-         *
-         *   pmc <<= 64 - width;
-         *   pmc >>= 64 - width; // signed shift right
-         *   count += pmc;
-         */
-        __u16   pmc_width;
-
-        /*
-         * If cap_usr_time the below fields can be used to compute the time
-         * delta since time_enabled (in ns) using rdtsc or similar.
-         *
-         *   u64 quot, rem;
-         *   u64 delta;
-         *
-         *   quot = (cyc >> time_shift);
-         *   rem = cyc & ((1 << time_shift) - 1);
-         *   delta = time_offset + quot * time_mult +
-         *              ((rem * time_mult) >> time_shift);
-         *
-         * Where time_offset,time_mult,time_shift and cyc are read in the
-         * seqcount loop described above. This delta can then be added to
-         * enabled and possible running (if idx), improving the scaling:
-         *
-         *   enabled += delta;
-         *   if (idx)
-         *     running += delta;
-         *
-         *   quot = count / running;
-         *   rem  = count % running;
-         *   count = quot * enabled + (rem * enabled) / running;
-         */
-        __u16   time_shift;
-        __u32   time_mult;
-        __u64   time_offset;
-
-                /*
-                 * Hole for extension of the self monitor capabilities
-                 */
-
-        __u64   __reserved[120];        /* align to 1k */
-
-        /*
-         * Control data for the mmap() data buffer.
-         *
-         * User-space reading the @data_head value should issue an rmb(), on
-         * SMP capable platforms, after reading this value -- see
-         * perf_event_wakeup().
-         *
-         * When the mapping is PROT_WRITE the @data_tail value should be
-         * written by userspace to reflect the last read data. In this case
-         * the kernel will not over-write unread data.
-         */
-        __u64   data_head;              /* head in the data section */
-        __u64   data_tail;              /* user-space written tail */
-};
-
-#define PERF_RECORD_MISC_CPUMODE_MASK           (7 << 0)
-#define PERF_RECORD_MISC_CPUMODE_UNKNOWN        (0 << 0)
-#define PERF_RECORD_MISC_KERNEL                 (1 << 0)
-#define PERF_RECORD_MISC_USER                   (2 << 0)
-#define PERF_RECORD_MISC_HYPERVISOR             (3 << 0)
-#define PERF_RECORD_MISC_GUEST_KERNEL           (4 << 0)
-#define PERF_RECORD_MISC_GUEST_USER             (5 << 0)
-
-/*
- * Indicates that the content of PERF_SAMPLE_IP points to
- * the actual instruction that triggered the event. See also
- * perf_event_attr::precise_ip.
- */
-#define PERF_RECORD_MISC_EXACT_IP               (1 << 14)
-/*
- * Reserve the last bit to indicate some extended misc field
- */
-#define PERF_RECORD_MISC_EXT_RESERVED           (1 << 15)
-
-struct perf_event_header {
-        __u32   type;
-        __u16   misc;
-        __u16   size;
-};
-
-enum perf_event_type {
-
-        /*
-         * If perf_event_attr.sample_id_all is set then all event types will
-         * have the sample_type selected fields related to where/when
-         * (identity) an event took place (TID, TIME, ID, CPU, STREAM_ID)
-         * described in PERF_RECORD_SAMPLE below, it will be stashed just after
-         * the perf_event_header and the fields already present for the existing
-         * fields, i.e. at the end of the payload. That way a newer perf.data
-         * file will be supported by older perf tools, with these new optional
-         * fields being ignored.
-         *
-         * The MMAP events record the PROT_EXEC mappings so that we can
-         * correlate userspace IPs to code. They have the following structure:
-         *
-         * struct {
-         *      struct perf_event_header        header;
-         *
-         *      u32                             pid, tid;
-         *      u64                             addr;
-         *      u64                             len;
-         *      u64                             pgoff;
-         *      char                            filename[];
-         * };
-         */
-        PERF_RECORD_MMAP                        = 1,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *      u64                             id;
-         *      u64                             lost;
-         * };
-         */
-        PERF_RECORD_LOST                        = 2,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *
-         *      u32                             pid, tid;
-         *      char                            comm[];
-         * };
-         */
-        PERF_RECORD_COMM                        = 3,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *      u32                             pid, ppid;
-         *      u32                             tid, ptid;
-         *      u64                             time;
-         * };
-         */
-        PERF_RECORD_EXIT                        = 4,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *      u64                             time;
-         *      u64                             id;
-         *      u64                             stream_id;
-         * };
-         */
-        PERF_RECORD_THROTTLE                    = 5,
-        PERF_RECORD_UNTHROTTLE                  = 6,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *      u32                             pid, ppid;
-         *      u32                             tid, ptid;
-         *      u64                             time;
-         * };
-         */
-        PERF_RECORD_FORK                        = 7,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *      u32                             pid, tid;
-         *
-         *      struct read_format              values;
-         * };
-         */
-        PERF_RECORD_READ                        = 8,
-
-        /*
-         * struct {
-         *      struct perf_event_header        header;
-         *
-         *      { u64                   ip;       } && PERF_SAMPLE_IP
-         *      { u32                   pid, tid; } && PERF_SAMPLE_TID
-         *      { u64                   time;     } && PERF_SAMPLE_TIME
-         *      { u64                   addr;     } && PERF_SAMPLE_ADDR
-         *      { u64                   id;       } && PERF_SAMPLE_ID
-         *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
-         *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
-         *      { u64                   period;   } && PERF_SAMPLE_PERIOD
-         *
-         *      { struct read_format    values;   } && PERF_SAMPLE_READ
-         *
-         *      { u64                   nr,
-         *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
-         *
-         *      #
-         *      # The RAW record below is opaque data wrt the ABI
-         *      #
-         *      # That is, the ABI doesn't make any promises wrt to
-         *      # the stability of its content, it may vary depending
-         *      # on event, hardware, kernel version and phase of
-         *      # the moon.
-         *      #
-         *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
-         *      #
-         *
-         *      { u32                   size;
-         *        char                  data[size];}&& PERF_SAMPLE_RAW
-         *
-         *      { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
-         *
-         *      { u64                   abi; # enum perf_sample_regs_abi
-         *        u64                   regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
-         *
-         *      { u64                   size;
-         *        char                  data[size];
-         *        u64                   dyn_size; } && PERF_SAMPLE_STACK_USER
-         * };
-         */
-        PERF_RECORD_SAMPLE                      = 9,
-
-        PERF_RECORD_MAX,                        /* non-ABI */
-};
-
-#define PERF_MAX_STACK_DEPTH            127
-
-enum perf_callchain_context {
-        PERF_CONTEXT_HV                 = (__u64)-32,
-        PERF_CONTEXT_KERNEL             = (__u64)-128,
-        PERF_CONTEXT_USER               = (__u64)-512,
-
-        PERF_CONTEXT_GUEST              = (__u64)-2048,
-        PERF_CONTEXT_GUEST_KERNEL       = (__u64)-2176,
-        PERF_CONTEXT_GUEST_USER         = (__u64)-2560,
-
-        PERF_CONTEXT_MAX                = (__u64)-4095,
-};
-
-#define PERF_FLAG_FD_NO_GROUP           (1U << 0)
-#define PERF_FLAG_FD_OUTPUT             (1U << 1)
-#define PERF_FLAG_PID_CGROUP            (1U << 2) /* pid=cgroup id, per-cpu mode only */
-
-#ifdef __KERNEL__
-/*
  * Kernel-internal data types and definitions:
  */
 
@@ -1110,7 +513,7 @@ struct perf_cpu_context {
         int                             exclusive;
         struct list_head                rotation_list;
         int                             jiffies_interval;
-        struct pmu                      *active_pmu;
+        struct pmu                      *unique_pmu;
         struct perf_cgroup              *cgrp;
 };
 
@@ -1400,12 +803,16 @@ static inline void perf_event_task_tick(void)				{ }
 do {                                                                    \
         static struct notifier_block fn##_nb __cpuinitdata =            \
                 { .notifier_call = fn, .priority = CPU_PRI_PERF };      \
+        unsigned long cpu = smp_processor_id();                         \
+        unsigned long flags;                                            \
         fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE,                     \
-                (void *)(unsigned long)smp_processor_id());             \
+                (void *)(unsigned long)cpu);                            \
+        local_irq_save(flags);                                          \
         fn(&fn##_nb, (unsigned long)CPU_STARTING,                       \
-                (void *)(unsigned long)smp_processor_id());             \
+                (void *)(unsigned long)cpu);                            \
+        local_irq_restore(flags);                                       \
         fn(&fn##_nb, (unsigned long)CPU_ONLINE,                         \
-                (void *)(unsigned long)smp_processor_id());             \
+                (void *)(unsigned long)cpu);                            \
         register_cpu_notifier(&fn##_nb);                                \
 } while (0)
 
@@ -1422,5 +829,4 @@ _name##_show(struct device *dev,					\
                                                                         \
 static struct device_attribute format_attr_##_name = __ATTR_RO(_name)
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_PERF_EVENT_H */
diff --git a/include/linux/personality.h b/include/linux/personality.h
index 8fc7dd1a57ff..646c0a7d50fa 100644
--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -1,7 +1,8 @@
 #ifndef _LINUX_PERSONALITY_H
 #define _LINUX_PERSONALITY_H
 
-#ifdef __KERNEL__
+#include <uapi/linux/personality.h>
+
 
 /*
  * Handling of different ABIs (personalities).
@@ -14,72 +15,6 @@ extern int		register_exec_domain(struct exec_domain *);
 extern int              unregister_exec_domain(struct exec_domain *);
 extern int              __set_personality(unsigned int);
 
-#endif /* __KERNEL__ */
-
-/*
- * Flags for bug emulation.
- *
- * These occupy the top three bytes.
- */
-enum {
-        UNAME26 =               0x0020000,
-        ADDR_NO_RANDOMIZE =     0x0040000,      /* disable randomization of VA space */
-        FDPIC_FUNCPTRS =        0x0080000,      /* userspace function ptrs point to descriptors
-                                                 * (signal handling)
-                                                 */
-        MMAP_PAGE_ZERO =        0x0100000,
-        ADDR_COMPAT_LAYOUT =    0x0200000,
-        READ_IMPLIES_EXEC =     0x0400000,
-        ADDR_LIMIT_32BIT =      0x0800000,
-        SHORT_INODE =           0x1000000,
-        WHOLE_SECONDS =         0x2000000,
-        STICKY_TIMEOUTS =       0x4000000,
-        ADDR_LIMIT_3GB =        0x8000000,
-};
-
-/*
- * Security-relevant compatibility flags that must be
- * cleared upon setuid or setgid exec:
- */
-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC  | \
-                            ADDR_NO_RANDOMIZE  | \
-                            ADDR_COMPAT_LAYOUT | \
-                            MMAP_PAGE_ZERO)
-
-/*
- * Personality types.
- *
- * These go in the low byte.  Avoid using the top bit, it will
- * conflict with error returns.
- */
-enum {
-        PER_LINUX =             0x0000,
-        PER_LINUX_32BIT =       0x0000 | ADDR_LIMIT_32BIT,
-        PER_LINUX_FDPIC =       0x0000 | FDPIC_FUNCPTRS,
-        PER_SVR4 =              0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-        PER_SVR3 =              0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
-        PER_SCOSVR3 =           0x0003 | STICKY_TIMEOUTS |
-                                         WHOLE_SECONDS | SHORT_INODE,
-        PER_OSR5 =              0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS,
-        PER_WYSEV386 =          0x0004 | STICKY_TIMEOUTS | SHORT_INODE,
-        PER_ISCR4 =             0x0005 | STICKY_TIMEOUTS,
-        PER_BSD =               0x0006,
-        PER_SUNOS =             0x0006 | STICKY_TIMEOUTS,
-        PER_XENIX =             0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
-        PER_LINUX32 =           0x0008,
-        PER_LINUX32_3GB =       0x0008 | ADDR_LIMIT_3GB,
-        PER_IRIX32 =            0x0009 | STICKY_TIMEOUTS,/* IRIX5 32-bit */
-        PER_IRIXN32 =           0x000a | STICKY_TIMEOUTS,/* IRIX6 new 32-bit */
-        PER_IRIX64 =            0x000b | STICKY_TIMEOUTS,/* IRIX6 64-bit */
-        PER_RISCOS =            0x000c,
-        PER_SOLARIS =           0x000d | STICKY_TIMEOUTS,
-        PER_UW7 =               0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-        PER_OSF4 =              0x000f,                  /* OSF/1 v4 */
-        PER_HPUX =              0x0010,
-        PER_MASK =              0x00ff,
-};
-
-#ifdef __KERNEL__
 
 /*
  * Description of an execution domain.
@@ -116,6 +51,4 @@ struct exec_domain {
 #define set_personality(pers) \
         ((current->personality == (pers)) ? 0 : __set_personality(pers))
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_PERSONALITY_H */
diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index f48bfc80cb4b..f691b04fc5ce 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -19,169 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-
 #ifndef LINUX_PHONET_H
 #define LINUX_PHONET_H
 
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/* Automatic protocol selection */
-#define PN_PROTO_TRANSPORT      0
-/* Phonet datagram socket */
-#define PN_PROTO_PHONET         1
-/* Phonet pipe */
-#define PN_PROTO_PIPE           2
-#define PHONET_NPROTO           3
-
-/* Socket options for SOL_PNPIPE level */
-#define PNPIPE_ENCAP            1
-#define PNPIPE_IFINDEX          2
-#define PNPIPE_HANDLE           3
-#define PNPIPE_INITSTATE        4
-
-#define PNADDR_ANY              0
-#define PNADDR_BROADCAST        0xFC
-#define PNPORT_RESOURCE_ROUTING 0
-
-/* Values for PNPIPE_ENCAP option */
-#define PNPIPE_ENCAP_NONE       0
-#define PNPIPE_ENCAP_IP         1
-
-/* ioctls */
-#define SIOCPNGETOBJECT         (SIOCPROTOPRIVATE + 0)
-#define SIOCPNENABLEPIPE        (SIOCPROTOPRIVATE + 13)
-#define SIOCPNADDRESOURCE       (SIOCPROTOPRIVATE + 14)
-#define SIOCPNDELRESOURCE       (SIOCPROTOPRIVATE + 15)
-
-/* Phonet protocol header */
-struct phonethdr {
-        __u8    pn_rdev;
-        __u8    pn_sdev;
-        __u8    pn_res;
-        __be16  pn_length;
-        __u8    pn_robj;
-        __u8    pn_sobj;
-} __attribute__((packed));
-
-/* Common Phonet payload header */
-struct phonetmsg {
-        __u8    pn_trans_id;    /* transaction ID */
-        __u8    pn_msg_id;      /* message type */
-        union {
-                struct {
-                        __u8    pn_submsg_id;   /* message subtype */
-                        __u8    pn_data[5];
-                } base;
-                struct {
-                        __u16   pn_e_res_id;    /* extended resource ID */
-                        __u8    pn_e_submsg_id; /* message subtype */
-                        __u8    pn_e_data[3];
-                } ext;
-        } pn_msg_u;
-};
-#define PN_COMMON_MESSAGE       0xF0
-#define PN_COMMGR               0x10
-#define PN_PREFIX               0xE0 /* resource for extended messages */
-#define pn_submsg_id            pn_msg_u.base.pn_submsg_id
-#define pn_e_submsg_id          pn_msg_u.ext.pn_e_submsg_id
-#define pn_e_res_id             pn_msg_u.ext.pn_e_res_id
-#define pn_data                 pn_msg_u.base.pn_data
-#define pn_e_data               pn_msg_u.ext.pn_e_data
-
-/* data for unreachable errors */
-#define PN_COMM_SERVICE_NOT_IDENTIFIED_RESP     0x01
-#define PN_COMM_ISA_ENTITY_NOT_REACHABLE_RESP   0x14
-#define pn_orig_msg_id          pn_data[0]
-#define pn_status               pn_data[1]
-#define pn_e_orig_msg_id        pn_e_data[0]
-#define pn_e_status             pn_e_data[1]
-
-/* Phonet socket address structure */
-struct sockaddr_pn {
-        __kernel_sa_family_t spn_family;
-        __u8 spn_obj;
-        __u8 spn_dev;
-        __u8 spn_resource;
-        __u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3];
-} __attribute__((packed));
-
-/* Well known address */
-#define PN_DEV_PC       0x10
-
-static inline __u16 pn_object(__u8 addr, __u16 port)
-{
-        return (addr << 8) | (port & 0x3ff);
-}
+#include <uapi/linux/phonet.h>
 
-static inline __u8 pn_obj(__u16 handle)
-{
-        return handle & 0xff;
-}
-
-static inline __u8 pn_dev(__u16 handle)
-{
-        return handle >> 8;
-}
-
-static inline __u16 pn_port(__u16 handle)
-{
-        return handle & 0x3ff;
-}
-
-static inline __u8 pn_addr(__u16 handle)
-{
-        return (handle >> 8) & 0xfc;
-}
-
-static inline void pn_sockaddr_set_addr(struct sockaddr_pn *spn, __u8 addr)
-{
-        spn->spn_dev &= 0x03;
-        spn->spn_dev |= addr & 0xfc;
-}
-
-static inline void pn_sockaddr_set_port(struct sockaddr_pn *spn, __u16 port)
-{
-        spn->spn_dev &= 0xfc;
-        spn->spn_dev |= (port >> 8) & 0x03;
-        spn->spn_obj = port & 0xff;
-}
-
-static inline void pn_sockaddr_set_object(struct sockaddr_pn *spn,
-                                                __u16 handle)
-{
-        spn->spn_dev = pn_dev(handle);
-        spn->spn_obj = pn_obj(handle);
-}
-
-static inline void pn_sockaddr_set_resource(struct sockaddr_pn *spn,
-                                                __u8 resource)
-{
-        spn->spn_resource = resource;
-}
-
-static inline __u8 pn_sockaddr_get_addr(const struct sockaddr_pn *spn)
-{
-        return spn->spn_dev & 0xfc;
-}
-
-static inline __u16 pn_sockaddr_get_port(const struct sockaddr_pn *spn)
-{
-        return ((spn->spn_dev & 0x03) << 8) | spn->spn_obj;
-}
-
-static inline __u16 pn_sockaddr_get_object(const struct sockaddr_pn *spn)
-{
-        return pn_object(spn->spn_dev, spn->spn_obj);
-}
-
-static inline __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn)
-{
-        return spn->spn_resource;
-}
-
-/* Phonet device ioctl requests */
-#ifdef __KERNEL__
 #define SIOCPNGAUTOCONF         (SIOCDEVPRIVATE + 0)
 
 struct if_phonet_autoconf {
@@ -195,6 +37,4 @@ struct if_phonet_req {
         } ifr_ifru;
 };
 #define ifr_phonet_autoconf ifr_ifru.ifru_phonet_autoconf
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index 00474b047145..65e3e87eacc5 100644
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -47,15 +47,9 @@ static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)
 }
 
 extern struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns);
-extern void free_pid_ns(struct kref *kref);
 extern void zap_pid_ns_processes(struct pid_namespace *pid_ns);
 extern int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd);
-
-static inline void put_pid_ns(struct pid_namespace *ns)
-{
-        if (ns != &init_pid_ns)
-                kref_put(&ns->kref, free_pid_ns);
-}
+extern void put_pid_ns(struct pid_namespace *ns);
 
 #else /* !CONFIG_PID_NS */
 #include <linux/err.h>
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index 721301b0a908..93d142ad1528 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -12,108 +12,13 @@
 #ifndef __PKTCDVD_H
 #define __PKTCDVD_H
 
-#include <linux/types.h>
-
-/*
- * 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
- */
-#define PACKET_DEBUG            1
-
-#define MAX_WRITERS             8
-
-#define PKT_RB_POOL_SIZE        512
-
-/*
- * How long we should hold a non-full packet before starting data gathering.
- */
-#define PACKET_WAIT_TIME        (HZ * 5 / 1000)
-
-/*
- * use drive write caching -- we need deferred error handling to be
- * able to successfully recover with this option (drive will return good
- * status as soon as the cdb is validated).
- */
-#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
-#define USE_WCACHING            1
-#else
-#define USE_WCACHING            0
-#endif
-
-/*
- * No user-servicable parts beyond this point ->
- */
-
-/*
- * device types
- */
-#define PACKET_CDR              1
-#define PACKET_CDRW             2
-#define PACKET_DVDR             3
-#define PACKET_DVDRW            4
-
-/*
- * flags
- */
-#define PACKET_WRITABLE         1       /* pd is writable */
-#define PACKET_NWA_VALID        2       /* next writable address valid */
-#define PACKET_LRA_VALID        3       /* last recorded address valid */
-#define PACKET_MERGE_SEGS       4       /* perform segment merging to keep */
-                                        /* underlying cdrom device happy */
-
-/*
- * Disc status -- from READ_DISC_INFO
- */
-#define PACKET_DISC_EMPTY       0
-#define PACKET_DISC_INCOMPLETE  1
-#define PACKET_DISC_COMPLETE    2
-#define PACKET_DISC_OTHER       3
-
-/*
- * write type, and corresponding data block type
- */
-#define PACKET_MODE1            1
-#define PACKET_MODE2            2
-#define PACKET_BLOCK_MODE1      8
-#define PACKET_BLOCK_MODE2      10
-
-/*
- * Last session/border status
- */
-#define PACKET_SESSION_EMPTY            0
-#define PACKET_SESSION_INCOMPLETE       1
-#define PACKET_SESSION_RESERVED         2
-#define PACKET_SESSION_COMPLETE         3
-
-#define PACKET_MCN                      "4a656e734178626f65323030300000"
-
-#undef PACKET_USE_LS
-
-#define PKT_CTRL_CMD_SETUP      0
-#define PKT_CTRL_CMD_TEARDOWN   1
-#define PKT_CTRL_CMD_STATUS     2
-
-struct pkt_ctrl_command {
-        __u32 command;                          /* in: Setup, teardown, status */
-        __u32 dev_index;                        /* in/out: Device index */
-        __u32 dev;                              /* in/out: Device nr for cdrw device */
-        __u32 pkt_dev;                          /* in/out: Device nr for packet device */
-        __u32 num_devices;                      /* out: Largest device index + 1 */
-        __u32 padding;                          /* Not used */
-};
-
-/*
- * packet ioctls
- */
-#define PACKET_IOCTL_MAGIC      ('X')
-#define PACKET_CTRL_CMD         _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
-
-#ifdef __KERNEL__
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
 #include <linux/mempool.h>
+#include <uapi/linux/pktcdvd.h>
 
 /* default bio write queue congestion marks */
 #define PKT_WRITE_CONGESTION_ON    10000
@@ -297,6 +202,4 @@ struct pktcdvd_device
         struct dentry           *dfs_f_info;    /* debugfs: info file */
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* __PKTCDVD_H */
diff --git a/include/linux/platform_data/asoc-mx27vis.h b/include/linux/platform_data/asoc-mx27vis.h
new file mode 100644
index 000000000000..409adcd04d04
--- /dev/null
+++ b/include/linux/platform_data/asoc-mx27vis.h
@@ -0,0 +1,11 @@
+#ifndef __PLATFORM_DATA_ASOC_MX27VIS_H
+#define __PLATFORM_DATA_ASOC_MX27VIS_H
+
+struct snd_mx27vis_platform_data {
+        int amp_gain0_gpio;
+        int amp_gain1_gpio;
+        int amp_mutel_gpio;
+        int amp_muter_gpio;
+};
+
+#endif /* __PLATFORM_DATA_ASOC_MX27VIS_H */
diff --git a/include/linux/platform_data/asoc-ti-mcbsp.h b/include/linux/platform_data/asoc-ti-mcbsp.h
index 18814127809a..c78d90b28b19 100644
--- a/include/linux/platform_data/asoc-ti-mcbsp.h
+++ b/include/linux/platform_data/asoc-ti-mcbsp.h
@@ -47,8 +47,6 @@ struct omap_mcbsp_platform_data {
         bool has_wakeup; /* Wakeup capability */
         bool has_ccr; /* Transceiver has configuration control registers */
         int (*enable_st_clock)(unsigned int, bool);
-        int (*set_clk_src)(struct device *dev, struct clk *clk, const char *src);
-        int (*mux_signal)(struct device *dev, const char *signal, const char *src);
 };
 
 /**
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
new file mode 100644
index 000000000000..d0c5825876f8
--- /dev/null
+++ b/include/linux/platform_data/davinci_asp.h
@@ -0,0 +1,105 @@
+/*
+ * TI DaVinci Audio Serial Port support
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __DAVINCI_ASP_H
+#define __DAVINCI_ASP_H
+
+struct snd_platform_data {
+        u32 tx_dma_offset;
+        u32 rx_dma_offset;
+        int asp_chan_q; /* event queue number for ASP channel */
+        int ram_chan_q; /* event queue number for RAM channel */
+        unsigned int codec_fmt;
+        /*
+         * Allowing this is more efficient and eliminates left and right swaps
+         * caused by underruns, but will swap the left and right channels
+         * when compared to previous behavior.
+         */
+        unsigned enable_channel_combine:1;
+        unsigned sram_size_playback;
+        unsigned sram_size_capture;
+
+        /*
+         * If McBSP peripheral gets the clock from an external pin,
+         * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR
+         * and MCBSP_CLKS.
+         * Depending on different hardware connections it is possible
+         * to use this setting to change the behaviour of McBSP
+         * driver.
+         */
+        int clk_input_pin;
+
+        /*
+         * This flag works when both clock and FS are outputs for the cpu
+         * and makes clock more accurate (FS is not symmetrical and the
+         * clock is very fast.
+         * The clock becoming faster is named
+         * i2s continuous serial clock (I2S_SCK) and it is an externally
+         * visible bit clock.
+         *
+         * first line : WordSelect
+         * second line : ContinuousSerialClock
+         * third line: SerialData
+         *
+         * SYMMETRICAL APPROACH:
+         *   _______________________          LEFT
+         * _|         RIGHT         |______________________|
+         *     _   _         _   _   _   _         _   _
+         *   _| |_| |_ x16 _| |_| |_| |_| |_ x16 _| |_| |_
+         *     _   _         _   _   _   _         _   _
+         *   _/ \_/ \_ ... _/ \_/ \_/ \_/ \_ ... _/ \_/ \_
+         *    \_/ \_/       \_/ \_/ \_/ \_/       \_/ \_/
+         *
+         * ACCURATE CLOCK APPROACH:
+         *   ______________          LEFT
+         * _|     RIGHT    |_______________________________|
+         *     _         _   _         _   _   _   _   _   _
+         *   _| |_ x16 _| |_| |_ x16 _| |_| |_| |_| |_| |_| |
+         *     _         _   _          _      dummy cycles
+         *   _/ \_ ... _/ \_/ \_  ... _/ \__________________
+         *    \_/       \_/ \_/        \_/
+         *
+         */
+        bool i2s_accurate_sck;
+
+        /* McASP specific fields */
+        int tdm_slots;
+        u8 op_mode;
+        u8 num_serializer;
+        u8 *serial_dir;
+        u8 version;
+        u8 txnumevt;
+        u8 rxnumevt;
+};
+
+enum {
+        MCASP_VERSION_1 = 0,    /* DM646x */
+        MCASP_VERSION_2,        /* DA8xx/OMAPL1x */
+        MCASP_VERSION_3,        /* TI81xx/AM33xx */
+};
+
+enum mcbsp_clk_input_pin {
+        MCBSP_CLKR = 0,         /* as in DM365 */
+        MCBSP_CLKS,
+};
+
+#define INACTIVE_MODE   0
+#define TX_MODE         1
+#define RX_MODE         2
+
+#define DAVINCI_MCASP_IIS_MODE  0
+#define DAVINCI_MCASP_DIT_MODE  1
+
+#endif
diff --git a/include/linux/platform_data/exynos4_tmu.h b/include/linux/platform_data/exynos_thermal.h
index 39e038cca590..a7bdb2f63b73 100644
--- a/include/linux/platform_data/exynos4_tmu.h
+++ b/include/linux/platform_data/exynos_thermal.h
@@ -1,5 +1,5 @@
 /*
- * exynos4_tmu.h - Samsung EXYNOS4 TMU (Thermal Management Unit)
+ * exynos_thermal.h - Samsung EXYNOS TMU (Thermal Management Unit)
  *
  *  Copyright (C) 2011 Samsung Electronics
  *  Donggeun Kim <dg77.kim@samsung.com>
@@ -19,8 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LINUX_EXYNOS4_TMU_H
-#define _LINUX_EXYNOS4_TMU_H
+#ifndef _LINUX_EXYNOS_THERMAL_H
+#define _LINUX_EXYNOS_THERMAL_H
+#include <linux/cpu_cooling.h>
 
 enum calibration_type {
         TYPE_ONE_POINT_TRIMMING,
@@ -28,8 +29,28 @@ enum calibration_type {
         TYPE_NONE,
 };
 
+enum soc_type {
+        SOC_ARCH_EXYNOS4210 = 1,
+        SOC_ARCH_EXYNOS,
+};
+/**
+ * struct freq_clip_table
+ * @freq_clip_max: maximum frequency allowed for this cooling state.
+ * @temp_level: Temperature level at which the temperature clipping will
+ *      happen.
+ * @mask_val: cpumask of the allowed cpu's where the clipping will take place.
+ *
+ * This structure is required to be filled and passed to the
+ * cpufreq_cooling_unregister function.
+ */
+struct freq_clip_table {
+        unsigned int freq_clip_max;
+        unsigned int temp_level;
+        const struct cpumask *mask_val;
+};
+
 /**
- * struct exynos4_tmu_platform_data
+ * struct exynos_tmu_platform_data
  * @threshold: basic temperature for generating interrupt
  *             25 <= threshold <= 125 [unit: degree Celsius]
  * @trigger_levels: array for each interrupt levels
@@ -63,11 +84,18 @@ enum calibration_type {
  * @reference_voltage: reference voltage of amplifier
  *      in the positive-TC generator block
  *      0 <= reference_voltage <= 31
+ * @noise_cancel_mode: noise cancellation mode
+ *      000, 100, 101, 110 and 111 can be different modes
+ * @type: determines the type of SOC
+ * @efuse_value: platform defined fuse value
  * @cal_type: calibration type for temperature
+ * @freq_clip_table: Table representing frequency reduction percentage.
+ * @freq_tab_count: Count of the above table as frequency reduction may
+ *      applicable to only some of the trigger levels.
  *
- * This structure is required for configuration of exynos4_tmu driver.
+ * This structure is required for configuration of exynos_tmu driver.
  */
-struct exynos4_tmu_platform_data {
+struct exynos_tmu_platform_data {
         u8 threshold;
         u8 trigger_levels[4];
         bool trigger_level0_en;
@@ -77,7 +105,12 @@ struct exynos4_tmu_platform_data {
 
         u8 gain;
         u8 reference_voltage;
+        u8 noise_cancel_mode;
+        u32 efuse_value;
 
         enum calibration_type cal_type;
+        enum soc_type type;
+        struct freq_clip_table freq_tab[4];
+        unsigned int freq_tab_count;
 };
-#endif /* _LINUX_EXYNOS4_TMU_H */
+#endif /* _LINUX_EXYNOS_THERMAL_H */
diff --git a/include/linux/platform_data/i2c-nomadik.h b/include/linux/platform_data/i2c-nomadik.h
index c2303c3e4803..3a8be9cdc95c 100644
--- a/include/linux/platform_data/i2c-nomadik.h
+++ b/include/linux/platform_data/i2c-nomadik.h
@@ -28,7 +28,7 @@ enum i2c_freq_mode {
  * @sm:         speed mode
  */
 struct nmk_i2c_controller {
-        unsigned long   clk_freq;
+        u32             clk_freq;
         unsigned short  slsu;
         unsigned char   tft;
         unsigned char   rft;
diff --git a/include/linux/platform_data/leds-lm3556.h b/include/linux/platform_data/leds-lm3556.h
deleted file mode 100644
index 4b4e7d6b0527..000000000000
--- a/include/linux/platform_data/leds-lm3556.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Simple driver for Texas Instruments LM3556 LED Flash driver chip (Rev0x03)
- * Copyright (C) 2012 Texas Instruments
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef __LINUX_LM3556_H
-#define __LINUX_LM3556_H
-
-#define LM3556_NAME "leds-lm3556"
-
-enum lm3556_pin_polarity {
-        PIN_LOW_ACTIVE = 0,
-        PIN_HIGH_ACTIVE,
-};
-
-enum lm3556_pin_enable {
-        PIN_DISABLED = 0,
-        PIN_ENABLED,
-};
-
-enum lm3556_strobe_usuage {
-        STROBE_EDGE_DETECT = 0,
-        STROBE_LEVEL_DETECT,
-};
-
-enum lm3556_indic_mode {
-        INDIC_MODE_INTERNAL = 0,
-        INDIC_MODE_EXTERNAL,
-};
-
-struct lm3556_platform_data {
-        enum lm3556_pin_enable torch_pin_en;
-        enum lm3556_pin_polarity torch_pin_polarity;
-
-        enum lm3556_strobe_usuage strobe_usuage;
-        enum lm3556_pin_enable strobe_pin_en;
-        enum lm3556_pin_polarity strobe_pin_polarity;
-
-        enum lm3556_pin_enable tx_pin_en;
-        enum lm3556_pin_polarity tx_pin_polarity;
-
-        enum lm3556_indic_mode indicator_mode;
-};
-
-#endif /* __LINUX_LM3556_H */
diff --git a/include/linux/platform_data/leds-lm355x.h b/include/linux/platform_data/leds-lm355x.h
new file mode 100644
index 000000000000..b88724bb0b46
--- /dev/null
+++ b/include/linux/platform_data/leds-lm355x.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * Simple driver for Texas Instruments LM355x LED driver chip
+ *
+ * Author: G.Shark Jeong <gshark.jeong@gmail.com>
+ *         Daniel Jeong <daniel.jeong@ti.com>
+ */
+
+#define LM355x_NAME "leds-lm355x"
+#define LM3554_NAME "leds-lm3554"
+#define LM3556_NAME "leds-lm3556"
+
+/* lm3554 : strobe def. on */
+enum lm355x_strobe {
+        LM355x_PIN_STROBE_DISABLE = 0x00,
+        LM355x_PIN_STROBE_ENABLE = 0x01,
+};
+
+enum lm355x_torch {
+        LM355x_PIN_TORCH_DISABLE = 0,
+        LM3554_PIN_TORCH_ENABLE = 0x80,
+        LM3556_PIN_TORCH_ENABLE = 0x10,
+};
+
+enum lm355x_tx2 {
+        LM355x_PIN_TX_DISABLE = 0,
+        LM3554_PIN_TX_ENABLE = 0x20,
+        LM3556_PIN_TX_ENABLE = 0x40,
+};
+
+enum lm355x_ntc {
+        LM355x_PIN_NTC_DISABLE = 0,
+        LM3554_PIN_NTC_ENABLE = 0x08,
+        LM3556_PIN_NTC_ENABLE = 0x80,
+};
+
+enum lm355x_pmode {
+        LM355x_PMODE_DISABLE = 0,
+        LM355x_PMODE_ENABLE = 0x04,
+};
+
+/*
+ * struct lm3554_platform_data
+ * @pin_strobe: strobe input
+ * @pin_torch : input pin
+ *              lm3554-tx1/torch/gpio1
+ *              lm3556-torch
+ * @pin_tx2   : input pin
+ *              lm3554-envm/tx2/gpio2
+ *              lm3556-tx pin
+ * @ntc_pin  : output pin
+ *              lm3554-ledi/ntc
+ *              lm3556-temp pin
+ * @pass_mode : pass mode
+ */
+struct lm355x_platform_data {
+        enum lm355x_strobe pin_strobe;
+        enum lm355x_torch pin_tx1;
+        enum lm355x_tx2 pin_tx2;
+        enum lm355x_ntc ntc_pin;
+
+        enum lm355x_pmode pass_mode;
+};
diff --git a/include/linux/platform_data/leds-lm3642.h b/include/linux/platform_data/leds-lm3642.h
new file mode 100644
index 000000000000..72d6ee6ade57
--- /dev/null
+++ b/include/linux/platform_data/leds-lm3642.h
@@ -0,0 +1,38 @@
+/*
+* Copyright (C) 2012 Texas Instruments
+*
+* License Terms: GNU General Public License v2
+*
+* Simple driver for Texas Instruments LM3642 LED driver chip
+*
+* Author: G.Shark Jeong <gshark.jeong@gmail.com>
+*         Daniel Jeong <daniel.jeong@ti.com>
+*/
+
+#ifndef __LINUX_LM3642_H
+#define __LINUX_LM3642_H
+
+#define LM3642_NAME "leds-lm3642"
+
+enum lm3642_torch_pin_enable {
+        LM3642_TORCH_PIN_DISABLE = 0x00,
+        LM3642_TORCH_PIN_ENABLE = 0x10,
+};
+
+enum lm3642_strobe_pin_enable {
+        LM3642_STROBE_PIN_DISABLE = 0x00,
+        LM3642_STROBE_PIN_ENABLE = 0x20,
+};
+
+enum lm3642_tx_pin_enable {
+        LM3642_TX_PIN_DISABLE = 0x00,
+        LM3642_TX_PIN_ENABLE = 0x40,
+};
+
+struct lm3642_platform_data {
+        enum lm3642_torch_pin_enable torch_pin;
+        enum lm3642_strobe_pin_enable strobe_pin;
+        enum lm3642_tx_pin_enable tx_pin;
+};
+
+#endif /* __LINUX_LM3642_H */
diff --git a/include/linux/platform_data/leds-pca9633.h b/include/linux/platform_data/leds-pca9633.h
new file mode 100644
index 000000000000..c5bf29b6fa7f
--- /dev/null
+++ b/include/linux/platform_data/leds-pca9633.h
@@ -0,0 +1,35 @@
+/*
+ * PCA9633 LED chip driver.
+ *
+ * Copyright 2012 bct electronic GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef __LINUX_PCA9633_H
+#define __LINUX_PCA9633_H
+#include <linux/leds.h>
+
+enum pca9633_outdrv {
+        PCA9633_OPEN_DRAIN,
+        PCA9633_TOTEM_POLE, /* aka push-pull */
+};
+
+struct pca9633_platform_data {
+        struct led_platform_data leds;
+        enum pca9633_outdrv outdrv;
+};
+
+#endif /* __LINUX_PCA9633_H*/
diff --git a/include/linux/platform_data/lm3630_bl.h b/include/linux/platform_data/lm3630_bl.h
new file mode 100644
index 000000000000..9176dd3f2d63
--- /dev/null
+++ b/include/linux/platform_data/lm3630_bl.h
@@ -0,0 +1,57 @@
+/*
+* Simple driver for Texas Instruments LM3630 LED Flash driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+
+#ifndef __LINUX_LM3630_H
+#define __LINUX_LM3630_H
+
+#define LM3630_NAME "lm3630_bl"
+
+enum lm3630_pwm_ctrl {
+        PWM_CTRL_DISABLE = 0,
+        PWM_CTRL_BANK_A,
+        PWM_CTRL_BANK_B,
+        PWM_CTRL_BANK_ALL,
+};
+
+enum lm3630_pwm_active {
+        PWM_ACTIVE_HIGH = 0,
+        PWM_ACTIVE_LOW,
+};
+
+enum lm3630_bank_a_ctrl {
+        BANK_A_CTRL_DISABLE = 0x0,
+        BANK_A_CTRL_LED1 = 0x4,
+        BANK_A_CTRL_LED2 = 0x1,
+        BANK_A_CTRL_ALL = 0x5,
+};
+
+enum lm3630_bank_b_ctrl {
+        BANK_B_CTRL_DISABLE = 0,
+        BANK_B_CTRL_LED2,
+};
+
+struct lm3630_platform_data {
+
+        /* maximum brightness */
+        int max_brt_led1;
+        int max_brt_led2;
+
+        /* initial on brightness */
+        int init_brt_led1;
+        int init_brt_led2;
+        enum lm3630_pwm_ctrl pwm_ctrl;
+        enum lm3630_pwm_active pwm_active;
+        enum lm3630_bank_a_ctrl bank_a_ctrl;
+        enum lm3630_bank_b_ctrl bank_b_ctrl;
+        unsigned int pwm_period;
+        void (*pwm_set_intensity) (int brightness, int max_brightness);
+};
+
+#endif /* __LINUX_LM3630_H */
diff --git a/include/linux/platform_data/lm3639_bl.h b/include/linux/platform_data/lm3639_bl.h
new file mode 100644
index 000000000000..5234cd5ed166
--- /dev/null
+++ b/include/linux/platform_data/lm3639_bl.h
@@ -0,0 +1,69 @@
+/*
+* Simple driver for Texas Instruments LM3630 LED Flash driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+
+#ifndef __LINUX_LM3639_H
+#define __LINUX_LM3639_H
+
+#define LM3639_NAME "lm3639_bl"
+
+enum lm3639_pwm {
+        LM3639_PWM_DISABLE = 0x00,
+        LM3639_PWM_EN_ACTLOW = 0x48,
+        LM3639_PWM_EN_ACTHIGH = 0x40,
+};
+
+enum lm3639_strobe {
+        LM3639_STROBE_DISABLE = 0x00,
+        LM3639_STROBE_EN_ACTLOW = 0x10,
+        LM3639_STROBE_EN_ACTHIGH = 0x30,
+};
+
+enum lm3639_txpin {
+        LM3639_TXPIN_DISABLE = 0x00,
+        LM3639_TXPIN_EN_ACTLOW = 0x04,
+        LM3639_TXPIN_EN_ACTHIGH = 0x0C,
+};
+
+enum lm3639_fleds {
+        LM3639_FLED_DIASBLE_ALL = 0x00,
+        LM3639_FLED_EN_1 = 0x40,
+        LM3639_FLED_EN_2 = 0x20,
+        LM3639_FLED_EN_ALL = 0x60,
+};
+
+enum lm3639_bleds {
+        LM3639_BLED_DIASBLE_ALL = 0x00,
+        LM3639_BLED_EN_1 = 0x10,
+        LM3639_BLED_EN_2 = 0x08,
+        LM3639_BLED_EN_ALL = 0x18,
+};
+enum lm3639_bled_mode {
+        LM3639_BLED_MODE_EXPONETIAL = 0x00,
+        LM3639_BLED_MODE_LINEAR = 0x10,
+};
+
+struct lm3639_platform_data {
+        unsigned int max_brt_led;
+        unsigned int init_brt_led;
+
+        /* input pins */
+        enum lm3639_pwm pin_pwm;
+        enum lm3639_strobe pin_strobe;
+        enum lm3639_txpin pin_tx;
+
+        /* output pins */
+        enum lm3639_fleds fled_pins;
+        enum lm3639_bleds bled_pins;
+        enum lm3639_bled_mode bled_mode;
+
+        void (*pwm_set_intensity) (int brightness, int max_brightness);
+        int (*pwm_get_intensity) (void);
+};
+#endif /* __LINUX_LM3639_H */
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index cc76f1f18f18..761f31752367 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -46,6 +46,8 @@
 #define LP8556_I2C_CONFIG       ((ENABLE_BL << BL_CTL_SHFT) | \
                                 (LP8556_I2C_ONLY << BRT_MODE_SHFT))
 #define LP8556_COMB2_CONFIG     (LP8556_COMBINED2 << BRT_MODE_SHFT)
+#define LP8556_FAST_CONFIG      BIT(7) /* use it if EPROMs should be maintained
+                                          when exiting the low power mode */
 
 enum lp855x_chip_id {
         LP8550,
diff --git a/include/linux/platform_data/lp8727.h b/include/linux/platform_data/lp8727.h
index ea98c6133d32..47128a50e04e 100644
--- a/include/linux/platform_data/lp8727.h
+++ b/include/linux/platform_data/lp8727.h
@@ -13,32 +13,32 @@
 #define _LP8727_H
 
 enum lp8727_eoc_level {
-        EOC_5P,
-        EOC_10P,
-        EOC_16P,
-        EOC_20P,
-        EOC_25P,
-        EOC_33P,
-        EOC_50P,
+        LP8727_EOC_5P,
+        LP8727_EOC_10P,
+        LP8727_EOC_16P,
+        LP8727_EOC_20P,
+        LP8727_EOC_25P,
+        LP8727_EOC_33P,
+        LP8727_EOC_50P,
 };
 
 enum lp8727_ichg {
-        ICHG_90mA,
-        ICHG_100mA,
-        ICHG_400mA,
-        ICHG_450mA,
-        ICHG_500mA,
-        ICHG_600mA,
-        ICHG_700mA,
-        ICHG_800mA,
-        ICHG_900mA,
-        ICHG_1000mA,
+        LP8727_ICHG_90mA,
+        LP8727_ICHG_100mA,
+        LP8727_ICHG_400mA,
+        LP8727_ICHG_450mA,
+        LP8727_ICHG_500mA,
+        LP8727_ICHG_600mA,
+        LP8727_ICHG_700mA,
+        LP8727_ICHG_800mA,
+        LP8727_ICHG_900mA,
+        LP8727_ICHG_1000mA,
 };
 
 /**
  * struct lp8727_chg_param
  * @eoc_level : end of charge level setting
- * @ichg : charging current
+ * @ichg      : charging current
  */
 struct lp8727_chg_param {
         enum lp8727_eoc_level eoc_level;
@@ -47,19 +47,22 @@ struct lp8727_chg_param {
 
 /**
  * struct lp8727_platform_data
- * @get_batt_present : check battery status - exists or not
- * @get_batt_level : get battery voltage (mV)
+ * @get_batt_present  : check battery status - exists or not
+ * @get_batt_level    : get battery voltage (mV)
  * @get_batt_capacity : get battery capacity (%)
- * @get_batt_temp : get battery temperature
- * @ac, @usb : charging parameters each charger type
+ * @get_batt_temp     : get battery temperature
+ * @ac                : charging parameters for AC type charger
+ * @usb               : charging parameters for USB type charger
+ * @debounce_msec     : interrupt debounce time
  */
 struct lp8727_platform_data {
         u8 (*get_batt_present)(void);
         u16 (*get_batt_level)(void);
         u8 (*get_batt_capacity)(void);
         u8 (*get_batt_temp)(void);
-        struct lp8727_chg_param ac;
-        struct lp8727_chg_param usb;
+        struct lp8727_chg_param *ac;
+        struct lp8727_chg_param *usb;
+        unsigned int debounce_msec;
 };
 
 #endif
diff --git a/include/linux/platform_data/mipi-csis.h b/include/linux/platform_data/mipi-csis.h
index c45b1e8d4c2e..bf34e17cee7f 100644
--- a/include/linux/platform_data/mipi-csis.h
+++ b/include/linux/platform_data/mipi-csis.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd.
+ * Copyright (C) 2010 - 2012 Samsung Electronics Co., Ltd.
  *
- * S5P series MIPI CSI slave device support
+ * Samsung S5P/Exynos SoC series MIPI CSIS device support
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -11,33 +11,27 @@
 #ifndef __PLAT_SAMSUNG_MIPI_CSIS_H_
 #define __PLAT_SAMSUNG_MIPI_CSIS_H_ __FILE__
 
-struct platform_device;
-
 /**
  * struct s5p_platform_mipi_csis - platform data for S5P MIPI-CSIS driver
- * @clk_rate: bus clock frequency
- * @lanes: number of data lanes used
- * @alignment: data alignment in bits
- * @hs_settle: HS-RX settle time
- * @fixed_phy_vdd: false to enable external D-PHY regulator management in the
- *                 driver or true in case this regulator has no enable function
- * @phy_enable: pointer to a callback controlling D-PHY enable/reset
+ * @clk_rate:    bus clock frequency
+ * @wclk_source: CSI wrapper clock selection: 0 - bus clock, 1 - ext. SCLK_CAM
+ * @lanes:       number of data lanes used
+ * @hs_settle:   HS-RX settle time
  */
 struct s5p_platform_mipi_csis {
         unsigned long clk_rate;
+        u8 wclk_source;
         u8 lanes;
-        u8 alignment;
         u8 hs_settle;
-        bool fixed_phy_vdd;
-        int (*phy_enable)(struct platform_device *pdev, bool on);
 };
 
 /**
  * s5p_csis_phy_enable - global MIPI-CSI receiver D-PHY control
- * @pdev: MIPI-CSIS platform device
- * @on: true to enable D-PHY and deassert its reset
- *      false to disable D-PHY
+ * @id:     MIPI-CSIS harware instance index (0...1)
+ * @on:     true to enable D-PHY and deassert its reset
+ *          false to disable D-PHY
+ * @return: 0 on success, or negative error code on failure
  */
-int s5p_csis_phy_enable(struct platform_device *pdev, bool on);
+int s5p_csis_phy_enable(int id, bool on);
 
 #endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */
diff --git a/include/linux/platform_data/mmp_dma.h b/include/linux/platform_data/mmp_dma.h
new file mode 100644
index 000000000000..2a330ec9e2af
--- /dev/null
+++ b/include/linux/platform_data/mmp_dma.h
@@ -0,0 +1,19 @@
+/*
+ *  MMP Platform DMA Management
+ *
+ *  Copyright (c) 2011 Marvell Semiconductors Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#ifndef MMP_DMA_H
+#define MMP_DMA_H
+
+struct mmp_dma_platdata {
+        int dma_channels;
+};
+
+#endif /* MMP_DMA_H */
diff --git a/include/linux/platform_data/omap-twl4030.h b/include/linux/platform_data/omap-twl4030.h
new file mode 100644
index 000000000000..c7bef788daab
--- /dev/null
+++ b/include/linux/platform_data/omap-twl4030.h
@@ -0,0 +1,32 @@
+/**
+ * omap-twl4030.h - ASoC machine driver for TI SoC based boards with twl4030
+ *                  codec, header.
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * All rights reserved.
+ *
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _OMAP_TWL4030_H_
+#define _OMAP_TWL4030_H_
+
+struct omap_tw4030_pdata {
+        const char *card_name;
+};
+
+#endif /* _OMAP_TWL4030_H_ */
diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h
index 51ad0995abac..59acd987ed34 100644
--- a/include/linux/platform_data/pxa_sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -49,6 +49,7 @@ struct sdhci_pxa_platdata {
         bool            ext_cd_gpio_invert;
         unsigned int    max_speed;
         unsigned int    host_caps;
+        unsigned int    host_caps2;
         unsigned int    quirks;
         unsigned int    pm_caps;
 };
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 84e6a55a1202..99b400b8a241 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -5,137 +5,11 @@
  *
  * Copyright (C) 1998 Paul Mackerras.
  */
-
 #ifndef _LINUX_PMU_H
 #define _LINUX_PMU_H
 
-#define PMU_DRIVER_VERSION      2
-
-/*
- * PMU commands
- */
-#define PMU_POWER_CTRL0         0x10    /* control power of some devices */
-#define PMU_POWER_CTRL          0x11    /* control power of some devices */
-#define PMU_ADB_CMD             0x20    /* send ADB packet */
-#define PMU_ADB_POLL_OFF        0x21    /* disable ADB auto-poll */
-#define PMU_WRITE_NVRAM         0x33    /* write non-volatile RAM */
-#define PMU_READ_NVRAM          0x3b    /* read non-volatile RAM */
-#define PMU_SET_RTC             0x30    /* set real-time clock */
-#define PMU_READ_RTC            0x38    /* read real-time clock */
-#define PMU_SET_VOLBUTTON       0x40    /* set volume up/down position */
-#define PMU_BACKLIGHT_BRIGHT    0x41    /* set backlight brightness */
-#define PMU_GET_VOLBUTTON       0x48    /* get volume up/down position */
-#define PMU_PCEJECT             0x4c    /* eject PC-card from slot */
-#define PMU_BATTERY_STATE       0x6b    /* report battery state etc. */
-#define PMU_SMART_BATTERY_STATE 0x6f    /* report battery state (new way) */
-#define PMU_SET_INTR_MASK       0x70    /* set PMU interrupt mask */
-#define PMU_INT_ACK             0x78    /* read interrupt bits */
-#define PMU_SHUTDOWN            0x7e    /* turn power off */
-#define PMU_CPU_SPEED           0x7d    /* control CPU speed on some models */
-#define PMU_SLEEP               0x7f    /* put CPU to sleep */
-#define PMU_POWER_EVENTS        0x8f    /* Send power-event commands to PMU */
-#define PMU_I2C_CMD             0x9a    /* I2C operations */
-#define PMU_RESET               0xd0    /* reset CPU */
-#define PMU_GET_BRIGHTBUTTON    0xd9    /* report brightness up/down pos */
-#define PMU_GET_COVER           0xdc    /* report cover open/closed */
-#define PMU_SYSTEM_READY        0xdf    /* tell PMU we are awake */
-#define PMU_GET_VERSION         0xea    /* read the PMU version */
-
-/* Bits to use with the PMU_POWER_CTRL0 command */
-#define PMU_POW0_ON             0x80    /* OR this to power ON the device */
-#define PMU_POW0_OFF            0x00    /* leave bit 7 to 0 to power it OFF */
-#define PMU_POW0_HARD_DRIVE     0x04    /* Hard drive power (on wallstreet/lombard ?) */
-
-/* Bits to use with the PMU_POWER_CTRL command */
-#define PMU_POW_ON              0x80    /* OR this to power ON the device */
-#define PMU_POW_OFF             0x00    /* leave bit 7 to 0 to power it OFF */
-#define PMU_POW_BACKLIGHT       0x01    /* backlight power */
-#define PMU_POW_CHARGER         0x02    /* battery charger power */
-#define PMU_POW_IRLED           0x04    /* IR led power (on wallstreet) */
-#define PMU_POW_MEDIABAY        0x08    /* media bay power (wallstreet/lombard ?) */
-
-/* Bits in PMU interrupt and interrupt mask bytes */
-#define PMU_INT_PCEJECT         0x04    /* PC-card eject buttons */
-#define PMU_INT_SNDBRT          0x08    /* sound/brightness up/down buttons */
-#define PMU_INT_ADB             0x10    /* ADB autopoll or reply data */
-#define PMU_INT_BATTERY         0x20    /* Battery state change */
-#define PMU_INT_ENVIRONMENT     0x40    /* Environment interrupts */
-#define PMU_INT_TICK            0x80    /* 1-second tick interrupt */
-
-/* Other bits in PMU interrupt valid when PMU_INT_ADB is set */
-#define PMU_INT_ADB_AUTO        0x04    /* ADB autopoll, when PMU_INT_ADB */
-#define PMU_INT_WAITING_CHARGER 0x01    /* ??? */
-#define PMU_INT_AUTO_SRQ_POLL   0x02    /* ??? */
-
-/* Bits in the environement message (either obtained via PMU_GET_COVER,
- * or via PMU_INT_ENVIRONMENT on core99 */
-#define PMU_ENV_LID_CLOSED      0x01    /* The lid is closed */
-
-/* I2C related definitions */
-#define PMU_I2C_MODE_SIMPLE     0
-#define PMU_I2C_MODE_STDSUB     1
-#define PMU_I2C_MODE_COMBINED   2
-
-#define PMU_I2C_BUS_STATUS      0
-#define PMU_I2C_BUS_SYSCLK      1
-#define PMU_I2C_BUS_POWER       2
-
-#define PMU_I2C_STATUS_OK       0
-#define PMU_I2C_STATUS_DATAREAD 1
-#define PMU_I2C_STATUS_BUSY     0xfe
-
-
-/* Kind of PMU (model) */
-enum {
-        PMU_UNKNOWN,
-        PMU_OHARE_BASED,        /* 2400, 3400, 3500 (old G3 powerbook) */
-        PMU_HEATHROW_BASED,     /* PowerBook G3 series */
-        PMU_PADDINGTON_BASED,   /* 1999 PowerBook G3 */
-        PMU_KEYLARGO_BASED,     /* Core99 motherboard (PMU99) */
-        PMU_68K_V1,             /* 68K PMU, version 1 */
-        PMU_68K_V2,             /* 68K PMU, version 2 */
-};
+#include <uapi/linux/pmu.h>
 
-/* PMU PMU_POWER_EVENTS commands */
-enum {
-        PMU_PWR_GET_POWERUP_EVENTS      = 0x00,
-        PMU_PWR_SET_POWERUP_EVENTS      = 0x01,
-        PMU_PWR_CLR_POWERUP_EVENTS      = 0x02,
-        PMU_PWR_GET_WAKEUP_EVENTS       = 0x03,
-        PMU_PWR_SET_WAKEUP_EVENTS       = 0x04,
-        PMU_PWR_CLR_WAKEUP_EVENTS       = 0x05,
-};
-
-/* Power events wakeup bits */
-enum {
-        PMU_PWR_WAKEUP_KEY              = 0x01, /* Wake on key press */
-        PMU_PWR_WAKEUP_AC_INSERT        = 0x02, /* Wake on AC adapter plug */
-        PMU_PWR_WAKEUP_AC_CHANGE        = 0x04,
-        PMU_PWR_WAKEUP_LID_OPEN         = 0x08,
-        PMU_PWR_WAKEUP_RING             = 0x10,
-};
-        
-/*
- * Ioctl commands for the /dev/pmu device
- */
-#include <linux/ioctl.h>
-
-/* no param */
-#define PMU_IOC_SLEEP           _IO('B', 0)
-/* out param: u32*      backlight value: 0 to 15 */
-#define PMU_IOC_GET_BACKLIGHT   _IOR('B', 1, size_t)
-/* in param: u32        backlight value: 0 to 15 */
-#define PMU_IOC_SET_BACKLIGHT   _IOW('B', 2, size_t)
-/* out param: u32*      PMU model */
-#define PMU_IOC_GET_MODEL       _IOR('B', 3, size_t)
-/* out param: u32*      has_adb: 0 or 1 */
-#define PMU_IOC_HAS_ADB         _IOR('B', 4, size_t) 
-/* out param: u32*      can_sleep: 0 or 1 */
-#define PMU_IOC_CAN_SLEEP       _IOR('B', 5, size_t) 
-/* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
-#define PMU_IOC_GRAB_BACKLIGHT  _IOR('B', 6, size_t) 
-
-#ifdef __KERNEL__
 
 extern int find_via_pmu(void);
 
@@ -208,6 +82,4 @@ extern int pmu_sys_suspended;
 #define pmu_sys_suspended       0
 #endif
 
-#endif  /* __KERNEL__ */
-
 #endif /* _LINUX_PMU_H */
diff --git a/include/linux/pnfs_osd_xdr.h b/include/linux/pnfs_osd_xdr.h
index 435dd5fa7453..fe25876c1a5d 100644
--- a/include/linux/pnfs_osd_xdr.h
+++ b/include/linux/pnfs_osd_xdr.h
@@ -40,7 +40,6 @@
 #define __PNFS_OSD_XDR_H__
 
 #include <linux/nfs_fs.h>
-#include <linux/nfs_page.h>
 
 /*
  * draft-ietf-nfsv4-minorversion-22
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 48fe8bc398d1..c08386fb3e08 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -1,9 +1,6 @@
 #ifndef _LINUX_POLL_H
 #define _LINUX_POLL_H
 
-#include <asm/poll.h>
-
-#ifdef __KERNEL__
 
 #include <linux/compiler.h>
 #include <linux/ktime.h>
@@ -12,6 +9,7 @@
 #include <linux/fs.h>
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
+#include <uapi/linux/poll.h>
 
 extern struct ctl_table epoll_table[]; /* for sysctl */
 /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating
@@ -163,6 +161,4 @@ extern int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
 
 extern int poll_select_set_timeout(struct timespec *to, long sec, long nsec);
 
-#endif /* KERNEL */
-
 #endif /* _LINUX_POLL_H */
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index cd22029e32aa..0e86840eb603 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -109,24 +109,43 @@ struct charger_cable {
  * struct charger_regulator
  * @regulator_name: the name of regulator for using charger.
  * @consumer: the regulator consumer for the charger.
+ * @externally_control:
+ *      Set if the charger-manager cannot control charger,
+ *      the charger will be maintained with disabled state.
  * @cables:
  *      the array of charger cables to enable/disable charger
  *      and set current limit according to constratint data of
  *      struct charger_cable if only charger cable included
  *      in the array of charger cables is attached/detached.
  * @num_cables: the number of charger cables.
+ * @attr_g: Attribute group for the charger(regulator)
+ * @attr_name: "name" sysfs entry
+ * @attr_state: "state" sysfs entry
+ * @attr_externally_control: "externally_control" sysfs entry
+ * @attrs: Arrays pointing to attr_name/state/externally_control for attr_g
  */
 struct charger_regulator {
         /* The name of regulator for charging */
         const char *regulator_name;
         struct regulator *consumer;
 
+        /* charger never on when system is on */
+        int externally_control;
+
         /*
          * Store constraint information related to current limit,
          * each cable have different condition for charging.
          */
         struct charger_cable *cables;
         int num_cables;
+
+        struct attribute_group attr_g;
+        struct device_attribute attr_name;
+        struct device_attribute attr_state;
+        struct device_attribute attr_externally_control;
+        struct attribute *attrs[4];
+
+        struct charger_manager *cm;
 };
 
 /**
@@ -140,7 +159,11 @@ struct charger_regulator {
  *      If it has dropped more than fullbatt_vchkdrop_uV after
  *      fullbatt_vchkdrop_ms, CM will restart charging.
  * @fullbatt_uV: voltage in microvolt
- *      If it is not being charged and VBATT >= fullbatt_uV,
+ *      If VBATT >= fullbatt_uV, it is assumed to be full.
+ * @fullbatt_soc: state of Charge in %
+ *      If state of Charge >= fullbatt_soc, it is assumed to be full.
+ * @fullbatt_full_capacity: full capacity measure
+ *      If full capacity of battery >= fullbatt_full_capacity,
  *      it is assumed to be full.
  * @polling_interval_ms: interval in millisecond at which
  *      charger manager will monitor battery health
@@ -148,7 +171,7 @@ struct charger_regulator {
  *      Specify where information for existance of battery can be obtained
  * @psy_charger_stat: the names of power-supply for chargers
  * @num_charger_regulator: the number of entries in charger_regulators
- * @charger_regulators: array of regulator_bulk_data for chargers
+ * @charger_regulators: array of charger regulators
  * @psy_fuel_gauge: the name of power-supply for fuel gauge
  * @temperature_out_of_range:
  *      Determine whether the status is overheat or cold or normal.
@@ -158,6 +181,13 @@ struct charger_regulator {
  * @measure_battery_temp:
  *      true: measure battery temperature
  *      false: measure ambient temperature
+ * @charging_max_duration_ms: Maximum possible duration for charging
+ *      If whole charging duration exceed 'charging_max_duration_ms',
+ *      cm stop charging.
+ * @discharging_max_duration_ms:
+ *      Maximum possible duration for discharging with charger cable
+ *      after full-batt. If discharging duration exceed 'discharging
+ *      max_duration_ms', cm start charging.
  */
 struct charger_desc {
         char *psy_name;
@@ -168,6 +198,8 @@ struct charger_desc {
         unsigned int fullbatt_vchkdrop_ms;
         unsigned int fullbatt_vchkdrop_uV;
         unsigned int fullbatt_uV;
+        unsigned int fullbatt_soc;
+        unsigned int fullbatt_full_capacity;
 
         enum data_source battery_present;
 
@@ -180,6 +212,9 @@ struct charger_desc {
 
         int (*temperature_out_of_range)(int *mC);
         bool measure_battery_temp;
+
+        u64 charging_max_duration_ms;
+        u64 discharging_max_duration_ms;
 };
 
 #define PSY_NAME_MAX    30
@@ -194,8 +229,6 @@ struct charger_desc {
  * @charger_enabled: the state of charger
  * @fullbatt_vchk_jiffies_at:
  *      jiffies at the time full battery check will occur.
- * @fullbatt_vchk_uV: voltage in microvolt
- *      criteria for full battery
  * @fullbatt_vchk_work: work queue for full battery check
  * @emergency_stop:
  *      When setting true, stop charging
@@ -206,6 +239,8 @@ struct charger_desc {
  *      saved status of external power before entering suspend-to-RAM
  * @status_save_batt:
  *      saved status of battery before entering suspend-to-RAM
+ * @charging_start_time: saved start time of enabling charging
+ * @charging_end_time: saved end time of disabling charging
  */
 struct charger_manager {
         struct list_head entry;
@@ -218,7 +253,6 @@ struct charger_manager {
         bool charger_enabled;
 
         unsigned long fullbatt_vchk_jiffies_at;
-        unsigned int fullbatt_vchk_uV;
         struct delayed_work fullbatt_vchk_work;
 
         int emergency_stop;
@@ -229,6 +263,9 @@ struct charger_manager {
 
         bool status_save_ext_pwr_inserted;
         bool status_save_batt;
+
+        u64 charging_start_time;
+        u64 charging_end_time;
 };
 
 #ifdef CONFIG_CHARGER_MANAGER
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 0bafbb15f29c..e5ef45834c3c 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -88,6 +88,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_HEALTH,
         POWER_SUPPLY_PROP_PRESENT,
         POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_AUTHENTIC,
         POWER_SUPPLY_PROP_TECHNOLOGY,
         POWER_SUPPLY_PROP_CYCLE_COUNT,
         POWER_SUPPLY_PROP_VOLTAGE_MAX,
@@ -110,7 +111,9 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_CHARGE_AVG,
         POWER_SUPPLY_PROP_CHARGE_COUNTER,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
@@ -248,6 +251,7 @@ static inline bool power_supply_is_amp_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_CHARGE_AVG:
         case POWER_SUPPLY_PROP_CHARGE_COUNTER:
         case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
         case POWER_SUPPLY_PROP_CURRENT_MAX:
         case POWER_SUPPLY_PROP_CURRENT_NOW:
         case POWER_SUPPLY_PROP_CURRENT_AVG:
@@ -276,6 +280,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
         case POWER_SUPPLY_PROP_VOLTAGE_OCV:
         case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
         case POWER_SUPPLY_PROP_POWER_NOW:
                 return 1;
         default:
diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index e53ff65935dd..4ea1d377e1ad 100644
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -10,6 +10,9 @@
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H
 
+#include <uapi/linux/ppp-comp.h>
+
+
 struct module;
 
 /*
@@ -98,87 +101,6 @@ struct compressor {
 #define DECOMP_ERROR            -1      /* error detected before decomp. */
 #define DECOMP_FATALERROR       -2      /* error detected after decomp. */
 
-/*
- * CCP codes.
- */
-
-#define CCP_CONFREQ     1
-#define CCP_CONFACK     2
-#define CCP_TERMREQ     5
-#define CCP_TERMACK     6
-#define CCP_RESETREQ    14
-#define CCP_RESETACK    15
-
-/*
- * Max # bytes for a CCP option
- */
-
-#define CCP_MAX_OPTION_LENGTH   32
-
-/*
- * Parts of a CCP packet.
- */
-
-#define CCP_CODE(dp)            ((dp)[0])
-#define CCP_ID(dp)              ((dp)[1])
-#define CCP_LENGTH(dp)          (((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN              4
-
-#define CCP_OPT_CODE(dp)        ((dp)[0])
-#define CCP_OPT_LENGTH(dp)      ((dp)[1])
-#define CCP_OPT_MINLEN          2
-
-/*
- * Definitions for BSD-Compress.
- */
-
-#define CI_BSD_COMPRESS         21      /* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS      3       /* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)            ((x) & 0x1F)    /* number of bits requested */
-#define BSD_VERSION(x)          ((x) >> 5)      /* version of option format */
-#define BSD_CURRENT_VERSION     1               /* current version number */
-#define BSD_MAKE_OPT(v, n)      (((v) << 5) | (n))
-
-#define BSD_MIN_BITS            9       /* smallest code size supported */
-#define BSD_MAX_BITS            15      /* largest code size supported */
-
-/*
- * Definitions for Deflate.
- */
-
-#define CI_DEFLATE              26      /* config option for Deflate */
-#define CI_DEFLATE_DRAFT        24      /* value used in original draft RFC */
-#define CILEN_DEFLATE           4       /* length of its config option */
-
-#define DEFLATE_MIN_SIZE        9
-#define DEFLATE_MAX_SIZE        15
-#define DEFLATE_METHOD_VAL      8
-#define DEFLATE_SIZE(x)         (((x) >> 4) + 8)
-#define DEFLATE_METHOD(x)       ((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)     ((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE    0
-
-/*
- * Definitions for MPPE.
- */
-
-#define CI_MPPE                18      /* config option for MPPE */
-#define CILEN_MPPE              6      /* length of config option */
-
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-
-#define CI_PREDICTOR_1          1       /* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1       2       /* length of its config option */
-#define CI_PREDICTOR_2          2       /* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2       2       /* length of its config option */
-
-#ifdef __KERNEL__
 extern int ppp_register_compressor(struct compressor *);
 extern void ppp_unregister_compressor(struct compressor *);
-#endif /* __KERNEL__ */
-
 #endif /* _NET_PPP_COMP_H */
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index ba416f67eb62..28aa0237c8c3 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -7,148 +7,11 @@
  *  modify it under the terms of the GNU General Public License
  *  version 2 as published by the Free Software Foundation.
  */
-#include <linux/types.h>
-
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
-/*
- * The basic PPP frame.
- */
-#define PPP_HDRLEN      4       /* octets for standard ppp header */
-#define PPP_FCSLEN      2       /* octets for FCS */
-#define PPP_MRU         1500    /* default MRU = max length of info field */
-
-#define PPP_ADDRESS(p)  (((__u8 *)(p))[0])
-#define PPP_CONTROL(p)  (((__u8 *)(p))[1])
-#define PPP_PROTOCOL(p) ((((__u8 *)(p))[2] << 8) + ((__u8 *)(p))[3])
-
-/*
- * Significant octet values.
- */
-#define PPP_ALLSTATIONS 0xff    /* All-Stations broadcast address */
-#define PPP_UI          0x03    /* Unnumbered Information */
-#define PPP_FLAG        0x7e    /* Flag Sequence */
-#define PPP_ESCAPE      0x7d    /* Asynchronous Control Escape */
-#define PPP_TRANS       0x20    /* Asynchronous transparency modifier */
-
-/*
- * Protocol field values.
- */
-#define PPP_IP          0x21    /* Internet Protocol */
-#define PPP_AT          0x29    /* AppleTalk Protocol */
-#define PPP_IPX         0x2b    /* IPX protocol */
-#define PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
-#define PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
-#define PPP_MP          0x3d    /* Multilink protocol */
-#define PPP_IPV6        0x57    /* Internet Protocol Version 6 */
-#define PPP_COMPFRAG    0xfb    /* fragment compressed below bundle */
-#define PPP_COMP        0xfd    /* compressed packet */
-#define PPP_MPLS_UC     0x0281  /* Multi Protocol Label Switching - Unicast */
-#define PPP_MPLS_MC     0x0283  /* Multi Protocol Label Switching - Multicast */
-#define PPP_IPCP        0x8021  /* IP Control Protocol */
-#define PPP_ATCP        0x8029  /* AppleTalk Control Protocol */
-#define PPP_IPXCP       0x802b  /* IPX Control Protocol */
-#define PPP_IPV6CP      0x8057  /* IPv6 Control Protocol */
-#define PPP_CCPFRAG     0x80fb  /* CCP at link level (below MP bundle) */
-#define PPP_CCP         0x80fd  /* Compression Control Protocol */
-#define PPP_MPLSCP      0x80fd  /* MPLS Control Protocol */
-#define PPP_LCP         0xc021  /* Link Control Protocol */
-#define PPP_PAP         0xc023  /* Password Authentication Protocol */
-#define PPP_LQR         0xc025  /* Link Quality Report protocol */
-#define PPP_CHAP        0xc223  /* Cryptographic Handshake Auth. Protocol */
-#define PPP_CBCP        0xc029  /* Callback Control Protocol */
-
-/*
- * Values for FCS calculations.
- */
-
-#define PPP_INITFCS     0xffff  /* Initial FCS value */
-#define PPP_GOODFCS     0xf0b8  /* Good final FCS value */
-
-#ifdef __KERNEL__
 #include <linux/crc-ccitt.h>
-#define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
-#endif
-
-/*
- * Extended asyncmap - allows any character to be escaped.
- */
-
-typedef __u32           ext_accm[8];
-
-/*
- * What to do with network protocol (NP) packets.
- */
-enum NPmode {
-    NPMODE_PASS,                /* pass the packet through */
-    NPMODE_DROP,                /* silently drop the packet */
-    NPMODE_ERROR,               /* return an error */
-    NPMODE_QUEUE                /* save it up for later. */
-};
-
-/*
- * Statistics for LQRP and pppstats
- */
-struct pppstat  {
-    __u32       ppp_discards;   /* # frames discarded */
-
-    __u32       ppp_ibytes;     /* bytes received */
-    __u32       ppp_ioctects;   /* bytes received not in error */
-    __u32       ppp_ipackets;   /* packets received */
-    __u32       ppp_ierrors;    /* receive errors */
-    __u32       ppp_ilqrs;      /* # LQR frames received */
-
-    __u32       ppp_obytes;     /* raw bytes sent */
-    __u32       ppp_ooctects;   /* frame bytes sent */
-    __u32       ppp_opackets;   /* packets sent */
-    __u32       ppp_oerrors;    /* transmit errors */ 
-    __u32       ppp_olqrs;      /* # LQR frames sent */
-};
-
-struct vjstat {
-    __u32       vjs_packets;    /* outbound packets */
-    __u32       vjs_compressed; /* outbound compressed packets */
-    __u32       vjs_searches;   /* searches for connection state */
-    __u32       vjs_misses;     /* times couldn't find conn. state */
-    __u32       vjs_uncompressedin; /* inbound uncompressed packets */
-    __u32       vjs_compressedin;   /* inbound compressed packets */
-    __u32       vjs_errorin;    /* inbound unknown type packets */
-    __u32       vjs_tossed;     /* inbound packets tossed because of error */
-};
-
-struct compstat {
-    __u32       unc_bytes;      /* total uncompressed bytes */
-    __u32       unc_packets;    /* total uncompressed packets */
-    __u32       comp_bytes;     /* compressed bytes */
-    __u32       comp_packets;   /* compressed packets */
-    __u32       inc_bytes;      /* incompressible bytes */
-    __u32       inc_packets;    /* incompressible packets */
-
-    /* the compression ratio is defined as in_count / bytes_out */
-    __u32       in_count;       /* Bytes received */
-    __u32       bytes_out;      /* Bytes transmitted */
-
-    double      ratio;          /* not computed in kernel. */
-};
-
-struct ppp_stats {
-    struct pppstat      p;      /* basic PPP statistics */
-    struct vjstat       vj;     /* VJ header compression statistics */
-};
-
-struct ppp_comp_stats {
-    struct compstat     c;      /* packet compression statistics */
-    struct compstat     d;      /* packet decompression statistics */
-};
-
-/*
- * The following structure records the time in seconds since
- * the last NP packet was sent or received.
- */
-struct ppp_idle {
-    __kernel_time_t xmit_idle;  /* time since last NP packet sent */
-    __kernel_time_t recv_idle;  /* time since last NP packet received */
-};
+#include <uapi/linux/ppp_defs.h>
 
+#define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
 #endif /* _PPP_DEFS_H_ */
diff --git a/include/linux/prio_tree.h b/include/linux/prio_tree.h
deleted file mode 100644
index db04abb557e0..000000000000
--- a/include/linux/prio_tree.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef _LINUX_PRIO_TREE_H
-#define _LINUX_PRIO_TREE_H
-
-/*
- * K&R 2nd ed. A8.3 somewhat obliquely hints that initial sequences of struct
- * fields with identical types should end up at the same location. We'll use
- * this until we can scrap struct raw_prio_tree_node.
- *
- * Note: all this could be done more elegantly by using unnamed union/struct
- * fields. However, gcc 2.95.3 and apparently also gcc 3.0.4 don't support this
- * language extension.
- */
-
-struct raw_prio_tree_node {
-        struct prio_tree_node   *left;
-        struct prio_tree_node   *right;
-        struct prio_tree_node   *parent;
-};
-
-struct prio_tree_node {
-        struct prio_tree_node   *left;
-        struct prio_tree_node   *right;
-        struct prio_tree_node   *parent;
-        unsigned long           start;
-        unsigned long           last;   /* last location _in_ interval */
-};
-
-struct prio_tree_root {
-        struct prio_tree_node   *prio_tree_node;
-        unsigned short          index_bits;
-        unsigned short          raw;
-                /*
-                 * 0: nodes are of type struct prio_tree_node
-                 * 1: nodes are of type raw_prio_tree_node
-                 */
-};
-
-struct prio_tree_iter {
-        struct prio_tree_node   *cur;
-        unsigned long           mask;
-        unsigned long           value;
-        int                     size_level;
-
-        struct prio_tree_root   *root;
-        pgoff_t                 r_index;
-        pgoff_t                 h_index;
-};
-
-static inline void prio_tree_iter_init(struct prio_tree_iter *iter,
-                struct prio_tree_root *root, pgoff_t r_index, pgoff_t h_index)
-{
-        iter->root = root;
-        iter->r_index = r_index;
-        iter->h_index = h_index;
-        iter->cur = NULL;
-}
-
-#define __INIT_PRIO_TREE_ROOT(ptr, _raw)        \
-do {                                    \
-        (ptr)->prio_tree_node = NULL;   \
-        (ptr)->index_bits = 1;          \
-        (ptr)->raw = (_raw);            \
-} while (0)
-
-#define INIT_PRIO_TREE_ROOT(ptr)        __INIT_PRIO_TREE_ROOT(ptr, 0)
-#define INIT_RAW_PRIO_TREE_ROOT(ptr)    __INIT_PRIO_TREE_ROOT(ptr, 1)
-
-#define INIT_PRIO_TREE_NODE(ptr)                                \
-do {                                                            \
-        (ptr)->left = (ptr)->right = (ptr)->parent = (ptr);     \
-} while (0)
-
-#define INIT_PRIO_TREE_ITER(ptr)        \
-do {                                    \
-        (ptr)->cur = NULL;              \
-        (ptr)->mask = 0UL;              \
-        (ptr)->value = 0UL;             \
-        (ptr)->size_level = 0;          \
-} while (0)
-
-#define prio_tree_entry(ptr, type, member) \
-       ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-
-static inline int prio_tree_empty(const struct prio_tree_root *root)
-{
-        return root->prio_tree_node == NULL;
-}
-
-static inline int prio_tree_root(const struct prio_tree_node *node)
-{
-        return node->parent == node;
-}
-
-static inline int prio_tree_left_empty(const struct prio_tree_node *node)
-{
-        return node->left == node;
-}
-
-static inline int prio_tree_right_empty(const struct prio_tree_node *node)
-{
-        return node->right == node;
-}
-
-
-struct prio_tree_node *prio_tree_replace(struct prio_tree_root *root,
-                struct prio_tree_node *old, struct prio_tree_node *node);
-struct prio_tree_node *prio_tree_insert(struct prio_tree_root *root,
-                struct prio_tree_node *node);
-void prio_tree_remove(struct prio_tree_root *root, struct prio_tree_node *node);
-struct prio_tree_node *prio_tree_next(struct prio_tree_iter *iter);
-
-#define raw_prio_tree_replace(root, old, node) \
-        prio_tree_replace(root, (struct prio_tree_node *) (old), \
-            (struct prio_tree_node *) (node))
-#define raw_prio_tree_insert(root, node) \
-        prio_tree_insert(root, (struct prio_tree_node *) (node))
-#define raw_prio_tree_remove(root, node) \
-        prio_tree_remove(root, (struct prio_tree_node *) (node))
-
-#endif /* _LINUX_PRIO_TREE_H */
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index c892587d9b81..ee3034a40884 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -64,14 +64,6 @@ struct pstore_info {
         void            *data;
 };
 
-
-#ifdef CONFIG_PSTORE_FTRACE
-extern void pstore_ftrace_call(unsigned long ip, unsigned long parent_ip);
-#else
-static inline void pstore_ftrace_call(unsigned long ip, unsigned long parent_ip)
-{ }
-#endif
-
 #ifdef CONFIG_PSTORE
 extern int pstore_register(struct pstore_info *);
 #else
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 3db698aee34c..e0ff4689d35a 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -1,83 +1,13 @@
 #ifndef _LINUX_PTRACE_H
 #define _LINUX_PTRACE_H
-/* ptrace.h */
-/* structs and defines to help the user use the ptrace system call. */
 
-/* has the defines to get at the registers. */
-
-#define PTRACE_TRACEME             0
-#define PTRACE_PEEKTEXT            1
-#define PTRACE_PEEKDATA            2
-#define PTRACE_PEEKUSR             3
-#define PTRACE_POKETEXT            4
-#define PTRACE_POKEDATA            5
-#define PTRACE_POKEUSR             6
-#define PTRACE_CONT                7
-#define PTRACE_KILL                8
-#define PTRACE_SINGLESTEP          9
-
-#define PTRACE_ATTACH             16
-#define PTRACE_DETACH             17
-
-#define PTRACE_SYSCALL            24
-
-/* 0x4200-0x4300 are reserved for architecture-independent additions.  */
-#define PTRACE_SETOPTIONS       0x4200
-#define PTRACE_GETEVENTMSG      0x4201
-#define PTRACE_GETSIGINFO       0x4202
-#define PTRACE_SETSIGINFO       0x4203
+#include <linux/compiler.h>             /* For unlikely.  */
+#include <linux/sched.h>                /* For struct task_struct.  */
+#include <linux/err.h>                  /* for IS_ERR_VALUE */
+#include <linux/bug.h>                  /* For BUG_ON.  */
+#include <uapi/linux/ptrace.h>
 
 /*
- * Generic ptrace interface that exports the architecture specific regsets
- * using the corresponding NT_* types (which are also used in the core dump).
- * Please note that the NT_PRSTATUS note type in a core dump contains a full
- * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
- * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
- * other user_regset flavors, the user_regset layout and the ELF core dump note
- * payload are exactly the same layout.
- *
- * This interface usage is as follows:
- *      struct iovec iov = { buf, len};
- *
- *      ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov);
- *
- * On the successful completion, iov.len will be updated by the kernel,
- * specifying how much the kernel has written/read to/from the user's iov.buf.
- */
-#define PTRACE_GETREGSET        0x4204
-#define PTRACE_SETREGSET        0x4205
-
-#define PTRACE_SEIZE            0x4206
-#define PTRACE_INTERRUPT        0x4207
-#define PTRACE_LISTEN           0x4208
-
-/* Wait extended result codes for the above trace options.  */
-#define PTRACE_EVENT_FORK       1
-#define PTRACE_EVENT_VFORK      2
-#define PTRACE_EVENT_CLONE      3
-#define PTRACE_EVENT_EXEC       4
-#define PTRACE_EVENT_VFORK_DONE 5
-#define PTRACE_EVENT_EXIT       6
-#define PTRACE_EVENT_SECCOMP    7
-/* Extended result codes which enabled by means other than options.  */
-#define PTRACE_EVENT_STOP       128
-
-/* Options set using PTRACE_SETOPTIONS or using PTRACE_SEIZE @data param */
-#define PTRACE_O_TRACESYSGOOD   1
-#define PTRACE_O_TRACEFORK      (1 << PTRACE_EVENT_FORK)
-#define PTRACE_O_TRACEVFORK     (1 << PTRACE_EVENT_VFORK)
-#define PTRACE_O_TRACECLONE     (1 << PTRACE_EVENT_CLONE)
-#define PTRACE_O_TRACEEXEC      (1 << PTRACE_EVENT_EXEC)
-#define PTRACE_O_TRACEVFORKDONE (1 << PTRACE_EVENT_VFORK_DONE)
-#define PTRACE_O_TRACEEXIT      (1 << PTRACE_EVENT_EXIT)
-#define PTRACE_O_TRACESECCOMP   (1 << PTRACE_EVENT_SECCOMP)
-
-#define PTRACE_O_MASK           0x000000ff
-
-#include <asm/ptrace.h>
-
-#ifdef __KERNEL__
-/*
  * Ptrace flags
  *
  * The owner ship rules for task->ptrace which holds the ptrace
@@ -108,12 +38,6 @@
 #define PT_BLOCKSTEP_BIT        30
 #define PT_BLOCKSTEP            (1<<PT_BLOCKSTEP_BIT)
 
-#include <linux/compiler.h>             /* For unlikely.  */
-#include <linux/sched.h>                /* For struct task_struct.  */
-#include <linux/err.h>                  /* for IS_ERR_VALUE */
-#include <linux/bug.h>                  /* For BUG_ON.  */
-
-
 extern long arch_ptrace(struct task_struct *child, long request,
                         unsigned long addr, unsigned long data);
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
@@ -401,6 +325,10 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
 #define arch_ptrace_stop(code, info)            do { } while (0)
 #endif
 
+#ifndef current_pt_regs
+#define current_pt_regs() task_pt_regs(current)
+#endif
+
 extern int task_current_syscall(struct task_struct *target, long *callno,
                                 unsigned long args[6], unsigned int maxargs,
                                 unsigned long *sp, unsigned long *pc);
@@ -412,6 +340,4 @@ extern void ptrace_put_breakpoints(struct task_struct *tsk);
 static inline void ptrace_put_breakpoints(struct task_struct *tsk) { }
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 
-#endif /* __KERNEL */
-
 #endif
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 21d076c5089e..112b31436848 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -1,11 +1,13 @@
 #ifndef __LINUX_PWM_H
 #define __LINUX_PWM_H
 
+#include <linux/err.h>
 #include <linux/of.h>
 
 struct pwm_device;
 struct seq_file;
 
+#if IS_ENABLED(CONFIG_PWM) || IS_ENABLED(CONFIG_HAVE_PWM)
 /*
  * pwm_request - request a PWM device
  */
@@ -30,10 +32,47 @@ int pwm_enable(struct pwm_device *pwm);
  * pwm_disable - stop a PWM output toggling
  */
 void pwm_disable(struct pwm_device *pwm);
+#else
+static inline struct pwm_device *pwm_request(int pwm_id, const char *label)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline void pwm_free(struct pwm_device *pwm)
+{
+}
+
+static inline int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
+{
+        return -EINVAL;
+}
+
+static inline int pwm_enable(struct pwm_device *pwm)
+{
+        return -EINVAL;
+}
+
+static inline void pwm_disable(struct pwm_device *pwm)
+{
+}
+#endif
 
-#ifdef CONFIG_PWM
 struct pwm_chip;
 
+/**
+ * enum pwm_polarity - polarity of a PWM signal
+ * @PWM_POLARITY_NORMAL: a high signal for the duration of the duty-
+ * cycle, followed by a low signal for the remainder of the pulse
+ * period
+ * @PWM_POLARITY_INVERSED: a low signal for the duration of the duty-
+ * cycle, followed by a high signal for the remainder of the pulse
+ * period
+ */
+enum pwm_polarity {
+        PWM_POLARITY_NORMAL,
+        PWM_POLARITY_INVERSED,
+};
+
 enum {
         PWMF_REQUESTED = 1 << 0,
         PWMF_ENABLED = 1 << 1,
@@ -61,11 +100,17 @@ static inline unsigned int pwm_get_period(struct pwm_device *pwm)
         return pwm ? pwm->period : 0;
 }
 
+/*
+ * pwm_set_polarity - configure the polarity of a PWM signal
+ */
+int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity);
+
 /**
  * struct pwm_ops - PWM controller operations
  * @request: optional hook for requesting a PWM
  * @free: optional hook for freeing a PWM
  * @config: configure duty cycles and period length for this PWM
+ * @set_polarity: configure the polarity of this PWM
  * @enable: enable PWM output toggling
  * @disable: disable PWM output toggling
  * @dbg_show: optional routine to show contents in debugfs
@@ -79,6 +124,9 @@ struct pwm_ops {
         int                     (*config)(struct pwm_chip *chip,
                                           struct pwm_device *pwm,
                                           int duty_ns, int period_ns);
+        int                     (*set_polarity)(struct pwm_chip *chip,
+                                          struct pwm_device *pwm,
+                                          enum pwm_polarity polarity);
         int                     (*enable)(struct pwm_chip *chip,
                                           struct pwm_device *pwm);
         void                    (*disable)(struct pwm_chip *chip,
@@ -113,6 +161,7 @@ struct pwm_chip {
         unsigned int            of_pwm_n_cells;
 };
 
+#if IS_ENABLED(CONFIG_PWM)
 int pwm_set_chip_data(struct pwm_device *pwm, void *data);
 void *pwm_get_chip_data(struct pwm_device *pwm);
 
@@ -125,6 +174,57 @@ struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
 struct pwm_device *pwm_get(struct device *dev, const char *consumer);
 void pwm_put(struct pwm_device *pwm);
 
+struct pwm_device *devm_pwm_get(struct device *dev, const char *consumer);
+void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
+#else
+static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data)
+{
+        return -EINVAL;
+}
+
+static inline void *pwm_get_chip_data(struct pwm_device *pwm)
+{
+        return NULL;
+}
+
+static inline int pwmchip_add(struct pwm_chip *chip)
+{
+        return -EINVAL;
+}
+
+static inline int pwmchip_remove(struct pwm_chip *chip)
+{
+        return -EINVAL;
+}
+
+static inline struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
+                                                       unsigned int index,
+                                                       const char *label)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline struct pwm_device *pwm_get(struct device *dev,
+                                         const char *consumer)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline void pwm_put(struct pwm_device *pwm)
+{
+}
+
+static inline struct pwm_device *devm_pwm_get(struct device *dev,
+                                              const char *consumer)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
+{
+}
+#endif
+
 struct pwm_lookup {
         struct list_head list;
         const char *provider;
@@ -141,8 +241,12 @@ struct pwm_lookup {
                 .con_id = _con_id,                      \
         }
 
+#if IS_ENABLED(CONFIG_PWM)
 void pwm_add_table(struct pwm_lookup *table, size_t num);
-
+#else
+static inline void pwm_add_table(struct pwm_lookup *table, size_t num)
+{
+}
 #endif
 
 #endif /* __LINUX_PWM_H */
diff --git a/include/linux/quota.h b/include/linux/quota.h
index dcd5721e626d..58fdef125252 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -29,146 +29,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #ifndef _LINUX_QUOTA_
 #define _LINUX_QUOTA_
 
-#include <linux/errno.h>
-#include <linux/types.h>
-
-#define __DQUOT_VERSION__       "dquot_6.5.2"
-
-#define MAXQUOTAS 2
-#define USRQUOTA  0             /* element used for user quotas */
-#define GRPQUOTA  1             /* element used for group quotas */
-
-/*
- * Definitions for the default names of the quotas files.
- */
-#define INITQFNAMES { \
-        "user",    /* USRQUOTA */ \
-        "group",   /* GRPQUOTA */ \
-        "undefined", \
-};
-
-/*
- * Command definitions for the 'quotactl' system call.
- * The commands are broken into a main command defined below
- * and a subcommand that is used to convey the type of
- * quota that is being manipulated (see above).
- */
-#define SUBCMDMASK  0x00ff
-#define SUBCMDSHIFT 8
-#define QCMD(cmd, type)  (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
-
-#define Q_SYNC     0x800001     /* sync disk copy of a filesystems quotas */
-#define Q_QUOTAON  0x800002     /* turn quotas on */
-#define Q_QUOTAOFF 0x800003     /* turn quotas off */
-#define Q_GETFMT   0x800004     /* get quota format used on given filesystem */
-#define Q_GETINFO  0x800005     /* get information about quota files */
-#define Q_SETINFO  0x800006     /* set information about quota files */
-#define Q_GETQUOTA 0x800007     /* get user quota structure */
-#define Q_SETQUOTA 0x800008     /* set user quota structure */
-
-/* Quota format type IDs */
-#define QFMT_VFS_OLD 1
-#define QFMT_VFS_V0 2
-#define QFMT_OCFS2 3
-#define QFMT_VFS_V1 4
-
-/* Size of block in which space limits are passed through the quota
- * interface */
-#define QIF_DQBLKSIZE_BITS 10
-#define QIF_DQBLKSIZE (1 << QIF_DQBLKSIZE_BITS)
-
-/*
- * Quota structure used for communication with userspace via quotactl
- * Following flags are used to specify which fields are valid
- */
-enum {
-        QIF_BLIMITS_B = 0,
-        QIF_SPACE_B,
-        QIF_ILIMITS_B,
-        QIF_INODES_B,
-        QIF_BTIME_B,
-        QIF_ITIME_B,
-};
-
-#define QIF_BLIMITS     (1 << QIF_BLIMITS_B)
-#define QIF_SPACE       (1 << QIF_SPACE_B)
-#define QIF_ILIMITS     (1 << QIF_ILIMITS_B)
-#define QIF_INODES      (1 << QIF_INODES_B)
-#define QIF_BTIME       (1 << QIF_BTIME_B)
-#define QIF_ITIME       (1 << QIF_ITIME_B)
-#define QIF_LIMITS      (QIF_BLIMITS | QIF_ILIMITS)
-#define QIF_USAGE       (QIF_SPACE | QIF_INODES)
-#define QIF_TIMES       (QIF_BTIME | QIF_ITIME)
-#define QIF_ALL         (QIF_LIMITS | QIF_USAGE | QIF_TIMES)
-
-struct if_dqblk {
-        __u64 dqb_bhardlimit;
-        __u64 dqb_bsoftlimit;
-        __u64 dqb_curspace;
-        __u64 dqb_ihardlimit;
-        __u64 dqb_isoftlimit;
-        __u64 dqb_curinodes;
-        __u64 dqb_btime;
-        __u64 dqb_itime;
-        __u32 dqb_valid;
-};
-
-/*
- * Structure used for setting quota information about file via quotactl
- * Following flags are used to specify which fields are valid
- */
-#define IIF_BGRACE      1
-#define IIF_IGRACE      2
-#define IIF_FLAGS       4
-#define IIF_ALL         (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
-
-struct if_dqinfo {
-        __u64 dqi_bgrace;
-        __u64 dqi_igrace;
-        __u32 dqi_flags;
-        __u32 dqi_valid;
-};
-
-/*
- * Definitions for quota netlink interface
- */
-#define QUOTA_NL_NOWARN 0
-#define QUOTA_NL_IHARDWARN 1            /* Inode hardlimit reached */
-#define QUOTA_NL_ISOFTLONGWARN 2        /* Inode grace time expired */
-#define QUOTA_NL_ISOFTWARN 3            /* Inode softlimit reached */
-#define QUOTA_NL_BHARDWARN 4            /* Block hardlimit reached */
-#define QUOTA_NL_BSOFTLONGWARN 5        /* Block grace time expired */
-#define QUOTA_NL_BSOFTWARN 6            /* Block softlimit reached */
-#define QUOTA_NL_IHARDBELOW 7           /* Usage got below inode hardlimit */
-#define QUOTA_NL_ISOFTBELOW 8           /* Usage got below inode softlimit */
-#define QUOTA_NL_BHARDBELOW 9           /* Usage got below block hardlimit */
-#define QUOTA_NL_BSOFTBELOW 10          /* Usage got below block softlimit */
-
-enum {
-        QUOTA_NL_C_UNSPEC,
-        QUOTA_NL_C_WARNING,
-        __QUOTA_NL_C_MAX,
-};
-#define QUOTA_NL_C_MAX (__QUOTA_NL_C_MAX - 1)
-
-enum {
-        QUOTA_NL_A_UNSPEC,
-        QUOTA_NL_A_QTYPE,
-        QUOTA_NL_A_EXCESS_ID,
-        QUOTA_NL_A_WARNING,
-        QUOTA_NL_A_DEV_MAJOR,
-        QUOTA_NL_A_DEV_MINOR,
-        QUOTA_NL_A_CAUSED_ID,
-        __QUOTA_NL_A_MAX,
-};
-#define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
-
-
-#ifdef __KERNEL__
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/rwsem.h>
@@ -183,6 +46,7 @@ enum {
 #include <linux/atomic.h>
 #include <linux/uidgid.h>
 #include <linux/projid.h>
+#include <uapi/linux/quota.h>
 
 #undef USRQUOTA
 #undef GRPQUOTA
@@ -543,5 +407,4 @@ struct quota_module_name {
         {QFMT_VFS_V0, "quota_v2"},\
         {0, NULL}}
 
-#endif /* __KERNEL__ */
 #endif /* _QUOTA_ */
diff --git a/include/linux/random.h b/include/linux/random.h
index ac621ce886ca..6330ed47b38b 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -3,50 +3,11 @@
  *
  * Include file for the random number generator.
  */
-
 #ifndef _LINUX_RANDOM_H
 #define _LINUX_RANDOM_H
 
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/irqnr.h>
-
-/* ioctl()'s for the random number generator */
-
-/* Get the entropy count. */
-#define RNDGETENTCNT    _IOR( 'R', 0x00, int )
-
-/* Add to (or subtract from) the entropy count.  (Superuser only.) */
-#define RNDADDTOENTCNT  _IOW( 'R', 0x01, int )
-
-/* Get the contents of the entropy pool.  (Superuser only.) */
-#define RNDGETPOOL      _IOR( 'R', 0x02, int [2] )
-
-/* 
- * Write bytes into the entropy pool and add to the entropy count.
- * (Superuser only.)
- */
-#define RNDADDENTROPY   _IOW( 'R', 0x03, int [2] )
+#include <uapi/linux/random.h>
 
-/* Clear entropy count to 0.  (Superuser only.) */
-#define RNDZAPENTCNT    _IO( 'R', 0x04 )
-
-/* Clear the entropy pool and associated counters.  (Superuser only.) */
-#define RNDCLEARPOOL    _IO( 'R', 0x06 )
-
-struct rand_pool_info {
-        int     entropy_count;
-        int     buf_size;
-        __u32   buf[0];
-};
-
-struct rnd_state {
-        __u32 s1, s2, s3;
-};
-
-/* Exported functions */
-
-#ifdef __KERNEL__
 
 extern void add_device_randomness(const void *, unsigned int);
 extern void add_input_randomness(unsigned int type, unsigned int code,
@@ -104,6 +65,4 @@ static inline int arch_get_random_int(unsigned int *v)
 }
 #endif
 
-#endif /* __KERNEL___ */
-
 #endif /* _LINUX_RANDOM_H */
diff --git a/include/linux/ratelimit.h b/include/linux/ratelimit.h
index e11ccb4cf48d..0a260d8a18bf 100644
--- a/include/linux/ratelimit.h
+++ b/include/linux/ratelimit.h
@@ -46,20 +46,17 @@ extern int ___ratelimit(struct ratelimit_state *rs, const char *func);
 #define WARN_ON_RATELIMIT(condition, state)                     \
                 WARN_ON((condition) && __ratelimit(state))
 
-#define __WARN_RATELIMIT(condition, state, format...)           \
-({                                                              \
-        int rtn = 0;                                            \
-        if (unlikely(__ratelimit(state)))                       \
-                rtn = WARN(condition, format);                  \
-        rtn;                                                    \
-})
-
-#define WARN_RATELIMIT(condition, format...)                    \
+#define WARN_RATELIMIT(condition, format, ...)                  \
 ({                                                              \
         static DEFINE_RATELIMIT_STATE(_rs,                      \
                                       DEFAULT_RATELIMIT_INTERVAL,       \
                                       DEFAULT_RATELIMIT_BURST); \
-        __WARN_RATELIMIT(condition, &_rs, format);              \
+        int rtn = !!(condition);                                \
+                                                                \
+        if (unlikely(rtn && __ratelimit(&_rs)))                 \
+                WARN(rtn, format, ##__VA_ARGS__);               \
+                                                                \
+        rtn;                                                    \
 })
 
 #else
@@ -67,15 +64,9 @@ extern int ___ratelimit(struct ratelimit_state *rs, const char *func);
 #define WARN_ON_RATELIMIT(condition, state)                     \
         WARN_ON(condition)
 
-#define __WARN_RATELIMIT(condition, state, format...)           \
-({                                                              \
-        int rtn = WARN(condition, format);                      \
-        rtn;                                                    \
-})
-
-#define WARN_RATELIMIT(condition, format...)                    \
+#define WARN_RATELIMIT(condition, format, ...)                  \
 ({                                                              \
-        int rtn = WARN(condition, format);                      \
+        int rtn = WARN(condition, format, ##__VA_ARGS__);       \
         rtn;                                                    \
 })
 
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 033b507b33b1..0022c1bb1e26 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -23,72 +23,7 @@
   I know it's not the cleaner way,  but in C (not in C++) to get
   performances and genericity...
 
-  Some example of insert and search follows here. The search is a plain
-  normal search over an ordered tree. The insert instead must be implemented
-  in two steps: First, the code must insert the element in order as a red leaf
-  in the tree, and then the support library function rb_insert_color() must
-  be called. Such function will do the not trivial work to rebalance the
-  rbtree, if necessary.
-
------------------------------------------------------------------------
-static inline struct page * rb_search_page_cache(struct inode * inode,
-                                                 unsigned long offset)
-{
-        struct rb_node * n = inode->i_rb_page_cache.rb_node;
-        struct page * page;
-
-        while (n)
-        {
-                page = rb_entry(n, struct page, rb_page_cache);
-
-                if (offset < page->offset)
-                        n = n->rb_left;
-                else if (offset > page->offset)
-                        n = n->rb_right;
-                else
-                        return page;
-        }
-        return NULL;
-}
-
-static inline struct page * __rb_insert_page_cache(struct inode * inode,
-                                                   unsigned long offset,
-                                                   struct rb_node * node)
-{
-        struct rb_node ** p = &inode->i_rb_page_cache.rb_node;
-        struct rb_node * parent = NULL;
-        struct page * page;
-
-        while (*p)
-        {
-                parent = *p;
-                page = rb_entry(parent, struct page, rb_page_cache);
-
-                if (offset < page->offset)
-                        p = &(*p)->rb_left;
-                else if (offset > page->offset)
-                        p = &(*p)->rb_right;
-                else
-                        return page;
-        }
-
-        rb_link_node(node, parent, p);
-
-        return NULL;
-}
-
-static inline struct page * rb_insert_page_cache(struct inode * inode,
-                                                 unsigned long offset,
-                                                 struct rb_node * node)
-{
-        struct page * ret;
-        if ((ret = __rb_insert_page_cache(inode, offset, node)))
-                goto out;
-        rb_insert_color(node, &inode->i_rb_page_cache);
- out:
-        return ret;
-}
------------------------------------------------------------------------
+  See Documentation/rbtree.txt for documentation and samples.
 */
 
 #ifndef _LINUX_RBTREE_H
@@ -97,63 +32,35 @@ static inline struct page * rb_insert_page_cache(struct inode * inode,
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 
-struct rb_node
-{
-        unsigned long  rb_parent_color;
-#define RB_RED          0
-#define RB_BLACK        1
+struct rb_node {
+        unsigned long  __rb_parent_color;
         struct rb_node *rb_right;
         struct rb_node *rb_left;
 } __attribute__((aligned(sizeof(long))));
     /* The alignment might seem pointless, but allegedly CRIS needs it */
 
-struct rb_root
-{
+struct rb_root {
         struct rb_node *rb_node;
 };
 
 
-#define rb_parent(r)   ((struct rb_node *)((r)->rb_parent_color & ~3))
-#define rb_color(r)   ((r)->rb_parent_color & 1)
-#define rb_is_red(r)   (!rb_color(r))
-#define rb_is_black(r) rb_color(r)
-#define rb_set_red(r)  do { (r)->rb_parent_color &= ~1; } while (0)
-#define rb_set_black(r)  do { (r)->rb_parent_color |= 1; } while (0)
-
-static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
-{
-        rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p;
-}
-static inline void rb_set_color(struct rb_node *rb, int color)
-{
-        rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
-}
+#define rb_parent(r)   ((struct rb_node *)((r)->__rb_parent_color & ~3))
 
 #define RB_ROOT (struct rb_root) { NULL, }
 #define rb_entry(ptr, type, member) container_of(ptr, type, member)
 
-#define RB_EMPTY_ROOT(root)     ((root)->rb_node == NULL)
-#define RB_EMPTY_NODE(node)     (rb_parent(node) == node)
-#define RB_CLEAR_NODE(node)     (rb_set_parent(node, node))
+#define RB_EMPTY_ROOT(root)  ((root)->rb_node == NULL)
+
+/* 'empty' nodes are nodes that are known not to be inserted in an rbree */
+#define RB_EMPTY_NODE(node)  \
+        ((node)->__rb_parent_color == (unsigned long)(node))
+#define RB_CLEAR_NODE(node)  \
+        ((node)->__rb_parent_color = (unsigned long)(node))
 
-static inline void rb_init_node(struct rb_node *rb)
-{
-        rb->rb_parent_color = 0;
-        rb->rb_right = NULL;
-        rb->rb_left = NULL;
-        RB_CLEAR_NODE(rb);
-}
 
 extern void rb_insert_color(struct rb_node *, struct rb_root *);
 extern void rb_erase(struct rb_node *, struct rb_root *);
 
-typedef void (*rb_augment_f)(struct rb_node *node, void *data);
-
-extern void rb_augment_insert(struct rb_node *node,
-                              rb_augment_f func, void *data);
-extern struct rb_node *rb_augment_erase_begin(struct rb_node *node);
-extern void rb_augment_erase_end(struct rb_node *node,
-                                 rb_augment_f func, void *data);
 
 /* Find logical next and previous nodes in a tree */
 extern struct rb_node *rb_next(const struct rb_node *);
@@ -168,7 +75,7 @@ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
 static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
                                 struct rb_node ** rb_link)
 {
-        node->rb_parent_color = (unsigned long )parent;
+        node->__rb_parent_color = (unsigned long)parent;
         node->rb_left = node->rb_right = NULL;
 
         *rb_link = node;
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
new file mode 100644
index 000000000000..2ac60c9cf644
--- /dev/null
+++ b/include/linux/rbtree_augmented.h
@@ -0,0 +1,224 @@
+/*
+  Red Black Trees
+  (C) 1999  Andrea Arcangeli <andrea@suse.de>
+  (C) 2002  David Woodhouse <dwmw2@infradead.org>
+  (C) 2012  Michel Lespinasse <walken@google.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+  linux/include/linux/rbtree_augmented.h
+*/
+
+#ifndef _LINUX_RBTREE_AUGMENTED_H
+#define _LINUX_RBTREE_AUGMENTED_H
+
+#include <linux/compiler.h>
+#include <linux/rbtree.h>
+
+/*
+ * Please note - only struct rb_augment_callbacks and the prototypes for
+ * rb_insert_augmented() and rb_erase_augmented() are intended to be public.
+ * The rest are implementation details you are not expected to depend on.
+ *
+ * See Documentation/rbtree.txt for documentation and samples.
+ */
+
+struct rb_augment_callbacks {
+        void (*propagate)(struct rb_node *node, struct rb_node *stop);
+        void (*copy)(struct rb_node *old, struct rb_node *new);
+        void (*rotate)(struct rb_node *old, struct rb_node *new);
+};
+
+extern void __rb_insert_augmented(struct rb_node *node, struct rb_root *root,
+        void (*augment_rotate)(struct rb_node *old, struct rb_node *new));
+static inline void
+rb_insert_augmented(struct rb_node *node, struct rb_root *root,
+                    const struct rb_augment_callbacks *augment)
+{
+        __rb_insert_augmented(node, root, augment->rotate);
+}
+
+#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield,       \
+                             rbtype, rbaugmented, rbcompute)            \
+static inline void                                                      \
+rbname ## _propagate(struct rb_node *rb, struct rb_node *stop)          \
+{                                                                       \
+        while (rb != stop) {                                            \
+                rbstruct *node = rb_entry(rb, rbstruct, rbfield);       \
+                rbtype augmented = rbcompute(node);                     \
+                if (node->rbaugmented == augmented)                     \
+                        break;                                          \
+                node->rbaugmented = augmented;                          \
+                rb = rb_parent(&node->rbfield);                         \
+        }                                                               \
+}                                                                       \
+static inline void                                                      \
+rbname ## _copy(struct rb_node *rb_old, struct rb_node *rb_new)         \
+{                                                                       \
+        rbstruct *old = rb_entry(rb_old, rbstruct, rbfield);            \
+        rbstruct *new = rb_entry(rb_new, rbstruct, rbfield);            \
+        new->rbaugmented = old->rbaugmented;                            \
+}                                                                       \
+static void                                                             \
+rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new)       \
+{                                                                       \
+        rbstruct *old = rb_entry(rb_old, rbstruct, rbfield);            \
+        rbstruct *new = rb_entry(rb_new, rbstruct, rbfield);            \
+        new->rbaugmented = old->rbaugmented;                            \
+        old->rbaugmented = rbcompute(old);                              \
+}                                                                       \
+rbstatic const struct rb_augment_callbacks rbname = {                   \
+        rbname ## _propagate, rbname ## _copy, rbname ## _rotate        \
+};
+
+
+#define RB_RED          0
+#define RB_BLACK        1
+
+#define __rb_parent(pc)    ((struct rb_node *)(pc & ~3))
+
+#define __rb_color(pc)     ((pc) & 1)
+#define __rb_is_black(pc)  __rb_color(pc)
+#define __rb_is_red(pc)    (!__rb_color(pc))
+#define rb_color(rb)       __rb_color((rb)->__rb_parent_color)
+#define rb_is_red(rb)      __rb_is_red((rb)->__rb_parent_color)
+#define rb_is_black(rb)    __rb_is_black((rb)->__rb_parent_color)
+
+static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
+{
+        rb->__rb_parent_color = rb_color(rb) | (unsigned long)p;
+}
+
+static inline void rb_set_parent_color(struct rb_node *rb,
+                                       struct rb_node *p, int color)
+{
+        rb->__rb_parent_color = (unsigned long)p | color;
+}
+
+static inline void
+__rb_change_child(struct rb_node *old, struct rb_node *new,
+                  struct rb_node *parent, struct rb_root *root)
+{
+        if (parent) {
+                if (parent->rb_left == old)
+                        parent->rb_left = new;
+                else
+                        parent->rb_right = new;
+        } else
+                root->rb_node = new;
+}
+
+extern void __rb_erase_color(struct rb_node *parent, struct rb_root *root,
+        void (*augment_rotate)(struct rb_node *old, struct rb_node *new));
+
+static __always_inline void
+rb_erase_augmented(struct rb_node *node, struct rb_root *root,
+                   const struct rb_augment_callbacks *augment)
+{
+        struct rb_node *child = node->rb_right, *tmp = node->rb_left;
+        struct rb_node *parent, *rebalance;
+        unsigned long pc;
+
+        if (!tmp) {
+                /*
+                 * Case 1: node to erase has no more than 1 child (easy!)
+                 *
+                 * Note that if there is one child it must be red due to 5)
+                 * and node must be black due to 4). We adjust colors locally
+                 * so as to bypass __rb_erase_color() later on.
+                 */
+                pc = node->__rb_parent_color;
+                parent = __rb_parent(pc);
+                __rb_change_child(node, child, parent, root);
+                if (child) {
+                        child->__rb_parent_color = pc;
+                        rebalance = NULL;
+                } else
+                        rebalance = __rb_is_black(pc) ? parent : NULL;
+                tmp = parent;
+        } else if (!child) {
+                /* Still case 1, but this time the child is node->rb_left */
+                tmp->__rb_parent_color = pc = node->__rb_parent_color;
+                parent = __rb_parent(pc);
+                __rb_change_child(node, tmp, parent, root);
+                rebalance = NULL;
+                tmp = parent;
+        } else {
+                struct rb_node *successor = child, *child2;
+                tmp = child->rb_left;
+                if (!tmp) {
+                        /*
+                         * Case 2: node's successor is its right child
+                         *
+                         *    (n)          (s)
+                         *    / \          / \
+                         *  (x) (s)  ->  (x) (c)
+                         *        \
+                         *        (c)
+                         */
+                        parent = successor;
+                        child2 = successor->rb_right;
+                        augment->copy(node, successor);
+                } else {
+                        /*
+                         * Case 3: node's successor is leftmost under
+                         * node's right child subtree
+                         *
+                         *    (n)          (s)
+                         *    / \          / \
+                         *  (x) (y)  ->  (x) (y)
+                         *      /            /
+                         *    (p)          (p)
+                         *    /            /
+                         *  (s)          (c)
+                         *    \
+                         *    (c)
+                         */
+                        do {
+                                parent = successor;
+                                successor = tmp;
+                                tmp = tmp->rb_left;
+                        } while (tmp);
+                        parent->rb_left = child2 = successor->rb_right;
+                        successor->rb_right = child;
+                        rb_set_parent(child, successor);
+                        augment->copy(node, successor);
+                        augment->propagate(parent, successor);
+                }
+
+                successor->rb_left = tmp = node->rb_left;
+                rb_set_parent(tmp, successor);
+
+                pc = node->__rb_parent_color;
+                tmp = __rb_parent(pc);
+                __rb_change_child(node, successor, tmp, root);
+                if (child2) {
+                        successor->__rb_parent_color = pc;
+                        rb_set_parent_color(child2, parent, RB_BLACK);
+                        rebalance = NULL;
+                } else {
+                        unsigned long pc2 = successor->__rb_parent_color;
+                        successor->__rb_parent_color = pc;
+                        rebalance = __rb_is_black(pc2) ? parent : NULL;
+                }
+                tmp = successor;
+        }
+
+        augment->propagate(tmp, NULL);
+        if (rebalance)
+                __rb_erase_color(rebalance, root, augment->rotate);
+}
+
+#endif  /* _LINUX_RBTREE_AUGMENTED_H */
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index e0879a70e830..23b36304cd88 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -1,43 +1,9 @@
 #ifndef _LINUX_REBOOT_H
 #define _LINUX_REBOOT_H
 
-/*
- * Magic values required to use _reboot() system call.
- */
-
-#define LINUX_REBOOT_MAGIC1     0xfee1dead
-#define LINUX_REBOOT_MAGIC2     672274793
-#define LINUX_REBOOT_MAGIC2A    85072278
-#define LINUX_REBOOT_MAGIC2B    369367448
-#define LINUX_REBOOT_MAGIC2C    537993216
-
-
-/*
- * Commands accepted by the _reboot() system call.
- *
- * RESTART     Restart system using default command and mode.
- * HALT        Stop OS and give system control to ROM monitor, if any.
- * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
- * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
- * POWER_OFF   Stop OS and remove all power from system, if possible.
- * RESTART2    Restart system using given command string.
- * SW_SUSPEND  Suspend system using software suspend if compiled in.
- * KEXEC       Restart system using a previously loaded Linux kernel
- */
-
-#define LINUX_REBOOT_CMD_RESTART        0x01234567
-#define LINUX_REBOOT_CMD_HALT           0xCDEF0123
-#define LINUX_REBOOT_CMD_CAD_ON         0x89ABCDEF
-#define LINUX_REBOOT_CMD_CAD_OFF        0x00000000
-#define LINUX_REBOOT_CMD_POWER_OFF      0x4321FEDC
-#define LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
-#define LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
-#define LINUX_REBOOT_CMD_KEXEC          0x45584543
-
-
-#ifdef __KERNEL__
 
 #include <linux/notifier.h>
+#include <uapi/linux/reboot.h>
 
 #define SYS_DOWN        0x0001  /* Notify of system down */
 #define SYS_RESTART     SYS_DOWN
@@ -84,6 +50,4 @@ extern int orderly_poweroff(bool force);
 extern void emergency_restart(void);
 #include <asm/emergency-restart.h>
 
-#endif
-
 #endif /* _LINUX_REBOOT_H */
diff --git a/include/linux/resource.h b/include/linux/resource.h
index d01c96c1966e..5bc3116e649c 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
@@ -1,82 +1,8 @@
 #ifndef _LINUX_RESOURCE_H
 #define _LINUX_RESOURCE_H
 
-#include <linux/time.h>
-#include <linux/types.h>
+#include <uapi/linux/resource.h>
 
-/*
- * Resource control/accounting header file for linux
- */
-
-/*
- * Definition of struct rusage taken from BSD 4.3 Reno
- * 
- * We don't support all of these yet, but we might as well have them....
- * Otherwise, each time we add new items, programs which depend on this
- * structure will lose.  This reduces the chances of that happening.
- */
-#define RUSAGE_SELF     0
-#define RUSAGE_CHILDREN (-1)
-#define RUSAGE_BOTH     (-2)            /* sys_wait4() uses this */
-#define RUSAGE_THREAD   1               /* only the calling thread */
-
-struct  rusage {
-        struct timeval ru_utime;        /* user time used */
-        struct timeval ru_stime;        /* system time used */
-        long    ru_maxrss;              /* maximum resident set size */
-        long    ru_ixrss;               /* integral shared memory size */
-        long    ru_idrss;               /* integral unshared data size */
-        long    ru_isrss;               /* integral unshared stack size */
-        long    ru_minflt;              /* page reclaims */
-        long    ru_majflt;              /* page faults */
-        long    ru_nswap;               /* swaps */
-        long    ru_inblock;             /* block input operations */
-        long    ru_oublock;             /* block output operations */
-        long    ru_msgsnd;              /* messages sent */
-        long    ru_msgrcv;              /* messages received */
-        long    ru_nsignals;            /* signals received */
-        long    ru_nvcsw;               /* voluntary context switches */
-        long    ru_nivcsw;              /* involuntary " */
-};
-
-struct rlimit {
-        unsigned long   rlim_cur;
-        unsigned long   rlim_max;
-};
-
-#define RLIM64_INFINITY         (~0ULL)
-
-struct rlimit64 {
-        __u64 rlim_cur;
-        __u64 rlim_max;
-};
-
-#define PRIO_MIN        (-20)
-#define PRIO_MAX        20
-
-#define PRIO_PROCESS    0
-#define PRIO_PGRP       1
-#define PRIO_USER       2
-
-/*
- * Limit the stack by to some sane default: root can always
- * increase this limit if needed..  8MB seems reasonable.
- */
-#define _STK_LIM        (8*1024*1024)
-
-/*
- * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
- * and other sensitive information are never written to disk.
- */
-#define MLOCK_LIMIT     ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
-
-/*
- * Due to binary compatibility, the actual resource numbers
- * may be different for different linux versions..
- */
-#include <asm/resource.h>
-
-#ifdef __KERNEL__
 
 struct task_struct;
 
@@ -84,6 +10,4 @@ int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
 int do_prlimit(struct task_struct *tsk, unsigned int resource,
                 struct rlimit *new_rlim, struct rlimit *old_rlim);
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 0ec590bb3611..d9010789b4e8 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -1,6 +1,3 @@
-#ifndef __RFKILL_H
-#define __RFKILL_H
-
 /*
  * Copyright (C) 2006 - 2007 Ivo van Doorn
  * Copyright (C) 2007 Dmitry Torokhov
@@ -18,92 +15,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifndef __RFKILL_H
+#define __RFKILL_H
 
-#include <linux/types.h>
-
-/* define userspace visible states */
-#define RFKILL_STATE_SOFT_BLOCKED       0
-#define RFKILL_STATE_UNBLOCKED          1
-#define RFKILL_STATE_HARD_BLOCKED       2
-
-/**
- * enum rfkill_type - type of rfkill switch.
- *
- * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
- * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
- * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
- * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
- * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
- * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
- * @RFKILL_TYPE_GPS: switch is on a GPS device.
- * @RFKILL_TYPE_FM: switch is on a FM radio device.
- * @NUM_RFKILL_TYPES: number of defined rfkill types
- */
-enum rfkill_type {
-        RFKILL_TYPE_ALL = 0,
-        RFKILL_TYPE_WLAN,
-        RFKILL_TYPE_BLUETOOTH,
-        RFKILL_TYPE_UWB,
-        RFKILL_TYPE_WIMAX,
-        RFKILL_TYPE_WWAN,
-        RFKILL_TYPE_GPS,
-        RFKILL_TYPE_FM,
-        NUM_RFKILL_TYPES,
-};
-
-/**
- * enum rfkill_operation - operation types
- * @RFKILL_OP_ADD: a device was added
- * @RFKILL_OP_DEL: a device was removed
- * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
- * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
- */
-enum rfkill_operation {
-        RFKILL_OP_ADD = 0,
-        RFKILL_OP_DEL,
-        RFKILL_OP_CHANGE,
-        RFKILL_OP_CHANGE_ALL,
-};
-
-/**
- * struct rfkill_event - events for userspace on /dev/rfkill
- * @idx: index of dev rfkill
- * @type: type of the rfkill struct
- * @op: operation code
- * @hard: hard state (0/1)
- * @soft: soft state (0/1)
- *
- * Structure used for userspace communication on /dev/rfkill,
- * used for events from the kernel and control to the kernel.
- */
-struct rfkill_event {
-        __u32 idx;
-        __u8  type;
-        __u8  op;
-        __u8  soft, hard;
-} __attribute__((packed));
-
-/*
- * We are planning to be backward and forward compatible with changes
- * to the event struct, by adding new, optional, members at the end.
- * When reading an event (whether the kernel from userspace or vice
- * versa) we need to accept anything that's at least as large as the
- * version 1 event size, but might be able to accept other sizes in
- * the future.
- *
- * One exception is the kernel -- we already have two event sizes in
- * that we've made the 'hard' member optional since our only option
- * is to ignore it anyway.
- */
-#define RFKILL_EVENT_SIZE_V1    8
-
-/* ioctl for turning off rfkill-input (if present) */
-#define RFKILL_IOC_MAGIC        'R'
-#define RFKILL_IOC_NOINPUT      1
-#define RFKILL_IOCTL_NOINPUT    _IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
+#include <uapi/linux/rfkill.h>
 
-/* and that's all userspace gets */
-#ifdef __KERNEL__
 /* don't allow anyone to use these in the kernel */
 enum rfkill_user_states {
         RFKILL_USER_STATE_SOFT_BLOCKED  = RFKILL_STATE_SOFT_BLOCKED,
@@ -385,6 +301,4 @@ rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name)
 }
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* RFKILL_H */
diff --git a/include/linux/rio.h b/include/linux/rio.h
index a90ebadd9da0..4187da511006 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -30,6 +30,7 @@
 #define RIO_MAX_MPORTS          8
 #define RIO_MAX_MPORT_RESOURCES 16
 #define RIO_MAX_DEV_RESOURCES   16
+#define RIO_MAX_MPORT_NAME      40
 
 #define RIO_GLOBAL_TABLE        0xff    /* Indicates access of a switch's
                                            global routing table if it
@@ -62,7 +63,7 @@
  *
  *      0       RapidIO inbound doorbells
  *      1       RapidIO inbound mailboxes
- *      1       RapidIO outbound mailboxes
+ *      2       RapidIO outbound mailboxes
  */
 #define RIO_DOORBELL_RESOURCE   0
 #define RIO_INB_MBOX_RESOURCE   1
@@ -235,6 +236,7 @@ enum rio_phy_type {
  * @phys_efptr: RIO port extended features pointer
  * @name: Port name string
  * @priv: Master port private data
+ * @dma: DMA device associated with mport
  */
 struct rio_mport {
         struct list_head dbells;        /* list of doorbell events */
@@ -255,13 +257,20 @@ struct rio_mport {
                                  */
         enum rio_phy_type phy_type;     /* RapidIO phy type */
         u32 phys_efptr;
-        unsigned char name[40];
+        unsigned char name[RIO_MAX_MPORT_NAME];
         void *priv;             /* Master port private data */
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
         struct dma_device       dma;
 #endif
 };
 
+struct rio_id_table {
+        u16 start;      /* logical minimal id */
+        u32 max;        /* max number of IDs in table */
+        spinlock_t lock;
+        unsigned long *table;
+};
+
 /**
  * struct rio_net - RIO network info
  * @node: Node in global list of RIO networks
@@ -273,9 +282,11 @@ struct rio_mport {
 struct rio_net {
         struct list_head node;  /* node in list of networks */
         struct list_head devices;       /* list of devices in this net */
+        struct list_head switches;      /* list of switches in this net */
         struct list_head mports;        /* list of ports accessing net */
         struct rio_mport *hport;        /* primary port for accessing net */
         unsigned char id;       /* RIO network ID */
+        struct rio_id_table destid_table;  /* destID allocation table */
 };
 
 /* Definitions used by switch sysfs initialization callback */
@@ -299,6 +310,8 @@ struct rio_net {
  * @add_outb_message: Callback to add a message to an outbound mailbox queue.
  * @add_inb_buffer: Callback to add a buffer to an inbound mailbox queue.
  * @get_inb_message: Callback to get a message from an inbound mailbox queue.
+ * @map_inb: Callback to map RapidIO address region into local memory space.
+ * @unmap_inb: Callback to unmap RapidIO address region mapped with map_inb().
  */
 struct rio_ops {
         int (*lcread) (struct rio_mport *mport, int index, u32 offset, int len,
@@ -321,6 +334,9 @@ struct rio_ops {
                                  int mbox, void *buffer, size_t len);
         int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
         void *(*get_inb_message)(struct rio_mport *mport, int mbox);
+        int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
+                        u64 rstart, u32 size, u32 flags);
+        void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
 };
 
 #define RIO_RESOURCE_MEM        0x00000100
@@ -403,7 +419,7 @@ union rio_pw_msg {
 
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 
-/**
+/*
  * enum rio_write_type - RIO write transaction types used in DMA transfers
  *
  * Note: RapidIO specification defines write (NWRITE) and
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 31ad146be316..b75c05920ab5 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -365,6 +365,11 @@ void rio_release_regions(struct rio_dev *);
 int rio_request_region(struct rio_dev *, int, char *);
 void rio_release_region(struct rio_dev *, int);
 
+/* Memory mapping functions */
+extern int rio_map_inb_region(struct rio_mport *mport, dma_addr_t local,
+                        u64 rbase, u32 size, u32 rflags);
+extern void rio_unmap_inb_region(struct rio_mport *mport, dma_addr_t lstart);
+
 /* Port-Write management */
 extern int rio_request_inb_pwrite(struct rio_dev *,
                         int (*)(struct rio_dev *, union rio_pw_msg*, int));
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 3fce545df394..bfe1f4780644 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -37,14 +37,14 @@ struct anon_vma {
         atomic_t refcount;
 
         /*
-         * NOTE: the LSB of the head.next is set by
+         * NOTE: the LSB of the rb_root.rb_node is set by
          * mm_take_all_locks() _after_ taking the above lock. So the
-         * head must only be read/written after taking the above lock
+         * rb_root must only be read/written after taking the above lock
          * to be sure to see a valid next pointer. The LSB bit itself
          * is serialized by a system wide lock only visible to
          * mm_take_all_locks() (mm_all_locks_mutex).
          */
-        struct list_head head;  /* Chain of private "related" vmas */
+        struct rb_root rb_root; /* Interval tree of private "related" vmas */
 };
 
 /*
@@ -57,14 +57,29 @@ struct anon_vma {
  * with a VMA, or the VMAs associated with an anon_vma.
  * The "same_vma" list contains the anon_vma_chains linking
  * all the anon_vmas associated with this VMA.
- * The "same_anon_vma" list contains the anon_vma_chains
+ * The "rb" field indexes on an interval tree the anon_vma_chains
  * which link all the VMAs associated with this anon_vma.
  */
 struct anon_vma_chain {
         struct vm_area_struct *vma;
         struct anon_vma *anon_vma;
         struct list_head same_vma;   /* locked by mmap_sem & page_table_lock */
-        struct list_head same_anon_vma; /* locked by anon_vma->mutex */
+        struct rb_node rb;                      /* locked by anon_vma->mutex */
+        unsigned long rb_subtree_last;
+#ifdef CONFIG_DEBUG_VM_RB
+        unsigned long cached_vma_start, cached_vma_last;
+#endif
+};
+
+enum ttu_flags {
+        TTU_UNMAP = 0,                  /* unmap mode */
+        TTU_MIGRATION = 1,              /* migration mode */
+        TTU_MUNLOCK = 2,                /* munlock mode */
+        TTU_ACTION_MASK = 0xff,
+
+        TTU_IGNORE_MLOCK = (1 << 8),    /* ignore mlock */
+        TTU_IGNORE_ACCESS = (1 << 9),   /* don't age */
+        TTU_IGNORE_HWPOISON = (1 << 10),/* corrupted page is recoverable */
 };
 
 #ifdef CONFIG_MMU
@@ -120,7 +135,6 @@ void anon_vma_init(void);	/* create anon_vma_cachep */
 int  anon_vma_prepare(struct vm_area_struct *);
 void unlink_anon_vmas(struct vm_area_struct *);
 int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
-void anon_vma_moveto_tail(struct vm_area_struct *);
 int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
 
 static inline void anon_vma_merge(struct vm_area_struct *vma,
@@ -161,16 +175,6 @@ int page_referenced(struct page *, int is_locked,
 int page_referenced_one(struct page *, struct vm_area_struct *,
         unsigned long address, unsigned int *mapcount, unsigned long *vm_flags);
 
-enum ttu_flags {
-        TTU_UNMAP = 0,                  /* unmap mode */
-        TTU_MIGRATION = 1,              /* migration mode */
-        TTU_MUNLOCK = 2,                /* munlock mode */
-        TTU_ACTION_MASK = 0xff,
-
-        TTU_IGNORE_MLOCK = (1 << 8),    /* ignore mlock */
-        TTU_IGNORE_ACCESS = (1 << 9),   /* don't age */
-        TTU_IGNORE_HWPOISON = (1 << 10),/* corrupted page is recoverable */
-};
 #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
 
 int try_to_unmap(struct page *, enum ttu_flags flags);
diff --git a/include/linux/rtc-ds2404.h b/include/linux/rtc-ds2404.h
new file mode 100644
index 000000000000..22c53825528f
--- /dev/null
+++ b/include/linux/rtc-ds2404.h
@@ -0,0 +1,20 @@
+/*
+ * ds2404.h - platform data structure for the DS2404 RTC.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2012 Sven Schnelle <svens@stackframe.org>
+ */
+
+#ifndef __LINUX_DS2404_H
+#define __LINUX_DS2404_H
+
+struct ds2404_platform_data {
+
+        unsigned int gpio_rst;
+        unsigned int gpio_clk;
+        unsigned int gpio_dq;
+};
+#endif
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index f071b3922c67..9531845c419f 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -11,102 +11,10 @@
 #ifndef _LINUX_RTC_H_
 #define _LINUX_RTC_H_
 
-/*
- * The struct used to pass data via the following ioctl. Similar to the
- * struct tm in <time.h>, but it needs to be here so that the kernel
- * source is self contained, allowing cross-compiles, etc. etc.
- */
-
-struct rtc_time {
-        int tm_sec;
-        int tm_min;
-        int tm_hour;
-        int tm_mday;
-        int tm_mon;
-        int tm_year;
-        int tm_wday;
-        int tm_yday;
-        int tm_isdst;
-};
-
-/*
- * This data structure is inspired by the EFI (v0.92) wakeup
- * alarm API.
- */
-struct rtc_wkalrm {
-        unsigned char enabled;  /* 0 = alarm disabled, 1 = alarm enabled */
-        unsigned char pending;  /* 0 = alarm not pending, 1 = alarm pending */
-        struct rtc_time time;   /* time the alarm is set to */
-};
-
-/*
- * Data structure to control PLL correction some better RTC feature
- * pll_value is used to get or set current value of correction,
- * the rest of the struct is used to query HW capabilities.
- * This is modeled after the RTC used in Q40/Q60 computers but
- * should be sufficiently flexible for other devices
- *
- * +ve pll_value means clock will run faster by
- *   pll_value*pll_posmult/pll_clock
- * -ve pll_value means clock will run slower by
- *   pll_value*pll_negmult/pll_clock
- */
-
-struct rtc_pll_info {
-        int pll_ctrl;       /* placeholder for fancier control */
-        int pll_value;      /* get/set correction value */
-        int pll_max;        /* max +ve (faster) adjustment value */
-        int pll_min;        /* max -ve (slower) adjustment value */
-        int pll_posmult;    /* factor for +ve correction */
-        int pll_negmult;    /* factor for -ve correction */
-        long pll_clock;     /* base PLL frequency */
-};
-
-/*
- * ioctl calls that are permitted to the /dev/rtc interface, if
- * any of the RTC drivers are enabled.
- */
-
-#define RTC_AIE_ON      _IO('p', 0x01)  /* Alarm int. enable on         */
-#define RTC_AIE_OFF     _IO('p', 0x02)  /* ... off                      */
-#define RTC_UIE_ON      _IO('p', 0x03)  /* Update int. enable on        */
-#define RTC_UIE_OFF     _IO('p', 0x04)  /* ... off                      */
-#define RTC_PIE_ON      _IO('p', 0x05)  /* Periodic int. enable on      */
-#define RTC_PIE_OFF     _IO('p', 0x06)  /* ... off                      */
-#define RTC_WIE_ON      _IO('p', 0x0f)  /* Watchdog int. enable on      */
-#define RTC_WIE_OFF     _IO('p', 0x10)  /* ... off                      */
-
-#define RTC_ALM_SET     _IOW('p', 0x07, struct rtc_time) /* Set alarm time  */
-#define RTC_ALM_READ    _IOR('p', 0x08, struct rtc_time) /* Read alarm time */
-#define RTC_RD_TIME     _IOR('p', 0x09, struct rtc_time) /* Read RTC time   */
-#define RTC_SET_TIME    _IOW('p', 0x0a, struct rtc_time) /* Set RTC time    */
-#define RTC_IRQP_READ   _IOR('p', 0x0b, unsigned long)   /* Read IRQ rate   */
-#define RTC_IRQP_SET    _IOW('p', 0x0c, unsigned long)   /* Set IRQ rate    */
-#define RTC_EPOCH_READ  _IOR('p', 0x0d, unsigned long)   /* Read epoch      */
-#define RTC_EPOCH_SET   _IOW('p', 0x0e, unsigned long)   /* Set epoch       */
-
-#define RTC_WKALM_SET   _IOW('p', 0x0f, struct rtc_wkalrm)/* Set wakeup alarm*/
-#define RTC_WKALM_RD    _IOR('p', 0x10, struct rtc_wkalrm)/* Get wakeup alarm*/
-
-#define RTC_PLL_GET     _IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */
-#define RTC_PLL_SET     _IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
-
-#define RTC_VL_READ     _IOR('p', 0x13, int)    /* Voltage low detector */
-#define RTC_VL_CLR      _IO('p', 0x14)          /* Clear voltage low information */
-
-/* interrupt flags */
-#define RTC_IRQF 0x80   /* Any of the following is active */
-#define RTC_PF 0x40     /* Periodic interrupt */
-#define RTC_AF 0x20     /* Alarm interrupt */
-#define RTC_UF 0x10     /* Update interrupt for 1Hz RTC */
-
-
-#define RTC_MAX_FREQ    8192
-
-#ifdef __KERNEL__
 
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <uapi/linux/rtc.h>
 
 extern int rtc_month_days(unsigned int month, unsigned int year);
 extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year);
@@ -276,12 +184,10 @@ static inline bool is_leap_year(unsigned int year)
         return (!(year % 4) && (year % 100)) || !(year % 400);
 }
 
-#ifdef CONFIG_RTC_HCTOSYS
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
 extern int rtc_hctosys_ret;
 #else
 #define rtc_hctosys_ret -ENODEV
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_RTC_H_ */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index db71c4ad8624..7002bbfd5d4a 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -1,616 +1,10 @@
 #ifndef __LINUX_RTNETLINK_H
 #define __LINUX_RTNETLINK_H
 
-#include <linux/types.h>
-#include <linux/netlink.h>
-#include <linux/if_link.h>
-#include <linux/if_addr.h>
-#include <linux/neighbour.h>
-
-/* rtnetlink families. Values up to 127 are reserved for real address
- * families, values above 128 may be used arbitrarily.
- */
-#define RTNL_FAMILY_IPMR                128
-#define RTNL_FAMILY_IP6MR               129
-#define RTNL_FAMILY_MAX                 129
-
-/****
- *              Routing/neighbour discovery messages.
- ****/
-
-/* Types of messages */
-
-enum {
-        RTM_BASE        = 16,
-#define RTM_BASE        RTM_BASE
-
-        RTM_NEWLINK     = 16,
-#define RTM_NEWLINK     RTM_NEWLINK
-        RTM_DELLINK,
-#define RTM_DELLINK     RTM_DELLINK
-        RTM_GETLINK,
-#define RTM_GETLINK     RTM_GETLINK
-        RTM_SETLINK,
-#define RTM_SETLINK     RTM_SETLINK
-
-        RTM_NEWADDR     = 20,
-#define RTM_NEWADDR     RTM_NEWADDR
-        RTM_DELADDR,
-#define RTM_DELADDR     RTM_DELADDR
-        RTM_GETADDR,
-#define RTM_GETADDR     RTM_GETADDR
-
-        RTM_NEWROUTE    = 24,
-#define RTM_NEWROUTE    RTM_NEWROUTE
-        RTM_DELROUTE,
-#define RTM_DELROUTE    RTM_DELROUTE
-        RTM_GETROUTE,
-#define RTM_GETROUTE    RTM_GETROUTE
-
-        RTM_NEWNEIGH    = 28,
-#define RTM_NEWNEIGH    RTM_NEWNEIGH
-        RTM_DELNEIGH,
-#define RTM_DELNEIGH    RTM_DELNEIGH
-        RTM_GETNEIGH,
-#define RTM_GETNEIGH    RTM_GETNEIGH
-
-        RTM_NEWRULE     = 32,
-#define RTM_NEWRULE     RTM_NEWRULE
-        RTM_DELRULE,
-#define RTM_DELRULE     RTM_DELRULE
-        RTM_GETRULE,
-#define RTM_GETRULE     RTM_GETRULE
-
-        RTM_NEWQDISC    = 36,
-#define RTM_NEWQDISC    RTM_NEWQDISC
-        RTM_DELQDISC,
-#define RTM_DELQDISC    RTM_DELQDISC
-        RTM_GETQDISC,
-#define RTM_GETQDISC    RTM_GETQDISC
-
-        RTM_NEWTCLASS   = 40,
-#define RTM_NEWTCLASS   RTM_NEWTCLASS
-        RTM_DELTCLASS,
-#define RTM_DELTCLASS   RTM_DELTCLASS
-        RTM_GETTCLASS,
-#define RTM_GETTCLASS   RTM_GETTCLASS
-
-        RTM_NEWTFILTER  = 44,
-#define RTM_NEWTFILTER  RTM_NEWTFILTER
-        RTM_DELTFILTER,
-#define RTM_DELTFILTER  RTM_DELTFILTER
-        RTM_GETTFILTER,
-#define RTM_GETTFILTER  RTM_GETTFILTER
-
-        RTM_NEWACTION   = 48,
-#define RTM_NEWACTION   RTM_NEWACTION
-        RTM_DELACTION,
-#define RTM_DELACTION   RTM_DELACTION
-        RTM_GETACTION,
-#define RTM_GETACTION   RTM_GETACTION
-
-        RTM_NEWPREFIX   = 52,
-#define RTM_NEWPREFIX   RTM_NEWPREFIX
-
-        RTM_GETMULTICAST = 58,
-#define RTM_GETMULTICAST RTM_GETMULTICAST
-
-        RTM_GETANYCAST  = 62,
-#define RTM_GETANYCAST  RTM_GETANYCAST
-
-        RTM_NEWNEIGHTBL = 64,
-#define RTM_NEWNEIGHTBL RTM_NEWNEIGHTBL
-        RTM_GETNEIGHTBL = 66,
-#define RTM_GETNEIGHTBL RTM_GETNEIGHTBL
-        RTM_SETNEIGHTBL,
-#define RTM_SETNEIGHTBL RTM_SETNEIGHTBL
-
-        RTM_NEWNDUSEROPT = 68,
-#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
-
-        RTM_NEWADDRLABEL = 72,
-#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
-        RTM_DELADDRLABEL,
-#define RTM_DELADDRLABEL RTM_DELADDRLABEL
-        RTM_GETADDRLABEL,
-#define RTM_GETADDRLABEL RTM_GETADDRLABEL
-
-        RTM_GETDCB = 78,
-#define RTM_GETDCB RTM_GETDCB
-        RTM_SETDCB,
-#define RTM_SETDCB RTM_SETDCB
-
-        __RTM_MAX,
-#define RTM_MAX         (((__RTM_MAX + 3) & ~3) - 1)
-};
-
-#define RTM_NR_MSGTYPES (RTM_MAX + 1 - RTM_BASE)
-#define RTM_NR_FAMILIES (RTM_NR_MSGTYPES >> 2)
-#define RTM_FAM(cmd)    (((cmd) - RTM_BASE) >> 2)
-
-/* 
-   Generic structure for encapsulation of optional route information.
-   It is reminiscent of sockaddr, but with sa_family replaced
-   with attribute type.
- */
-
-struct rtattr {
-        unsigned short  rta_len;
-        unsigned short  rta_type;
-};
-
-/* Macros to handle rtattributes */
-
-#define RTA_ALIGNTO     4
-#define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
-#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \
-                         (rta)->rta_len >= sizeof(struct rtattr) && \
-                         (rta)->rta_len <= (len))
-#define RTA_NEXT(rta,attrlen)   ((attrlen) -= RTA_ALIGN((rta)->rta_len), \
-                                 (struct rtattr*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len)))
-#define RTA_LENGTH(len) (RTA_ALIGN(sizeof(struct rtattr)) + (len))
-#define RTA_SPACE(len)  RTA_ALIGN(RTA_LENGTH(len))
-#define RTA_DATA(rta)   ((void*)(((char*)(rta)) + RTA_LENGTH(0)))
-#define RTA_PAYLOAD(rta) ((int)((rta)->rta_len) - RTA_LENGTH(0))
-
-
-
-
-/******************************************************************************
- *              Definitions used in routing table administration.
- ****/
-
-struct rtmsg {
-        unsigned char           rtm_family;
-        unsigned char           rtm_dst_len;
-        unsigned char           rtm_src_len;
-        unsigned char           rtm_tos;
-
-        unsigned char           rtm_table;      /* Routing table id */
-        unsigned char           rtm_protocol;   /* Routing protocol; see below  */
-        unsigned char           rtm_scope;      /* See below */ 
-        unsigned char           rtm_type;       /* See below    */
-
-        unsigned                rtm_flags;
-};
-
-/* rtm_type */
-
-enum {
-        RTN_UNSPEC,
-        RTN_UNICAST,            /* Gateway or direct route      */
-        RTN_LOCAL,              /* Accept locally               */
-        RTN_BROADCAST,          /* Accept locally as broadcast,
-                                   send as broadcast */
-        RTN_ANYCAST,            /* Accept locally as broadcast,
-                                   but send as unicast */
-        RTN_MULTICAST,          /* Multicast route              */
-        RTN_BLACKHOLE,          /* Drop                         */
-        RTN_UNREACHABLE,        /* Destination is unreachable   */
-        RTN_PROHIBIT,           /* Administratively prohibited  */
-        RTN_THROW,              /* Not in this table            */
-        RTN_NAT,                /* Translate this address       */
-        RTN_XRESOLVE,           /* Use external resolver        */
-        __RTN_MAX
-};
-
-#define RTN_MAX (__RTN_MAX - 1)
-
-
-/* rtm_protocol */
-
-#define RTPROT_UNSPEC   0
-#define RTPROT_REDIRECT 1       /* Route installed by ICMP redirects;
-                                   not used by current IPv4 */
-#define RTPROT_KERNEL   2       /* Route installed by kernel            */
-#define RTPROT_BOOT     3       /* Route installed during boot          */
-#define RTPROT_STATIC   4       /* Route installed by administrator     */
-
-/* Values of protocol >= RTPROT_STATIC are not interpreted by kernel;
-   they are just passed from user and back as is.
-   It will be used by hypothetical multiple routing daemons.
-   Note that protocol values should be standardized in order to
-   avoid conflicts.
- */
-
-#define RTPROT_GATED    8       /* Apparently, GateD */
-#define RTPROT_RA       9       /* RDISC/ND router advertisements */
-#define RTPROT_MRT      10      /* Merit MRT */
-#define RTPROT_ZEBRA    11      /* Zebra */
-#define RTPROT_BIRD     12      /* BIRD */
-#define RTPROT_DNROUTED 13      /* DECnet routing daemon */
-#define RTPROT_XORP     14      /* XORP */
-#define RTPROT_NTK      15      /* Netsukuku */
-#define RTPROT_DHCP     16      /* DHCP client */
-
-/* rtm_scope
-
-   Really it is not scope, but sort of distance to the destination.
-   NOWHERE are reserved for not existing destinations, HOST is our
-   local addresses, LINK are destinations, located on directly attached
-   link and UNIVERSE is everywhere in the Universe.
-
-   Intermediate values are also possible f.e. interior routes
-   could be assigned a value between UNIVERSE and LINK.
-*/
-
-enum rt_scope_t {
-        RT_SCOPE_UNIVERSE=0,
-/* User defined values  */
-        RT_SCOPE_SITE=200,
-        RT_SCOPE_LINK=253,
-        RT_SCOPE_HOST=254,
-        RT_SCOPE_NOWHERE=255
-};
-
-/* rtm_flags */
-
-#define RTM_F_NOTIFY            0x100   /* Notify user of route change  */
-#define RTM_F_CLONED            0x200   /* This route is cloned         */
-#define RTM_F_EQUALIZE          0x400   /* Multipath equalizer: NI      */
-#define RTM_F_PREFIX            0x800   /* Prefix addresses             */
-
-/* Reserved table identifiers */
-
-enum rt_class_t {
-        RT_TABLE_UNSPEC=0,
-/* User defined values */
-        RT_TABLE_COMPAT=252,
-        RT_TABLE_DEFAULT=253,
-        RT_TABLE_MAIN=254,
-        RT_TABLE_LOCAL=255,
-        RT_TABLE_MAX=0xFFFFFFFF
-};
-
-
-/* Routing message attributes */
-
-enum rtattr_type_t {
-        RTA_UNSPEC,
-        RTA_DST,
-        RTA_SRC,
-        RTA_IIF,
-        RTA_OIF,
-        RTA_GATEWAY,
-        RTA_PRIORITY,
-        RTA_PREFSRC,
-        RTA_METRICS,
-        RTA_MULTIPATH,
-        RTA_PROTOINFO, /* no longer used */
-        RTA_FLOW,
-        RTA_CACHEINFO,
-        RTA_SESSION, /* no longer used */
-        RTA_MP_ALGO, /* no longer used */
-        RTA_TABLE,
-        RTA_MARK,
-        __RTA_MAX
-};
-
-#define RTA_MAX (__RTA_MAX - 1)
-
-#define RTM_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg))))
-#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
-
-/* RTM_MULTIPATH --- array of struct rtnexthop.
- *
- * "struct rtnexthop" describes all necessary nexthop information,
- * i.e. parameters of path to a destination via this nexthop.
- *
- * At the moment it is impossible to set different prefsrc, mtu, window
- * and rtt for different paths from multipath.
- */
-
-struct rtnexthop {
-        unsigned short          rtnh_len;
-        unsigned char           rtnh_flags;
-        unsigned char           rtnh_hops;
-        int                     rtnh_ifindex;
-};
-
-/* rtnh_flags */
-
-#define RTNH_F_DEAD             1       /* Nexthop is dead (used by multipath)  */
-#define RTNH_F_PERVASIVE        2       /* Do recursive gateway lookup  */
-#define RTNH_F_ONLINK           4       /* Gateway is forced on link    */
-
-/* Macros to handle hexthops */
-
-#define RTNH_ALIGNTO    4
-#define RTNH_ALIGN(len) ( ((len)+RTNH_ALIGNTO-1) & ~(RTNH_ALIGNTO-1) )
-#define RTNH_OK(rtnh,len) ((rtnh)->rtnh_len >= sizeof(struct rtnexthop) && \
-                           ((int)(rtnh)->rtnh_len) <= (len))
-#define RTNH_NEXT(rtnh) ((struct rtnexthop*)(((char*)(rtnh)) + RTNH_ALIGN((rtnh)->rtnh_len)))
-#define RTNH_LENGTH(len) (RTNH_ALIGN(sizeof(struct rtnexthop)) + (len))
-#define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
-#define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
-
-/* RTM_CACHEINFO */
-
-struct rta_cacheinfo {
-        __u32   rta_clntref;
-        __u32   rta_lastuse;
-        __s32   rta_expires;
-        __u32   rta_error;
-        __u32   rta_used;
-
-#define RTNETLINK_HAVE_PEERINFO 1
-        __u32   rta_id;
-        __u32   rta_ts;
-        __u32   rta_tsage;
-};
-
-/* RTM_METRICS --- array of struct rtattr with types of RTAX_* */
-
-enum {
-        RTAX_UNSPEC,
-#define RTAX_UNSPEC RTAX_UNSPEC
-        RTAX_LOCK,
-#define RTAX_LOCK RTAX_LOCK
-        RTAX_MTU,
-#define RTAX_MTU RTAX_MTU
-        RTAX_WINDOW,
-#define RTAX_WINDOW RTAX_WINDOW
-        RTAX_RTT,
-#define RTAX_RTT RTAX_RTT
-        RTAX_RTTVAR,
-#define RTAX_RTTVAR RTAX_RTTVAR
-        RTAX_SSTHRESH,
-#define RTAX_SSTHRESH RTAX_SSTHRESH
-        RTAX_CWND,
-#define RTAX_CWND RTAX_CWND
-        RTAX_ADVMSS,
-#define RTAX_ADVMSS RTAX_ADVMSS
-        RTAX_REORDERING,
-#define RTAX_REORDERING RTAX_REORDERING
-        RTAX_HOPLIMIT,
-#define RTAX_HOPLIMIT RTAX_HOPLIMIT
-        RTAX_INITCWND,
-#define RTAX_INITCWND RTAX_INITCWND
-        RTAX_FEATURES,
-#define RTAX_FEATURES RTAX_FEATURES
-        RTAX_RTO_MIN,
-#define RTAX_RTO_MIN RTAX_RTO_MIN
-        RTAX_INITRWND,
-#define RTAX_INITRWND RTAX_INITRWND
-        __RTAX_MAX
-};
-
-#define RTAX_MAX (__RTAX_MAX - 1)
-
-#define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_SACK       0x00000002
-#define RTAX_FEATURE_TIMESTAMP  0x00000004
-#define RTAX_FEATURE_ALLFRAG    0x00000008
-
-struct rta_session {
-        __u8    proto;
-        __u8    pad1;
-        __u16   pad2;
-
-        union {
-                struct {
-                        __u16   sport;
-                        __u16   dport;
-                } ports;
-
-                struct {
-                        __u8    type;
-                        __u8    code;
-                        __u16   ident;
-                } icmpt;
-
-                __u32           spi;
-        } u;
-};
-
-/****
- *              General form of address family dependent message.
- ****/
-
-struct rtgenmsg {
-        unsigned char           rtgen_family;
-};
-
-/*****************************************************************
- *              Link layer specific messages.
- ****/
-
-/* struct ifinfomsg
- * passes link level specific information, not dependent
- * on network protocol.
- */
-
-struct ifinfomsg {
-        unsigned char   ifi_family;
-        unsigned char   __ifi_pad;
-        unsigned short  ifi_type;               /* ARPHRD_* */
-        int             ifi_index;              /* Link index   */
-        unsigned        ifi_flags;              /* IFF_* flags  */
-        unsigned        ifi_change;             /* IFF_* change mask */
-};
-
-/********************************************************************
- *              prefix information 
- ****/
-
-struct prefixmsg {
-        unsigned char   prefix_family;
-        unsigned char   prefix_pad1;
-        unsigned short  prefix_pad2;
-        int             prefix_ifindex;
-        unsigned char   prefix_type;
-        unsigned char   prefix_len;
-        unsigned char   prefix_flags;
-        unsigned char   prefix_pad3;
-};
-
-enum 
-{
-        PREFIX_UNSPEC,
-        PREFIX_ADDRESS,
-        PREFIX_CACHEINFO,
-        __PREFIX_MAX
-};
-
-#define PREFIX_MAX      (__PREFIX_MAX - 1)
-
-struct prefix_cacheinfo {
-        __u32   preferred_time;
-        __u32   valid_time;
-};
-
-
-/*****************************************************************
- *              Traffic control messages.
- ****/
-
-struct tcmsg {
-        unsigned char   tcm_family;
-        unsigned char   tcm__pad1;
-        unsigned short  tcm__pad2;
-        int             tcm_ifindex;
-        __u32           tcm_handle;
-        __u32           tcm_parent;
-        __u32           tcm_info;
-};
-
-enum {
-        TCA_UNSPEC,
-        TCA_KIND,
-        TCA_OPTIONS,
-        TCA_STATS,
-        TCA_XSTATS,
-        TCA_RATE,
-        TCA_FCNT,
-        TCA_STATS2,
-        TCA_STAB,
-        __TCA_MAX
-};
-
-#define TCA_MAX (__TCA_MAX - 1)
-
-#define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
-#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
-
-/********************************************************************
- *              Neighbor Discovery userland options
- ****/
-
-struct nduseroptmsg {
-        unsigned char   nduseropt_family;
-        unsigned char   nduseropt_pad1;
-        unsigned short  nduseropt_opts_len;     /* Total length of options */
-        int             nduseropt_ifindex;
-        __u8            nduseropt_icmp_type;
-        __u8            nduseropt_icmp_code;
-        unsigned short  nduseropt_pad2;
-        unsigned int    nduseropt_pad3;
-        /* Followed by one or more ND options */
-};
-
-enum {
-        NDUSEROPT_UNSPEC,
-        NDUSEROPT_SRCADDR,
-        __NDUSEROPT_MAX
-};
-
-#define NDUSEROPT_MAX   (__NDUSEROPT_MAX - 1)
-
-#ifndef __KERNEL__
-/* RTnetlink multicast groups - backwards compatibility for userspace */
-#define RTMGRP_LINK             1
-#define RTMGRP_NOTIFY           2
-#define RTMGRP_NEIGH            4
-#define RTMGRP_TC               8
-
-#define RTMGRP_IPV4_IFADDR      0x10
-#define RTMGRP_IPV4_MROUTE      0x20
-#define RTMGRP_IPV4_ROUTE       0x40
-#define RTMGRP_IPV4_RULE        0x80
-
-#define RTMGRP_IPV6_IFADDR      0x100
-#define RTMGRP_IPV6_MROUTE      0x200
-#define RTMGRP_IPV6_ROUTE       0x400
-#define RTMGRP_IPV6_IFINFO      0x800
-
-#define RTMGRP_DECnet_IFADDR    0x1000
-#define RTMGRP_DECnet_ROUTE     0x4000
-
-#define RTMGRP_IPV6_PREFIX      0x20000
-#endif
-
-/* RTnetlink multicast groups */
-enum rtnetlink_groups {
-        RTNLGRP_NONE,
-#define RTNLGRP_NONE            RTNLGRP_NONE
-        RTNLGRP_LINK,
-#define RTNLGRP_LINK            RTNLGRP_LINK
-        RTNLGRP_NOTIFY,
-#define RTNLGRP_NOTIFY          RTNLGRP_NOTIFY
-        RTNLGRP_NEIGH,
-#define RTNLGRP_NEIGH           RTNLGRP_NEIGH
-        RTNLGRP_TC,
-#define RTNLGRP_TC              RTNLGRP_TC
-        RTNLGRP_IPV4_IFADDR,
-#define RTNLGRP_IPV4_IFADDR     RTNLGRP_IPV4_IFADDR
-        RTNLGRP_IPV4_MROUTE,
-#define RTNLGRP_IPV4_MROUTE     RTNLGRP_IPV4_MROUTE
-        RTNLGRP_IPV4_ROUTE,
-#define RTNLGRP_IPV4_ROUTE      RTNLGRP_IPV4_ROUTE
-        RTNLGRP_IPV4_RULE,
-#define RTNLGRP_IPV4_RULE       RTNLGRP_IPV4_RULE
-        RTNLGRP_IPV6_IFADDR,
-#define RTNLGRP_IPV6_IFADDR     RTNLGRP_IPV6_IFADDR
-        RTNLGRP_IPV6_MROUTE,
-#define RTNLGRP_IPV6_MROUTE     RTNLGRP_IPV6_MROUTE
-        RTNLGRP_IPV6_ROUTE,
-#define RTNLGRP_IPV6_ROUTE      RTNLGRP_IPV6_ROUTE
-        RTNLGRP_IPV6_IFINFO,
-#define RTNLGRP_IPV6_IFINFO     RTNLGRP_IPV6_IFINFO
-        RTNLGRP_DECnet_IFADDR,
-#define RTNLGRP_DECnet_IFADDR   RTNLGRP_DECnet_IFADDR
-        RTNLGRP_NOP2,
-        RTNLGRP_DECnet_ROUTE,
-#define RTNLGRP_DECnet_ROUTE    RTNLGRP_DECnet_ROUTE
-        RTNLGRP_DECnet_RULE,
-#define RTNLGRP_DECnet_RULE     RTNLGRP_DECnet_RULE
-        RTNLGRP_NOP4,
-        RTNLGRP_IPV6_PREFIX,
-#define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
-        RTNLGRP_IPV6_RULE,
-#define RTNLGRP_IPV6_RULE       RTNLGRP_IPV6_RULE
-        RTNLGRP_ND_USEROPT,
-#define RTNLGRP_ND_USEROPT      RTNLGRP_ND_USEROPT
-        RTNLGRP_PHONET_IFADDR,
-#define RTNLGRP_PHONET_IFADDR   RTNLGRP_PHONET_IFADDR
-        RTNLGRP_PHONET_ROUTE,
-#define RTNLGRP_PHONET_ROUTE    RTNLGRP_PHONET_ROUTE
-        RTNLGRP_DCB,
-#define RTNLGRP_DCB             RTNLGRP_DCB
-        __RTNLGRP_MAX
-};
-#define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
-
-/* TC action piece */
-struct tcamsg {
-        unsigned char   tca_family;
-        unsigned char   tca__pad1;
-        unsigned short  tca__pad2;
-};
-#define TA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))
-#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
-#define TCA_ACT_TAB 1 /* attr type must be >=1 */       
-#define TCAA_MAX 1
-
-/* New extended info filters for IFLA_EXT_MASK */
-#define RTEXT_FILTER_VF         (1 << 0)
-
-/* End of information exported to user level */
-
-#ifdef __KERNEL__
 
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
+#include <uapi/linux/rtnetlink.h>
 
 extern int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, u32 group, int echo);
 extern int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid);
@@ -675,7 +69,4 @@ extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
                              struct netlink_callback *cb,
                              struct net_device *dev,
                              int idx);
-#endif /* __KERNEL__ */
-
-
 #endif  /* __LINUX_RTNETLINK_H */
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 7b600da9a635..4bd6c06eb28e 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -201,6 +201,7 @@ static inline void *sg_virt(struct scatterlist *sg)
         return page_address(sg_page(sg)) + sg->offset;
 }
 
+int sg_nents(struct scatterlist *sg);
 struct scatterlist *sg_next(struct scatterlist *);
 struct scatterlist *sg_last(struct scatterlist *s, unsigned int);
 void sg_init_table(struct scatterlist *, unsigned int);
diff --git a/include/linux/scc.h b/include/linux/scc.h
index 3495bd953cc6..c5a004962679 100644
--- a/include/linux/scc.h
+++ b/include/linux/scc.h
@@ -1,175 +1,9 @@
 /* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */
-
 #ifndef _SCC_H
 #define _SCC_H
 
+#include <uapi/linux/scc.h>
 
-/* selection of hardware types */
-
-#define PA0HZP          0x00    /* hardware type for PA0HZP SCC card and compatible */
-#define EAGLE           0x01    /* hardware type for EAGLE card */
-#define PC100           0x02    /* hardware type for PC100 card */
-#define PRIMUS          0x04    /* hardware type for PRIMUS-PC (DG9BL) card */
-#define DRSI            0x08    /* hardware type for DRSI PC*Packet card */
-#define BAYCOM          0x10    /* hardware type for BayCom (U)SCC */
-
-/* DEV ioctl() commands */
-
-enum SCC_ioctl_cmds {
-        SIOCSCCRESERVED = SIOCDEVPRIVATE,
-        SIOCSCCCFG,
-        SIOCSCCINI,
-        SIOCSCCCHANINI,
-        SIOCSCCSMEM,
-        SIOCSCCGKISS,
-        SIOCSCCSKISS,
-        SIOCSCCGSTAT,
-        SIOCSCCCAL
-};
-
-/* Device parameter control (from WAMPES) */
-
-enum L1_params {
-        PARAM_DATA,
-        PARAM_TXDELAY,
-        PARAM_PERSIST,
-        PARAM_SLOTTIME,
-        PARAM_TXTAIL,
-        PARAM_FULLDUP,
-        PARAM_SOFTDCD,          /* was: PARAM_HW */
-        PARAM_MUTE,             /* ??? */
-        PARAM_DTR,
-        PARAM_RTS,
-        PARAM_SPEED,
-        PARAM_ENDDELAY,         /* ??? */
-        PARAM_GROUP,
-        PARAM_IDLE,
-        PARAM_MIN,
-        PARAM_MAXKEY,
-        PARAM_WAIT,
-        PARAM_MAXDEFER,
-        PARAM_TX,
-        PARAM_HWEVENT = 31,
-        PARAM_RETURN = 255      /* reset kiss mode */
-};
-
-/* fulldup parameter */
-
-enum FULLDUP_modes {
-        KISS_DUPLEX_HALF,       /* normal CSMA operation */
-        KISS_DUPLEX_FULL,       /* fullduplex, key down trx after transmission */
-        KISS_DUPLEX_LINK,       /* fullduplex, key down trx after 'idletime' sec */
-        KISS_DUPLEX_OPTIMA      /* fullduplex, let the protocol layer control the hw */
-};
-
-/* misc. parameters */
-
-#define TIMER_OFF       65535U  /* to switch off timers */
-#define NO_SUCH_PARAM   65534U  /* param not implemented */
-
-/* HWEVENT parameter */
-
-enum HWEVENT_opts {
-        HWEV_DCD_ON,
-        HWEV_DCD_OFF,
-        HWEV_ALL_SENT
-};
-
-/* channel grouping */
-
-#define RXGROUP         0100    /* if set, only tx when all channels clear */
-#define TXGROUP         0200    /* if set, don't transmit simultaneously */
-
-/* Tx/Rx clock sources */
-
-enum CLOCK_sources {
-        CLK_DPLL,       /* normal halfduplex operation */
-        CLK_EXTERNAL,   /* external clocking (G3RUH/DF9IC modems) */
-        CLK_DIVIDER,    /* Rx = DPLL, Tx = divider (fullduplex with */
-                        /* modems without clock regeneration */
-        CLK_BRG         /* experimental fullduplex mode with DPLL/BRG for */
-                        /* MODEMs without clock recovery */
-};
-
-/* Tx state */
-
-enum TX_state {
-        TXS_IDLE,       /* Transmitter off, no data pending */
-        TXS_BUSY,       /* waiting for permission to send / tailtime */
-        TXS_ACTIVE,     /* Transmitter on, sending data */
-        TXS_NEWFRAME,   /* reset CRC and send (next) frame */
-        TXS_IDLE2,      /* Transmitter on, no data pending */
-        TXS_WAIT,       /* Waiting for Mintime to expire */
-        TXS_TIMEOUT     /* We had a transmission timeout */
-};
-
-typedef unsigned long io_port;  /* type definition for an 'io port address' */
-
-/* SCC statistical information */
-
-struct scc_stat {
-        long rxints;            /* Receiver interrupts */
-        long txints;            /* Transmitter interrupts */
-        long exints;            /* External/status interrupts */
-        long spints;            /* Special receiver interrupts */
-
-        long txframes;          /* Packets sent */
-        long rxframes;          /* Number of Frames Actually Received */
-        long rxerrs;            /* CRC Errors */
-        long txerrs;            /* KISS errors */
-        
-        unsigned int nospace;   /* "Out of buffers" */
-        unsigned int rx_over;   /* Receiver Overruns */
-        unsigned int tx_under;  /* Transmitter Underruns */
-
-        unsigned int tx_state;  /* Transmitter state */
-        int tx_queued;          /* tx frames enqueued */
-
-        unsigned int maxqueue;  /* allocated tx_buffers */
-        unsigned int bufsize;   /* used buffersize */
-};
-
-struct scc_modem {
-        long speed;             /* Line speed, bps */
-        char clocksrc;          /* 0 = DPLL, 1 = external, 2 = divider */
-        char nrz;               /* NRZ instead of NRZI */       
-};
-
-struct scc_kiss_cmd {
-        int      command;       /* one of the KISS-Commands defined above */
-        unsigned param;         /* KISS-Param */
-};
-
-struct scc_hw_config {
-        io_port data_a;         /* data port channel A */
-        io_port ctrl_a;         /* control port channel A */
-        io_port data_b;         /* data port channel B */
-        io_port ctrl_b;         /* control port channel B */
-        io_port vector_latch;   /* INTACK-Latch (#) */
-        io_port special;        /* special function port */
-
-        int     irq;            /* irq */
-        long    clock;          /* clock */
-        char    option;         /* command for function port */
-
-        char brand;             /* hardware type */
-        char escc;              /* use ext. features of a 8580/85180/85280 */
-};
-
-/* (#) only one INTACK latch allowed. */
-
-
-struct scc_mem_config {
-        unsigned int dummy;
-        unsigned int bufsize;
-};
-
-struct scc_calibrate {
-        unsigned int time;
-        unsigned char pattern;
-};
-
-#ifdef __KERNEL__
 
 enum {TX_OFF, TX_ON};   /* command for scc_key_trx() */
 
@@ -248,5 +82,4 @@ struct scc_channel {
         spinlock_t      lock;           /* Channel guard lock */
 };
 
-#endif /* defined(__KERNEL__) */
 #endif /* defined(_SCC_H) */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9d51e260bde0..0dd42a02df2e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1,48 +1,8 @@
 #ifndef _LINUX_SCHED_H
 #define _LINUX_SCHED_H
 
-/*
- * cloning flags:
- */
-#define CSIGNAL         0x000000ff      /* signal mask to be sent at exit */
-#define CLONE_VM        0x00000100      /* set if VM shared between processes */
-#define CLONE_FS        0x00000200      /* set if fs info shared between processes */
-#define CLONE_FILES     0x00000400      /* set if open files shared between processes */
-#define CLONE_SIGHAND   0x00000800      /* set if signal handlers and blocked signals shared */
-#define CLONE_PTRACE    0x00002000      /* set if we want to let tracing continue on the child too */
-#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
-#define CLONE_PARENT    0x00008000      /* set if we want to have the same parent as the cloner */
-#define CLONE_THREAD    0x00010000      /* Same thread group? */
-#define CLONE_NEWNS     0x00020000      /* New namespace group? */
-#define CLONE_SYSVSEM   0x00040000      /* share system V SEM_UNDO semantics */
-#define CLONE_SETTLS    0x00080000      /* create a new TLS for the child */
-#define CLONE_PARENT_SETTID     0x00100000      /* set the TID in the parent */
-#define CLONE_CHILD_CLEARTID    0x00200000      /* clear the TID in the child */
-#define CLONE_DETACHED          0x00400000      /* Unused, ignored */
-#define CLONE_UNTRACED          0x00800000      /* set if the tracing process can't force CLONE_PTRACE on this clone */
-#define CLONE_CHILD_SETTID      0x01000000      /* set the TID in the child */
-/* 0x02000000 was previously the unused CLONE_STOPPED (Start in stopped state)
-   and is now available for re-use. */
-#define CLONE_NEWUTS            0x04000000      /* New utsname group? */
-#define CLONE_NEWIPC            0x08000000      /* New ipcs */
-#define CLONE_NEWUSER           0x10000000      /* New user namespace */
-#define CLONE_NEWPID            0x20000000      /* New pid namespace */
-#define CLONE_NEWNET            0x40000000      /* New network namespace */
-#define CLONE_IO                0x80000000      /* Clone io context */
+#include <uapi/linux/sched.h>
 
-/*
- * Scheduling policies
- */
-#define SCHED_NORMAL            0
-#define SCHED_FIFO              1
-#define SCHED_RR                2
-#define SCHED_BATCH             3
-/* SCHED_ISO: reserved but not implemented yet */
-#define SCHED_IDLE              5
-/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */
-#define SCHED_RESET_ON_FORK     0x40000000
-
-#ifdef __KERNEL__
 
 struct sched_param {
         int sched_priority;
@@ -405,7 +365,6 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
 
 extern void set_dumpable(struct mm_struct *mm, int value);
 extern int get_dumpable(struct mm_struct *mm);
-extern int __get_dumpable(unsigned long mm_flags);
 
 /* get/set_dumpable() values */
 #define SUID_DUMPABLE_DISABLED  0
@@ -672,7 +631,6 @@ struct signal_struct {
         struct rw_semaphore group_rwsem;
 #endif
 
-        int oom_adj;            /* OOM kill score adjustment (bit shift) */
         int oom_score_adj;      /* OOM kill score adjustment */
         int oom_score_adj_min;  /* OOM kill score adjustment minimum value.
                                  * Only settable by CAP_SYS_RESOURCE. */
@@ -2334,6 +2292,9 @@ extern int do_execve(const char *,
                      const char __user * const __user *, struct pt_regs *);
 extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
 struct task_struct *fork_idle(int);
+#ifdef CONFIG_GENERIC_KERNEL_THREAD
+extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
+#endif
 
 extern void set_task_comm(struct task_struct *tsk, char *from);
 extern char *get_task_comm(char *to, struct task_struct *tsk);
@@ -2827,6 +2788,4 @@ static inline unsigned long rlimit_max(unsigned int limit)
         return task_rlimit_max(current, limit);
 }
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index fb3c5a8fef3d..005bf3e38db5 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -1,76 +1,8 @@
 #ifndef _SCREEN_INFO_H
 #define _SCREEN_INFO_H
 
-#include <linux/types.h>
+#include <uapi/linux/screen_info.h>
 
-/*
- * These are set up by the setup-routine at boot-time:
- */
-
-struct screen_info {
-        __u8  orig_x;           /* 0x00 */
-        __u8  orig_y;           /* 0x01 */
-        __u16 ext_mem_k;        /* 0x02 */
-        __u16 orig_video_page;  /* 0x04 */
-        __u8  orig_video_mode;  /* 0x06 */
-        __u8  orig_video_cols;  /* 0x07 */
-        __u8  flags;            /* 0x08 */
-        __u8  unused2;          /* 0x09 */
-        __u16 orig_video_ega_bx;/* 0x0a */
-        __u16 unused3;          /* 0x0c */
-        __u8  orig_video_lines; /* 0x0e */
-        __u8  orig_video_isVGA; /* 0x0f */
-        __u16 orig_video_points;/* 0x10 */
-
-        /* VESA graphic mode -- linear frame buffer */
-        __u16 lfb_width;        /* 0x12 */
-        __u16 lfb_height;       /* 0x14 */
-        __u16 lfb_depth;        /* 0x16 */
-        __u32 lfb_base;         /* 0x18 */
-        __u32 lfb_size;         /* 0x1c */
-        __u16 cl_magic, cl_offset; /* 0x20 */
-        __u16 lfb_linelength;   /* 0x24 */
-        __u8  red_size;         /* 0x26 */
-        __u8  red_pos;          /* 0x27 */
-        __u8  green_size;       /* 0x28 */
-        __u8  green_pos;        /* 0x29 */
-        __u8  blue_size;        /* 0x2a */
-        __u8  blue_pos;         /* 0x2b */
-        __u8  rsvd_size;        /* 0x2c */
-        __u8  rsvd_pos;         /* 0x2d */
-        __u16 vesapm_seg;       /* 0x2e */
-        __u16 vesapm_off;       /* 0x30 */
-        __u16 pages;            /* 0x32 */
-        __u16 vesa_attributes;  /* 0x34 */
-        __u32 capabilities;     /* 0x36 */
-        __u8  _reserved[6];     /* 0x3a */
-} __attribute__((packed));
-
-#define VIDEO_TYPE_MDA          0x10    /* Monochrome Text Display      */
-#define VIDEO_TYPE_CGA          0x11    /* CGA Display                  */
-#define VIDEO_TYPE_EGAM         0x20    /* EGA/VGA in Monochrome Mode   */
-#define VIDEO_TYPE_EGAC         0x21    /* EGA in Color Mode            */
-#define VIDEO_TYPE_VGAC         0x22    /* VGA+ in Color Mode           */
-#define VIDEO_TYPE_VLFB         0x23    /* VESA VGA in graphic mode     */
-
-#define VIDEO_TYPE_PICA_S3      0x30    /* ACER PICA-61 local S3 video  */
-#define VIDEO_TYPE_MIPS_G364    0x31    /* MIPS Magnum 4000 G364 video  */
-#define VIDEO_TYPE_SGI          0x33    /* Various SGI graphics hardware */
-
-#define VIDEO_TYPE_TGAC         0x40    /* DEC TGA */
-
-#define VIDEO_TYPE_SUN          0x50    /* Sun frame buffer. */
-#define VIDEO_TYPE_SUNPCI       0x51    /* Sun PCI based frame buffer. */
-
-#define VIDEO_TYPE_PMAC         0x60    /* PowerMacintosh frame buffer. */
-
-#define VIDEO_TYPE_EFI          0x70    /* EFI graphic mode             */
-
-#define VIDEO_FLAGS_NOCURSOR    (1 << 0) /* The video mode has no cursor set */
-
-#define VIDEO_CAPABILITY_SKIP_QUIRKS    (1 << 0)
-
-#ifdef __KERNEL__
 extern struct screen_info screen_info;
 
 #define ORIG_X                  (screen_info.orig_x)
@@ -81,6 +13,4 @@ extern struct screen_info screen_info;
 #define ORIG_VIDEO_LINES        (screen_info.orig_video_lines)
 #define ORIG_VIDEO_ISVGA        (screen_info.orig_video_isVGA)
 #define ORIG_VIDEO_POINTS       (screen_info.orig_video_points)
-#endif /* __KERNEL__ */
-
 #endif /* _SCREEN_INFO_H */
diff --git a/include/linux/sdla.h b/include/linux/sdla.h
index 9995c7fc3f60..fe7a967d7de4 100644
--- a/include/linux/sdla.h
+++ b/include/linux/sdla.h
@@ -19,100 +19,11 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  */
-
 #ifndef SDLA_H
 #define SDLA_H
 
-/* adapter type */
-#define SDLA_TYPES
-#define SDLA_S502A                      5020
-#define SDLA_S502E                      5021
-#define SDLA_S503                       5030
-#define SDLA_S507                       5070
-#define SDLA_S508                       5080
-#define SDLA_S509                       5090
-#define SDLA_UNKNOWN                    -1
-
-/* port selection flags for the S508 */
-#define SDLA_S508_PORT_V35              0x00
-#define SDLA_S508_PORT_RS232            0x02
-
-/* Z80 CPU speeds */
-#define SDLA_CPU_3M                     0x00
-#define SDLA_CPU_5M                     0x01
-#define SDLA_CPU_7M                     0x02
-#define SDLA_CPU_8M                     0x03
-#define SDLA_CPU_10M                    0x04
-#define SDLA_CPU_16M                    0x05
-#define SDLA_CPU_12M                    0x06
-
-/* some private IOCTLs */
-#define SDLA_IDENTIFY                   (FRAD_LAST_IOCTL + 1)
-#define SDLA_CPUSPEED                   (FRAD_LAST_IOCTL + 2)
-#define SDLA_PROTOCOL                   (FRAD_LAST_IOCTL + 3)
-
-#define SDLA_CLEARMEM                   (FRAD_LAST_IOCTL + 4)
-#define SDLA_WRITEMEM                   (FRAD_LAST_IOCTL + 5)
-#define SDLA_READMEM                    (FRAD_LAST_IOCTL + 6)
-
-struct sdla_mem {
-   int  addr;
-   int  len;
-   void __user *data;
-};
-
-#define SDLA_START                      (FRAD_LAST_IOCTL + 7)
-#define SDLA_STOP                       (FRAD_LAST_IOCTL + 8)
+#include <uapi/linux/sdla.h>
 
-/* some offsets in the Z80's memory space */
-#define SDLA_NMIADDR                    0x0000
-#define SDLA_CONF_ADDR                  0x0010
-#define SDLA_S502A_NMIADDR              0x0066
-#define SDLA_CODE_BASEADDR              0x0100
-#define SDLA_WINDOW_SIZE                0x2000
-#define SDLA_ADDR_MASK                  0x1FFF
-
-/* largest handleable block of data */
-#define SDLA_MAX_DATA                   4080
-#define SDLA_MAX_MTU                    4072    /* MAX_DATA - sizeof(fradhdr) */
-#define SDLA_MAX_DLCI                   24
-
-/* this should be the same as frad_conf */
-struct sdla_conf {
-   short station;
-   short config;
-   short kbaud;
-   short clocking;
-   short max_frm;
-   short T391;
-   short T392;
-   short N391;
-   short N392;
-   short N393;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd;
-};
-
-/* this should be the same as dlci_conf */
-struct sdla_dlci_conf {
-   short config;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd; 
-   short Tc_fwd;
-   short Tc_bwd;
-   short Tf_max;
-   short Tb_max;
-};
-
-#ifdef __KERNEL__
 
 /* important Z80 window addresses */
 #define SDLA_CONTROL_WND                0xE000
@@ -331,5 +242,3 @@ struct buf_entry {
 } __attribute__((packed));
 
 #endif
-
-#endif
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 84f6320da50f..6f19cfd1840e 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -1,50 +1,8 @@
 #ifndef _LINUX_SECCOMP_H
 #define _LINUX_SECCOMP_H
 
-#include <linux/compiler.h>
-#include <linux/types.h>
+#include <uapi/linux/seccomp.h>
 
-
-/* Valid values for seccomp.mode and prctl(PR_SET_SECCOMP, <mode>) */
-#define SECCOMP_MODE_DISABLED   0 /* seccomp is not in use. */
-#define SECCOMP_MODE_STRICT     1 /* uses hard-coded filter. */
-#define SECCOMP_MODE_FILTER     2 /* uses user-supplied filter. */
-
-/*
- * All BPF programs must return a 32-bit value.
- * The bottom 16-bits are for optional return data.
- * The upper 16-bits are ordered from least permissive values to most.
- *
- * The ordering ensures that a min_t() over composed return values always
- * selects the least permissive choice.
- */
-#define SECCOMP_RET_KILL        0x00000000U /* kill the task immediately */
-#define SECCOMP_RET_TRAP        0x00030000U /* disallow and force a SIGSYS */
-#define SECCOMP_RET_ERRNO       0x00050000U /* returns an errno */
-#define SECCOMP_RET_TRACE       0x7ff00000U /* pass to a tracer or disallow */
-#define SECCOMP_RET_ALLOW       0x7fff0000U /* allow */
-
-/* Masks for the return value sections. */
-#define SECCOMP_RET_ACTION      0x7fff0000U
-#define SECCOMP_RET_DATA        0x0000ffffU
-
-/**
- * struct seccomp_data - the format the BPF program executes over.
- * @nr: the system call number
- * @arch: indicates system call convention as an AUDIT_ARCH_* value
- *        as defined in <linux/audit.h>.
- * @instruction_pointer: at the time of the system call.
- * @args: up to 6 system call arguments always stored as 64-bit values
- *        regardless of the architecture.
- */
-struct seccomp_data {
-        int nr;
-        __u32 arch;
-        __u64 instruction_pointer;
-        __u64 args[6];
-};
-
-#ifdef __KERNEL__
 #ifdef CONFIG_SECCOMP
 
 #include <linux/thread_info.h>
@@ -129,5 +87,4 @@ static inline void get_seccomp_filter(struct task_struct *tsk)
         return;
 }
 #endif /* CONFIG_SECCOMP_FILTER */
-#endif /* __KERNEL__ */
 #endif /* _LINUX_SECCOMP_H */
diff --git a/include/linux/securebits.h b/include/linux/securebits.h
index 33406174cbe8..da1b33b33af7 100644
--- a/include/linux/securebits.h
+++ b/include/linux/securebits.h
@@ -1,54 +1,7 @@
 #ifndef _LINUX_SECUREBITS_H
 #define _LINUX_SECUREBITS_H 1
 
-/* Each securesetting is implemented using two bits. One bit specifies
-   whether the setting is on or off. The other bit specify whether the
-   setting is locked or not. A setting which is locked cannot be
-   changed from user-level. */
-#define issecure_mask(X)        (1 << (X))
-#ifdef __KERNEL__
-#define issecure(X)             (issecure_mask(X) & current_cred_xxx(securebits))
-#endif
-
-#define SECUREBITS_DEFAULT 0x00000000
-
-/* When set UID 0 has no special privileges. When unset, we support
-   inheritance of root-permissions and suid-root executable under
-   compatibility mode. We raise the effective and inheritable bitmasks
-   *of the executable file* if the effective uid of the new process is
-   0. If the real uid is 0, we raise the effective (legacy) bit of the
-   executable file. */
-#define SECURE_NOROOT                   0
-#define SECURE_NOROOT_LOCKED            1  /* make bit-0 immutable */
-
-#define SECBIT_NOROOT           (issecure_mask(SECURE_NOROOT))
-#define SECBIT_NOROOT_LOCKED    (issecure_mask(SECURE_NOROOT_LOCKED))
-
-/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
-   When unset, to provide compatiblility with old programs relying on
-   set*uid to gain/lose privilege, transitions to/from uid 0 cause
-   capabilities to be gained/lost. */
-#define SECURE_NO_SETUID_FIXUP          2
-#define SECURE_NO_SETUID_FIXUP_LOCKED   3  /* make bit-2 immutable */
-
-#define SECBIT_NO_SETUID_FIXUP  (issecure_mask(SECURE_NO_SETUID_FIXUP))
-#define SECBIT_NO_SETUID_FIXUP_LOCKED \
-                        (issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
-
-/* When set, a process can retain its capabilities even after
-   transitioning to a non-root user (the set-uid fixup suppressed by
-   bit 2). Bit-4 is cleared when a process calls exec(); setting both
-   bit 4 and 5 will create a barrier through exec that no exec()'d
-   child can use this feature again. */
-#define SECURE_KEEP_CAPS                4
-#define SECURE_KEEP_CAPS_LOCKED         5  /* make bit-4 immutable */
-
-#define SECBIT_KEEP_CAPS        (issecure_mask(SECURE_KEEP_CAPS))
-#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
-
-#define SECURE_ALL_BITS         (issecure_mask(SECURE_NOROOT) | \
-                                 issecure_mask(SECURE_NO_SETUID_FIXUP) | \
-                                 issecure_mask(SECURE_KEEP_CAPS))
-#define SECURE_ALL_LOCKS        (SECURE_ALL_BITS << 1)
+#include <uapi/linux/securebits.h>
 
+#define issecure(X)             (issecure_mask(X) & current_cred_xxx(securebits))
 #endif /* !_LINUX_SECUREBITS_H */
diff --git a/include/linux/security.h b/include/linux/security.h
index 5b50c4e1a7c2..05e88bdcf7d9 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1411,8 +1411,8 @@ struct security_operations {
         int (*sb_kern_mount) (struct super_block *sb, int flags, void *data);
         int (*sb_show_options) (struct seq_file *m, struct super_block *sb);
         int (*sb_statfs) (struct dentry *dentry);
-        int (*sb_mount) (char *dev_name, struct path *path,
-                         char *type, unsigned long flags, void *data);
+        int (*sb_mount) (const char *dev_name, struct path *path,
+                         const char *type, unsigned long flags, void *data);
         int (*sb_umount) (struct vfsmount *mnt, int flags);
         int (*sb_pivotroot) (struct path *old_path,
                              struct path *new_path);
@@ -1694,8 +1694,8 @@ int security_sb_remount(struct super_block *sb, void *data);
 int security_sb_kern_mount(struct super_block *sb, int flags, void *data);
 int security_sb_show_options(struct seq_file *m, struct super_block *sb);
 int security_sb_statfs(struct dentry *dentry);
-int security_sb_mount(char *dev_name, struct path *path,
-                      char *type, unsigned long flags, void *data);
+int security_sb_mount(const char *dev_name, struct path *path,
+                      const char *type, unsigned long flags, void *data);
 int security_sb_umount(struct vfsmount *mnt, int flags);
 int security_sb_pivotroot(struct path *old_path, struct path *new_path);
 int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
@@ -1964,8 +1964,8 @@ static inline int security_sb_statfs(struct dentry *dentry)
         return 0;
 }
 
-static inline int security_sb_mount(char *dev_name, struct path *path,
-                                    char *type, unsigned long flags,
+static inline int security_sb_mount(const char *dev_name, struct path *path,
+                                    const char *type, unsigned long flags,
                                     void *data)
 {
         return 0;
diff --git a/include/linux/sem.h b/include/linux/sem.h
index 10d6b226afc5..53d42650b193 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -1,85 +1,10 @@
 #ifndef _LINUX_SEM_H
 #define _LINUX_SEM_H
 
-#include <linux/ipc.h>
-
-/* semop flags */
-#define SEM_UNDO        0x1000  /* undo the operation on exit */
-
-/* semctl Command Definitions. */
-#define GETPID  11       /* get sempid */
-#define GETVAL  12       /* get semval */
-#define GETALL  13       /* get all semval's */
-#define GETNCNT 14       /* get semncnt */
-#define GETZCNT 15       /* get semzcnt */
-#define SETVAL  16       /* set semval */
-#define SETALL  17       /* set all semval's */
-
-/* ipcs ctl cmds */
-#define SEM_STAT 18
-#define SEM_INFO 19
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct semid_ds {
-        struct ipc_perm sem_perm;               /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        __kernel_time_t sem_ctime;              /* last change time */
-        struct sem      *sem_base;              /* ptr to first semaphore in array */
-        struct sem_queue *sem_pending;          /* pending operations to be processed */
-        struct sem_queue **sem_pending_last;    /* last pending operation */
-        struct sem_undo *undo;                  /* undo requests on this array */
-        unsigned short  sem_nsems;              /* no. of semaphores in array */
-};
-
-/* Include the definition of semid64_ds */
-#include <asm/sembuf.h>
-
-/* semop system calls takes an array of these. */
-struct sembuf {
-        unsigned short  sem_num;        /* semaphore index in array */
-        short           sem_op;         /* semaphore operation */
-        short           sem_flg;        /* operation flags */
-};
-
-/* arg for semctl system calls. */
-union semun {
-        int val;                        /* value for SETVAL */
-        struct semid_ds __user *buf;    /* buffer for IPC_STAT & IPC_SET */
-        unsigned short __user *array;   /* array for GETALL & SETALL */
-        struct seminfo __user *__buf;   /* buffer for IPC_INFO */
-        void __user *__pad;
-};
-
-struct  seminfo {
-        int semmap;
-        int semmni;
-        int semmns;
-        int semmnu;
-        int semmsl;
-        int semopm;
-        int semume;
-        int semusz;
-        int semvmx;
-        int semaem;
-};
-
-#define SEMMNI  128             /* <= IPCMNI  max # of semaphore identifiers */
-#define SEMMSL  250             /* <= 8 000 max num of semaphores per id */
-#define SEMMNS  (SEMMNI*SEMMSL) /* <= INT_MAX max # of semaphores in system */
-#define SEMOPM  32              /* <= 1 000 max num of ops per semop call */
-#define SEMVMX  32767           /* <= 32767 semaphore maximum value */
-#define SEMAEM  SEMVMX          /* adjust on exit max value */
-
-/* unused */
-#define SEMUME  SEMOPM          /* max num of undo entries per process */
-#define SEMMNU  SEMMNS          /* num of undo structures system wide */
-#define SEMMAP  SEMMNS          /* # of entries in semaphore map */
-#define SEMUSZ  20              /* sizeof struct sem_undo */
-
-#ifdef __KERNEL__
 #include <linux/atomic.h>
 #include <linux/rcupdate.h>
 #include <linux/cache.h>
+#include <uapi/linux/sem.h>
 
 struct task_struct;
 
@@ -122,6 +47,4 @@ static inline void exit_sem(struct task_struct *tsk)
 }
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SEM_H */
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 861e51de476b..0916107c77f9 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -6,16 +6,11 @@
  * Redistribution of this file is permitted under the terms of the GNU 
  * Public License (GPL)
  */
-
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
 
-#include <linux/types.h>
-
-#include <linux/tty_flags.h>
-
-#ifdef __KERNEL__
 #include <asm/page.h>
+#include <uapi/linux/serial.h>
 
 
 /*
@@ -33,118 +28,6 @@ struct async_icount {
  */
 #define SERIAL_XMIT_SIZE PAGE_SIZE
 
-#endif
-
-struct serial_struct {
-        int     type;
-        int     line;
-        unsigned int    port;
-        int     irq;
-        int     flags;
-        int     xmit_fifo_size;
-        int     custom_divisor;
-        int     baud_base;
-        unsigned short  close_delay;
-        char    io_type;
-        char    reserved_char[1];
-        int     hub6;
-        unsigned short  closing_wait; /* time to wait before closing */
-        unsigned short  closing_wait2; /* no longer used... */
-        unsigned char   *iomem_base;
-        unsigned short  iomem_reg_shift;
-        unsigned int    port_high;
-        unsigned long   iomap_base;     /* cookie passed into ioremap */
-};
-
-/*
- * For the close wait times, 0 means wait forever for serial port to
- * flush its output.  65535 means don't wait at all.
- */
-#define ASYNC_CLOSING_WAIT_INF  0
-#define ASYNC_CLOSING_WAIT_NONE 65535
-
-/*
- * These are the supported serial types.
- */
-#define PORT_UNKNOWN    0
-#define PORT_8250       1
-#define PORT_16450      2
-#define PORT_16550      3
-#define PORT_16550A     4
-#define PORT_CIRRUS     5       /* usurped by cyclades.c */
-#define PORT_16650      6
-#define PORT_16650V2    7
-#define PORT_16750      8
-#define PORT_STARTECH   9       /* usurped by cyclades.c */
-#define PORT_16C950     10      /* Oxford Semiconductor */
-#define PORT_16654      11
-#define PORT_16850      12
-#define PORT_RSA        13      /* RSA-DV II/S card */
-#define PORT_MAX        13
-
-#define SERIAL_IO_PORT  0
-#define SERIAL_IO_HUB6  1
-#define SERIAL_IO_MEM   2
-
-#define UART_CLEAR_FIFO         0x01
-#define UART_USE_FIFO           0x02
-#define UART_STARTECH           0x04
-#define UART_NATSEMI            0x08
-
-
-/*
- * Multiport serial configuration structure --- external structure
- */
-struct serial_multiport_struct {
-        int             irq;
-        int             port1;
-        unsigned char   mask1, match1;
-        int             port2;
-        unsigned char   mask2, match2;
-        int             port3;
-        unsigned char   mask3, match3;
-        int             port4;
-        unsigned char   mask4, match4;
-        int             port_monitor;
-        int     reserved[32];
-};
-
-/*
- * Serial input interrupt line counters -- external structure
- * Four lines can interrupt: CTS, DSR, RI, DCD
- */
-struct serial_icounter_struct {
-        int cts, dsr, rng, dcd;
-        int rx, tx;
-        int frame, overrun, parity, brk;
-        int buf_overrun;
-        int reserved[9];
-};
-
-/*
- * Serial interface for controlling RS485 settings on chips with suitable
- * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
- * platform. The set function returns the new state, with any unsupported bits
- * reverted appropriately.
- */
-
-struct serial_rs485 {
-        __u32   flags;                  /* RS485 feature flags */
-#define SER_RS485_ENABLED               (1 << 0)        /* If enabled */
-#define SER_RS485_RTS_ON_SEND           (1 << 1)        /* Logical level for
-                                                           RTS pin when
-                                                           sending */
-#define SER_RS485_RTS_AFTER_SEND        (1 << 2)        /* Logical level for
-                                                           RTS pin after sent*/
-#define SER_RS485_RX_DURING_TX          (1 << 4)
-        __u32   delay_rts_before_send;  /* Delay before send (milliseconds) */
-        __u32   delay_rts_after_send;   /* Delay after send (milliseconds) */
-        __u32   padding[5];             /* Memory is cheap, new structs
-                                           are a royal PITA .. */
-};
-
-#ifdef __KERNEL__
 #include <linux/compiler.h>
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_SERIAL_H */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f9b22ec7a9f3..3c430228d232 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -20,202 +20,6 @@
 #ifndef LINUX_SERIAL_CORE_H
 #define LINUX_SERIAL_CORE_H
 
-#include <linux/serial.h>
-
-/*
- * The type definitions.  These are from Ted Ts'o's serial.h
- */
-#define PORT_UNKNOWN    0
-#define PORT_8250       1
-#define PORT_16450      2
-#define PORT_16550      3
-#define PORT_16550A     4
-#define PORT_CIRRUS     5
-#define PORT_16650      6
-#define PORT_16650V2    7
-#define PORT_16750      8
-#define PORT_STARTECH   9
-#define PORT_16C950     10
-#define PORT_16654      11
-#define PORT_16850      12
-#define PORT_RSA        13
-#define PORT_NS16550A   14
-#define PORT_XSCALE     15
-#define PORT_RM9000     16      /* PMC-Sierra RM9xxx internal UART */
-#define PORT_OCTEON     17      /* Cavium OCTEON internal UART */
-#define PORT_AR7        18      /* Texas Instruments AR7 internal UART */
-#define PORT_U6_16550A  19      /* ST-Ericsson U6xxx internal UART */
-#define PORT_TEGRA      20      /* NVIDIA Tegra internal UART */
-#define PORT_XR17D15X   21      /* Exar XR17D15x UART */
-#define PORT_LPC3220    22      /* NXP LPC32xx SoC "Standard" UART */
-#define PORT_8250_CIR   23      /* CIR infrared port, has its own driver */
-#define PORT_MAX_8250   23      /* max port ID */
-
-/*
- * ARM specific type numbers.  These are not currently guaranteed
- * to be implemented, and will change in the future.  These are
- * separate so any additions to the old serial.c that occur before
- * we are merged can be easily merged here.
- */
-#define PORT_PXA        31
-#define PORT_AMBA       32
-#define PORT_CLPS711X   33
-#define PORT_SA1100     34
-#define PORT_UART00     35
-#define PORT_21285      37
-
-/* Sparc type numbers.  */
-#define PORT_SUNZILOG   38
-#define PORT_SUNSAB     39
-
-/* DEC */
-#define PORT_DZ         46
-#define PORT_ZS         47
-
-/* Parisc type numbers. */
-#define PORT_MUX        48
-
-/* Atmel AT91 / AT32 SoC */
-#define PORT_ATMEL      49
-
-/* Macintosh Zilog type numbers */
-#define PORT_MAC_ZILOG  50      /* m68k : not yet implemented */
-#define PORT_PMAC_ZILOG 51
-
-/* SH-SCI */
-#define PORT_SCI        52
-#define PORT_SCIF       53
-#define PORT_IRDA       54
-
-/* Samsung S3C2410 SoC and derivatives thereof */
-#define PORT_S3C2410    55
-
-/* SGI IP22 aka Indy / Challenge S / Indigo 2 */
-#define PORT_IP22ZILOG  56
-
-/* Sharp LH7a40x -- an ARM9 SoC series */
-#define PORT_LH7A40X    57
-
-/* PPC CPM type number */
-#define PORT_CPM        58
-
-/* MPC52xx (and MPC512x) type numbers */
-#define PORT_MPC52xx    59
-
-/* IBM icom */
-#define PORT_ICOM       60
-
-/* Samsung S3C2440 SoC */
-#define PORT_S3C2440    61
-
-/* Motorola i.MX SoC */
-#define PORT_IMX        62
-
-/* Marvell MPSC */
-#define PORT_MPSC       63
-
-/* TXX9 type number */
-#define PORT_TXX9       64
-
-/* NEC VR4100 series SIU/DSIU */
-#define PORT_VR41XX_SIU         65
-#define PORT_VR41XX_DSIU        66
-
-/* Samsung S3C2400 SoC */
-#define PORT_S3C2400    67
-
-/* M32R SIO */
-#define PORT_M32R_SIO   68
-
-/*Digi jsm */
-#define PORT_JSM        69
-
-#define PORT_PNX8XXX    70
-
-/* Hilscher netx */
-#define PORT_NETX       71
-
-/* SUN4V Hypervisor Console */
-#define PORT_SUNHV      72
-
-#define PORT_S3C2412    73
-
-/* Xilinx uartlite */
-#define PORT_UARTLITE   74
-
-/* Blackfin bf5xx */
-#define PORT_BFIN       75
-
-/* Micrel KS8695 */
-#define PORT_KS8695     76
-
-/* Broadcom SB1250, etc. SOC */
-#define PORT_SB1250_DUART       77
-
-/* Freescale ColdFire */
-#define PORT_MCF        78
-
-/* Blackfin SPORT */
-#define PORT_BFIN_SPORT         79
-
-/* MN10300 on-chip UART numbers */
-#define PORT_MN10300            80
-#define PORT_MN10300_CTS        81
-
-#define PORT_SC26XX     82
-
-/* SH-SCI */
-#define PORT_SCIFA      83
-
-#define PORT_S3C6400    84
-
-/* NWPSERIAL */
-#define PORT_NWPSERIAL  85
-
-/* MAX3100 */
-#define PORT_MAX3100    86
-
-/* Timberdale UART */
-#define PORT_TIMBUART   87
-
-/* Qualcomm MSM SoCs */
-#define PORT_MSM        88
-
-/* BCM63xx family SoCs */
-#define PORT_BCM63XX    89
-
-/* Aeroflex Gaisler GRLIB APBUART */
-#define PORT_APBUART    90
-
-/* Altera UARTs */
-#define PORT_ALTERA_JTAGUART    91
-#define PORT_ALTERA_UART        92
-
-/* SH-SCI */
-#define PORT_SCIFB      93
-
-/* MAX310X */
-#define PORT_MAX310X    94
-
-/* High Speed UART for Medfield */
-#define PORT_MFD        95
-
-/* TI OMAP-UART */
-#define PORT_OMAP       96
-
-/* VIA VT8500 SoC */
-#define PORT_VT8500     97
-
-/* Xilinx PSS UART */
-#define PORT_XUARTPS    98
-
-/* Atheros AR933X SoC */
-#define PORT_AR933X     99
-
-/* Energy Micro efm32 SoC */
-#define PORT_EFMUART   100
-
-#ifdef __KERNEL__
 
 #include <linux/compiler.h>
 #include <linux/interrupt.h>
@@ -226,6 +30,7 @@
 #include <linux/mutex.h>
 #include <linux/sysrq.h>
 #include <linux/pps_kernel.h>
+#include <uapi/linux/serial_core.h>
 
 struct uart_port;
 struct serial_struct;
@@ -562,6 +367,4 @@ static inline int uart_handle_break(struct uart_port *port)
                                          (cflag) & CRTSCTS || \
                                          !((cflag) & CLOCAL))
 
-#endif
-
 #endif /* LINUX_SERIAL_CORE_H */
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 6d6cfd3e94a3..36aac733840a 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -1,6 +1,3 @@
-#ifndef _SERIO_H
-#define _SERIO_H
-
 /*
  * Copyright (C) 1999-2002 Vojtech Pavlik
 *
@@ -8,12 +5,9 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
+#ifndef _SERIO_H
+#define _SERIO_H
 
-#include <linux/ioctl.h>
-
-#define SPIOCSTYPE      _IOW('q', 0x01, unsigned long)
-
-#ifdef __KERNEL__
 
 #include <linux/types.h>
 #include <linux/interrupt.h>
@@ -22,6 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
+#include <uapi/linux/serio.h>
 
 struct serio {
         void *port_data;
@@ -152,68 +147,3 @@ static inline void serio_continue_rx(struct serio *serio)
 }
 
 #endif
-
-/*
- * bit masks for use in "interrupt" flags (3rd argument)
- */
-#define SERIO_TIMEOUT   1
-#define SERIO_PARITY    2
-#define SERIO_FRAME     4
-
-/*
- * Serio types
- */
-#define SERIO_XT        0x00
-#define SERIO_8042      0x01
-#define SERIO_RS232     0x02
-#define SERIO_HIL_MLC   0x03
-#define SERIO_PS_PSTHRU 0x05
-#define SERIO_8042_XL   0x06
-
-/*
- * Serio protocols
- */
-#define SERIO_UNKNOWN   0x00
-#define SERIO_MSC       0x01
-#define SERIO_SUN       0x02
-#define SERIO_MS        0x03
-#define SERIO_MP        0x04
-#define SERIO_MZ        0x05
-#define SERIO_MZP       0x06
-#define SERIO_MZPP      0x07
-#define SERIO_VSXXXAA   0x08
-#define SERIO_SUNKBD    0x10
-#define SERIO_WARRIOR   0x18
-#define SERIO_SPACEORB  0x19
-#define SERIO_MAGELLAN  0x1a
-#define SERIO_SPACEBALL 0x1b
-#define SERIO_GUNZE     0x1c
-#define SERIO_IFORCE    0x1d
-#define SERIO_STINGER   0x1e
-#define SERIO_NEWTON    0x1f
-#define SERIO_STOWAWAY  0x20
-#define SERIO_H3600     0x21
-#define SERIO_PS2SER    0x22
-#define SERIO_TWIDKBD   0x23
-#define SERIO_TWIDJOY   0x24
-#define SERIO_HIL       0x25
-#define SERIO_SNES232   0x26
-#define SERIO_SEMTECH   0x27
-#define SERIO_LKKBD     0x28
-#define SERIO_ELO       0x29
-#define SERIO_MICROTOUCH        0x30
-#define SERIO_PENMOUNT  0x31
-#define SERIO_TOUCHRIGHT        0x32
-#define SERIO_TOUCHWIN  0x33
-#define SERIO_TAOSEVM   0x34
-#define SERIO_FUJITSU   0x35
-#define SERIO_ZHENHUA   0x36
-#define SERIO_INEXIO    0x37
-#define SERIO_TOUCHIT213        0x38
-#define SERIO_W8001     0x39
-#define SERIO_DYNAPRO   0x3a
-#define SERIO_HAMPSHIRE 0x3b
-#define SERIO_PS2MULT   0x3c
-#define SERIO_TSC40     0x3d
-
-#endif
diff --git a/include/linux/shm.h b/include/linux/shm.h
index edd086883ccb..bcf8a6a3ec00 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -1,88 +1,11 @@
 #ifndef _LINUX_SHM_H_
 #define _LINUX_SHM_H_
 
-#include <linux/ipc.h>
-#include <linux/errno.h>
-#ifdef __KERNEL__
 #include <asm/page.h>
-#else
-#include <unistd.h>
-#endif
-
-/*
- * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can
- * be increased by sysctl
- */
+#include <uapi/linux/shm.h>
 
-#define SHMMAX 0x2000000                 /* max shared seg size (bytes) */
-#define SHMMIN 1                         /* min shared seg size (bytes) */
-#define SHMMNI 4096                      /* max num of segs system wide */
-#ifdef __KERNEL__
 #define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */
-#else
-#define SHMALL (SHMMAX/getpagesize()*(SHMMNI/16))
-#endif
-#define SHMSEG SHMMNI                    /* max shared segs per process */
-
-#ifdef __KERNEL__
 #include <asm/shmparam.h>
-#endif
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct shmid_ds {
-        struct ipc_perm         shm_perm;       /* operation perms */
-        int                     shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        __kernel_time_t         shm_ctime;      /* last change time */
-        __kernel_ipc_pid_t      shm_cpid;       /* pid of creator */
-        __kernel_ipc_pid_t      shm_lpid;       /* pid of last operator */
-        unsigned short          shm_nattch;     /* no. of current attaches */
-        unsigned short          shm_unused;     /* compatibility */
-        void                    *shm_unused2;   /* ditto - used by DIPC */
-        void                    *shm_unused3;   /* unused */
-};
-
-/* Include the definition of shmid64_ds and shminfo64 */
-#include <asm/shmbuf.h>
-
-/* permission flag for shmget */
-#define SHM_R           0400    /* or S_IRUGO from <linux/stat.h> */
-#define SHM_W           0200    /* or S_IWUGO from <linux/stat.h> */
-
-/* mode for attach */
-#define SHM_RDONLY      010000  /* read-only access */
-#define SHM_RND         020000  /* round attach address to SHMLBA boundary */
-#define SHM_REMAP       040000  /* take-over region on attach */
-#define SHM_EXEC        0100000 /* execution access */
-
-/* super user shmctl commands */
-#define SHM_LOCK        11
-#define SHM_UNLOCK      12
-
-/* ipcs ctl commands */
-#define SHM_STAT        13
-#define SHM_INFO        14
-
-/* Obsolete, used only for backwards compatibility */
-struct  shminfo {
-        int shmmax;
-        int shmmin;
-        int shmmni;
-        int shmseg;
-        int shmall;
-};
-
-struct shm_info {
-        int used_ids;
-        unsigned long shm_tot;  /* total allocated shm */
-        unsigned long shm_rss;  /* total resident shm */
-        unsigned long shm_swp;  /* total swapped shm */
-        unsigned long swap_attempts;
-        unsigned long swap_successes;
-};
-
-#ifdef __KERNEL__
 struct shmid_kernel /* private to the kernel */
 {       
         struct kern_ipc_perm    shm_perm;
@@ -127,6 +50,4 @@ static inline void exit_shm(struct task_struct *task)
 }
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SHM_H_ */
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 26b424adc842..e19a011b43b7 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -1,11 +1,8 @@
 #ifndef _LINUX_SIGNAL_H
 #define _LINUX_SIGNAL_H
 
-#include <asm/signal.h>
-#include <asm/siginfo.h>
-
-#ifdef __KERNEL__
 #include <linux/list.h>
+#include <uapi/linux/signal.h>
 
 struct task_struct;
 
@@ -388,6 +385,4 @@ int unhandled_signal(struct task_struct *tsk, int sig);
 
 void signals_init(void);
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SIGNAL_H */
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index 247399b2979a..eadbe227c256 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -4,51 +4,11 @@
  *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
  *
  */
-
 #ifndef _LINUX_SIGNALFD_H
 #define _LINUX_SIGNALFD_H
 
-#include <linux/types.h>
-/* For O_CLOEXEC and O_NONBLOCK */
-#include <linux/fcntl.h>
-
-/* Flags for signalfd4.  */
-#define SFD_CLOEXEC O_CLOEXEC
-#define SFD_NONBLOCK O_NONBLOCK
-
-struct signalfd_siginfo {
-        __u32 ssi_signo;
-        __s32 ssi_errno;
-        __s32 ssi_code;
-        __u32 ssi_pid;
-        __u32 ssi_uid;
-        __s32 ssi_fd;
-        __u32 ssi_tid;
-        __u32 ssi_band;
-        __u32 ssi_overrun;
-        __u32 ssi_trapno;
-        __s32 ssi_status;
-        __s32 ssi_int;
-        __u64 ssi_ptr;
-        __u64 ssi_utime;
-        __u64 ssi_stime;
-        __u64 ssi_addr;
-        __u16 ssi_addr_lsb;
+#include <uapi/linux/signalfd.h>
 
-        /*
-         * Pad strcture to 128 bytes. Remember to update the
-         * pad size when you add new members. We use a fixed
-         * size structure to avoid compatibility problems with
-         * future versions, and we leave extra space for additional
-         * members. We use fixed size members because this strcture
-         * comes out of a read(2) and we really don't want to have
-         * a compat on read(2).
-         */
-        __u8 __pad[46];
-};
-
-
-#ifdef __KERNEL__
 
 #ifdef CONFIG_SIGNALFD
 
@@ -71,6 +31,4 @@ static inline void signalfd_cleanup(struct sighand_struct *sighand) { }
 
 #endif /* CONFIG_SIGNALFD */
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SIGNALFD_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b33a3a1f205e..6a2c34e6d962 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -589,9 +589,6 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
         return __alloc_skb(size, priority, SKB_ALLOC_FCLONE, NUMA_NO_NODE);
 }
 
-extern void skb_recycle(struct sk_buff *skb);
-extern bool skb_recycle_check(struct sk_buff *skb, int skb_size);
-
 extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src);
 extern int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask);
 extern struct sk_buff *skb_clone(struct sk_buff *skb,
@@ -2645,27 +2642,6 @@ static inline void skb_checksum_none_assert(const struct sk_buff *skb)
 
 bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
 
-static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)
-{
-        if (irqs_disabled())
-                return false;
-
-        if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY)
-                return false;
-
-        if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE)
-                return false;
-
-        skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD);
-        if (skb_end_offset(skb) < skb_size)
-                return false;
-
-        if (skb_shared(skb) || skb_cloned(skb))
-                return false;
-
-        return true;
-}
-
 /**
  * skb_head_is_locked - Determine if the skb->head is locked down
  * @skb: skb to check
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 0dd2dfa7beca..83d1a1454b7e 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -321,7 +321,8 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
  * request comes from.
  */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
-        (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+        (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+        (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
 extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
 #define kmalloc_track_caller(size, flags) \
         __kmalloc_track_caller(size, flags, _RET_IP_)
@@ -340,7 +341,8 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
  * allocation request comes from.
  */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
-        (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+        (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+        (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
 extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
 #define kmalloc_node_track_caller(size, flags, node) \
         __kmalloc_node_track_caller(size, flags, node, \
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 0c634fa376c9..cc290f0bdb34 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -45,7 +45,6 @@ struct kmem_cache {
         unsigned int colour_off;        /* colour offset */
         struct kmem_cache *slabp_cache;
         unsigned int slab_size;
-        unsigned int dflags;            /* dynamic flags */
 
         /* constructor func */
         void (*ctor)(void *obj);
@@ -112,19 +111,13 @@ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
 #ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_trace(size_t size,
-                                    struct kmem_cache *cachep, gfp_t flags);
-extern size_t slab_buffer_size(struct kmem_cache *cachep);
+extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
 #else
 static __always_inline void *
-kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
+kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
 {
         return kmem_cache_alloc(cachep, flags);
 }
-static inline size_t slab_buffer_size(struct kmem_cache *cachep)
-{
-        return 0;
-}
 #endif
 
 static __always_inline void *kmalloc(size_t size, gfp_t flags)
@@ -154,7 +147,7 @@ found:
 #endif
                         cachep = malloc_sizes[i].cs_cachep;
 
-                ret = kmem_cache_alloc_trace(size, cachep, flags);
+                ret = kmem_cache_alloc_trace(cachep, flags, size);
 
                 return ret;
         }
@@ -166,16 +159,16 @@ extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
 #ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_node_trace(size_t size,
-                                         struct kmem_cache *cachep,
+extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
                                          gfp_t flags,
-                                         int nodeid);
+                                         int nodeid,
+                                         size_t size);
 #else
 static __always_inline void *
-kmem_cache_alloc_node_trace(size_t size,
-                            struct kmem_cache *cachep,
+kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
                             gfp_t flags,
-                            int nodeid)
+                            int nodeid,
+                            size_t size)
 {
         return kmem_cache_alloc_node(cachep, flags, nodeid);
 }
@@ -207,7 +200,7 @@ found:
 #endif
                         cachep = malloc_sizes[i].cs_cachep;
 
-                return kmem_cache_alloc_node_trace(size, cachep, flags, node);
+                return kmem_cache_alloc_node_trace(cachep, flags, node, size);
         }
         return __kmalloc_node(size, flags, node);
 }
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index 0ec00b39d006..f28e14a12e3f 100644
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -1,12 +1,14 @@
 #ifndef __LINUX_SLOB_DEF_H
 #define __LINUX_SLOB_DEF_H
 
+#include <linux/numa.h>
+
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
 static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
                                               gfp_t flags)
 {
-        return kmem_cache_alloc_node(cachep, flags, -1);
+        return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);
 }
 
 void *__kmalloc_node(size_t size, gfp_t flags, int node);
@@ -26,7 +28,7 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
  */
 static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
-        return __kmalloc_node(size, flags, -1);
+        return __kmalloc_node(size, flags, NUMA_NO_NODE);
 }
 
 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index e3e395acc2fd..e8d702e0fd89 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -1,29 +1,8 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
 
-#include <linux/types.h>
+#include <uapi/linux/sock_diag.h>
 
-#define SOCK_DIAG_BY_FAMILY 20
-
-struct sock_diag_req {
-        __u8    sdiag_family;
-        __u8    sdiag_protocol;
-};
-
-enum {
-        SK_MEMINFO_RMEM_ALLOC,
-        SK_MEMINFO_RCVBUF,
-        SK_MEMINFO_WMEM_ALLOC,
-        SK_MEMINFO_SNDBUF,
-        SK_MEMINFO_FWD_ALLOC,
-        SK_MEMINFO_WMEM_QUEUED,
-        SK_MEMINFO_OPTMEM,
-        SK_MEMINFO_BACKLOG,
-
-        SK_MEMINFO_VARS,
-};
-
-#ifdef __KERNEL__
 struct sk_buff;
 struct nlmsghdr;
 struct sock;
@@ -44,5 +23,4 @@ void sock_diag_save_cookie(void *sk, __u32 *cookie);
 
 int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);
 
-#endif /* KERNEL */
 #endif
diff --git a/include/linux/socket.h b/include/linux/socket.h
index ba7b2e817cfa..9a546ff853dc 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -1,30 +1,13 @@
 #ifndef _LINUX_SOCKET_H
 #define _LINUX_SOCKET_H
 
-/*
- * Desired design of maximum size and alignment (see RFC2553)
- */
-#define _K_SS_MAXSIZE   128     /* Implementation specific max size */
-#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
-                                /* Implementation specific desired alignment */
-
-typedef unsigned short __kernel_sa_family_t;
-
-struct __kernel_sockaddr_storage {
-        __kernel_sa_family_t    ss_family;              /* address family */
-        /* Following field(s) are implementation specific */
-        char            __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
-                                /* space to achieve desired size, */
-                                /* _SS_MAXSIZE value minus size of ss_family */
-} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));   /* force desired alignment */
-
-#ifdef __KERNEL__
 
 #include <asm/socket.h>                 /* arch-dependent defines       */
 #include <linux/sockios.h>              /* the SIOCxxx I/O controls     */
 #include <linux/uio.h>                  /* iovec support                */
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
+#include <uapi/linux/socket.h>
 
 struct pid;
 struct cred;
@@ -340,5 +323,4 @@ extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen
                           unsigned int flags, struct timespec *timeout);
 extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg,
                           unsigned int vlen, unsigned int flags);
-#endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */
diff --git a/include/linux/sonet.h b/include/linux/sonet.h
index de8832dd272b..680f9a31df25 100644
--- a/include/linux/sonet.h
+++ b/include/linux/sonet.h
@@ -1,64 +1,10 @@
 /* sonet.h - SONET/SHD physical layer control */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
 #ifndef LINUX_SONET_H
 #define LINUX_SONET_H
 
-#define __SONET_ITEMS \
-    __HANDLE_ITEM(section_bip);         /* section parity errors (B1) */ \
-    __HANDLE_ITEM(line_bip);            /* line parity errors (B2) */ \
-    __HANDLE_ITEM(path_bip);            /* path parity errors (B3) */ \
-    __HANDLE_ITEM(line_febe);           /* line parity errors at remote */ \
-    __HANDLE_ITEM(path_febe);           /* path parity errors at remote */ \
-    __HANDLE_ITEM(corr_hcs);            /* correctable header errors */ \
-    __HANDLE_ITEM(uncorr_hcs);          /* uncorrectable header errors */ \
-    __HANDLE_ITEM(tx_cells);            /* cells sent */ \
-    __HANDLE_ITEM(rx_cells);            /* cells received */
-
-struct sonet_stats {
-#define __HANDLE_ITEM(i) int i
-        __SONET_ITEMS
-#undef __HANDLE_ITEM
-} __attribute__ ((packed));
-
-
-#define SONET_GETSTAT   _IOR('a',ATMIOC_PHYTYP,struct sonet_stats)
-                                        /* get statistics */
-#define SONET_GETSTATZ  _IOR('a',ATMIOC_PHYTYP+1,struct sonet_stats)
-                                        /* ... and zero counters */
-#define SONET_SETDIAG   _IOWR('a',ATMIOC_PHYTYP+2,int)
-                                        /* set error insertion */
-#define SONET_CLRDIAG   _IOWR('a',ATMIOC_PHYTYP+3,int)
-                                        /* clear error insertion */
-#define SONET_GETDIAG   _IOR('a',ATMIOC_PHYTYP+4,int)
-                                        /* query error insertion */
-#define SONET_SETFRAMING _IOW('a',ATMIOC_PHYTYP+5,int)
-                                        /* set framing mode (SONET/SDH) */
-#define SONET_GETFRAMING _IOR('a',ATMIOC_PHYTYP+6,int)
-                                        /* get framing mode */
-#define SONET_GETFRSENSE _IOR('a',ATMIOC_PHYTYP+7, \
-  unsigned char[SONET_FRSENSE_SIZE])    /* get framing sense information */
-
-#define SONET_INS_SBIP    1             /* section BIP */
-#define SONET_INS_LBIP    2             /* line BIP */
-#define SONET_INS_PBIP    4             /* path BIP */
-#define SONET_INS_FRAME   8             /* out of frame */
-#define SONET_INS_LOS    16             /* set line to zero */
-#define SONET_INS_LAIS   32             /* line alarm indication signal */
-#define SONET_INS_PAIS   64             /* path alarm indication signal */
-#define SONET_INS_HCS   128             /* insert HCS error */
-
-#define SONET_FRAME_SONET 0             /* SONET STS-3 framing */
-#define SONET_FRAME_SDH   1             /* SDH STM-1 framing */
-
-#define SONET_FRSENSE_SIZE 6            /* C1[3],H1[3] (0xff for unknown) */
-
-
-#ifdef __KERNEL__
 
 #include <linux/atomic.h>
+#include <uapi/linux/sonet.h>
 
 struct k_sonet_stats {
 #define __HANDLE_ITEM(i) atomic_t i
@@ -71,5 +17,3 @@ extern void sonet_subtract_stats(struct k_sonet_stats *from,
     struct sonet_stats *to);
 
 #endif
-
-#endif
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index c0f87da78f8a..0b7cc265cc0b 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -32,117 +32,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
 #ifndef _SONYPI_H_
 #define _SONYPI_H_
 
-#include <linux/types.h>
-
-/* events the user application reading /dev/sonypi can use */
-
-#define SONYPI_EVENT_IGNORE                      0
-#define SONYPI_EVENT_JOGDIAL_DOWN                1
-#define SONYPI_EVENT_JOGDIAL_UP                  2
-#define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED        3
-#define SONYPI_EVENT_JOGDIAL_UP_PRESSED          4
-#define SONYPI_EVENT_JOGDIAL_PRESSED             5
-#define SONYPI_EVENT_JOGDIAL_RELEASED            6      /* obsolete */
-#define SONYPI_EVENT_CAPTURE_PRESSED             7
-#define SONYPI_EVENT_CAPTURE_RELEASED            8      /* obsolete */
-#define SONYPI_EVENT_CAPTURE_PARTIALPRESSED      9
-#define SONYPI_EVENT_CAPTURE_PARTIALRELEASED    10
-#define SONYPI_EVENT_FNKEY_ESC                  11
-#define SONYPI_EVENT_FNKEY_F1                   12
-#define SONYPI_EVENT_FNKEY_F2                   13
-#define SONYPI_EVENT_FNKEY_F3                   14
-#define SONYPI_EVENT_FNKEY_F4                   15
-#define SONYPI_EVENT_FNKEY_F5                   16
-#define SONYPI_EVENT_FNKEY_F6                   17
-#define SONYPI_EVENT_FNKEY_F7                   18
-#define SONYPI_EVENT_FNKEY_F8                   19
-#define SONYPI_EVENT_FNKEY_F9                   20
-#define SONYPI_EVENT_FNKEY_F10                  21
-#define SONYPI_EVENT_FNKEY_F11                  22
-#define SONYPI_EVENT_FNKEY_F12                  23
-#define SONYPI_EVENT_FNKEY_1                    24
-#define SONYPI_EVENT_FNKEY_2                    25
-#define SONYPI_EVENT_FNKEY_D                    26
-#define SONYPI_EVENT_FNKEY_E                    27
-#define SONYPI_EVENT_FNKEY_F                    28
-#define SONYPI_EVENT_FNKEY_S                    29
-#define SONYPI_EVENT_FNKEY_B                    30
-#define SONYPI_EVENT_BLUETOOTH_PRESSED          31
-#define SONYPI_EVENT_PKEY_P1                    32
-#define SONYPI_EVENT_PKEY_P2                    33
-#define SONYPI_EVENT_PKEY_P3                    34
-#define SONYPI_EVENT_BACK_PRESSED               35
-#define SONYPI_EVENT_LID_CLOSED                 36
-#define SONYPI_EVENT_LID_OPENED                 37
-#define SONYPI_EVENT_BLUETOOTH_ON               38
-#define SONYPI_EVENT_BLUETOOTH_OFF              39
-#define SONYPI_EVENT_HELP_PRESSED               40
-#define SONYPI_EVENT_FNKEY_ONLY                 41
-#define SONYPI_EVENT_JOGDIAL_FAST_DOWN          42
-#define SONYPI_EVENT_JOGDIAL_FAST_UP            43
-#define SONYPI_EVENT_JOGDIAL_FAST_DOWN_PRESSED  44
-#define SONYPI_EVENT_JOGDIAL_FAST_UP_PRESSED    45
-#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN         46
-#define SONYPI_EVENT_JOGDIAL_VFAST_UP           47
-#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN_PRESSED 48
-#define SONYPI_EVENT_JOGDIAL_VFAST_UP_PRESSED   49
-#define SONYPI_EVENT_ZOOM_PRESSED               50
-#define SONYPI_EVENT_THUMBPHRASE_PRESSED        51
-#define SONYPI_EVENT_MEYE_FACE                  52
-#define SONYPI_EVENT_MEYE_OPPOSITE              53
-#define SONYPI_EVENT_MEMORYSTICK_INSERT         54
-#define SONYPI_EVENT_MEMORYSTICK_EJECT          55
-#define SONYPI_EVENT_ANYBUTTON_RELEASED         56
-#define SONYPI_EVENT_BATTERY_INSERT             57
-#define SONYPI_EVENT_BATTERY_REMOVE             58
-#define SONYPI_EVENT_FNKEY_RELEASED             59
-#define SONYPI_EVENT_WIRELESS_ON                60
-#define SONYPI_EVENT_WIRELESS_OFF               61
-#define SONYPI_EVENT_ZOOM_IN_PRESSED            62
-#define SONYPI_EVENT_ZOOM_OUT_PRESSED           63
-#define SONYPI_EVENT_CD_EJECT_PRESSED           64
-#define SONYPI_EVENT_MODEKEY_PRESSED            65
-#define SONYPI_EVENT_PKEY_P4                    66
-#define SONYPI_EVENT_PKEY_P5                    67
-#define SONYPI_EVENT_SETTINGKEY_PRESSED         68
-#define SONYPI_EVENT_VOLUME_INC_PRESSED         69
-#define SONYPI_EVENT_VOLUME_DEC_PRESSED         70
-#define SONYPI_EVENT_BRIGHTNESS_PRESSED         71
-#define SONYPI_EVENT_MEDIA_PRESSED              72
-#define SONYPI_EVENT_VENDOR_PRESSED             73
-
-/* get/set brightness */
-#define SONYPI_IOCGBRT          _IOR('v', 0, __u8)
-#define SONYPI_IOCSBRT          _IOW('v', 0, __u8)
-
-/* get battery full capacity/remaining capacity */
-#define SONYPI_IOCGBAT1CAP      _IOR('v', 2, __u16)
-#define SONYPI_IOCGBAT1REM      _IOR('v', 3, __u16)
-#define SONYPI_IOCGBAT2CAP      _IOR('v', 4, __u16)
-#define SONYPI_IOCGBAT2REM      _IOR('v', 5, __u16)
+#include <uapi/linux/sonypi.h>
 
-/* get battery flags: battery1/battery2/ac adapter present */
-#define SONYPI_BFLAGS_B1        0x01
-#define SONYPI_BFLAGS_B2        0x02
-#define SONYPI_BFLAGS_AC        0x04
-#define SONYPI_IOCGBATFLAGS     _IOR('v', 7, __u8)
-
-/* get/set bluetooth subsystem state on/off */
-#define SONYPI_IOCGBLUE         _IOR('v', 8, __u8)
-#define SONYPI_IOCSBLUE         _IOW('v', 9, __u8)
-
-/* get/set fan state on/off */
-#define SONYPI_IOCGFAN          _IOR('v', 10, __u8)
-#define SONYPI_IOCSFAN          _IOW('v', 11, __u8)
-
-/* get temperature (C) */
-#define SONYPI_IOCGTEMP         _IOR('v', 12, __u8)
-
-#ifdef __KERNEL__
 
 /* used only for communication between v4l and sonypi */
 
@@ -166,6 +60,4 @@
 #define SONYPI_COMMAND_GETCAMERAROMVERSION      18      /* obsolete */
 #define SONYPI_COMMAND_GETCAMERAREVISION        19      /* obsolete */
 
-#endif                          /* __KERNEL__ */
-
 #endif                          /* _SONYPI_H_ */
diff --git a/include/linux/sound.h b/include/linux/sound.h
index fae20ba01fbf..73ded040f1d7 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -1,33 +1,8 @@
 #ifndef _LINUX_SOUND_H
 #define _LINUX_SOUND_H
 
-/*
- * Minor numbers for the sound driver.
- */
-
-#include <linux/fs.h>
+#include <uapi/linux/sound.h>
 
-#define SND_DEV_CTL             0       /* Control port /dev/mixer */
-#define SND_DEV_SEQ             1       /* Sequencer output /dev/sequencer (FM
-                                                synthesizer and MIDI output) */
-#define SND_DEV_MIDIN           2       /* Raw midi access */
-#define SND_DEV_DSP             3       /* Digitized voice /dev/dsp */
-#define SND_DEV_AUDIO           4       /* Sparc compatible /dev/audio */
-#define SND_DEV_DSP16           5       /* Like /dev/dsp but 16 bits/sample */
-/* #define SND_DEV_STATUS       6 */    /* /dev/sndstat (obsolete) */
-#define SND_DEV_UNUSED          6
-#define SND_DEV_AWFM            7       /* Reserved */
-#define SND_DEV_SEQ2            8       /* /dev/sequencer, level 2 interface */
-/* #define SND_DEV_SNDPROC      9 */    /* /dev/sndproc for programmable devices (not used) */
-/* #define SND_DEV_DMMIDI       9 */
-#define SND_DEV_SYNTH           9       /* Raw synth access /dev/synth (same as /dev/dmfm) */
-#define SND_DEV_DMFM            10      /* Raw synth access /dev/dmfm */
-#define SND_DEV_UNKNOWN11       11
-#define SND_DEV_ADSP            12      /* Like /dev/dsp (obsolete) */
-#define SND_DEV_AMIDI           13      /* Like /dev/midi (obsolete) */
-#define SND_DEV_ADMMIDI         14      /* Like /dev/dmmidi (onsolete) */
-
-#ifdef __KERNEL__
 /*
  *      Sound core interface functions
  */
@@ -43,6 +18,4 @@ extern void unregister_sound_special(int unit);
 extern void unregister_sound_mixer(int unit);
 extern void unregister_sound_midi(int unit);
 extern void unregister_sound_dsp(int unit);
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SOUND_H */
diff --git a/include/linux/soundcard.h b/include/linux/soundcard.h
index dfcf86f013a9..96c79cbd79ef 100644
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
@@ -1,5 +1,3 @@
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
 /*
  * Copyright by Hannu Savolainen 1993-1997
  *
@@ -23,174 +21,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#ifndef SOUNDCARD_H
+#define SOUNDCARD_H
 
-
-/*
- * OSS interface version. With versions earlier than 3.6 this value is
- * an integer with value less than 361. In versions 3.6 and later
- * it's a six digit hexadecimal value. For example value
- * of 0x030600 represents OSS version 3.6.0.
- * Use ioctl(fd, OSS_GETVERSION, &int) to get the version number of
- * the currently active driver.
- */
-#define SOUND_VERSION   0x030802
-#define OPEN_SOUND_SYSTEM
-
-/* In Linux we need to be prepared for cross compiling */
-#include <linux/ioctl.h>
-
-/* Endian macros. */
-#ifdef __KERNEL__
 #  include <asm/byteorder.h>
-#else
-#  include <endian.h>
-#endif
-
-/*
- *      Supported card ID numbers (Should be somewhere else?)
- */
-
-#define SNDCARD_ADLIB           1
-#define SNDCARD_SB              2
-#define SNDCARD_PAS             3
-#define SNDCARD_GUS             4
-#define SNDCARD_MPU401          5
-#define SNDCARD_SB16            6
-#define SNDCARD_SB16MIDI        7
-#define SNDCARD_UART6850        8
-#define SNDCARD_GUS16           9
-#define SNDCARD_MSS             10
-#define SNDCARD_PSS             11
-#define SNDCARD_SSCAPE          12
-#define SNDCARD_PSS_MPU         13
-#define SNDCARD_PSS_MSS         14
-#define SNDCARD_SSCAPE_MSS      15
-#define SNDCARD_TRXPRO          16
-#define SNDCARD_TRXPRO_SB       17
-#define SNDCARD_TRXPRO_MPU      18
-#define SNDCARD_MAD16           19
-#define SNDCARD_MAD16_MPU       20
-#define SNDCARD_CS4232          21
-#define SNDCARD_CS4232_MPU      22
-#define SNDCARD_MAUI            23
-#define SNDCARD_PSEUDO_MSS      24
-#define SNDCARD_GUSPNP          25
-#define SNDCARD_UART401         26
-/* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
-
-/***********************************
- * IOCTL Commands for /dev/sequencer
- */
-
-#ifndef _SIOWR
-#if defined(_IOWR) && (defined(_AIX) || (!defined(sun) && !defined(sparc) && !defined(__sparc__) && !defined(__INCioctlh) && !defined(__Lynx__)))
-/* Use already defined ioctl defines if they exist (except with Sun or Sparc) */
-#define SIOCPARM_MASK   IOCPARM_MASK
-#define SIOC_VOID       IOC_VOID
-#define SIOC_OUT        IOC_OUT
-#define SIOC_IN         IOC_IN
-#define SIOC_INOUT      IOC_INOUT
-#define _SIOC_SIZE      _IOC_SIZE
-#define _SIOC_DIR       _IOC_DIR
-#define _SIOC_NONE      _IOC_NONE
-#define _SIOC_READ      _IOC_READ
-#define _SIOC_WRITE     _IOC_WRITE
-#define _SIO            _IO
-#define _SIOR           _IOR
-#define _SIOW           _IOW
-#define _SIOWR          _IOWR
-#else
+#include <uapi/linux/soundcard.h>
 
-/* Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 8191 bytes.
- */
-/* #define      SIOCTYPE                (0xff<<8) */
-#define SIOCPARM_MASK   0x1fff          /* parameters must be < 8192 bytes */
-#define SIOC_VOID       0x00000000      /* no parameters */
-#define SIOC_OUT        0x20000000      /* copy out parameters */
-#define SIOC_IN         0x40000000      /* copy in parameters */
-#define SIOC_INOUT      (SIOC_IN|SIOC_OUT)
-/* the 0x20000000 is so we can distinguish new ioctl's from old */
-#define _SIO(x,y)       ((int)(SIOC_VOID|(x<<8)|y))
-#define _SIOR(x,y,t)    ((int)(SIOC_OUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define _SIOW(x,y,t)    ((int)(SIOC_IN|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-/* this should be _SIORW, but stdio got there first */
-#define _SIOWR(x,y,t)   ((int)(SIOC_INOUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define _SIOC_SIZE(x)   ((x>>16)&SIOCPARM_MASK) 
-#define _SIOC_DIR(x)    (x & 0xf0000000)
-#define _SIOC_NONE      SIOC_VOID
-#define _SIOC_READ      SIOC_OUT
-#define _SIOC_WRITE     SIOC_IN
-#  endif /* _IOWR */
-#endif  /* !_SIOWR */
-
-#define SNDCTL_SEQ_RESET                _SIO  ('Q', 0)
-#define SNDCTL_SEQ_SYNC                 _SIO  ('Q', 1)
-#define SNDCTL_SYNTH_INFO               _SIOWR('Q', 2, struct synth_info)
-#define SNDCTL_SEQ_CTRLRATE             _SIOWR('Q', 3, int)     /* Set/get timer resolution (HZ) */
-#define SNDCTL_SEQ_GETOUTCOUNT          _SIOR ('Q', 4, int)
-#define SNDCTL_SEQ_GETINCOUNT           _SIOR ('Q', 5, int)
-#define SNDCTL_SEQ_PERCMODE             _SIOW ('Q', 6, int)
-#define SNDCTL_FM_LOAD_INSTR            _SIOW ('Q', 7, struct sbi_instrument)   /* Obsolete. Don't use!!!!!! */
-#define SNDCTL_SEQ_TESTMIDI             _SIOW ('Q', 8, int)
-#define SNDCTL_SEQ_RESETSAMPLES         _SIOW ('Q', 9, int)
-#define SNDCTL_SEQ_NRSYNTHS             _SIOR ('Q',10, int)
-#define SNDCTL_SEQ_NRMIDIS              _SIOR ('Q',11, int)
-#define SNDCTL_MIDI_INFO                _SIOWR('Q',12, struct midi_info)
-#define SNDCTL_SEQ_THRESHOLD            _SIOW ('Q',13, int)
-#define SNDCTL_SYNTH_MEMAVL             _SIOWR('Q',14, int)     /* in=dev#, out=memsize */
-#define SNDCTL_FM_4OP_ENABLE            _SIOW ('Q',15, int)     /* in=dev# */
-#define SNDCTL_SEQ_PANIC                _SIO  ('Q',17)
-#define SNDCTL_SEQ_OUTOFBAND            _SIOW ('Q',18, struct seq_event_rec)
-#define SNDCTL_SEQ_GETTIME              _SIOR ('Q',19, int)
-#define SNDCTL_SYNTH_ID                 _SIOWR('Q',20, struct synth_info)
-#define SNDCTL_SYNTH_CONTROL            _SIOWR('Q',21, struct synth_control)
-#define SNDCTL_SYNTH_REMOVESAMPLE       _SIOWR('Q',22, struct remove_sample)
-
-typedef struct synth_control
-{
-        int devno;      /* Synthesizer # */
-        char data[4000]; /* Device spesific command/data record */
-}synth_control;
-
-typedef struct remove_sample
-{
-        int devno;      /* Synthesizer # */
-        int bankno;     /* MIDI bank # (0=General MIDI) */
-        int instrno;    /* MIDI instrument number */
-} remove_sample;
-
-typedef struct seq_event_rec {
-                unsigned char arr[8];
-} seq_event_rec;
-
-#define SNDCTL_TMR_TIMEBASE             _SIOWR('T', 1, int)
-#define SNDCTL_TMR_START                _SIO  ('T', 2)
-#define SNDCTL_TMR_STOP                 _SIO  ('T', 3)
-#define SNDCTL_TMR_CONTINUE             _SIO  ('T', 4)
-#define SNDCTL_TMR_TEMPO                _SIOWR('T', 5, int)
-#define SNDCTL_TMR_SOURCE               _SIOWR('T', 6, int)
-#       define TMR_INTERNAL             0x00000001
-#       define TMR_EXTERNAL             0x00000002
-#               define TMR_MODE_MIDI    0x00000010
-#               define TMR_MODE_FSK     0x00000020
-#               define TMR_MODE_CLS     0x00000040
-#               define TMR_MODE_SMPTE   0x00000080
-#define SNDCTL_TMR_METRONOME            _SIOW ('T', 7, int)
-#define SNDCTL_TMR_SELECT               _SIOW ('T', 8, int)
-
-/*
- * Some big endian/little endian handling macros
- */
-
-#define _LINUX_PATCHKEY_H_INDIRECT
-#include <linux/patchkey.h>
-#undef _LINUX_PATCHKEY_H_INDIRECT
-
-#if defined(__KERNEL__)
 #  if defined(__BIG_ENDIAN)
 #    define AFMT_S16_NE AFMT_S16_BE
 #  elif defined(__LITTLE_ENDIAN)
@@ -198,1095 +34,4 @@ typedef struct seq_event_rec {
 #  else
 #    error "could not determine byte order"
 #  endif
-#else
-# if defined(__BYTE_ORDER)
-#  if __BYTE_ORDER == __BIG_ENDIAN
-#    define AFMT_S16_NE AFMT_S16_BE
-#  elif __BYTE_ORDER == __LITTLE_ENDIAN
-#    define AFMT_S16_NE AFMT_S16_LE
-#  else
-#    error "could not determine byte order"
-#  endif
-# endif
-#endif
-
-/*
- *      Sample loading mechanism for internal synthesizers (/dev/sequencer)
- *      The following patch_info structure has been designed to support
- *      Gravis UltraSound. It tries to be universal format for uploading
- *      sample based patches but is probably too limited.
- *
- *      (PBD) As Hannu guessed, the GUS structure is too limited for 
- *      the WaveFront, but this is the right place for a constant definition.
- */
-
-struct patch_info {
-                unsigned short key;             /* Use WAVE_PATCH here */
-#define WAVE_PATCH         _PATCHKEY(0x04)
-#define GUS_PATCH          WAVE_PATCH
-#define WAVEFRONT_PATCH    _PATCHKEY(0x06)
-
-                short device_no;        /* Synthesizer number */
-                short instr_no;         /* Midi pgm# */
-
-                unsigned int mode;
-/*
- * The least significant byte has the same format than the GUS .PAT
- * files
- */
-#define WAVE_16_BITS    0x01    /* bit 0 = 8 or 16 bit wave data. */
-#define WAVE_UNSIGNED   0x02    /* bit 1 = Signed - Unsigned data. */
-#define WAVE_LOOPING    0x04    /* bit 2 = looping enabled-1. */
-#define WAVE_BIDIR_LOOP 0x08    /* bit 3 = Set is bidirectional looping. */
-#define WAVE_LOOP_BACK  0x10    /* bit 4 = Set is looping backward. */
-#define WAVE_SUSTAIN_ON 0x20    /* bit 5 = Turn sustaining on. (Env. pts. 3)*/
-#define WAVE_ENVELOPES  0x40    /* bit 6 = Enable envelopes - 1 */
-#define WAVE_FAST_RELEASE 0x80  /* bit 7 = Shut off immediately after note off */
-                                /*      (use the env_rate/env_offs fields). */
-/* Linux specific bits */
-#define WAVE_VIBRATO    0x00010000      /* The vibrato info is valid */
-#define WAVE_TREMOLO    0x00020000      /* The tremolo info is valid */
-#define WAVE_SCALE      0x00040000      /* The scaling info is valid */
-#define WAVE_FRACTIONS  0x00080000      /* Fraction information is valid */
-/* Reserved bits */
-#define WAVE_ROM        0x40000000      /* For future use */
-#define WAVE_MULAW      0x20000000      /* For future use */
-/* Other bits must be zeroed */
-
-                int len;        /* Size of the wave data in bytes */
-                int loop_start, loop_end; /* Byte offsets from the beginning */
-
-/* 
- * The base_freq and base_note fields are used when computing the
- * playback speed for a note. The base_note defines the tone frequency
- * which is heard if the sample is played using the base_freq as the
- * playback speed.
- *
- * The low_note and high_note fields define the minimum and maximum note
- * frequencies for which this sample is valid. It is possible to define
- * more than one samples for an instrument number at the same time. The
- * low_note and high_note fields are used to select the most suitable one.
- *
- * The fields base_note, high_note and low_note should contain
- * the note frequency multiplied by 1000. For example value for the
- * middle A is 440*1000.
- */
-
-                unsigned int base_freq;
-                unsigned int base_note;
-                unsigned int high_note;
-                unsigned int low_note;
-                int panning;    /* -128=left, 127=right */
-                int detuning;
-
-/*      New fields introduced in version 1.99.5 */
-
-       /* Envelope. Enabled by mode bit WAVE_ENVELOPES  */
-                unsigned char   env_rate[ 6 ];   /* GUS HW ramping rate */
-                unsigned char   env_offset[ 6 ]; /* 255 == 100% */
-
-        /* 
-         * The tremolo, vibrato and scale info are not supported yet.
-         * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
-         * WAVE_SCALE
-         */
-
-                unsigned char   tremolo_sweep;
-                unsigned char   tremolo_rate;
-                unsigned char   tremolo_depth;
-        
-                unsigned char   vibrato_sweep;
-                unsigned char   vibrato_rate;
-                unsigned char   vibrato_depth;
-
-                int             scale_frequency;
-                unsigned int    scale_factor;           /* from 0 to 2048 or 0 to 2 */
-        
-                int             volume;
-                int             fractions;
-                int             reserved1;
-                int             spare[2];
-                char data[1];   /* The waveform data starts here */
-        };
-
-struct sysex_info {
-                short key;              /* Use SYSEX_PATCH or MAUI_PATCH here */
-#define SYSEX_PATCH     _PATCHKEY(0x05)
-#define MAUI_PATCH      _PATCHKEY(0x06)
-                short device_no;        /* Synthesizer number */
-                int len;        /* Size of the sysex data in bytes */
-                unsigned char data[1];  /* Sysex data starts here */
-        };
-
-/*
- * /dev/sequencer input events.
- *
- * The data written to the /dev/sequencer is a stream of events. Events
- * are records of 4 or 8 bytes. The first byte defines the size. 
- * Any number of events can be written with a write call. There
- * is a set of macros for sending these events. Use these macros if you
- * want to maximize portability of your program.
- *
- * Events SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO. Are also input events.
- * (All input events are currently 4 bytes long. Be prepared to support
- * 8 byte events also. If you receive any event having first byte >= 128,
- * it's a 8 byte event.
- *
- * The events are documented at the end of this file.
- *
- * Normal events (4 bytes)
- * There is also a 8 byte version of most of the 4 byte events. The
- * 8 byte one is recommended.
- */
-#define SEQ_NOTEOFF             0
-#define SEQ_FMNOTEOFF           SEQ_NOTEOFF     /* Just old name */
-#define SEQ_NOTEON              1
-#define SEQ_FMNOTEON            SEQ_NOTEON
-#define SEQ_WAIT                TMR_WAIT_ABS
-#define SEQ_PGMCHANGE           3
-#define SEQ_FMPGMCHANGE         SEQ_PGMCHANGE
-#define SEQ_SYNCTIMER           TMR_START
-#define SEQ_MIDIPUTC            5
-#define SEQ_DRUMON              6       /*** OBSOLETE ***/
-#define SEQ_DRUMOFF             7       /*** OBSOLETE ***/
-#define SEQ_ECHO                TMR_ECHO        /* For synching programs with output */
-#define SEQ_AFTERTOUCH          9
-#define SEQ_CONTROLLER          10
-
-/*******************************************
- *      Midi controller numbers
- *******************************************
- * Controllers 0 to 31 (0x00 to 0x1f) and
- * 32 to 63 (0x20 to 0x3f) are continuous
- * controllers.
- * In the MIDI 1.0 these controllers are sent using
- * two messages. Controller numbers 0 to 31 are used
- * to send the MSB and the controller numbers 32 to 63
- * are for the LSB. Note that just 7 bits are used in MIDI bytes.
- */
-
-#define    CTL_BANK_SELECT              0x00
-#define    CTL_MODWHEEL                 0x01
-#define    CTL_BREATH                   0x02
-/*              undefined               0x03 */
-#define    CTL_FOOT                     0x04
-#define    CTL_PORTAMENTO_TIME          0x05
-#define    CTL_DATA_ENTRY               0x06
-#define    CTL_MAIN_VOLUME              0x07
-#define    CTL_BALANCE                  0x08
-/*              undefined               0x09 */
-#define    CTL_PAN                      0x0a
-#define    CTL_EXPRESSION               0x0b
-/*              undefined               0x0c */
-/*              undefined               0x0d */
-/*              undefined               0x0e */
-/*              undefined               0x0f */
-#define    CTL_GENERAL_PURPOSE1 0x10
-#define    CTL_GENERAL_PURPOSE2 0x11
-#define    CTL_GENERAL_PURPOSE3 0x12
-#define    CTL_GENERAL_PURPOSE4 0x13
-/*              undefined               0x14 - 0x1f */
-
-/*              undefined               0x20 */
-/* The controller numbers 0x21 to 0x3f are reserved for the */
-/* least significant bytes of the controllers 0x00 to 0x1f. */
-/* These controllers are not recognised by the driver. */
-
-/* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
-/* 0=OFF and 127=ON (intermediate values are possible) */
-#define    CTL_DAMPER_PEDAL             0x40
-#define    CTL_SUSTAIN                  0x40    /* Alias */
-#define    CTL_HOLD                     0x40    /* Alias */
-#define    CTL_PORTAMENTO               0x41
-#define    CTL_SOSTENUTO                0x42
-#define    CTL_SOFT_PEDAL               0x43
-/*              undefined               0x44 */
-#define    CTL_HOLD2                    0x45
-/*              undefined               0x46 - 0x4f */
-
-#define    CTL_GENERAL_PURPOSE5 0x50
-#define    CTL_GENERAL_PURPOSE6 0x51
-#define    CTL_GENERAL_PURPOSE7 0x52
-#define    CTL_GENERAL_PURPOSE8 0x53
-/*              undefined               0x54 - 0x5a */
-#define    CTL_EXT_EFF_DEPTH            0x5b
-#define    CTL_TREMOLO_DEPTH            0x5c
-#define    CTL_CHORUS_DEPTH             0x5d
-#define    CTL_DETUNE_DEPTH             0x5e
-#define    CTL_CELESTE_DEPTH            0x5e    /* Alias for the above one */
-#define    CTL_PHASER_DEPTH             0x5f
-#define    CTL_DATA_INCREMENT           0x60
-#define    CTL_DATA_DECREMENT           0x61
-#define    CTL_NONREG_PARM_NUM_LSB      0x62
-#define    CTL_NONREG_PARM_NUM_MSB      0x63
-#define    CTL_REGIST_PARM_NUM_LSB      0x64
-#define    CTL_REGIST_PARM_NUM_MSB      0x65
-/*              undefined               0x66 - 0x78 */
-/*              reserved                0x79 - 0x7f */
-
-/* Pseudo controllers (not midi compatible) */
-#define    CTRL_PITCH_BENDER            255
-#define    CTRL_PITCH_BENDER_RANGE      254
-#define    CTRL_EXPRESSION              253     /* Obsolete */
-#define    CTRL_MAIN_VOLUME             252     /* Obsolete */
-#define SEQ_BALANCE             11
-#define SEQ_VOLMODE             12
-
-/*
- * Volume mode decides how volumes are used
- */
-
-#define VOL_METHOD_ADAGIO       1
-#define VOL_METHOD_LINEAR       2
-
-/*
- * Note! SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO are used also as
- *       input events.
- */
-
-/*
- * Event codes 0xf0 to 0xfc are reserved for future extensions.
- */
-
-#define SEQ_FULLSIZE            0xfd    /* Long events */
-/*
- *      SEQ_FULLSIZE events are used for loading patches/samples to the
- *      synthesizer devices. These events are passed directly to the driver
- *      of the associated synthesizer device. There is no limit to the size
- *      of the extended events. These events are not queued but executed
- *      immediately when the write() is called (execution can take several
- *      seconds of time). 
- *
- *      When a SEQ_FULLSIZE message is written to the device, it must
- *      be written using exactly one write() call. Other events cannot
- *      be mixed to the same write.
- *      
- *      For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the 
- *      /dev/sequencer. Don't write other data together with the instrument structure
- *      Set the key field of the structure to FM_PATCH. The device field is used to
- *      route the patch to the corresponding device.
- *
- *      For wave table use struct patch_info. Initialize the key field
- *      to WAVE_PATCH.
- */
-#define SEQ_PRIVATE             0xfe    /* Low level HW dependent events (8 bytes) */
-#define SEQ_EXTENDED            0xff    /* Extended events (8 bytes) OBSOLETE */
-
-/*
- * Record for FM patches
- */
-
-typedef unsigned char sbi_instr_data[32];
-
-struct sbi_instrument {
-                unsigned short  key;    /* FM_PATCH or OPL3_PATCH */
-#define FM_PATCH        _PATCHKEY(0x01)
-#define OPL3_PATCH      _PATCHKEY(0x03)
-                short           device;         /*      Synth# (0-4)    */
-                int             channel;        /*      Program# to be initialized      */
-                sbi_instr_data  operators;      /*      Register settings for operator cells (.SBI format)      */
-        };
-
-struct synth_info {     /* Read only */
-                char    name[30];
-                int     device;         /* 0-N. INITIALIZE BEFORE CALLING */
-                int     synth_type;
-#define SYNTH_TYPE_FM                   0
-#define SYNTH_TYPE_SAMPLE               1
-#define SYNTH_TYPE_MIDI                 2       /* Midi interface */
-
-                int     synth_subtype;
-#define FM_TYPE_ADLIB                   0x00
-#define FM_TYPE_OPL3                    0x01
-#define MIDI_TYPE_MPU401                0x401
-
-#define SAMPLE_TYPE_BASIC               0x10
-#define SAMPLE_TYPE_GUS                 SAMPLE_TYPE_BASIC
-#define SAMPLE_TYPE_WAVEFRONT           0x11
-
-                int     perc_mode;      /* No longer supported */
-                int     nr_voices;
-                int     nr_drums;       /* Obsolete field */
-                int     instr_bank_size;
-                unsigned int    capabilities;   
-#define SYNTH_CAP_PERCMODE              0x00000001 /* No longer used */
-#define SYNTH_CAP_OPL3                  0x00000002 /* Set if OPL3 supported */
-#define SYNTH_CAP_INPUT                 0x00000004 /* Input (MIDI) device */
-                int     dummies[19];    /* Reserve space */
-        };
-
-struct sound_timer_info {
-                char name[32];
-                int caps;
-        };
-
-#define MIDI_CAP_MPU401         1               /* MPU-401 intelligent mode */
-
-struct midi_info {
-                char            name[30];
-                int             device;         /* 0-N. INITIALIZE BEFORE CALLING */
-                unsigned int    capabilities;   /* To be defined later */
-                int             dev_type;
-                int             dummies[18];    /* Reserve space */
-        };
-
-/********************************************
- * ioctl commands for the /dev/midi##
- */
-typedef struct {
-                unsigned char cmd;
-                char nr_args, nr_returns;
-                unsigned char data[30];
-        } mpu_command_rec;
-
-#define SNDCTL_MIDI_PRETIME             _SIOWR('m', 0, int)
-#define SNDCTL_MIDI_MPUMODE             _SIOWR('m', 1, int)
-#define SNDCTL_MIDI_MPUCMD              _SIOWR('m', 2, mpu_command_rec)
-
-/********************************************
- * IOCTL commands for /dev/dsp and /dev/audio
- */
-
-#define SNDCTL_DSP_RESET                _SIO  ('P', 0)
-#define SNDCTL_DSP_SYNC                 _SIO  ('P', 1)
-#define SNDCTL_DSP_SPEED                _SIOWR('P', 2, int)
-#define SNDCTL_DSP_STEREO               _SIOWR('P', 3, int)
-#define SNDCTL_DSP_GETBLKSIZE           _SIOWR('P', 4, int)
-#define SNDCTL_DSP_SAMPLESIZE           SNDCTL_DSP_SETFMT
-#define SNDCTL_DSP_CHANNELS             _SIOWR('P', 6, int)
-#define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
-#define SOUND_PCM_WRITE_FILTER          _SIOWR('P', 7, int)
-#define SNDCTL_DSP_POST                 _SIO  ('P', 8)
-#define SNDCTL_DSP_SUBDIVIDE            _SIOWR('P', 9, int)
-#define SNDCTL_DSP_SETFRAGMENT          _SIOWR('P',10, int)
-
-/*      Audio data formats (Note! U8=8 and S16_LE=16 for compatibility) */
-#define SNDCTL_DSP_GETFMTS              _SIOR ('P',11, int) /* Returns a mask */
-#define SNDCTL_DSP_SETFMT               _SIOWR('P',5, int) /* Selects ONE fmt*/
-#       define AFMT_QUERY               0x00000000      /* Return current fmt */
-#       define AFMT_MU_LAW              0x00000001
-#       define AFMT_A_LAW               0x00000002
-#       define AFMT_IMA_ADPCM           0x00000004
-#       define AFMT_U8                  0x00000008
-#       define AFMT_S16_LE              0x00000010      /* Little endian signed 16*/
-#       define AFMT_S16_BE              0x00000020      /* Big endian signed 16 */
-#       define AFMT_S8                  0x00000040
-#       define AFMT_U16_LE              0x00000080      /* Little endian U16 */
-#       define AFMT_U16_BE              0x00000100      /* Big endian U16 */
-#       define AFMT_MPEG                0x00000200      /* MPEG (2) audio */
-#       define AFMT_AC3         0x00000400      /* Dolby Digital AC3 */
-
-/*
- * Buffer status queries.
- */
-typedef struct audio_buf_info {
-                        int fragments;  /* # of available fragments (partially usend ones not counted) */
-                        int fragstotal; /* Total # of fragments allocated */
-                        int fragsize;   /* Size of a fragment in bytes */
-
-                        int bytes;      /* Available space in bytes (includes partially used fragments) */
-                        /* Note! 'bytes' could be more than fragments*fragsize */
-                } audio_buf_info;
-
-#define SNDCTL_DSP_GETOSPACE            _SIOR ('P',12, audio_buf_info)
-#define SNDCTL_DSP_GETISPACE            _SIOR ('P',13, audio_buf_info)
-#define SNDCTL_DSP_NONBLOCK             _SIO  ('P',14)
-#define SNDCTL_DSP_GETCAPS              _SIOR ('P',15, int)
-#       define DSP_CAP_REVISION         0x000000ff      /* Bits for revision level (0 to 255) */
-#       define DSP_CAP_DUPLEX           0x00000100      /* Full duplex record/playback */
-#       define DSP_CAP_REALTIME         0x00000200      /* Real time capability */
-#       define DSP_CAP_BATCH            0x00000400      /* Device has some kind of */
-                                                        /* internal buffers which may */
-                                                        /* cause some delays and */
-                                                        /* decrease precision of timing */
-#       define DSP_CAP_COPROC           0x00000800      /* Has a coprocessor */
-                                                        /* Sometimes it's a DSP */
-                                                        /* but usually not */
-#       define DSP_CAP_TRIGGER          0x00001000      /* Supports SETTRIGGER */
-#       define DSP_CAP_MMAP             0x00002000      /* Supports mmap() */
-#       define DSP_CAP_MULTI            0x00004000      /* support multiple open */
-#       define DSP_CAP_BIND             0x00008000      /* channel binding to front/rear/cneter/lfe */
-
-
-#define SNDCTL_DSP_GETTRIGGER           _SIOR ('P',16, int)
-#define SNDCTL_DSP_SETTRIGGER           _SIOW ('P',16, int)
-#       define PCM_ENABLE_INPUT         0x00000001
-#       define PCM_ENABLE_OUTPUT                0x00000002
-
-typedef struct count_info {
-                int bytes;      /* Total # of bytes processed */
-                int blocks;     /* # of fragment transitions since last time */
-                int ptr;        /* Current DMA pointer value */
-        } count_info;
-
-#define SNDCTL_DSP_GETIPTR              _SIOR ('P',17, count_info)
-#define SNDCTL_DSP_GETOPTR              _SIOR ('P',18, count_info)
-
-typedef struct buffmem_desc {
-                unsigned *buffer;
-                int size;
-        } buffmem_desc;
-#define SNDCTL_DSP_MAPINBUF             _SIOR ('P', 19, buffmem_desc)
-#define SNDCTL_DSP_MAPOUTBUF            _SIOR ('P', 20, buffmem_desc)
-#define SNDCTL_DSP_SETSYNCRO            _SIO  ('P', 21)
-#define SNDCTL_DSP_SETDUPLEX            _SIO  ('P', 22)
-#define SNDCTL_DSP_GETODELAY            _SIOR ('P', 23, int)
-
-#define SNDCTL_DSP_GETCHANNELMASK               _SIOWR('P', 64, int)
-#define SNDCTL_DSP_BIND_CHANNEL         _SIOWR('P', 65, int)
-#       define DSP_BIND_QUERY           0x00000000
-#       define DSP_BIND_FRONT           0x00000001
-#       define DSP_BIND_SURR            0x00000002
-#       define DSP_BIND_CENTER_LFE      0x00000004
-#       define DSP_BIND_HANDSET         0x00000008
-#       define DSP_BIND_MIC             0x00000010
-#       define DSP_BIND_MODEM1          0x00000020
-#       define DSP_BIND_MODEM2          0x00000040
-#       define DSP_BIND_I2S             0x00000080
-#       define DSP_BIND_SPDIF           0x00000100
-
-#define SNDCTL_DSP_SETSPDIF             _SIOW ('P', 66, int)
-#define SNDCTL_DSP_GETSPDIF             _SIOR ('P', 67, int)
-#       define SPDIF_PRO        0x0001
-#       define SPDIF_N_AUD      0x0002
-#       define SPDIF_COPY       0x0004
-#       define SPDIF_PRE        0x0008
-#       define SPDIF_CC         0x07f0
-#       define SPDIF_L          0x0800
-#       define SPDIF_DRS        0x4000
-#       define SPDIF_V          0x8000
-
-/*
- * Application's profile defines the way how playback underrun situations should be handled.
- * 
- *      APF_NORMAL (the default) and APF_NETWORK make the driver to cleanup the
- *      playback buffer whenever an underrun occurs. This consumes some time
- *      prevents looping the existing buffer.
- *      APF_CPUINTENS is intended to be set by CPU intensive applications which
- *      are likely to run out of time occasionally. In this mode the buffer cleanup is
- *      disabled which saves CPU time but also let's the previous buffer content to
- *      be played during the "pause" after the underrun.
- */
-#define SNDCTL_DSP_PROFILE              _SIOW ('P', 23, int)
-#define   APF_NORMAL    0       /* Normal applications */
-#define   APF_NETWORK   1       /* Underruns probably caused by an "external" delay */
-#define   APF_CPUINTENS 2       /* Underruns probably caused by "overheating" the CPU */
-
-#define SOUND_PCM_READ_RATE             _SIOR ('P', 2, int)
-#define SOUND_PCM_READ_CHANNELS         _SIOR ('P', 6, int)
-#define SOUND_PCM_READ_BITS             _SIOR ('P', 5, int)
-#define SOUND_PCM_READ_FILTER           _SIOR ('P', 7, int)
-
-/* Some alias names */
-#define SOUND_PCM_WRITE_BITS            SNDCTL_DSP_SETFMT
-#define SOUND_PCM_WRITE_RATE            SNDCTL_DSP_SPEED
-#define SOUND_PCM_POST                  SNDCTL_DSP_POST
-#define SOUND_PCM_RESET                 SNDCTL_DSP_RESET
-#define SOUND_PCM_SYNC                  SNDCTL_DSP_SYNC
-#define SOUND_PCM_SUBDIVIDE             SNDCTL_DSP_SUBDIVIDE
-#define SOUND_PCM_SETFRAGMENT           SNDCTL_DSP_SETFRAGMENT
-#define SOUND_PCM_GETFMTS               SNDCTL_DSP_GETFMTS
-#define SOUND_PCM_SETFMT                SNDCTL_DSP_SETFMT
-#define SOUND_PCM_GETOSPACE             SNDCTL_DSP_GETOSPACE
-#define SOUND_PCM_GETISPACE             SNDCTL_DSP_GETISPACE
-#define SOUND_PCM_NONBLOCK              SNDCTL_DSP_NONBLOCK
-#define SOUND_PCM_GETCAPS               SNDCTL_DSP_GETCAPS
-#define SOUND_PCM_GETTRIGGER            SNDCTL_DSP_GETTRIGGER
-#define SOUND_PCM_SETTRIGGER            SNDCTL_DSP_SETTRIGGER
-#define SOUND_PCM_SETSYNCRO             SNDCTL_DSP_SETSYNCRO
-#define SOUND_PCM_GETIPTR               SNDCTL_DSP_GETIPTR
-#define SOUND_PCM_GETOPTR               SNDCTL_DSP_GETOPTR
-#define SOUND_PCM_MAPINBUF              SNDCTL_DSP_MAPINBUF
-#define SOUND_PCM_MAPOUTBUF             SNDCTL_DSP_MAPOUTBUF
-
-/*
- * ioctl calls to be used in communication with coprocessors and
- * DSP chips.
- */
-
-typedef struct copr_buffer {
-                int command;    /* Set to 0 if not used */
-                int flags;
-#define CPF_NONE                0x0000
-#define CPF_FIRST               0x0001  /* First block */
-#define CPF_LAST                0x0002  /* Last block */
-                int len;
-                int offs;       /* If required by the device (0 if not used) */
-
-                unsigned char data[4000]; /* NOTE! 4000 is not 4k */
-        } copr_buffer;
-
-typedef struct copr_debug_buf {
-                int command;    /* Used internally. Set to 0 */
-                int parm1;
-                int parm2;
-                int flags;      
-                int len;        /* Length of data in bytes */
-        } copr_debug_buf;
-
-typedef struct copr_msg {
-                int len;
-                unsigned char data[4000];
-        } copr_msg;
-
-#define SNDCTL_COPR_RESET             _SIO  ('C',  0)
-#define SNDCTL_COPR_LOAD              _SIOWR('C',  1, copr_buffer)
-#define SNDCTL_COPR_RDATA             _SIOWR('C',  2, copr_debug_buf)
-#define SNDCTL_COPR_RCODE             _SIOWR('C',  3, copr_debug_buf)
-#define SNDCTL_COPR_WDATA             _SIOW ('C',  4, copr_debug_buf)
-#define SNDCTL_COPR_WCODE             _SIOW ('C',  5, copr_debug_buf)
-#define SNDCTL_COPR_RUN               _SIOWR('C',  6, copr_debug_buf)
-#define SNDCTL_COPR_HALT              _SIOWR('C',  7, copr_debug_buf)
-#define SNDCTL_COPR_SENDMSG           _SIOWR('C',  8, copr_msg)
-#define SNDCTL_COPR_RCVMSG            _SIOR ('C',  9, copr_msg)
-
-/*********************************************
- * IOCTL commands for /dev/mixer
- */
-        
-/* 
- * Mixer devices
- *
- * There can be up to 20 different analog mixer channels. The
- * SOUND_MIXER_NRDEVICES gives the currently supported maximum. 
- * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
- * the devices supported by the particular mixer.
- */
-
-#define SOUND_MIXER_NRDEVICES   25
-#define SOUND_MIXER_VOLUME      0
-#define SOUND_MIXER_BASS        1
-#define SOUND_MIXER_TREBLE      2
-#define SOUND_MIXER_SYNTH       3
-#define SOUND_MIXER_PCM         4
-#define SOUND_MIXER_SPEAKER     5
-#define SOUND_MIXER_LINE        6
-#define SOUND_MIXER_MIC         7
-#define SOUND_MIXER_CD          8
-#define SOUND_MIXER_IMIX        9       /*  Recording monitor  */
-#define SOUND_MIXER_ALTPCM      10
-#define SOUND_MIXER_RECLEV      11      /* Recording level */
-#define SOUND_MIXER_IGAIN       12      /* Input gain */
-#define SOUND_MIXER_OGAIN       13      /* Output gain */
-/* 
- * The AD1848 codec and compatibles have three line level inputs
- * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
- * specific meanings (line, cd, synth etc.) to them.
- */
-#define SOUND_MIXER_LINE1       14      /* Input source 1  (aux1) */
-#define SOUND_MIXER_LINE2       15      /* Input source 2  (aux2) */
-#define SOUND_MIXER_LINE3       16      /* Input source 3  (line) */
-#define SOUND_MIXER_DIGITAL1    17      /* Digital (input) 1 */
-#define SOUND_MIXER_DIGITAL2    18      /* Digital (input) 2 */
-#define SOUND_MIXER_DIGITAL3    19      /* Digital (input) 3 */
-#define SOUND_MIXER_PHONEIN     20      /* Phone input */
-#define SOUND_MIXER_PHONEOUT    21      /* Phone output */
-#define SOUND_MIXER_VIDEO       22      /* Video/TV (audio) in */
-#define SOUND_MIXER_RADIO       23      /* Radio in */
-#define SOUND_MIXER_MONITOR     24      /* Monitor (usually mic) volume */
-
-/* Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX) */
-/* Not counted to SOUND_MIXER_NRDEVICES, but use the same number space */
-#define SOUND_ONOFF_MIN         28
-#define SOUND_ONOFF_MAX         30
-
-/* Note!        Number 31 cannot be used since the sign bit is reserved */
-#define SOUND_MIXER_NONE        31
-
-/*
- * The following unsupported macros are no longer functional.
- * Use SOUND_MIXER_PRIVATE# macros in future.
- */
-#define SOUND_MIXER_ENHANCE     SOUND_MIXER_NONE
-#define SOUND_MIXER_MUTE        SOUND_MIXER_NONE
-#define SOUND_MIXER_LOUD        SOUND_MIXER_NONE
-
-
-#define SOUND_DEVICE_LABELS     {"Vol  ", "Bass ", "Trebl", "Synth", "Pcm  ", "Spkr ", "Line ", \
-                                 "Mic  ", "CD   ", "Mix  ", "Pcm2 ", "Rec  ", "IGain", "OGain", \
-                                 "Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", \
-                                 "PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"}
-
-#define SOUND_DEVICE_NAMES      {"vol", "bass", "treble", "synth", "pcm", "speaker", "line", \
-                                 "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", \
-                                 "line1", "line2", "line3", "dig1", "dig2", "dig3", \
-                                 "phin", "phout", "video", "radio", "monitor"}
-
-/*      Device bitmask identifiers      */
-
-#define SOUND_MIXER_RECSRC      0xff    /* Arg contains a bit for each recording source */
-#define SOUND_MIXER_DEVMASK     0xfe    /* Arg contains a bit for each supported device */
-#define SOUND_MIXER_RECMASK     0xfd    /* Arg contains a bit for each supported recording source */
-#define SOUND_MIXER_CAPS        0xfc
-#       define SOUND_CAP_EXCL_INPUT     0x00000001      /* Only one recording source at a time */
-#define SOUND_MIXER_STEREODEVS  0xfb    /* Mixer channels supporting stereo */
-#define SOUND_MIXER_OUTSRC      0xfa    /* Arg contains a bit for each input source to output */
-#define SOUND_MIXER_OUTMASK     0xf9    /* Arg contains a bit for each supported input source to output */
-
-/*      Device mask bits        */
-
-#define SOUND_MASK_VOLUME       (1 << SOUND_MIXER_VOLUME)
-#define SOUND_MASK_BASS         (1 << SOUND_MIXER_BASS)
-#define SOUND_MASK_TREBLE       (1 << SOUND_MIXER_TREBLE)
-#define SOUND_MASK_SYNTH        (1 << SOUND_MIXER_SYNTH)
-#define SOUND_MASK_PCM          (1 << SOUND_MIXER_PCM)
-#define SOUND_MASK_SPEAKER      (1 << SOUND_MIXER_SPEAKER)
-#define SOUND_MASK_LINE         (1 << SOUND_MIXER_LINE)
-#define SOUND_MASK_MIC          (1 << SOUND_MIXER_MIC)
-#define SOUND_MASK_CD           (1 << SOUND_MIXER_CD)
-#define SOUND_MASK_IMIX         (1 << SOUND_MIXER_IMIX)
-#define SOUND_MASK_ALTPCM       (1 << SOUND_MIXER_ALTPCM)
-#define SOUND_MASK_RECLEV       (1 << SOUND_MIXER_RECLEV)
-#define SOUND_MASK_IGAIN        (1 << SOUND_MIXER_IGAIN)
-#define SOUND_MASK_OGAIN        (1 << SOUND_MIXER_OGAIN)
-#define SOUND_MASK_LINE1        (1 << SOUND_MIXER_LINE1)
-#define SOUND_MASK_LINE2        (1 << SOUND_MIXER_LINE2)
-#define SOUND_MASK_LINE3        (1 << SOUND_MIXER_LINE3)
-#define SOUND_MASK_DIGITAL1     (1 << SOUND_MIXER_DIGITAL1)
-#define SOUND_MASK_DIGITAL2     (1 << SOUND_MIXER_DIGITAL2)
-#define SOUND_MASK_DIGITAL3     (1 << SOUND_MIXER_DIGITAL3)
-#define SOUND_MASK_PHONEIN      (1 << SOUND_MIXER_PHONEIN)
-#define SOUND_MASK_PHONEOUT     (1 << SOUND_MIXER_PHONEOUT)
-#define SOUND_MASK_RADIO        (1 << SOUND_MIXER_RADIO)
-#define SOUND_MASK_VIDEO        (1 << SOUND_MIXER_VIDEO)
-#define SOUND_MASK_MONITOR      (1 << SOUND_MIXER_MONITOR)
-
-/* Obsolete macros */
-#define SOUND_MASK_MUTE         (1 << SOUND_MIXER_MUTE)
-#define SOUND_MASK_ENHANCE      (1 << SOUND_MIXER_ENHANCE)
-#define SOUND_MASK_LOUD         (1 << SOUND_MIXER_LOUD)
-
-#define MIXER_READ(dev)         _SIOR('M', dev, int)
-#define SOUND_MIXER_READ_VOLUME         MIXER_READ(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_READ_BASS           MIXER_READ(SOUND_MIXER_BASS)
-#define SOUND_MIXER_READ_TREBLE         MIXER_READ(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_READ_SYNTH          MIXER_READ(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_READ_PCM            MIXER_READ(SOUND_MIXER_PCM)
-#define SOUND_MIXER_READ_SPEAKER        MIXER_READ(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_READ_LINE           MIXER_READ(SOUND_MIXER_LINE)
-#define SOUND_MIXER_READ_MIC            MIXER_READ(SOUND_MIXER_MIC)
-#define SOUND_MIXER_READ_CD             MIXER_READ(SOUND_MIXER_CD)
-#define SOUND_MIXER_READ_IMIX           MIXER_READ(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_READ_ALTPCM         MIXER_READ(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_READ_RECLEV         MIXER_READ(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_READ_IGAIN          MIXER_READ(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_READ_OGAIN          MIXER_READ(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_READ_LINE1          MIXER_READ(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_READ_LINE2          MIXER_READ(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_READ_LINE3          MIXER_READ(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_READ_MUTE           MIXER_READ(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_READ_ENHANCE        MIXER_READ(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_READ_LOUD           MIXER_READ(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_READ_RECSRC         MIXER_READ(SOUND_MIXER_RECSRC)
-#define SOUND_MIXER_READ_DEVMASK        MIXER_READ(SOUND_MIXER_DEVMASK)
-#define SOUND_MIXER_READ_RECMASK        MIXER_READ(SOUND_MIXER_RECMASK)
-#define SOUND_MIXER_READ_STEREODEVS     MIXER_READ(SOUND_MIXER_STEREODEVS)
-#define SOUND_MIXER_READ_CAPS           MIXER_READ(SOUND_MIXER_CAPS)
-
-#define MIXER_WRITE(dev)                _SIOWR('M', dev, int)
-#define SOUND_MIXER_WRITE_VOLUME        MIXER_WRITE(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_WRITE_BASS          MIXER_WRITE(SOUND_MIXER_BASS)
-#define SOUND_MIXER_WRITE_TREBLE        MIXER_WRITE(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_WRITE_SYNTH         MIXER_WRITE(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_WRITE_PCM           MIXER_WRITE(SOUND_MIXER_PCM)
-#define SOUND_MIXER_WRITE_SPEAKER       MIXER_WRITE(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_WRITE_LINE          MIXER_WRITE(SOUND_MIXER_LINE)
-#define SOUND_MIXER_WRITE_MIC           MIXER_WRITE(SOUND_MIXER_MIC)
-#define SOUND_MIXER_WRITE_CD            MIXER_WRITE(SOUND_MIXER_CD)
-#define SOUND_MIXER_WRITE_IMIX          MIXER_WRITE(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_WRITE_ALTPCM        MIXER_WRITE(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_WRITE_RECLEV        MIXER_WRITE(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_WRITE_IGAIN         MIXER_WRITE(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_WRITE_OGAIN         MIXER_WRITE(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_WRITE_LINE1         MIXER_WRITE(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_WRITE_LINE2         MIXER_WRITE(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_WRITE_LINE3         MIXER_WRITE(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_WRITE_MUTE          MIXER_WRITE(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_WRITE_ENHANCE       MIXER_WRITE(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_WRITE_LOUD          MIXER_WRITE(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_WRITE_RECSRC        MIXER_WRITE(SOUND_MIXER_RECSRC)
-
-typedef struct mixer_info
-{
-  char id[16];
-  char name[32];
-  int  modify_counter;
-  int fillers[10];
-} mixer_info;
-
-typedef struct _old_mixer_info /* Obsolete */
-{
-  char id[16];
-  char name[32];
-} _old_mixer_info;
-
-#define SOUND_MIXER_INFO                _SIOR ('M', 101, mixer_info)
-#define SOUND_OLD_MIXER_INFO            _SIOR ('M', 101, _old_mixer_info)
-
-/*
- * A mechanism for accessing "proprietary" mixer features. This method
- * permits passing 128 bytes of arbitrary data between a mixer application
- * and the mixer driver. Interpretation of the record is defined by
- * the particular mixer driver.
- */
-typedef unsigned char mixer_record[128];
-
-#define SOUND_MIXER_ACCESS              _SIOWR('M', 102, mixer_record)
-
-/*
- * Two ioctls for special souncard function
- */
-#define SOUND_MIXER_AGC  _SIOWR('M', 103, int)
-#define SOUND_MIXER_3DSE  _SIOWR('M', 104, int)
-
-/*
- * The SOUND_MIXER_PRIVATE# commands can be redefined by low level drivers.
- * These features can be used when accessing device specific features.
- */
-#define SOUND_MIXER_PRIVATE1            _SIOWR('M', 111, int)
-#define SOUND_MIXER_PRIVATE2            _SIOWR('M', 112, int)
-#define SOUND_MIXER_PRIVATE3            _SIOWR('M', 113, int)
-#define SOUND_MIXER_PRIVATE4            _SIOWR('M', 114, int)
-#define SOUND_MIXER_PRIVATE5            _SIOWR('M', 115, int)
-
-/*
- * SOUND_MIXER_GETLEVELS and SOUND_MIXER_SETLEVELS calls can be used
- * for querying current mixer settings from the driver and for loading
- * default volume settings _prior_ activating the mixer (loading
- * doesn't affect current state of the mixer hardware). These calls
- * are for internal use only.
- */
-
-typedef struct mixer_vol_table {
-  int num;      /* Index to volume table */
-  char name[32];
-  int levels[32];
-} mixer_vol_table;
-
-#define SOUND_MIXER_GETLEVELS           _SIOWR('M', 116, mixer_vol_table)
-#define SOUND_MIXER_SETLEVELS           _SIOWR('M', 117, mixer_vol_table)
-
-/* 
- * An ioctl for identifying the driver version. It will return value
- * of the SOUND_VERSION macro used when compiling the driver.
- * This call was introduced in OSS version 3.6 and it will not work
- * with earlier versions (returns EINVAL).
- */
-#define OSS_GETVERSION                  _SIOR ('M', 118, int)
-
-/*
- * Level 2 event types for /dev/sequencer
- */
-
-/*
- * The 4 most significant bits of byte 0 specify the class of
- * the event: 
- *
- *      0x8X = system level events,
- *      0x9X = device/port specific events, event[1] = device/port,
- *              The last 4 bits give the subtype:
- *                      0x02    = Channel event (event[3] = chn).
- *                      0x01    = note event (event[4] = note).
- *                      (0x01 is not used alone but always with bit 0x02).
- *             event[2] = MIDI message code (0x80=note off etc.)
- *
- */
-
-#define EV_SEQ_LOCAL            0x80
-#define EV_TIMING               0x81
-#define EV_CHN_COMMON           0x92
-#define EV_CHN_VOICE            0x93
-#define EV_SYSEX                0x94
-/*
- * Event types 200 to 220 are reserved for application use.
- * These numbers will not be used by the driver.
- */
-
-/*
- * Events for event type EV_CHN_VOICE
- */
-
-#define MIDI_NOTEOFF            0x80
-#define MIDI_NOTEON             0x90
-#define MIDI_KEY_PRESSURE       0xA0
-
-/*
- * Events for event type EV_CHN_COMMON
- */
-
-#define MIDI_CTL_CHANGE         0xB0
-#define MIDI_PGM_CHANGE         0xC0
-#define MIDI_CHN_PRESSURE       0xD0
-#define MIDI_PITCH_BEND         0xE0
-
-#define MIDI_SYSTEM_PREFIX      0xF0
-
-/*
- * Timer event types
- */
-#define TMR_WAIT_REL            1       /* Time relative to the prev time */
-#define TMR_WAIT_ABS            2       /* Absolute time since TMR_START */
-#define TMR_STOP                3
-#define TMR_START               4
-#define TMR_CONTINUE            5
-#define TMR_TEMPO               6
-#define TMR_ECHO                8
-#define TMR_CLOCK               9       /* MIDI clock */
-#define TMR_SPP                 10      /* Song position pointer */
-#define TMR_TIMESIG             11      /* Time signature */
-
-/*
- *      Local event types
- */
-#define LOCL_STARTAUDIO         1
-
-#if !defined(__KERNEL__) || defined(USE_SEQ_MACROS)
-/*
- *      Some convenience macros to simplify programming of the
- *      /dev/sequencer interface
- *
- *      This is a legacy interface for applications written against
- *      the OSSlib-3.8 style interface. It is no longer possible
- *      to actually link against OSSlib with this header, but we
- *      still provide these macros for programs using them.
- *
- *      If you want to use OSSlib, it is recommended that you get
- *      the GPL version of OSS-4.x and build against that version
- *      of the header.
- *
- *      We redefine the extern keyword so that make headers_check
- *      does not complain about SEQ_USE_EXTBUF.
- */
-#define SEQ_DECLAREBUF()                SEQ_USE_EXTBUF()
-
-void seqbuf_dump(void); /* This function must be provided by programs */
-
-#define SEQ_PM_DEFINES int __foo_bar___
-
-#define SEQ_LOAD_GMINSTR(dev, instr)
-#define SEQ_LOAD_GMDRUM(dev, drum)
-
-#define _SEQ_EXTERN extern
-#define SEQ_USE_EXTBUF() \
-                _SEQ_EXTERN unsigned char _seqbuf[]; \
-                _SEQ_EXTERN int _seqbuflen; _SEQ_EXTERN int _seqbufptr
-
-#ifndef USE_SIMPLE_MACROS
-/* Sample seqbuf_dump() implementation:
- *
- *      SEQ_DEFINEBUF (2048);   -- Defines a buffer for 2048 bytes
- *
- *      int seqfd;              -- The file descriptor for /dev/sequencer.
- *
- *      void
- *      seqbuf_dump ()
- *      {
- *        if (_seqbufptr)
- *          if (write (seqfd, _seqbuf, _seqbufptr) == -1)
- *            {
- *              perror ("write /dev/sequencer");
- *              exit (-1);
- *            }
- *        _seqbufptr = 0;
- *      }
- */
-
-#define SEQ_DEFINEBUF(len)              unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
-#define _SEQ_NEEDBUF(len)               if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump()
-#define _SEQ_ADVBUF(len)                _seqbufptr += len
-#define SEQ_DUMPBUF                     seqbuf_dump
-#else
-/*
- * This variation of the sequencer macros is used just to format one event
- * using fixed buffer.
- * 
- * The program using the macro library must define the following macros before
- * using this library.
- *
- * #define _seqbuf               name of the buffer (unsigned char[]) 
- * #define _SEQ_ADVBUF(len)      If the applic needs to know the exact
- *                               size of the event, this macro can be used.
- *                               Otherwise this must be defined as empty.
- * #define _seqbufptr            Define the name of index variable or 0 if
- *                               not required. 
- */
-#define _SEQ_NEEDBUF(len)       /* empty */
-#endif
-
-#define SEQ_VOLUME_MODE(dev, mode)      {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-                                        _seqbuf[_seqbufptr+1] = SEQ_VOLMODE;\
-                                        _seqbuf[_seqbufptr+2] = (dev);\
-                                        _seqbuf[_seqbufptr+3] = (mode);\
-                                        _seqbuf[_seqbufptr+4] = 0;\
-                                        _seqbuf[_seqbufptr+5] = 0;\
-                                        _seqbuf[_seqbufptr+6] = 0;\
-                                        _seqbuf[_seqbufptr+7] = 0;\
-                                        _SEQ_ADVBUF(8);}
-
-/*
- * Midi voice messages
- */
-
-#define _CHN_VOICE(dev, event, chn, note, parm) \
-                                        {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr] = EV_CHN_VOICE;\
-                                        _seqbuf[_seqbufptr+1] = (dev);\
-                                        _seqbuf[_seqbufptr+2] = (event);\
-                                        _seqbuf[_seqbufptr+3] = (chn);\
-                                        _seqbuf[_seqbufptr+4] = (note);\
-                                        _seqbuf[_seqbufptr+5] = (parm);\
-                                        _seqbuf[_seqbufptr+6] = (0);\
-                                        _seqbuf[_seqbufptr+7] = 0;\
-                                        _SEQ_ADVBUF(8);}
-
-#define SEQ_START_NOTE(dev, chn, note, vol) \
-                _CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol)
-
-#define SEQ_STOP_NOTE(dev, chn, note, vol) \
-                _CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol)
-
-#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) \
-                _CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure)
-
-/*
- * Midi channel messages
- */
-
-#define _CHN_COMMON(dev, event, chn, p1, p2, w14) \
-                                        {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr] = EV_CHN_COMMON;\
-                                        _seqbuf[_seqbufptr+1] = (dev);\
-                                        _seqbuf[_seqbufptr+2] = (event);\
-                                        _seqbuf[_seqbufptr+3] = (chn);\
-                                        _seqbuf[_seqbufptr+4] = (p1);\
-                                        _seqbuf[_seqbufptr+5] = (p2);\
-                                        *(short *)&_seqbuf[_seqbufptr+6] = (w14);\
-                                        _SEQ_ADVBUF(8);}
-/*
- * SEQ_SYSEX permits sending of sysex messages. (It may look that it permits
- * sending any MIDI bytes but it's absolutely not possible. Trying to do
- * so _will_ cause problems with MPU401 intelligent mode).
- *
- * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be 
- * sent by calling SEQ_SYSEX() several times (there must be no other events
- * between them). First sysex fragment must have 0xf0 in the first byte
- * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
- * between these sysex start and end markers cannot be larger than 0x7f. Also
- * lengths of each fragments (except the last one) must be 6.
- *
- * Breaking the above rules may work with some MIDI ports but is likely to
- * cause fatal problems with some other devices (such as MPU401).
- */
-#define SEQ_SYSEX(dev, buf, len) \
-                                        {int ii, ll=(len); \
-                                         unsigned char *bufp=buf;\
-                                         if (ll>6)ll=6;\
-                                        _SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr] = EV_SYSEX;\
-                                        _seqbuf[_seqbufptr+1] = (dev);\
-                                        for(ii=0;ii<ll;ii++)\
-                                           _seqbuf[_seqbufptr+ii+2] = bufp[ii];\
-                                        for(ii=ll;ii<6;ii++)\
-                                           _seqbuf[_seqbufptr+ii+2] = 0xff;\
-                                        _SEQ_ADVBUF(8);}
-
-#define SEQ_CHN_PRESSURE(dev, chn, pressure) \
-                _CHN_COMMON(dev, MIDI_CHN_PRESSURE, chn, pressure, 0, 0)
-
-#define SEQ_SET_PATCH SEQ_PGM_CHANGE
-#define SEQ_PGM_CHANGE(dev, chn, patch) \
-                _CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0)
-
-#define SEQ_CONTROL(dev, chn, controller, value) \
-                _CHN_COMMON(dev, MIDI_CTL_CHANGE, chn, controller, 0, value)
-
-#define SEQ_BENDER(dev, chn, value) \
-                _CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
-
-
-#define SEQ_V2_X_CONTROL(dev, voice, controller, value) {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-                                        _seqbuf[_seqbufptr+1] = SEQ_CONTROLLER;\
-                                        _seqbuf[_seqbufptr+2] = (dev);\
-                                        _seqbuf[_seqbufptr+3] = (voice);\
-                                        _seqbuf[_seqbufptr+4] = (controller);\
-                                        _seqbuf[_seqbufptr+5] = ((value)&0xff);\
-                                        _seqbuf[_seqbufptr+6] = ((value>>8)&0xff);\
-                                        _seqbuf[_seqbufptr+7] = 0;\
-                                        _SEQ_ADVBUF(8);}
-/*
- * The following 5 macros are incorrectly implemented and obsolete.
- * Use SEQ_BENDER and SEQ_CONTROL (with proper controller) instead.
- */
-#define SEQ_PITCHBEND(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value)
-#define SEQ_BENDER_RANGE(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value)
-#define SEQ_EXPRESSION(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128)
-#define SEQ_MAIN_VOLUME(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100)
-#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
-
-/*
- * Timing and synchronization macros
- */
-
-#define _TIMER_EVENT(ev, parm)          {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr+0] = EV_TIMING; \
-                                        _seqbuf[_seqbufptr+1] = (ev); \
-                                        _seqbuf[_seqbufptr+2] = 0;\
-                                        _seqbuf[_seqbufptr+3] = 0;\
-                                        *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-                                        _SEQ_ADVBUF(8);}
-
-#define SEQ_START_TIMER()               _TIMER_EVENT(TMR_START, 0)
-#define SEQ_STOP_TIMER()                _TIMER_EVENT(TMR_STOP, 0)
-#define SEQ_CONTINUE_TIMER()            _TIMER_EVENT(TMR_CONTINUE, 0)
-#define SEQ_WAIT_TIME(ticks)            _TIMER_EVENT(TMR_WAIT_ABS, ticks)
-#define SEQ_DELTA_TIME(ticks)           _TIMER_EVENT(TMR_WAIT_REL, ticks)
-#define SEQ_ECHO_BACK(key)              _TIMER_EVENT(TMR_ECHO, key)
-#define SEQ_SET_TEMPO(value)            _TIMER_EVENT(TMR_TEMPO, value)
-#define SEQ_SONGPOS(pos)                _TIMER_EVENT(TMR_SPP, pos)
-#define SEQ_TIME_SIGNATURE(sig)         _TIMER_EVENT(TMR_TIMESIG, sig)
-
-/*
- * Local control events
- */
-
-#define _LOCAL_EVENT(ev, parm)          {_SEQ_NEEDBUF(8);\
-                                        _seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
-                                        _seqbuf[_seqbufptr+1] = (ev); \
-                                        _seqbuf[_seqbufptr+2] = 0;\
-                                        _seqbuf[_seqbufptr+3] = 0;\
-                                        *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-                                        _SEQ_ADVBUF(8);}
-
-#define SEQ_PLAYAUDIO(devmask)          _LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
-/*
- * Events for the level 1 interface only 
- */
-
-#define SEQ_MIDIOUT(device, byte)       {_SEQ_NEEDBUF(4);\
-                                        _seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
-                                        _seqbuf[_seqbufptr+1] = (byte);\
-                                        _seqbuf[_seqbufptr+2] = (device);\
-                                        _seqbuf[_seqbufptr+3] = 0;\
-                                        _SEQ_ADVBUF(4);}
-
-/*
- * Patch loading.
- */
-#define SEQ_WRPATCH(patchx, len) \
-                {if (_seqbufptr) SEQ_DUMPBUF();\
-                 if (write(seqfd, (char*)(patchx), len)==-1) \
-                    perror("Write patch: /dev/sequencer");}
-#define SEQ_WRPATCH2(patchx, len) \
-                (SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len))
-
-#endif
 #endif
diff --git a/include/linux/spi/Kbuild b/include/linux/spi/Kbuild
deleted file mode 100644
index d375a082986e..000000000000
--- a/include/linux/spi/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += spidev.h
diff --git a/include/linux/spi/tsc2005.h b/include/linux/spi/tsc2005.h
index d9b0c84220c7..8f721e465e05 100644
--- a/include/linux/spi/tsc2005.h
+++ b/include/linux/spi/tsc2005.h
@@ -3,8 +3,6 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation
  *
- * Contact: Aaro Koskinen <aaro.koskinen@nokia.com>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 46132409a3f7..075cb0c7eb2a 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -1,52 +1,10 @@
 #ifndef _LINUX_STAT_H
 #define _LINUX_STAT_H
 
-#ifdef __KERNEL__
 
 #include <asm/stat.h>
+#include <uapi/linux/stat.h>
 
-#endif
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#define S_IFMT  00170000
-#define S_IFSOCK 0140000
-#define S_IFLNK  0120000
-#define S_IFREG  0100000
-#define S_IFBLK  0060000
-#define S_IFDIR  0040000
-#define S_IFCHR  0020000
-#define S_IFIFO  0010000
-#define S_ISUID  0004000
-#define S_ISGID  0002000
-#define S_ISVTX  0001000
-
-#define S_ISLNK(m)      (((m) & S_IFMT) == S_IFLNK)
-#define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
-#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)
-#define S_ISCHR(m)      (((m) & S_IFMT) == S_IFCHR)
-#define S_ISBLK(m)      (((m) & S_IFMT) == S_IFBLK)
-#define S_ISFIFO(m)     (((m) & S_IFMT) == S_IFIFO)
-#define S_ISSOCK(m)     (((m) & S_IFMT) == S_IFSOCK)
-
-#define S_IRWXU 00700
-#define S_IRUSR 00400
-#define S_IWUSR 00200
-#define S_IXUSR 00100
-
-#define S_IRWXG 00070
-#define S_IRGRP 00040
-#define S_IWGRP 00020
-#define S_IXGRP 00010
-
-#define S_IRWXO 00007
-#define S_IROTH 00004
-#define S_IWOTH 00002
-#define S_IXOTH 00001
-
-#endif
-
-#ifdef __KERNEL__
 #define S_IRWXUGO       (S_IRWXU|S_IRWXG|S_IRWXO)
 #define S_IALLUGO       (S_ISUID|S_ISGID|S_ISVTX|S_IRWXUGO)
 #define S_IRUGO         (S_IRUSR|S_IRGRP|S_IROTH)
@@ -77,5 +35,3 @@ struct kstat {
 };
 
 #endif
-
-#endif
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index 1747b6787b9e..f4aec0e75c3a 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -1,9 +1,8 @@
 #ifndef _LINUX_STDDEF_H
 #define _LINUX_STDDEF_H
 
-#include <linux/compiler.h>
+#include <uapi/linux/stddef.h>
 
-#ifdef __KERNEL__
 
 #undef NULL
 #define NULL ((void *)0)
@@ -19,6 +18,4 @@ enum {
 #else
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/string.h b/include/linux/string.h
index b9178812d9df..630125818ca8 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -1,16 +1,12 @@
 #ifndef _LINUX_STRING_H_
 #define _LINUX_STRING_H_
 
-/* We don't want strings.h stuff being used by user stuff by accident */
-
-#ifndef __KERNEL__
-#include <string.h>
-#else
 
 #include <linux/compiler.h>     /* for inline */
 #include <linux/types.h>        /* for size_t */
 #include <linux/stddef.h>       /* for NULL */
 #include <stdarg.h>
+#include <uapi/linux/string.h>
 
 extern char *strndup_user(const char __user *, long);
 extern void *memdup_user(const void __user *, size_t);
@@ -147,5 +143,4 @@ static inline bool strstarts(const char *str, const char *prefix)
 
 extern size_t memweight(const void *ptr, size_t bytes);
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_STRING_H_ */
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
deleted file mode 100644
index 98df21164a86..000000000000
--- a/include/linux/sunrpc/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += debug.h
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 523547ecfee2..34206b84d8da 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -130,6 +130,8 @@ struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,
                                 const struct rpc_program *, u32);
 void rpc_task_reset_client(struct rpc_task *task, struct rpc_clnt *clnt);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
+struct rpc_clnt *rpc_clone_client_set_auth(struct rpc_clnt *,
+                                rpc_authflavor_t);
 void            rpc_shutdown_client(struct rpc_clnt *);
 void            rpc_release_client(struct rpc_clnt *);
 void            rpc_task_release_client(struct rpc_task *);
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index a76cc20d98ce..9385bd74c860 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -5,28 +5,11 @@
  *
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef _LINUX_SUNRPC_DEBUG_H_
 #define _LINUX_SUNRPC_DEBUG_H_
 
-/*
- * RPC debug facilities
- */
-#define RPCDBG_XPRT             0x0001
-#define RPCDBG_CALL             0x0002
-#define RPCDBG_DEBUG            0x0004
-#define RPCDBG_NFS              0x0008
-#define RPCDBG_AUTH             0x0010
-#define RPCDBG_BIND             0x0020
-#define RPCDBG_SCHED            0x0040
-#define RPCDBG_TRANS            0x0080
-#define RPCDBG_SVCXPRT          0x0100
-#define RPCDBG_SVCDSP           0x0200
-#define RPCDBG_MISC             0x0400
-#define RPCDBG_CACHE            0x0800
-#define RPCDBG_ALL              0x7fff
+#include <uapi/linux/sunrpc/debug.h>
 
-#ifdef __KERNEL__
 
 /*
  * Enable RPC debugging/profiling.
@@ -87,24 +70,4 @@ void		rpc_register_sysctl(void);
 void            rpc_unregister_sysctl(void);
 #endif
 
-#endif /* __KERNEL__ */
-
-/*
- * Declarations for the sysctl debug interface, which allows to read or
- * change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
- * module currently registers its sysctl table dynamically, the sysctl path
- * for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
- */
-
-enum {
-        CTL_RPCDEBUG = 1,
-        CTL_NFSDEBUG,
-        CTL_NFSDDEBUG,
-        CTL_NLMDEBUG,
-        CTL_SLOTTABLE_UDP,
-        CTL_SLOTTABLE_TCP,
-        CTL_MIN_RESVPORT,
-        CTL_MAX_RESVPORT,
-};
-
 #endif /* _LINUX_SUNRPC_DEBUG_H_ */
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index b3f64b12f141..b05963f09ebf 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -114,7 +114,6 @@ void	svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *,
 int     svc_create_xprt(struct svc_serv *, const char *, struct net *,
                         const int, const unsigned short, int);
 void    svc_xprt_enqueue(struct svc_xprt *xprt);
-void    svc_xprt_received(struct svc_xprt *);
 void    svc_xprt_put(struct svc_xprt *xprt);
 void    svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);
 void    svc_close_xprt(struct svc_xprt *xprt);
@@ -124,6 +123,7 @@ struct	svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,
                         struct net *net, const sa_family_t af,
                         const unsigned short port);
 int     svc_xprt_names(struct svc_serv *serv, char *buf, const int buflen);
+void    svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *xprt);
 
 static inline void svc_xprt_get(struct svc_xprt *xprt)
 {
@@ -166,8 +166,7 @@ static inline size_t svc_addr_len(const struct sockaddr *sa)
         case AF_INET6:
                 return sizeof(struct sockaddr_in6);
         }
-
-        return 0;
+        BUG();
 }
 
 static inline unsigned short svc_xprt_local_port(const struct svc_xprt *xprt)
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index cb4ac69e1f33..92ad02f0dcc0 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -39,9 +39,6 @@ int		svc_recv(struct svc_rqst *, long);
 int             svc_send(struct svc_rqst *);
 void            svc_drop(struct svc_rqst *);
 void            svc_sock_update_bufs(struct svc_serv *serv);
-int             svc_sock_names(struct svc_serv *serv, char *buf,
-                                        const size_t buflen,
-                                        const char *toclose);
 int             svc_addsock(struct svc_serv *serv, const int fd,
                                         char *name_return, const size_t len);
 void            svc_init_xprt_sock(void);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index bf8c49ff7530..951cb9b7d02b 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -173,8 +173,7 @@ struct rpc_xprt {
         unsigned int            min_reqs;       /* min number of slots */
         atomic_t                num_reqs;       /* total slots */
         unsigned long           state;          /* transport state */
-        unsigned char           shutdown   : 1, /* being shut down */
-                                resvport   : 1; /* use a reserved port */
+        unsigned char           resvport   : 1; /* use a reserved port */
         unsigned int            swapper;        /* we're swapping over this
                                                    transport */
         unsigned int            bind_index;     /* bind function index */
diff --git a/include/linux/swab.h b/include/linux/swab.h
index ea0c02fd5163..9ad3c60f6cae 100644
--- a/include/linux/swab.h
+++ b/include/linux/swab.h
@@ -1,284 +1,8 @@
 #ifndef _LINUX_SWAB_H
 #define _LINUX_SWAB_H
 
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <asm/swab.h>
+#include <uapi/linux/swab.h>
 
-/*
- * casts are necessary for constants, because we never know how for sure
- * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
- */
-#define ___constant_swab16(x) ((__u16)(                         \
-        (((__u16)(x) & (__u16)0x00ffU) << 8) |                  \
-        (((__u16)(x) & (__u16)0xff00U) >> 8)))
-
-#define ___constant_swab32(x) ((__u32)(                         \
-        (((__u32)(x) & (__u32)0x000000ffUL) << 24) |            \
-        (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) |            \
-        (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) |            \
-        (((__u32)(x) & (__u32)0xff000000UL) >> 24)))
-
-#define ___constant_swab64(x) ((__u64)(                         \
-        (((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) |   \
-        (((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) |   \
-        (((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) |   \
-        (((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) |   \
-        (((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) |   \
-        (((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) |   \
-        (((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) |   \
-        (((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56)))
-
-#define ___constant_swahw32(x) ((__u32)(                        \
-        (((__u32)(x) & (__u32)0x0000ffffUL) << 16) |            \
-        (((__u32)(x) & (__u32)0xffff0000UL) >> 16)))
-
-#define ___constant_swahb32(x) ((__u32)(                        \
-        (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) |             \
-        (((__u32)(x) & (__u32)0xff00ff00UL) >> 8)))
-
-/*
- * Implement the following as inlines, but define the interface using
- * macros to allow constant folding when possible:
- * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
- */
-
-static inline __attribute_const__ __u16 __fswab16(__u16 val)
-{
-#ifdef __arch_swab16
-        return __arch_swab16(val);
-#else
-        return ___constant_swab16(val);
-#endif
-}
-
-static inline __attribute_const__ __u32 __fswab32(__u32 val)
-{
-#ifdef __arch_swab32
-        return __arch_swab32(val);
-#else
-        return ___constant_swab32(val);
-#endif
-}
-
-static inline __attribute_const__ __u64 __fswab64(__u64 val)
-{
-#ifdef __arch_swab64
-        return __arch_swab64(val);
-#elif defined(__SWAB_64_THRU_32__)
-        __u32 h = val >> 32;
-        __u32 l = val & ((1ULL << 32) - 1);
-        return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
-#else
-        return ___constant_swab64(val);
-#endif
-}
-
-static inline __attribute_const__ __u32 __fswahw32(__u32 val)
-{
-#ifdef __arch_swahw32
-        return __arch_swahw32(val);
-#else
-        return ___constant_swahw32(val);
-#endif
-}
-
-static inline __attribute_const__ __u32 __fswahb32(__u32 val)
-{
-#ifdef __arch_swahb32
-        return __arch_swahb32(val);
-#else
-        return ___constant_swahb32(val);
-#endif
-}
-
-/**
- * __swab16 - return a byteswapped 16-bit value
- * @x: value to byteswap
- */
-#define __swab16(x)                             \
-        (__builtin_constant_p((__u16)(x)) ?     \
-        ___constant_swab16(x) :                 \
-        __fswab16(x))
-
-/**
- * __swab32 - return a byteswapped 32-bit value
- * @x: value to byteswap
- */
-#define __swab32(x)                             \
-        (__builtin_constant_p((__u32)(x)) ?     \
-        ___constant_swab32(x) :                 \
-        __fswab32(x))
-
-/**
- * __swab64 - return a byteswapped 64-bit value
- * @x: value to byteswap
- */
-#define __swab64(x)                             \
-        (__builtin_constant_p((__u64)(x)) ?     \
-        ___constant_swab64(x) :                 \
-        __fswab64(x))
-
-/**
- * __swahw32 - return a word-swapped 32-bit value
- * @x: value to wordswap
- *
- * __swahw32(0x12340000) is 0x00001234
- */
-#define __swahw32(x)                            \
-        (__builtin_constant_p((__u32)(x)) ?     \
-        ___constant_swahw32(x) :                \
-        __fswahw32(x))
-
-/**
- * __swahb32 - return a high and low byte-swapped 32-bit value
- * @x: value to byteswap
- *
- * __swahb32(0x12345678) is 0x34127856
- */
-#define __swahb32(x)                            \
-        (__builtin_constant_p((__u32)(x)) ?     \
-        ___constant_swahb32(x) :                \
-        __fswahb32(x))
-
-/**
- * __swab16p - return a byteswapped 16-bit value from a pointer
- * @p: pointer to a naturally-aligned 16-bit value
- */
-static inline __u16 __swab16p(const __u16 *p)
-{
-#ifdef __arch_swab16p
-        return __arch_swab16p(p);
-#else
-        return __swab16(*p);
-#endif
-}
-
-/**
- * __swab32p - return a byteswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- */
-static inline __u32 __swab32p(const __u32 *p)
-{
-#ifdef __arch_swab32p
-        return __arch_swab32p(p);
-#else
-        return __swab32(*p);
-#endif
-}
-
-/**
- * __swab64p - return a byteswapped 64-bit value from a pointer
- * @p: pointer to a naturally-aligned 64-bit value
- */
-static inline __u64 __swab64p(const __u64 *p)
-{
-#ifdef __arch_swab64p
-        return __arch_swab64p(p);
-#else
-        return __swab64(*p);
-#endif
-}
-
-/**
- * __swahw32p - return a wordswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahw32() for details of wordswapping.
- */
-static inline __u32 __swahw32p(const __u32 *p)
-{
-#ifdef __arch_swahw32p
-        return __arch_swahw32p(p);
-#else
-        return __swahw32(*p);
-#endif
-}
-
-/**
- * __swahb32p - return a high and low byteswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahb32() for details of high/low byteswapping.
- */
-static inline __u32 __swahb32p(const __u32 *p)
-{
-#ifdef __arch_swahb32p
-        return __arch_swahb32p(p);
-#else
-        return __swahb32(*p);
-#endif
-}
-
-/**
- * __swab16s - byteswap a 16-bit value in-place
- * @p: pointer to a naturally-aligned 16-bit value
- */
-static inline void __swab16s(__u16 *p)
-{
-#ifdef __arch_swab16s
-        __arch_swab16s(p);
-#else
-        *p = __swab16p(p);
-#endif
-}
-/**
- * __swab32s - byteswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- */
-static inline void __swab32s(__u32 *p)
-{
-#ifdef __arch_swab32s
-        __arch_swab32s(p);
-#else
-        *p = __swab32p(p);
-#endif
-}
-
-/**
- * __swab64s - byteswap a 64-bit value in-place
- * @p: pointer to a naturally-aligned 64-bit value
- */
-static inline void __swab64s(__u64 *p)
-{
-#ifdef __arch_swab64s
-        __arch_swab64s(p);
-#else
-        *p = __swab64p(p);
-#endif
-}
-
-/**
- * __swahw32s - wordswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahw32() for details of wordswapping
- */
-static inline void __swahw32s(__u32 *p)
-{
-#ifdef __arch_swahw32s
-        __arch_swahw32s(p);
-#else
-        *p = __swahw32p(p);
-#endif
-}
-
-/**
- * __swahb32s - high and low byteswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahb32() for details of high and low byte swapping
- */
-static inline void __swahb32s(__u32 *p)
-{
-#ifdef __arch_swahb32s
-        __arch_swahb32s(p);
-#else
-        *p = __swahb32p(p);
-#endif
-}
-
-#ifdef __KERNEL__
 # define swab16 __swab16
 # define swab32 __swab32
 # define swab64 __swab64
@@ -294,6 +18,4 @@ static inline void __swahb32s(__u32 *p)
 # define swab64s __swab64s
 # define swahw32s __swahw32s
 # define swahb32s __swahb32s
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SWAB_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 388e70601413..68df9c17fbbb 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -281,7 +281,7 @@ static inline int zone_reclaim(struct zone *z, gfp_t mask, unsigned int order)
 }
 #endif
 
-extern int page_evictable(struct page *page, struct vm_area_struct *vma);
+extern int page_evictable(struct page *page);
 extern void check_move_unevictable_pages(struct page **, int nr_pages);
 
 extern unsigned long scan_unevictable_pages;
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index 2e7d81c4e5ad..f1405b1c71ba 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -8,295 +8,11 @@
  * Redistribution of this file is permitted under
  * the terms of the GNU Public License (GPL)
  */
-
 #ifndef _SYNCLINK_H_
 #define _SYNCLINK_H_
-#define SYNCLINK_H_VERSION 3.6
-
-#include <linux/types.h>
-
-#define BIT0    0x0001
-#define BIT1    0x0002
-#define BIT2    0x0004
-#define BIT3    0x0008
-#define BIT4    0x0010
-#define BIT5    0x0020
-#define BIT6    0x0040
-#define BIT7    0x0080
-#define BIT8    0x0100
-#define BIT9    0x0200
-#define BIT10   0x0400
-#define BIT11   0x0800
-#define BIT12   0x1000
-#define BIT13   0x2000
-#define BIT14   0x4000
-#define BIT15   0x8000
-#define BIT16   0x00010000
-#define BIT17   0x00020000
-#define BIT18   0x00040000
-#define BIT19   0x00080000
-#define BIT20   0x00100000
-#define BIT21   0x00200000
-#define BIT22   0x00400000
-#define BIT23   0x00800000
-#define BIT24   0x01000000
-#define BIT25   0x02000000
-#define BIT26   0x04000000
-#define BIT27   0x08000000
-#define BIT28   0x10000000
-#define BIT29   0x20000000
-#define BIT30   0x40000000
-#define BIT31   0x80000000
-
-
-#define HDLC_MAX_FRAME_SIZE     65535
-#define MAX_ASYNC_TRANSMIT      4096
-#define MAX_ASYNC_BUFFER_SIZE   4096
-
-#define ASYNC_PARITY_NONE               0
-#define ASYNC_PARITY_EVEN               1
-#define ASYNC_PARITY_ODD                2
-#define ASYNC_PARITY_SPACE              3
-
-#define HDLC_FLAG_UNDERRUN_ABORT7       0x0000
-#define HDLC_FLAG_UNDERRUN_ABORT15      0x0001
-#define HDLC_FLAG_UNDERRUN_FLAG         0x0002
-#define HDLC_FLAG_UNDERRUN_CRC          0x0004
-#define HDLC_FLAG_SHARE_ZERO            0x0010
-#define HDLC_FLAG_AUTO_CTS              0x0020
-#define HDLC_FLAG_AUTO_DCD              0x0040
-#define HDLC_FLAG_AUTO_RTS              0x0080
-#define HDLC_FLAG_RXC_DPLL              0x0100
-#define HDLC_FLAG_RXC_BRG               0x0200
-#define HDLC_FLAG_RXC_TXCPIN            0x8000
-#define HDLC_FLAG_RXC_RXCPIN            0x0000
-#define HDLC_FLAG_TXC_DPLL              0x0400
-#define HDLC_FLAG_TXC_BRG               0x0800
-#define HDLC_FLAG_TXC_TXCPIN            0x0000
-#define HDLC_FLAG_TXC_RXCPIN            0x0008
-#define HDLC_FLAG_DPLL_DIV8             0x1000
-#define HDLC_FLAG_DPLL_DIV16            0x2000
-#define HDLC_FLAG_DPLL_DIV32            0x0000
-#define HDLC_FLAG_HDLC_LOOPMODE         0x4000
-
-#define HDLC_CRC_NONE                   0
-#define HDLC_CRC_16_CCITT               1
-#define HDLC_CRC_32_CCITT               2
-#define HDLC_CRC_MASK                   0x00ff
-#define HDLC_CRC_RETURN_EX              0x8000
-
-#define RX_OK                           0
-#define RX_CRC_ERROR                    1
-
-#define HDLC_TXIDLE_FLAGS               0
-#define HDLC_TXIDLE_ALT_ZEROS_ONES      1
-#define HDLC_TXIDLE_ZEROS               2
-#define HDLC_TXIDLE_ONES                3
-#define HDLC_TXIDLE_ALT_MARK_SPACE      4
-#define HDLC_TXIDLE_SPACE               5
-#define HDLC_TXIDLE_MARK                6
-#define HDLC_TXIDLE_CUSTOM_8            0x10000000
-#define HDLC_TXIDLE_CUSTOM_16           0x20000000
-
-#define HDLC_ENCODING_NRZ                       0
-#define HDLC_ENCODING_NRZB                      1
-#define HDLC_ENCODING_NRZI_MARK                 2
-#define HDLC_ENCODING_NRZI_SPACE                3
-#define HDLC_ENCODING_NRZI                      HDLC_ENCODING_NRZI_SPACE
-#define HDLC_ENCODING_BIPHASE_MARK              4
-#define HDLC_ENCODING_BIPHASE_SPACE             5
-#define HDLC_ENCODING_BIPHASE_LEVEL             6
-#define HDLC_ENCODING_DIFF_BIPHASE_LEVEL        7
-
-#define HDLC_PREAMBLE_LENGTH_8BITS      0
-#define HDLC_PREAMBLE_LENGTH_16BITS     1
-#define HDLC_PREAMBLE_LENGTH_32BITS     2
-#define HDLC_PREAMBLE_LENGTH_64BITS     3
-
-#define HDLC_PREAMBLE_PATTERN_NONE      0
-#define HDLC_PREAMBLE_PATTERN_ZEROS     1
-#define HDLC_PREAMBLE_PATTERN_FLAGS     2
-#define HDLC_PREAMBLE_PATTERN_10        3
-#define HDLC_PREAMBLE_PATTERN_01        4
-#define HDLC_PREAMBLE_PATTERN_ONES      5
-
-#define MGSL_MODE_ASYNC         1
-#define MGSL_MODE_HDLC          2
-#define MGSL_MODE_MONOSYNC      3
-#define MGSL_MODE_BISYNC        4
-#define MGSL_MODE_RAW           6
-#define MGSL_MODE_BASE_CLOCK    7
-#define MGSL_MODE_XSYNC         8
-
-#define MGSL_BUS_TYPE_ISA       1
-#define MGSL_BUS_TYPE_EISA      2
-#define MGSL_BUS_TYPE_PCI       5
-
-#define MGSL_INTERFACE_MASK     0xf
-#define MGSL_INTERFACE_DISABLE  0
-#define MGSL_INTERFACE_RS232    1
-#define MGSL_INTERFACE_V35      2
-#define MGSL_INTERFACE_RS422    3
-#define MGSL_INTERFACE_RTS_EN   0x10
-#define MGSL_INTERFACE_LL       0x20
-#define MGSL_INTERFACE_RL       0x40
-#define MGSL_INTERFACE_MSB_FIRST 0x80
-
-typedef struct _MGSL_PARAMS
-{
-        /* Common */
-
-        unsigned long   mode;           /* Asynchronous or HDLC */
-        unsigned char   loopback;       /* internal loopback mode */
-
-        /* HDLC Only */
-
-        unsigned short  flags;
-        unsigned char   encoding;       /* NRZ, NRZI, etc. */
-        unsigned long   clock_speed;    /* external clock speed in bits per second */
-        unsigned char   addr_filter;    /* receive HDLC address filter, 0xFF = disable */
-        unsigned short  crc_type;       /* None, CRC16-CCITT, or CRC32-CCITT */
-        unsigned char   preamble_length;
-        unsigned char   preamble;
 
-        /* Async Only */
+#include <uapi/linux/synclink.h>
 
-        unsigned long   data_rate;      /* bits per second */
-        unsigned char   data_bits;      /* 7 or 8 data bits */
-        unsigned char   stop_bits;      /* 1 or 2 stop bits */
-        unsigned char   parity;         /* none, even, or odd */
-
-} MGSL_PARAMS, *PMGSL_PARAMS;
-
-#define MICROGATE_VENDOR_ID 0x13c0
-#define SYNCLINK_DEVICE_ID 0x0010
-#define MGSCC_DEVICE_ID 0x0020
-#define SYNCLINK_SCA_DEVICE_ID 0x0030
-#define SYNCLINK_GT_DEVICE_ID 0x0070
-#define SYNCLINK_GT4_DEVICE_ID 0x0080
-#define SYNCLINK_AC_DEVICE_ID  0x0090
-#define SYNCLINK_GT2_DEVICE_ID 0x00A0
-#define MGSL_MAX_SERIAL_NUMBER 30
-
-/*
-** device diagnostics status
-*/
-
-#define DiagStatus_OK                           0
-#define DiagStatus_AddressFailure               1
-#define DiagStatus_AddressConflict              2
-#define DiagStatus_IrqFailure                   3
-#define DiagStatus_IrqConflict                  4
-#define DiagStatus_DmaFailure                   5
-#define DiagStatus_DmaConflict                  6
-#define DiagStatus_PciAdapterNotFound           7
-#define DiagStatus_CantAssignPciResources       8
-#define DiagStatus_CantAssignPciMemAddr         9
-#define DiagStatus_CantAssignPciIoAddr          10
-#define DiagStatus_CantAssignPciIrq             11
-#define DiagStatus_MemoryError                  12
-
-#define SerialSignal_DCD            0x01     /* Data Carrier Detect */
-#define SerialSignal_TXD            0x02     /* Transmit Data */
-#define SerialSignal_RI             0x04     /* Ring Indicator */
-#define SerialSignal_RXD            0x08     /* Receive Data */
-#define SerialSignal_CTS            0x10     /* Clear to Send */
-#define SerialSignal_RTS            0x20     /* Request to Send */
-#define SerialSignal_DSR            0x40     /* Data Set Ready */
-#define SerialSignal_DTR            0x80     /* Data Terminal Ready */
-
-
-/*
- * Counters of the input lines (CTS, DSR, RI, CD) interrupts
- */
-struct mgsl_icount {
-        __u32   cts, dsr, rng, dcd, tx, rx;
-        __u32   frame, parity, overrun, brk;
-        __u32   buf_overrun;
-        __u32   txok;
-        __u32   txunder;
-        __u32   txabort;
-        __u32   txtimeout;
-        __u32   rxshort;
-        __u32   rxlong;
-        __u32   rxabort;
-        __u32   rxover;
-        __u32   rxcrc;
-        __u32   rxok;
-        __u32   exithunt;
-        __u32   rxidle;
-};
-
-struct gpio_desc {
-        __u32 state;
-        __u32 smask;
-        __u32 dir;
-        __u32 dmask;
-};
-
-#define DEBUG_LEVEL_DATA        1
-#define DEBUG_LEVEL_ERROR       2
-#define DEBUG_LEVEL_INFO        3
-#define DEBUG_LEVEL_BH          4
-#define DEBUG_LEVEL_ISR         5
-
-/*
-** Event bit flags for use with MgslWaitEvent
-*/
-
-#define MgslEvent_DsrActive     0x0001
-#define MgslEvent_DsrInactive   0x0002
-#define MgslEvent_Dsr           0x0003
-#define MgslEvent_CtsActive     0x0004
-#define MgslEvent_CtsInactive   0x0008
-#define MgslEvent_Cts           0x000c
-#define MgslEvent_DcdActive     0x0010
-#define MgslEvent_DcdInactive   0x0020
-#define MgslEvent_Dcd           0x0030
-#define MgslEvent_RiActive      0x0040
-#define MgslEvent_RiInactive    0x0080
-#define MgslEvent_Ri            0x00c0
-#define MgslEvent_ExitHuntMode  0x0100
-#define MgslEvent_IdleReceived  0x0200
-
-/* Private IOCTL codes:
- *
- * MGSL_IOCSPARAMS      set MGSL_PARAMS structure values
- * MGSL_IOCGPARAMS      get current MGSL_PARAMS structure values
- * MGSL_IOCSTXIDLE      set current transmit idle mode
- * MGSL_IOCGTXIDLE      get current transmit idle mode
- * MGSL_IOCTXENABLE     enable or disable transmitter
- * MGSL_IOCRXENABLE     enable or disable receiver
- * MGSL_IOCTXABORT      abort transmitting frame (HDLC)
- * MGSL_IOCGSTATS       return current statistics
- * MGSL_IOCWAITEVENT    wait for specified event to occur
- * MGSL_LOOPTXDONE      transmit in HDLC LoopMode done
- * MGSL_IOCSIF          set the serial interface type
- * MGSL_IOCGIF          get the serial interface type
- */
-#define MGSL_MAGIC_IOC  'm'
-#define MGSL_IOCSPARAMS         _IOW(MGSL_MAGIC_IOC,0,struct _MGSL_PARAMS)
-#define MGSL_IOCGPARAMS         _IOR(MGSL_MAGIC_IOC,1,struct _MGSL_PARAMS)
-#define MGSL_IOCSTXIDLE         _IO(MGSL_MAGIC_IOC,2)
-#define MGSL_IOCGTXIDLE         _IO(MGSL_MAGIC_IOC,3)
-#define MGSL_IOCTXENABLE        _IO(MGSL_MAGIC_IOC,4)
-#define MGSL_IOCRXENABLE        _IO(MGSL_MAGIC_IOC,5)
-#define MGSL_IOCTXABORT         _IO(MGSL_MAGIC_IOC,6)
-#define MGSL_IOCGSTATS          _IO(MGSL_MAGIC_IOC,7)
-#define MGSL_IOCWAITEVENT       _IOWR(MGSL_MAGIC_IOC,8,int)
-#define MGSL_IOCCLRMODCOUNT     _IO(MGSL_MAGIC_IOC,15)
-#define MGSL_IOCLOOPTXDONE      _IO(MGSL_MAGIC_IOC,9)
-#define MGSL_IOCSIF             _IO(MGSL_MAGIC_IOC,10)
-#define MGSL_IOCGIF             _IO(MGSL_MAGIC_IOC,11)
-#define MGSL_IOCSGPIO           _IOW(MGSL_MAGIC_IOC,16,struct gpio_desc)
-#define MGSL_IOCGGPIO           _IOR(MGSL_MAGIC_IOC,17,struct gpio_desc)
-#define MGSL_IOCWAITGPIO        _IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc)
-#define MGSL_IOCSXSYNC          _IO(MGSL_MAGIC_IOC, 19)
-#define MGSL_IOCGXSYNC          _IO(MGSL_MAGIC_IOC, 20)
-#define MGSL_IOCSXCTRL          _IO(MGSL_MAGIC_IOC, 21)
-#define MGSL_IOCGXCTRL          _IO(MGSL_MAGIC_IOC, 22)
-
-#ifdef __KERNEL__
 /* provide 32 bit ioctl compatibility on 64 bit systems */
 #ifdef CONFIG_COMPAT
 #include <linux/compat.h>
@@ -318,6 +34,4 @@ struct MGSL_PARAMS32 {
 #define MGSL_IOCSPARAMS32 _IOW(MGSL_MAGIC_IOC,0,struct MGSL_PARAMS32)
 #define MGSL_IOCGPARAMS32 _IOR(MGSL_MAGIC_IOC,1,struct MGSL_PARAMS32)
 #endif
-#endif
-
 #endif /* _SYNCLINK_H_ */
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 19439c75c5b2..727f0cd73921 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -827,7 +827,15 @@ asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
                                   const char  __user *pathname);
 asmlinkage long sys_syncfs(int fd);
 
+#ifndef CONFIG_GENERIC_KERNEL_EXECVE
 int kernel_execve(const char *filename, const char *const argv[], const char *const envp[]);
+#else
+#define kernel_execve(filename, argv, envp) \
+        do_execve(filename, \
+                (const char __user *const __user *)argv, \
+                (const char __user *const __user *)envp, \
+                current_pt_regs())
+#endif
 
 
 asmlinkage long sys_perf_event_open(
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index c34b4c82b0dc..cd844a6a8d5f 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -18,921 +18,14 @@
  ****************************************************************
  ****************************************************************
  */
-
 #ifndef _LINUX_SYSCTL_H
 #define _LINUX_SYSCTL_H
 
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/compiler.h>
-
-struct completion;
-
-#define CTL_MAXNAME 10          /* how many path components do we allow in a
-                                   call to sysctl?   In other words, what is
-                                   the largest acceptable value for the nlen
-                                   member of a struct __sysctl_args to have? */
-
-struct __sysctl_args {
-        int __user *name;
-        int nlen;
-        void __user *oldval;
-        size_t __user *oldlenp;
-        void __user *newval;
-        size_t newlen;
-        unsigned long __unused[4];
-};
-
-/* Define sysctl names first */
-
-/* Top-level names: */
-
-enum
-{
-        CTL_KERN=1,             /* General kernel info and control */
-        CTL_VM=2,               /* VM management */
-        CTL_NET=3,              /* Networking */
-        CTL_PROC=4,             /* removal breaks strace(1) compilation */
-        CTL_FS=5,               /* Filesystems */
-        CTL_DEBUG=6,            /* Debugging */
-        CTL_DEV=7,              /* Devices */
-        CTL_BUS=8,              /* Busses */
-        CTL_ABI=9,              /* Binary emulation */
-        CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
-        CTL_ARLAN=254,          /* arlan wireless driver */
-        CTL_S390DBF=5677,       /* s390 debug */
-        CTL_SUNRPC=7249,        /* sunrpc debug */
-        CTL_PM=9899,            /* frv power management */
-        CTL_FRV=9898,           /* frv specific sysctls */
-};
-
-/* CTL_BUS names: */
-enum
-{
-        CTL_BUS_ISA=1           /* ISA */
-};
-
-/* /proc/sys/fs/inotify/ */
-enum
-{
-        INOTIFY_MAX_USER_INSTANCES=1,   /* max instances per user */
-        INOTIFY_MAX_USER_WATCHES=2,     /* max watches per user */
-        INOTIFY_MAX_QUEUED_EVENTS=3     /* max queued events per instance */
-};
-
-/* CTL_KERN names: */
-enum
-{
-        KERN_OSTYPE=1,          /* string: system version */
-        KERN_OSRELEASE=2,       /* string: system release */
-        KERN_OSREV=3,           /* int: system revision */
-        KERN_VERSION=4,         /* string: compile time info */
-        KERN_SECUREMASK=5,      /* struct: maximum rights mask */
-        KERN_PROF=6,            /* table: profiling information */
-        KERN_NODENAME=7,        /* string: hostname */
-        KERN_DOMAINNAME=8,      /* string: domainname */
-
-        KERN_PANIC=15,          /* int: panic timeout */
-        KERN_REALROOTDEV=16,    /* real root device to mount after initrd */
-
-        KERN_SPARC_REBOOT=21,   /* reboot command on Sparc */
-        KERN_CTLALTDEL=22,      /* int: allow ctl-alt-del to reboot */
-        KERN_PRINTK=23,         /* struct: control printk logging parameters */
-        KERN_NAMETRANS=24,      /* Name translation */
-        KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */
-        KERN_PPC_ZEROPAGED=26,  /* turn idle page zeroing on/off on PPC */
-        KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */
-        KERN_MODPROBE=28,       /* string: modprobe path */
-        KERN_SG_BIG_BUFF=29,    /* int: sg driver reserved buffer size */
-        KERN_ACCT=30,           /* BSD process accounting parameters */
-        KERN_PPC_L2CR=31,       /* l2cr register on PPC */
-
-        KERN_RTSIGNR=32,        /* Number of rt sigs queued */
-        KERN_RTSIGMAX=33,       /* Max queuable */
-        
-        KERN_SHMMAX=34,         /* long: Maximum shared memory segment */
-        KERN_MSGMAX=35,         /* int: Maximum size of a messege */
-        KERN_MSGMNB=36,         /* int: Maximum message queue size */
-        KERN_MSGPOOL=37,        /* int: Maximum system message pool size */
-        KERN_SYSRQ=38,          /* int: Sysreq enable */
-        KERN_MAX_THREADS=39,    /* int: Maximum nr of threads in the system */
-        KERN_RANDOM=40,         /* Random driver */
-        KERN_SHMALL=41,         /* int: Maximum size of shared memory */
-        KERN_MSGMNI=42,         /* int: msg queue identifiers */
-        KERN_SEM=43,            /* struct: sysv semaphore limits */
-        KERN_SPARC_STOP_A=44,   /* int: Sparc Stop-A enable */
-        KERN_SHMMNI=45,         /* int: shm array identifiers */
-        KERN_OVERFLOWUID=46,    /* int: overflow UID */
-        KERN_OVERFLOWGID=47,    /* int: overflow GID */
-        KERN_SHMPATH=48,        /* string: path to shm fs */
-        KERN_HOTPLUG=49,        /* string: path to uevent helper (deprecated) */
-        KERN_IEEE_EMULATION_WARNINGS=50, /* int: unimplemented ieee instructions */
-        KERN_S390_USER_DEBUG_LOGGING=51,  /* int: dumps of user faults */
-        KERN_CORE_USES_PID=52,          /* int: use core or core.%pid */
-        KERN_TAINTED=53,        /* int: various kernel tainted flags */
-        KERN_CADPID=54,         /* int: PID of the process to notify on CAD */
-        KERN_PIDMAX=55,         /* int: PID # limit */
-        KERN_CORE_PATTERN=56,   /* string: pattern for core-file names */
-        KERN_PANIC_ON_OOPS=57,  /* int: whether we will panic on an oops */
-        KERN_HPPA_PWRSW=58,     /* int: hppa soft-power enable */
-        KERN_HPPA_UNALIGNED=59, /* int: hppa unaligned-trap enable */
-        KERN_PRINTK_RATELIMIT=60, /* int: tune printk ratelimiting */
-        KERN_PRINTK_RATELIMIT_BURST=61, /* int: tune printk ratelimiting */
-        KERN_PTY=62,            /* dir: pty driver */
-        KERN_NGROUPS_MAX=63,    /* int: NGROUPS_MAX */
-        KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
-        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
-        KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
-        KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
-        KERN_RANDOMIZE=68, /* int: randomize virtual address space */
-        KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
-        KERN_SPIN_RETRY=70,     /* int: number of spinlock retries */
-        KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
-        KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
-        KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
-        KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */
-        KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
-        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
-};
-
-
-
-/* CTL_VM names: */
-enum
-{
-        VM_UNUSED1=1,           /* was: struct: Set vm swapping control */
-        VM_UNUSED2=2,           /* was; int: Linear or sqrt() swapout for hogs */
-        VM_UNUSED3=3,           /* was: struct: Set free page thresholds */
-        VM_UNUSED4=4,           /* Spare */
-        VM_OVERCOMMIT_MEMORY=5, /* Turn off the virtual memory safety limit */
-        VM_UNUSED5=6,           /* was: struct: Set buffer memory thresholds */
-        VM_UNUSED7=7,           /* was: struct: Set cache memory thresholds */
-        VM_UNUSED8=8,           /* was: struct: Control kswapd behaviour */
-        VM_UNUSED9=9,           /* was: struct: Set page table cache parameters */
-        VM_PAGE_CLUSTER=10,     /* int: set number of pages to swap together */
-        VM_DIRTY_BACKGROUND=11, /* dirty_background_ratio */
-        VM_DIRTY_RATIO=12,      /* dirty_ratio */
-        VM_DIRTY_WB_CS=13,      /* dirty_writeback_centisecs */
-        VM_DIRTY_EXPIRE_CS=14,  /* dirty_expire_centisecs */
-        VM_NR_PDFLUSH_THREADS=15, /* nr_pdflush_threads */
-        VM_OVERCOMMIT_RATIO=16, /* percent of RAM to allow overcommit in */
-        VM_PAGEBUF=17,          /* struct: Control pagebuf parameters */
-        VM_HUGETLB_PAGES=18,    /* int: Number of available Huge Pages */
-        VM_SWAPPINESS=19,       /* Tendency to steal mapped memory */
-        VM_LOWMEM_RESERVE_RATIO=20,/* reservation ratio for lower memory zones */
-        VM_MIN_FREE_KBYTES=21,  /* Minimum free kilobytes to maintain */
-        VM_MAX_MAP_COUNT=22,    /* int: Maximum number of mmaps/address-space */
-        VM_LAPTOP_MODE=23,      /* vm laptop mode */
-        VM_BLOCK_DUMP=24,       /* block dump mode */
-        VM_HUGETLB_GROUP=25,    /* permitted hugetlb group */
-        VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
-        VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
-        VM_SWAP_TOKEN_TIMEOUT=28, /* default time for token time out */
-        VM_DROP_PAGECACHE=29,   /* int: nuke lots of pagecache */
-        VM_PERCPU_PAGELIST_FRACTION=30,/* int: fraction of pages in each percpu_pagelist */
-        VM_ZONE_RECLAIM_MODE=31, /* reclaim local zone memory before going off node */
-        VM_MIN_UNMAPPED=32,     /* Set min percent of unmapped pages */
-        VM_PANIC_ON_OOM=33,     /* panic at out-of-memory */
-        VM_VDSO_ENABLED=34,     /* map VDSO into new processes? */
-        VM_MIN_SLAB=35,          /* Percent pages ignored by zone reclaim */
-};
-
-
-/* CTL_NET names: */
-enum
-{
-        NET_CORE=1,
-        NET_ETHER=2,
-        NET_802=3,
-        NET_UNIX=4,
-        NET_IPV4=5,
-        NET_IPX=6,
-        NET_ATALK=7,
-        NET_NETROM=8,
-        NET_AX25=9,
-        NET_BRIDGE=10,
-        NET_ROSE=11,
-        NET_IPV6=12,
-        NET_X25=13,
-        NET_TR=14,
-        NET_DECNET=15,
-        NET_ECONET=16,
-        NET_SCTP=17,
-        NET_LLC=18,
-        NET_NETFILTER=19,
-        NET_DCCP=20,
-        NET_IRDA=412,
-};
-
-/* /proc/sys/kernel/random */
-enum
-{
-        RANDOM_POOLSIZE=1,
-        RANDOM_ENTROPY_COUNT=2,
-        RANDOM_READ_THRESH=3,
-        RANDOM_WRITE_THRESH=4,
-        RANDOM_BOOT_ID=5,
-        RANDOM_UUID=6
-};
-
-/* /proc/sys/kernel/pty */
-enum
-{
-        PTY_MAX=1,
-        PTY_NR=2
-};
-
-/* /proc/sys/bus/isa */
-enum
-{
-        BUS_ISA_MEM_BASE=1,
-        BUS_ISA_PORT_BASE=2,
-        BUS_ISA_PORT_SHIFT=3
-};
-
-/* /proc/sys/net/core */
-enum
-{
-        NET_CORE_WMEM_MAX=1,
-        NET_CORE_RMEM_MAX=2,
-        NET_CORE_WMEM_DEFAULT=3,
-        NET_CORE_RMEM_DEFAULT=4,
-/* was  NET_CORE_DESTROY_DELAY */
-        NET_CORE_MAX_BACKLOG=6,
-        NET_CORE_FASTROUTE=7,
-        NET_CORE_MSG_COST=8,
-        NET_CORE_MSG_BURST=9,
-        NET_CORE_OPTMEM_MAX=10,
-        NET_CORE_HOT_LIST_LENGTH=11,
-        NET_CORE_DIVERT_VERSION=12,
-        NET_CORE_NO_CONG_THRESH=13,
-        NET_CORE_NO_CONG=14,
-        NET_CORE_LO_CONG=15,
-        NET_CORE_MOD_CONG=16,
-        NET_CORE_DEV_WEIGHT=17,
-        NET_CORE_SOMAXCONN=18,
-        NET_CORE_BUDGET=19,
-        NET_CORE_AEVENT_ETIME=20,
-        NET_CORE_AEVENT_RSEQTH=21,
-        NET_CORE_WARNINGS=22,
-};
-
-/* /proc/sys/net/ethernet */
-
-/* /proc/sys/net/802 */
-
-/* /proc/sys/net/unix */
-
-enum
-{
-        NET_UNIX_DESTROY_DELAY=1,
-        NET_UNIX_DELETE_DELAY=2,
-        NET_UNIX_MAX_DGRAM_QLEN=3,
-};
-
-/* /proc/sys/net/netfilter */
-enum
-{
-        NET_NF_CONNTRACK_MAX=1,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
-        NET_NF_CONNTRACK_UDP_TIMEOUT=10,
-        NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
-        NET_NF_CONNTRACK_ICMP_TIMEOUT=12,
-        NET_NF_CONNTRACK_GENERIC_TIMEOUT=13,
-        NET_NF_CONNTRACK_BUCKETS=14,
-        NET_NF_CONNTRACK_LOG_INVALID=15,
-        NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
-        NET_NF_CONNTRACK_TCP_LOOSE=17,
-        NET_NF_CONNTRACK_TCP_BE_LIBERAL=18,
-        NET_NF_CONNTRACK_TCP_MAX_RETRANS=19,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
-        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
-        NET_NF_CONNTRACK_COUNT=27,
-        NET_NF_CONNTRACK_ICMPV6_TIMEOUT=28,
-        NET_NF_CONNTRACK_FRAG6_TIMEOUT=29,
-        NET_NF_CONNTRACK_FRAG6_LOW_THRESH=30,
-        NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31,
-        NET_NF_CONNTRACK_CHECKSUM=32,
-};
-
-/* /proc/sys/net/ipv4 */
-enum
-{
-        /* v2.0 compatibile variables */
-        NET_IPV4_FORWARD=8,
-        NET_IPV4_DYNADDR=9,
-
-        NET_IPV4_CONF=16,
-        NET_IPV4_NEIGH=17,
-        NET_IPV4_ROUTE=18,
-        NET_IPV4_FIB_HASH=19,
-        NET_IPV4_NETFILTER=20,
-
-        NET_IPV4_TCP_TIMESTAMPS=33,
-        NET_IPV4_TCP_WINDOW_SCALING=34,
-        NET_IPV4_TCP_SACK=35,
-        NET_IPV4_TCP_RETRANS_COLLAPSE=36,
-        NET_IPV4_DEFAULT_TTL=37,
-        NET_IPV4_AUTOCONFIG=38,
-        NET_IPV4_NO_PMTU_DISC=39,
-        NET_IPV4_TCP_SYN_RETRIES=40,
-        NET_IPV4_IPFRAG_HIGH_THRESH=41,
-        NET_IPV4_IPFRAG_LOW_THRESH=42,
-        NET_IPV4_IPFRAG_TIME=43,
-        NET_IPV4_TCP_MAX_KA_PROBES=44,
-        NET_IPV4_TCP_KEEPALIVE_TIME=45,
-        NET_IPV4_TCP_KEEPALIVE_PROBES=46,
-        NET_IPV4_TCP_RETRIES1=47,
-        NET_IPV4_TCP_RETRIES2=48,
-        NET_IPV4_TCP_FIN_TIMEOUT=49,
-        NET_IPV4_IP_MASQ_DEBUG=50,
-        NET_TCP_SYNCOOKIES=51,
-        NET_TCP_STDURG=52,
-        NET_TCP_RFC1337=53,
-        NET_TCP_SYN_TAILDROP=54,
-        NET_TCP_MAX_SYN_BACKLOG=55,
-        NET_IPV4_LOCAL_PORT_RANGE=56,
-        NET_IPV4_ICMP_ECHO_IGNORE_ALL=57,
-        NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS=58,
-        NET_IPV4_ICMP_SOURCEQUENCH_RATE=59,
-        NET_IPV4_ICMP_DESTUNREACH_RATE=60,
-        NET_IPV4_ICMP_TIMEEXCEED_RATE=61,
-        NET_IPV4_ICMP_PARAMPROB_RATE=62,
-        NET_IPV4_ICMP_ECHOREPLY_RATE=63,
-        NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES=64,
-        NET_IPV4_IGMP_MAX_MEMBERSHIPS=65,
-        NET_TCP_TW_RECYCLE=66,
-        NET_IPV4_ALWAYS_DEFRAG=67,
-        NET_IPV4_TCP_KEEPALIVE_INTVL=68,
-        NET_IPV4_INET_PEER_THRESHOLD=69,
-        NET_IPV4_INET_PEER_MINTTL=70,
-        NET_IPV4_INET_PEER_MAXTTL=71,
-        NET_IPV4_INET_PEER_GC_MINTIME=72,
-        NET_IPV4_INET_PEER_GC_MAXTIME=73,
-        NET_TCP_ORPHAN_RETRIES=74,
-        NET_TCP_ABORT_ON_OVERFLOW=75,
-        NET_TCP_SYNACK_RETRIES=76,
-        NET_TCP_MAX_ORPHANS=77,
-        NET_TCP_MAX_TW_BUCKETS=78,
-        NET_TCP_FACK=79,
-        NET_TCP_REORDERING=80,
-        NET_TCP_ECN=81,
-        NET_TCP_DSACK=82,
-        NET_TCP_MEM=83,
-        NET_TCP_WMEM=84,
-        NET_TCP_RMEM=85,
-        NET_TCP_APP_WIN=86,
-        NET_TCP_ADV_WIN_SCALE=87,
-        NET_IPV4_NONLOCAL_BIND=88,
-        NET_IPV4_ICMP_RATELIMIT=89,
-        NET_IPV4_ICMP_RATEMASK=90,
-        NET_TCP_TW_REUSE=91,
-        NET_TCP_FRTO=92,
-        NET_TCP_LOW_LATENCY=93,
-        NET_IPV4_IPFRAG_SECRET_INTERVAL=94,
-        NET_IPV4_IGMP_MAX_MSF=96,
-        NET_TCP_NO_METRICS_SAVE=97,
-        NET_TCP_DEFAULT_WIN_SCALE=105,
-        NET_TCP_MODERATE_RCVBUF=106,
-        NET_TCP_TSO_WIN_DIVISOR=107,
-        NET_TCP_BIC_BETA=108,
-        NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109,
-        NET_TCP_CONG_CONTROL=110,
-        NET_TCP_ABC=111,
-        NET_IPV4_IPFRAG_MAX_DIST=112,
-        NET_TCP_MTU_PROBING=113,
-        NET_TCP_BASE_MSS=114,
-        NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
-        NET_TCP_DMA_COPYBREAK=116,
-        NET_TCP_SLOW_START_AFTER_IDLE=117,
-        NET_CIPSOV4_CACHE_ENABLE=118,
-        NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
-        NET_CIPSOV4_RBM_OPTFMT=120,
-        NET_CIPSOV4_RBM_STRICTVALID=121,
-        NET_TCP_AVAIL_CONG_CONTROL=122,
-        NET_TCP_ALLOWED_CONG_CONTROL=123,
-        NET_TCP_MAX_SSTHRESH=124,
-        NET_TCP_FRTO_RESPONSE=125,
-};
-
-enum {
-        NET_IPV4_ROUTE_FLUSH=1,
-        NET_IPV4_ROUTE_MIN_DELAY=2, /* obsolete since 2.6.25 */
-        NET_IPV4_ROUTE_MAX_DELAY=3, /* obsolete since 2.6.25 */
-        NET_IPV4_ROUTE_GC_THRESH=4,
-        NET_IPV4_ROUTE_MAX_SIZE=5,
-        NET_IPV4_ROUTE_GC_MIN_INTERVAL=6,
-        NET_IPV4_ROUTE_GC_TIMEOUT=7,
-        NET_IPV4_ROUTE_GC_INTERVAL=8, /* obsolete since 2.6.38 */
-        NET_IPV4_ROUTE_REDIRECT_LOAD=9,
-        NET_IPV4_ROUTE_REDIRECT_NUMBER=10,
-        NET_IPV4_ROUTE_REDIRECT_SILENCE=11,
-        NET_IPV4_ROUTE_ERROR_COST=12,
-        NET_IPV4_ROUTE_ERROR_BURST=13,
-        NET_IPV4_ROUTE_GC_ELASTICITY=14,
-        NET_IPV4_ROUTE_MTU_EXPIRES=15,
-        NET_IPV4_ROUTE_MIN_PMTU=16,
-        NET_IPV4_ROUTE_MIN_ADVMSS=17,
-        NET_IPV4_ROUTE_SECRET_INTERVAL=18,
-        NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS=19,
-};
-
-enum
-{
-        NET_PROTO_CONF_ALL=-2,
-        NET_PROTO_CONF_DEFAULT=-3
-
-        /* And device ifindices ... */
-};
-
-enum
-{
-        NET_IPV4_CONF_FORWARDING=1,
-        NET_IPV4_CONF_MC_FORWARDING=2,
-        NET_IPV4_CONF_PROXY_ARP=3,
-        NET_IPV4_CONF_ACCEPT_REDIRECTS=4,
-        NET_IPV4_CONF_SECURE_REDIRECTS=5,
-        NET_IPV4_CONF_SEND_REDIRECTS=6,
-        NET_IPV4_CONF_SHARED_MEDIA=7,
-        NET_IPV4_CONF_RP_FILTER=8,
-        NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE=9,
-        NET_IPV4_CONF_BOOTP_RELAY=10,
-        NET_IPV4_CONF_LOG_MARTIANS=11,
-        NET_IPV4_CONF_TAG=12,
-        NET_IPV4_CONF_ARPFILTER=13,
-        NET_IPV4_CONF_MEDIUM_ID=14,
-        NET_IPV4_CONF_NOXFRM=15,
-        NET_IPV4_CONF_NOPOLICY=16,
-        NET_IPV4_CONF_FORCE_IGMP_VERSION=17,
-        NET_IPV4_CONF_ARP_ANNOUNCE=18,
-        NET_IPV4_CONF_ARP_IGNORE=19,
-        NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
-        NET_IPV4_CONF_ARP_ACCEPT=21,
-        NET_IPV4_CONF_ARP_NOTIFY=22,
-};
-
-/* /proc/sys/net/ipv4/netfilter */
-enum
-{
-        NET_IPV4_NF_CONNTRACK_MAX=1,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
-        NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT=10,
-        NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
-        NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12,
-        NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13,
-        NET_IPV4_NF_CONNTRACK_BUCKETS=14,
-        NET_IPV4_NF_CONNTRACK_LOG_INVALID=15,
-        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
-        NET_IPV4_NF_CONNTRACK_TCP_LOOSE=17,
-        NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL=18,
-        NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS=19,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
-        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
-        NET_IPV4_NF_CONNTRACK_COUNT=27,
-        NET_IPV4_NF_CONNTRACK_CHECKSUM=28,
-};
- 
-/* /proc/sys/net/ipv6 */
-enum {
-        NET_IPV6_CONF=16,
-        NET_IPV6_NEIGH=17,
-        NET_IPV6_ROUTE=18,
-        NET_IPV6_ICMP=19,
-        NET_IPV6_BINDV6ONLY=20,
-        NET_IPV6_IP6FRAG_HIGH_THRESH=21,
-        NET_IPV6_IP6FRAG_LOW_THRESH=22,
-        NET_IPV6_IP6FRAG_TIME=23,
-        NET_IPV6_IP6FRAG_SECRET_INTERVAL=24,
-        NET_IPV6_MLD_MAX_MSF=25,
-};
-
-enum {
-        NET_IPV6_ROUTE_FLUSH=1,
-        NET_IPV6_ROUTE_GC_THRESH=2,
-        NET_IPV6_ROUTE_MAX_SIZE=3,
-        NET_IPV6_ROUTE_GC_MIN_INTERVAL=4,
-        NET_IPV6_ROUTE_GC_TIMEOUT=5,
-        NET_IPV6_ROUTE_GC_INTERVAL=6,
-        NET_IPV6_ROUTE_GC_ELASTICITY=7,
-        NET_IPV6_ROUTE_MTU_EXPIRES=8,
-        NET_IPV6_ROUTE_MIN_ADVMSS=9,
-        NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10
-};
-
-enum {
-        NET_IPV6_FORWARDING=1,
-        NET_IPV6_HOP_LIMIT=2,
-        NET_IPV6_MTU=3,
-        NET_IPV6_ACCEPT_RA=4,
-        NET_IPV6_ACCEPT_REDIRECTS=5,
-        NET_IPV6_AUTOCONF=6,
-        NET_IPV6_DAD_TRANSMITS=7,
-        NET_IPV6_RTR_SOLICITS=8,
-        NET_IPV6_RTR_SOLICIT_INTERVAL=9,
-        NET_IPV6_RTR_SOLICIT_DELAY=10,
-        NET_IPV6_USE_TEMPADDR=11,
-        NET_IPV6_TEMP_VALID_LFT=12,
-        NET_IPV6_TEMP_PREFERED_LFT=13,
-        NET_IPV6_REGEN_MAX_RETRY=14,
-        NET_IPV6_MAX_DESYNC_FACTOR=15,
-        NET_IPV6_MAX_ADDRESSES=16,
-        NET_IPV6_FORCE_MLD_VERSION=17,
-        NET_IPV6_ACCEPT_RA_DEFRTR=18,
-        NET_IPV6_ACCEPT_RA_PINFO=19,
-        NET_IPV6_ACCEPT_RA_RTR_PREF=20,
-        NET_IPV6_RTR_PROBE_INTERVAL=21,
-        NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
-        NET_IPV6_PROXY_NDP=23,
-        NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
-        __NET_IPV6_MAX
-};
-
-/* /proc/sys/net/ipv6/icmp */
-enum {
-        NET_IPV6_ICMP_RATELIMIT=1
-};
-
-/* /proc/sys/net/<protocol>/neigh/<dev> */
-enum {
-        NET_NEIGH_MCAST_SOLICIT=1,
-        NET_NEIGH_UCAST_SOLICIT=2,
-        NET_NEIGH_APP_SOLICIT=3,
-        NET_NEIGH_RETRANS_TIME=4,
-        NET_NEIGH_REACHABLE_TIME=5,
-        NET_NEIGH_DELAY_PROBE_TIME=6,
-        NET_NEIGH_GC_STALE_TIME=7,
-        NET_NEIGH_UNRES_QLEN=8,
-        NET_NEIGH_PROXY_QLEN=9,
-        NET_NEIGH_ANYCAST_DELAY=10,
-        NET_NEIGH_PROXY_DELAY=11,
-        NET_NEIGH_LOCKTIME=12,
-        NET_NEIGH_GC_INTERVAL=13,
-        NET_NEIGH_GC_THRESH1=14,
-        NET_NEIGH_GC_THRESH2=15,
-        NET_NEIGH_GC_THRESH3=16,
-        NET_NEIGH_RETRANS_TIME_MS=17,
-        NET_NEIGH_REACHABLE_TIME_MS=18,
-};
-
-/* /proc/sys/net/dccp */
-enum {
-        NET_DCCP_DEFAULT=1,
-};
-
-/* /proc/sys/net/ipx */
-enum {
-        NET_IPX_PPROP_BROADCASTING=1,
-        NET_IPX_FORWARDING=2
-};
-
-/* /proc/sys/net/llc */
-enum {
-        NET_LLC2=1,
-        NET_LLC_STATION=2,
-};
-
-/* /proc/sys/net/llc/llc2 */
-enum {
-        NET_LLC2_TIMEOUT=1,
-};
-
-/* /proc/sys/net/llc/station */
-enum {
-        NET_LLC_STATION_ACK_TIMEOUT=1,
-};
-
-/* /proc/sys/net/llc/llc2/timeout */
-enum {
-        NET_LLC2_ACK_TIMEOUT=1,
-        NET_LLC2_P_TIMEOUT=2,
-        NET_LLC2_REJ_TIMEOUT=3,
-        NET_LLC2_BUSY_TIMEOUT=4,
-};
-
-/* /proc/sys/net/appletalk */
-enum {
-        NET_ATALK_AARP_EXPIRY_TIME=1,
-        NET_ATALK_AARP_TICK_TIME=2,
-        NET_ATALK_AARP_RETRANSMIT_LIMIT=3,
-        NET_ATALK_AARP_RESOLVE_TIME=4
-};
-
-
-/* /proc/sys/net/netrom */
-enum {
-        NET_NETROM_DEFAULT_PATH_QUALITY=1,
-        NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER=2,
-        NET_NETROM_NETWORK_TTL_INITIALISER=3,
-        NET_NETROM_TRANSPORT_TIMEOUT=4,
-        NET_NETROM_TRANSPORT_MAXIMUM_TRIES=5,
-        NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY=6,
-        NET_NETROM_TRANSPORT_BUSY_DELAY=7,
-        NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8,
-        NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9,
-        NET_NETROM_ROUTING_CONTROL=10,
-        NET_NETROM_LINK_FAILS_COUNT=11,
-        NET_NETROM_RESET=12
-};
-
-/* /proc/sys/net/ax25 */
-enum {
-        NET_AX25_IP_DEFAULT_MODE=1,
-        NET_AX25_DEFAULT_MODE=2,
-        NET_AX25_BACKOFF_TYPE=3,
-        NET_AX25_CONNECT_MODE=4,
-        NET_AX25_STANDARD_WINDOW=5,
-        NET_AX25_EXTENDED_WINDOW=6,
-        NET_AX25_T1_TIMEOUT=7,
-        NET_AX25_T2_TIMEOUT=8,
-        NET_AX25_T3_TIMEOUT=9,
-        NET_AX25_IDLE_TIMEOUT=10,
-        NET_AX25_N2=11,
-        NET_AX25_PACLEN=12,
-        NET_AX25_PROTOCOL=13,
-        NET_AX25_DAMA_SLAVE_TIMEOUT=14
-};
-
-/* /proc/sys/net/rose */
-enum {
-        NET_ROSE_RESTART_REQUEST_TIMEOUT=1,
-        NET_ROSE_CALL_REQUEST_TIMEOUT=2,
-        NET_ROSE_RESET_REQUEST_TIMEOUT=3,
-        NET_ROSE_CLEAR_REQUEST_TIMEOUT=4,
-        NET_ROSE_ACK_HOLD_BACK_TIMEOUT=5,
-        NET_ROSE_ROUTING_CONTROL=6,
-        NET_ROSE_LINK_FAIL_TIMEOUT=7,
-        NET_ROSE_MAX_VCS=8,
-        NET_ROSE_WINDOW_SIZE=9,
-        NET_ROSE_NO_ACTIVITY_TIMEOUT=10
-};
-
-/* /proc/sys/net/x25 */
-enum {
-        NET_X25_RESTART_REQUEST_TIMEOUT=1,
-        NET_X25_CALL_REQUEST_TIMEOUT=2,
-        NET_X25_RESET_REQUEST_TIMEOUT=3,
-        NET_X25_CLEAR_REQUEST_TIMEOUT=4,
-        NET_X25_ACK_HOLD_BACK_TIMEOUT=5,
-        NET_X25_FORWARD=6
-};
-
-/* /proc/sys/net/token-ring */
-enum
-{
-        NET_TR_RIF_TIMEOUT=1
-};
-
-/* /proc/sys/net/decnet/ */
-enum {
-        NET_DECNET_NODE_TYPE = 1,
-        NET_DECNET_NODE_ADDRESS = 2,
-        NET_DECNET_NODE_NAME = 3,
-        NET_DECNET_DEFAULT_DEVICE = 4,
-        NET_DECNET_TIME_WAIT = 5,
-        NET_DECNET_DN_COUNT = 6,
-        NET_DECNET_DI_COUNT = 7,
-        NET_DECNET_DR_COUNT = 8,
-        NET_DECNET_DST_GC_INTERVAL = 9,
-        NET_DECNET_CONF = 10,
-        NET_DECNET_NO_FC_MAX_CWND = 11,
-        NET_DECNET_MEM = 12,
-        NET_DECNET_RMEM = 13,
-        NET_DECNET_WMEM = 14,
-        NET_DECNET_DEBUG_LEVEL = 255
-};
-
-/* /proc/sys/net/decnet/conf/<dev> */
-enum {
-        NET_DECNET_CONF_LOOPBACK = -2,
-        NET_DECNET_CONF_DDCMP = -3,
-        NET_DECNET_CONF_PPP = -4,
-        NET_DECNET_CONF_X25 = -5,
-        NET_DECNET_CONF_GRE = -6,
-        NET_DECNET_CONF_ETHER = -7
-
-        /* ... and ifindex of devices */
-};
-
-/* /proc/sys/net/decnet/conf/<dev>/ */
-enum {
-        NET_DECNET_CONF_DEV_PRIORITY = 1,
-        NET_DECNET_CONF_DEV_T1 = 2,
-        NET_DECNET_CONF_DEV_T2 = 3,
-        NET_DECNET_CONF_DEV_T3 = 4,
-        NET_DECNET_CONF_DEV_FORWARDING = 5,
-        NET_DECNET_CONF_DEV_BLKSIZE = 6,
-        NET_DECNET_CONF_DEV_STATE = 7
-};
-
-/* /proc/sys/net/sctp */
-enum {
-        NET_SCTP_RTO_INITIAL = 1,
-        NET_SCTP_RTO_MIN     = 2,
-        NET_SCTP_RTO_MAX     = 3,
-        NET_SCTP_RTO_ALPHA   = 4,
-        NET_SCTP_RTO_BETA    = 5,
-        NET_SCTP_VALID_COOKIE_LIFE       =  6,
-        NET_SCTP_ASSOCIATION_MAX_RETRANS =  7,
-        NET_SCTP_PATH_MAX_RETRANS        =  8,
-        NET_SCTP_MAX_INIT_RETRANSMITS    =  9,
-        NET_SCTP_HB_INTERVAL             = 10,
-        NET_SCTP_PRESERVE_ENABLE         = 11,
-        NET_SCTP_MAX_BURST               = 12,
-        NET_SCTP_ADDIP_ENABLE            = 13,
-        NET_SCTP_PRSCTP_ENABLE           = 14,
-        NET_SCTP_SNDBUF_POLICY           = 15,
-        NET_SCTP_SACK_TIMEOUT            = 16,
-        NET_SCTP_RCVBUF_POLICY           = 17,
-};
-
-/* /proc/sys/net/bridge */
-enum {
-        NET_BRIDGE_NF_CALL_ARPTABLES = 1,
-        NET_BRIDGE_NF_CALL_IPTABLES = 2,
-        NET_BRIDGE_NF_CALL_IP6TABLES = 3,
-        NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
-        NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
-};
-
-/* proc/sys/net/irda */
-enum {
-        NET_IRDA_DISCOVERY=1,
-        NET_IRDA_DEVNAME=2,
-        NET_IRDA_DEBUG=3,
-        NET_IRDA_FAST_POLL=4,
-        NET_IRDA_DISCOVERY_SLOTS=5,
-        NET_IRDA_DISCOVERY_TIMEOUT=6,
-        NET_IRDA_SLOT_TIMEOUT=7,
-        NET_IRDA_MAX_BAUD_RATE=8,
-        NET_IRDA_MIN_TX_TURN_TIME=9,
-        NET_IRDA_MAX_TX_DATA_SIZE=10,
-        NET_IRDA_MAX_TX_WINDOW=11,
-        NET_IRDA_MAX_NOREPLY_TIME=12,
-        NET_IRDA_WARN_NOREPLY_TIME=13,
-        NET_IRDA_LAP_KEEPALIVE_TIME=14,
-};
-
-
-/* CTL_FS names: */
-enum
-{
-        FS_NRINODE=1,   /* int:current number of allocated inodes */
-        FS_STATINODE=2,
-        FS_MAXINODE=3,  /* int:maximum number of inodes that can be allocated */
-        FS_NRDQUOT=4,   /* int:current number of allocated dquots */
-        FS_MAXDQUOT=5,  /* int:maximum number of dquots that can be allocated */
-        FS_NRFILE=6,    /* int:current number of allocated filedescriptors */
-        FS_MAXFILE=7,   /* int:maximum number of filedescriptors that can be allocated */
-        FS_DENTRY=8,
-        FS_NRSUPER=9,   /* int:current number of allocated super_blocks */
-        FS_MAXSUPER=10, /* int:maximum number of super_blocks that can be allocated */
-        FS_OVERFLOWUID=11,      /* int: overflow UID */
-        FS_OVERFLOWGID=12,      /* int: overflow GID */
-        FS_LEASES=13,   /* int: leases enabled */
-        FS_DIR_NOTIFY=14,       /* int: directory notification enabled */
-        FS_LEASE_TIME=15,       /* int: maximum time to wait for a lease break */
-        FS_DQSTATS=16,  /* disc quota usage statistics and control */
-        FS_XFS=17,      /* struct: control xfs parameters */
-        FS_AIO_NR=18,   /* current system-wide number of aio requests */
-        FS_AIO_MAX_NR=19,       /* system-wide maximum number of aio requests */
-        FS_INOTIFY=20,  /* inotify submenu */
-        FS_OCFS2=988,   /* ocfs2 */
-};
-
-/* /proc/sys/fs/quota/ */
-enum {
-        FS_DQ_LOOKUPS = 1,
-        FS_DQ_DROPS = 2,
-        FS_DQ_READS = 3,
-        FS_DQ_WRITES = 4,
-        FS_DQ_CACHE_HITS = 5,
-        FS_DQ_ALLOCATED = 6,
-        FS_DQ_FREE = 7,
-        FS_DQ_SYNCS = 8,
-        FS_DQ_WARNINGS = 9,
-};
-
-/* CTL_DEBUG names: */
-
-/* CTL_DEV names: */
-enum {
-        DEV_CDROM=1,
-        DEV_HWMON=2,
-        DEV_PARPORT=3,
-        DEV_RAID=4,
-        DEV_MAC_HID=5,
-        DEV_SCSI=6,
-        DEV_IPMI=7,
-};
-
-/* /proc/sys/dev/cdrom */
-enum {
-        DEV_CDROM_INFO=1,
-        DEV_CDROM_AUTOCLOSE=2,
-        DEV_CDROM_AUTOEJECT=3,
-        DEV_CDROM_DEBUG=4,
-        DEV_CDROM_LOCK=5,
-        DEV_CDROM_CHECK_MEDIA=6
-};
-
-/* /proc/sys/dev/parport */
-enum {
-        DEV_PARPORT_DEFAULT=-3
-};
-
-/* /proc/sys/dev/raid */
-enum {
-        DEV_RAID_SPEED_LIMIT_MIN=1,
-        DEV_RAID_SPEED_LIMIT_MAX=2
-};
-
-/* /proc/sys/dev/parport/default */
-enum {
-        DEV_PARPORT_DEFAULT_TIMESLICE=1,
-        DEV_PARPORT_DEFAULT_SPINTIME=2
-};
-
-/* /proc/sys/dev/parport/parport n */
-enum {
-        DEV_PARPORT_SPINTIME=1,
-        DEV_PARPORT_BASE_ADDR=2,
-        DEV_PARPORT_IRQ=3,
-        DEV_PARPORT_DMA=4,
-        DEV_PARPORT_MODES=5,
-        DEV_PARPORT_DEVICES=6,
-        DEV_PARPORT_AUTOPROBE=16
-};
-
-/* /proc/sys/dev/parport/parport n/devices/ */
-enum {
-        DEV_PARPORT_DEVICES_ACTIVE=-3,
-};
-
-/* /proc/sys/dev/parport/parport n/devices/device n */
-enum {
-        DEV_PARPORT_DEVICE_TIMESLICE=1,
-};
-
-/* /proc/sys/dev/mac_hid */
-enum {
-        DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES=1,
-        DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES=2,
-        DEV_MAC_HID_MOUSE_BUTTON_EMULATION=3,
-        DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE=4,
-        DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE=5,
-        DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6
-};
-
-/* /proc/sys/dev/scsi */
-enum {
-        DEV_SCSI_LOGGING_LEVEL=1,
-};
-
-/* /proc/sys/dev/ipmi */
-enum {
-        DEV_IPMI_POWEROFF_POWERCYCLE=1,
-};
-
-/* /proc/sys/abi */
-enum
-{
-        ABI_DEFHANDLER_COFF=1,  /* default handler for coff binaries */
-        ABI_DEFHANDLER_ELF=2,   /* default handler for ELF binaries */
-        ABI_DEFHANDLER_LCALL7=3,/* default handler for procs using lcall7 */
-        ABI_DEFHANDLER_LIBCSO=4,/* default handler for an libc.so ELF interp */
-        ABI_TRACE=5,            /* tracing flags */
-        ABI_FAKE_UTSNAME=6,     /* fake target utsname information */
-};
-
-#ifdef __KERNEL__
 #include <linux/list.h>
 #include <linux/rcupdate.h>
 #include <linux/wait.h>
 #include <linux/rbtree.h>
+#include <uapi/linux/sysctl.h>
 
 /* For the /proc/sys support */
 struct ctl_table;
@@ -1122,6 +215,4 @@ static inline void setup_sysctl_set(struct ctl_table_set *p,
 
 #endif /* CONFIG_SYSCTL */
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_SYSCTL_H */
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
deleted file mode 100644
index 67b501c302b2..000000000000
--- a/include/linux/tc_act/Kbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-header-y += tc_gact.h
-header-y += tc_ipt.h
-header-y += tc_mirred.h
-header-y += tc_pedit.h
-header-y += tc_nat.h
-header-y += tc_skbedit.h
-header-y += tc_csum.h
diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
deleted file mode 100644
index 4a58a1c32a00..000000000000
--- a/include/linux/tc_ematch/Kbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-header-y += tc_em_cmp.h
-header-y += tc_em_meta.h
-header-y += tc_em_nbyte.h
-header-y += tc_em_text.h
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 67c789ae719c..60b7aac15e0e 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -17,217 +17,13 @@
 #ifndef _LINUX_TCP_H
 #define _LINUX_TCP_H
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/socket.h>
-
-struct tcphdr {
-        __be16  source;
-        __be16  dest;
-        __be32  seq;
-        __be32  ack_seq;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u16   res1:4,
-                doff:4,
-                fin:1,
-                syn:1,
-                rst:1,
-                psh:1,
-                ack:1,
-                urg:1,
-                ece:1,
-                cwr:1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u16   doff:4,
-                res1:4,
-                cwr:1,
-                ece:1,
-                urg:1,
-                ack:1,
-                psh:1,
-                rst:1,
-                syn:1,
-                fin:1;
-#else
-#error  "Adjust your <asm/byteorder.h> defines"
-#endif  
-        __be16  window;
-        __sum16 check;
-        __be16  urg_ptr;
-};
-
-/*
- *      The union cast uses a gcc extension to avoid aliasing problems
- *  (union is compatible to any of its members)
- *  This means this part of the code is -fstrict-aliasing safe now.
- */
-union tcp_word_hdr { 
-        struct tcphdr hdr;
-        __be32            words[5];
-}; 
-
-#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
-
-enum { 
-        TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000),
-        TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000),
-        TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000),
-        TCP_FLAG_ACK = __constant_cpu_to_be32(0x00100000),
-        TCP_FLAG_PSH = __constant_cpu_to_be32(0x00080000),
-        TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000),
-        TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000),
-        TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000),
-        TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000),
-        TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000)
-}; 
-
-/*
- * TCP general constants
- */
-#define TCP_MSS_DEFAULT          536U   /* IPv4 (RFC1122, RFC2581) */
-#define TCP_MSS_DESIRED         1220U   /* IPv6 (tunneled), EDNS0 (RFC3226) */
-
-/* TCP socket options */
-#define TCP_NODELAY             1       /* Turn off Nagle's algorithm. */
-#define TCP_MAXSEG              2       /* Limit MSS */
-#define TCP_CORK                3       /* Never send partially complete segments */
-#define TCP_KEEPIDLE            4       /* Start keeplives after this period */
-#define TCP_KEEPINTVL           5       /* Interval between keepalives */
-#define TCP_KEEPCNT             6       /* Number of keepalives before death */
-#define TCP_SYNCNT              7       /* Number of SYN retransmits */
-#define TCP_LINGER2             8       /* Life time of orphaned FIN-WAIT-2 state */
-#define TCP_DEFER_ACCEPT        9       /* Wake up listener only when data arrive */
-#define TCP_WINDOW_CLAMP        10      /* Bound advertised window */
-#define TCP_INFO                11      /* Information about this connection. */
-#define TCP_QUICKACK            12      /* Block/reenable quick acks */
-#define TCP_CONGESTION          13      /* Congestion control algorithm */
-#define TCP_MD5SIG              14      /* TCP MD5 Signature (RFC2385) */
-#define TCP_COOKIE_TRANSACTIONS 15      /* TCP Cookie Transactions */
-#define TCP_THIN_LINEAR_TIMEOUTS 16      /* Use linear timeouts for thin streams*/
-#define TCP_THIN_DUPACK         17      /* Fast retrans. after 1 dupack */
-#define TCP_USER_TIMEOUT        18      /* How long for loss retry before timeout */
-#define TCP_REPAIR              19      /* TCP sock is under repair right now */
-#define TCP_REPAIR_QUEUE        20
-#define TCP_QUEUE_SEQ           21
-#define TCP_REPAIR_OPTIONS      22
-#define TCP_FASTOPEN            23      /* Enable FastOpen on listeners */
-
-struct tcp_repair_opt {
-        __u32   opt_code;
-        __u32   opt_val;
-};
-
-enum {
-        TCP_NO_QUEUE,
-        TCP_RECV_QUEUE,
-        TCP_SEND_QUEUE,
-        TCP_QUEUES_NR,
-};
-
-/* for TCP_INFO socket option */
-#define TCPI_OPT_TIMESTAMPS     1
-#define TCPI_OPT_SACK           2
-#define TCPI_OPT_WSCALE         4
-#define TCPI_OPT_ECN            8 /* ECN was negociated at TCP session init */
-#define TCPI_OPT_ECN_SEEN       16 /* we received at least one packet with ECT */
-
-enum tcp_ca_state {
-        TCP_CA_Open = 0,
-#define TCPF_CA_Open    (1<<TCP_CA_Open)
-        TCP_CA_Disorder = 1,
-#define TCPF_CA_Disorder (1<<TCP_CA_Disorder)
-        TCP_CA_CWR = 2,
-#define TCPF_CA_CWR     (1<<TCP_CA_CWR)
-        TCP_CA_Recovery = 3,
-#define TCPF_CA_Recovery (1<<TCP_CA_Recovery)
-        TCP_CA_Loss = 4
-#define TCPF_CA_Loss    (1<<TCP_CA_Loss)
-};
-
-struct tcp_info {
-        __u8    tcpi_state;
-        __u8    tcpi_ca_state;
-        __u8    tcpi_retransmits;
-        __u8    tcpi_probes;
-        __u8    tcpi_backoff;
-        __u8    tcpi_options;
-        __u8    tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
-
-        __u32   tcpi_rto;
-        __u32   tcpi_ato;
-        __u32   tcpi_snd_mss;
-        __u32   tcpi_rcv_mss;
-
-        __u32   tcpi_unacked;
-        __u32   tcpi_sacked;
-        __u32   tcpi_lost;
-        __u32   tcpi_retrans;
-        __u32   tcpi_fackets;
-
-        /* Times. */
-        __u32   tcpi_last_data_sent;
-        __u32   tcpi_last_ack_sent;     /* Not remembered, sorry. */
-        __u32   tcpi_last_data_recv;
-        __u32   tcpi_last_ack_recv;
-
-        /* Metrics. */
-        __u32   tcpi_pmtu;
-        __u32   tcpi_rcv_ssthresh;
-        __u32   tcpi_rtt;
-        __u32   tcpi_rttvar;
-        __u32   tcpi_snd_ssthresh;
-        __u32   tcpi_snd_cwnd;
-        __u32   tcpi_advmss;
-        __u32   tcpi_reordering;
-
-        __u32   tcpi_rcv_rtt;
-        __u32   tcpi_rcv_space;
-
-        __u32   tcpi_total_retrans;
-};
-
-/* for TCP_MD5SIG socket option */
-#define TCP_MD5SIG_MAXKEYLEN    80
-
-struct tcp_md5sig {
-        struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
-        __u16   __tcpm_pad1;                            /* zero */
-        __u16   tcpm_keylen;                            /* key length */
-        __u32   __tcpm_pad2;                            /* zero */
-        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
-};
-
-/* for TCP_COOKIE_TRANSACTIONS (TCPCT) socket option */
-#define TCP_COOKIE_MIN           8              /*  64-bits */
-#define TCP_COOKIE_MAX          16              /* 128-bits */
-#define TCP_COOKIE_PAIR_SIZE    (2*TCP_COOKIE_MAX)
-
-/* Flags for both getsockopt and setsockopt */
-#define TCP_COOKIE_IN_ALWAYS    (1 << 0)        /* Discard SYN without cookie */
-#define TCP_COOKIE_OUT_NEVER    (1 << 1)        /* Prohibit outgoing cookies,
-                                                 * supercedes everything. */
-
-/* Flags for getsockopt */
-#define TCP_S_DATA_IN           (1 << 2)        /* Was data received? */
-#define TCP_S_DATA_OUT          (1 << 3)        /* Was data sent? */
-
-/* TCP_COOKIE_TRANSACTIONS data */
-struct tcp_cookie_transactions {
-        __u16   tcpct_flags;                    /* see above */
-        __u8    __tcpct_pad1;                   /* zero */
-        __u8    tcpct_cookie_desired;           /* bytes */
-        __u16   tcpct_s_data_desired;           /* bytes of variable data */
-        __u16   tcpct_used;                     /* bytes in value */
-        __u8    tcpct_value[TCP_MSS_DEFAULT];
-};
-
-#ifdef __KERNEL__
 
 #include <linux/skbuff.h>
 #include <linux/dmaengine.h>
 #include <net/sock.h>
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
+#include <uapi/linux/tcp.h>
 
 static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
 {
@@ -395,7 +191,8 @@ struct tcp_sock {
         u8      do_early_retrans:1,/* Enable RFC5827 early-retransmit  */
                 early_retrans_delayed:1, /* Delayed ER timer installed */
                 syn_data:1,     /* SYN includes data */
-                syn_fastopen:1; /* SYN includes Fast Open option */
+                syn_fastopen:1, /* SYN includes Fast Open option */
+                syn_data_acked:1;/* data in SYN is acked by SYN-ACK */
 
 /* RTT measurement */
         u32     srtt;           /* smoothed round trip time << 3        */
@@ -595,6 +392,4 @@ static inline int fastopen_init_queue(struct sock *sk, int backlog)
         return 0;
 }
 
-#endif  /* __KERNEL__ */
-
 #endif  /* _LINUX_TCP_H */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 4b94a61955df..91b34812cd84 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -44,6 +44,12 @@ enum thermal_trip_type {
         THERMAL_TRIP_CRITICAL,
 };
 
+enum thermal_trend {
+        THERMAL_TREND_STABLE, /* temperature is stable */
+        THERMAL_TREND_RAISING, /* temperature is raising */
+        THERMAL_TREND_DROPPING, /* temperature is dropping */
+};
+
 struct thermal_zone_device_ops {
         int (*bind) (struct thermal_zone_device *,
                      struct thermal_cooling_device *);
@@ -65,6 +71,8 @@ struct thermal_zone_device_ops {
         int (*set_trip_hyst) (struct thermal_zone_device *, int,
                               unsigned long);
         int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
+        int (*get_trend) (struct thermal_zone_device *, int,
+                          enum thermal_trend *);
         int (*notify) (struct thermal_zone_device *, int,
                        enum thermal_trip_type);
 };
@@ -75,6 +83,8 @@ struct thermal_cooling_device_ops {
         int (*set_cur_state) (struct thermal_cooling_device *, unsigned long);
 };
 
+#define THERMAL_NO_LIMIT -1UL /* no upper/lower limit requirement */
+
 #define THERMAL_TRIPS_NONE -1
 #define THERMAL_MAX_TRIPS 12
 #define THERMAL_NAME_LENGTH 20
@@ -84,6 +94,9 @@ struct thermal_cooling_device {
         struct device device;
         void *devdata;
         const struct thermal_cooling_device_ops *ops;
+        bool updated; /* true if the cooling device does not need update */
+        struct mutex lock; /* protect thermal_instances list */
+        struct list_head thermal_instances;
         struct list_head node;
 };
 
@@ -105,17 +118,16 @@ struct thermal_zone_device {
         struct thermal_attr *trip_hyst_attrs;
         void *devdata;
         int trips;
-        int tc1;
-        int tc2;
         int passive_delay;
         int polling_delay;
+        int temperature;
         int last_temperature;
-        bool passive;
+        int passive;
         unsigned int forced_passive;
         const struct thermal_zone_device_ops *ops;
-        struct list_head cooling_devices;
+        struct list_head thermal_instances;
         struct idr idr;
-        struct mutex lock;      /* protect cooling devices list */
+        struct mutex lock; /* protect thermal_instances list */
         struct list_head node;
         struct delayed_work poll_queue;
 };
@@ -152,12 +164,12 @@ enum {
 #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
 
 struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
-                void *, const struct thermal_zone_device_ops *, int tc1,
-                int tc2, int passive_freq, int polling_freq);
+                void *, const struct thermal_zone_device_ops *, int, int);
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
-                                     struct thermal_cooling_device *);
+                                     struct thermal_cooling_device *,
+                                     unsigned long, unsigned long);
 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
                                        struct thermal_cooling_device *);
 void thermal_zone_device_update(struct thermal_zone_device *);
diff --git a/include/linux/time.h b/include/linux/time.h
index b51e664c83e7..4d358e9d10f1 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -1,33 +1,10 @@
 #ifndef _LINUX_TIME_H
 #define _LINUX_TIME_H
 
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 # include <linux/cache.h>
 # include <linux/seqlock.h>
 # include <linux/math64.h>
-#endif
-
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC
-struct timespec {
-        __kernel_time_t tv_sec;                 /* seconds */
-        long            tv_nsec;                /* nanoseconds */
-};
-#endif
-
-struct timeval {
-        __kernel_time_t         tv_sec;         /* seconds */
-        __kernel_suseconds_t    tv_usec;        /* microseconds */
-};
-
-struct timezone {
-        int     tz_minuteswest; /* minutes west of Greenwich */
-        int     tz_dsttime;     /* type of dst correction */
-};
-
-#ifdef __KERNEL__
+#include <uapi/linux/time.h>
 
 extern struct timezone sys_tz;
 
@@ -280,51 +257,4 @@ static __always_inline void timespec_add_ns(struct timespec *a, u64 ns)
         a->tv_nsec = ns;
 }
 
-#endif /* __KERNEL__ */
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting:
- */
-#define ITIMER_REAL             0
-#define ITIMER_VIRTUAL          1
-#define ITIMER_PROF             2
-
-struct itimerspec {
-        struct timespec it_interval;    /* timer period */
-        struct timespec it_value;       /* timer expiration */
-};
-
-struct itimerval {
-        struct timeval it_interval;     /* timer interval */
-        struct timeval it_value;        /* current value */
-};
-
-/*
- * The IDs of the various system clocks (for POSIX.1b interval timers):
- */
-#define CLOCK_REALTIME                  0
-#define CLOCK_MONOTONIC                 1
-#define CLOCK_PROCESS_CPUTIME_ID        2
-#define CLOCK_THREAD_CPUTIME_ID         3
-#define CLOCK_MONOTONIC_RAW             4
-#define CLOCK_REALTIME_COARSE           5
-#define CLOCK_MONOTONIC_COARSE          6
-#define CLOCK_BOOTTIME                  7
-#define CLOCK_REALTIME_ALARM            8
-#define CLOCK_BOOTTIME_ALARM            9
-
-/*
- * The IDs of various hardware clocks:
- */
-#define CLOCK_SGI_CYCLE                 10
-#define MAX_CLOCKS                      16
-#define CLOCKS_MASK                     (CLOCK_REALTIME | CLOCK_MONOTONIC)
-#define CLOCKS_MONO                     CLOCK_MONOTONIC
-
-/*
- * The various flags for setting POSIX.1b interval timers:
- */
-#define TIMER_ABSTIME                   0x01
-
 #endif
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
new file mode 100644
index 000000000000..e1d558e237ec
--- /dev/null
+++ b/include/linux/timekeeper_internal.h
@@ -0,0 +1,108 @@
+/*
+ * You SHOULD NOT be including this unless you're vsyscall
+ * handling code or timekeeping internal code!
+ */
+
+#ifndef _LINUX_TIMEKEEPER_INTERNAL_H
+#define _LINUX_TIMEKEEPER_INTERNAL_H
+
+#include <linux/clocksource.h>
+#include <linux/jiffies.h>
+#include <linux/time.h>
+
+/* Structure holding internal timekeeping values. */
+struct timekeeper {
+        /* Current clocksource used for timekeeping. */
+        struct clocksource      *clock;
+        /* NTP adjusted clock multiplier */
+        u32                     mult;
+        /* The shift value of the current clocksource. */
+        u32                     shift;
+        /* Number of clock cycles in one NTP interval. */
+        cycle_t                 cycle_interval;
+        /* Number of clock shifted nano seconds in one NTP interval. */
+        u64                     xtime_interval;
+        /* shifted nano seconds left over when rounding cycle_interval */
+        s64                     xtime_remainder;
+        /* Raw nano seconds accumulated per NTP interval. */
+        u32                     raw_interval;
+
+        /* Current CLOCK_REALTIME time in seconds */
+        u64                     xtime_sec;
+        /* Clock shifted nano seconds */
+        u64                     xtime_nsec;
+
+        /* Difference between accumulated time and NTP time in ntp
+         * shifted nano seconds. */
+        s64                     ntp_error;
+        /* Shift conversion between clock shifted nano seconds and
+         * ntp shifted nano seconds. */
+        u32                     ntp_error_shift;
+
+        /*
+         * wall_to_monotonic is what we need to add to xtime (or xtime corrected
+         * for sub jiffie times) to get to monotonic time.  Monotonic is pegged
+         * at zero at system boot time, so wall_to_monotonic will be negative,
+         * however, we will ALWAYS keep the tv_nsec part positive so we can use
+         * the usual normalization.
+         *
+         * wall_to_monotonic is moved after resume from suspend for the
+         * monotonic time not to jump. We need to add total_sleep_time to
+         * wall_to_monotonic to get the real boot based time offset.
+         *
+         * - wall_to_monotonic is no longer the boot time, getboottime must be
+         * used instead.
+         */
+        struct timespec         wall_to_monotonic;
+        /* Offset clock monotonic -> clock realtime */
+        ktime_t                 offs_real;
+        /* time spent in suspend */
+        struct timespec         total_sleep_time;
+        /* Offset clock monotonic -> clock boottime */
+        ktime_t                 offs_boot;
+        /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
+        struct timespec         raw_time;
+        /* Seqlock for all timekeeper values */
+        seqlock_t               lock;
+};
+
+static inline struct timespec tk_xtime(struct timekeeper *tk)
+{
+        struct timespec ts;
+
+        ts.tv_sec = tk->xtime_sec;
+        ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
+        return ts;
+}
+
+
+#ifdef CONFIG_GENERIC_TIME_VSYSCALL
+
+extern void update_vsyscall(struct timekeeper *tk);
+extern void update_vsyscall_tz(void);
+
+#elif defined(CONFIG_GENERIC_TIME_VSYSCALL_OLD)
+
+extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
+                                struct clocksource *c, u32 mult);
+extern void update_vsyscall_tz(void);
+
+static inline void update_vsyscall(struct timekeeper *tk)
+{
+        struct timespec xt;
+
+        xt = tk_xtime(tk);
+        update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
+}
+
+#else
+
+static inline void update_vsyscall(struct timekeeper *tk)
+{
+}
+static inline void update_vsyscall_tz(void)
+{
+}
+#endif
+
+#endif /* _LINUX_TIMEKEEPER_INTERNAL_H */
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index 5088727478fd..a520fd70a59f 100644
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
@@ -39,7 +39,7 @@ struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head)
 
 static inline void timerqueue_init(struct timerqueue_node *node)
 {
-        rb_init_node(&node->node);
+        RB_CLEAR_NODE(&node->node);
 }
 
 static inline void timerqueue_init_head(struct timerqueue_head *head)
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 7c5ceb20e03a..5ec87c60b97c 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -53,120 +53,11 @@
 #ifndef _LINUX_TIMEX_H
 #define _LINUX_TIMEX_H
 
-#include <linux/time.h>
+#include <uapi/linux/timex.h>
 
-#define NTP_API         4       /* NTP API version */
-
-/*
- * syscall interface - used (mainly by NTP daemon)
- * to discipline kernel clock oscillator
- */
-struct timex {
-        unsigned int modes;     /* mode selector */
-        long offset;            /* time offset (usec) */
-        long freq;              /* frequency offset (scaled ppm) */
-        long maxerror;          /* maximum error (usec) */
-        long esterror;          /* estimated error (usec) */
-        int status;             /* clock command/status */
-        long constant;          /* pll time constant */
-        long precision;         /* clock precision (usec) (read only) */
-        long tolerance;         /* clock frequency tolerance (ppm)
-                                 * (read only)
-                                 */
-        struct timeval time;    /* (read only, except for ADJ_SETOFFSET) */
-        long tick;              /* (modified) usecs between clock ticks */
-
-        long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
-        long jitter;            /* pps jitter (us) (ro) */
-        int shift;              /* interval duration (s) (shift) (ro) */
-        long stabil;            /* pps stability (scaled ppm) (ro) */
-        long jitcnt;            /* jitter limit exceeded (ro) */
-        long calcnt;            /* calibration intervals (ro) */
-        long errcnt;            /* calibration errors (ro) */
-        long stbcnt;            /* stability limit exceeded (ro) */
-
-        int tai;                /* TAI offset (ro) */
-
-        int  :32; int  :32; int  :32; int  :32;
-        int  :32; int  :32; int  :32; int  :32;
-        int  :32; int  :32; int  :32;
-};
-
-/*
- * Mode codes (timex.mode)
- */
-#define ADJ_OFFSET              0x0001  /* time offset */
-#define ADJ_FREQUENCY           0x0002  /* frequency offset */
-#define ADJ_MAXERROR            0x0004  /* maximum time error */
-#define ADJ_ESTERROR            0x0008  /* estimated time error */
-#define ADJ_STATUS              0x0010  /* clock status */
-#define ADJ_TIMECONST           0x0020  /* pll time constant */
-#define ADJ_TAI                 0x0080  /* set TAI offset */
-#define ADJ_SETOFFSET           0x0100  /* add 'time' to current time */
-#define ADJ_MICRO               0x1000  /* select microsecond resolution */
-#define ADJ_NANO                0x2000  /* select nanosecond resolution */
-#define ADJ_TICK                0x4000  /* tick value */
-
-#ifdef __KERNEL__
 #define ADJ_ADJTIME             0x8000  /* switch between adjtime/adjtimex modes */
 #define ADJ_OFFSET_SINGLESHOT   0x0001  /* old-fashioned adjtime */
 #define ADJ_OFFSET_READONLY     0x2000  /* read-only adjtime */
-#else
-#define ADJ_OFFSET_SINGLESHOT   0x8001  /* old-fashioned adjtime */
-#define ADJ_OFFSET_SS_READ      0xa001  /* read-only adjtime */
-#endif
-
-/* NTP userland likes the MOD_ prefix better */
-#define MOD_OFFSET      ADJ_OFFSET
-#define MOD_FREQUENCY   ADJ_FREQUENCY
-#define MOD_MAXERROR    ADJ_MAXERROR
-#define MOD_ESTERROR    ADJ_ESTERROR
-#define MOD_STATUS      ADJ_STATUS
-#define MOD_TIMECONST   ADJ_TIMECONST
-#define MOD_TAI ADJ_TAI
-#define MOD_MICRO       ADJ_MICRO
-#define MOD_NANO        ADJ_NANO
-
-
-/*
- * Status codes (timex.status)
- */
-#define STA_PLL         0x0001  /* enable PLL updates (rw) */
-#define STA_PPSFREQ     0x0002  /* enable PPS freq discipline (rw) */
-#define STA_PPSTIME     0x0004  /* enable PPS time discipline (rw) */
-#define STA_FLL         0x0008  /* select frequency-lock mode (rw) */
-
-#define STA_INS         0x0010  /* insert leap (rw) */
-#define STA_DEL         0x0020  /* delete leap (rw) */
-#define STA_UNSYNC      0x0040  /* clock unsynchronized (rw) */
-#define STA_FREQHOLD    0x0080  /* hold frequency (rw) */
-
-#define STA_PPSSIGNAL   0x0100  /* PPS signal present (ro) */
-#define STA_PPSJITTER   0x0200  /* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER   0x0400  /* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR    0x0800  /* PPS signal calibration error (ro) */
-
-#define STA_CLOCKERR    0x1000  /* clock hardware fault (ro) */
-#define STA_NANO        0x2000  /* resolution (0 = us, 1 = ns) (ro) */
-#define STA_MODE        0x4000  /* mode (0 = PLL, 1 = FLL) (ro) */
-#define STA_CLK         0x8000  /* clock source (0 = A, 1 = B) (ro) */
-
-/* read-only bits */
-#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-        STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
-
-/*
- * Clock states (time_state)
- */
-#define TIME_OK         0       /* clock synchronized, no leap second */
-#define TIME_INS        1       /* insert leap second */
-#define TIME_DEL        2       /* delete leap second */
-#define TIME_OOP        3       /* leap second in progress */
-#define TIME_WAIT       4       /* leap second has occurred */
-#define TIME_ERROR      5       /* clock not synchronized */
-#define TIME_BAD        TIME_ERROR /* bw compat */
-
-#ifdef __KERNEL__
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/param.h>
@@ -261,6 +152,4 @@ int read_current_timer(unsigned long *timer_val);
 /* The clock frequency of the i8253/i8254 PIT */
 #define PIT_TICK_RATE 1193182ul
 
-#endif /* KERNEL */
-
 #endif /* LINUX_TIMEX_H */
diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h
index 772dedbc3a22..915c3bb164ac 100644
--- a/include/linux/toshiba.h
+++ b/include/linux/toshiba.h
@@ -16,25 +16,10 @@
  * General Public License for more details.
  *
  */
-
 #ifndef _LINUX_TOSHIBA_H
 #define _LINUX_TOSHIBA_H
 
-#define TOSH_PROC "/proc/toshiba"
-#define TOSH_DEVICE "/dev/toshiba"
-#define TOSH_SMM _IOWR('t', 0x90, int)  /* broken: meant 24 bytes */
-
-typedef struct {
-        unsigned int eax;
-        unsigned int ebx __attribute__ ((packed));
-        unsigned int ecx __attribute__ ((packed));
-        unsigned int edx __attribute__ ((packed));
-        unsigned int esi __attribute__ ((packed));
-        unsigned int edi __attribute__ ((packed));
-} SMMRegisters;
+#include <uapi/linux/toshiba.h>
 
-#ifdef __KERNEL__
 int tosh_smm(SMMRegisters *regs);
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 4f6c59a5fb79..f0b4eb47297c 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -1,41 +1,6 @@
 #ifndef _LINUX_TTY_H
 #define _LINUX_TTY_H
 
-/*
- * 'tty.h' defines some structures used by tty_io.c and some defines.
- */
-
-#define NR_LDISCS               30
-
-/* line disciplines */
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6       /* X.25 async */
-#define N_6PACK         7
-#define N_MASC          8       /* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964         9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL  10      /* Reserved for Profibus */
-#define N_IRDA          11      /* Linux IrDa - http://irda.sourceforge.net/ */
-#define N_SMSBLOCK      12      /* SMS block mode - for talking to GSM data */
-                                /* cards about SMS messages */
-#define N_HDLC          13      /* synchronous HDLC */
-#define N_SYNC_PPP      14      /* synchronous PPP */
-#define N_HCI           15      /* Bluetooth HCI UART */
-#define N_GIGASET_M101  16      /* Siemens Gigaset M101 serial DECT adapter */
-#define N_SLCAN         17      /* Serial / USB serial CAN Adaptors */
-#define N_PPS           18      /* Pulse per Second */
-#define N_V253          19      /* Codec control over voice modem */
-#define N_CAIF          20      /* CAIF protocol for talking to modems */
-#define N_GSM0710       21      /* GSM 0710 Mux */
-#define N_TI_WL         22      /* for TI's WL BT, FM, GPS combo chips */
-#define N_TRACESINK     23      /* Trace data routing for MIPI P1149.7 */
-#define N_TRACEROUTER   24      /* Trace data routing for MIPI P1149.7 */
-
-#ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/major.h>
 #include <linux/termios.h>
@@ -44,6 +9,7 @@
 #include <linux/tty_ldisc.h>
 #include <linux/mutex.h>
 #include <linux/tty_flags.h>
+#include <uapi/linux/tty.h>
 
 
 
@@ -694,5 +660,4 @@ do {									\
 } while (0)
 
 
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/types.h b/include/linux/types.h
index bf0dd7524b2a..1cc0e4b9a048 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,22 +1,13 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
-#include <asm/types.h>
+#define __EXPORTED_HEADERS__
+#include <uapi/linux/types.h>
 
 #ifndef __ASSEMBLY__
-#ifdef  __KERNEL__
 
 #define DECLARE_BITMAP(name,bits) \
         unsigned long name[BITS_TO_LONGS(bits)]
-#else
-#ifndef __EXPORTED_HEADERS__
-#warning "Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders"
-#endif /* __EXPORTED_HEADERS__ */
-#endif
-
-#include <linux/posix_types.h>
-
-#ifdef __KERNEL__
 
 typedef __u32 __kernel_dev_t;
 
@@ -157,48 +148,12 @@ typedef u64 dma_addr_t;
 typedef u32 dma_addr_t;
 #endif /* dma_addr_t */
 
-#endif /* __KERNEL__ */
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
 #ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
 #else
-#define __bitwise__
 #endif
 #ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
 #else
-#define __bitwise
 #endif
-
-typedef __u16 __bitwise __le16;
-typedef __u16 __bitwise __be16;
-typedef __u32 __bitwise __le32;
-typedef __u32 __bitwise __be32;
-typedef __u64 __bitwise __le64;
-typedef __u64 __bitwise __be64;
-
-typedef __u16 __bitwise __sum16;
-typedef __u32 __bitwise __wsum;
-
-/*
- * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
- * common 32/64-bit compat problems.
- * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
- * architectures) and to 8-byte boundaries on 64-bit architectures.  The new
- * aligned_64 type enforces 8-byte alignment so that structs containing
- * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
- * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
- */
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-
-#ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
 typedef unsigned __bitwise__ fmode_t;
 
@@ -256,6 +211,5 @@ struct callback_head {
 };
 #define rcu_head callback_head
 
-#endif  /* __KERNEL__ */
 #endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 03f72a2ba028..0b67d7793520 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -17,28 +17,10 @@
 #ifndef _LINUX_UDP_H
 #define _LINUX_UDP_H
 
-#include <linux/types.h>
-
-struct udphdr {
-        __be16  source;
-        __be16  dest;
-        __be16  len;
-        __sum16 check;
-};
-
-/* UDP socket options */
-#define UDP_CORK        1       /* Never send partially complete segments */
-#define UDP_ENCAP       100     /* Set the socket to accept encapsulated packets */
-
-/* UDP encapsulation types */
-#define UDP_ENCAP_ESPINUDP_NON_IKE      1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
-#define UDP_ENCAP_ESPINUDP      2 /* draft-ietf-ipsec-udp-encaps-06 */
-#define UDP_ENCAP_L2TPINUDP     3 /* rfc2661 */
-
-#ifdef __KERNEL__
 #include <net/inet_sock.h>
 #include <linux/skbuff.h>
 #include <net/netns/hash.h>
+#include <uapi/linux/udp.h>
 
 static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
 {
@@ -96,6 +78,4 @@ static inline struct udp_sock *udp_sk(const struct sock *sk)
 
 #define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 
-#endif
-
 #endif  /* _LINUX_UDP_H */
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index c454bbe39ee7..0a4487d3fb1e 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -1,5 +1,3 @@
-#ifndef __UINPUT_H_
-#define __UINPUT_H_
 /*
  *  User level driver support for input subsystem
  *
@@ -31,13 +29,11 @@
  *      0.1     20/06/2002
  *              - first public version
  */
+#ifndef __UINPUT_H_
+#define __UINPUT_H_
 
-#include <linux/types.h>
-#include <linux/input.h>
-
-#define UINPUT_VERSION          3
+#include <uapi/linux/uinput.h>
 
-#ifdef __KERNEL__
 #define UINPUT_NAME             "uinput"
 #define UINPUT_BUFFER_SIZE      16
 #define UINPUT_NUM_REQUESTS     16
@@ -75,103 +71,4 @@ struct uinput_device {
         wait_queue_head_t       requests_waitq;
         spinlock_t              requests_lock;
 };
-#endif  /* __KERNEL__ */
-
-struct uinput_ff_upload {
-        __u32                   request_id;
-        __s32                   retval;
-        struct ff_effect        effect;
-        struct ff_effect        old;
-};
-
-struct uinput_ff_erase {
-        __u32                   request_id;
-        __s32                   retval;
-        __u32                   effect_id;
-};
-
-/* ioctl */
-#define UINPUT_IOCTL_BASE       'U'
-#define UI_DEV_CREATE           _IO(UINPUT_IOCTL_BASE, 1)
-#define UI_DEV_DESTROY          _IO(UINPUT_IOCTL_BASE, 2)
-
-#define UI_SET_EVBIT            _IOW(UINPUT_IOCTL_BASE, 100, int)
-#define UI_SET_KEYBIT           _IOW(UINPUT_IOCTL_BASE, 101, int)
-#define UI_SET_RELBIT           _IOW(UINPUT_IOCTL_BASE, 102, int)
-#define UI_SET_ABSBIT           _IOW(UINPUT_IOCTL_BASE, 103, int)
-#define UI_SET_MSCBIT           _IOW(UINPUT_IOCTL_BASE, 104, int)
-#define UI_SET_LEDBIT           _IOW(UINPUT_IOCTL_BASE, 105, int)
-#define UI_SET_SNDBIT           _IOW(UINPUT_IOCTL_BASE, 106, int)
-#define UI_SET_FFBIT            _IOW(UINPUT_IOCTL_BASE, 107, int)
-#define UI_SET_PHYS             _IOW(UINPUT_IOCTL_BASE, 108, char*)
-#define UI_SET_SWBIT            _IOW(UINPUT_IOCTL_BASE, 109, int)
-#define UI_SET_PROPBIT          _IOW(UINPUT_IOCTL_BASE, 110, int)
-
-#define UI_BEGIN_FF_UPLOAD      _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
-#define UI_END_FF_UPLOAD        _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
-#define UI_BEGIN_FF_ERASE       _IOWR(UINPUT_IOCTL_BASE, 202, struct uinput_ff_erase)
-#define UI_END_FF_ERASE         _IOW(UINPUT_IOCTL_BASE, 203, struct uinput_ff_erase)
-
-/*
- * To write a force-feedback-capable driver, the upload_effect
- * and erase_effect callbacks in input_dev must be implemented.
- * The uinput driver will generate a fake input event when one of
- * these callbacks are invoked. The userspace code then uses
- * ioctls to retrieve additional parameters and send the return code.
- * The callback blocks until this return code is sent.
- *
- * The described callback mechanism is only used if ff_effects_max
- * is set.
- *
- * To implement upload_effect():
- *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_UPLOAD.
- *      A request ID will be given in 'value'.
- *   2. Allocate a uinput_ff_upload struct, fill in request_id with
- *      the 'value' from the EV_UINPUT event.
- *   3. Issue a UI_BEGIN_FF_UPLOAD ioctl, giving it the
- *      uinput_ff_upload struct. It will be filled in with the
- *      ff_effects passed to upload_effect().
- *   4. Perform the effect upload, and place a return code back into
-        the uinput_ff_upload struct.
- *   5. Issue a UI_END_FF_UPLOAD ioctl, also giving it the
- *      uinput_ff_upload_effect struct. This will complete execution
- *      of our upload_effect() handler.
- *
- * To implement erase_effect():
- *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_ERASE.
- *      A request ID will be given in 'value'.
- *   2. Allocate a uinput_ff_erase struct, fill in request_id with
- *      the 'value' from the EV_UINPUT event.
- *   3. Issue a UI_BEGIN_FF_ERASE ioctl, giving it the
- *      uinput_ff_erase struct. It will be filled in with the
- *      effect ID passed to erase_effect().
- *   4. Perform the effect erasure, and place a return code back
- *      into the uinput_ff_erase struct.
- *   5. Issue a UI_END_FF_ERASE ioctl, also giving it the
- *      uinput_ff_erase_effect struct. This will complete execution
- *      of our erase_effect() handler.
- */
-
-/*
- * This is the new event type, used only by uinput.
- * 'code' is UI_FF_UPLOAD or UI_FF_ERASE, and 'value'
- * is the unique request ID. This number was picked
- * arbitrarily, above EV_MAX (since the input system
- * never sees it) but in the range of a 16-bit int.
- */
-#define EV_UINPUT               0x0101
-#define UI_FF_UPLOAD            1
-#define UI_FF_ERASE             2
-
-#define UINPUT_MAX_NAME_SIZE    80
-struct uinput_user_dev {
-        char name[UINPUT_MAX_NAME_SIZE];
-        struct input_id id;
-        __u32 ff_effects_max;
-        __s32 absmax[ABS_CNT];
-        __s32 absmin[ABS_CNT];
-        __s32 absfuzz[ABS_CNT];
-        __s32 absflat[ABS_CNT];
-};
 #endif  /* __UINPUT_H_ */
-
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 98c114323a8b..629aaf51f30b 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -1,9 +1,3 @@
-#ifndef __LINUX_UIO_H
-#define __LINUX_UIO_H
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-
 /*
  *      Berkeley style UIO structures   -       Alan Cox 1994.
  *
@@ -12,21 +6,11 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  */
+#ifndef __LINUX_UIO_H
+#define __LINUX_UIO_H
 
-struct iovec
-{
-        void __user *iov_base;  /* BSD uses caddr_t (1003.1g requires void *) */
-        __kernel_size_t iov_len; /* Must be size_t (1003.1g) */
-};
-
-/*
- *      UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
- */
- 
-#define UIO_FASTIOV     8
-#define UIO_MAXIOV      1024
+#include <uapi/linux/uio.h>
 
-#ifdef __KERNEL__
 
 struct kvec {
         void *iov_base; /* and that should *never* hold a userland pointer */
@@ -52,5 +36,3 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
 #endif
-
-#endif
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index e6f0331e3d45..24594571c5a3 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -35,16 +35,6 @@ struct inode;
 # include <asm/uprobes.h>
 #endif
 
-/* flags that denote/change uprobes behaviour */
-
-/* Have a copy of original instruction */
-#define UPROBE_COPY_INSN        0x1
-
-/* Dont run handlers when first register/ last unregister in progress*/
-#define UPROBE_RUN_HANDLER      0x2
-/* Can skip singlestep */
-#define UPROBE_SKIP_SSTEP       0x4
-
 struct uprobe_consumer {
         int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
         /*
@@ -59,7 +49,6 @@ struct uprobe_consumer {
 #ifdef CONFIG_UPROBES
 enum uprobe_task_state {
         UTASK_RUNNING,
-        UTASK_BP_HIT,
         UTASK_SSTEP,
         UTASK_SSTEP_ACK,
         UTASK_SSTEP_TRAPPED,
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 07915a32fb9d..10278d18709c 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1778,17 +1778,6 @@ static inline int usb_translate_errors(int error_code)
 extern void usb_register_notify(struct notifier_block *nb);
 extern void usb_unregister_notify(struct notifier_block *nb);
 
-#ifdef DEBUG
-#define dbg(format, arg...)                                             \
-        printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)
-#else
-#define dbg(format, arg...)                                             \
-do {                                                                    \
-        if (0)                                                          \
-                printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
-} while (0)
-#endif
-
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;
 
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild
index b607f3532e88..e69de29bb2d1 100644
--- a/include/linux/usb/Kbuild
+++ b/include/linux/usb/Kbuild
@@ -1,10 +0,0 @@
-header-y += audio.h
-header-y += cdc.h
-header-y += ch9.h
-header-y += ch11.h
-header-y += functionfs.h
-header-y += gadgetfs.h
-header-y += midi.h
-header-y += g_printer.h
-header-y += tmc.h
-header-y += video.h
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index a54b8255d75f..3d84619110a4 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -17,531 +17,11 @@
  * Types and defines in this file are either specific to version 1.0 of
  * this standard or common for newer versions.
  */
-
 #ifndef __LINUX_USB_AUDIO_H
 #define __LINUX_USB_AUDIO_H
 
-#include <linux/types.h>
-
-/* bInterfaceProtocol values to denote the version of the standard used */
-#define UAC_VERSION_1                   0x00
-#define UAC_VERSION_2                   0x20
-
-/* A.2 Audio Interface Subclass Codes */
-#define USB_SUBCLASS_AUDIOCONTROL       0x01
-#define USB_SUBCLASS_AUDIOSTREAMING     0x02
-#define USB_SUBCLASS_MIDISTREAMING      0x03
-
-/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-#define UAC_HEADER                      0x01
-#define UAC_INPUT_TERMINAL              0x02
-#define UAC_OUTPUT_TERMINAL             0x03
-#define UAC_MIXER_UNIT                  0x04
-#define UAC_SELECTOR_UNIT               0x05
-#define UAC_FEATURE_UNIT                0x06
-#define UAC1_PROCESSING_UNIT            0x07
-#define UAC1_EXTENSION_UNIT             0x08
-
-/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define UAC_AS_GENERAL                  0x01
-#define UAC_FORMAT_TYPE                 0x02
-#define UAC_FORMAT_SPECIFIC             0x03
-
-/* A.7 Processing Unit Process Types */
-#define UAC_PROCESS_UNDEFINED           0x00
-#define UAC_PROCESS_UP_DOWNMIX          0x01
-#define UAC_PROCESS_DOLBY_PROLOGIC      0x02
-#define UAC_PROCESS_STEREO_EXTENDER     0x03
-#define UAC_PROCESS_REVERB              0x04
-#define UAC_PROCESS_CHORUS              0x05
-#define UAC_PROCESS_DYN_RANGE_COMP      0x06
-
-/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_EP_GENERAL                  0x01
-
-/* A.9 Audio Class-Specific Request Codes */
-#define UAC_SET_                        0x00
-#define UAC_GET_                        0x80
-
-#define UAC__CUR                        0x1
-#define UAC__MIN                        0x2
-#define UAC__MAX                        0x3
-#define UAC__RES                        0x4
-#define UAC__MEM                        0x5
-
-#define UAC_SET_CUR                     (UAC_SET_ | UAC__CUR)
-#define UAC_GET_CUR                     (UAC_GET_ | UAC__CUR)
-#define UAC_SET_MIN                     (UAC_SET_ | UAC__MIN)
-#define UAC_GET_MIN                     (UAC_GET_ | UAC__MIN)
-#define UAC_SET_MAX                     (UAC_SET_ | UAC__MAX)
-#define UAC_GET_MAX                     (UAC_GET_ | UAC__MAX)
-#define UAC_SET_RES                     (UAC_SET_ | UAC__RES)
-#define UAC_GET_RES                     (UAC_GET_ | UAC__RES)
-#define UAC_SET_MEM                     (UAC_SET_ | UAC__MEM)
-#define UAC_GET_MEM                     (UAC_GET_ | UAC__MEM)
-
-#define UAC_GET_STAT                    0xff
-
-/* A.10 Control Selector Codes */
-
-/* A.10.1 Terminal Control Selectors */
-#define UAC_TERM_COPY_PROTECT           0x01
-
-/* A.10.2 Feature Unit Control Selectors */
-#define UAC_FU_MUTE                     0x01
-#define UAC_FU_VOLUME                   0x02
-#define UAC_FU_BASS                     0x03
-#define UAC_FU_MID                      0x04
-#define UAC_FU_TREBLE                   0x05
-#define UAC_FU_GRAPHIC_EQUALIZER        0x06
-#define UAC_FU_AUTOMATIC_GAIN           0x07
-#define UAC_FU_DELAY                    0x08
-#define UAC_FU_BASS_BOOST               0x09
-#define UAC_FU_LOUDNESS                 0x0a
-
-#define UAC_CONTROL_BIT(CS)     (1 << ((CS) - 1))
-
-/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
-#define UAC_UD_ENABLE                   0x01
-#define UAC_UD_MODE_SELECT              0x02
-
-/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
-#define UAC_DP_ENABLE                   0x01
-#define UAC_DP_MODE_SELECT              0x02
-
-/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
-#define UAC_3D_ENABLE                   0x01
-#define UAC_3D_SPACE                    0x02
-
-/* A.10.3.4 Reverberation Processing Unit Control Selectors */
-#define UAC_REVERB_ENABLE               0x01
-#define UAC_REVERB_LEVEL                0x02
-#define UAC_REVERB_TIME                 0x03
-#define UAC_REVERB_FEEDBACK             0x04
-
-/* A.10.3.5 Chorus Processing Unit Control Selectors */
-#define UAC_CHORUS_ENABLE               0x01
-#define UAC_CHORUS_LEVEL                0x02
-#define UAC_CHORUS_RATE                 0x03
-#define UAC_CHORUS_DEPTH                0x04
-
-/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
-#define UAC_DCR_ENABLE                  0x01
-#define UAC_DCR_RATE                    0x02
-#define UAC_DCR_MAXAMPL                 0x03
-#define UAC_DCR_THRESHOLD               0x04
-#define UAC_DCR_ATTACK_TIME             0x05
-#define UAC_DCR_RELEASE_TIME            0x06
-
-/* A.10.4 Extension Unit Control Selectors */
-#define UAC_XU_ENABLE                   0x01
-
-/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define UAC_MS_HEADER                   0x01
-#define UAC_MIDI_IN_JACK                0x02
-#define UAC_MIDI_OUT_JACK               0x03
-
-/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_MS_GENERAL                  0x01
-
-/* Terminals - 2.1 USB Terminal Types */
-#define UAC_TERMINAL_UNDEFINED          0x100
-#define UAC_TERMINAL_STREAMING          0x101
-#define UAC_TERMINAL_VENDOR_SPEC        0x1FF
-
-/* Terminal Control Selectors */
-/* 4.3.2  Class-Specific AC Interface Descriptor */
-struct uac1_ac_header_descriptor {
-        __u8  bLength;                  /* 8 + n */
-        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-        __u8  bDescriptorSubtype;       /* UAC_MS_HEADER */
-        __le16 bcdADC;                  /* 0x0100 */
-        __le16 wTotalLength;            /* includes Unit and Terminal desc. */
-        __u8  bInCollection;            /* n */
-        __u8  baInterfaceNr[];          /* [n] */
-} __attribute__ ((packed));
-
-#define UAC_DT_AC_HEADER_SIZE(n)        (8 + (n))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                     \
-struct uac1_ac_header_descriptor_##n {                  \
-        __u8  bLength;                                          \
-        __u8  bDescriptorType;                                  \
-        __u8  bDescriptorSubtype;                               \
-        __le16 bcdADC;                                          \
-        __le16 wTotalLength;                                    \
-        __u8  bInCollection;                                    \
-        __u8  baInterfaceNr[n];                                 \
-} __attribute__ ((packed))
-
-/* 4.3.2.1 Input Terminal Descriptor */
-struct uac_input_terminal_descriptor {
-        __u8  bLength;                  /* in bytes: 12 */
-        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
-        __u8  bDescriptorSubtype;       /* INPUT_TERMINAL descriptor subtype */
-        __u8  bTerminalID;              /* Constant uniquely terminal ID */
-        __le16 wTerminalType;           /* USB Audio Terminal Types */
-        __u8  bAssocTerminal;           /* ID of the Output Terminal associated */
-        __u8  bNrChannels;              /* Number of logical output channels */
-        __le16 wChannelConfig;
-        __u8  iChannelNames;
-        __u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_INPUT_TERMINAL_SIZE                      12
-
-/* Terminals - 2.2 Input Terminal Types */
-#define UAC_INPUT_TERMINAL_UNDEFINED                    0x200
-#define UAC_INPUT_TERMINAL_MICROPHONE                   0x201
-#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE           0x202
-#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE          0x203
-#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE          0x204
-#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY             0x205
-#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY        0x206
-
-/* Terminals - control selectors */
-
-#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL            0x01
-
-/* 4.3.2.2 Output Terminal Descriptor */
-struct uac1_output_terminal_descriptor {
-        __u8  bLength;                  /* in bytes: 9 */
-        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
-        __u8  bDescriptorSubtype;       /* OUTPUT_TERMINAL descriptor subtype */
-        __u8  bTerminalID;              /* Constant uniquely terminal ID */
-        __le16 wTerminalType;           /* USB Audio Terminal Types */
-        __u8  bAssocTerminal;           /* ID of the Input Terminal associated */
-        __u8  bSourceID;                /* ID of the connected Unit or Terminal*/
-        __u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_OUTPUT_TERMINAL_SIZE                     9
-
-/* Terminals - 2.3 Output Terminal Types */
-#define UAC_OUTPUT_TERMINAL_UNDEFINED                   0x300
-#define UAC_OUTPUT_TERMINAL_SPEAKER                     0x301
-#define UAC_OUTPUT_TERMINAL_HEADPHONES                  0x302
-#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO  0x303
-#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER             0x304
-#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER                0x305
-#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER       0x306
-#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER    0x307
-
-/* Set bControlSize = 2 as default setting */
-#define UAC_DT_FEATURE_UNIT_SIZE(ch)            (7 + ((ch) + 1) * 2)
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                 \
-struct uac_feature_unit_descriptor_##ch {                       \
-        __u8  bLength;                                          \
-        __u8  bDescriptorType;                                  \
-        __u8  bDescriptorSubtype;                               \
-        __u8  bUnitID;                                          \
-        __u8  bSourceID;                                        \
-        __u8  bControlSize;                                     \
-        __le16 bmaControls[ch + 1];                             \
-        __u8  iFeature;                                         \
-} __attribute__ ((packed))
-
-/* 4.3.2.3 Mixer Unit Descriptor */
-struct uac_mixer_unit_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bUnitID;
-        __u8 bNrInPins;
-        __u8 baSourceID[];
-} __attribute__ ((packed));
+#include <uapi/linux/usb/audio.h>
 
-static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
-{
-        return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
-                                                  int protocol)
-{
-        if (protocol == UAC_VERSION_1)
-                return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-                        desc->baSourceID[desc->bNrInPins + 1];
-        else
-                return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-                        (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-                        (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-                        (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
-                                                int protocol)
-{
-        return (protocol == UAC_VERSION_1) ?
-                desc->baSourceID[desc->bNrInPins + 3] :
-                desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
-                                              int protocol)
-{
-        return (protocol == UAC_VERSION_1) ?
-                &desc->baSourceID[desc->bNrInPins + 4] :
-                &desc->baSourceID[desc->bNrInPins + 6];
-}
-
-static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
-{
-        __u8 *raw = (__u8 *) desc;
-        return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.4 Selector Unit Descriptor */
-struct uac_selector_unit_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bUintID;
-        __u8 bNrInPins;
-        __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
-{
-        __u8 *raw = (__u8 *) desc;
-        return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.5 Feature Unit Descriptor */
-struct uac_feature_unit_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bUnitID;
-        __u8 bSourceID;
-        __u8 bControlSize;
-        __u8 bmaControls[0]; /* variable length */
-} __attribute__((packed));
-
-static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
-{
-        __u8 *raw = (__u8 *) desc;
-        return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.6 Processing Unit Descriptors */
-struct uac_processing_unit_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bUnitID;
-        __u16 wProcessType;
-        __u8 bNrInPins;
-        __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
-{
-        return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
-                                                       int protocol)
-{
-        if (protocol == UAC_VERSION_1)
-                return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-                        desc->baSourceID[desc->bNrInPins + 1];
-        else
-                return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-                        (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-                        (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-                        (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
-                                                     int protocol)
-{
-        return (protocol == UAC_VERSION_1) ?
-                desc->baSourceID[desc->bNrInPins + 3] :
-                desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-                                                    int protocol)
-{
-        return (protocol == UAC_VERSION_1) ?
-                desc->baSourceID[desc->bNrInPins + 4] :
-                desc->baSourceID[desc->bNrInPins + 6];
-}
-
-static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
-                                                   int protocol)
-{
-        return (protocol == UAC_VERSION_1) ?
-                &desc->baSourceID[desc->bNrInPins + 5] :
-                &desc->baSourceID[desc->bNrInPins + 7];
-}
-
-static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
-                                                   int protocol)
-{
-        __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-        return desc->baSourceID[desc->bNrInPins + control_size];
-}
-
-static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
-                                                 int protocol)
-{
-        __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-        return &desc->baSourceID[desc->bNrInPins + control_size + 1];
-}
-
-/* 4.5.2 Class-Specific AS Interface Descriptor */
-struct uac1_as_header_descriptor {
-        __u8  bLength;                  /* in bytes: 7 */
-        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-        __u8  bDescriptorSubtype;       /* AS_GENERAL */
-        __u8  bTerminalLink;            /* Terminal ID of connected Terminal */
-        __u8  bDelay;                   /* Delay introduced by the data path */
-        __le16 wFormatTag;              /* The Audio Data Format */
-} __attribute__ ((packed));
-
-#define UAC_DT_AS_HEADER_SIZE           7
-
-/* Formats - A.1.1 Audio Data Format Type I Codes */
-#define UAC_FORMAT_TYPE_I_UNDEFINED     0x0
-#define UAC_FORMAT_TYPE_I_PCM           0x1
-#define UAC_FORMAT_TYPE_I_PCM8          0x2
-#define UAC_FORMAT_TYPE_I_IEEE_FLOAT    0x3
-#define UAC_FORMAT_TYPE_I_ALAW          0x4
-#define UAC_FORMAT_TYPE_I_MULAW         0x5
-
-struct uac_format_type_i_continuous_descriptor {
-        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
-        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
-        __u8  bFormatType;              /* FORMAT_TYPE_1 */
-        __u8  bNrChannels;              /* physical channels in the stream */
-        __u8  bSubframeSize;            /* */
-        __u8  bBitResolution;
-        __u8  bSamFreqType;
-        __u8  tLowerSamFreq[3];
-        __u8  tUpperSamFreq[3];
-} __attribute__ ((packed));
-
-#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE  14
-
-struct uac_format_type_i_discrete_descriptor {
-        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
-        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
-        __u8  bFormatType;              /* FORMAT_TYPE_1 */
-        __u8  bNrChannels;              /* physical channels in the stream */
-        __u8  bSubframeSize;            /* */
-        __u8  bBitResolution;
-        __u8  bSamFreqType;
-        __u8  tSamFreq[][3];
-} __attribute__ ((packed));
-
-#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)              \
-struct uac_format_type_i_discrete_descriptor_##n {              \
-        __u8  bLength;                                          \
-        __u8  bDescriptorType;                                  \
-        __u8  bDescriptorSubtype;                               \
-        __u8  bFormatType;                                      \
-        __u8  bNrChannels;                                      \
-        __u8  bSubframeSize;                                    \
-        __u8  bBitResolution;                                   \
-        __u8  bSamFreqType;                                     \
-        __u8  tSamFreq[n][3];                                   \
-} __attribute__ ((packed))
-
-#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
-
-struct uac_format_type_i_ext_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bFormatType;
-        __u8 bSubslotSize;
-        __u8 bBitResolution;
-        __u8 bHeaderLength;
-        __u8 bControlSize;
-        __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* Formats - Audio Data Format Type I Codes */
-
-#define UAC_FORMAT_TYPE_II_MPEG 0x1001
-#define UAC_FORMAT_TYPE_II_AC3  0x1002
-
-struct uac_format_type_ii_discrete_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bFormatType;
-        __le16 wMaxBitRate;
-        __le16 wSamplesPerFrame;
-        __u8 bSamFreqType;
-        __u8 tSamFreq[][3];
-} __attribute__((packed));
-
-struct uac_format_type_ii_ext_descriptor {
-        __u8 bLength;
-        __u8 bDescriptorType;
-        __u8 bDescriptorSubtype;
-        __u8 bFormatType;
-        __u16 wMaxBitRate;
-        __u16 wSamplesPerFrame;
-        __u8 bHeaderLength;
-        __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* type III */
-#define UAC_FORMAT_TYPE_III_IEC1937_AC3 0x2001
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG1_LAYER1        0x2002
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_NOEXT 0x2003
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_EXT   0x2004
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER1_LS     0x2005
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER23_LS    0x2006
-
-/* Formats - A.2 Format Type Codes */
-#define UAC_FORMAT_TYPE_UNDEFINED       0x0
-#define UAC_FORMAT_TYPE_I               0x1
-#define UAC_FORMAT_TYPE_II              0x2
-#define UAC_FORMAT_TYPE_III             0x3
-#define UAC_EXT_FORMAT_TYPE_I           0x81
-#define UAC_EXT_FORMAT_TYPE_II          0x82
-#define UAC_EXT_FORMAT_TYPE_III         0x83
-
-struct uac_iso_endpoint_descriptor {
-        __u8  bLength;                  /* in bytes: 7 */
-        __u8  bDescriptorType;          /* USB_DT_CS_ENDPOINT */
-        __u8  bDescriptorSubtype;       /* EP_GENERAL */
-        __u8  bmAttributes;
-        __u8  bLockDelayUnits;
-        __le16 wLockDelay;
-} __attribute__((packed));
-#define UAC_ISO_ENDPOINT_DESC_SIZE      7
-
-#define UAC_EP_CS_ATTR_SAMPLE_RATE      0x01
-#define UAC_EP_CS_ATTR_PITCH_CONTROL    0x02
-#define UAC_EP_CS_ATTR_FILL_MAX         0x80
-
-/* status word format (3.7.1.1) */
-
-#define UAC1_STATUS_TYPE_ORIG_MASK              0x0f
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF  0x0
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF   0x1
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP   0x2
-
-#define UAC1_STATUS_TYPE_IRQ_PENDING            (1 << 7)
-#define UAC1_STATUS_TYPE_MEM_CHANGED            (1 << 6)
-
-struct uac1_status_word {
-        __u8 bStatusType;
-        __u8 bOriginator;
-} __attribute__((packed));
-
-#ifdef __KERNEL__
 
 struct usb_audio_control {
         struct list_head list;
@@ -561,6 +41,4 @@ struct usb_audio_control_selector {
         struct usb_descriptor_header *desc;
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* __LINUX_USB_AUDIO_H */
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index d1d732c2838d..9c210f2283df 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -29,887 +29,11 @@
  *     someone that the two other points are non-issues for that
  *     particular descriptor type.
  */
-
 #ifndef __LINUX_USB_CH9_H
 #define __LINUX_USB_CH9_H
 
-#include <linux/types.h>        /* __u8 etc */
-#include <asm/byteorder.h>      /* le16_to_cpu */
-
-/*-------------------------------------------------------------------------*/
-
-/* CONTROL REQUEST SUPPORT */
-
-/*
- * USB directions
- *
- * This bit flag is used in endpoint descriptors' bEndpointAddress field.
- * It's also one of three fields in control requests bRequestType.
- */
-#define USB_DIR_OUT                     0               /* to device */
-#define USB_DIR_IN                      0x80            /* to host */
-
-/*
- * USB types, the second of three bRequestType fields
- */
-#define USB_TYPE_MASK                   (0x03 << 5)
-#define USB_TYPE_STANDARD               (0x00 << 5)
-#define USB_TYPE_CLASS                  (0x01 << 5)
-#define USB_TYPE_VENDOR                 (0x02 << 5)
-#define USB_TYPE_RESERVED               (0x03 << 5)
-
-/*
- * USB recipients, the third of three bRequestType fields
- */
-#define USB_RECIP_MASK                  0x1f
-#define USB_RECIP_DEVICE                0x00
-#define USB_RECIP_INTERFACE             0x01
-#define USB_RECIP_ENDPOINT              0x02
-#define USB_RECIP_OTHER                 0x03
-/* From Wireless USB 1.0 */
-#define USB_RECIP_PORT                  0x04
-#define USB_RECIP_RPIPE         0x05
-
-/*
- * Standard requests, for the bRequest field of a SETUP packet.
- *
- * These are qualified by the bRequestType field, so that for example
- * TYPE_CLASS or TYPE_VENDOR specific feature flags could be retrieved
- * by a GET_STATUS request.
- */
-#define USB_REQ_GET_STATUS              0x00
-#define USB_REQ_CLEAR_FEATURE           0x01
-#define USB_REQ_SET_FEATURE             0x03
-#define USB_REQ_SET_ADDRESS             0x05
-#define USB_REQ_GET_DESCRIPTOR          0x06
-#define USB_REQ_SET_DESCRIPTOR          0x07
-#define USB_REQ_GET_CONFIGURATION       0x08
-#define USB_REQ_SET_CONFIGURATION       0x09
-#define USB_REQ_GET_INTERFACE           0x0A
-#define USB_REQ_SET_INTERFACE           0x0B
-#define USB_REQ_SYNCH_FRAME             0x0C
-#define USB_REQ_SET_SEL                 0x30
-#define USB_REQ_SET_ISOCH_DELAY         0x31
-
-#define USB_REQ_SET_ENCRYPTION          0x0D    /* Wireless USB */
-#define USB_REQ_GET_ENCRYPTION          0x0E
-#define USB_REQ_RPIPE_ABORT             0x0E
-#define USB_REQ_SET_HANDSHAKE           0x0F
-#define USB_REQ_RPIPE_RESET             0x0F
-#define USB_REQ_GET_HANDSHAKE           0x10
-#define USB_REQ_SET_CONNECTION          0x11
-#define USB_REQ_SET_SECURITY_DATA       0x12
-#define USB_REQ_GET_SECURITY_DATA       0x13
-#define USB_REQ_SET_WUSB_DATA           0x14
-#define USB_REQ_LOOPBACK_DATA_WRITE     0x15
-#define USB_REQ_LOOPBACK_DATA_READ      0x16
-#define USB_REQ_SET_INTERFACE_DS        0x17
-
-/* The Link Power Management (LPM) ECN defines USB_REQ_TEST_AND_SET command,
- * used by hubs to put ports into a new L1 suspend state, except that it
- * forgot to define its number ...
- */
-
-/*
- * USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and
- * are read as a bit array returned by USB_REQ_GET_STATUS.  (So there
- * are at most sixteen features of each type.)  Hubs may also support a
- * new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend.
- */
-#define USB_DEVICE_SELF_POWERED         0       /* (read only) */
-#define USB_DEVICE_REMOTE_WAKEUP        1       /* dev may initiate wakeup */
-#define USB_DEVICE_TEST_MODE            2       /* (wired high speed only) */
-#define USB_DEVICE_BATTERY              2       /* (wireless) */
-#define USB_DEVICE_B_HNP_ENABLE         3       /* (otg) dev may initiate HNP */
-#define USB_DEVICE_WUSB_DEVICE          3       /* (wireless)*/
-#define USB_DEVICE_A_HNP_SUPPORT        4       /* (otg) RH port supports HNP */
-#define USB_DEVICE_A_ALT_HNP_SUPPORT    5       /* (otg) other RH port does */
-#define USB_DEVICE_DEBUG_MODE           6       /* (special devices only) */
-
-/*
- * Test Mode Selectors
- * See USB 2.0 spec Table 9-7
- */
-#define TEST_J          1
-#define TEST_K          2
-#define TEST_SE0_NAK    3
-#define TEST_PACKET     4
-#define TEST_FORCE_EN   5
-
-/*
- * New Feature Selectors as added by USB 3.0
- * See USB 3.0 spec Table 9-6
- */
-#define USB_DEVICE_U1_ENABLE    48      /* dev may initiate U1 transition */
-#define USB_DEVICE_U2_ENABLE    49      /* dev may initiate U2 transition */
-#define USB_DEVICE_LTM_ENABLE   50      /* dev may send LTM */
-#define USB_INTRF_FUNC_SUSPEND  0       /* function suspend */
-
-#define USB_INTR_FUNC_SUSPEND_OPT_MASK  0xFF00
-/*
- * Suspend Options, Table 9-7 USB 3.0 spec
- */
-#define USB_INTRF_FUNC_SUSPEND_LP       (1 << (8 + 0))
-#define USB_INTRF_FUNC_SUSPEND_RW       (1 << (8 + 1))
-
-#define USB_ENDPOINT_HALT               0       /* IN/OUT will STALL */
-
-/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
-#define USB_DEV_STAT_U1_ENABLED         2       /* transition into U1 state */
-#define USB_DEV_STAT_U2_ENABLED         3       /* transition into U2 state */
-#define USB_DEV_STAT_LTM_ENABLED        4       /* Latency tolerance messages */
-
-/**
- * struct usb_ctrlrequest - SETUP data for a USB device control request
- * @bRequestType: matches the USB bmRequestType field
- * @bRequest: matches the USB bRequest field
- * @wValue: matches the USB wValue field (le16 byte order)
- * @wIndex: matches the USB wIndex field (le16 byte order)
- * @wLength: matches the USB wLength field (le16 byte order)
- *
- * This structure is used to send control requests to a USB device.  It matches
- * the different fields of the USB 2.0 Spec section 9.3, table 9-2.  See the
- * USB spec for a fuller description of the different fields, and what they are
- * used for.
- *
- * Note that the driver for any interface can issue control requests.
- * For most devices, interfaces don't coordinate with each other, so
- * such requests may be made at any time.
- */
-struct usb_ctrlrequest {
-        __u8 bRequestType;
-        __u8 bRequest;
-        __le16 wValue;
-        __le16 wIndex;
-        __le16 wLength;
-} __attribute__ ((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * STANDARD DESCRIPTORS ... as returned by GET_DESCRIPTOR, or
- * (rarely) accepted by SET_DESCRIPTOR.
- *
- * Note that all multi-byte values here are encoded in little endian
- * byte order "on the wire".  Within the kernel and when exposed
- * through the Linux-USB APIs, they are not converted to cpu byte
- * order; it is the responsibility of the client code to do this.
- * The single exception is when device and configuration descriptors (but
- * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
- * in this case the fields are converted to host endianness by the kernel.
- */
-
-/*
- * Descriptor types ... USB 2.0 spec table 9.5
- */
-#define USB_DT_DEVICE                   0x01
-#define USB_DT_CONFIG                   0x02
-#define USB_DT_STRING                   0x03
-#define USB_DT_INTERFACE                0x04
-#define USB_DT_ENDPOINT                 0x05
-#define USB_DT_DEVICE_QUALIFIER         0x06
-#define USB_DT_OTHER_SPEED_CONFIG       0x07
-#define USB_DT_INTERFACE_POWER          0x08
-/* these are from a minor usb 2.0 revision (ECN) */
-#define USB_DT_OTG                      0x09
-#define USB_DT_DEBUG                    0x0a
-#define USB_DT_INTERFACE_ASSOCIATION    0x0b
-/* these are from the Wireless USB spec */
-#define USB_DT_SECURITY                 0x0c
-#define USB_DT_KEY                      0x0d
-#define USB_DT_ENCRYPTION_TYPE          0x0e
-#define USB_DT_BOS                      0x0f
-#define USB_DT_DEVICE_CAPABILITY        0x10
-#define USB_DT_WIRELESS_ENDPOINT_COMP   0x11
-#define USB_DT_WIRE_ADAPTER             0x21
-#define USB_DT_RPIPE                    0x22
-#define USB_DT_CS_RADIO_CONTROL         0x23
-/* From the T10 UAS specification */
-#define USB_DT_PIPE_USAGE               0x24
-/* From the USB 3.0 spec */
-#define USB_DT_SS_ENDPOINT_COMP         0x30
-
-/* Conventional codes for class-specific descriptors.  The convention is
- * defined in the USB "Common Class" Spec (3.11).  Individual class specs
- * are authoritative for their usage, not the "common class" writeup.
- */
-#define USB_DT_CS_DEVICE                (USB_TYPE_CLASS | USB_DT_DEVICE)
-#define USB_DT_CS_CONFIG                (USB_TYPE_CLASS | USB_DT_CONFIG)
-#define USB_DT_CS_STRING                (USB_TYPE_CLASS | USB_DT_STRING)
-#define USB_DT_CS_INTERFACE             (USB_TYPE_CLASS | USB_DT_INTERFACE)
-#define USB_DT_CS_ENDPOINT              (USB_TYPE_CLASS | USB_DT_ENDPOINT)
-
-/* All standard descriptors have these 2 fields at the beginning */
-struct usb_descriptor_header {
-        __u8  bLength;
-        __u8  bDescriptorType;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE: Device descriptor */
-struct usb_device_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 bcdUSB;
-        __u8  bDeviceClass;
-        __u8  bDeviceSubClass;
-        __u8  bDeviceProtocol;
-        __u8  bMaxPacketSize0;
-        __le16 idVendor;
-        __le16 idProduct;
-        __le16 bcdDevice;
-        __u8  iManufacturer;
-        __u8  iProduct;
-        __u8  iSerialNumber;
-        __u8  bNumConfigurations;
-} __attribute__ ((packed));
-
-#define USB_DT_DEVICE_SIZE              18
-
-
-/*
- * Device and/or Interface Class codes
- * as found in bDeviceClass or bInterfaceClass
- * and defined by www.usb.org documents
- */
-#define USB_CLASS_PER_INTERFACE         0       /* for DeviceClass */
-#define USB_CLASS_AUDIO                 1
-#define USB_CLASS_COMM                  2
-#define USB_CLASS_HID                   3
-#define USB_CLASS_PHYSICAL              5
-#define USB_CLASS_STILL_IMAGE           6
-#define USB_CLASS_PRINTER               7
-#define USB_CLASS_MASS_STORAGE          8
-#define USB_CLASS_HUB                   9
-#define USB_CLASS_CDC_DATA              0x0a
-#define USB_CLASS_CSCID                 0x0b    /* chip+ smart card */
-#define USB_CLASS_CONTENT_SEC           0x0d    /* content security */
-#define USB_CLASS_VIDEO                 0x0e
-#define USB_CLASS_WIRELESS_CONTROLLER   0xe0
-#define USB_CLASS_MISC                  0xef
-#define USB_CLASS_APP_SPEC              0xfe
-#define USB_CLASS_VENDOR_SPEC           0xff
-
-#define USB_SUBCLASS_VENDOR_SPEC        0xff
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_CONFIG: Configuration descriptor information.
- *
- * USB_DT_OTHER_SPEED_CONFIG is the same descriptor, except that the
- * descriptor type is different.  Highspeed-capable devices can look
- * different depending on what speed they're currently running.  Only
- * devices with a USB_DT_DEVICE_QUALIFIER have any OTHER_SPEED_CONFIG
- * descriptors.
- */
-struct usb_config_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 wTotalLength;
-        __u8  bNumInterfaces;
-        __u8  bConfigurationValue;
-        __u8  iConfiguration;
-        __u8  bmAttributes;
-        __u8  bMaxPower;
-} __attribute__ ((packed));
-
-#define USB_DT_CONFIG_SIZE              9
-
-/* from config descriptor bmAttributes */
-#define USB_CONFIG_ATT_ONE              (1 << 7)        /* must be set */
-#define USB_CONFIG_ATT_SELFPOWER        (1 << 6)        /* self powered */
-#define USB_CONFIG_ATT_WAKEUP           (1 << 5)        /* can wakeup */
-#define USB_CONFIG_ATT_BATTERY          (1 << 4)        /* battery powered */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_STRING: String descriptor */
-struct usb_string_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 wData[1];                /* UTF-16LE encoded */
-} __attribute__ ((packed));
-
-/* note that "string" zero is special, it holds language codes that
- * the device supports, not Unicode characters.
- */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_INTERFACE: Interface descriptor */
-struct usb_interface_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bInterfaceNumber;
-        __u8  bAlternateSetting;
-        __u8  bNumEndpoints;
-        __u8  bInterfaceClass;
-        __u8  bInterfaceSubClass;
-        __u8  bInterfaceProtocol;
-        __u8  iInterface;
-} __attribute__ ((packed));
-
-#define USB_DT_INTERFACE_SIZE           9
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_ENDPOINT: Endpoint descriptor */
-struct usb_endpoint_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bEndpointAddress;
-        __u8  bmAttributes;
-        __le16 wMaxPacketSize;
-        __u8  bInterval;
-
-        /* NOTE:  these two are _only_ in audio endpoints. */
-        /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
-        __u8  bRefresh;
-        __u8  bSynchAddress;
-} __attribute__ ((packed));
-
-#define USB_DT_ENDPOINT_SIZE            7
-#define USB_DT_ENDPOINT_AUDIO_SIZE      9       /* Audio extension */
-
-
-/*
- * Endpoints
- */
-#define USB_ENDPOINT_NUMBER_MASK        0x0f    /* in bEndpointAddress */
-#define USB_ENDPOINT_DIR_MASK           0x80
-
-#define USB_ENDPOINT_XFERTYPE_MASK      0x03    /* in bmAttributes */
-#define USB_ENDPOINT_XFER_CONTROL       0
-#define USB_ENDPOINT_XFER_ISOC          1
-#define USB_ENDPOINT_XFER_BULK          2
-#define USB_ENDPOINT_XFER_INT           3
-#define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
-
-/* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
-#define USB_ENDPOINT_INTRTYPE           0x30
-#define USB_ENDPOINT_INTR_PERIODIC      (0 << 4)
-#define USB_ENDPOINT_INTR_NOTIFICATION  (1 << 4)
-
-#define USB_ENDPOINT_SYNCTYPE           0x0c
-#define USB_ENDPOINT_SYNC_NONE          (0 << 2)
-#define USB_ENDPOINT_SYNC_ASYNC         (1 << 2)
-#define USB_ENDPOINT_SYNC_ADAPTIVE      (2 << 2)
-#define USB_ENDPOINT_SYNC_SYNC          (3 << 2)
-
-#define USB_ENDPOINT_USAGE_MASK         0x30
-#define USB_ENDPOINT_USAGE_DATA         0x00
-#define USB_ENDPOINT_USAGE_FEEDBACK     0x10
-#define USB_ENDPOINT_USAGE_IMPLICIT_FB  0x20    /* Implicit feedback Data endpoint */
-
-/*-------------------------------------------------------------------------*/
-
-/**
- * usb_endpoint_num - get the endpoint's number
- * @epd: endpoint to be checked
- *
- * Returns @epd's number: 0 to 15.
- */
-static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
-{
-        return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
-}
-
-/**
- * usb_endpoint_type - get the endpoint's transfer type
- * @epd: endpoint to be checked
- *
- * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
- * to @epd's transfer type.
- */
-static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
-{
-        return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
-}
-
-/**
- * usb_endpoint_dir_in - check if the endpoint has IN direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type IN, otherwise it returns false.
- */
-static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
-}
-
-/**
- * usb_endpoint_dir_out - check if the endpoint has OUT direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type OUT, otherwise it returns false.
- */
-static inline int usb_endpoint_dir_out(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
-}
-
-/**
- * usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type bulk, otherwise it returns false.
- */
-static inline int usb_endpoint_xfer_bulk(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_BULK);
-}
-
-/**
- * usb_endpoint_xfer_control - check if the endpoint has control transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type control, otherwise it returns false.
- */
-static inline int usb_endpoint_xfer_control(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_CONTROL);
-}
-
-/**
- * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type interrupt, otherwise it returns
- * false.
- */
-static inline int usb_endpoint_xfer_int(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_INT);
-}
-
-/**
- * usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type isochronous, otherwise it returns
- * false.
- */
-static inline int usb_endpoint_xfer_isoc(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_ISOC);
-}
-
-/**
- * usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and IN direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_bulk_in(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and OUT direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_bulk_out(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and IN direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_int_in(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and OUT direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_int_out(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and IN direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_isoc_in(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and OUT direction,
- * otherwise it returns false.
- */
-static inline int usb_endpoint_is_isoc_out(
-                                const struct usb_endpoint_descriptor *epd)
-{
-        return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_maxp - get endpoint's max packet size
- * @epd: endpoint to be checked
- *
- * Returns @epd's max packet
- */
-static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
-{
-        return __le16_to_cpu(epd->wMaxPacketSize);
-}
-
-static inline int usb_endpoint_interrupt_type(
-                const struct usb_endpoint_descriptor *epd)
-{
-        return epd->bmAttributes & USB_ENDPOINT_INTRTYPE;
-}
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
-struct usb_ss_ep_comp_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bMaxBurst;
-        __u8  bmAttributes;
-        __le16 wBytesPerInterval;
-} __attribute__ ((packed));
-
-#define USB_DT_SS_EP_COMP_SIZE          6
-
-/* Bits 4:0 of bmAttributes if this is a bulk endpoint */
-static inline int
-usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
-{
-        int             max_streams;
-
-        if (!comp)
-                return 0;
-
-        max_streams = comp->bmAttributes & 0x1f;
-
-        if (!max_streams)
-                return 0;
-
-        max_streams = 1 << max_streams;
-
-        return max_streams;
-}
-
-/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
-#define USB_SS_MULT(p)                  (1 + ((p) & 0x3))
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE_QUALIFIER: Device Qualifier descriptor */
-struct usb_qualifier_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 bcdUSB;
-        __u8  bDeviceClass;
-        __u8  bDeviceSubClass;
-        __u8  bDeviceProtocol;
-        __u8  bMaxPacketSize0;
-        __u8  bNumConfigurations;
-        __u8  bRESERVED;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_OTG (from OTG 1.0a supplement) */
-struct usb_otg_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bmAttributes;     /* support for HNP, SRP, etc */
-} __attribute__ ((packed));
-
-/* from usb_otg_descriptor.bmAttributes */
-#define USB_OTG_SRP             (1 << 0)
-#define USB_OTG_HNP             (1 << 1)        /* swap host/device roles */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEBUG:  for special highspeed devices, replacing serial console */
-struct usb_debug_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        /* bulk endpoints with 8 byte maxpacket */
-        __u8  bDebugInEndpoint;
-        __u8  bDebugOutEndpoint;
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_INTERFACE_ASSOCIATION: groups interfaces */
-struct usb_interface_assoc_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bFirstInterface;
-        __u8  bInterfaceCount;
-        __u8  bFunctionClass;
-        __u8  bFunctionSubClass;
-        __u8  bFunctionProtocol;
-        __u8  iFunction;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_SECURITY:  group of wireless security descriptors, including
- * encryption types available for setting up a CC/association.
- */
-struct usb_security_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 wTotalLength;
-        __u8  bNumEncryptionTypes;
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_KEY:  used with {GET,SET}_SECURITY_DATA; only public keys
- * may be retrieved.
- */
-struct usb_key_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  tTKID[3];
-        __u8  bReserved;
-        __u8  bKeyData[0];
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_ENCRYPTION_TYPE:  bundled in DT_SECURITY groups */
-struct usb_encryption_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bEncryptionType;
-#define USB_ENC_TYPE_UNSECURE           0
-#define USB_ENC_TYPE_WIRED              1       /* non-wireless mode */
-#define USB_ENC_TYPE_CCM_1              2       /* aes128/cbc session */
-#define USB_ENC_TYPE_RSA_1              3       /* rsa3072/sha1 auth */
-        __u8  bEncryptionValue;         /* use in SET_ENCRYPTION */
-        __u8  bAuthKeyIndex;
-} __attribute__((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_BOS:  group of device-level capabilities */
-struct usb_bos_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __le16 wTotalLength;
-        __u8  bNumDeviceCaps;
-} __attribute__((packed));
-
-#define USB_DT_BOS_SIZE         5
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE_CAPABILITY:  grouped with BOS */
-struct usb_dev_cap_header {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDevCapabilityType;
-} __attribute__((packed));
-
-#define USB_CAP_TYPE_WIRELESS_USB       1
-
-struct usb_wireless_cap_descriptor {    /* Ultra Wide Band */
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDevCapabilityType;
-
-        __u8  bmAttributes;
-#define USB_WIRELESS_P2P_DRD            (1 << 1)
-#define USB_WIRELESS_BEACON_MASK        (3 << 2)
-#define USB_WIRELESS_BEACON_SELF        (1 << 2)
-#define USB_WIRELESS_BEACON_DIRECTED    (2 << 2)
-#define USB_WIRELESS_BEACON_NONE        (3 << 2)
-        __le16 wPHYRates;       /* bit rates, Mbps */
-#define USB_WIRELESS_PHY_53             (1 << 0)        /* always set */
-#define USB_WIRELESS_PHY_80             (1 << 1)
-#define USB_WIRELESS_PHY_107            (1 << 2)        /* always set */
-#define USB_WIRELESS_PHY_160            (1 << 3)
-#define USB_WIRELESS_PHY_200            (1 << 4)        /* always set */
-#define USB_WIRELESS_PHY_320            (1 << 5)
-#define USB_WIRELESS_PHY_400            (1 << 6)
-#define USB_WIRELESS_PHY_480            (1 << 7)
-        __u8  bmTFITXPowerInfo; /* TFI power levels */
-        __u8  bmFFITXPowerInfo; /* FFI power levels */
-        __le16 bmBandGroup;
-        __u8  bReserved;
-} __attribute__((packed));
-
-/* USB 2.0 Extension descriptor */
-#define USB_CAP_TYPE_EXT                2
-
-struct usb_ext_cap_descriptor {         /* Link Power Management */
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDevCapabilityType;
-        __le32 bmAttributes;
-#define USB_LPM_SUPPORT                 (1 << 1)        /* supports LPM */
-#define USB_BESL_SUPPORT                (1 << 2)        /* supports BESL */
-#define USB_BESL_BASELINE_VALID         (1 << 3)        /* Baseline BESL valid*/
-#define USB_BESL_DEEP_VALID             (1 << 4)        /* Deep BESL valid */
-#define USB_GET_BESL_BASELINE(p)        (((p) & (0xf << 8)) >> 8)
-#define USB_GET_BESL_DEEP(p)            (((p) & (0xf << 12)) >> 12)
-} __attribute__((packed));
-
-#define USB_DT_USB_EXT_CAP_SIZE 7
-
-/*
- * SuperSpeed USB Capability descriptor: Defines the set of SuperSpeed USB
- * specific device level capabilities
- */
-#define         USB_SS_CAP_TYPE         3
-struct usb_ss_cap_descriptor {          /* Link Power Management */
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDevCapabilityType;
-        __u8  bmAttributes;
-#define USB_LTM_SUPPORT                 (1 << 1) /* supports LTM */
-        __le16 wSpeedSupported;
-#define USB_LOW_SPEED_OPERATION         (1)      /* Low speed operation */
-#define USB_FULL_SPEED_OPERATION        (1 << 1) /* Full speed operation */
-#define USB_HIGH_SPEED_OPERATION        (1 << 2) /* High speed operation */
-#define USB_5GBPS_OPERATION             (1 << 3) /* Operation at 5Gbps */
-        __u8  bFunctionalitySupport;
-        __u8  bU1devExitLat;
-        __le16 bU2DevExitLat;
-} __attribute__((packed));
-
-#define USB_DT_USB_SS_CAP_SIZE  10
-
-/*
- * Container ID Capability descriptor: Defines the instance unique ID used to
- * identify the instance across all operating modes
- */
-#define CONTAINER_ID_TYPE       4
-struct usb_ss_container_id_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDevCapabilityType;
-        __u8  bReserved;
-        __u8  ContainerID[16]; /* 128-bit number */
-} __attribute__((packed));
-
-#define USB_DT_USB_SS_CONTN_ID_SIZE     20
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_WIRELESS_ENDPOINT_COMP:  companion descriptor associated with
- * each endpoint descriptor for a wireless device
- */
-struct usb_wireless_ep_comp_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bMaxBurst;
-        __u8  bMaxSequence;
-        __le16 wMaxStreamDelay;
-        __le16 wOverTheAirPacketSize;
-        __u8  bOverTheAirInterval;
-        __u8  bmCompAttributes;
-#define USB_ENDPOINT_SWITCH_MASK        0x03    /* in bmCompAttributes */
-#define USB_ENDPOINT_SWITCH_NO          0
-#define USB_ENDPOINT_SWITCH_SWITCH      1
-#define USB_ENDPOINT_SWITCH_SCALE       2
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_REQ_SET_HANDSHAKE is a four-way handshake used between a wireless
- * host and a device for connection set up, mutual authentication, and
- * exchanging short lived session keys.  The handshake depends on a CC.
- */
-struct usb_handshake {
-        __u8 bMessageNumber;
-        __u8 bStatus;
-        __u8 tTKID[3];
-        __u8 bReserved;
-        __u8 CDID[16];
-        __u8 nonce[16];
-        __u8 MIC[8];
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_REQ_SET_CONNECTION modifies or revokes a connection context (CC).
- * A CC may also be set up using non-wireless secure channels (including
- * wired USB!), and some devices may support CCs with multiple hosts.
- */
-struct usb_connection_context {
-        __u8 CHID[16];          /* persistent host id */
-        __u8 CDID[16];          /* device id (unique w/in host context) */
-        __u8 CK[16];            /* connection key */
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
+#include <uapi/linux/usb/ch9.h>
 
-/* USB 2.0 defines three speeds, here's how Linux identifies them */
-
-enum usb_device_speed {
-        USB_SPEED_UNKNOWN = 0,                  /* enumerating */
-        USB_SPEED_LOW, USB_SPEED_FULL,          /* usb 1.1 */
-        USB_SPEED_HIGH,                         /* usb 2.0 */
-        USB_SPEED_WIRELESS,                     /* wireless (usb 2.5) */
-        USB_SPEED_SUPER,                        /* usb 3.0 */
-};
-
-#ifdef __KERNEL__
 
 /**
  * usb_speed_string() - Returns human readable-name of the speed.
@@ -919,86 +43,4 @@ enum usb_device_speed {
  */
 extern const char *usb_speed_string(enum usb_device_speed speed);
 
-#endif
-
-enum usb_device_state {
-        /* NOTATTACHED isn't in the USB spec, and this state acts
-         * the same as ATTACHED ... but it's clearer this way.
-         */
-        USB_STATE_NOTATTACHED = 0,
-
-        /* chapter 9 and authentication (wireless) device states */
-        USB_STATE_ATTACHED,
-        USB_STATE_POWERED,                      /* wired */
-        USB_STATE_RECONNECTING,                 /* auth */
-        USB_STATE_UNAUTHENTICATED,              /* auth */
-        USB_STATE_DEFAULT,                      /* limited function */
-        USB_STATE_ADDRESS,
-        USB_STATE_CONFIGURED,                   /* most functions */
-
-        USB_STATE_SUSPENDED
-
-        /* NOTE:  there are actually four different SUSPENDED
-         * states, returning to POWERED, DEFAULT, ADDRESS, or
-         * CONFIGURED respectively when SOF tokens flow again.
-         * At this level there's no difference between L1 and L2
-         * suspend states.  (L2 being original USB 1.1 suspend.)
-         */
-};
-
-enum usb3_link_state {
-        USB3_LPM_U0 = 0,
-        USB3_LPM_U1,
-        USB3_LPM_U2,
-        USB3_LPM_U3
-};
-
-/*
- * A U1 timeout of 0x0 means the parent hub will reject any transitions to U1.
- * 0xff means the parent hub will accept transitions to U1, but will not
- * initiate a transition.
- *
- * A U1 timeout of 0x1 to 0x7F also causes the hub to initiate a transition to
- * U1 after that many microseconds.  Timeouts of 0x80 to 0xFE are reserved
- * values.
- *
- * A U2 timeout of 0x0 means the parent hub will reject any transitions to U2.
- * 0xff means the parent hub will accept transitions to U2, but will not
- * initiate a transition.
- *
- * A U2 timeout of 0x1 to 0xFE also causes the hub to initiate a transition to
- * U2 after N*256 microseconds.  Therefore a U2 timeout value of 0x1 means a U2
- * idle timer of 256 microseconds, 0x2 means 512 microseconds, 0xFE means
- * 65.024ms.
- */
-#define USB3_LPM_DISABLED               0x0
-#define USB3_LPM_U1_MAX_TIMEOUT         0x7F
-#define USB3_LPM_U2_MAX_TIMEOUT         0xFE
-#define USB3_LPM_DEVICE_INITIATED       0xFF
-
-struct usb_set_sel_req {
-        __u8    u1_sel;
-        __u8    u1_pel;
-        __le16  u2_sel;
-        __le16  u2_pel;
-} __attribute__ ((packed));
-
-/*
- * The Set System Exit Latency control transfer provides one byte each for
- * U1 SEL and U1 PEL, so the max exit latency is 0xFF.  U2 SEL and U2 PEL each
- * are two bytes long.
- */
-#define USB3_LPM_MAX_U1_SEL_PEL         0xFF
-#define USB3_LPM_MAX_U2_SEL_PEL         0xFFFF
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * As per USB compliance update, a device that is actively drawing
- * more than 100mA from USB must report itself as bus-powered in
- * the GetStatus(DEVICE) call.
- * http://compliance.usb.org/index.asp?UpdateFile=Electrical&Format=Standard#34
- */
-#define USB_SELF_POWER_VBUS_MAX_DRAW            100
-
 #endif /* __LINUX_USB_CH9_H */
diff --git a/include/linux/usb/functionfs.h b/include/linux/usb/functionfs.h
index a843d0851364..65d0a88dbc67 100644
--- a/include/linux/usb/functionfs.h
+++ b/include/linux/usb/functionfs.h
@@ -1,171 +1,8 @@
 #ifndef __LINUX_FUNCTIONFS_H__
 #define __LINUX_FUNCTIONFS_H__ 1
 
+#include <uapi/linux/usb/functionfs.h>
 
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#include <linux/usb/ch9.h>
-
-
-enum {
-        FUNCTIONFS_DESCRIPTORS_MAGIC = 1,
-        FUNCTIONFS_STRINGS_MAGIC     = 2
-};
-
-
-#ifndef __KERNEL__
-
-/* Descriptor of an non-audio endpoint */
-struct usb_endpoint_descriptor_no_audio {
-        __u8  bLength;
-        __u8  bDescriptorType;
-
-        __u8  bEndpointAddress;
-        __u8  bmAttributes;
-        __le16 wMaxPacketSize;
-        __u8  bInterval;
-} __attribute__((packed));
-
-
-/*
- * All numbers must be in little endian order.
- */
-
-struct usb_functionfs_descs_head {
-        __le32 magic;
-        __le32 length;
-        __le32 fs_count;
-        __le32 hs_count;
-} __attribute__((packed));
-
-/*
- * Descriptors format:
- *
- * | off | name      | type         | description                          |
- * |-----+-----------+--------------+--------------------------------------|
- * |   0 | magic     | LE32         | FUNCTIONFS_{FS,HS}_DESCRIPTORS_MAGIC |
- * |   4 | length    | LE32         | length of the whole data chunk       |
- * |   8 | fs_count  | LE32         | number of full-speed descriptors     |
- * |  12 | hs_count  | LE32         | number of high-speed descriptors     |
- * |  16 | fs_descrs | Descriptor[] | list of full-speed descriptors       |
- * |     | hs_descrs | Descriptor[] | list of high-speed descriptors       |
- *
- * descs are just valid USB descriptors and have the following format:
- *
- * | off | name            | type | description              |
- * |-----+-----------------+------+--------------------------|
- * |   0 | bLength         | U8   | length of the descriptor |
- * |   1 | bDescriptorType | U8   | descriptor type          |
- * |   2 | payload         |      | descriptor's payload     |
- */
-
-struct usb_functionfs_strings_head {
-        __le32 magic;
-        __le32 length;
-        __le32 str_count;
-        __le32 lang_count;
-} __attribute__((packed));
-
-/*
- * Strings format:
- *
- * | off | name       | type                  | description                |
- * |-----+------------+-----------------------+----------------------------|
- * |   0 | magic      | LE32                  | FUNCTIONFS_STRINGS_MAGIC   |
- * |   4 | length     | LE32                  | length of the data chunk   |
- * |   8 | str_count  | LE32                  | number of strings          |
- * |  12 | lang_count | LE32                  | number of languages        |
- * |  16 | stringtab  | StringTab[lang_count] | table of strings per lang  |
- *
- * For each language there is one stringtab entry (ie. there are lang_count
- * stringtab entires).  Each StringTab has following format:
- *
- * | off | name    | type              | description                        |
- * |-----+---------+-------------------+------------------------------------|
- * |   0 | lang    | LE16              | language code                      |
- * |   2 | strings | String[str_count] | array of strings in given language |
- *
- * For each string there is one strings entry (ie. there are str_count
- * string entries).  Each String is a NUL terminated string encoded in
- * UTF-8.
- */
-
-#endif
-
-
-/*
- * Events are delivered on the ep0 file descriptor, when the user mode driver
- * reads from this file descriptor after writing the descriptors.  Don't
- * stop polling this descriptor.
- */
-
-enum usb_functionfs_event_type {
-        FUNCTIONFS_BIND,
-        FUNCTIONFS_UNBIND,
-
-        FUNCTIONFS_ENABLE,
-        FUNCTIONFS_DISABLE,
-
-        FUNCTIONFS_SETUP,
-
-        FUNCTIONFS_SUSPEND,
-        FUNCTIONFS_RESUME
-};
-
-/* NOTE:  this structure must stay the same size and layout on
- * both 32-bit and 64-bit kernels.
- */
-struct usb_functionfs_event {
-        union {
-                /* SETUP: packet; DATA phase i/o precedes next event
-                 *(setup.bmRequestType & USB_DIR_IN) flags direction */
-                struct usb_ctrlrequest  setup;
-        } __attribute__((packed)) u;
-
-        /* enum usb_functionfs_event_type */
-        __u8                            type;
-        __u8                            _pad[3];
-} __attribute__((packed));
-
-
-/* Endpoint ioctls */
-/* The same as in gadgetfs */
-
-/* IN transfers may be reported to the gadget driver as complete
- *      when the fifo is loaded, before the host reads the data;
- * OUT transfers may be reported to the host's "client" driver as
- *      complete when they're sitting in the FIFO unread.
- * THIS returns how many bytes are "unclaimed" in the endpoint fifo
- * (needed for precise fault handling, when the hardware allows it)
- */
-#define FUNCTIONFS_FIFO_STATUS  _IO('g', 1)
-
-/* discards any unclaimed data in the fifo. */
-#define FUNCTIONFS_FIFO_FLUSH   _IO('g', 2)
-
-/* resets endpoint halt+toggle; used to implement set_interface.
- * some hardware (like pxa2xx) can't support this.
- */
-#define FUNCTIONFS_CLEAR_HALT   _IO('g', 3)
-
-/* Specific for functionfs */
-
-/*
- * Returns reverse mapping of an interface.  Called on EP0.  If there
- * is no such interface returns -EDOM.  If function is not active
- * returns -ENODEV.
- */
-#define FUNCTIONFS_INTERFACE_REVMAP     _IO('g', 128)
-
-/*
- * Returns real bEndpointAddress of an endpoint.  If function is not
- * active returns -ENODEV.
- */
-#define FUNCTIONFS_ENDPOINT_REVMAP      _IO('g', 129)
-
-
-#ifdef __KERNEL__
 
 struct ffs_data;
 struct usb_composite_dev;
@@ -197,5 +34,3 @@ static void functionfs_release_dev_callback(struct ffs_data *ffs_data)
 
 
 #endif
-
-#endif
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index f87cf622317f..ddbbb7de894b 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -68,6 +68,7 @@ struct usbnet {
 #               define EVENT_RX_PAUSED  5
 #               define EVENT_DEV_ASLEEP 6
 #               define EVENT_DEV_OPEN   7
+#               define EVENT_DEVICE_REPORT_IDLE 8
 };
 
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -160,6 +161,7 @@ extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
 extern int usbnet_suspend(struct usb_interface *, pm_message_t);
 extern int usbnet_resume(struct usb_interface *);
 extern void usbnet_disconnect(struct usb_interface *);
+extern void usbnet_device_suggests_idle(struct usbnet *dev);
 
 
 /* Drivers that reuse some of the standard USB CDC infrastructure
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
index 4abe28e41cbc..04a26285416c 100644
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -25,126 +25,11 @@
  */
 
 /*****************************************************************************/
-
 #ifndef _LINUX_USBDEVICE_FS_H
 #define _LINUX_USBDEVICE_FS_H
 
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/* --------------------------------------------------------------------- */
-
-/* usbdevfs ioctl codes */
-
-struct usbdevfs_ctrltransfer {
-        __u8 bRequestType;
-        __u8 bRequest;
-        __u16 wValue;
-        __u16 wIndex;
-        __u16 wLength;
-        __u32 timeout;  /* in milliseconds */
-        void __user *data;
-};
-
-struct usbdevfs_bulktransfer {
-        unsigned int ep;
-        unsigned int len;
-        unsigned int timeout; /* in milliseconds */
-        void __user *data;
-};
-
-struct usbdevfs_setinterface {
-        unsigned int interface;
-        unsigned int altsetting;
-};
-
-struct usbdevfs_disconnectsignal {
-        unsigned int signr;
-        void __user *context;
-};
-
-#define USBDEVFS_MAXDRIVERNAME 255
-
-struct usbdevfs_getdriver {
-        unsigned int interface;
-        char driver[USBDEVFS_MAXDRIVERNAME + 1];
-};
-
-struct usbdevfs_connectinfo {
-        unsigned int devnum;
-        unsigned char slow;
-};
-
-#define USBDEVFS_URB_SHORT_NOT_OK       0x01
-#define USBDEVFS_URB_ISO_ASAP           0x02
-#define USBDEVFS_URB_BULK_CONTINUATION  0x04
-#define USBDEVFS_URB_NO_FSBR            0x20
-#define USBDEVFS_URB_ZERO_PACKET        0x40
-#define USBDEVFS_URB_NO_INTERRUPT       0x80
-
-#define USBDEVFS_URB_TYPE_ISO              0
-#define USBDEVFS_URB_TYPE_INTERRUPT        1
-#define USBDEVFS_URB_TYPE_CONTROL          2
-#define USBDEVFS_URB_TYPE_BULK             3
+#include <uapi/linux/usbdevice_fs.h>
 
-struct usbdevfs_iso_packet_desc {
-        unsigned int length;
-        unsigned int actual_length;
-        unsigned int status;
-};
-
-struct usbdevfs_urb {
-        unsigned char type;
-        unsigned char endpoint;
-        int status;
-        unsigned int flags;
-        void __user *buffer;
-        int buffer_length;
-        int actual_length;
-        int start_frame;
-        int number_of_packets;
-        int error_count;
-        unsigned int signr;     /* signal to be sent on completion,
-                                  or 0 if none should be sent. */
-        void __user *usercontext;
-        struct usbdevfs_iso_packet_desc iso_frame_desc[0];
-};
-
-/* ioctls for talking directly to drivers */
-struct usbdevfs_ioctl {
-        int     ifno;           /* interface 0..N ; negative numbers reserved */
-        int     ioctl_code;     /* MUST encode size + direction of data so the
-                                 * macros in <asm/ioctl.h> give correct values */
-        void __user *data;      /* param buffer (in, or out) */
-};
-
-/* You can do most things with hubs just through control messages,
- * except find out what device connects to what port. */
-struct usbdevfs_hub_portinfo {
-        char nports;            /* number of downstream ports in this hub */
-        char port [127];        /* e.g. port 3 connects to device 27 */
-};
-
-/* Device capability flags */
-#define USBDEVFS_CAP_ZERO_PACKET                0x01
-#define USBDEVFS_CAP_BULK_CONTINUATION          0x02
-#define USBDEVFS_CAP_NO_PACKET_SIZE_LIM         0x04
-#define USBDEVFS_CAP_BULK_SCATTER_GATHER        0x08
-
-/* USBDEVFS_DISCONNECT_CLAIM flags & struct */
-
-/* disconnect-and-claim if the driver matches the driver field */
-#define USBDEVFS_DISCONNECT_CLAIM_IF_DRIVER     0x01
-/* disconnect-and-claim except when the driver matches the driver field */
-#define USBDEVFS_DISCONNECT_CLAIM_EXCEPT_DRIVER 0x02
-
-struct usbdevfs_disconnect_claim {
-        unsigned int interface;
-        unsigned int flags;
-        char driver[USBDEVFS_MAXDRIVERNAME + 1];
-};
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 #include <linux/compat.h>
 
@@ -192,38 +77,4 @@ struct usbdevfs_ioctl32 {
         compat_caddr_t data;
 };
 #endif
-#endif /* __KERNEL__ */
-
-#define USBDEVFS_CONTROL           _IOWR('U', 0, struct usbdevfs_ctrltransfer)
-#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
-#define USBDEVFS_BULK              _IOWR('U', 2, struct usbdevfs_bulktransfer)
-#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
-#define USBDEVFS_RESETEP           _IOR('U', 3, unsigned int)
-#define USBDEVFS_SETINTERFACE      _IOR('U', 4, struct usbdevfs_setinterface)
-#define USBDEVFS_SETCONFIGURATION  _IOR('U', 5, unsigned int)
-#define USBDEVFS_GETDRIVER         _IOW('U', 8, struct usbdevfs_getdriver)
-#define USBDEVFS_SUBMITURB         _IOR('U', 10, struct usbdevfs_urb)
-#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
-#define USBDEVFS_DISCARDURB        _IO('U', 11)
-#define USBDEVFS_REAPURB           _IOW('U', 12, void *)
-#define USBDEVFS_REAPURB32         _IOW('U', 12, __u32)
-#define USBDEVFS_REAPURBNDELAY     _IOW('U', 13, void *)
-#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, __u32)
-#define USBDEVFS_DISCSIGNAL        _IOR('U', 14, struct usbdevfs_disconnectsignal)
-#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
-#define USBDEVFS_CLAIMINTERFACE    _IOR('U', 15, unsigned int)
-#define USBDEVFS_RELEASEINTERFACE  _IOR('U', 16, unsigned int)
-#define USBDEVFS_CONNECTINFO       _IOW('U', 17, struct usbdevfs_connectinfo)
-#define USBDEVFS_IOCTL             _IOWR('U', 18, struct usbdevfs_ioctl)
-#define USBDEVFS_IOCTL32           _IOWR('U', 18, struct usbdevfs_ioctl32)
-#define USBDEVFS_HUB_PORTINFO      _IOR('U', 19, struct usbdevfs_hub_portinfo)
-#define USBDEVFS_RESET             _IO('U', 20)
-#define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)
-#define USBDEVFS_DISCONNECT        _IO('U', 22)
-#define USBDEVFS_CONNECT           _IO('U', 23)
-#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)
-#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)
-#define USBDEVFS_GET_CAPABILITIES  _IOR('U', 26, __u32)
-#define USBDEVFS_DISCONNECT_CLAIM  _IOR('U', 27, struct usbdevfs_disconnect_claim)
-
 #endif /* _LINUX_USBDEVICE_FS_H */
diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index c714ed75eae2..2b345206722a 100644
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -1,41 +1,12 @@
 #ifndef _LINUX_UTSNAME_H
 #define _LINUX_UTSNAME_H
 
-#define __OLD_UTS_LEN 8
-
-struct oldold_utsname {
-        char sysname[9];
-        char nodename[9];
-        char release[9];
-        char version[9];
-        char machine[9];
-};
-
-#define __NEW_UTS_LEN 64
-
-struct old_utsname {
-        char sysname[65];
-        char nodename[65];
-        char release[65];
-        char version[65];
-        char machine[65];
-};
-
-struct new_utsname {
-        char sysname[__NEW_UTS_LEN + 1];
-        char nodename[__NEW_UTS_LEN + 1];
-        char release[__NEW_UTS_LEN + 1];
-        char version[__NEW_UTS_LEN + 1];
-        char machine[__NEW_UTS_LEN + 1];
-        char domainname[__NEW_UTS_LEN + 1];
-};
-
-#ifdef __KERNEL__
 
 #include <linux/sched.h>
 #include <linux/kref.h>
 #include <linux/nsproxy.h>
 #include <linux/err.h>
+#include <uapi/linux/utsname.h>
 
 enum uts_proc {
         UTS_PROC_OSTYPE,
@@ -108,6 +79,4 @@ static inline struct new_utsname *init_utsname(void)
 
 extern struct rw_semaphore uts_sem;
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_UTSNAME_H */
diff --git a/include/linux/uuid.h b/include/linux/uuid.h
index f86c37bfd4a0..6df2509033d7 100644
--- a/include/linux/uuid.h
+++ b/include/linux/uuid.h
@@ -17,44 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _LINUX_UUID_H_
 #define _LINUX_UUID_H_
 
-#include <linux/types.h>
-#include <linux/string.h>
-
-typedef struct {
-        __u8 b[16];
-} uuid_le;
-
-typedef struct {
-        __u8 b[16];
-} uuid_be;
-
-#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)                \
-((uuid_le)                                                              \
-{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
-   (b) & 0xff, ((b) >> 8) & 0xff,                                       \
-   (c) & 0xff, ((c) >> 8) & 0xff,                                       \
-   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+#include <uapi/linux/uuid.h>
 
-#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)                \
-((uuid_be)                                                              \
-{{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \
-   ((b) >> 8) & 0xff, (b) & 0xff,                                       \
-   ((c) >> 8) & 0xff, (c) & 0xff,                                       \
-   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
-
-#define NULL_UUID_LE                                                    \
-        UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,     \
-                0x00, 0x00, 0x00, 0x00)
-
-#define NULL_UUID_BE                                                    \
-        UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,     \
-                0x00, 0x00, 0x00, 0x00)
-
-#ifdef __KERNEL__
 
 static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2)
 {
@@ -69,6 +36,4 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2)
 extern void uuid_le_gen(uuid_le *u);
 extern void uuid_be_gen(uuid_be *u);
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 0a4f180a11d8..ab9e86224c54 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -11,15 +11,10 @@
 #ifndef VFIO_H
 #define VFIO_H
 
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define VFIO_API_VERSION        0
-
-#ifdef __KERNEL__       /* Internal VFIO-core/bus driver API */
 
 #include <linux/iommu.h>
 #include <linux/mm.h>
+#include <uapi/linux/vfio.h>
 
 /**
  * struct vfio_device_ops - VFIO bus driver device callbacks
@@ -92,354 +87,4 @@ extern void vfio_unregister_iommu_driver(
         TYPE tmp;                                               \
         offsetof(TYPE, MEMBER) + sizeof(tmp.MEMBER); })         \
 
-#endif /* __KERNEL__ */
-
-/* Kernel & User level defines for VFIO IOCTLs. */
-
-/* Extensions */
-
-#define VFIO_TYPE1_IOMMU                1
-
-/*
- * The IOCTL interface is designed for extensibility by embedding the
- * structure length (argsz) and flags into structures passed between
- * kernel and userspace.  We therefore use the _IO() macro for these
- * defines to avoid implicitly embedding a size into the ioctl request.
- * As structure fields are added, argsz will increase to match and flag
- * bits will be defined to indicate additional fields with valid data.
- * It's *always* the caller's responsibility to indicate the size of
- * the structure passed by setting argsz appropriately.
- */
-
-#define VFIO_TYPE       (';')
-#define VFIO_BASE       100
-
-/* -------- IOCTLs for VFIO file descriptor (/dev/vfio/vfio) -------- */
-
-/**
- * VFIO_GET_API_VERSION - _IO(VFIO_TYPE, VFIO_BASE + 0)
- *
- * Report the version of the VFIO API.  This allows us to bump the entire
- * API version should we later need to add or change features in incompatible
- * ways.
- * Return: VFIO_API_VERSION
- * Availability: Always
- */
-#define VFIO_GET_API_VERSION            _IO(VFIO_TYPE, VFIO_BASE + 0)
-
-/**
- * VFIO_CHECK_EXTENSION - _IOW(VFIO_TYPE, VFIO_BASE + 1, __u32)
- *
- * Check whether an extension is supported.
- * Return: 0 if not supported, 1 (or some other positive integer) if supported.
- * Availability: Always
- */
-#define VFIO_CHECK_EXTENSION            _IO(VFIO_TYPE, VFIO_BASE + 1)
-
-/**
- * VFIO_SET_IOMMU - _IOW(VFIO_TYPE, VFIO_BASE + 2, __s32)
- *
- * Set the iommu to the given type.  The type must be supported by an
- * iommu driver as verified by calling CHECK_EXTENSION using the same
- * type.  A group must be set to this file descriptor before this
- * ioctl is available.  The IOMMU interfaces enabled by this call are
- * specific to the value set.
- * Return: 0 on success, -errno on failure
- * Availability: When VFIO group attached
- */
-#define VFIO_SET_IOMMU                  _IO(VFIO_TYPE, VFIO_BASE + 2)
-
-/* -------- IOCTLs for GROUP file descriptors (/dev/vfio/$GROUP) -------- */
-
-/**
- * VFIO_GROUP_GET_STATUS - _IOR(VFIO_TYPE, VFIO_BASE + 3,
- *                                              struct vfio_group_status)
- *
- * Retrieve information about the group.  Fills in provided
- * struct vfio_group_info.  Caller sets argsz.
- * Return: 0 on succes, -errno on failure.
- * Availability: Always
- */
-struct vfio_group_status {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_GROUP_FLAGS_VIABLE         (1 << 0)
-#define VFIO_GROUP_FLAGS_CONTAINER_SET  (1 << 1)
-};
-#define VFIO_GROUP_GET_STATUS           _IO(VFIO_TYPE, VFIO_BASE + 3)
-
-/**
- * VFIO_GROUP_SET_CONTAINER - _IOW(VFIO_TYPE, VFIO_BASE + 4, __s32)
- *
- * Set the container for the VFIO group to the open VFIO file
- * descriptor provided.  Groups may only belong to a single
- * container.  Containers may, at their discretion, support multiple
- * groups.  Only when a container is set are all of the interfaces
- * of the VFIO file descriptor and the VFIO group file descriptor
- * available to the user.
- * Return: 0 on success, -errno on failure.
- * Availability: Always
- */
-#define VFIO_GROUP_SET_CONTAINER        _IO(VFIO_TYPE, VFIO_BASE + 4)
-
-/**
- * VFIO_GROUP_UNSET_CONTAINER - _IO(VFIO_TYPE, VFIO_BASE + 5)
- *
- * Remove the group from the attached container.  This is the
- * opposite of the SET_CONTAINER call and returns the group to
- * an initial state.  All device file descriptors must be released
- * prior to calling this interface.  When removing the last group
- * from a container, the IOMMU will be disabled and all state lost,
- * effectively also returning the VFIO file descriptor to an initial
- * state.
- * Return: 0 on success, -errno on failure.
- * Availability: When attached to container
- */
-#define VFIO_GROUP_UNSET_CONTAINER      _IO(VFIO_TYPE, VFIO_BASE + 5)
-
-/**
- * VFIO_GROUP_GET_DEVICE_FD - _IOW(VFIO_TYPE, VFIO_BASE + 6, char)
- *
- * Return a new file descriptor for the device object described by
- * the provided string.  The string should match a device listed in
- * the devices subdirectory of the IOMMU group sysfs entry.  The
- * group containing the device must already be added to this context.
- * Return: new file descriptor on success, -errno on failure.
- * Availability: When attached to container
- */
-#define VFIO_GROUP_GET_DEVICE_FD        _IO(VFIO_TYPE, VFIO_BASE + 6)
-
-/* --------------- IOCTLs for DEVICE file descriptors --------------- */
-
-/**
- * VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
- *                                              struct vfio_device_info)
- *
- * Retrieve information about the device.  Fills in provided
- * struct vfio_device_info.  Caller sets argsz.
- * Return: 0 on success, -errno on failure.
- */
-struct vfio_device_info {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_DEVICE_FLAGS_RESET (1 << 0)        /* Device supports reset */
-#define VFIO_DEVICE_FLAGS_PCI   (1 << 1)        /* vfio-pci device */
-        __u32   num_regions;    /* Max region index + 1 */
-        __u32   num_irqs;       /* Max IRQ index + 1 */
-};
-#define VFIO_DEVICE_GET_INFO            _IO(VFIO_TYPE, VFIO_BASE + 7)
-
-/**
- * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
- *                                     struct vfio_region_info)
- *
- * Retrieve information about a device region.  Caller provides
- * struct vfio_region_info with index value set.  Caller sets argsz.
- * Implementation of region mapping is bus driver specific.  This is
- * intended to describe MMIO, I/O port, as well as bus specific
- * regions (ex. PCI config space).  Zero sized regions may be used
- * to describe unimplemented regions (ex. unimplemented PCI BARs).
- * Return: 0 on success, -errno on failure.
- */
-struct vfio_region_info {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_REGION_INFO_FLAG_READ      (1 << 0) /* Region supports read */
-#define VFIO_REGION_INFO_FLAG_WRITE     (1 << 1) /* Region supports write */
-#define VFIO_REGION_INFO_FLAG_MMAP      (1 << 2) /* Region supports mmap */
-        __u32   index;          /* Region index */
-        __u32   resv;           /* Reserved for alignment */
-        __u64   size;           /* Region size (bytes) */
-        __u64   offset;         /* Region offset from start of device fd */
-};
-#define VFIO_DEVICE_GET_REGION_INFO     _IO(VFIO_TYPE, VFIO_BASE + 8)
-
-/**
- * VFIO_DEVICE_GET_IRQ_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 9,
- *                                  struct vfio_irq_info)
- *
- * Retrieve information about a device IRQ.  Caller provides
- * struct vfio_irq_info with index value set.  Caller sets argsz.
- * Implementation of IRQ mapping is bus driver specific.  Indexes
- * using multiple IRQs are primarily intended to support MSI-like
- * interrupt blocks.  Zero count irq blocks may be used to describe
- * unimplemented interrupt types.
- *
- * The EVENTFD flag indicates the interrupt index supports eventfd based
- * signaling.
- *
- * The MASKABLE flags indicates the index supports MASK and UNMASK
- * actions described below.
- *
- * AUTOMASKED indicates that after signaling, the interrupt line is
- * automatically masked by VFIO and the user needs to unmask the line
- * to receive new interrupts.  This is primarily intended to distinguish
- * level triggered interrupts.
- *
- * The NORESIZE flag indicates that the interrupt lines within the index
- * are setup as a set and new subindexes cannot be enabled without first
- * disabling the entire index.  This is used for interrupts like PCI MSI
- * and MSI-X where the driver may only use a subset of the available
- * indexes, but VFIO needs to enable a specific number of vectors
- * upfront.  In the case of MSI-X, where the user can enable MSI-X and
- * then add and unmask vectors, it's up to userspace to make the decision
- * whether to allocate the maximum supported number of vectors or tear
- * down setup and incrementally increase the vectors as each is enabled.
- */
-struct vfio_irq_info {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_IRQ_INFO_EVENTFD           (1 << 0)
-#define VFIO_IRQ_INFO_MASKABLE          (1 << 1)
-#define VFIO_IRQ_INFO_AUTOMASKED        (1 << 2)
-#define VFIO_IRQ_INFO_NORESIZE          (1 << 3)
-        __u32   index;          /* IRQ index */
-        __u32   count;          /* Number of IRQs within this index */
-};
-#define VFIO_DEVICE_GET_IRQ_INFO        _IO(VFIO_TYPE, VFIO_BASE + 9)
-
-/**
- * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set)
- *
- * Set signaling, masking, and unmasking of interrupts.  Caller provides
- * struct vfio_irq_set with all fields set.  'start' and 'count' indicate
- * the range of subindexes being specified.
- *
- * The DATA flags specify the type of data provided.  If DATA_NONE, the
- * operation performs the specified action immediately on the specified
- * interrupt(s).  For example, to unmask AUTOMASKED interrupt [0,0]:
- * flags = (DATA_NONE|ACTION_UNMASK), index = 0, start = 0, count = 1.
- *
- * DATA_BOOL allows sparse support for the same on arrays of interrupts.
- * For example, to mask interrupts [0,1] and [0,3] (but not [0,2]):
- * flags = (DATA_BOOL|ACTION_MASK), index = 0, start = 1, count = 3,
- * data = {1,0,1}
- *
- * DATA_EVENTFD binds the specified ACTION to the provided __s32 eventfd.
- * A value of -1 can be used to either de-assign interrupts if already
- * assigned or skip un-assigned interrupts.  For example, to set an eventfd
- * to be trigger for interrupts [0,0] and [0,2]:
- * flags = (DATA_EVENTFD|ACTION_TRIGGER), index = 0, start = 0, count = 3,
- * data = {fd1, -1, fd2}
- * If index [0,1] is previously set, two count = 1 ioctls calls would be
- * required to set [0,0] and [0,2] without changing [0,1].
- *
- * Once a signaling mechanism is set, DATA_BOOL or DATA_NONE can be used
- * with ACTION_TRIGGER to perform kernel level interrupt loopback testing
- * from userspace (ie. simulate hardware triggering).
- *
- * Setting of an event triggering mechanism to userspace for ACTION_TRIGGER
- * enables the interrupt index for the device.  Individual subindex interrupts
- * can be disabled using the -1 value for DATA_EVENTFD or the index can be
- * disabled as a whole with: flags = (DATA_NONE|ACTION_TRIGGER), count = 0.
- *
- * Note that ACTION_[UN]MASK specify user->kernel signaling (irqfds) while
- * ACTION_TRIGGER specifies kernel->user signaling.
- */
-struct vfio_irq_set {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_IRQ_SET_DATA_NONE          (1 << 0) /* Data not present */
-#define VFIO_IRQ_SET_DATA_BOOL          (1 << 1) /* Data is bool (u8) */
-#define VFIO_IRQ_SET_DATA_EVENTFD       (1 << 2) /* Data is eventfd (s32) */
-#define VFIO_IRQ_SET_ACTION_MASK        (1 << 3) /* Mask interrupt */
-#define VFIO_IRQ_SET_ACTION_UNMASK      (1 << 4) /* Unmask interrupt */
-#define VFIO_IRQ_SET_ACTION_TRIGGER     (1 << 5) /* Trigger interrupt */
-        __u32   index;
-        __u32   start;
-        __u32   count;
-        __u8    data[];
-};
-#define VFIO_DEVICE_SET_IRQS            _IO(VFIO_TYPE, VFIO_BASE + 10)
-
-#define VFIO_IRQ_SET_DATA_TYPE_MASK     (VFIO_IRQ_SET_DATA_NONE | \
-                                         VFIO_IRQ_SET_DATA_BOOL | \
-                                         VFIO_IRQ_SET_DATA_EVENTFD)
-#define VFIO_IRQ_SET_ACTION_TYPE_MASK   (VFIO_IRQ_SET_ACTION_MASK | \
-                                         VFIO_IRQ_SET_ACTION_UNMASK | \
-                                         VFIO_IRQ_SET_ACTION_TRIGGER)
-/**
- * VFIO_DEVICE_RESET - _IO(VFIO_TYPE, VFIO_BASE + 11)
- *
- * Reset a device.
- */
-#define VFIO_DEVICE_RESET               _IO(VFIO_TYPE, VFIO_BASE + 11)
-
-/*
- * The VFIO-PCI bus driver makes use of the following fixed region and
- * IRQ index mapping.  Unimplemented regions return a size of zero.
- * Unimplemented IRQ types return a count of zero.
- */
-
-enum {
-        VFIO_PCI_BAR0_REGION_INDEX,
-        VFIO_PCI_BAR1_REGION_INDEX,
-        VFIO_PCI_BAR2_REGION_INDEX,
-        VFIO_PCI_BAR3_REGION_INDEX,
-        VFIO_PCI_BAR4_REGION_INDEX,
-        VFIO_PCI_BAR5_REGION_INDEX,
-        VFIO_PCI_ROM_REGION_INDEX,
-        VFIO_PCI_CONFIG_REGION_INDEX,
-        VFIO_PCI_NUM_REGIONS
-};
-
-enum {
-        VFIO_PCI_INTX_IRQ_INDEX,
-        VFIO_PCI_MSI_IRQ_INDEX,
-        VFIO_PCI_MSIX_IRQ_INDEX,
-        VFIO_PCI_NUM_IRQS
-};
-
-/* -------- API for Type1 VFIO IOMMU -------- */
-
-/**
- * VFIO_IOMMU_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 12, struct vfio_iommu_info)
- *
- * Retrieve information about the IOMMU object. Fills in provided
- * struct vfio_iommu_info. Caller sets argsz.
- *
- * XXX Should we do these by CHECK_EXTENSION too?
- */
-struct vfio_iommu_type1_info {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_IOMMU_INFO_PGSIZES (1 << 0)        /* supported page sizes info */
-        __u64   iova_pgsizes;           /* Bitmap of supported page sizes */
-};
-
-#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-/**
- * VFIO_IOMMU_MAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 13, struct vfio_dma_map)
- *
- * Map process virtual addresses to IO virtual addresses using the
- * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required.
- */
-struct vfio_iommu_type1_dma_map {
-        __u32   argsz;
-        __u32   flags;
-#define VFIO_DMA_MAP_FLAG_READ (1 << 0)         /* readable from device */
-#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1)        /* writable from device */
-        __u64   vaddr;                          /* Process virtual address */
-        __u64   iova;                           /* IO virtual address */
-        __u64   size;                           /* Size of mapping (bytes) */
-};
-
-#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
-
-/**
- * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)
- *
- * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
- * Caller sets argsz.
- */
-struct vfio_iommu_type1_dma_unmap {
-        __u32   argsz;
-        __u32   flags;
-        __u64   iova;                           /* IO virtual address */
-        __u64   size;                           /* Size of mapping (bytes) */
-};
-
-#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
-
 #endif /* VFIO_H */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 7a147c8299ab..73ea2fb04731 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1,7 +1,7 @@
 /*
  *  Video for Linux Two header file
  *
- *  Copyright (C) 1999-2007 the contributors
+ *  Copyright (C) 1999-2012 the contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -56,2606 +56,7 @@
 #ifndef __LINUX_VIDEODEV2_H
 #define __LINUX_VIDEODEV2_H
 
-#ifdef __KERNEL__
 #include <linux/time.h>     /* need struct timeval */
-#else
-#include <sys/time.h>
-#endif
-#include <linux/compiler.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/v4l2-common.h>
-
-/*
- * Common stuff for both V4L1 and V4L2
- * Moved from videodev.h
- */
-#define VIDEO_MAX_FRAME               32
-#define VIDEO_MAX_PLANES               8
-
-#ifndef __KERNEL__
-
-/* These defines are V4L1 specific and should not be used with the V4L2 API!
-   They will be removed from this header in the future. */
-
-#define VID_TYPE_CAPTURE        1       /* Can capture */
-#define VID_TYPE_TUNER          2       /* Can tune */
-#define VID_TYPE_TELETEXT       4       /* Does teletext */
-#define VID_TYPE_OVERLAY        8       /* Overlay onto frame buffer */
-#define VID_TYPE_CHROMAKEY      16      /* Overlay by chromakey */
-#define VID_TYPE_CLIPPING       32      /* Can clip */
-#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
-#define VID_TYPE_SCALES         128     /* Scalable */
-#define VID_TYPE_MONOCHROME     256     /* Monochrome only */
-#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
-#define VID_TYPE_MPEG_DECODER   1024    /* Can decode MPEG streams */
-#define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
-#define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
-#define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
-#endif
-
-/*
- *      M I S C E L L A N E O U S
- */
-
-/*  Four-character-code (FOURCC) */
-#define v4l2_fourcc(a, b, c, d)\
-        ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-
-/*
- *      E N U M S
- */
-enum v4l2_field {
-        V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-                                         top, bottom, interlaced
-                                         depending on whatever it thinks
-                                         is approximate ... */
-        V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-        V4L2_FIELD_TOP           = 2, /* top field only */
-        V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-        V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-        V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-                                         buffer, top-bottom order */
-        V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-        V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-                                         separate buffers */
-        V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-                                         first and the top field is
-                                         transmitted first */
-        V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-                                         first and the bottom field is
-                                         transmitted first */
-};
-#define V4L2_FIELD_HAS_TOP(field)       \
-        ((field) == V4L2_FIELD_TOP      ||\
-         (field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB   ||\
-         (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTTOM(field)    \
-        ((field) == V4L2_FIELD_BOTTOM   ||\
-         (field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB   ||\
-         (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTH(field)      \
-        ((field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB ||\
-         (field) == V4L2_FIELD_SEQ_BT)
-
-enum v4l2_buf_type {
-        V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-        V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-        V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-        V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-        V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-        V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-        V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-#if 1
-        /* Experimental */
-        V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-#endif
-        V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-        V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-        V4L2_BUF_TYPE_PRIVATE              = 0x80,
-};
-
-#define V4L2_TYPE_IS_MULTIPLANAR(type)                  \
-        ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE   \
-         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-
-#define V4L2_TYPE_IS_OUTPUT(type)                               \
-        ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT                   \
-         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE         \
-         || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY               \
-         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY        \
-         || (type) == V4L2_BUF_TYPE_VBI_OUTPUT                  \
-         || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-
-enum v4l2_tuner_type {
-        V4L2_TUNER_RADIO             = 1,
-        V4L2_TUNER_ANALOG_TV         = 2,
-        V4L2_TUNER_DIGITAL_TV        = 3,
-};
-
-enum v4l2_memory {
-        V4L2_MEMORY_MMAP             = 1,
-        V4L2_MEMORY_USERPTR          = 2,
-        V4L2_MEMORY_OVERLAY          = 3,
-};
-
-/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-enum v4l2_colorspace {
-        /* ITU-R 601 -- broadcast NTSC/PAL */
-        V4L2_COLORSPACE_SMPTE170M     = 1,
-
-        /* 1125-Line (US) HDTV */
-        V4L2_COLORSPACE_SMPTE240M     = 2,
-
-        /* HD and modern captures. */
-        V4L2_COLORSPACE_REC709        = 3,
-
-        /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-        V4L2_COLORSPACE_BT878         = 4,
-
-        /* These should be useful.  Assume 601 extents. */
-        V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-        V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-
-        /* I know there will be cameras that send this.  So, this is
-         * unspecified chromaticities and full 0-255 on each of the
-         * Y'CbCr components
-         */
-        V4L2_COLORSPACE_JPEG          = 7,
-
-        /* For RGB colourspaces, this is probably a good start. */
-        V4L2_COLORSPACE_SRGB          = 8,
-};
-
-enum v4l2_priority {
-        V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-        V4L2_PRIORITY_BACKGROUND  = 1,
-        V4L2_PRIORITY_INTERACTIVE = 2,
-        V4L2_PRIORITY_RECORD      = 3,
-        V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-};
-
-struct v4l2_rect {
-        __s32   left;
-        __s32   top;
-        __s32   width;
-        __s32   height;
-};
-
-struct v4l2_fract {
-        __u32   numerator;
-        __u32   denominator;
-};
-
-/**
-  * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP
-  *
-  * @driver:       name of the driver module (e.g. "bttv")
-  * @card:         name of the card (e.g. "Hauppauge WinTV")
-  * @bus_info:     name of the bus (e.g. "PCI:" + pci_name(pci_dev) )
-  * @version:      KERNEL_VERSION
-  * @capabilities: capabilities of the physical device as a whole
-  * @device_caps:  capabilities accessed via this particular device (node)
-  * @reserved:     reserved fields for future extensions
-  */
-struct v4l2_capability {
-        __u8    driver[16];
-        __u8    card[32];
-        __u8    bus_info[32];
-        __u32   version;
-        __u32   capabilities;
-        __u32   device_caps;
-        __u32   reserved[3];
-};
-
-/* Values for 'capabilities' field */
-#define V4L2_CAP_VIDEO_CAPTURE          0x00000001  /* Is a video capture device */
-#define V4L2_CAP_VIDEO_OUTPUT           0x00000002  /* Is a video output device */
-#define V4L2_CAP_VIDEO_OVERLAY          0x00000004  /* Can do video overlay */
-#define V4L2_CAP_VBI_CAPTURE            0x00000010  /* Is a raw VBI capture device */
-#define V4L2_CAP_VBI_OUTPUT             0x00000020  /* Is a raw VBI output device */
-#define V4L2_CAP_SLICED_VBI_CAPTURE     0x00000040  /* Is a sliced VBI capture device */
-#define V4L2_CAP_SLICED_VBI_OUTPUT      0x00000080  /* Is a sliced VBI output device */
-#define V4L2_CAP_RDS_CAPTURE            0x00000100  /* RDS data capture */
-#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY   0x00000200  /* Can do video output overlay */
-#define V4L2_CAP_HW_FREQ_SEEK           0x00000400  /* Can do hardware frequency seek  */
-#define V4L2_CAP_RDS_OUTPUT             0x00000800  /* Is an RDS encoder */
-
-/* Is a video capture device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_CAPTURE_MPLANE   0x00001000
-/* Is a video output device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_OUTPUT_MPLANE    0x00002000
-/* Is a video mem-to-mem device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_M2M_MPLANE       0x00004000
-/* Is a video mem-to-mem device */
-#define V4L2_CAP_VIDEO_M2M              0x00008000
-
-#define V4L2_CAP_TUNER                  0x00010000  /* has a tuner */
-#define V4L2_CAP_AUDIO                  0x00020000  /* has audio support */
-#define V4L2_CAP_RADIO                  0x00040000  /* is a radio device */
-#define V4L2_CAP_MODULATOR              0x00080000  /* has a modulator */
-
-#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-
-#define V4L2_CAP_DEVICE_CAPS            0x80000000  /* sets device capabilities field */
-
-/*
- *      V I D E O   I M A G E   F O R M A T
- */
-struct v4l2_pix_format {
-        __u32                   width;
-        __u32                   height;
-        __u32                   pixelformat;
-        __u32                   field;          /* enum v4l2_field */
-        __u32                   bytesperline;   /* for padding, zero if unused */
-        __u32                   sizeimage;
-        __u32                   colorspace;     /* enum v4l2_colorspace */
-        __u32                   priv;           /* private data, depends on pixelformat */
-};
-
-/*      Pixel format         FOURCC                          depth  Description  */
-
-/* RGB formats */
-#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6     */
-#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-
-/* Grey formats */
-#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-#define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
-#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-
-/* Grey bit-packed formats */
-#define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
-
-/* Palette formats */
-#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-
-/* Luminance+Chrominance formats */
-#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-#define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
-
-/* two planes -- one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-#define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
-#define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
-
-/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-
-/* three non contiguous planes - Y, Cb, Cr */
-#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-
-/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
-        /* 10bit raw bayer DPCM compressed to 8 bits */
-#define V4L2_PIX_FMT_SBGGR10DPCM8 v4l2_fourcc('b', 'B', 'A', '8')
-#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
-#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
-        /*
-         * 10bit raw bayer, expanded to 16 bits
-         * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-         */
-#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-
-/* compressed formats */
-#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */
-#define V4L2_PIX_FMT_H264     v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */
-#define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
-#define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
-#define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
-#define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
-#define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES     */
-#define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
-#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
-#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
-
-/*  Vendor-specific formats   */
-#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-#define V4L2_PIX_FMT_JL2005BCD v4l2_fourcc('J', 'L', '2', '0') /* compressed RGGB bayer */
-#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-#define V4L2_PIX_FMT_JPGL       v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
-#define V4L2_PIX_FMT_SE401      v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */
-
-/*
- *      F O R M A T   E N U M E R A T I O N
- */
-struct v4l2_fmtdesc {
-        __u32               index;             /* Format number      */
-        __u32               type;              /* enum v4l2_buf_type */
-        __u32               flags;
-        __u8                description[32];   /* Description string */
-        __u32               pixelformat;       /* Format fourcc      */
-        __u32               reserved[4];
-};
-
-#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-#define V4L2_FMT_FLAG_EMULATED   0x0002
-
-#if 1
-        /* Experimental Frame Size and frame rate enumeration */
-/*
- *      F R A M E   S I Z E   E N U M E R A T I O N
- */
-enum v4l2_frmsizetypes {
-        V4L2_FRMSIZE_TYPE_DISCRETE      = 1,
-        V4L2_FRMSIZE_TYPE_CONTINUOUS    = 2,
-        V4L2_FRMSIZE_TYPE_STEPWISE      = 3,
-};
-
-struct v4l2_frmsize_discrete {
-        __u32                   width;          /* Frame width [pixel] */
-        __u32                   height;         /* Frame height [pixel] */
-};
-
-struct v4l2_frmsize_stepwise {
-        __u32                   min_width;      /* Minimum frame width [pixel] */
-        __u32                   max_width;      /* Maximum frame width [pixel] */
-        __u32                   step_width;     /* Frame width step size [pixel] */
-        __u32                   min_height;     /* Minimum frame height [pixel] */
-        __u32                   max_height;     /* Maximum frame height [pixel] */
-        __u32                   step_height;    /* Frame height step size [pixel] */
-};
-
-struct v4l2_frmsizeenum {
-        __u32                   index;          /* Frame size number */
-        __u32                   pixel_format;   /* Pixel format */
-        __u32                   type;           /* Frame size type the device supports. */
-
-        union {                                 /* Frame size */
-                struct v4l2_frmsize_discrete    discrete;
-                struct v4l2_frmsize_stepwise    stepwise;
-        };
-
-        __u32   reserved[2];                    /* Reserved space for future use */
-};
-
-/*
- *      F R A M E   R A T E   E N U M E R A T I O N
- */
-enum v4l2_frmivaltypes {
-        V4L2_FRMIVAL_TYPE_DISCRETE      = 1,
-        V4L2_FRMIVAL_TYPE_CONTINUOUS    = 2,
-        V4L2_FRMIVAL_TYPE_STEPWISE      = 3,
-};
-
-struct v4l2_frmival_stepwise {
-        struct v4l2_fract       min;            /* Minimum frame interval [s] */
-        struct v4l2_fract       max;            /* Maximum frame interval [s] */
-        struct v4l2_fract       step;           /* Frame interval step size [s] */
-};
-
-struct v4l2_frmivalenum {
-        __u32                   index;          /* Frame format index */
-        __u32                   pixel_format;   /* Pixel format */
-        __u32                   width;          /* Frame width */
-        __u32                   height;         /* Frame height */
-        __u32                   type;           /* Frame interval type the device supports. */
-
-        union {                                 /* Frame interval */
-                struct v4l2_fract               discrete;
-                struct v4l2_frmival_stepwise    stepwise;
-        };
-
-        __u32   reserved[2];                    /* Reserved space for future use */
-};
-#endif
-
-/*
- *      T I M E C O D E
- */
-struct v4l2_timecode {
-        __u32   type;
-        __u32   flags;
-        __u8    frames;
-        __u8    seconds;
-        __u8    minutes;
-        __u8    hours;
-        __u8    userbits[4];
-};
-
-/*  Type  */
-#define V4L2_TC_TYPE_24FPS              1
-#define V4L2_TC_TYPE_25FPS              2
-#define V4L2_TC_TYPE_30FPS              3
-#define V4L2_TC_TYPE_50FPS              4
-#define V4L2_TC_TYPE_60FPS              5
-
-/*  Flags  */
-#define V4L2_TC_FLAG_DROPFRAME          0x0001 /* "drop-frame" mode */
-#define V4L2_TC_FLAG_COLORFRAME         0x0002
-#define V4L2_TC_USERBITS_field          0x000C
-#define V4L2_TC_USERBITS_USERDEFINED    0x0000
-#define V4L2_TC_USERBITS_8BITCHARS      0x0008
-/* The above is based on SMPTE timecodes */
-
-struct v4l2_jpegcompression {
-        int quality;
-
-        int  APPn;              /* Number of APP segment to be written,
-                                 * must be 0..15 */
-        int  APP_len;           /* Length of data in JPEG APPn segment */
-        char APP_data[60];      /* Data in the JPEG APPn segment. */
-
-        int  COM_len;           /* Length of data in JPEG COM segment */
-        char COM_data[60];      /* Data in JPEG COM segment */
-
-        __u32 jpeg_markers;     /* Which markers should go into the JPEG
-                                 * output. Unless you exactly know what
-                                 * you do, leave them untouched.
-                                 * Inluding less markers will make the
-                                 * resulting code smaller, but there will
-                                 * be fewer applications which can read it.
-                                 * The presence of the APP and COM marker
-                                 * is influenced by APP_len and COM_len
-                                 * ONLY, not by this property! */
-
-#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-                                        * allways use APP0 */
-};
-
-/*
- *      M E M O R Y - M A P P I N G   B U F F E R S
- */
-struct v4l2_requestbuffers {
-        __u32                   count;
-        __u32                   type;           /* enum v4l2_buf_type */
-        __u32                   memory;         /* enum v4l2_memory */
-        __u32                   reserved[2];
-};
-
-/**
- * struct v4l2_plane - plane info for multi-planar buffers
- * @bytesused:          number of bytes occupied by data in the plane (payload)
- * @length:             size of this plane (NOT the payload) in bytes
- * @mem_offset:         when memory in the associated struct v4l2_buffer is
- *                      V4L2_MEMORY_MMAP, equals the offset from the start of
- *                      the device memory for this plane (or is a "cookie" that
- *                      should be passed to mmap() called on the video node)
- * @userptr:            when memory is V4L2_MEMORY_USERPTR, a userspace pointer
- *                      pointing to this plane
- * @data_offset:        offset in the plane to the start of data; usually 0,
- *                      unless there is a header in front of the data
- *
- * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
- * with two planes can have one plane for Y, and another for interleaved CbCr
- * components. Each plane can reside in a separate memory buffer, or even in
- * a completely separate memory node (e.g. in embedded devices).
- */
-struct v4l2_plane {
-        __u32                   bytesused;
-        __u32                   length;
-        union {
-                __u32           mem_offset;
-                unsigned long   userptr;
-        } m;
-        __u32                   data_offset;
-        __u32                   reserved[11];
-};
-
-/**
- * struct v4l2_buffer - video buffer info
- * @index:      id number of the buffer
- * @type:       enum v4l2_buf_type; buffer type (type == *_MPLANE for
- *              multiplanar buffers);
- * @bytesused:  number of bytes occupied by data in the buffer (payload);
- *              unused (set to 0) for multiplanar buffers
- * @flags:      buffer informational flags
- * @field:      enum v4l2_field; field order of the image in the buffer
- * @timestamp:  frame timestamp
- * @timecode:   frame timecode
- * @sequence:   sequence count of this frame
- * @memory:     enum v4l2_memory; the method, in which the actual video data is
- *              passed
- * @offset:     for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
- *              offset from the start of the device memory for this plane,
- *              (or a "cookie" that should be passed to mmap() as offset)
- * @userptr:    for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
- *              a userspace pointer pointing to this buffer
- * @planes:     for multiplanar buffers; userspace pointer to the array of plane
- *              info structs for this buffer
- * @length:     size in bytes of the buffer (NOT its payload) for single-plane
- *              buffers (when type != *_MPLANE); number of elements in the
- *              planes array for multi-plane buffers
- * @input:      input number from which the video data has has been captured
- *
- * Contains data exchanged by application and driver using one of the Streaming
- * I/O methods.
- */
-struct v4l2_buffer {
-        __u32                   index;
-        __u32                   type;
-        __u32                   bytesused;
-        __u32                   flags;
-        __u32                   field;
-        struct timeval          timestamp;
-        struct v4l2_timecode    timecode;
-        __u32                   sequence;
-
-        /* memory location */
-        __u32                   memory;
-        union {
-                __u32           offset;
-                unsigned long   userptr;
-                struct v4l2_plane *planes;
-        } m;
-        __u32                   length;
-        __u32                   reserved2;
-        __u32                   reserved;
-};
-
-/*  Flags for 'flags' field */
-#define V4L2_BUF_FLAG_MAPPED    0x0001  /* Buffer is mapped (flag) */
-#define V4L2_BUF_FLAG_QUEUED    0x0002  /* Buffer is queued for processing */
-#define V4L2_BUF_FLAG_DONE      0x0004  /* Buffer is ready */
-#define V4L2_BUF_FLAG_KEYFRAME  0x0008  /* Image is a keyframe (I-frame) */
-#define V4L2_BUF_FLAG_PFRAME    0x0010  /* Image is a P-frame */
-#define V4L2_BUF_FLAG_BFRAME    0x0020  /* Image is a B-frame */
-/* Buffer is ready, but the data contained within is corrupted. */
-#define V4L2_BUF_FLAG_ERROR     0x0040
-#define V4L2_BUF_FLAG_TIMECODE  0x0100  /* timecode field is valid */
-#define V4L2_BUF_FLAG_PREPARED  0x0400  /* Buffer is prepared for queuing */
-/* Cache handling flags */
-#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE       0x0800
-#define V4L2_BUF_FLAG_NO_CACHE_CLEAN            0x1000
-
-/*
- *      O V E R L A Y   P R E V I E W
- */
-struct v4l2_framebuffer {
-        __u32                   capability;
-        __u32                   flags;
-/* FIXME: in theory we should pass something like PCI device + memory
- * region + offset instead of some physical address */
-        void                    *base;
-        struct v4l2_pix_format  fmt;
-};
-/*  Flags for the 'capability' field. Read only */
-#define V4L2_FBUF_CAP_EXTERNOVERLAY     0x0001
-#define V4L2_FBUF_CAP_CHROMAKEY         0x0002
-#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-#define V4L2_FBUF_CAP_BITMAP_CLIPPING   0x0008
-#define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
-#define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
-#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
-#define V4L2_FBUF_CAP_SRC_CHROMAKEY     0x0080
-/*  Flags for the 'flags' field. */
-#define V4L2_FBUF_FLAG_PRIMARY          0x0001
-#define V4L2_FBUF_FLAG_OVERLAY          0x0002
-#define V4L2_FBUF_FLAG_CHROMAKEY        0x0004
-#define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
-#define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
-#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
-#define V4L2_FBUF_FLAG_SRC_CHROMAKEY    0x0040
-
-struct v4l2_clip {
-        struct v4l2_rect        c;
-        struct v4l2_clip        __user *next;
-};
-
-struct v4l2_window {
-        struct v4l2_rect        w;
-        __u32                   field;   /* enum v4l2_field */
-        __u32                   chromakey;
-        struct v4l2_clip        __user *clips;
-        __u32                   clipcount;
-        void                    __user *bitmap;
-        __u8                    global_alpha;
-};
-
-/*
- *      C A P T U R E   P A R A M E T E R S
- */
-struct v4l2_captureparm {
-        __u32              capability;    /*  Supported modes */
-        __u32              capturemode;   /*  Current mode */
-        struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-        __u32              extendedmode;  /*  Driver-specific extensions */
-        __u32              readbuffers;   /*  # of buffers for read */
-        __u32              reserved[4];
-};
-
-/*  Flags for 'capability' and 'capturemode' fields */
-#define V4L2_MODE_HIGHQUALITY   0x0001  /*  High quality imaging mode */
-#define V4L2_CAP_TIMEPERFRAME   0x1000  /*  timeperframe field is supported */
-
-struct v4l2_outputparm {
-        __u32              capability;   /*  Supported modes */
-        __u32              outputmode;   /*  Current mode */
-        struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-        __u32              extendedmode; /*  Driver-specific extensions */
-        __u32              writebuffers; /*  # of buffers for write */
-        __u32              reserved[4];
-};
-
-/*
- *      I N P U T   I M A G E   C R O P P I N G
- */
-struct v4l2_cropcap {
-        __u32                   type;   /* enum v4l2_buf_type */
-        struct v4l2_rect        bounds;
-        struct v4l2_rect        defrect;
-        struct v4l2_fract       pixelaspect;
-};
-
-struct v4l2_crop {
-        __u32                   type;   /* enum v4l2_buf_type */
-        struct v4l2_rect        c;
-};
-
-/**
- * struct v4l2_selection - selection info
- * @type:       buffer type (do not use *_MPLANE types)
- * @target:     Selection target, used to choose one of possible rectangles;
- *              defined in v4l2-common.h; V4L2_SEL_TGT_* .
- * @flags:      constraints flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.
- * @r:          coordinates of selection window
- * @reserved:   for future use, rounds structure size to 64 bytes, set to zero
- *
- * Hardware may use multiple helper windows to process a video stream.
- * The structure is used to exchange this selection areas between
- * an application and a driver.
- */
-struct v4l2_selection {
-        __u32                   type;
-        __u32                   target;
-        __u32                   flags;
-        struct v4l2_rect        r;
-        __u32                   reserved[9];
-};
-
-
-/*
- *      A N A L O G   V I D E O   S T A N D A R D
- */
-
-typedef __u64 v4l2_std_id;
-
-/* one bit for each */
-#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-
-#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-
-#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)       /* BTSC */
-#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)       /* EIA-J */
-#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)       /* FM A2 */
-
-#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-
-/* ATSC/HDTV */
-#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-
-/* FIXME:
-   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-   this value to 32 bits.
-   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-   it should work fine. However, if needed to add more than two standards,
-   v4l2-common.c should be fixed.
- */
-
-/*
- * Some macros to merge video standards in order to make live easier for the
- * drivers and V4L2 applications
- */
-
-/*
- * "Common" NTSC/M - It should be noticed that V4L2_STD_NTSC_443 is
- * Missing here.
- */
-#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M        |\
-                                 V4L2_STD_NTSC_M_JP     |\
-                                 V4L2_STD_NTSC_M_KR)
-/* Secam macros */
-#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
-                                 V4L2_STD_SECAM_K       |\
-                                 V4L2_STD_SECAM_K1)
-/* All Secam Standards */
-#define V4L2_STD_SECAM          (V4L2_STD_SECAM_B       |\
-                                 V4L2_STD_SECAM_G       |\
-                                 V4L2_STD_SECAM_H       |\
-                                 V4L2_STD_SECAM_DK      |\
-                                 V4L2_STD_SECAM_L       |\
-                                 V4L2_STD_SECAM_LC)
-/* PAL macros */
-#define V4L2_STD_PAL_BG         (V4L2_STD_PAL_B         |\
-                                 V4L2_STD_PAL_B1        |\
-                                 V4L2_STD_PAL_G)
-#define V4L2_STD_PAL_DK         (V4L2_STD_PAL_D         |\
-                                 V4L2_STD_PAL_D1        |\
-                                 V4L2_STD_PAL_K)
-/*
- * "Common" PAL - This macro is there to be compatible with the old
- * V4L1 concept of "PAL": /BGDKHI.
- * Several PAL standards are mising here: /M, /N and /Nc
- */
-#define V4L2_STD_PAL            (V4L2_STD_PAL_BG        |\
-                                 V4L2_STD_PAL_DK        |\
-                                 V4L2_STD_PAL_H         |\
-                                 V4L2_STD_PAL_I)
-/* Chroma "agnostic" standards */
-#define V4L2_STD_B              (V4L2_STD_PAL_B         |\
-                                 V4L2_STD_PAL_B1        |\
-                                 V4L2_STD_SECAM_B)
-#define V4L2_STD_G              (V4L2_STD_PAL_G         |\
-                                 V4L2_STD_SECAM_G)
-#define V4L2_STD_H              (V4L2_STD_PAL_H         |\
-                                 V4L2_STD_SECAM_H)
-#define V4L2_STD_L              (V4L2_STD_SECAM_L       |\
-                                 V4L2_STD_SECAM_LC)
-#define V4L2_STD_GH             (V4L2_STD_G             |\
-                                 V4L2_STD_H)
-#define V4L2_STD_DK             (V4L2_STD_PAL_DK        |\
-                                 V4L2_STD_SECAM_DK)
-#define V4L2_STD_BG             (V4L2_STD_B             |\
-                                 V4L2_STD_G)
-#define V4L2_STD_MN             (V4L2_STD_PAL_M         |\
-                                 V4L2_STD_PAL_N         |\
-                                 V4L2_STD_PAL_Nc        |\
-                                 V4L2_STD_NTSC)
-
-/* Standards where MTS/BTSC stereo could be found */
-#define V4L2_STD_MTS            (V4L2_STD_NTSC_M        |\
-                                 V4L2_STD_PAL_M         |\
-                                 V4L2_STD_PAL_N         |\
-                                 V4L2_STD_PAL_Nc)
-
-/* Standards for Countries with 60Hz Line frequency */
-#define V4L2_STD_525_60         (V4L2_STD_PAL_M         |\
-                                 V4L2_STD_PAL_60        |\
-                                 V4L2_STD_NTSC          |\
-                                 V4L2_STD_NTSC_443)
-/* Standards for Countries with 50Hz Line frequency */
-#define V4L2_STD_625_50         (V4L2_STD_PAL           |\
-                                 V4L2_STD_PAL_N         |\
-                                 V4L2_STD_PAL_Nc        |\
-                                 V4L2_STD_SECAM)
-
-#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-                                 V4L2_STD_ATSC_16_VSB)
-/* Macros with none and all analog standards */
-#define V4L2_STD_UNKNOWN        0
-#define V4L2_STD_ALL            (V4L2_STD_525_60        |\
-                                 V4L2_STD_625_50)
-
-struct v4l2_standard {
-        __u32                index;
-        v4l2_std_id          id;
-        __u8                 name[24];
-        struct v4l2_fract    frameperiod; /* Frames, not fields */
-        __u32                framelines;
-        __u32                reserved[4];
-};
-
-/* The DV Preset API is deprecated in favor of the DV Timings API.
-   New drivers shouldn't use this anymore! */
-
-/*
- *      V I D E O       T I M I N G S   D V     P R E S E T
- */
-struct v4l2_dv_preset {
-        __u32   preset;
-        __u32   reserved[4];
-};
-
-/*
- *      D V     P R E S E T S   E N U M E R A T I O N
- */
-struct v4l2_dv_enum_preset {
-        __u32   index;
-        __u32   preset;
-        __u8    name[32]; /* Name of the preset timing */
-        __u32   width;
-        __u32   height;
-        __u32   reserved[4];
-};
-
-/*
- *      D V     P R E S E T     V A L U E S
- */
-#define         V4L2_DV_INVALID         0
-#define         V4L2_DV_480P59_94       1 /* BT.1362 */
-#define         V4L2_DV_576P50          2 /* BT.1362 */
-#define         V4L2_DV_720P24          3 /* SMPTE 296M */
-#define         V4L2_DV_720P25          4 /* SMPTE 296M */
-#define         V4L2_DV_720P30          5 /* SMPTE 296M */
-#define         V4L2_DV_720P50          6 /* SMPTE 296M */
-#define         V4L2_DV_720P59_94       7 /* SMPTE 274M */
-#define         V4L2_DV_720P60          8 /* SMPTE 274M/296M */
-#define         V4L2_DV_1080I29_97      9 /* BT.1120/ SMPTE 274M */
-#define         V4L2_DV_1080I30         10 /* BT.1120/ SMPTE 274M */
-#define         V4L2_DV_1080I25         11 /* BT.1120 */
-#define         V4L2_DV_1080I50         12 /* SMPTE 296M */
-#define         V4L2_DV_1080I60         13 /* SMPTE 296M */
-#define         V4L2_DV_1080P24         14 /* SMPTE 296M */
-#define         V4L2_DV_1080P25         15 /* SMPTE 296M */
-#define         V4L2_DV_1080P30         16 /* SMPTE 296M */
-#define         V4L2_DV_1080P50         17 /* BT.1120 */
-#define         V4L2_DV_1080P60         18 /* BT.1120 */
-
-/*
- *      D V     B T     T I M I N G S
- */
-
-/** struct v4l2_bt_timings - BT.656/BT.1120 timing data
- * @width:      total width of the active video in pixels
- * @height:     total height of the active video in lines
- * @interlaced: Interlaced or progressive
- * @polarities: Positive or negative polarities
- * @pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @hfrontporch:Horizontal front porch in pixels
- * @hsync:      Horizontal Sync length in pixels
- * @hbackporch: Horizontal back porch in pixels
- * @vfrontporch:Vertical front porch in lines
- * @vsync:      Vertical Sync length in lines
- * @vbackporch: Vertical back porch in lines
- * @il_vfrontporch:Vertical front porch for the even field
- *              (aka field 2) of interlaced field formats
- * @il_vsync:   Vertical Sync length for the even field
- *              (aka field 2) of interlaced field formats
- * @il_vbackporch:Vertical back porch for the even field
- *              (aka field 2) of interlaced field formats
- * @standards:  Standards the timing belongs to
- * @flags:      Flags
- * @reserved:   Reserved fields, must be zeroed.
- *
- * A note regarding vertical interlaced timings: height refers to the total
- * height of the active video frame (= two fields). The blanking timings refer
- * to the blanking of each field. So the height of the total frame is
- * calculated as follows:
- *
- * tot_height = height + vfrontporch + vsync + vbackporch +
- *                       il_vfrontporch + il_vsync + il_vbackporch
- *
- * The active height of each field is height / 2.
- */
-struct v4l2_bt_timings {
-        __u32   width;
-        __u32   height;
-        __u32   interlaced;
-        __u32   polarities;
-        __u64   pixelclock;
-        __u32   hfrontporch;
-        __u32   hsync;
-        __u32   hbackporch;
-        __u32   vfrontporch;
-        __u32   vsync;
-        __u32   vbackporch;
-        __u32   il_vfrontporch;
-        __u32   il_vsync;
-        __u32   il_vbackporch;
-        __u32   standards;
-        __u32   flags;
-        __u32   reserved[14];
-} __attribute__ ((packed));
-
-/* Interlaced or progressive format */
-#define V4L2_DV_PROGRESSIVE     0
-#define V4L2_DV_INTERLACED      1
-
-/* Polarities. If bit is not set, it is assumed to be negative polarity */
-#define V4L2_DV_VSYNC_POS_POL   0x00000001
-#define V4L2_DV_HSYNC_POS_POL   0x00000002
-
-/* Timings standards */
-#define V4L2_DV_BT_STD_CEA861   (1 << 0)  /* CEA-861 Digital TV Profile */
-#define V4L2_DV_BT_STD_DMT      (1 << 1)  /* VESA Discrete Monitor Timings */
-#define V4L2_DV_BT_STD_CVT      (1 << 2)  /* VESA Coordinated Video Timings */
-#define V4L2_DV_BT_STD_GTF      (1 << 3)  /* VESA Generalized Timings Formula */
-
-/* Flags */
-
-/* CVT/GTF specific: timing uses reduced blanking (CVT) or the 'Secondary
-   GTF' curve (GTF). In both cases the horizontal and/or vertical blanking
-   intervals are reduced, allowing a higher resolution over the same
-   bandwidth. This is a read-only flag. */
-#define V4L2_DV_FL_REDUCED_BLANKING             (1 << 0)
-/* CEA-861 specific: set for CEA-861 formats with a framerate of a multiple
-   of six. These formats can be optionally played at 1 / 1.001 speed.
-   This is a read-only flag. */
-#define V4L2_DV_FL_CAN_REDUCE_FPS               (1 << 1)
-/* CEA-861 specific: only valid for video transmitters, the flag is cleared
-   by receivers.
-   If the framerate of the format is a multiple of six, then the pixelclock
-   used to set up the transmitter is divided by 1.001 to make it compatible
-   with 60 Hz based standards such as NTSC and PAL-M that use a framerate of
-   29.97 Hz. Otherwise this flag is cleared. If the transmitter can't generate
-   such frequencies, then the flag will also be cleared. */
-#define V4L2_DV_FL_REDUCED_FPS                  (1 << 2)
-/* Specific to interlaced formats: if set, then field 1 is really one half-line
-   longer and field 2 is really one half-line shorter, so each field has
-   exactly the same number of half-lines. Whether half-lines can be detected
-   or used depends on the hardware. */
-#define V4L2_DV_FL_HALF_LINE                    (1 << 0)
-
-
-/** struct v4l2_dv_timings - DV timings
- * @type:       the type of the timings
- * @bt: BT656/1120 timings
- */
-struct v4l2_dv_timings {
-        __u32 type;
-        union {
-                struct v4l2_bt_timings  bt;
-                __u32   reserved[32];
-        };
-} __attribute__ ((packed));
-
-/* Values for the type field */
-#define V4L2_DV_BT_656_1120     0       /* BT.656/1120 timing type */
-
-
-/** struct v4l2_enum_dv_timings - DV timings enumeration
- * @index:      enumeration index
- * @reserved:   must be zeroed
- * @timings:    the timings for the given index
- */
-struct v4l2_enum_dv_timings {
-        __u32 index;
-        __u32 reserved[3];
-        struct v4l2_dv_timings timings;
-};
-
-/** struct v4l2_bt_timings_cap - BT.656/BT.1120 timing capabilities
- * @min_width:          width in pixels
- * @max_width:          width in pixels
- * @min_height:         height in lines
- * @max_height:         height in lines
- * @min_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @max_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @standards:          Supported standards
- * @capabilities:       Supported capabilities
- * @reserved:           Must be zeroed
- */
-struct v4l2_bt_timings_cap {
-        __u32   min_width;
-        __u32   max_width;
-        __u32   min_height;
-        __u32   max_height;
-        __u64   min_pixelclock;
-        __u64   max_pixelclock;
-        __u32   standards;
-        __u32   capabilities;
-        __u32   reserved[16];
-} __attribute__ ((packed));
-
-/* Supports interlaced formats */
-#define V4L2_DV_BT_CAP_INTERLACED       (1 << 0)
-/* Supports progressive formats */
-#define V4L2_DV_BT_CAP_PROGRESSIVE      (1 << 1)
-/* Supports CVT/GTF reduced blanking */
-#define V4L2_DV_BT_CAP_REDUCED_BLANKING (1 << 2)
-/* Supports custom formats */
-#define V4L2_DV_BT_CAP_CUSTOM           (1 << 3)
-
-/** struct v4l2_dv_timings_cap - DV timings capabilities
- * @type:       the type of the timings (same as in struct v4l2_dv_timings)
- * @bt:         the BT656/1120 timings capabilities
- */
-struct v4l2_dv_timings_cap {
-        __u32 type;
-        __u32 reserved[3];
-        union {
-                struct v4l2_bt_timings_cap bt;
-                __u32 raw_data[32];
-        };
-};
-
-
-/*
- *      V I D E O   I N P U T S
- */
-struct v4l2_input {
-        __u32        index;             /*  Which input */
-        __u8         name[32];          /*  Label */
-        __u32        type;              /*  Type of input */
-        __u32        audioset;          /*  Associated audios (bitfield) */
-        __u32        tuner;             /*  enum v4l2_tuner_type */
-        v4l2_std_id  std;
-        __u32        status;
-        __u32        capabilities;
-        __u32        reserved[3];
-};
-
-/*  Values for the 'type' field */
-#define V4L2_INPUT_TYPE_TUNER           1
-#define V4L2_INPUT_TYPE_CAMERA          2
-
-/* field 'status' - general */
-#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-#define V4L2_IN_ST_NO_COLOR    0x00000004
-
-/* field 'status' - sensor orientation */
-/* If sensor is mounted upside down set both bits */
-#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-
-/* field 'status' - analog */
-#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-
-/* field 'status' - digital */
-#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-
-/* field 'status' - VCR and set-top box */
-#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-
-/* capabilities flags */
-#define V4L2_IN_CAP_PRESETS             0x00000001 /* Supports S_DV_PRESET */
-#define V4L2_IN_CAP_CUSTOM_TIMINGS      0x00000002 /* Supports S_DV_TIMINGS */
-#define V4L2_IN_CAP_STD                 0x00000004 /* Supports S_STD */
-
-/*
- *      V I D E O   O U T P U T S
- */
-struct v4l2_output {
-        __u32        index;             /*  Which output */
-        __u8         name[32];          /*  Label */
-        __u32        type;              /*  Type of output */
-        __u32        audioset;          /*  Associated audios (bitfield) */
-        __u32        modulator;         /*  Associated modulator */
-        v4l2_std_id  std;
-        __u32        capabilities;
-        __u32        reserved[3];
-};
-/*  Values for the 'type' field */
-#define V4L2_OUTPUT_TYPE_MODULATOR              1
-#define V4L2_OUTPUT_TYPE_ANALOG                 2
-#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
-
-/* capabilities flags */
-#define V4L2_OUT_CAP_PRESETS            0x00000001 /* Supports S_DV_PRESET */
-#define V4L2_OUT_CAP_CUSTOM_TIMINGS     0x00000002 /* Supports S_DV_TIMINGS */
-#define V4L2_OUT_CAP_STD                0x00000004 /* Supports S_STD */
-
-/*
- *      C O N T R O L S
- */
-struct v4l2_control {
-        __u32                id;
-        __s32                value;
-};
-
-struct v4l2_ext_control {
-        __u32 id;
-        __u32 size;
-        __u32 reserved2[1];
-        union {
-                __s32 value;
-                __s64 value64;
-                char *string;
-        };
-} __attribute__ ((packed));
-
-struct v4l2_ext_controls {
-        __u32 ctrl_class;
-        __u32 count;
-        __u32 error_idx;
-        __u32 reserved[2];
-        struct v4l2_ext_control *controls;
-};
-
-/*  Values for ctrl_class field */
-#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
-#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
-#define V4L2_CTRL_CLASS_CAMERA 0x009a0000       /* Camera class controls */
-#define V4L2_CTRL_CLASS_FM_TX 0x009b0000        /* FM Modulator control class */
-#define V4L2_CTRL_CLASS_FLASH 0x009c0000        /* Camera flash controls */
-#define V4L2_CTRL_CLASS_JPEG 0x009d0000         /* JPEG-compression controls */
-#define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */
-#define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000   /* Image processing controls */
-
-#define V4L2_CTRL_ID_MASK         (0x0fffffff)
-#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-
-enum v4l2_ctrl_type {
-        V4L2_CTRL_TYPE_INTEGER       = 1,
-        V4L2_CTRL_TYPE_BOOLEAN       = 2,
-        V4L2_CTRL_TYPE_MENU          = 3,
-        V4L2_CTRL_TYPE_BUTTON        = 4,
-        V4L2_CTRL_TYPE_INTEGER64     = 5,
-        V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-        V4L2_CTRL_TYPE_STRING        = 7,
-        V4L2_CTRL_TYPE_BITMASK       = 8,
-        V4L2_CTRL_TYPE_INTEGER_MENU = 9,
-};
-
-/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-struct v4l2_queryctrl {
-        __u32                id;
-        __u32                type;      /* enum v4l2_ctrl_type */
-        __u8                 name[32];  /* Whatever */
-        __s32                minimum;   /* Note signedness */
-        __s32                maximum;
-        __s32                step;
-        __s32                default_value;
-        __u32                flags;
-        __u32                reserved[2];
-};
-
-/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-struct v4l2_querymenu {
-        __u32           id;
-        __u32           index;
-        union {
-                __u8    name[32];       /* Whatever */
-                __s64   value;
-        };
-        __u32           reserved;
-} __attribute__ ((packed));
-
-/*  Control flags  */
-#define V4L2_CTRL_FLAG_DISABLED         0x0001
-#define V4L2_CTRL_FLAG_GRABBED          0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
-#define V4L2_CTRL_FLAG_UPDATE           0x0008
-#define V4L2_CTRL_FLAG_INACTIVE         0x0010
-#define V4L2_CTRL_FLAG_SLIDER           0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
-#define V4L2_CTRL_FLAG_VOLATILE         0x0080
-
-/*  Query flag, to be ORed with the control ID */
-#define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
-
-/*  User-class control IDs defined by V4L2 */
-#define V4L2_CID_MAX_CTRLS              1024
-#define V4L2_CID_BASE                   (V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE              V4L2_CID_BASE
-/*  IDs reserved for driver specific controls */
-#define V4L2_CID_PRIVATE_BASE           0x08000000
-
-#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
-#define V4L2_CID_BRIGHTNESS             (V4L2_CID_BASE+0)
-#define V4L2_CID_CONTRAST               (V4L2_CID_BASE+1)
-#define V4L2_CID_SATURATION             (V4L2_CID_BASE+2)
-#define V4L2_CID_HUE                    (V4L2_CID_BASE+3)
-#define V4L2_CID_AUDIO_VOLUME           (V4L2_CID_BASE+5)
-#define V4L2_CID_AUDIO_BALANCE          (V4L2_CID_BASE+6)
-#define V4L2_CID_AUDIO_BASS             (V4L2_CID_BASE+7)
-#define V4L2_CID_AUDIO_TREBLE           (V4L2_CID_BASE+8)
-#define V4L2_CID_AUDIO_MUTE             (V4L2_CID_BASE+9)
-#define V4L2_CID_AUDIO_LOUDNESS         (V4L2_CID_BASE+10)
-#define V4L2_CID_BLACK_LEVEL            (V4L2_CID_BASE+11) /* Deprecated */
-#define V4L2_CID_AUTO_WHITE_BALANCE     (V4L2_CID_BASE+12)
-#define V4L2_CID_DO_WHITE_BALANCE       (V4L2_CID_BASE+13)
-#define V4L2_CID_RED_BALANCE            (V4L2_CID_BASE+14)
-#define V4L2_CID_BLUE_BALANCE           (V4L2_CID_BASE+15)
-#define V4L2_CID_GAMMA                  (V4L2_CID_BASE+16)
-#define V4L2_CID_WHITENESS              (V4L2_CID_GAMMA) /* Deprecated */
-#define V4L2_CID_EXPOSURE               (V4L2_CID_BASE+17)
-#define V4L2_CID_AUTOGAIN               (V4L2_CID_BASE+18)
-#define V4L2_CID_GAIN                   (V4L2_CID_BASE+19)
-#define V4L2_CID_HFLIP                  (V4L2_CID_BASE+20)
-#define V4L2_CID_VFLIP                  (V4L2_CID_BASE+21)
-
-/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-#define V4L2_CID_HCENTER                (V4L2_CID_BASE+22)
-#define V4L2_CID_VCENTER                (V4L2_CID_BASE+23)
-
-#define V4L2_CID_POWER_LINE_FREQUENCY   (V4L2_CID_BASE+24)
-enum v4l2_power_line_frequency {
-        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED  = 0,
-        V4L2_CID_POWER_LINE_FREQUENCY_50HZ      = 1,
-        V4L2_CID_POWER_LINE_FREQUENCY_60HZ      = 2,
-        V4L2_CID_POWER_LINE_FREQUENCY_AUTO      = 3,
-};
-#define V4L2_CID_HUE_AUTO                       (V4L2_CID_BASE+25)
-#define V4L2_CID_WHITE_BALANCE_TEMPERATURE      (V4L2_CID_BASE+26)
-#define V4L2_CID_SHARPNESS                      (V4L2_CID_BASE+27)
-#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
-#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-#define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
-enum v4l2_colorfx {
-        V4L2_COLORFX_NONE                       = 0,
-        V4L2_COLORFX_BW                         = 1,
-        V4L2_COLORFX_SEPIA                      = 2,
-        V4L2_COLORFX_NEGATIVE                   = 3,
-        V4L2_COLORFX_EMBOSS                     = 4,
-        V4L2_COLORFX_SKETCH                     = 5,
-        V4L2_COLORFX_SKY_BLUE                   = 6,
-        V4L2_COLORFX_GRASS_GREEN                = 7,
-        V4L2_COLORFX_SKIN_WHITEN                = 8,
-        V4L2_COLORFX_VIVID                      = 9,
-        V4L2_COLORFX_AQUA                       = 10,
-        V4L2_COLORFX_ART_FREEZE                 = 11,
-        V4L2_COLORFX_SILHOUETTE                 = 12,
-        V4L2_COLORFX_SOLARIZATION               = 13,
-        V4L2_COLORFX_ANTIQUE                    = 14,
-        V4L2_COLORFX_SET_CBCR                   = 15,
-};
-#define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
-#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
-
-#define V4L2_CID_ROTATE                         (V4L2_CID_BASE+34)
-#define V4L2_CID_BG_COLOR                       (V4L2_CID_BASE+35)
-
-#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-
-#define V4L2_CID_ILLUMINATORS_1                 (V4L2_CID_BASE+37)
-#define V4L2_CID_ILLUMINATORS_2                 (V4L2_CID_BASE+38)
-
-#define V4L2_CID_MIN_BUFFERS_FOR_CAPTURE        (V4L2_CID_BASE+39)
-#define V4L2_CID_MIN_BUFFERS_FOR_OUTPUT         (V4L2_CID_BASE+40)
-
-#define V4L2_CID_ALPHA_COMPONENT                (V4L2_CID_BASE+41)
-#define V4L2_CID_COLORFX_CBCR                   (V4L2_CID_BASE+42)
-
-/* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+43)
-
-/*  MPEG-class control IDs defined by V4L2 */
-#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
-#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
-
-/*  MPEG streams, specific to multiplexed streams */
-#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
-enum v4l2_mpeg_stream_type {
-        V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-        V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-        V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-        V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-        V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-        V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-};
-#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
-#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
-#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
-#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
-#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
-enum v4l2_mpeg_stream_vbi_fmt {
-        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-};
-
-/*  MPEG audio controls specific to multiplexed streams  */
-#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
-enum v4l2_mpeg_audio_sampling_freq {
-        V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-        V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-        V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-};
-#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
-enum v4l2_mpeg_audio_encoding {
-        V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-        V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-        V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-        V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-        V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-};
-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
-enum v4l2_mpeg_audio_l1_bitrate {
-        V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-        V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-        V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-        V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-        V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-        V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-        V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-        V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-        V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-        V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-        V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-        V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-        V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-        V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
-enum v4l2_mpeg_audio_l2_bitrate {
-        V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-        V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-        V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-        V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-        V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-        V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-        V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-        V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-        V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-        V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-        V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-        V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-        V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-        V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
-enum v4l2_mpeg_audio_l3_bitrate {
-        V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-        V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-        V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-        V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-        V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-        V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-        V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-        V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-        V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-        V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-        V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-        V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-        V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-        V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
-enum v4l2_mpeg_audio_mode {
-        V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-        V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-        V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-        V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-};
-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
-enum v4l2_mpeg_audio_mode_extension {
-        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-};
-#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
-enum v4l2_mpeg_audio_emphasis {
-        V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-        V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-        V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-};
-#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
-enum v4l2_mpeg_audio_crc {
-        V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-        V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-};
-#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
-#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE         (V4L2_CID_MPEG_BASE+110)
-#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE         (V4L2_CID_MPEG_BASE+111)
-enum v4l2_mpeg_audio_ac3_bitrate {
-        V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-        V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-};
-#define V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK        (V4L2_CID_MPEG_BASE+112)
-enum v4l2_mpeg_audio_dec_playback {
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO           = 0,
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO         = 1,
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT           = 2,
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_RIGHT          = 3,
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_MONO           = 4,
-        V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO = 5,
-};
-#define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
-
-/*  MPEG video controls specific to multiplexed streams */
-#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
-enum v4l2_mpeg_video_encoding {
-        V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-        V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-        V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-};
-#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
-enum v4l2_mpeg_video_aspect {
-        V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-        V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-        V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-        V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-};
-#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
-#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
-enum v4l2_mpeg_video_bitrate_mode {
-        V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-        V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-};
-#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
-#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
-#define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE             (V4L2_CID_MPEG_BASE+212)
-#define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER        (V4L2_CID_MPEG_BASE+213)
-#define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB             (V4L2_CID_MPEG_BASE+214)
-#define V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE                     (V4L2_CID_MPEG_BASE+215)
-#define V4L2_CID_MPEG_VIDEO_HEADER_MODE                         (V4L2_CID_MPEG_BASE+216)
-enum v4l2_mpeg_video_header_mode {
-        V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE                    = 0,
-        V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME       = 1,
-
-};
-#define V4L2_CID_MPEG_VIDEO_MAX_REF_PIC                 (V4L2_CID_MPEG_BASE+217)
-#define V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE                (V4L2_CID_MPEG_BASE+218)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES       (V4L2_CID_MPEG_BASE+219)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB          (V4L2_CID_MPEG_BASE+220)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE            (V4L2_CID_MPEG_BASE+221)
-enum v4l2_mpeg_video_multi_slice_mode {
-        V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE         = 0,
-        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB          = 1,
-        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES       = 2,
-};
-#define V4L2_CID_MPEG_VIDEO_VBV_SIZE                    (V4L2_CID_MPEG_BASE+222)
-#define V4L2_CID_MPEG_VIDEO_DEC_PTS                     (V4L2_CID_MPEG_BASE+223)
-#define V4L2_CID_MPEG_VIDEO_DEC_FRAME                   (V4L2_CID_MPEG_BASE+224)
-
-#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP             (V4L2_CID_MPEG_BASE+300)
-#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP             (V4L2_CID_MPEG_BASE+301)
-#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP             (V4L2_CID_MPEG_BASE+302)
-#define V4L2_CID_MPEG_VIDEO_H263_MIN_QP                 (V4L2_CID_MPEG_BASE+303)
-#define V4L2_CID_MPEG_VIDEO_H263_MAX_QP                 (V4L2_CID_MPEG_BASE+304)
-#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP             (V4L2_CID_MPEG_BASE+350)
-#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP             (V4L2_CID_MPEG_BASE+351)
-#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP             (V4L2_CID_MPEG_BASE+352)
-#define V4L2_CID_MPEG_VIDEO_H264_MIN_QP                 (V4L2_CID_MPEG_BASE+353)
-#define V4L2_CID_MPEG_VIDEO_H264_MAX_QP                 (V4L2_CID_MPEG_BASE+354)
-#define V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM          (V4L2_CID_MPEG_BASE+355)
-#define V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE               (V4L2_CID_MPEG_BASE+356)
-#define V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE           (V4L2_CID_MPEG_BASE+357)
-enum v4l2_mpeg_video_h264_entropy_mode {
-        V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC = 0,
-        V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC = 1,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_I_PERIOD               (V4L2_CID_MPEG_BASE+358)
-#define V4L2_CID_MPEG_VIDEO_H264_LEVEL                  (V4L2_CID_MPEG_BASE+359)
-enum v4l2_mpeg_video_h264_level {
-        V4L2_MPEG_VIDEO_H264_LEVEL_1_0  = 0,
-        V4L2_MPEG_VIDEO_H264_LEVEL_1B   = 1,
-        V4L2_MPEG_VIDEO_H264_LEVEL_1_1  = 2,
-        V4L2_MPEG_VIDEO_H264_LEVEL_1_2  = 3,
-        V4L2_MPEG_VIDEO_H264_LEVEL_1_3  = 4,
-        V4L2_MPEG_VIDEO_H264_LEVEL_2_0  = 5,
-        V4L2_MPEG_VIDEO_H264_LEVEL_2_1  = 6,
-        V4L2_MPEG_VIDEO_H264_LEVEL_2_2  = 7,
-        V4L2_MPEG_VIDEO_H264_LEVEL_3_0  = 8,
-        V4L2_MPEG_VIDEO_H264_LEVEL_3_1  = 9,
-        V4L2_MPEG_VIDEO_H264_LEVEL_3_2  = 10,
-        V4L2_MPEG_VIDEO_H264_LEVEL_4_0  = 11,
-        V4L2_MPEG_VIDEO_H264_LEVEL_4_1  = 12,
-        V4L2_MPEG_VIDEO_H264_LEVEL_4_2  = 13,
-        V4L2_MPEG_VIDEO_H264_LEVEL_5_0  = 14,
-        V4L2_MPEG_VIDEO_H264_LEVEL_5_1  = 15,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA      (V4L2_CID_MPEG_BASE+360)
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA       (V4L2_CID_MPEG_BASE+361)
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE       (V4L2_CID_MPEG_BASE+362)
-enum v4l2_mpeg_video_h264_loop_filter_mode {
-        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED                           = 0,
-        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED                          = 1,
-        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY        = 2,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_PROFILE                (V4L2_CID_MPEG_BASE+363)
-enum v4l2_mpeg_video_h264_profile {
-        V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE                   = 0,
-        V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE       = 1,
-        V4L2_MPEG_VIDEO_H264_PROFILE_MAIN                       = 2,
-        V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED                   = 3,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH                       = 4,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10                    = 5,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422                   = 6,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE        = 7,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA              = 8,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA             = 9,
-        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA             = 10,
-        V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA            = 11,
-        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE          = 12,
-        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH              = 13,
-        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA        = 14,
-        V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH                = 15,
-        V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH             = 16,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT     (V4L2_CID_MPEG_BASE+364)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH      (V4L2_CID_MPEG_BASE+365)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE         (V4L2_CID_MPEG_BASE+366)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC            (V4L2_CID_MPEG_BASE+367)
-enum v4l2_mpeg_video_h264_vui_sar_idc {
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED    = 0,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_1x1            = 1,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_12x11          = 2,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_10x11          = 3,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_16x11          = 4,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_40x33          = 5,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_24x11          = 6,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_20x11          = 7,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_32x11          = 8,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_80x33          = 9,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_18x11          = 10,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_15x11          = 11,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_64x33          = 12,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_160x99         = 13,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_4x3            = 14,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_3x2            = 15,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1            = 16,
-        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED       = 17,
-};
-#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP    (V4L2_CID_MPEG_BASE+400)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP    (V4L2_CID_MPEG_BASE+401)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP    (V4L2_CID_MPEG_BASE+402)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP        (V4L2_CID_MPEG_BASE+403)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP        (V4L2_CID_MPEG_BASE+404)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL         (V4L2_CID_MPEG_BASE+405)
-enum v4l2_mpeg_video_mpeg4_level {
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_0   = 0,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B  = 1,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_1   = 2,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_2   = 3,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_3   = 4,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B  = 5,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_4   = 6,
-        V4L2_MPEG_VIDEO_MPEG4_LEVEL_5   = 7,
-};
-#define V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE       (V4L2_CID_MPEG_BASE+406)
-enum v4l2_mpeg_video_mpeg4_profile {
-        V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE                            = 0,
-        V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE                   = 1,
-        V4L2_MPEG_VIDEO_MPEG4_PROFILE_CORE                              = 2,
-        V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE_SCALABLE                   = 3,
-        V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY        = 4,
-};
-#define V4L2_CID_MPEG_VIDEO_MPEG4_QPEL          (V4L2_CID_MPEG_BASE+407)
-
-/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
-enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
-enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
-enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
-enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
-enum v4l2_mpeg_cx2341x_video_median_filter_type {
-        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
-#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
-
-/*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
-#define V4L2_CID_MPEG_MFC51_BASE                                (V4L2_CTRL_CLASS_MPEG | 0x1100)
-
-#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY            (V4L2_CID_MPEG_MFC51_BASE+0)
-#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE     (V4L2_CID_MPEG_MFC51_BASE+1)
-#define V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE                       (V4L2_CID_MPEG_MFC51_BASE+2)
-enum v4l2_mpeg_mfc51_video_frame_skip_mode {
-        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED          = 0,
-        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT       = 1,
-        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT         = 2,
-};
-#define V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE                      (V4L2_CID_MPEG_MFC51_BASE+3)
-enum v4l2_mpeg_mfc51_video_force_frame_type {
-        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED         = 0,
-        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME          = 1,
-        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_NOT_CODED        = 2,
-};
-#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING                               (V4L2_CID_MPEG_MFC51_BASE+4)
-#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV                           (V4L2_CID_MPEG_MFC51_BASE+5)
-#define V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT                   (V4L2_CID_MPEG_MFC51_BASE+6)
-#define V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF                     (V4L2_CID_MPEG_MFC51_BASE+7)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY             (V4L2_CID_MPEG_MFC51_BASE+50)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK                 (V4L2_CID_MPEG_MFC51_BASE+51)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH               (V4L2_CID_MPEG_MFC51_BASE+52)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC               (V4L2_CID_MPEG_MFC51_BASE+53)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P                (V4L2_CID_MPEG_MFC51_BASE+54)
-
-/*  Camera class control IDs */
-#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
-#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
-
-#define V4L2_CID_EXPOSURE_AUTO                  (V4L2_CID_CAMERA_CLASS_BASE+1)
-enum  v4l2_exposure_auto_type {
-        V4L2_EXPOSURE_AUTO = 0,
-        V4L2_EXPOSURE_MANUAL = 1,
-        V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-        V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-};
-#define V4L2_CID_EXPOSURE_ABSOLUTE              (V4L2_CID_CAMERA_CLASS_BASE+2)
-#define V4L2_CID_EXPOSURE_AUTO_PRIORITY         (V4L2_CID_CAMERA_CLASS_BASE+3)
-
-#define V4L2_CID_PAN_RELATIVE                   (V4L2_CID_CAMERA_CLASS_BASE+4)
-#define V4L2_CID_TILT_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+5)
-#define V4L2_CID_PAN_RESET                      (V4L2_CID_CAMERA_CLASS_BASE+6)
-#define V4L2_CID_TILT_RESET                     (V4L2_CID_CAMERA_CLASS_BASE+7)
-
-#define V4L2_CID_PAN_ABSOLUTE                   (V4L2_CID_CAMERA_CLASS_BASE+8)
-#define V4L2_CID_TILT_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+9)
-
-#define V4L2_CID_FOCUS_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+10)
-#define V4L2_CID_FOCUS_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+11)
-#define V4L2_CID_FOCUS_AUTO                     (V4L2_CID_CAMERA_CLASS_BASE+12)
-
-#define V4L2_CID_ZOOM_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+13)
-#define V4L2_CID_ZOOM_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+14)
-#define V4L2_CID_ZOOM_CONTINUOUS                (V4L2_CID_CAMERA_CLASS_BASE+15)
-
-#define V4L2_CID_PRIVACY                        (V4L2_CID_CAMERA_CLASS_BASE+16)
-
-#define V4L2_CID_IRIS_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+17)
-#define V4L2_CID_IRIS_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+18)
-
-#define V4L2_CID_AUTO_EXPOSURE_BIAS             (V4L2_CID_CAMERA_CLASS_BASE+19)
-
-#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE    (V4L2_CID_CAMERA_CLASS_BASE+20)
-enum v4l2_auto_n_preset_white_balance {
-        V4L2_WHITE_BALANCE_MANUAL               = 0,
-        V4L2_WHITE_BALANCE_AUTO                 = 1,
-        V4L2_WHITE_BALANCE_INCANDESCENT         = 2,
-        V4L2_WHITE_BALANCE_FLUORESCENT          = 3,
-        V4L2_WHITE_BALANCE_FLUORESCENT_H        = 4,
-        V4L2_WHITE_BALANCE_HORIZON              = 5,
-        V4L2_WHITE_BALANCE_DAYLIGHT             = 6,
-        V4L2_WHITE_BALANCE_FLASH                = 7,
-        V4L2_WHITE_BALANCE_CLOUDY               = 8,
-        V4L2_WHITE_BALANCE_SHADE                = 9,
-};
-
-#define V4L2_CID_WIDE_DYNAMIC_RANGE             (V4L2_CID_CAMERA_CLASS_BASE+21)
-#define V4L2_CID_IMAGE_STABILIZATION            (V4L2_CID_CAMERA_CLASS_BASE+22)
-
-#define V4L2_CID_ISO_SENSITIVITY                (V4L2_CID_CAMERA_CLASS_BASE+23)
-#define V4L2_CID_ISO_SENSITIVITY_AUTO           (V4L2_CID_CAMERA_CLASS_BASE+24)
-enum v4l2_iso_sensitivity_auto_type {
-        V4L2_ISO_SENSITIVITY_MANUAL             = 0,
-        V4L2_ISO_SENSITIVITY_AUTO               = 1,
-};
-
-#define V4L2_CID_EXPOSURE_METERING              (V4L2_CID_CAMERA_CLASS_BASE+25)
-enum v4l2_exposure_metering {
-        V4L2_EXPOSURE_METERING_AVERAGE          = 0,
-        V4L2_EXPOSURE_METERING_CENTER_WEIGHTED  = 1,
-        V4L2_EXPOSURE_METERING_SPOT             = 2,
-};
-
-#define V4L2_CID_SCENE_MODE                     (V4L2_CID_CAMERA_CLASS_BASE+26)
-enum v4l2_scene_mode {
-        V4L2_SCENE_MODE_NONE                    = 0,
-        V4L2_SCENE_MODE_BACKLIGHT               = 1,
-        V4L2_SCENE_MODE_BEACH_SNOW              = 2,
-        V4L2_SCENE_MODE_CANDLE_LIGHT            = 3,
-        V4L2_SCENE_MODE_DAWN_DUSK               = 4,
-        V4L2_SCENE_MODE_FALL_COLORS             = 5,
-        V4L2_SCENE_MODE_FIREWORKS               = 6,
-        V4L2_SCENE_MODE_LANDSCAPE               = 7,
-        V4L2_SCENE_MODE_NIGHT                   = 8,
-        V4L2_SCENE_MODE_PARTY_INDOOR            = 9,
-        V4L2_SCENE_MODE_PORTRAIT                = 10,
-        V4L2_SCENE_MODE_SPORTS                  = 11,
-        V4L2_SCENE_MODE_SUNSET                  = 12,
-        V4L2_SCENE_MODE_TEXT                    = 13,
-};
-
-#define V4L2_CID_3A_LOCK                        (V4L2_CID_CAMERA_CLASS_BASE+27)
-#define V4L2_LOCK_EXPOSURE                      (1 << 0)
-#define V4L2_LOCK_WHITE_BALANCE                 (1 << 1)
-#define V4L2_LOCK_FOCUS                         (1 << 2)
-
-#define V4L2_CID_AUTO_FOCUS_START               (V4L2_CID_CAMERA_CLASS_BASE+28)
-#define V4L2_CID_AUTO_FOCUS_STOP                (V4L2_CID_CAMERA_CLASS_BASE+29)
-#define V4L2_CID_AUTO_FOCUS_STATUS              (V4L2_CID_CAMERA_CLASS_BASE+30)
-#define V4L2_AUTO_FOCUS_STATUS_IDLE             (0 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_BUSY             (1 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_REACHED          (1 << 1)
-#define V4L2_AUTO_FOCUS_STATUS_FAILED           (1 << 2)
-
-#define V4L2_CID_AUTO_FOCUS_RANGE               (V4L2_CID_CAMERA_CLASS_BASE+31)
-enum v4l2_auto_focus_range {
-        V4L2_AUTO_FOCUS_RANGE_AUTO              = 0,
-        V4L2_AUTO_FOCUS_RANGE_NORMAL            = 1,
-        V4L2_AUTO_FOCUS_RANGE_MACRO             = 2,
-        V4L2_AUTO_FOCUS_RANGE_INFINITY          = 3,
-};
-
-/* FM Modulator class control IDs */
-#define V4L2_CID_FM_TX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_TX | 0x900)
-#define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
-
-#define V4L2_CID_RDS_TX_DEVIATION               (V4L2_CID_FM_TX_CLASS_BASE + 1)
-#define V4L2_CID_RDS_TX_PI                      (V4L2_CID_FM_TX_CLASS_BASE + 2)
-#define V4L2_CID_RDS_TX_PTY                     (V4L2_CID_FM_TX_CLASS_BASE + 3)
-#define V4L2_CID_RDS_TX_PS_NAME                 (V4L2_CID_FM_TX_CLASS_BASE + 5)
-#define V4L2_CID_RDS_TX_RADIO_TEXT              (V4L2_CID_FM_TX_CLASS_BASE + 6)
-
-#define V4L2_CID_AUDIO_LIMITER_ENABLED          (V4L2_CID_FM_TX_CLASS_BASE + 64)
-#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME     (V4L2_CID_FM_TX_CLASS_BASE + 65)
-#define V4L2_CID_AUDIO_LIMITER_DEVIATION        (V4L2_CID_FM_TX_CLASS_BASE + 66)
-
-#define V4L2_CID_AUDIO_COMPRESSION_ENABLED      (V4L2_CID_FM_TX_CLASS_BASE + 80)
-#define V4L2_CID_AUDIO_COMPRESSION_GAIN         (V4L2_CID_FM_TX_CLASS_BASE + 81)
-#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD    (V4L2_CID_FM_TX_CLASS_BASE + 82)
-#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME  (V4L2_CID_FM_TX_CLASS_BASE + 83)
-#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 84)
-
-#define V4L2_CID_PILOT_TONE_ENABLED             (V4L2_CID_FM_TX_CLASS_BASE + 96)
-#define V4L2_CID_PILOT_TONE_DEVIATION           (V4L2_CID_FM_TX_CLASS_BASE + 97)
-#define V4L2_CID_PILOT_TONE_FREQUENCY           (V4L2_CID_FM_TX_CLASS_BASE + 98)
-
-#define V4L2_CID_TUNE_PREEMPHASIS               (V4L2_CID_FM_TX_CLASS_BASE + 112)
-enum v4l2_preemphasis {
-        V4L2_PREEMPHASIS_DISABLED       = 0,
-        V4L2_PREEMPHASIS_50_uS          = 1,
-        V4L2_PREEMPHASIS_75_uS          = 2,
-};
-#define V4L2_CID_TUNE_POWER_LEVEL               (V4L2_CID_FM_TX_CLASS_BASE + 113)
-#define V4L2_CID_TUNE_ANTENNA_CAPACITOR         (V4L2_CID_FM_TX_CLASS_BASE + 114)
-
-/* Flash and privacy (indicator) light controls */
-#define V4L2_CID_FLASH_CLASS_BASE               (V4L2_CTRL_CLASS_FLASH | 0x900)
-#define V4L2_CID_FLASH_CLASS                    (V4L2_CTRL_CLASS_FLASH | 1)
-
-#define V4L2_CID_FLASH_LED_MODE                 (V4L2_CID_FLASH_CLASS_BASE + 1)
-enum v4l2_flash_led_mode {
-        V4L2_FLASH_LED_MODE_NONE,
-        V4L2_FLASH_LED_MODE_FLASH,
-        V4L2_FLASH_LED_MODE_TORCH,
-};
-
-#define V4L2_CID_FLASH_STROBE_SOURCE            (V4L2_CID_FLASH_CLASS_BASE + 2)
-enum v4l2_flash_strobe_source {
-        V4L2_FLASH_STROBE_SOURCE_SOFTWARE,
-        V4L2_FLASH_STROBE_SOURCE_EXTERNAL,
-};
-
-#define V4L2_CID_FLASH_STROBE                   (V4L2_CID_FLASH_CLASS_BASE + 3)
-#define V4L2_CID_FLASH_STROBE_STOP              (V4L2_CID_FLASH_CLASS_BASE + 4)
-#define V4L2_CID_FLASH_STROBE_STATUS            (V4L2_CID_FLASH_CLASS_BASE + 5)
-
-#define V4L2_CID_FLASH_TIMEOUT                  (V4L2_CID_FLASH_CLASS_BASE + 6)
-#define V4L2_CID_FLASH_INTENSITY                (V4L2_CID_FLASH_CLASS_BASE + 7)
-#define V4L2_CID_FLASH_TORCH_INTENSITY          (V4L2_CID_FLASH_CLASS_BASE + 8)
-#define V4L2_CID_FLASH_INDICATOR_INTENSITY      (V4L2_CID_FLASH_CLASS_BASE + 9)
-
-#define V4L2_CID_FLASH_FAULT                    (V4L2_CID_FLASH_CLASS_BASE + 10)
-#define V4L2_FLASH_FAULT_OVER_VOLTAGE           (1 << 0)
-#define V4L2_FLASH_FAULT_TIMEOUT                (1 << 1)
-#define V4L2_FLASH_FAULT_OVER_TEMPERATURE       (1 << 2)
-#define V4L2_FLASH_FAULT_SHORT_CIRCUIT          (1 << 3)
-#define V4L2_FLASH_FAULT_OVER_CURRENT           (1 << 4)
-#define V4L2_FLASH_FAULT_INDICATOR              (1 << 5)
-
-#define V4L2_CID_FLASH_CHARGE                   (V4L2_CID_FLASH_CLASS_BASE + 11)
-#define V4L2_CID_FLASH_READY                    (V4L2_CID_FLASH_CLASS_BASE + 12)
-
-/*  JPEG-class control IDs defined by V4L2 */
-#define V4L2_CID_JPEG_CLASS_BASE                (V4L2_CTRL_CLASS_JPEG | 0x900)
-#define V4L2_CID_JPEG_CLASS                     (V4L2_CTRL_CLASS_JPEG | 1)
-
-#define V4L2_CID_JPEG_CHROMA_SUBSAMPLING        (V4L2_CID_JPEG_CLASS_BASE + 1)
-enum v4l2_jpeg_chroma_subsampling {
-        V4L2_JPEG_CHROMA_SUBSAMPLING_444        = 0,
-        V4L2_JPEG_CHROMA_SUBSAMPLING_422        = 1,
-        V4L2_JPEG_CHROMA_SUBSAMPLING_420        = 2,
-        V4L2_JPEG_CHROMA_SUBSAMPLING_411        = 3,
-        V4L2_JPEG_CHROMA_SUBSAMPLING_410        = 4,
-        V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY       = 5,
-};
-#define V4L2_CID_JPEG_RESTART_INTERVAL          (V4L2_CID_JPEG_CLASS_BASE + 2)
-#define V4L2_CID_JPEG_COMPRESSION_QUALITY       (V4L2_CID_JPEG_CLASS_BASE + 3)
-
-#define V4L2_CID_JPEG_ACTIVE_MARKER             (V4L2_CID_JPEG_CLASS_BASE + 4)
-#define V4L2_JPEG_ACTIVE_MARKER_APP0            (1 << 0)
-#define V4L2_JPEG_ACTIVE_MARKER_APP1            (1 << 1)
-#define V4L2_JPEG_ACTIVE_MARKER_COM             (1 << 16)
-#define V4L2_JPEG_ACTIVE_MARKER_DQT             (1 << 17)
-#define V4L2_JPEG_ACTIVE_MARKER_DHT             (1 << 18)
-
-/* Image source controls */
-#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE        (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
-#define V4L2_CID_IMAGE_SOURCE_CLASS             (V4L2_CTRL_CLASS_IMAGE_SOURCE | 1)
-
-#define V4L2_CID_VBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
-#define V4L2_CID_HBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
-#define V4L2_CID_ANALOGUE_GAIN                  (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
-
-/* Image processing controls */
-#define V4L2_CID_IMAGE_PROC_CLASS_BASE          (V4L2_CTRL_CLASS_IMAGE_PROC | 0x900)
-#define V4L2_CID_IMAGE_PROC_CLASS               (V4L2_CTRL_CLASS_IMAGE_PROC | 1)
-
-#define V4L2_CID_LINK_FREQ                      (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
-#define V4L2_CID_PIXEL_RATE                     (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
-
-/*
- *      T U N I N G
- */
-struct v4l2_tuner {
-        __u32                   index;
-        __u8                    name[32];
-        __u32                   type;   /* enum v4l2_tuner_type */
-        __u32                   capability;
-        __u32                   rangelow;
-        __u32                   rangehigh;
-        __u32                   rxsubchans;
-        __u32                   audmode;
-        __s32                   signal;
-        __s32                   afc;
-        __u32                   reserved[4];
-};
-
-struct v4l2_modulator {
-        __u32                   index;
-        __u8                    name[32];
-        __u32                   capability;
-        __u32                   rangelow;
-        __u32                   rangehigh;
-        __u32                   txsubchans;
-        __u32                   reserved[4];
-};
-
-/*  Flags for the 'capability' field */
-#define V4L2_TUNER_CAP_LOW              0x0001
-#define V4L2_TUNER_CAP_NORM             0x0002
-#define V4L2_TUNER_CAP_HWSEEK_BOUNDED   0x0004
-#define V4L2_TUNER_CAP_HWSEEK_WRAP      0x0008
-#define V4L2_TUNER_CAP_STEREO           0x0010
-#define V4L2_TUNER_CAP_LANG2            0x0020
-#define V4L2_TUNER_CAP_SAP              0x0020
-#define V4L2_TUNER_CAP_LANG1            0x0040
-#define V4L2_TUNER_CAP_RDS              0x0080
-#define V4L2_TUNER_CAP_RDS_BLOCK_IO     0x0100
-#define V4L2_TUNER_CAP_RDS_CONTROLS     0x0200
-#define V4L2_TUNER_CAP_FREQ_BANDS       0x0400
-#define V4L2_TUNER_CAP_HWSEEK_PROG_LIM  0x0800
-
-/*  Flags for the 'rxsubchans' field */
-#define V4L2_TUNER_SUB_MONO             0x0001
-#define V4L2_TUNER_SUB_STEREO           0x0002
-#define V4L2_TUNER_SUB_LANG2            0x0004
-#define V4L2_TUNER_SUB_SAP              0x0004
-#define V4L2_TUNER_SUB_LANG1            0x0008
-#define V4L2_TUNER_SUB_RDS              0x0010
-
-/*  Values for the 'audmode' field */
-#define V4L2_TUNER_MODE_MONO            0x0000
-#define V4L2_TUNER_MODE_STEREO          0x0001
-#define V4L2_TUNER_MODE_LANG2           0x0002
-#define V4L2_TUNER_MODE_SAP             0x0002
-#define V4L2_TUNER_MODE_LANG1           0x0003
-#define V4L2_TUNER_MODE_LANG1_LANG2     0x0004
-
-struct v4l2_frequency {
-        __u32   tuner;
-        __u32   type;   /* enum v4l2_tuner_type */
-        __u32   frequency;
-        __u32   reserved[8];
-};
-
-#define V4L2_BAND_MODULATION_VSB        (1 << 1)
-#define V4L2_BAND_MODULATION_FM         (1 << 2)
-#define V4L2_BAND_MODULATION_AM         (1 << 3)
-
-struct v4l2_frequency_band {
-        __u32   tuner;
-        __u32   type;   /* enum v4l2_tuner_type */
-        __u32   index;
-        __u32   capability;
-        __u32   rangelow;
-        __u32   rangehigh;
-        __u32   modulation;
-        __u32   reserved[9];
-};
-
-struct v4l2_hw_freq_seek {
-        __u32   tuner;
-        __u32   type;   /* enum v4l2_tuner_type */
-        __u32   seek_upward;
-        __u32   wrap_around;
-        __u32   spacing;
-        __u32   rangelow;
-        __u32   rangehigh;
-        __u32   reserved[5];
-};
-
-/*
- *      R D S
- */
-
-struct v4l2_rds_data {
-        __u8    lsb;
-        __u8    msb;
-        __u8    block;
-} __attribute__ ((packed));
-
-#define V4L2_RDS_BLOCK_MSK       0x7
-#define V4L2_RDS_BLOCK_A         0
-#define V4L2_RDS_BLOCK_B         1
-#define V4L2_RDS_BLOCK_C         2
-#define V4L2_RDS_BLOCK_D         3
-#define V4L2_RDS_BLOCK_C_ALT     4
-#define V4L2_RDS_BLOCK_INVALID   7
-
-#define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR     0x80
-
-/*
- *      A U D I O
- */
-struct v4l2_audio {
-        __u32   index;
-        __u8    name[32];
-        __u32   capability;
-        __u32   mode;
-        __u32   reserved[2];
-};
-
-/*  Flags for the 'capability' field */
-#define V4L2_AUDCAP_STEREO              0x00001
-#define V4L2_AUDCAP_AVL                 0x00002
-
-/*  Flags for the 'mode' field */
-#define V4L2_AUDMODE_AVL                0x00001
-
-struct v4l2_audioout {
-        __u32   index;
-        __u8    name[32];
-        __u32   capability;
-        __u32   mode;
-        __u32   reserved[2];
-};
-
-/*
- *      M P E G   S E R V I C E S
- *
- *      NOTE: EXPERIMENTAL API
- */
-#if 1
-#define V4L2_ENC_IDX_FRAME_I    (0)
-#define V4L2_ENC_IDX_FRAME_P    (1)
-#define V4L2_ENC_IDX_FRAME_B    (2)
-#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-
-struct v4l2_enc_idx_entry {
-        __u64 offset;
-        __u64 pts;
-        __u32 length;
-        __u32 flags;
-        __u32 reserved[2];
-};
-
-#define V4L2_ENC_IDX_ENTRIES (64)
-struct v4l2_enc_idx {
-        __u32 entries;
-        __u32 entries_cap;
-        __u32 reserved[4];
-        struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-};
-
-
-#define V4L2_ENC_CMD_START      (0)
-#define V4L2_ENC_CMD_STOP       (1)
-#define V4L2_ENC_CMD_PAUSE      (2)
-#define V4L2_ENC_CMD_RESUME     (3)
-
-/* Flags for V4L2_ENC_CMD_STOP */
-#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-
-struct v4l2_encoder_cmd {
-        __u32 cmd;
-        __u32 flags;
-        union {
-                struct {
-                        __u32 data[8];
-                } raw;
-        };
-};
-
-/* Decoder commands */
-#define V4L2_DEC_CMD_START       (0)
-#define V4L2_DEC_CMD_STOP        (1)
-#define V4L2_DEC_CMD_PAUSE       (2)
-#define V4L2_DEC_CMD_RESUME      (3)
-
-/* Flags for V4L2_DEC_CMD_START */
-#define V4L2_DEC_CMD_START_MUTE_AUDIO   (1 << 0)
-
-/* Flags for V4L2_DEC_CMD_PAUSE */
-#define V4L2_DEC_CMD_PAUSE_TO_BLACK     (1 << 0)
-
-/* Flags for V4L2_DEC_CMD_STOP */
-#define V4L2_DEC_CMD_STOP_TO_BLACK      (1 << 0)
-#define V4L2_DEC_CMD_STOP_IMMEDIATELY   (1 << 1)
-
-/* Play format requirements (returned by the driver): */
-
-/* The decoder has no special format requirements */
-#define V4L2_DEC_START_FMT_NONE         (0)
-/* The decoder requires full GOPs */
-#define V4L2_DEC_START_FMT_GOP          (1)
-
-/* The structure must be zeroed before use by the application
-   This ensures it can be extended safely in the future. */
-struct v4l2_decoder_cmd {
-        __u32 cmd;
-        __u32 flags;
-        union {
-                struct {
-                        __u64 pts;
-                } stop;
-
-                struct {
-                        /* 0 or 1000 specifies normal speed,
-                           1 specifies forward single stepping,
-                           -1 specifies backward single stepping,
-                           >1: playback at speed/1000 of the normal speed,
-                           <-1: reverse playback at (-speed/1000) of the normal speed. */
-                        __s32 speed;
-                        __u32 format;
-                } start;
-
-                struct {
-                        __u32 data[16];
-                } raw;
-        };
-};
-#endif
-
-
-/*
- *      D A T A   S E R V I C E S   ( V B I )
- *
- *      Data services API by Michael Schimek
- */
-
-/* Raw VBI */
-struct v4l2_vbi_format {
-        __u32   sampling_rate;          /* in 1 Hz */
-        __u32   offset;
-        __u32   samples_per_line;
-        __u32   sample_format;          /* V4L2_PIX_FMT_* */
-        __s32   start[2];
-        __u32   count[2];
-        __u32   flags;                  /* V4L2_VBI_* */
-        __u32   reserved[2];            /* must be zero */
-};
-
-/*  VBI flags  */
-#define V4L2_VBI_UNSYNC         (1 << 0)
-#define V4L2_VBI_INTERLACED     (1 << 1)
-
-/* Sliced VBI
- *
- *    This implements is a proposal V4L2 API to allow SLICED VBI
- * required for some hardware encoders. It should change without
- * notice in the definitive implementation.
- */
-
-struct v4l2_sliced_vbi_format {
-        __u16   service_set;
-        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-                                 (equals frame lines 313-336 for 625 line video
-                                  standards, 263-286 for 525 line standards) */
-        __u16   service_lines[2][24];
-        __u32   io_size;
-        __u32   reserved[2];            /* must be zero */
-};
-
-/* Teletext World System Teletext
-   (WST), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_B          (0x0001)
-/* Video Program System, defined on ETS 300 231*/
-#define V4L2_SLICED_VPS                 (0x0400)
-/* Closed Caption, defined on EIA-608 */
-#define V4L2_SLICED_CAPTION_525         (0x1000)
-/* Wide Screen System, defined on ITU-R BT1119.1 */
-#define V4L2_SLICED_WSS_625             (0x4000)
-
-#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-
-struct v4l2_sliced_vbi_cap {
-        __u16   service_set;
-        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-                                 (equals frame lines 313-336 for 625 line video
-                                  standards, 263-286 for 525 line standards) */
-        __u16   service_lines[2][24];
-        __u32   type;           /* enum v4l2_buf_type */
-        __u32   reserved[3];    /* must be 0 */
-};
-
-struct v4l2_sliced_vbi_data {
-        __u32   id;
-        __u32   field;          /* 0: first field, 1: second field */
-        __u32   line;           /* 1-23 */
-        __u32   reserved;       /* must be 0 */
-        __u8    data[48];
-};
-
-/*
- * Sliced VBI data inserted into MPEG Streams
- */
-
-/*
- * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
- *
- * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
- * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
- * data
- *
- * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
- * definitions are not included here.  See the MPEG-2 specifications for details
- * on these headers.
- */
-
-/* Line type IDs */
-#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-
-struct v4l2_mpeg_vbi_itv0_line {
-        __u8 id;        /* One of V4L2_MPEG_VBI_IVTV_* above */
-        __u8 data[42];  /* Sliced VBI data for the line */
-} __attribute__ ((packed));
-
-struct v4l2_mpeg_vbi_itv0 {
-        __le32 linemask[2]; /* Bitmasks of VBI service lines present */
-        struct v4l2_mpeg_vbi_itv0_line line[35];
-} __attribute__ ((packed));
-
-struct v4l2_mpeg_vbi_ITV0 {
-        struct v4l2_mpeg_vbi_itv0_line line[36];
-} __attribute__ ((packed));
-
-#define V4L2_MPEG_VBI_IVTV_MAGIC0       "itv0"
-#define V4L2_MPEG_VBI_IVTV_MAGIC1       "ITV0"
-
-struct v4l2_mpeg_vbi_fmt_ivtv {
-        __u8 magic[4];
-        union {
-                struct v4l2_mpeg_vbi_itv0 itv0;
-                struct v4l2_mpeg_vbi_ITV0 ITV0;
-        };
-} __attribute__ ((packed));
-
-/*
- *      A G G R E G A T E   S T R U C T U R E S
- */
-
-/**
- * struct v4l2_plane_pix_format - additional, per-plane format definition
- * @sizeimage:          maximum size in bytes required for data, for which
- *                      this plane will be used
- * @bytesperline:       distance in bytes between the leftmost pixels in two
- *                      adjacent lines
- */
-struct v4l2_plane_pix_format {
-        __u32           sizeimage;
-        __u16           bytesperline;
-        __u16           reserved[7];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_pix_format_mplane - multiplanar format definition
- * @width:              image width in pixels
- * @height:             image height in pixels
- * @pixelformat:        little endian four character code (fourcc)
- * @field:              enum v4l2_field; field order (for interlaced video)
- * @colorspace:         enum v4l2_colorspace; supplemental to pixelformat
- * @plane_fmt:          per-plane information
- * @num_planes:         number of planes for this format
- */
-struct v4l2_pix_format_mplane {
-        __u32                           width;
-        __u32                           height;
-        __u32                           pixelformat;
-        __u32                           field;
-        __u32                           colorspace;
-
-        struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
-        __u8                            num_planes;
-        __u8                            reserved[11];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_format - stream data format
- * @type:       enum v4l2_buf_type; type of the data stream
- * @pix:        definition of an image format
- * @pix_mp:     definition of a multiplanar image format
- * @win:        definition of an overlaid image
- * @vbi:        raw VBI capture or output parameters
- * @sliced:     sliced VBI capture or output parameters
- * @raw_data:   placeholder for future extensions and custom formats
- */
-struct v4l2_format {
-        __u32    type;
-        union {
-                struct v4l2_pix_format          pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-                struct v4l2_pix_format_mplane   pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-                struct v4l2_window              win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-                struct v4l2_vbi_format          vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-                struct v4l2_sliced_vbi_format   sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-                __u8    raw_data[200];                   /* user-defined */
-        } fmt;
-};
-
-/*      Stream type-dependent parameters
- */
-struct v4l2_streamparm {
-        __u32    type;                  /* enum v4l2_buf_type */
-        union {
-                struct v4l2_captureparm capture;
-                struct v4l2_outputparm  output;
-                __u8    raw_data[200];  /* user-defined */
-        } parm;
-};
-
-/*
- *      E V E N T S
- */
-
-#define V4L2_EVENT_ALL                          0
-#define V4L2_EVENT_VSYNC                        1
-#define V4L2_EVENT_EOS                          2
-#define V4L2_EVENT_CTRL                         3
-#define V4L2_EVENT_FRAME_SYNC                   4
-#define V4L2_EVENT_PRIVATE_START                0x08000000
-
-/* Payload for V4L2_EVENT_VSYNC */
-struct v4l2_event_vsync {
-        /* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-        __u8 field;
-} __attribute__ ((packed));
-
-/* Payload for V4L2_EVENT_CTRL */
-#define V4L2_EVENT_CTRL_CH_VALUE                (1 << 0)
-#define V4L2_EVENT_CTRL_CH_FLAGS                (1 << 1)
-
-struct v4l2_event_ctrl {
-        __u32 changes;
-        __u32 type;
-        union {
-                __s32 value;
-                __s64 value64;
-        };
-        __u32 flags;
-        __s32 minimum;
-        __s32 maximum;
-        __s32 step;
-        __s32 default_value;
-};
-
-struct v4l2_event_frame_sync {
-        __u32 frame_sequence;
-};
-
-struct v4l2_event {
-        __u32                           type;
-        union {
-                struct v4l2_event_vsync         vsync;
-                struct v4l2_event_ctrl          ctrl;
-                struct v4l2_event_frame_sync    frame_sync;
-                __u8                            data[64];
-        } u;
-        __u32                           pending;
-        __u32                           sequence;
-        struct timespec                 timestamp;
-        __u32                           id;
-        __u32                           reserved[8];
-};
-
-#define V4L2_EVENT_SUB_FL_SEND_INITIAL          (1 << 0)
-#define V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK        (1 << 1)
-
-struct v4l2_event_subscription {
-        __u32                           type;
-        __u32                           id;
-        __u32                           flags;
-        __u32                           reserved[5];
-};
-
-/*
- *      A D V A N C E D   D E B U G G I N G
- *
- *      NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
- *      FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
- */
-
-/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-
-#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
-#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
-#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
-
-struct v4l2_dbg_match {
-        __u32 type; /* Match type */
-        union {     /* Match this chip, meaning determined by type */
-                __u32 addr;
-                char name[32];
-        };
-} __attribute__ ((packed));
-
-struct v4l2_dbg_register {
-        struct v4l2_dbg_match match;
-        __u32 size;     /* register size in bytes */
-        __u64 reg;
-        __u64 val;
-} __attribute__ ((packed));
-
-/* VIDIOC_DBG_G_CHIP_IDENT */
-struct v4l2_dbg_chip_ident {
-        struct v4l2_dbg_match match;
-        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-        __u32 revision;    /* chip revision, chip specific */
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
- * @index:      on return, index of the first created buffer
- * @count:      entry: number of requested buffers,
- *              return: number of created buffers
- * @memory:     enum v4l2_memory; buffer memory type
- * @format:     frame format, for which buffers are requested
- * @reserved:   future extensions
- */
-struct v4l2_create_buffers {
-        __u32                   index;
-        __u32                   count;
-        __u32                   memory;
-        struct v4l2_format      format;
-        __u32                   reserved[8];
-};
-
-/*
- *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
- *
- */
-#define VIDIOC_QUERYCAP          _IOR('V',  0, struct v4l2_capability)
-#define VIDIOC_RESERVED           _IO('V',  1)
-#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-#define VIDIOC_G_FMT            _IOWR('V',  4, struct v4l2_format)
-#define VIDIOC_S_FMT            _IOWR('V',  5, struct v4l2_format)
-#define VIDIOC_REQBUFS          _IOWR('V',  8, struct v4l2_requestbuffers)
-#define VIDIOC_QUERYBUF         _IOWR('V',  9, struct v4l2_buffer)
-#define VIDIOC_G_FBUF            _IOR('V', 10, struct v4l2_framebuffer)
-#define VIDIOC_S_FBUF            _IOW('V', 11, struct v4l2_framebuffer)
-#define VIDIOC_OVERLAY           _IOW('V', 14, int)
-#define VIDIOC_QBUF             _IOWR('V', 15, struct v4l2_buffer)
-#define VIDIOC_DQBUF            _IOWR('V', 17, struct v4l2_buffer)
-#define VIDIOC_STREAMON          _IOW('V', 18, int)
-#define VIDIOC_STREAMOFF         _IOW('V', 19, int)
-#define VIDIOC_G_PARM           _IOWR('V', 21, struct v4l2_streamparm)
-#define VIDIOC_S_PARM           _IOWR('V', 22, struct v4l2_streamparm)
-#define VIDIOC_G_STD             _IOR('V', 23, v4l2_std_id)
-#define VIDIOC_S_STD             _IOW('V', 24, v4l2_std_id)
-#define VIDIOC_ENUMSTD          _IOWR('V', 25, struct v4l2_standard)
-#define VIDIOC_ENUMINPUT        _IOWR('V', 26, struct v4l2_input)
-#define VIDIOC_G_CTRL           _IOWR('V', 27, struct v4l2_control)
-#define VIDIOC_S_CTRL           _IOWR('V', 28, struct v4l2_control)
-#define VIDIOC_G_TUNER          _IOWR('V', 29, struct v4l2_tuner)
-#define VIDIOC_S_TUNER           _IOW('V', 30, struct v4l2_tuner)
-#define VIDIOC_G_AUDIO           _IOR('V', 33, struct v4l2_audio)
-#define VIDIOC_S_AUDIO           _IOW('V', 34, struct v4l2_audio)
-#define VIDIOC_QUERYCTRL        _IOWR('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_QUERYMENU        _IOWR('V', 37, struct v4l2_querymenu)
-#define VIDIOC_G_INPUT           _IOR('V', 38, int)
-#define VIDIOC_S_INPUT          _IOWR('V', 39, int)
-#define VIDIOC_G_OUTPUT          _IOR('V', 46, int)
-#define VIDIOC_S_OUTPUT         _IOWR('V', 47, int)
-#define VIDIOC_ENUMOUTPUT       _IOWR('V', 48, struct v4l2_output)
-#define VIDIOC_G_AUDOUT          _IOR('V', 49, struct v4l2_audioout)
-#define VIDIOC_S_AUDOUT          _IOW('V', 50, struct v4l2_audioout)
-#define VIDIOC_G_MODULATOR      _IOWR('V', 54, struct v4l2_modulator)
-#define VIDIOC_S_MODULATOR       _IOW('V', 55, struct v4l2_modulator)
-#define VIDIOC_G_FREQUENCY      _IOWR('V', 56, struct v4l2_frequency)
-#define VIDIOC_S_FREQUENCY       _IOW('V', 57, struct v4l2_frequency)
-#define VIDIOC_CROPCAP          _IOWR('V', 58, struct v4l2_cropcap)
-#define VIDIOC_G_CROP           _IOWR('V', 59, struct v4l2_crop)
-#define VIDIOC_S_CROP            _IOW('V', 60, struct v4l2_crop)
-#define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct v4l2_jpegcompression)
-#define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
-#define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
-#define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
-#define VIDIOC_G_PRIORITY        _IOR('V', 67, __u32) /* enum v4l2_priority */
-#define VIDIOC_S_PRIORITY        _IOW('V', 68, __u32) /* enum v4l2_priority */
-#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-#define VIDIOC_LOG_STATUS         _IO('V', 70)
-#define VIDIOC_G_EXT_CTRLS      _IOWR('V', 71, struct v4l2_ext_controls)
-#define VIDIOC_S_EXT_CTRLS      _IOWR('V', 72, struct v4l2_ext_controls)
-#define VIDIOC_TRY_EXT_CTRLS    _IOWR('V', 73, struct v4l2_ext_controls)
-#if 1
-#define VIDIOC_ENUM_FRAMESIZES  _IOWR('V', 74, struct v4l2_frmsizeenum)
-#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-#endif
-
-#if 1
-/* Experimental, meant for debugging, testing and internal use.
-   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-   You must be root to use these ioctls. Never use these in applications! */
-#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
-#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
-
-/* Experimental, meant for debugging, testing and internal use.
-   Never use this ioctl in applications! */
-#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-#endif
-
-#define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
-
-/* These four DV Preset ioctls are deprecated in favor of the DV Timings
-   ioctls. */
-#define VIDIOC_ENUM_DV_PRESETS  _IOWR('V', 83, struct v4l2_dv_enum_preset)
-#define VIDIOC_S_DV_PRESET      _IOWR('V', 84, struct v4l2_dv_preset)
-#define VIDIOC_G_DV_PRESET      _IOWR('V', 85, struct v4l2_dv_preset)
-#define VIDIOC_QUERY_DV_PRESET  _IOR('V',  86, struct v4l2_dv_preset)
-#define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)
-#define VIDIOC_G_DV_TIMINGS     _IOWR('V', 88, struct v4l2_dv_timings)
-#define VIDIOC_DQEVENT           _IOR('V', 89, struct v4l2_event)
-#define VIDIOC_SUBSCRIBE_EVENT   _IOW('V', 90, struct v4l2_event_subscription)
-#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-
-/* Experimental, the below two ioctls may change over the next couple of kernel
-   versions */
-#define VIDIOC_CREATE_BUFS      _IOWR('V', 92, struct v4l2_create_buffers)
-#define VIDIOC_PREPARE_BUF      _IOWR('V', 93, struct v4l2_buffer)
-
-/* Experimental selection API */
-#define VIDIOC_G_SELECTION      _IOWR('V', 94, struct v4l2_selection)
-#define VIDIOC_S_SELECTION      _IOWR('V', 95, struct v4l2_selection)
-
-/* Experimental, these two ioctls may change over the next couple of kernel
-   versions. */
-#define VIDIOC_DECODER_CMD      _IOWR('V', 96, struct v4l2_decoder_cmd)
-#define VIDIOC_TRY_DECODER_CMD  _IOWR('V', 97, struct v4l2_decoder_cmd)
-
-/* Experimental, these three ioctls may change over the next couple of kernel
-   versions. */
-#define VIDIOC_ENUM_DV_TIMINGS  _IOWR('V', 98, struct v4l2_enum_dv_timings)
-#define VIDIOC_QUERY_DV_TIMINGS  _IOR('V', 99, struct v4l2_dv_timings)
-#define VIDIOC_DV_TIMINGS_CAP   _IOWR('V', 100, struct v4l2_dv_timings_cap)
-
-/* Experimental, this ioctl may change over the next couple of kernel
-   versions. */
-#define VIDIOC_ENUM_FREQ_BANDS  _IOWR('V', 101, struct v4l2_frequency_band)
-
-/* Reminder: when adding new ioctls please add support for them to
-   drivers/media/video/v4l2-compat-ioctl32.c as well! */
-
-#define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
+#include <uapi/linux/videodev2.h>
 
 #endif /* __LINUX_VIDEODEV2_H */
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index a1ba8bbd9fbe..533b1157f22e 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -50,6 +50,8 @@ void *virtqueue_detach_unused_buf(struct virtqueue *vq);
 
 unsigned int virtqueue_get_vring_size(struct virtqueue *vq);
 
+int virtqueue_get_queue_index(struct virtqueue *vq);
+
 /**
  * virtio_device - representation of a device using virtio
  * @index: unique position on the virtio bus
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index fc457f452f64..29b9104232b4 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -1,60 +1,10 @@
 #ifndef _LINUX_VIRTIO_CONFIG_H
 #define _LINUX_VIRTIO_CONFIG_H
-/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
- * anyone can use the definitions to implement compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-
-/* Virtio devices use a standardized configuration space to define their
- * features and pass configuration information, but each implementation can
- * store and access that space differently. */
-#include <linux/types.h>
-
-/* Status byte for guest to report progress, and synchronize features. */
-/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
-#define VIRTIO_CONFIG_S_ACKNOWLEDGE     1
-/* We have found a driver for the device. */
-#define VIRTIO_CONFIG_S_DRIVER          2
-/* Driver has used its parts of the config, and is happy */
-#define VIRTIO_CONFIG_S_DRIVER_OK       4
-/* We've given up on this device. */
-#define VIRTIO_CONFIG_S_FAILED          0x80
-
-/* Some virtio feature bits (currently bits 28 through 31) are reserved for the
- * transport being used (eg. virtio_ring), the rest are per-device feature
- * bits. */
-#define VIRTIO_TRANSPORT_F_START        28
-#define VIRTIO_TRANSPORT_F_END          32
 
-/* Do we get callbacks when the ring is completely used, even if we've
- * suppressed them? */
-#define VIRTIO_F_NOTIFY_ON_EMPTY        24
-
-#ifdef __KERNEL__
 #include <linux/err.h>
 #include <linux/bug.h>
 #include <linux/virtio.h>
+#include <uapi/linux/virtio_config.h>
 
 /**
  * virtio_config_ops - operations for configuring a virtio device
@@ -84,7 +34,9 @@
  *      nvqs: the number of virtqueues to find
  *      vqs: on success, includes new virtqueues
  *      callbacks: array of callbacks, for each virtqueue
+ *              include a NULL entry for vqs that do not need a callback
  *      names: array of virtqueue names (mainly for debugging)
+ *              include a NULL entry for vqs unused by driver
  *      Returns 0 on success or error status
  * @del_vqs: free virtqueues found by find_vqs().
  * @get_features: get the array of feature bits for this device.
@@ -98,6 +50,7 @@
  *      vdev: the virtio_device
  *      This returns a pointer to the bus name a la pci_name from which
  *      the caller can then copy.
+ * @set_vq_affinity: set the affinity for a virtqueue.
  */
 typedef void vq_callback_t(struct virtqueue *);
 struct virtio_config_ops {
@@ -116,6 +69,7 @@ struct virtio_config_ops {
         u32 (*get_features)(struct virtio_device *vdev);
         void (*finalize_features)(struct virtio_device *vdev);
         const char *(*bus_name)(struct virtio_device *vdev);
+        int (*set_vq_affinity)(struct virtqueue *vq, int cpu);
 };
 
 /* If driver didn't advertise the feature, it will never appear. */
@@ -190,5 +144,23 @@ const char *virtio_bus_name(struct virtio_device *vdev)
         return vdev->config->bus_name(vdev);
 }
 
-#endif /* __KERNEL__ */
+/**
+ * virtqueue_set_affinity - setting affinity for a virtqueue
+ * @vq: the virtqueue
+ * @cpu: the cpu no.
+ *
+ * Pay attention the function are best-effort: the affinity hint may not be set
+ * due to config support, irq type and sharing.
+ *
+ */
+static inline
+int virtqueue_set_affinity(struct virtqueue *vq, int cpu)
+{
+        struct virtio_device *vdev = vq->vdev;
+        if (vdev->config->set_vq_affinity)
+                return vdev->config->set_vq_affinity(vq, cpu);
+        return 0;
+}
+
+
 #endif /* _LINUX_VIRTIO_CONFIG_H */
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index bdf4b0034739..d2e2785af602 100644
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -1,8 +1,3 @@
-#ifndef _LINUX_VIRTIO_CONSOLE_H
-#define _LINUX_VIRTIO_CONSOLE_H
-#include <linux/types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
 /*
  * This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
  * anyone can use the definitions to implement compatible drivers/servers:
@@ -34,44 +29,10 @@
  * Copyright (C) Red Hat, Inc., 2009, 2010, 2011
  * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011
  */
+#ifndef _LINUX_VIRTIO_CONSOLE_H
+#define _LINUX_VIRTIO_CONSOLE_H
 
-/* Feature bits */
-#define VIRTIO_CONSOLE_F_SIZE   0       /* Does host provide console size? */
-#define VIRTIO_CONSOLE_F_MULTIPORT 1    /* Does host provide multiple ports? */
-
-#define VIRTIO_CONSOLE_BAD_ID           (~(u32)0)
-
-struct virtio_console_config {
-        /* colums of the screens */
-        __u16 cols;
-        /* rows of the screens */
-        __u16 rows;
-        /* max. number of ports this device can hold */
-        __u32 max_nr_ports;
-} __attribute__((packed));
-
-/*
- * A message that's passed between the Host and the Guest for a
- * particular port.
- */
-struct virtio_console_control {
-        __u32 id;               /* Port number */
-        __u16 event;            /* The kind of control event (see below) */
-        __u16 value;            /* Extra information for the key */
-};
-
-/* Some events for control messages */
-#define VIRTIO_CONSOLE_DEVICE_READY     0
-#define VIRTIO_CONSOLE_PORT_ADD         1
-#define VIRTIO_CONSOLE_PORT_REMOVE      2
-#define VIRTIO_CONSOLE_PORT_READY       3
-#define VIRTIO_CONSOLE_CONSOLE_PORT     4
-#define VIRTIO_CONSOLE_RESIZE           5
-#define VIRTIO_CONSOLE_PORT_OPEN        6
-#define VIRTIO_CONSOLE_PORT_NAME        7
+#include <uapi/linux/virtio_console.h>
 
-#ifdef __KERNEL__
 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_VIRTIO_CONSOLE_H */
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index e338730c2660..63c6ea199519 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -1,171 +1,14 @@
 #ifndef _LINUX_VIRTIO_RING_H
 #define _LINUX_VIRTIO_RING_H
-/* An interface for efficient virtio implementation, currently for use by KVM
- * and lguest, but hopefully others soon.  Do NOT change this since it will
- * break existing servers and clients.
- *
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Copyright Rusty Russell IBM Corporation 2007. */
-#include <linux/types.h>
 
-/* This marks a buffer as continuing via the next field. */
-#define VRING_DESC_F_NEXT       1
-/* This marks a buffer as write-only (otherwise read-only). */
-#define VRING_DESC_F_WRITE      2
-/* This means the buffer contains a list of buffer descriptors. */
-#define VRING_DESC_F_INDIRECT   4
-
-/* The Host uses this in used->flags to advise the Guest: don't kick me when
- * you add a buffer.  It's unreliable, so it's simply an optimization.  Guest
- * will still kick if it's out of buffers. */
-#define VRING_USED_F_NO_NOTIFY  1
-/* The Guest uses this in avail->flags to advise the Host: don't interrupt me
- * when you consume a buffer.  It's unreliable, so it's simply an
- * optimization.  */
-#define VRING_AVAIL_F_NO_INTERRUPT      1
-
-/* We support indirect buffer descriptors */
-#define VIRTIO_RING_F_INDIRECT_DESC     28
-
-/* The Guest publishes the used index for which it expects an interrupt
- * at the end of the avail ring. Host should ignore the avail->flags field. */
-/* The Host publishes the avail index for which it expects a kick
- * at the end of the used ring. Guest should ignore the used->flags field. */
-#define VIRTIO_RING_F_EVENT_IDX         29
-
-/* Virtio ring descriptors: 16 bytes.  These can chain together via "next". */
-struct vring_desc {
-        /* Address (guest-physical). */
-        __u64 addr;
-        /* Length. */
-        __u32 len;
-        /* The flags as indicated above. */
-        __u16 flags;
-        /* We chain unused descriptors via this, too */
-        __u16 next;
-};
-
-struct vring_avail {
-        __u16 flags;
-        __u16 idx;
-        __u16 ring[];
-};
-
-/* u32 is used here for ids for padding reasons. */
-struct vring_used_elem {
-        /* Index of start of used descriptor chain. */
-        __u32 id;
-        /* Total length of the descriptor chain which was used (written to) */
-        __u32 len;
-};
-
-struct vring_used {
-        __u16 flags;
-        __u16 idx;
-        struct vring_used_elem ring[];
-};
-
-struct vring {
-        unsigned int num;
-
-        struct vring_desc *desc;
-
-        struct vring_avail *avail;
-
-        struct vring_used *used;
-};
-
-/* The standard layout for the ring is a continuous chunk of memory which looks
- * like this.  We assume num is a power of 2.
- *
- * struct vring
- * {
- *      // The actual descriptors (16 bytes each)
- *      struct vring_desc desc[num];
- *
- *      // A ring of available descriptor heads with free-running index.
- *      __u16 avail_flags;
- *      __u16 avail_idx;
- *      __u16 available[num];
- *      __u16 used_event_idx;
- *
- *      // Padding to the next align boundary.
- *      char pad[];
- *
- *      // A ring of used descriptor heads with free-running index.
- *      __u16 used_flags;
- *      __u16 used_idx;
- *      struct vring_used_elem used[num];
- *      __u16 avail_event_idx;
- * };
- */
-/* We publish the used event index at the end of the available ring, and vice
- * versa. They are at the end for backwards compatibility. */
-#define vring_used_event(vr) ((vr)->avail->ring[(vr)->num])
-#define vring_avail_event(vr) (*(__u16 *)&(vr)->used->ring[(vr)->num])
-
-static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-                              unsigned long align)
-{
-        vr->num = num;
-        vr->desc = p;
-        vr->avail = p + num*sizeof(struct vring_desc);
-        vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__u16)
-                + align-1) & ~(align - 1));
-}
-
-static inline unsigned vring_size(unsigned int num, unsigned long align)
-{
-        return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (3 + num)
-                 + align - 1) & ~(align - 1))
-                + sizeof(__u16) * 3 + sizeof(struct vring_used_elem) * num;
-}
-
-/* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */
-/* Assuming a given event_idx value from the other size, if
- * we have just incremented index from old to new_idx,
- * should we trigger an event? */
-static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old)
-{
-        /* Note: Xen has similar logic for notification hold-off
-         * in include/xen/interface/io/ring.h with req_event and req_prod
-         * corresponding to event_idx + 1 and new_idx respectively.
-         * Note also that req_event and req_prod in Xen start at 1,
-         * event indexes in virtio start at 0. */
-        return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old);
-}
-
-#ifdef __KERNEL__
 #include <linux/irqreturn.h>
+#include <uapi/linux/virtio_ring.h>
+
 struct virtio_device;
 struct virtqueue;
 
-struct virtqueue *vring_new_virtqueue(unsigned int num,
+struct virtqueue *vring_new_virtqueue(unsigned int index,
+                                      unsigned int num,
                                       unsigned int vring_align,
                                       struct virtio_device *vdev,
                                       bool weak_barriers,
@@ -178,5 +21,4 @@ void vring_del_virtqueue(struct virtqueue *vq);
 void vring_transport_features(struct virtio_device *vdev);
 
 irqreturn_t vring_interrupt(int irq, void *_vq);
-#endif /* __KERNEL__ */
 #endif /* _LINUX_VIRTIO_RING_H */
diff --git a/include/linux/virtio_scsi.h b/include/linux/virtio_scsi.h
index dc8d305b0e05..d6b4440387b7 100644
--- a/include/linux/virtio_scsi.h
+++ b/include/linux/virtio_scsi.h
@@ -72,6 +72,7 @@ struct virtio_scsi_config {
 /* Feature Bits */
 #define VIRTIO_SCSI_F_INOUT                    0
 #define VIRTIO_SCSI_F_HOTPLUG                  1
+#define VIRTIO_SCSI_F_CHANGE                   2
 
 /* Response codes */
 #define VIRTIO_SCSI_S_OK                       0
@@ -108,6 +109,7 @@ struct virtio_scsi_config {
 #define VIRTIO_SCSI_T_NO_EVENT                 0
 #define VIRTIO_SCSI_T_TRANSPORT_RESET          1
 #define VIRTIO_SCSI_T_ASYNC_NOTIFY             2
+#define VIRTIO_SCSI_T_PARAM_CHANGE             3
 
 /* Reasons of transport reset event */
 #define VIRTIO_SCSI_EVT_RESET_HARD             0
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index 57f7b1091511..3d3114594370 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -52,7 +52,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                 UNEVICTABLE_PGMUNLOCKED,
                 UNEVICTABLE_PGCLEARED,  /* on COW, page truncate */
                 UNEVICTABLE_PGSTRANDED, /* unable to isolate on unlock */
-                UNEVICTABLE_MLOCKFREED,
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                 THP_FAULT_ALLOC,
                 THP_FAULT_FALLBACK,
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index ad2cfd53dadc..92a86b2cce33 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -198,6 +198,8 @@ extern void __dec_zone_state(struct zone *, enum zone_stat_item);
 void refresh_cpu_vm_stats(int);
 void refresh_zone_stat_thresholds(void);
 
+void drain_zonestat(struct zone *zone, struct per_cpu_pageset *);
+
 int calculate_pressure_threshold(struct zone *zone);
 int calculate_normal_threshold(struct zone *zone);
 void set_pgdat_percpu_threshold(pg_data_t *pgdat,
@@ -251,8 +253,18 @@ static inline void __dec_zone_page_state(struct page *page,
 static inline void refresh_cpu_vm_stats(int cpu) { }
 static inline void refresh_zone_stat_thresholds(void) { }
 
+static inline void drain_zonestat(struct zone *zone,
+                        struct per_cpu_pageset *pset) { }
 #endif          /* CONFIG_SMP */
 
+static inline void __mod_zone_freepage_state(struct zone *zone, int nr_pages,
+                                             int migratetype)
+{
+        __mod_zone_page_state(zone, NR_FREE_PAGES, nr_pages);
+        if (is_migrate_cma(migratetype))
+                __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, nr_pages);
+}
+
 extern const char * const vmstat_text[];
 
 #endif /* _LINUX_VMSTAT_H */
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 30a8dd9c83ff..b186e0435239 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -1,90 +1,8 @@
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
 
+#include <uapi/linux/vt.h>
 
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES 63      /* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */
-                /* Note: the ioctl VT_GETSTATE does not work for
-                   consoles 16 and higher (since it returns a short) */
-
-/* 0x56 is 'V', to avoid collision with termios and kd */
-
-#define VT_OPENQRY      0x5600  /* find available vt */
-
-struct vt_mode {
-        char mode;              /* vt mode */
-        char waitv;             /* if set, hang on writes if not active */
-        short relsig;           /* signal to raise on release req */
-        short acqsig;           /* signal to raise on acquisition */
-        short frsig;            /* unused (set to 0) */
-};
-#define VT_GETMODE      0x5601  /* get mode of active vt */
-#define VT_SETMODE      0x5602  /* set mode of active vt */
-#define         VT_AUTO         0x00    /* auto vt switching */
-#define         VT_PROCESS      0x01    /* process controls switching */
-#define         VT_ACKACQ       0x02    /* acknowledge switch */
-
-struct vt_stat {
-        unsigned short v_active;        /* active vt */
-        unsigned short v_signal;        /* signal to send */
-        unsigned short v_state;         /* vt bitmask */
-};
-#define VT_GETSTATE     0x5603  /* get global vt state info */
-#define VT_SENDSIG      0x5604  /* signal to send to bitmask of vts */
-
-#define VT_RELDISP      0x5605  /* release display */
-
-#define VT_ACTIVATE     0x5606  /* make vt active */
-#define VT_WAITACTIVE   0x5607  /* wait for vt active */
-#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
-
-struct vt_sizes {
-        unsigned short v_rows;          /* number of rows */
-        unsigned short v_cols;          /* number of columns */
-        unsigned short v_scrollsize;    /* number of lines of scrollback */
-};
-#define VT_RESIZE       0x5609  /* set kernel's idea of screensize */
-
-struct vt_consize {
-        unsigned short v_rows;  /* number of rows */
-        unsigned short v_cols;  /* number of columns */
-        unsigned short v_vlin;  /* number of pixel rows on screen */
-        unsigned short v_clin;  /* number of pixel rows per character */
-        unsigned short v_vcol;  /* number of pixel columns on screen */
-        unsigned short v_ccol;  /* number of pixel columns per character */
-};
-#define VT_RESIZEX      0x560A  /* set kernel's idea of screensize + more */
-#define VT_LOCKSWITCH   0x560B  /* disallow vt switching */
-#define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
-#define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
-
-struct vt_event {
-        unsigned int event;
-#define VT_EVENT_SWITCH         0x0001  /* Console switch */
-#define VT_EVENT_BLANK          0x0002  /* Screen blank */
-#define VT_EVENT_UNBLANK        0x0004  /* Screen unblank */
-#define VT_EVENT_RESIZE         0x0008  /* Resize display */
-#define VT_MAX_EVENT            0x000F
-        unsigned int oldev;             /* Old console */
-        unsigned int newev;             /* New console (if changing) */
-        unsigned int pad[4];            /* Padding for expansion */
-};
-
-#define VT_WAITEVENT    0x560E  /* Wait for an event */
-
-struct vt_setactivate {
-        unsigned int console;
-        struct vt_mode mode;
-};
-
-#define VT_SETACTIVATE  0x560F  /* Activate and set the mode of a console */
-
-#ifdef __KERNEL__
 
 /* Virtual Terminal events. */
 #define VT_ALLOCATE             0x0001 /* Console got allocated */
@@ -106,8 +24,4 @@ static inline int vt_kmsg_redirect(int new)
 
 #endif
 
-#endif /* __KERNEL__ */
-
-#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
-
 #endif /* _LINUX_VT_H */
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 1dee81c41ff1..168dfe122dd3 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -1,28 +1,12 @@
 #ifndef _LINUX_WAIT_H
 #define _LINUX_WAIT_H
 
-#define WNOHANG         0x00000001
-#define WUNTRACED       0x00000002
-#define WSTOPPED        WUNTRACED
-#define WEXITED         0x00000004
-#define WCONTINUED      0x00000008
-#define WNOWAIT         0x01000000      /* Don't reap, just poll status.  */
-
-#define __WNOTHREAD     0x20000000      /* Don't wait on children of other threads in this group */
-#define __WALL          0x40000000      /* Wait on all children, regardless of type */
-#define __WCLONE        0x80000000      /* Wait only on non-SIGCHLD children */
-
-/* First argument to waitid: */
-#define P_ALL           0
-#define P_PID           1
-#define P_PGID          2
-
-#ifdef __KERNEL__
 
 #include <linux/list.h>
 #include <linux/stddef.h>
 #include <linux/spinlock.h>
 #include <asm/current.h>
+#include <uapi/linux/wait.h>
 
 typedef struct __wait_queue wait_queue_t;
 typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
@@ -663,6 +647,4 @@ static inline int wait_on_bit_lock(void *word, int bit,
         return out_of_line_wait_on_bit_lock(word, bit, action, mode);
 }
         
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
index 3157cc1fada6..cec4b4159767 100644
--- a/include/linux/wanrouter.h
+++ b/include/linux/wanrouter.h
@@ -43,413 +43,11 @@
 * Jan 16, 1997  Gene Kozin      router_devlist made public
 * Jan 02, 1997  Gene Kozin      Initial version (based on wanpipe.h).
 *****************************************************************************/
-
 #ifndef _ROUTER_H
 #define _ROUTER_H
 
-#define ROUTER_NAME     "wanrouter"     /* in case we ever change it */
-#define ROUTER_VERSION  1               /* version number */
-#define ROUTER_RELEASE  1               /* release (minor version) number */
-#define ROUTER_IOCTL    'W'             /* for IOCTL calls */
-#define ROUTER_MAGIC    0x524D4157L     /* signature: 'WANR' reversed */
-
-/* IOCTL codes for /proc/router/<device> entries (up to 255) */
-enum router_ioctls
-{
-        ROUTER_SETUP    = ROUTER_IOCTL<<8,      /* configure device */
-        ROUTER_DOWN,                            /* shut down device */
-        ROUTER_STAT,                            /* get device status */
-        ROUTER_IFNEW,                           /* add interface */
-        ROUTER_IFDEL,                           /* delete interface */
-        ROUTER_IFSTAT,                          /* get interface status */
-        ROUTER_USER     = (ROUTER_IOCTL<<8)+16, /* driver-specific calls */
-        ROUTER_USER_MAX = (ROUTER_IOCTL<<8)+31
-};
-
-/* identifiers for displaying proc file data for dual port adapters */
-#define PROC_DATA_PORT_0 0x8000 /* the data is for port 0 */
-#define PROC_DATA_PORT_1 0x8001 /* the data is for port 1 */
-
-/* NLPID for packet encapsulation (ISO/IEC TR 9577) */
-#define NLPID_IP        0xCC    /* Internet Protocol Datagram */
-#define NLPID_SNAP      0x80    /* IEEE Subnetwork Access Protocol */
-#define NLPID_CLNP      0x81    /* ISO/IEC 8473 */
-#define NLPID_ESIS      0x82    /* ISO/IEC 9542 */
-#define NLPID_ISIS      0x83    /* ISO/IEC ISIS */
-#define NLPID_Q933      0x08    /* CCITT Q.933 */
-
-/* Miscellaneous */
-#define WAN_IFNAME_SZ   15      /* max length of the interface name */
-#define WAN_DRVNAME_SZ  15      /* max length of the link driver name */
-#define WAN_ADDRESS_SZ  31      /* max length of the WAN media address */
-#define USED_BY_FIELD   8       /* max length of the used by field */
-
-/* Defines for UDP PACKET TYPE */
-#define UDP_PTPIPE_TYPE         0x01
-#define UDP_FPIPE_TYPE          0x02
-#define UDP_CPIPE_TYPE          0x03
-#define UDP_DRVSTATS_TYPE       0x04
-#define UDP_INVALID_TYPE        0x05
-
-/* Command return code */
-#define CMD_OK          0               /* normal firmware return code */
-#define CMD_TIMEOUT     0xFF            /* firmware command timed out */
-
-/* UDP Packet Management */
-#define UDP_PKT_FRM_STACK       0x00
-#define UDP_PKT_FRM_NETWORK     0x01
-
-/* Maximum interrupt test counter */
-#define MAX_INTR_TEST_COUNTER   100
-
-/* Critical Values for RACE conditions*/
-#define CRITICAL_IN_ISR         0xA1
-#define CRITICAL_INTR_HANDLED   0xB1
-
-/****** Data Types **********************************************************/
-
-/*----------------------------------------------------------------------------
- * X.25-specific link-level configuration.
- */
-typedef struct wan_x25_conf
-{
-        unsigned lo_pvc;        /* lowest permanent circuit number */
-        unsigned hi_pvc;        /* highest permanent circuit number */
-        unsigned lo_svc;        /* lowest switched circuit number */
-        unsigned hi_svc;        /* highest switched circuit number */
-        unsigned hdlc_window;   /* HDLC window size (1..7) */
-        unsigned pkt_window;    /* X.25 packet window size (1..7) */
-        unsigned t1;            /* HDLC timer T1, sec (1..30) */
-        unsigned t2;            /* HDLC timer T2, sec (0..29) */
-        unsigned t4;            /* HDLC supervisory frame timer = T4 * T1 */
-        unsigned n2;            /* HDLC retransmission limit (1..30) */
-        unsigned t10_t20;       /* X.25 RESTART timeout, sec (1..255) */
-        unsigned t11_t21;       /* X.25 CALL timeout, sec (1..255) */
-        unsigned t12_t22;       /* X.25 RESET timeout, sec (1..255) */
-        unsigned t13_t23;       /* X.25 CLEAR timeout, sec (1..255) */
-        unsigned t16_t26;       /* X.25 INTERRUPT timeout, sec (1..255) */
-        unsigned t28;           /* X.25 REGISTRATION timeout, sec (1..255) */
-        unsigned r10_r20;       /* RESTART retransmission limit (0..250) */
-        unsigned r12_r22;       /* RESET retransmission limit (0..250) */
-        unsigned r13_r23;       /* CLEAR retransmission limit (0..250) */
-        unsigned ccitt_compat;  /* compatibility mode: 1988/1984/1980 */
-        unsigned x25_conf_opt;   /* User defined x25 config optoins */
-        unsigned char LAPB_hdlc_only; /* Run in HDLC only mode */
-        unsigned char logging;   /* Control connection logging */  
-        unsigned char oob_on_modem; /* Whether to send modem status to the user app */
-} wan_x25_conf_t;
-
-/*----------------------------------------------------------------------------
- * Frame relay specific link-level configuration.
- */
-typedef struct wan_fr_conf
-{
-        unsigned signalling;    /* local in-channel signalling type */
-        unsigned t391;          /* link integrity verification timer */
-        unsigned t392;          /* polling verification timer */
-        unsigned n391;          /* full status polling cycle counter */
-        unsigned n392;          /* error threshold counter */
-        unsigned n393;          /* monitored events counter */
-        unsigned dlci_num;      /* number of DLCs (access node) */
-        unsigned  dlci[100];    /* List of all DLCIs */
-} wan_fr_conf_t;
-
-/*----------------------------------------------------------------------------
- * PPP-specific link-level configuration.
- */
-typedef struct wan_ppp_conf
-{
-        unsigned restart_tmr;   /* restart timer */
-        unsigned auth_rsrt_tmr; /* authentication timer */
-        unsigned auth_wait_tmr; /* authentication timer */
-        unsigned mdm_fail_tmr;  /* modem failure timer */
-        unsigned dtr_drop_tmr;  /* DTR drop timer */
-        unsigned connect_tmout; /* connection timeout */
-        unsigned conf_retry;    /* max. retry */
-        unsigned term_retry;    /* max. retry */
-        unsigned fail_retry;    /* max. retry */
-        unsigned auth_retry;    /* max. retry */
-        unsigned auth_options;  /* authentication opt. */
-        unsigned ip_options;    /* IP options */
-        char    authenticator;  /* AUTHENTICATOR or not */
-        char    ip_mode;        /* Static/Host/Peer */
-} wan_ppp_conf_t;
-
-/*----------------------------------------------------------------------------
- * CHDLC-specific link-level configuration.
- */
-typedef struct wan_chdlc_conf
-{
-        unsigned char ignore_dcd;       /* Protocol options:            */
-        unsigned char ignore_cts;       /*  Ignore these to determine   */
-        unsigned char ignore_keepalive; /*  link status (Yes or No)     */
-        unsigned char hdlc_streaming;   /*  hdlc_streaming mode (Y/N) */
-        unsigned char receive_only;     /*  no transmit buffering (Y/N) */
-        unsigned keepalive_tx_tmr;      /* transmit keepalive timer */
-        unsigned keepalive_rx_tmr;      /* receive  keepalive timer */
-        unsigned keepalive_err_margin;  /* keepalive_error_tolerance */
-        unsigned slarp_timer;           /* SLARP request timer */
-} wan_chdlc_conf_t;
-
-
-/*----------------------------------------------------------------------------
- * WAN device configuration. Passed to ROUTER_SETUP IOCTL.
- */
-typedef struct wandev_conf
-{
-        unsigned magic;         /* magic number (for verification) */
-        unsigned config_id;     /* configuration structure identifier */
-                                /****** hardware configuration ******/
-        unsigned ioport;        /* adapter I/O port base */
-        unsigned long maddr;    /* dual-port memory address */
-        unsigned msize;         /* dual-port memory size */
-        int irq;                /* interrupt request level */
-        int dma;                /* DMA request level */
-        char S514_CPU_no[1];    /* S514 PCI adapter CPU number ('A' or 'B') */
-        unsigned PCI_slot_no;   /* S514 PCI adapter slot number */
-        char auto_pci_cfg;      /* S515 PCI automatic slot detection */
-        char comm_port;         /* Communication Port (PRI=0, SEC=1) */ 
-        unsigned bps;           /* data transfer rate */
-        unsigned mtu;           /* maximum transmit unit size */
-        unsigned udp_port;      /* UDP port for management */
-        unsigned char ttl;      /* Time To Live for UDP security */
-        unsigned char ft1;      /* FT1 Configurator Option */
-        char interface;         /* RS-232/V.35, etc. */
-        char clocking;          /* external/internal */
-        char line_coding;       /* NRZ/NRZI/FM0/FM1, etc. */
-        char station;           /* DTE/DCE, primary/secondary, etc. */
-        char connection;        /* permanent/switched/on-demand */
-        char read_mode;         /* read mode: Polling or interrupt */
-        char receive_only;      /* disable tx buffers */
-        char tty;               /* Create a fake tty device */
-        unsigned tty_major;     /* Major number for wanpipe tty device */
-        unsigned tty_minor;     /* Minor number for wanpipe tty device */
-        unsigned tty_mode;      /* TTY operation mode SYNC or ASYNC */
-        char backup;            /* Backup Mode */
-        unsigned hw_opt[4];     /* other hardware options */
-        unsigned reserved[4];
-                                /****** arbitrary data ***************/
-        unsigned data_size;     /* data buffer size */
-        void* data;             /* data buffer, e.g. firmware */
-        union                   /****** protocol-specific ************/
-        {
-                wan_x25_conf_t x25;     /* X.25 configuration */
-                wan_ppp_conf_t ppp;     /* PPP configuration */
-                wan_fr_conf_t fr;       /* frame relay configuration */
-                wan_chdlc_conf_t chdlc; /* Cisco HDLC configuration */
-        } u;
-} wandev_conf_t;
-
-/* 'config_id' definitions */
-#define WANCONFIG_X25   101     /* X.25 link */
-#define WANCONFIG_FR    102     /* frame relay link */
-#define WANCONFIG_PPP   103     /* synchronous PPP link */
-#define WANCONFIG_CHDLC 104     /* Cisco HDLC Link */
-#define WANCONFIG_BSC   105     /* BiSync Streaming */
-#define WANCONFIG_HDLC  106     /* HDLC Support */
-#define WANCONFIG_MPPP  107     /* Multi Port PPP over RAW CHDLC */
-
-/*
- * Configuration options defines.
- */
-/* general options */
-#define WANOPT_OFF      0
-#define WANOPT_ON       1
-#define WANOPT_NO       0
-#define WANOPT_YES      1
-
-/* intercace options */
-#define WANOPT_RS232    0
-#define WANOPT_V35      1
-
-/* data encoding options */
-#define WANOPT_NRZ      0
-#define WANOPT_NRZI     1
-#define WANOPT_FM0      2
-#define WANOPT_FM1      3
-
-/* link type options */
-#define WANOPT_POINTTOPOINT     0       /* RTS always active */
-#define WANOPT_MULTIDROP        1       /* RTS is active when transmitting */
-
-/* clocking options */
-#define WANOPT_EXTERNAL 0
-#define WANOPT_INTERNAL 1
-
-/* station options */
-#define WANOPT_DTE              0
-#define WANOPT_DCE              1
-#define WANOPT_CPE              0
-#define WANOPT_NODE             1
-#define WANOPT_SECONDARY        0
-#define WANOPT_PRIMARY          1
-
-/* connection options */
-#define WANOPT_PERMANENT        0       /* DTR always active */
-#define WANOPT_SWITCHED         1       /* use DTR to setup link (dial-up) */
-#define WANOPT_ONDEMAND         2       /* activate DTR only before sending */
-
-/* frame relay in-channel signalling */
-#define WANOPT_FR_ANSI          1       /* ANSI T1.617 Annex D */
-#define WANOPT_FR_Q933          2       /* ITU Q.933A */
-#define WANOPT_FR_LMI           3       /* LMI */
-
-/* PPP IP Mode Options */
-#define WANOPT_PPP_STATIC       0
-#define WANOPT_PPP_HOST         1
-#define WANOPT_PPP_PEER         2
-
-/* ASY Mode Options */
-#define WANOPT_ONE              1
-#define WANOPT_TWO              2
-#define WANOPT_ONE_AND_HALF     3
-
-#define WANOPT_NONE     0
-#define WANOPT_ODD      1
-#define WANOPT_EVEN     2
-
-/* CHDLC Protocol Options */
-/* DF Commented out for now.
-
-#define WANOPT_CHDLC_NO_DCD             IGNORE_DCD_FOR_LINK_STAT
-#define WANOPT_CHDLC_NO_CTS             IGNORE_CTS_FOR_LINK_STAT
-#define WANOPT_CHDLC_NO_KEEPALIVE       IGNORE_KPALV_FOR_LINK_STAT
-*/
-
-/* Port options */
-#define WANOPT_PRI 0
-#define WANOPT_SEC 1
-/* read mode */
-#define WANOPT_INTR     0
-#define WANOPT_POLL     1
-
-
-#define WANOPT_TTY_SYNC  0
-#define WANOPT_TTY_ASYNC 1
-/*----------------------------------------------------------------------------
- * WAN Link Status Info (for ROUTER_STAT IOCTL).
- */
-typedef struct wandev_stat
-{
-        unsigned state;         /* link state */
-        unsigned ndev;          /* number of configured interfaces */
-
-        /* link/interface configuration */
-        unsigned connection;    /* permanent/switched/on-demand */
-        unsigned media_type;    /* Frame relay/PPP/X.25/SDLC, etc. */
-        unsigned mtu;           /* max. transmit unit for this device */
-
-        /* physical level statistics */
-        unsigned modem_status;  /* modem status */
-        unsigned rx_frames;     /* received frames count */
-        unsigned rx_overruns;   /* receiver overrun error count */
-        unsigned rx_crc_err;    /* receive CRC error count */
-        unsigned rx_aborts;     /* received aborted frames count */
-        unsigned rx_bad_length; /* unexpetedly long/short frames count */
-        unsigned rx_dropped;    /* frames discarded at device level */
-        unsigned tx_frames;     /* transmitted frames count */
-        unsigned tx_underruns;  /* aborted transmissions (underruns) count */
-        unsigned tx_timeouts;   /* transmission timeouts */
-        unsigned tx_rejects;    /* other transmit errors */
-
-        /* media level statistics */
-        unsigned rx_bad_format; /* frames with invalid format */
-        unsigned rx_bad_addr;   /* frames with invalid media address */
-        unsigned tx_retries;    /* frames re-transmitted */
-        unsigned reserved[16];  /* reserved for future use */
-} wandev_stat_t;
-
-/* 'state' defines */
-enum wan_states
-{
-        WAN_UNCONFIGURED,       /* link/channel is not configured */
-        WAN_DISCONNECTED,       /* link/channel is disconnected */
-        WAN_CONNECTING,         /* connection is in progress */
-        WAN_CONNECTED,          /* link/channel is operational */
-        WAN_LIMIT,              /* for verification only */
-        WAN_DUALPORT,           /* for Dual Port cards */
-        WAN_DISCONNECTING,
-        WAN_FT1_READY           /* FT1 Configurator Ready */
-};
-
-enum {
-        WAN_LOCAL_IP,
-        WAN_POINTOPOINT_IP,
-        WAN_NETMASK_IP,
-        WAN_BROADCAST_IP
-};
-
-/* 'modem_status' masks */
-#define WAN_MODEM_CTS   0x0001  /* CTS line active */
-#define WAN_MODEM_DCD   0x0002  /* DCD line active */
-#define WAN_MODEM_DTR   0x0010  /* DTR line active */
-#define WAN_MODEM_RTS   0x0020  /* RTS line active */
-
-/*----------------------------------------------------------------------------
- * WAN interface (logical channel) configuration (for ROUTER_IFNEW IOCTL).
- */
-typedef struct wanif_conf
-{
-        unsigned magic;                 /* magic number */
-        unsigned config_id;             /* configuration identifier */
-        char name[WAN_IFNAME_SZ+1];     /* interface name, ASCIIZ */
-        char addr[WAN_ADDRESS_SZ+1];    /* media address, ASCIIZ */
-        char usedby[USED_BY_FIELD];     /* used by API or WANPIPE */
-        unsigned idle_timeout;          /* sec, before disconnecting */
-        unsigned hold_timeout;          /* sec, before re-connecting */
-        unsigned cir;                   /* Committed Information Rate fwd,bwd*/
-        unsigned bc;                    /* Committed Burst Size fwd, bwd */
-        unsigned be;                    /* Excess Burst Size fwd, bwd */ 
-        unsigned char enable_IPX;       /* Enable or Disable IPX */
-        unsigned char inarp;            /* Send Inverse ARP requests Y/N */
-        unsigned inarp_interval;        /* sec, between InARP requests */
-        unsigned long network_number;   /* Network Number for IPX */
-        char mc;                        /* Multicast on or off */
-        char local_addr[WAN_ADDRESS_SZ+1];/* local media address, ASCIIZ */
-        unsigned char port;             /* board port */
-        unsigned char protocol;         /* prococol used in this channel (TCPOX25 or X25) */
-        char pap;                       /* PAP enabled or disabled */
-        char chap;                      /* CHAP enabled or disabled */
-        unsigned char userid[511];      /* List of User Id */
-        unsigned char passwd[511];      /* List of passwords */
-        unsigned char sysname[31];      /* Name of the system */
-        unsigned char ignore_dcd;       /* Protocol options: */
-        unsigned char ignore_cts;       /*  Ignore these to determine */
-        unsigned char ignore_keepalive; /*  link status (Yes or No) */
-        unsigned char hdlc_streaming;   /*  Hdlc streaming mode (Y/N) */
-        unsigned keepalive_tx_tmr;      /* transmit keepalive timer */
-        unsigned keepalive_rx_tmr;      /* receive  keepalive timer */
-        unsigned keepalive_err_margin;  /* keepalive_error_tolerance */
-        unsigned slarp_timer;           /* SLARP request timer */
-        unsigned char ttl;              /* Time To Live for UDP security */
-        char interface;                 /* RS-232/V.35, etc. */
-        char clocking;                  /* external/internal */
-        unsigned bps;                   /* data transfer rate */
-        unsigned mtu;                   /* maximum transmit unit size */
-        unsigned char if_down;          /* brind down interface when disconnected */
-        unsigned char gateway;          /* Is this interface a gateway */
-        unsigned char true_if_encoding; /* Set the dev->type to true board protocol */
-
-        unsigned char asy_data_trans;     /* async API options */
-        unsigned char rts_hs_for_receive; /* async Protocol options */
-        unsigned char xon_xoff_hs_for_receive;
-        unsigned char xon_xoff_hs_for_transmit;
-        unsigned char dcd_hs_for_transmit;
-        unsigned char cts_hs_for_transmit;
-        unsigned char async_mode;
-        unsigned tx_bits_per_char;
-        unsigned rx_bits_per_char;
-        unsigned stop_bits;  
-        unsigned char parity;
-        unsigned break_timer;
-        unsigned inter_char_timer;
-        unsigned rx_complete_length;
-        unsigned xon_char;
-        unsigned xoff_char;
-        unsigned char receive_only;     /*  no transmit buffering (Y/N) */
-} wanif_conf_t;
+#include <uapi/linux/wanrouter.h>
 
-#ifdef  __KERNEL__
 /****** Kernel Interface ****************************************************/
 
 #include <linux/fs.h>           /* support for device drivers */
@@ -528,5 +126,4 @@ extern long wanrouter_ioctl(struct file *file, unsigned int cmd, unsigned long a
 /* list of registered devices */
 extern struct wan_device *wanrouter_router_devlist;
 
-#endif  /* __KERNEL__ */
 #endif  /* _ROUTER_H */
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index da70f0facd2b..b7f45d48b2de 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -5,59 +5,14 @@
  * by Ken Hollis <khollis@bitgate.com>
  *
  */
-
 #ifndef _LINUX_WATCHDOG_H
 #define _LINUX_WATCHDOG_H
 
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-#define WATCHDOG_IOCTL_BASE     'W'
-
-struct watchdog_info {
-        __u32 options;          /* Options the card/driver supports */
-        __u32 firmware_version; /* Firmware version of the card */
-        __u8  identity[32];     /* Identity of the board */
-};
-
-#define WDIOC_GETSUPPORT        _IOR(WATCHDOG_IOCTL_BASE, 0, struct watchdog_info)
-#define WDIOC_GETSTATUS         _IOR(WATCHDOG_IOCTL_BASE, 1, int)
-#define WDIOC_GETBOOTSTATUS     _IOR(WATCHDOG_IOCTL_BASE, 2, int)
-#define WDIOC_GETTEMP           _IOR(WATCHDOG_IOCTL_BASE, 3, int)
-#define WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
-#define WDIOC_KEEPALIVE         _IOR(WATCHDOG_IOCTL_BASE, 5, int)
-#define WDIOC_SETTIMEOUT        _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
-#define WDIOC_GETTIMEOUT        _IOR(WATCHDOG_IOCTL_BASE, 7, int)
-#define WDIOC_SETPRETIMEOUT     _IOWR(WATCHDOG_IOCTL_BASE, 8, int)
-#define WDIOC_GETPRETIMEOUT     _IOR(WATCHDOG_IOCTL_BASE, 9, int)
-#define WDIOC_GETTIMELEFT       _IOR(WATCHDOG_IOCTL_BASE, 10, int)
-
-#define WDIOF_UNKNOWN           -1      /* Unknown flag error */
-#define WDIOS_UNKNOWN           -1      /* Unknown status error */
-
-#define WDIOF_OVERHEAT          0x0001  /* Reset due to CPU overheat */
-#define WDIOF_FANFAULT          0x0002  /* Fan failed */
-#define WDIOF_EXTERN1           0x0004  /* External relay 1 */
-#define WDIOF_EXTERN2           0x0008  /* External relay 2 */
-#define WDIOF_POWERUNDER        0x0010  /* Power bad/power fault */
-#define WDIOF_CARDRESET         0x0020  /* Card previously reset the CPU */
-#define WDIOF_POWEROVER         0x0040  /* Power over voltage */
-#define WDIOF_SETTIMEOUT        0x0080  /* Set timeout (in seconds) */
-#define WDIOF_MAGICCLOSE        0x0100  /* Supports magic close char */
-#define WDIOF_PRETIMEOUT        0x0200  /* Pretimeout (in seconds), get/set */
-#define WDIOF_ALARMONLY         0x0400  /* Watchdog triggers a management or
-                                           other external alarm not a reboot */
-#define WDIOF_KEEPALIVEPING     0x8000  /* Keep alive ping reply */
-
-#define WDIOS_DISABLECARD       0x0001  /* Turn off the watchdog timer */
-#define WDIOS_ENABLECARD        0x0002  /* Turn on the watchdog timer */
-#define WDIOS_TEMPPANIC         0x0004  /* Kernel panic on temperature trip */
-
-#ifdef __KERNEL__
 
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/cdev.h>
+#include <uapi/linux/watchdog.h>
 
 struct watchdog_ops;
 struct watchdog_device;
@@ -178,6 +133,4 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd)
 extern int watchdog_register_device(struct watchdog_device *);
 extern void watchdog_unregister_device(struct watchdog_device *);
 
-#endif  /* __KERNEL__ */
-
 #endif  /* ifndef _LINUX_WATCHDOG_H */
diff --git a/include/linux/wimax/Kbuild b/include/linux/wimax/Kbuild
deleted file mode 100644
index 3cb4f269bb09..000000000000
--- a/include/linux/wimax/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += i2400m.h
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 4395b28bb86c..4ea4c6e2383d 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -6,690 +6,11 @@
  * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
  * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
  */
-
 #ifndef _LINUX_WIRELESS_H
 #define _LINUX_WIRELESS_H
 
-/************************** DOCUMENTATION **************************/
-/*
- * Initial APIs (1996 -> onward) :
- * -----------------------------
- * Basically, the wireless extensions are for now a set of standard ioctl
- * call + /proc/net/wireless
- *
- * The entry /proc/net/wireless give statistics and information on the
- * driver.
- * This is better than having each driver having its entry because
- * its centralised and we may remove the driver module safely.
- *
- * Ioctl are used to configure the driver and issue commands.  This is
- * better than command line options of insmod because we may want to
- * change dynamically (while the driver is running) some parameters.
- *
- * The ioctl mechanimsm are copied from standard devices ioctl.
- * We have the list of command plus a structure descibing the
- * data exchanged...
- * Note that to add these ioctl, I was obliged to modify :
- *      # net/core/dev.c (two place + add include)
- *      # net/ipv4/af_inet.c (one place + add include)
- *
- * /proc/net/wireless is a copy of /proc/net/dev.
- * We have a structure for data passed from the driver to /proc/net/wireless
- * Too add this, I've modified :
- *      # net/core/dev.c (two other places)
- *      # include/linux/netdevice.h (one place)
- *      # include/linux/proc_fs.h (one place)
- *
- * New driver API (2002 -> onward) :
- * -------------------------------
- * This file is only concerned with the user space API and common definitions.
- * The new driver API is defined and documented in :
- *      # include/net/iw_handler.h
- *
- * Note as well that /proc/net/wireless implementation has now moved in :
- *      # net/core/wireless.c
- *
- * Wireless Events (2002 -> onward) :
- * --------------------------------
- * Events are defined at the end of this file, and implemented in :
- *      # net/core/wireless.c
- *
- * Other comments :
- * --------------
- * Do not add here things that are redundant with other mechanisms
- * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
- * wireless specific.
- *
- * These wireless extensions are not magic : each driver has to provide
- * support for them...
- *
- * IMPORTANT NOTE : As everything in the kernel, this is very much a
- * work in progress. Contact me if you have ideas of improvements...
- */
-
-/***************************** INCLUDES *****************************/
-
-#include <linux/types.h>                /* for __u* and __s* typedefs */
-#include <linux/socket.h>               /* for "struct sockaddr" et al  */
-#include <linux/if.h>                   /* for IFNAMSIZ and co... */
-
-/***************************** VERSION *****************************/
-/*
- * This constant is used to know the availability of the wireless
- * extensions and to know which version of wireless extensions it is
- * (there is some stuff that will be added in the future...)
- * I just plan to increment with each new version.
- */
-#define WIRELESS_EXT    22
-
-/*
- * Changes :
- *
- * V2 to V3
- * --------
- *      Alan Cox start some incompatibles changes. I've integrated a bit more.
- *      - Encryption renamed to Encode to avoid US regulation problems
- *      - Frequency changed from float to struct to avoid problems on old 386
- *
- * V3 to V4
- * --------
- *      - Add sensitivity
- *
- * V4 to V5
- * --------
- *      - Missing encoding definitions in range
- *      - Access points stuff
- *
- * V5 to V6
- * --------
- *      - 802.11 support (ESSID ioctls)
- *
- * V6 to V7
- * --------
- *      - define IW_ESSID_MAX_SIZE and IW_MAX_AP
- *
- * V7 to V8
- * --------
- *      - Changed my e-mail address
- *      - More 802.11 support (nickname, rate, rts, frag)
- *      - List index in frequencies
- *
- * V8 to V9
- * --------
- *      - Support for 'mode of operation' (ad-hoc, managed...)
- *      - Support for unicast and multicast power saving
- *      - Change encoding to support larger tokens (>64 bits)
- *      - Updated iw_params (disable, flags) and use it for NWID
- *      - Extracted iw_point from iwreq for clarity
- *
- * V9 to V10
- * ---------
- *      - Add PM capability to range structure
- *      - Add PM modifier : MAX/MIN/RELATIVE
- *      - Add encoding option : IW_ENCODE_NOKEY
- *      - Add TxPower ioctls (work like TxRate)
- *
- * V10 to V11
- * ----------
- *      - Add WE version in range (help backward/forward compatibility)
- *      - Add retry ioctls (work like PM)
- *
- * V11 to V12
- * ----------
- *      - Add SIOCSIWSTATS to get /proc/net/wireless programatically
- *      - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
- *      - Add new statistics (frag, retry, beacon)
- *      - Add average quality (for user space calibration)
- *
- * V12 to V13
- * ----------
- *      - Document creation of new driver API.
- *      - Extract union iwreq_data from struct iwreq (for new driver API).
- *      - Rename SIOCSIWNAME as SIOCSIWCOMMIT
- *
- * V13 to V14
- * ----------
- *      - Wireless Events support : define struct iw_event
- *      - Define additional specific event numbers
- *      - Add "addr" and "param" fields in union iwreq_data
- *      - AP scanning stuff (SIOCSIWSCAN and friends)
- *
- * V14 to V15
- * ----------
- *      - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
- *      - Make struct iw_freq signed (both m & e), add explicit padding
- *      - Add IWEVCUSTOM for driver specific event/scanning token
- *      - Add IW_MAX_GET_SPY for driver returning a lot of addresses
- *      - Add IW_TXPOW_RANGE for range of Tx Powers
- *      - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
- *      - Add IW_MODE_MONITOR for passive monitor
- *
- * V15 to V16
- * ----------
- *      - Increase the number of bitrates in iw_range to 32 (for 802.11g)
- *      - Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
- *      - Reshuffle struct iw_range for increases, add filler
- *      - Increase IW_MAX_AP to 64 for driver returning a lot of addresses
- *      - Remove IW_MAX_GET_SPY because conflict with enhanced spy support
- *      - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
- *      - Add IW_ENCODE_TEMP and iw_range->encoding_login_index
- *
- * V16 to V17
- * ----------
- *      - Add flags to frequency -> auto/fixed
- *      - Document (struct iw_quality *)->updated, add new flags (INVALID)
- *      - Wireless Event capability in struct iw_range
- *      - Add support for relative TxPower (yick !)
- *
- * V17 to V18 (From Jouni Malinen <j@w1.fi>)
- * ----------
- *      - Add support for WPA/WPA2
- *      - Add extended encoding configuration (SIOCSIWENCODEEXT and
- *        SIOCGIWENCODEEXT)
- *      - Add SIOCSIWGENIE/SIOCGIWGENIE
- *      - Add SIOCSIWMLME
- *      - Add SIOCSIWPMKSA
- *      - Add struct iw_range bit field for supported encoding capabilities
- *      - Add optional scan request parameters for SIOCSIWSCAN
- *      - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
- *        related parameters (extensible up to 4096 parameter values)
- *      - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
- *        IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
- *
- * V18 to V19
- * ----------
- *      - Remove (struct iw_point *)->pointer from events and streams
- *      - Remove header includes to help user space
- *      - Increase IW_ENCODING_TOKEN_MAX from 32 to 64
- *      - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
- *      - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
- *      - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
- *
- * V19 to V20
- * ----------
- *      - RtNetlink requests support (SET/GET)
- *
- * V20 to V21
- * ----------
- *      - Remove (struct net_device *)->get_wireless_stats()
- *      - Change length in ESSID and NICK to strlen() instead of strlen()+1
- *      - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
- *      - Power/Retry relative values no longer * 100000
- *      - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
- *
- * V21 to V22
- * ----------
- *      - Prevent leaking of kernel space in stream on 64 bits.
- */
-
-/**************************** CONSTANTS ****************************/
-
-/* -------------------------- IOCTL LIST -------------------------- */
-
-/* Wireless Identification */
-#define SIOCSIWCOMMIT   0x8B00          /* Commit pending changes to driver */
-#define SIOCGIWNAME     0x8B01          /* get name == wireless protocol */
-/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
- * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
- * Don't put the name of your driver there, it's useless. */
-
-/* Basic operations */
-#define SIOCSIWNWID     0x8B02          /* set network id (pre-802.11) */
-#define SIOCGIWNWID     0x8B03          /* get network id (the cell) */
-#define SIOCSIWFREQ     0x8B04          /* set channel/frequency (Hz) */
-#define SIOCGIWFREQ     0x8B05          /* get channel/frequency (Hz) */
-#define SIOCSIWMODE     0x8B06          /* set operation mode */
-#define SIOCGIWMODE     0x8B07          /* get operation mode */
-#define SIOCSIWSENS     0x8B08          /* set sensitivity (dBm) */
-#define SIOCGIWSENS     0x8B09          /* get sensitivity (dBm) */
-
-/* Informative stuff */
-#define SIOCSIWRANGE    0x8B0A          /* Unused */
-#define SIOCGIWRANGE    0x8B0B          /* Get range of parameters */
-#define SIOCSIWPRIV     0x8B0C          /* Unused */
-#define SIOCGIWPRIV     0x8B0D          /* get private ioctl interface info */
-#define SIOCSIWSTATS    0x8B0E          /* Unused */
-#define SIOCGIWSTATS    0x8B0F          /* Get /proc/net/wireless stats */
-/* SIOCGIWSTATS is strictly used between user space and the kernel, and
- * is never passed to the driver (i.e. the driver will never see it). */
-
-/* Spy support (statistics per MAC address - used for Mobile IP support) */
-#define SIOCSIWSPY      0x8B10          /* set spy addresses */
-#define SIOCGIWSPY      0x8B11          /* get spy info (quality of link) */
-#define SIOCSIWTHRSPY   0x8B12          /* set spy threshold (spy event) */
-#define SIOCGIWTHRSPY   0x8B13          /* get spy threshold */
-
-/* Access Point manipulation */
-#define SIOCSIWAP       0x8B14          /* set access point MAC addresses */
-#define SIOCGIWAP       0x8B15          /* get access point MAC addresses */
-#define SIOCGIWAPLIST   0x8B17          /* Deprecated in favor of scanning */
-#define SIOCSIWSCAN     0x8B18          /* trigger scanning (list cells) */
-#define SIOCGIWSCAN     0x8B19          /* get scanning results */
-
-/* 802.11 specific support */
-#define SIOCSIWESSID    0x8B1A          /* set ESSID (network name) */
-#define SIOCGIWESSID    0x8B1B          /* get ESSID */
-#define SIOCSIWNICKN    0x8B1C          /* set node name/nickname */
-#define SIOCGIWNICKN    0x8B1D          /* get node name/nickname */
-/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
- * within the 'iwreq' structure, so we need to use the 'data' member to
- * point to a string in user space, like it is done for RANGE... */
-
-/* Other parameters useful in 802.11 and some other devices */
-#define SIOCSIWRATE     0x8B20          /* set default bit rate (bps) */
-#define SIOCGIWRATE     0x8B21          /* get default bit rate (bps) */
-#define SIOCSIWRTS      0x8B22          /* set RTS/CTS threshold (bytes) */
-#define SIOCGIWRTS      0x8B23          /* get RTS/CTS threshold (bytes) */
-#define SIOCSIWFRAG     0x8B24          /* set fragmentation thr (bytes) */
-#define SIOCGIWFRAG     0x8B25          /* get fragmentation thr (bytes) */
-#define SIOCSIWTXPOW    0x8B26          /* set transmit power (dBm) */
-#define SIOCGIWTXPOW    0x8B27          /* get transmit power (dBm) */
-#define SIOCSIWRETRY    0x8B28          /* set retry limits and lifetime */
-#define SIOCGIWRETRY    0x8B29          /* get retry limits and lifetime */
-
-/* Encoding stuff (scrambling, hardware security, WEP...) */
-#define SIOCSIWENCODE   0x8B2A          /* set encoding token & mode */
-#define SIOCGIWENCODE   0x8B2B          /* get encoding token & mode */
-/* Power saving stuff (power management, unicast and multicast) */
-#define SIOCSIWPOWER    0x8B2C          /* set Power Management settings */
-#define SIOCGIWPOWER    0x8B2D          /* get Power Management settings */
-
-/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
- * This ioctl uses struct iw_point and data buffer that includes IE id and len
- * fields. More than one IE may be included in the request. Setting the generic
- * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
- * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
- * are required to report the used IE as a wireless event, e.g., when
- * associating with an AP. */
-#define SIOCSIWGENIE    0x8B30          /* set generic IE */
-#define SIOCGIWGENIE    0x8B31          /* get generic IE */
-
-/* WPA : IEEE 802.11 MLME requests */
-#define SIOCSIWMLME     0x8B16          /* request MLME operation; uses
-                                         * struct iw_mlme */
-/* WPA : Authentication mode parameters */
-#define SIOCSIWAUTH     0x8B32          /* set authentication mode params */
-#define SIOCGIWAUTH     0x8B33          /* get authentication mode params */
-
-/* WPA : Extended version of encoding configuration */
-#define SIOCSIWENCODEEXT 0x8B34         /* set encoding token & mode */
-#define SIOCGIWENCODEEXT 0x8B35         /* get encoding token & mode */
-
-/* WPA2 : PMKSA cache management */
-#define SIOCSIWPMKSA    0x8B36          /* PMKSA cache operation */
-
-/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
-
-/* These 32 ioctl are wireless device private, for 16 commands.
- * Each driver is free to use them for whatever purpose it chooses,
- * however the driver *must* export the description of those ioctls
- * with SIOCGIWPRIV and *must* use arguments as defined below.
- * If you don't follow those rules, DaveM is going to hate you (reason :
- * it make mixed 32/64bit operation impossible).
- */
-#define SIOCIWFIRSTPRIV 0x8BE0
-#define SIOCIWLASTPRIV  0x8BFF
-/* Previously, we were using SIOCDEVPRIVATE, but we now have our
- * separate range because of collisions with other tools such as
- * 'mii-tool'.
- * We now have 32 commands, so a bit more space ;-).
- * Also, all 'even' commands are only usable by root and don't return the
- * content of ifr/iwr to user (but you are not obliged to use the set/get
- * convention, just use every other two command). More details in iwpriv.c.
- * And I repeat : you are not forced to use them with iwpriv, but you
- * must be compliant with it.
- */
-
-/* ------------------------- IOCTL STUFF ------------------------- */
-
-/* The first and the last (range) */
-#define SIOCIWFIRST     0x8B00
-#define SIOCIWLAST      SIOCIWLASTPRIV          /* 0x8BFF */
-#define IW_IOCTL_IDX(cmd)       ((cmd) - SIOCIWFIRST)
-#define IW_HANDLER(id, func)                    \
-        [IW_IOCTL_IDX(id)] = func
-
-/* Odd : get (world access), even : set (root access) */
-#define IW_IS_SET(cmd)  (!((cmd) & 0x1))
-#define IW_IS_GET(cmd)  ((cmd) & 0x1)
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/* Those are *NOT* ioctls, do not issue request on them !!! */
-/* Most events use the same identifier as ioctl requests */
-
-#define IWEVTXDROP      0x8C00          /* Packet dropped to excessive retry */
-#define IWEVQUAL        0x8C01          /* Quality part of statistics (scan) */
-#define IWEVCUSTOM      0x8C02          /* Driver specific ascii string */
-#define IWEVREGISTERED  0x8C03          /* Discovered a new node (AP mode) */
-#define IWEVEXPIRED     0x8C04          /* Expired a node (AP mode) */
-#define IWEVGENIE       0x8C05          /* Generic IE (WPA, RSN, WMM, ..)
-                                         * (scan results); This includes id and
-                                         * length fields. One IWEVGENIE may
-                                         * contain more than one IE. Scan
-                                         * results may contain one or more
-                                         * IWEVGENIE events. */
-#define IWEVMICHAELMICFAILURE 0x8C06    /* Michael MIC failure
-                                         * (struct iw_michaelmicfailure)
-                                         */
-#define IWEVASSOCREQIE  0x8C07          /* IEs used in (Re)Association Request.
-                                         * The data includes id and length
-                                         * fields and may contain more than one
-                                         * IE. This event is required in
-                                         * Managed mode if the driver
-                                         * generates its own WPA/RSN IE. This
-                                         * should be sent just before
-                                         * IWEVREGISTERED event for the
-                                         * association. */
-#define IWEVASSOCRESPIE 0x8C08          /* IEs used in (Re)Association
-                                         * Response. The data includes id and
-                                         * length fields and may contain more
-                                         * than one IE. This may be sent
-                                         * between IWEVASSOCREQIE and
-                                         * IWEVREGISTERED events for the
-                                         * association. */
-#define IWEVPMKIDCAND   0x8C09          /* PMKID candidate for RSN
-                                         * pre-authentication
-                                         * (struct iw_pmkid_cand) */
-
-#define IWEVFIRST       0x8C00
-#define IW_EVENT_IDX(cmd)       ((cmd) - IWEVFIRST)
-
-/* ------------------------- PRIVATE INFO ------------------------- */
-/*
- * The following is used with SIOCGIWPRIV. It allow a driver to define
- * the interface (name, type of data) for its private ioctl.
- * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
- */
-
-#define IW_PRIV_TYPE_MASK       0x7000  /* Type of arguments */
-#define IW_PRIV_TYPE_NONE       0x0000
-#define IW_PRIV_TYPE_BYTE       0x1000  /* Char as number */
-#define IW_PRIV_TYPE_CHAR       0x2000  /* Char as character */
-#define IW_PRIV_TYPE_INT        0x4000  /* 32 bits int */
-#define IW_PRIV_TYPE_FLOAT      0x5000  /* struct iw_freq */
-#define IW_PRIV_TYPE_ADDR       0x6000  /* struct sockaddr */
-
-#define IW_PRIV_SIZE_FIXED      0x0800  /* Variable or fixed number of args */
-
-#define IW_PRIV_SIZE_MASK       0x07FF  /* Max number of those args */
-
-/*
- * Note : if the number of args is fixed and the size < 16 octets,
- * instead of passing a pointer we will put args in the iwreq struct...
- */
-
-/* ----------------------- OTHER CONSTANTS ----------------------- */
-
-/* Maximum frequencies in the range struct */
-#define IW_MAX_FREQUENCIES      32
-/* Note : if you have something like 80 frequencies,
- * don't increase this constant and don't fill the frequency list.
- * The user will be able to set by channel anyway... */
-
-/* Maximum bit rates in the range struct */
-#define IW_MAX_BITRATES         32
-
-/* Maximum tx powers in the range struct */
-#define IW_MAX_TXPOWER          8
-/* Note : if you more than 8 TXPowers, just set the max and min or
- * a few of them in the struct iw_range. */
-
-/* Maximum of address that you may set with SPY */
-#define IW_MAX_SPY              8
-
-/* Maximum of address that you may get in the
-   list of access points in range */
-#define IW_MAX_AP               64
-
-/* Maximum size of the ESSID and NICKN strings */
-#define IW_ESSID_MAX_SIZE       32
-
-/* Modes of operation */
-#define IW_MODE_AUTO    0       /* Let the driver decides */
-#define IW_MODE_ADHOC   1       /* Single cell network */
-#define IW_MODE_INFRA   2       /* Multi cell network, roaming, ... */
-#define IW_MODE_MASTER  3       /* Synchronisation master or Access Point */
-#define IW_MODE_REPEAT  4       /* Wireless Repeater (forwarder) */
-#define IW_MODE_SECOND  5       /* Secondary master/repeater (backup) */
-#define IW_MODE_MONITOR 6       /* Passive monitor (listen only) */
-#define IW_MODE_MESH    7       /* Mesh (IEEE 802.11s) network */
-
-/* Statistics flags (bitmask in updated) */
-#define IW_QUAL_QUAL_UPDATED    0x01    /* Value was updated since last read */
-#define IW_QUAL_LEVEL_UPDATED   0x02
-#define IW_QUAL_NOISE_UPDATED   0x04
-#define IW_QUAL_ALL_UPDATED     0x07
-#define IW_QUAL_DBM             0x08    /* Level + Noise are dBm */
-#define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
-#define IW_QUAL_LEVEL_INVALID   0x20
-#define IW_QUAL_NOISE_INVALID   0x40
-#define IW_QUAL_RCPI            0x80    /* Level + Noise are 802.11k RCPI */
-#define IW_QUAL_ALL_INVALID     0x70
-
-/* Frequency flags */
-#define IW_FREQ_AUTO            0x00    /* Let the driver decides */
-#define IW_FREQ_FIXED           0x01    /* Force a specific value */
-
-/* Maximum number of size of encoding token available
- * they are listed in the range structure */
-#define IW_MAX_ENCODING_SIZES   8
-
-/* Maximum size of the encoding token in bytes */
-#define IW_ENCODING_TOKEN_MAX   64      /* 512 bits (for now) */
-
-/* Flags for encoding (along with the token) */
-#define IW_ENCODE_INDEX         0x00FF  /* Token index (if needed) */
-#define IW_ENCODE_FLAGS         0xFF00  /* Flags defined below */
-#define IW_ENCODE_MODE          0xF000  /* Modes defined below */
-#define IW_ENCODE_DISABLED      0x8000  /* Encoding disabled */
-#define IW_ENCODE_ENABLED       0x0000  /* Encoding enabled */
-#define IW_ENCODE_RESTRICTED    0x4000  /* Refuse non-encoded packets */
-#define IW_ENCODE_OPEN          0x2000  /* Accept non-encoded packets */
-#define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not present */
-#define IW_ENCODE_TEMP          0x0400  /* Temporary key */
-
-/* Power management flags available (along with the value, if any) */
-#define IW_POWER_ON             0x0000  /* No details... */
-#define IW_POWER_TYPE           0xF000  /* Type of parameter */
-#define IW_POWER_PERIOD         0x1000  /* Value is a period/duration of  */
-#define IW_POWER_TIMEOUT        0x2000  /* Value is a timeout (to go asleep) */
-#define IW_POWER_MODE           0x0F00  /* Power Management mode */
-#define IW_POWER_UNICAST_R      0x0100  /* Receive only unicast messages */
-#define IW_POWER_MULTICAST_R    0x0200  /* Receive only multicast messages */
-#define IW_POWER_ALL_R          0x0300  /* Receive all messages though PM */
-#define IW_POWER_FORCE_S        0x0400  /* Force PM procedure for sending unicast */
-#define IW_POWER_REPEATER       0x0800  /* Repeat broadcast messages in PM period */
-#define IW_POWER_MODIFIER       0x000F  /* Modify a parameter */
-#define IW_POWER_MIN            0x0001  /* Value is a minimum  */
-#define IW_POWER_MAX            0x0002  /* Value is a maximum */
-#define IW_POWER_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
-
-/* Transmit Power flags available */
-#define IW_TXPOW_TYPE           0x00FF  /* Type of value */
-#define IW_TXPOW_DBM            0x0000  /* Value is in dBm */
-#define IW_TXPOW_MWATT          0x0001  /* Value is in mW */
-#define IW_TXPOW_RELATIVE       0x0002  /* Value is in arbitrary units */
-#define IW_TXPOW_RANGE          0x1000  /* Range of value between min/max */
-
-/* Retry limits and lifetime flags available */
-#define IW_RETRY_ON             0x0000  /* No details... */
-#define IW_RETRY_TYPE           0xF000  /* Type of parameter */
-#define IW_RETRY_LIMIT          0x1000  /* Maximum number of retries*/
-#define IW_RETRY_LIFETIME       0x2000  /* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER       0x00FF  /* Modify a parameter */
-#define IW_RETRY_MIN            0x0001  /* Value is a minimum  */
-#define IW_RETRY_MAX            0x0002  /* Value is a maximum */
-#define IW_RETRY_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
-#define IW_RETRY_SHORT          0x0010  /* Value is for short packets  */
-#define IW_RETRY_LONG           0x0020  /* Value is for long packets */
-
-/* Scanning request flags */
-#define IW_SCAN_DEFAULT         0x0000  /* Default scan of the driver */
-#define IW_SCAN_ALL_ESSID       0x0001  /* Scan all ESSIDs */
-#define IW_SCAN_THIS_ESSID      0x0002  /* Scan only this ESSID */
-#define IW_SCAN_ALL_FREQ        0x0004  /* Scan all Frequencies */
-#define IW_SCAN_THIS_FREQ       0x0008  /* Scan only this Frequency */
-#define IW_SCAN_ALL_MODE        0x0010  /* Scan all Modes */
-#define IW_SCAN_THIS_MODE       0x0020  /* Scan only this Mode */
-#define IW_SCAN_ALL_RATE        0x0040  /* Scan all Bit-Rates */
-#define IW_SCAN_THIS_RATE       0x0080  /* Scan only this Bit-Rate */
-/* struct iw_scan_req scan_type */
-#define IW_SCAN_TYPE_ACTIVE 0
-#define IW_SCAN_TYPE_PASSIVE 1
-/* Maximum size of returned data */
-#define IW_SCAN_MAX_DATA        4096    /* In bytes */
-
-/* Scan capability flags - in (struct iw_range *)->scan_capa */
-#define IW_SCAN_CAPA_NONE               0x00
-#define IW_SCAN_CAPA_ESSID              0x01
-#define IW_SCAN_CAPA_BSSID              0x02
-#define IW_SCAN_CAPA_CHANNEL    0x04
-#define IW_SCAN_CAPA_MODE               0x08
-#define IW_SCAN_CAPA_RATE               0x10
-#define IW_SCAN_CAPA_TYPE               0x20
-#define IW_SCAN_CAPA_TIME               0x40
-
-/* Max number of char in custom event - use multiple of them if needed */
-#define IW_CUSTOM_MAX           256     /* In bytes */
-
-/* Generic information element */
-#define IW_GENERIC_IE_MAX       1024
-
-/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
-#define IW_MLME_DEAUTH          0
-#define IW_MLME_DISASSOC        1
-#define IW_MLME_AUTH            2
-#define IW_MLME_ASSOC           3
-
-/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
-#define IW_AUTH_INDEX           0x0FFF
-#define IW_AUTH_FLAGS           0xF000
-/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
- * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
- * parameter that is being set/get to; value will be read/written to
- * struct iw_param value field) */
-#define IW_AUTH_WPA_VERSION             0
-#define IW_AUTH_CIPHER_PAIRWISE         1
-#define IW_AUTH_CIPHER_GROUP            2
-#define IW_AUTH_KEY_MGMT                3
-#define IW_AUTH_TKIP_COUNTERMEASURES    4
-#define IW_AUTH_DROP_UNENCRYPTED        5
-#define IW_AUTH_80211_AUTH_ALG          6
-#define IW_AUTH_WPA_ENABLED             7
-#define IW_AUTH_RX_UNENCRYPTED_EAPOL    8
-#define IW_AUTH_ROAMING_CONTROL         9
-#define IW_AUTH_PRIVACY_INVOKED         10
-#define IW_AUTH_CIPHER_GROUP_MGMT       11
-#define IW_AUTH_MFP                     12
-
-/* IW_AUTH_WPA_VERSION values (bit field) */
-#define IW_AUTH_WPA_VERSION_DISABLED    0x00000001
-#define IW_AUTH_WPA_VERSION_WPA         0x00000002
-#define IW_AUTH_WPA_VERSION_WPA2        0x00000004
-
-/* IW_AUTH_PAIRWISE_CIPHER, IW_AUTH_GROUP_CIPHER, and IW_AUTH_CIPHER_GROUP_MGMT
- * values (bit field) */
-#define IW_AUTH_CIPHER_NONE     0x00000001
-#define IW_AUTH_CIPHER_WEP40    0x00000002
-#define IW_AUTH_CIPHER_TKIP     0x00000004
-#define IW_AUTH_CIPHER_CCMP     0x00000008
-#define IW_AUTH_CIPHER_WEP104   0x00000010
-#define IW_AUTH_CIPHER_AES_CMAC 0x00000020
-
-/* IW_AUTH_KEY_MGMT values (bit field) */
-#define IW_AUTH_KEY_MGMT_802_1X 1
-#define IW_AUTH_KEY_MGMT_PSK    2
-
-/* IW_AUTH_80211_AUTH_ALG values (bit field) */
-#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001
-#define IW_AUTH_ALG_SHARED_KEY  0x00000002
-#define IW_AUTH_ALG_LEAP        0x00000004
-
-/* IW_AUTH_ROAMING_CONTROL values */
-#define IW_AUTH_ROAMING_ENABLE  0       /* driver/firmware based roaming */
-#define IW_AUTH_ROAMING_DISABLE 1       /* user space program used for roaming
-                                         * control */
-
-/* IW_AUTH_MFP (management frame protection) values */
-#define IW_AUTH_MFP_DISABLED    0       /* MFP disabled */
-#define IW_AUTH_MFP_OPTIONAL    1       /* MFP optional */
-#define IW_AUTH_MFP_REQUIRED    2       /* MFP required */
-
-/* SIOCSIWENCODEEXT definitions */
-#define IW_ENCODE_SEQ_MAX_SIZE  8
-/* struct iw_encode_ext ->alg */
-#define IW_ENCODE_ALG_NONE      0
-#define IW_ENCODE_ALG_WEP       1
-#define IW_ENCODE_ALG_TKIP      2
-#define IW_ENCODE_ALG_CCMP      3
-#define IW_ENCODE_ALG_PMK       4
-#define IW_ENCODE_ALG_AES_CMAC  5
-/* struct iw_encode_ext ->ext_flags */
-#define IW_ENCODE_EXT_TX_SEQ_VALID      0x00000001
-#define IW_ENCODE_EXT_RX_SEQ_VALID      0x00000002
-#define IW_ENCODE_EXT_GROUP_KEY         0x00000004
-#define IW_ENCODE_EXT_SET_TX_KEY        0x00000008
-
-/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
-#define IW_MICFAILURE_KEY_ID    0x00000003 /* Key ID 0..3 */
-#define IW_MICFAILURE_GROUP     0x00000004
-#define IW_MICFAILURE_PAIRWISE  0x00000008
-#define IW_MICFAILURE_STAKEY    0x00000010
-#define IW_MICFAILURE_COUNT     0x00000060 /* 1 or 2 (0 = count not supported)
-                                            */
-
-/* Bit field values for enc_capa in struct iw_range */
-#define IW_ENC_CAPA_WPA         0x00000001
-#define IW_ENC_CAPA_WPA2        0x00000002
-#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004
-#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008
-#define IW_ENC_CAPA_4WAY_HANDSHAKE      0x00000010
-
-/* Event capability macros - in (struct iw_range *)->event_capa
- * Because we have more than 32 possible events, we use an array of
- * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
-#define IW_EVENT_CAPA_BASE(cmd)         ((cmd >= SIOCIWFIRSTPRIV) ? \
-                                         (cmd - SIOCIWFIRSTPRIV + 0x60) : \
-                                         (cmd - SIOCIWFIRST))
-#define IW_EVENT_CAPA_INDEX(cmd)        (IW_EVENT_CAPA_BASE(cmd) >> 5)
-#define IW_EVENT_CAPA_MASK(cmd)         (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
-/* Event capability constants - event autogenerated by the kernel
- * This list is valid for most 802.11 devices, customise as needed... */
-#define IW_EVENT_CAPA_K_0       (IW_EVENT_CAPA_MASK(0x8B04) | \
-                                 IW_EVENT_CAPA_MASK(0x8B06) | \
-                                 IW_EVENT_CAPA_MASK(0x8B1A))
-#define IW_EVENT_CAPA_K_1       (IW_EVENT_CAPA_MASK(0x8B2A))
-/* "Easy" macro to set events in iw_range (less efficient) */
-#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
-#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
-
-
-/****************************** TYPES ******************************/
-
-/* --------------------------- SUBTYPES --------------------------- */
-/*
- *      Generic format for most parameters that fit in an int
- */
-struct  iw_param
-{
-  __s32         value;          /* The value of the parameter itself */
-  __u8          fixed;          /* Hardware should not use auto select */
-  __u8          disabled;       /* Disable the feature */
-  __u16         flags;          /* Various specifc flags (if any) */
-};
-
-/*
- *      For all data larger than 16 octets, we need to use a
- *      pointer to memory allocated in user space.
- */
-struct  iw_point
-{
-  void __user   *pointer;       /* Pointer to the data  (in user space) */
-  __u16         length;         /* number of fields or size in bytes */
-  __u16         flags;          /* Optional params */
-};
+#include <uapi/linux/wireless.h>
 
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 
 #include <linux/compat.h>
@@ -700,432 +21,6 @@ struct compat_iw_point {
         __u16 flags;
 };
 #endif
-#endif
-
-/*
- *      A frequency
- *      For numbers lower than 10^9, we encode the number in 'm' and
- *      set 'e' to 0
- *      For number greater than 10^9, we divide it by the lowest power
- *      of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
- *      The power of 10 is in 'e', the result of the division is in 'm'.
- */
-struct  iw_freq
-{
-        __s32           m;              /* Mantissa */
-        __s16           e;              /* Exponent */
-        __u8            i;              /* List index (when in range struct) */
-        __u8            flags;          /* Flags (fixed/auto) */
-};
-
-/*
- *      Quality of the link
- */
-struct  iw_quality
-{
-        __u8            qual;           /* link quality (%retries, SNR,
-                                           %missed beacons or better...) */
-        __u8            level;          /* signal level (dBm) */
-        __u8            noise;          /* noise level (dBm) */
-        __u8            updated;        /* Flags to know if updated */
-};
-
-/*
- *      Packet discarded in the wireless adapter due to
- *      "wireless" specific problems...
- *      Note : the list of counter and statistics in net_device_stats
- *      is already pretty exhaustive, and you should use that first.
- *      This is only additional stats...
- */
-struct  iw_discarded
-{
-        __u32           nwid;           /* Rx : Wrong nwid/essid */
-        __u32           code;           /* Rx : Unable to code/decode (WEP) */
-        __u32           fragment;       /* Rx : Can't perform MAC reassembly */
-        __u32           retries;        /* Tx : Max MAC retries num reached */
-        __u32           misc;           /* Others cases */
-};
-
-/*
- *      Packet/Time period missed in the wireless adapter due to
- *      "wireless" specific problems...
- */
-struct  iw_missed
-{
-        __u32           beacon;         /* Missed beacons/superframe */
-};
-
-/*
- *      Quality range (for spy threshold)
- */
-struct  iw_thrspy
-{
-        struct sockaddr         addr;           /* Source address (hw/mac) */
-        struct iw_quality       qual;           /* Quality of the link */
-        struct iw_quality       low;            /* Low threshold */
-        struct iw_quality       high;           /* High threshold */
-};
-
-/*
- *      Optional data for scan request
- *
- *      Note: these optional parameters are controlling parameters for the
- *      scanning behavior, these do not apply to getting scan results
- *      (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
- *      provide a merged results with all BSSes even if the previous scan
- *      request limited scanning to a subset, e.g., by specifying an SSID.
- *      Especially, scan results are required to include an entry for the
- *      current BSS if the driver is in Managed mode and associated with an AP.
- */
-struct  iw_scan_req
-{
-        __u8            scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
-        __u8            essid_len;
-        __u8            num_channels; /* num entries in channel_list;
-                                       * 0 = scan all allowed channels */
-        __u8            flags; /* reserved as padding; use zero, this may
-                                * be used in the future for adding flags
-                                * to request different scan behavior */
-        struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
-                                * individual address of a specific BSS */
-
-        /*
-         * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
-         * the current ESSID. This allows scan requests for specific ESSID
-         * without having to change the current ESSID and potentially breaking
-         * the current association.
-         */
-        __u8            essid[IW_ESSID_MAX_SIZE];
-
-        /*
-         * Optional parameters for changing the default scanning behavior.
-         * These are based on the MLME-SCAN.request from IEEE Std 802.11.
-         * TU is 1.024 ms. If these are set to 0, driver is expected to use
-         * reasonable default values. min_channel_time defines the time that
-         * will be used to wait for the first reply on each channel. If no
-         * replies are received, next channel will be scanned after this. If
-         * replies are received, total time waited on the channel is defined by
-         * max_channel_time.
-         */
-        __u32           min_channel_time; /* in TU */
-        __u32           max_channel_time; /* in TU */
-
-        struct iw_freq  channel_list[IW_MAX_FREQUENCIES];
-};
-
-/* ------------------------- WPA SUPPORT ------------------------- */
-
-/*
- *      Extended data structure for get/set encoding (this is used with
- *      SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
- *      flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
- *      only the data contents changes (key data -> this structure, including
- *      key data).
- *
- *      If the new key is the first group key, it will be set as the default
- *      TX key. Otherwise, default TX key index is only changed if
- *      IW_ENCODE_EXT_SET_TX_KEY flag is set.
- *
- *      Key will be changed with SIOCSIWENCODEEXT in all cases except for
- *      special "change TX key index" operation which is indicated by setting
- *      key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
- *
- *      tx_seq/rx_seq are only used when respective
- *      IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
- *      TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
- *      TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
- *      used only by an Authenticator (AP or an IBSS station) to get the
- *      current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
- *      RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
- *      debugging/testing.
- */
-struct  iw_encode_ext
-{
-        __u32           ext_flags; /* IW_ENCODE_EXT_* */
-        __u8            tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-        __u8            rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-        struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
-                               * (group) keys or unicast address for
-                               * individual keys */
-        __u16           alg; /* IW_ENCODE_ALG_* */
-        __u16           key_len;
-        __u8            key[0];
-};
-
-/* SIOCSIWMLME data */
-struct  iw_mlme
-{
-        __u16           cmd; /* IW_MLME_* */
-        __u16           reason_code;
-        struct sockaddr addr;
-};
-
-/* SIOCSIWPMKSA data */
-#define IW_PMKSA_ADD            1
-#define IW_PMKSA_REMOVE         2
-#define IW_PMKSA_FLUSH          3
-
-#define IW_PMKID_LEN    16
-
-struct  iw_pmksa
-{
-        __u32           cmd; /* IW_PMKSA_* */
-        struct sockaddr bssid;
-        __u8            pmkid[IW_PMKID_LEN];
-};
-
-/* IWEVMICHAELMICFAILURE data */
-struct  iw_michaelmicfailure
-{
-        __u32           flags;
-        struct sockaddr src_addr;
-        __u8            tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-};
-
-/* IWEVPMKIDCAND data */
-#define IW_PMKID_CAND_PREAUTH   0x00000001 /* RNS pre-authentication enabled */
-struct  iw_pmkid_cand
-{
-        __u32           flags; /* IW_PMKID_CAND_* */
-        __u32           index; /* the smaller the index, the higher the
-                                * priority */
-        struct sockaddr bssid;
-};
-
-/* ------------------------ WIRELESS STATS ------------------------ */
-/*
- * Wireless statistics (used for /proc/net/wireless)
- */
-struct  iw_statistics
-{
-        __u16           status;         /* Status
-                                         * - device dependent for now */
-
-        struct iw_quality       qual;           /* Quality of the link
-                                                 * (instant/mean/max) */
-        struct iw_discarded     discard;        /* Packet discarded counts */
-        struct iw_missed        miss;           /* Packet missed counts */
-};
-
-/* ------------------------ IOCTL REQUEST ------------------------ */
-/*
- * This structure defines the payload of an ioctl, and is used 
- * below.
- *
- * Note that this structure should fit on the memory footprint
- * of iwreq (which is the same as ifreq), which mean a max size of
- * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
- * You should check this when increasing the structures defined
- * above in this file...
- */
-union   iwreq_data
-{
-        /* Config - generic */
-        char            name[IFNAMSIZ];
-        /* Name : used to verify the presence of  wireless extensions.
-         * Name of the protocol/provider... */
-
-        struct iw_point essid;          /* Extended network name */
-        struct iw_param nwid;           /* network id (or domain - the cell) */
-        struct iw_freq  freq;           /* frequency or channel :
-                                         * 0-1000 = channel
-                                         * > 1000 = frequency in Hz */
-
-        struct iw_param sens;           /* signal level threshold */
-        struct iw_param bitrate;        /* default bit rate */
-        struct iw_param txpower;        /* default transmit power */
-        struct iw_param rts;            /* RTS threshold threshold */
-        struct iw_param frag;           /* Fragmentation threshold */
-        __u32           mode;           /* Operation mode */
-        struct iw_param retry;          /* Retry limits & lifetime */
-
-        struct iw_point encoding;       /* Encoding stuff : tokens */
-        struct iw_param power;          /* PM duration/timeout */
-        struct iw_quality qual;         /* Quality part of statistics */
-
-        struct sockaddr ap_addr;        /* Access point address */
-        struct sockaddr addr;           /* Destination address (hw/mac) */
-
-        struct iw_param param;          /* Other small parameters */
-        struct iw_point data;           /* Other large parameters */
-};
-
-/*
- * The structure to exchange data for ioctl.
- * This structure is the same as 'struct ifreq', but (re)defined for
- * convenience...
- * Do I need to remind you about structure size (32 octets) ?
- */
-struct  iwreq 
-{
-        union
-        {
-                char    ifrn_name[IFNAMSIZ];    /* if name, e.g. "eth0" */
-        } ifr_ifrn;
-
-        /* Data part (defined just above) */
-        union   iwreq_data      u;
-};
-
-/* -------------------------- IOCTL DATA -------------------------- */
-/*
- *      For those ioctl which want to exchange mode data that what could
- *      fit in the above structure...
- */
-
-/*
- *      Range of parameters
- */
-
-struct  iw_range
-{
-        /* Informative stuff (to choose between different interface) */
-        __u32           throughput;     /* To give an idea... */
-        /* In theory this value should be the maximum benchmarked
-         * TCP/IP throughput, because with most of these devices the
-         * bit rate is meaningless (overhead an co) to estimate how
-         * fast the connection will go and pick the fastest one.
-         * I suggest people to play with Netperf or any benchmark...
-         */
-
-        /* NWID (or domain id) */
-        __u32           min_nwid;       /* Minimal NWID we are able to set */
-        __u32           max_nwid;       /* Maximal NWID we are able to set */
-
-        /* Old Frequency (backward compat - moved lower ) */
-        __u16           old_num_channels;
-        __u8            old_num_frequency;
-
-        /* Scan capabilities */
-        __u8            scan_capa;      /* IW_SCAN_CAPA_* bit field */
-
-        /* Wireless event capability bitmasks */
-        __u32           event_capa[6];
-
-        /* signal level threshold range */
-        __s32           sensitivity;
-
-        /* Quality of link & SNR stuff */
-        /* Quality range (link, level, noise)
-         * If the quality is absolute, it will be in the range [0 ; max_qual],
-         * if the quality is dBm, it will be in the range [max_qual ; 0].
-         * Don't forget that we use 8 bit arithmetics... */
-        struct iw_quality       max_qual;       /* Quality of the link */
-        /* This should contain the average/typical values of the quality
-         * indicator. This should be the threshold between a "good" and
-         * a "bad" link (example : monitor going from green to orange).
-         * Currently, user space apps like quality monitors don't have any
-         * way to calibrate the measurement. With this, they can split
-         * the range between 0 and max_qual in different quality level
-         * (using a geometric subdivision centered on the average).
-         * I expect that people doing the user space apps will feedback
-         * us on which value we need to put in each driver... */
-        struct iw_quality       avg_qual;       /* Quality of the link */
-
-        /* Rates */
-        __u8            num_bitrates;   /* Number of entries in the list */
-        __s32           bitrate[IW_MAX_BITRATES];       /* list, in bps */
-
-        /* RTS threshold */
-        __s32           min_rts;        /* Minimal RTS threshold */
-        __s32           max_rts;        /* Maximal RTS threshold */
-
-        /* Frag threshold */
-        __s32           min_frag;       /* Minimal frag threshold */
-        __s32           max_frag;       /* Maximal frag threshold */
-
-        /* Power Management duration & timeout */
-        __s32           min_pmp;        /* Minimal PM period */
-        __s32           max_pmp;        /* Maximal PM period */
-        __s32           min_pmt;        /* Minimal PM timeout */
-        __s32           max_pmt;        /* Maximal PM timeout */
-        __u16           pmp_flags;      /* How to decode max/min PM period */
-        __u16           pmt_flags;      /* How to decode max/min PM timeout */
-        __u16           pm_capa;        /* What PM options are supported */
-
-        /* Encoder stuff */
-        __u16   encoding_size[IW_MAX_ENCODING_SIZES];   /* Different token sizes */
-        __u8    num_encoding_sizes;     /* Number of entry in the list */
-        __u8    max_encoding_tokens;    /* Max number of tokens */
-        /* For drivers that need a "login/passwd" form */
-        __u8    encoding_login_index;   /* token index for login token */
-
-        /* Transmit power */
-        __u16           txpower_capa;   /* What options are supported */
-        __u8            num_txpower;    /* Number of entries in the list */
-        __s32           txpower[IW_MAX_TXPOWER];        /* list, in bps */
-
-        /* Wireless Extension version info */
-        __u8            we_version_compiled;    /* Must be WIRELESS_EXT */
-        __u8            we_version_source;      /* Last update of source */
-
-        /* Retry limits and lifetime */
-        __u16           retry_capa;     /* What retry options are supported */
-        __u16           retry_flags;    /* How to decode max/min retry limit */
-        __u16           r_time_flags;   /* How to decode max/min retry life */
-        __s32           min_retry;      /* Minimal number of retries */
-        __s32           max_retry;      /* Maximal number of retries */
-        __s32           min_r_time;     /* Minimal retry lifetime */
-        __s32           max_r_time;     /* Maximal retry lifetime */
-
-        /* Frequency */
-        __u16           num_channels;   /* Number of channels [0; num - 1] */
-        __u8            num_frequency;  /* Number of entry in the list */
-        struct iw_freq  freq[IW_MAX_FREQUENCIES];       /* list */
-        /* Note : this frequency list doesn't need to fit channel numbers,
-         * because each entry contain its channel index */
-
-        __u32           enc_capa;       /* IW_ENC_CAPA_* bit field */
-};
-
-/*
- * Private ioctl interface information
- */
- 
-struct  iw_priv_args
-{
-        __u32           cmd;            /* Number of the ioctl to issue */
-        __u16           set_args;       /* Type and number of args */
-        __u16           get_args;       /* Type and number of args */
-        char            name[IFNAMSIZ]; /* Name of the extension */
-};
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/*
- * Wireless events are carried through the rtnetlink socket to user
- * space. They are encapsulated in the IFLA_WIRELESS field of
- * a RTM_NEWLINK message.
- */
-
-/*
- * A Wireless Event. Contains basically the same data as the ioctl...
- */
-struct iw_event
-{
-        __u16           len;                    /* Real length of this stuff */
-        __u16           cmd;                    /* Wireless IOCTL */
-        union iwreq_data        u;              /* IOCTL fixed payload */
-};
-
-/* Size of the Event prefix (including padding and alignement junk) */
-#define IW_EV_LCP_LEN   (sizeof(struct iw_event) - sizeof(union iwreq_data))
-/* Size of the various events */
-#define IW_EV_CHAR_LEN  (IW_EV_LCP_LEN + IFNAMSIZ)
-#define IW_EV_UINT_LEN  (IW_EV_LCP_LEN + sizeof(__u32))
-#define IW_EV_FREQ_LEN  (IW_EV_LCP_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_LEN  (IW_EV_LCP_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_LEN  (IW_EV_LCP_LEN + sizeof(struct iw_quality))
-
-/* iw_point events are special. First, the payload (extra data) come at
- * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
- * we omit the pointer, so start at an offset. */
-#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
-                          (char *) NULL)
-#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \
-                         IW_EV_POINT_OFF)
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 struct __compat_iw_event {
         __u16           len;                    /* Real length of this stuff */
@@ -1146,17 +41,4 @@ struct __compat_iw_event {
         (IW_EV_COMPAT_LCP_LEN + sizeof(struct compat_iw_point) - \
          IW_EV_COMPAT_POINT_OFF)
 #endif
-#endif
-
-/* Size of the Event prefix when packed in stream */
-#define IW_EV_LCP_PK_LEN        (4)
-/* Size of the various events when packed in stream */
-#define IW_EV_CHAR_PK_LEN       (IW_EV_LCP_PK_LEN + IFNAMSIZ)
-#define IW_EV_UINT_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(__u32))
-#define IW_EV_FREQ_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_PK_LEN      (IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
-#define IW_EV_POINT_PK_LEN      (IW_EV_LCP_PK_LEN + 4)
-
 #endif  /* _LINUX_WIRELESS_H */
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index cc13e1115970..fdbafc6841cf 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -10,61 +10,11 @@
 #ifndef _LINUX_XATTR_H
 #define _LINUX_XATTR_H
 
-#define XATTR_CREATE    0x1     /* set value, fail if attr already exists */
-#define XATTR_REPLACE   0x2     /* set value, fail if attr does not exist */
-
-/* Namespaces */
-#define XATTR_OS2_PREFIX "os2."
-#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
-
-#define XATTR_SECURITY_PREFIX   "security."
-#define XATTR_SECURITY_PREFIX_LEN (sizeof (XATTR_SECURITY_PREFIX) - 1)
-
-#define XATTR_SYSTEM_PREFIX "system."
-#define XATTR_SYSTEM_PREFIX_LEN (sizeof (XATTR_SYSTEM_PREFIX) - 1)
-
-#define XATTR_TRUSTED_PREFIX "trusted."
-#define XATTR_TRUSTED_PREFIX_LEN (sizeof (XATTR_TRUSTED_PREFIX) - 1)
-
-#define XATTR_USER_PREFIX "user."
-#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
-
-/* Security namespace */
-#define XATTR_EVM_SUFFIX "evm"
-#define XATTR_NAME_EVM XATTR_SECURITY_PREFIX XATTR_EVM_SUFFIX
-
-#define XATTR_IMA_SUFFIX "ima"
-#define XATTR_NAME_IMA XATTR_SECURITY_PREFIX XATTR_IMA_SUFFIX
-
-#define XATTR_SELINUX_SUFFIX "selinux"
-#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
-
-#define XATTR_SMACK_SUFFIX "SMACK64"
-#define XATTR_SMACK_IPIN "SMACK64IPIN"
-#define XATTR_SMACK_IPOUT "SMACK64IPOUT"
-#define XATTR_SMACK_EXEC "SMACK64EXEC"
-#define XATTR_SMACK_TRANSMUTE "SMACK64TRANSMUTE"
-#define XATTR_SMACK_MMAP "SMACK64MMAP"
-#define XATTR_NAME_SMACK XATTR_SECURITY_PREFIX XATTR_SMACK_SUFFIX
-#define XATTR_NAME_SMACKIPIN    XATTR_SECURITY_PREFIX XATTR_SMACK_IPIN
-#define XATTR_NAME_SMACKIPOUT   XATTR_SECURITY_PREFIX XATTR_SMACK_IPOUT
-#define XATTR_NAME_SMACKEXEC    XATTR_SECURITY_PREFIX XATTR_SMACK_EXEC
-#define XATTR_NAME_SMACKTRANSMUTE XATTR_SECURITY_PREFIX XATTR_SMACK_TRANSMUTE
-#define XATTR_NAME_SMACKMMAP XATTR_SECURITY_PREFIX XATTR_SMACK_MMAP
-
-#define XATTR_CAPS_SUFFIX "capability"
-#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
-
-#define XATTR_POSIX_ACL_ACCESS  "posix_acl_access"
-#define XATTR_NAME_POSIX_ACL_ACCESS XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_ACCESS
-#define XATTR_POSIX_ACL_DEFAULT  "posix_acl_default"
-#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
-
-#ifdef  __KERNEL__
 
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
+#include <uapi/linux/xattr.h>
 
 struct inode;
 struct dentry;
@@ -147,6 +97,4 @@ ssize_t simple_xattr_list(struct simple_xattrs *xattrs, char *buffer,
 void simple_xattr_list_add(struct simple_xattrs *xattrs,
                            struct simple_xattr *new_xattr);
 
-#endif  /*  __KERNEL__  */
-
 #endif  /* _LINUX_XATTR_H */
diff --git a/include/media/ad9389b.h b/include/media/ad9389b.h
new file mode 100644
index 000000000000..5ba9af869b8b
--- /dev/null
+++ b/include/media/ad9389b.h
@@ -0,0 +1,49 @@
+/*
+ * Analog Devices AD9389B/AD9889B video encoder driver header
+ *
+ * Copyright 2012 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef AD9389B_H
+#define AD9389B_H
+
+enum ad9389b_tmds_pll_gear {
+        AD9389B_TMDS_PLL_GEAR_AUTOMATIC,
+        AD9389B_TMDS_PLL_GEAR_SEMI_AUTOMATIC,
+};
+
+/* Platform dependent definitions */
+struct ad9389b_platform_data {
+        enum ad9389b_tmds_pll_gear tmds_pll_gear ;
+        /* Differential Data/Clock Output Drive Strength (reg. 0xa2/0xa3) */
+        u8 diff_data_drive_strength;
+        u8 diff_clk_drive_strength;
+};
+
+/* notify events */
+#define AD9389B_MONITOR_DETECT 0
+#define AD9389B_EDID_DETECT 1
+
+struct ad9389b_monitor_detect {
+        int present;
+};
+
+struct ad9389b_edid_detect {
+        int present;
+        int segment;
+};
+
+#endif
diff --git a/include/media/adv7604.h b/include/media/adv7604.h
new file mode 100644
index 000000000000..171b957db743
--- /dev/null
+++ b/include/media/adv7604.h
@@ -0,0 +1,153 @@
+/*
+ * adv7604 - Analog Devices ADV7604 video decoder driver
+ *
+ * Copyright 2012 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _ADV7604_
+#define _ADV7604_
+
+/* Analog input muxing modes (AFE register 0x02, [2:0]) */
+enum adv7604_ain_sel {
+        ADV7604_AIN1_2_3_NC_SYNC_1_2 = 0,
+        ADV7604_AIN4_5_6_NC_SYNC_2_1 = 1,
+        ADV7604_AIN7_8_9_NC_SYNC_3_1 = 2,
+        ADV7604_AIN10_11_12_NC_SYNC_4_1 = 3,
+        ADV7604_AIN9_4_5_6_SYNC_2_1 = 4,
+};
+
+/* Bus rotation and reordering (IO register 0x04, [7:5]) */
+enum adv7604_op_ch_sel {
+        ADV7604_OP_CH_SEL_GBR = 0,
+        ADV7604_OP_CH_SEL_GRB = 1,
+        ADV7604_OP_CH_SEL_BGR = 2,
+        ADV7604_OP_CH_SEL_RGB = 3,
+        ADV7604_OP_CH_SEL_BRG = 4,
+        ADV7604_OP_CH_SEL_RBG = 5,
+};
+
+/* Primary mode (IO register 0x01, [3:0]) */
+enum adv7604_prim_mode {
+        ADV7604_PRIM_MODE_COMP = 1,
+        ADV7604_PRIM_MODE_RGB = 2,
+        ADV7604_PRIM_MODE_HDMI_COMP = 5,
+        ADV7604_PRIM_MODE_HDMI_GR = 6,
+};
+
+/* Input Color Space (IO register 0x02, [7:4]) */
+enum adv7604_inp_color_space {
+        ADV7604_INP_COLOR_SPACE_LIM_RGB = 0,
+        ADV7604_INP_COLOR_SPACE_FULL_RGB = 1,
+        ADV7604_INP_COLOR_SPACE_LIM_YCbCr_601 = 2,
+        ADV7604_INP_COLOR_SPACE_LIM_YCbCr_709 = 3,
+        ADV7604_INP_COLOR_SPACE_XVYCC_601 = 4,
+        ADV7604_INP_COLOR_SPACE_XVYCC_709 = 5,
+        ADV7604_INP_COLOR_SPACE_FULL_YCbCr_601 = 6,
+        ADV7604_INP_COLOR_SPACE_FULL_YCbCr_709 = 7,
+        ADV7604_INP_COLOR_SPACE_AUTO = 0xf,
+};
+
+/* Select output format (IO register 0x03, [7:0]) */
+enum adv7604_op_format_sel {
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_8 = 0x00,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_10 = 0x01,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_12_MODE0 = 0x02,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_12_MODE1 = 0x06,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_12_MODE2 = 0x0a,
+        ADV7604_OP_FORMAT_SEL_DDR_422_8 = 0x20,
+        ADV7604_OP_FORMAT_SEL_DDR_422_10 = 0x21,
+        ADV7604_OP_FORMAT_SEL_DDR_422_12_MODE0 = 0x22,
+        ADV7604_OP_FORMAT_SEL_DDR_422_12_MODE1 = 0x23,
+        ADV7604_OP_FORMAT_SEL_DDR_422_12_MODE2 = 0x24,
+        ADV7604_OP_FORMAT_SEL_SDR_444_24 = 0x40,
+        ADV7604_OP_FORMAT_SEL_SDR_444_30 = 0x41,
+        ADV7604_OP_FORMAT_SEL_SDR_444_36_MODE0 = 0x42,
+        ADV7604_OP_FORMAT_SEL_DDR_444_24 = 0x60,
+        ADV7604_OP_FORMAT_SEL_DDR_444_30 = 0x61,
+        ADV7604_OP_FORMAT_SEL_DDR_444_36 = 0x62,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_16 = 0x80,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_20 = 0x81,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_24_MODE0 = 0x82,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_24_MODE1 = 0x86,
+        ADV7604_OP_FORMAT_SEL_SDR_ITU656_24_MODE2 = 0x8a,
+};
+
+/* Platform dependent definition */
+struct adv7604_platform_data {
+        /* connector - HDMI or DVI? */
+        unsigned connector_hdmi:1;
+
+        /* DIS_PWRDNB: 1 if the PWRDNB pin is unused and unconnected */
+        unsigned disable_pwrdnb:1;
+
+        /* DIS_CABLE_DET_RST: 1 if the 5V pins are unused and unconnected */
+        unsigned disable_cable_det_rst:1;
+
+        /* Analog input muxing mode */
+        enum adv7604_ain_sel ain_sel;
+
+        /* Bus rotation and reordering */
+        enum adv7604_op_ch_sel op_ch_sel;
+
+        /* Primary mode */
+        enum adv7604_prim_mode prim_mode;
+
+        /* Select output format */
+        enum adv7604_op_format_sel op_format_sel;
+
+        /* IO register 0x02 */
+        unsigned alt_gamma:1;
+        unsigned op_656_range:1;
+        unsigned rgb_out:1;
+        unsigned alt_data_sat:1;
+
+        /* IO register 0x05 */
+        unsigned blank_data:1;
+        unsigned insert_av_codes:1;
+        unsigned replicate_av_codes:1;
+        unsigned invert_cbcr:1;
+
+        /* IO register 0x30 */
+        unsigned output_bus_lsb_to_msb:1;
+
+        /* Free run */
+        unsigned hdmi_free_run_mode;
+
+        /* i2c addresses: 0 == use default */
+        u8 i2c_avlink;
+        u8 i2c_cec;
+        u8 i2c_infoframe;
+        u8 i2c_esdp;
+        u8 i2c_dpp;
+        u8 i2c_afe;
+        u8 i2c_repeater;
+        u8 i2c_edid;
+        u8 i2c_hdmi;
+        u8 i2c_test;
+        u8 i2c_cp;
+        u8 i2c_vdp;
+};
+
+#define V4L2_CID_ADV_RX_ANALOG_SAMPLING_PHASE   (V4L2_CID_DV_CLASS_BASE + 0x1000)
+#define V4L2_CID_ADV_RX_FREE_RUN_COLOR_MANUAL   (V4L2_CID_DV_CLASS_BASE + 0x1001)
+#define V4L2_CID_ADV_RX_FREE_RUN_COLOR          (V4L2_CID_DV_CLASS_BASE + 0x1002)
+
+/* notify events */
+#define ADV7604_HOTPLUG         1
+#define ADV7604_FMT_CHANGE      2
+
+#endif
diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h
index 8bc1b3c0e679..a7ca4884c46c 100644
--- a/include/media/davinci/vpbe.h
+++ b/include/media/davinci/vpbe.h
@@ -35,7 +35,7 @@ struct osd_config_info {
 struct vpbe_output {
         struct v4l2_output output;
         /*
-         * If output capabilities include dv_preset, list supported presets
+         * If output capabilities include dv_timings, list supported timings
          * below
          */
         char *subdev_name;
@@ -120,16 +120,16 @@ struct vpbe_device_ops {
         unsigned int (*get_output)(struct vpbe_device *vpbe_dev);
 
         /* Set DV preset at current output */
-        int (*s_dv_preset)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_preset *dv_preset);
+        int (*s_dv_timings)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_timings *dv_timings);
 
         /* Get DV presets supported at the output */
-        int (*g_dv_preset)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_preset *dv_preset);
+        int (*g_dv_timings)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_timings *dv_timings);
 
         /* Enumerate the DV Presets supported at the output */
-        int (*enum_dv_presets)(struct vpbe_device *vpbe_dev,
-                               struct v4l2_dv_enum_preset *preset_info);
+        int (*enum_dv_timings)(struct vpbe_device *vpbe_dev,
+                               struct v4l2_enum_dv_timings *timings_info);
 
         /* Set std at the output */
         int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id);
diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h
index 727f55170e41..9b85396514be 100644
--- a/include/media/davinci/vpbe_types.h
+++ b/include/media/davinci/vpbe_types.h
@@ -32,11 +32,6 @@ enum vpbe_enc_timings_type {
         VPBE_ENC_TIMINGS_INVALID = 0x8,
 };
 
-union vpbe_timings {
-        v4l2_std_id std_id;
-        unsigned int dv_preset;
-};
-
 /*
  * struct vpbe_enc_mode_info
  * @name: ptr to name string of the standard, "NTSC", "PAL" etc
@@ -73,7 +68,8 @@ union vpbe_timings {
 struct vpbe_enc_mode_info {
         unsigned char *name;
         enum vpbe_enc_timings_type timings_type;
-        union vpbe_timings timings;
+        v4l2_std_id std_id;
+        struct v4l2_dv_timings dv_timings;
         unsigned int interlaced;
         unsigned int xres;
         unsigned int yres;
diff --git a/include/media/davinci/vpbe_venc.h b/include/media/davinci/vpbe_venc.h
index 6b57334f4029..cc78c2eb16da 100644
--- a/include/media/davinci/vpbe_venc.h
+++ b/include/media/davinci/vpbe_venc.h
@@ -32,7 +32,7 @@ struct venc_platform_data {
         int (*setup_pinmux)(enum v4l2_mbus_pixelcode if_type,
                             int field);
         int (*setup_clock)(enum vpbe_enc_timings_type type,
-                           unsigned int mode);
+                           unsigned int pixclock);
         int (*setup_if_config)(enum v4l2_mbus_pixelcode pixcode);
         /* Number of LCD outputs supported */
         int num_lcd_outputs;
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index d8f6ab1943e4..3882e0675ccf 100644
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 
 #define VPIF_CAPTURE_MAX_CHANNELS       2
+#define VPIF_DISPLAY_MAX_CHANNELS       2
 
 enum vpif_if_type {
         VPIF_IF_BT656,
@@ -37,29 +38,38 @@ struct vpif_interface {
 struct vpif_subdev_info {
         const char *name;
         struct i2c_board_info board_info;
-        u32 input;
-        u32 output;
-        unsigned can_route:1;
-        struct vpif_interface vpif_if;
+};
+
+struct vpif_output {
+        struct v4l2_output output;
+        const char *subdev_name;
+        u32 input_route;
+        u32 output_route;
+};
+
+struct vpif_display_chan_config {
+        const struct vpif_output *outputs;
+        int output_count;
+        bool clip_en;
 };
 
 struct vpif_display_config {
         int (*set_clock)(int, int);
         struct vpif_subdev_info *subdevinfo;
         int subdev_count;
-        const char **output;
-        int output_count;
+        struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS];
         const char *card_name;
-        bool ch2_clip_en;
-        bool ch3_clip_en;
 };
 
 struct vpif_input {
         struct v4l2_input input;
         const char *subdev_name;
+        u32 input_route;
+        u32 output_route;
 };
 
 struct vpif_capture_chan_config {
+        struct vpif_interface vpif_if;
         const struct vpif_input *inputs;
         int input_count;
 };
diff --git a/include/media/ir-rx51.h b/include/media/ir-rx51.h
new file mode 100644
index 000000000000..104aa892f31b
--- /dev/null
+++ b/include/media/ir-rx51.h
@@ -0,0 +1,10 @@
+#ifndef _LIRC_RX51_H
+#define _LIRC_RX51_H
+
+struct lirc_rx51_platform_data {
+        int pwm_timer;
+
+        int(*set_max_mpu_wakeup_lat)(struct device *dev, long t);
+};
+
+#endif
diff --git a/include/media/mt9v032.h b/include/media/mt9v032.h
index 5e27f9be6b95..78fd39eac219 100644
--- a/include/media/mt9v032.h
+++ b/include/media/mt9v032.h
@@ -7,6 +7,9 @@ struct mt9v032_platform_data {
         unsigned int clk_pol:1;
 
         void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate);
+
+        const s64 *link_freqs;
+        s64 link_def_freq;
 };
 
 #endif
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 4d94be5226af..95842696857f 100644
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -42,12 +42,6 @@ enum isp_interface_type {
 };
 
 enum {
-        ISP_BRIDGE_DISABLE = 0,
-        ISP_BRIDGE_LITTLE_ENDIAN = 2,
-        ISP_BRIDGE_BIG_ENDIAN = 3,
-};
-
-enum {
         ISP_LANE_SHIFT_0 = 0,
         ISP_LANE_SHIFT_2 = 1,
         ISP_LANE_SHIFT_4 = 2,
@@ -67,17 +61,15 @@ enum {
  *              0 - Active high, 1 - Active low
  * @vs_pol: Vertical synchronization polarity
  *              0 - Active high, 1 - Active low
- * @bridge: CCDC Bridge input control
- *              ISP_BRIDGE_DISABLE - Disable
- *              ISP_BRIDGE_LITTLE_ENDIAN - Little endian
- *              ISP_BRIDGE_BIG_ENDIAN - Big endian
+ * @data_pol: Data polarity
+ *              0 - Normal, 1 - One's complement
  */
 struct isp_parallel_platform_data {
         unsigned int data_lane_shift:2;
         unsigned int clk_pol:1;
         unsigned int hs_pol:1;
         unsigned int vs_pol:1;
-        unsigned int bridge:2;
+        unsigned int data_pol:1;
 };
 
 enum {
diff --git a/include/media/s5k4ecgx.h b/include/media/s5k4ecgx.h
new file mode 100644
index 000000000000..90c1be792ffe
--- /dev/null
+++ b/include/media/s5k4ecgx.h
@@ -0,0 +1,37 @@
+/*
+ * S5K4ECGX image sensor header file
+ *
+ * Copyright (C) 2012, Linaro
+ * Copyright (C) 2012, Samsung Electronics Co., Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef S5K4ECGX_H
+#define S5K4ECGX_H
+
+/**
+ * struct s5k4ecgx_gpio - data structure describing a GPIO
+ * @gpio : GPIO number
+ * @level: indicates active state of the @gpio
+ */
+struct s5k4ecgx_gpio {
+        int gpio;
+        int level;
+};
+
+/**
+ * struct ss5k4ecgx_platform_data- s5k4ecgx driver platform data
+ * @gpio_reset:  GPIO driving RESET pin
+ * @gpio_stby :  GPIO driving STBY pin
+ */
+
+struct s5k4ecgx_platform_data {
+        struct s5k4ecgx_gpio gpio_reset;
+        struct s5k4ecgx_gpio gpio_stby;
+};
+
+#endif /* S5K4ECGX_H */
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index 8587aaf73646..eaea62a382f8 100644
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -12,6 +12,8 @@
 #ifndef S5P_FIMC_H_
 #define S5P_FIMC_H_
 
+#include <media/media-entity.h>
+
 enum cam_bus_type {
         FIMC_ITU_601 = 1,
         FIMC_ITU_656,
@@ -28,7 +30,6 @@ struct i2c_board_info;
  * @board_info: pointer to I2C subdevice's board info
  * @clk_frequency: frequency of the clock the host interface provides to sensor
  * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
- * @csi_data_align: MIPI-CSI interface data alignment in bits
  * @i2c_bus_num: i2c control bus id the sensor is attached to
  * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
  * @clk_id: index of the SoC peripheral clock for sensors
@@ -38,7 +39,6 @@ struct s5p_fimc_isp_info {
         struct i2c_board_info *board_info;
         unsigned long clk_frequency;
         enum cam_bus_type bus_type;
-        u16 csi_data_align;
         u16 i2c_bus_num;
         u16 mux_id;
         u16 flags;
@@ -80,4 +80,20 @@ struct fimc_pipeline {
         struct media_pipeline *m_pipeline;
 };
 
+/*
+ * Media pipeline operations to be called from within the fimc(-lite)
+ * video node when it is the last entity of the pipeline. Implemented
+ * by corresponding media device driver.
+ */
+struct fimc_pipeline_ops {
+        int (*open)(struct fimc_pipeline *p, struct media_entity *me,
+                          bool resume);
+        int (*close)(struct fimc_pipeline *p);
+        int (*set_stream)(struct fimc_pipeline *p, bool state);
+};
+
+#define fimc_pipeline_call(f, op, p, args...)                           \
+        (!(f) ? -ENODEV : (((f)->pipeline_ops && (f)->pipeline_ops->op) ? \
+                            (f)->pipeline_ops->op((p), ##args) : -ENOIOCTLCMD))
+
 #endif /* S5P_FIMC_H_ */
diff --git a/include/media/s5p_hdmi.h b/include/media/s5p_hdmi.h
index 361a751f73af..181642b8d0a5 100644
--- a/include/media/s5p_hdmi.h
+++ b/include/media/s5p_hdmi.h
@@ -20,6 +20,7 @@ struct i2c_board_info;
  * @hdmiphy_info: template for HDMIPHY I2C device
  * @mhl_bus: controller id for MHL control bus
  * @mhl_info: template for MHL I2C device
+ * @hpd_gpio: GPIO for Hot-Plug-Detect pin
  *
  * NULL pointer for *_info fields indicates that
  * the corresponding chip is not present
@@ -29,6 +30,7 @@ struct s5p_hdmi_platform_data {
         struct i2c_board_info *hdmiphy_info;
         int mhl_bus;
         struct i2c_board_info *mhl_info;
+        int hpd_gpio;
 };
 
 #endif /* S5P_HDMI_H */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 773e527deabe..96058a5a4acc 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -117,8 +117,6 @@ struct saa7146_dev
 {
         struct module                   *module;
 
-        struct list_head                item;
-
         struct v4l2_device              v4l2_dev;
         struct v4l2_ctrl_handler        ctrl_handler;
 
@@ -166,8 +164,6 @@ static inline struct saa7146_dev *to_saa7146_dev(struct v4l2_device *v4l2_dev)
 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
 
 /* from saa7146_core.c */
-extern struct list_head saa7146_devices;
-extern struct mutex saa7146_devices_lock;
 int saa7146_register_extension(struct saa7146_extension*);
 int saa7146_unregister_extension(struct saa7146_extension*);
 struct saa7146_format* saa7146_format_by_fourcc(struct saa7146_dev *dev, int fourcc);
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index d865dcf9879f..6442edc2a151 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -85,12 +85,14 @@ struct soc_camera_host_ops {
         void (*put_formats)(struct soc_camera_device *);
         int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
         int (*get_crop)(struct soc_camera_device *, struct v4l2_crop *);
-        int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *);
+        int (*set_crop)(struct soc_camera_device *, const struct v4l2_crop *);
+        int (*get_selection)(struct soc_camera_device *, struct v4l2_selection *);
+        int (*set_selection)(struct soc_camera_device *, struct v4l2_selection *);
         /*
          * The difference to .set_crop() is, that .set_livecrop is not allowed
          * to change the output sizes
          */
-        int (*set_livecrop)(struct soc_camera_device *, struct v4l2_crop *);
+        int (*set_livecrop)(struct soc_camera_device *, const struct v4l2_crop *);
         int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
         int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
         void (*init_videobuf)(struct videobuf_queue *,
@@ -254,6 +256,16 @@ unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
 unsigned long soc_camera_apply_board_flags(struct soc_camera_link *icl,
                                            const struct v4l2_mbus_config *cfg);
 
+int soc_camera_power_on(struct device *dev, struct soc_camera_link *icl);
+int soc_camera_power_off(struct device *dev, struct soc_camera_link *icl);
+
+static inline int soc_camera_set_power(struct device *dev,
+                                       struct soc_camera_link *icl, bool on)
+{
+        return on ? soc_camera_power_on(dev, icl)
+                  : soc_camera_power_off(dev, icl);
+}
+
 /* This is only temporary here - until v4l2-subdev begins to link to video_device */
 #include <linux/i2c.h>
 static inline struct video_device *soc_camera_i2c_to_vdev(const struct i2c_client *client)
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 58f914a40b20..4ee125bae719 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -183,6 +183,9 @@ enum {
         /* module adv7393: just ident 7393 */
         V4L2_IDENT_ADV7393 = 7393,
 
+        /* module adv7604: just ident 7604 */
+        V4L2_IDENT_ADV7604 = 7604,
+
         /* module saa7706h: just ident 7706 */
         V4L2_IDENT_SAA7706H = 7706,
 
@@ -212,6 +215,9 @@ enum {
         V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
         V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
 
+        /* module ad9389b: just ident 9389 */
+        V4L2_IDENT_AD9389B = 9389,
+
         /* module tda9840: just ident 9840 */
         V4L2_IDENT_TDA9840 = 9840,
 
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index a298ec49ddc4..1a0b2db4c5d3 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -133,7 +133,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
                 struct i2c_adapter *adapter, struct i2c_board_info *info,
                 const unsigned short *probe_addrs);
 
-/* Initialize an v4l2_subdev with data from an i2c_client struct */
+/* Initialize a v4l2_subdev with data from an i2c_client struct */
 void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
                 const struct v4l2_subdev_ops *ops);
 /* Return i2c client address of v4l2_subdev. */
@@ -166,7 +166,7 @@ struct spi_device;
 struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
                 struct spi_master *master, struct spi_board_info *info);
 
-/* Initialize an v4l2_subdev with data from an spi_device struct */
+/* Initialize a v4l2_subdev with data from an spi_device struct */
 void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
                 const struct v4l2_subdev_ops *ops);
 #endif
@@ -212,4 +212,17 @@ const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
                 const struct v4l2_discrete_probe *probe,
                 s32 width, s32 height);
 
+bool v4l_match_dv_timings(const struct v4l2_dv_timings *t1,
+                          const struct v4l2_dv_timings *t2,
+                          unsigned pclock_delta);
+
+bool v4l2_detect_cvt(unsigned frame_height, unsigned hfreq, unsigned vsync,
+                u32 polarities, struct v4l2_dv_timings *fmt);
+
+bool v4l2_detect_gtf(unsigned frame_height, unsigned hfreq, unsigned vsync,
+                u32 polarities, struct v4l2_fract aspect,
+                struct v4l2_dv_timings *fmt);
+
+struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait);
+
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 776605f1cbe2..96509119f28f 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -351,6 +351,29 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
                         u32 id, s32 max, s32 mask, s32 def);
 
+/** v4l2_ctrl_new_std_menu_items() - Create a new standard V4L2 menu control
+  * with driver specific menu.
+  * @hdl:       The control handler.
+  * @ops:       The control ops.
+  * @id:        The control ID.
+  * @max:       The control's maximum value.
+  * @mask:      The control's skip mask for menu controls. This makes it
+  *             easy to skip menu items that are not valid. If bit X is set,
+  *             then menu item X is skipped. Of course, this only works for
+  *             menus with <= 32 menu items. There are no menus that come
+  *             close to that number, so this is OK. Should we ever need more,
+  *             then this will have to be extended to a u64 or a bit array.
+  * @def:       The control's default value.
+  * @qmenu:     The new menu.
+  *
+  * Same as v4l2_ctrl_new_std_menu(), but @qmenu will be the driver specific
+  * menu of this control.
+  *
+  */
+struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,
+                        const struct v4l2_ctrl_ops *ops, u32 id, s32 max,
+                        s32 mask, s32 def, const char * const *qmenu);
+
 /** v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control.
   * @hdl:       The control handler.
   * @ops:       The control ops.
@@ -384,14 +407,28 @@ struct v4l2_ctrl *v4l2_ctrl_add_ctrl(struct v4l2_ctrl_handler *hdl,
   * @hdl:       The control handler.
   * @add:       The control handler whose controls you want to add to
   *             the @hdl control handler.
+  * @filter:    This function will filter which controls should be added.
   *
-  * Does nothing if either of the two is a NULL pointer.
+  * Does nothing if either of the two handlers is a NULL pointer.
+  * If @filter is NULL, then all controls are added. Otherwise only those
+  * controls for which @filter returns true will be added.
   * In case of an error @hdl->error will be set to the error code (if it
   * wasn't set already).
   */
 int v4l2_ctrl_add_handler(struct v4l2_ctrl_handler *hdl,
-                          struct v4l2_ctrl_handler *add);
+                          struct v4l2_ctrl_handler *add,
+                          bool (*filter)(const struct v4l2_ctrl *ctrl));
 
+/** v4l2_ctrl_radio_filter() - Standard filter for radio controls.
+  * @ctrl:      The control that is filtered.
+  *
+  * This will return true for any controls that are valid for radio device
+  * nodes. Those are all of the V4L2_CID_AUDIO_* user controls and all FM
+  * transmitter class controls.
+  *
+  * This function is to be used with v4l2_ctrl_add_handler().
+  */
+bool v4l2_ctrl_radio_filter(const struct v4l2_ctrl *ctrl);
 
 /** v4l2_ctrl_cluster() - Mark all controls in the cluster as belonging to that cluster.
   * @ncontrols: The number of controls in this cluster.
@@ -511,6 +548,29 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
   */
 int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
 
+/** v4l2_ctrl_g_ctrl_int64() - Helper function to get a 64-bit control's value from within a driver.
+  * @ctrl:      The control.
+  *
+  * This returns the control's value safely by going through the control
+  * framework. This function will lock the control's handler, so it cannot be
+  * used from within the &v4l2_ctrl_ops functions.
+  *
+  * This function is for 64-bit integer type controls only.
+  */
+s64 v4l2_ctrl_g_ctrl_int64(struct v4l2_ctrl *ctrl);
+
+/** v4l2_ctrl_s_ctrl_int64() - Helper function to set a 64-bit control's value from within a driver.
+  * @ctrl:      The control.
+  * @val:       The new value.
+  *
+  * This set the control's new value safely by going through the control
+  * framework. This function will lock the control's handler, so it cannot be
+  * used from within the &v4l2_ctrl_ops functions.
+  *
+  * This function is for 64-bit integer type controls only.
+  */
+int v4l2_ctrl_s_ctrl_int64(struct v4l2_ctrl *ctrl, s64 val);
+
 /* Internal helper functions that deal with control events. */
 extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;
 void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new);
@@ -523,7 +583,7 @@ int v4l2_ctrl_log_status(struct file *file, void *fh);
 /* Can be used as a vidioc_subscribe_event function that just subscribes
    control events. */
 int v4l2_ctrl_subscribe_event(struct v4l2_fh *fh,
-                                struct v4l2_event_subscription *sub);
+                                const struct v4l2_event_subscription *sub);
 
 /* Can be used as a poll function that just polls for control events. */
 unsigned int v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait);
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 5c416cdc88d5..95d1c91770f4 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -26,6 +26,12 @@
 #define VFL_TYPE_SUBDEV         3
 #define VFL_TYPE_MAX            4
 
+/* Is this a receiver, transmitter or mem-to-mem? */
+/* Ignored for VFL_TYPE_SUBDEV. */
+#define VFL_DIR_RX              0
+#define VFL_DIR_TX              1
+#define VFL_DIR_M2M             2
+
 struct v4l2_ioctl_callbacks;
 struct video_device;
 struct v4l2_device;
@@ -39,9 +45,6 @@ struct v4l2_ctrl_handler;
 #define V4L2_FL_USES_V4L2_FH    (1)
 /* Use the prio field of v4l2_fh for core priority checking */
 #define V4L2_FL_USE_FH_PRIO     (2)
-/* If ioctl core locking is in use, then apply that also to all
-   file operations. Don't use this flag in new drivers! */
-#define V4L2_FL_LOCK_ALL_FOPS   (3)
 
 /* Priority helper functions */
 
@@ -108,7 +111,8 @@ struct video_device
 
         /* device info */
         char name[32];
-        int vfl_type;
+        int vfl_type;   /* device type */
+        int vfl_dir;    /* receiver, transmitter or m2m */
         /* 'minor' is set to -1 if the registration failed */
         int minor;
         u16 num;
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index 2885a810a128..e7c5d170a9cd 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -124,10 +124,10 @@ void v4l2_event_queue(struct video_device *vdev, const struct v4l2_event *ev);
 void v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *ev);
 int v4l2_event_pending(struct v4l2_fh *fh);
 int v4l2_event_subscribe(struct v4l2_fh *fh,
-                         struct v4l2_event_subscription *sub, unsigned elems,
+                         const struct v4l2_event_subscription *sub, unsigned elems,
                          const struct v4l2_subscribed_event_ops *ops);
 int v4l2_event_unsubscribe(struct v4l2_fh *fh,
-                           struct v4l2_event_subscription *sub);
+                           const struct v4l2_event_subscription *sub);
 void v4l2_event_unsubscribe_all(struct v4l2_fh *fh);
 
 #endif /* V4L2_EVENT_H */
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index e614c9c15e56..e48b571ca37d 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -40,8 +40,6 @@ struct v4l2_ioctl_ops {
                                               struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
                                               struct v4l2_fmtdesc *f);
-        int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
 
         /* VIDIOC_G_FMT handlers */
         int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
@@ -64,8 +62,6 @@ struct v4l2_ioctl_ops {
                                            struct v4l2_format *f);
         int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,
                                            struct v4l2_format *f);
-        int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
 
         /* VIDIOC_S_FMT handlers */
         int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
@@ -88,8 +84,6 @@ struct v4l2_ioctl_ops {
                                            struct v4l2_format *f);
         int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh,
                                            struct v4l2_format *f);
-        int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
 
         /* VIDIOC_TRY_FMT handlers */
         int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
@@ -112,8 +106,6 @@ struct v4l2_ioctl_ops {
                                              struct v4l2_format *f);
         int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh,
                                              struct v4l2_format *f);
-        int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
 
         /* Buffer handlers */
         int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
@@ -128,7 +120,7 @@ struct v4l2_ioctl_ops {
         int (*vidioc_g_fbuf)   (struct file *file, void *fh,
                                 struct v4l2_framebuffer *a);
         int (*vidioc_s_fbuf)   (struct file *file, void *fh,
-                                struct v4l2_framebuffer *a);
+                                const struct v4l2_framebuffer *a);
 
                 /* Stream on/off */
         int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i);
@@ -175,7 +167,7 @@ struct v4l2_ioctl_ops {
         int (*vidioc_g_audio)          (struct file *file, void *fh,
                                         struct v4l2_audio *a);
         int (*vidioc_s_audio)          (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
+                                        const struct v4l2_audio *a);
 
         /* Audio out ioctls */
         int (*vidioc_enumaudout)       (struct file *file, void *fh,
@@ -183,18 +175,18 @@ struct v4l2_ioctl_ops {
         int (*vidioc_g_audout)         (struct file *file, void *fh,
                                         struct v4l2_audioout *a);
         int (*vidioc_s_audout)         (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
+                                        const struct v4l2_audioout *a);
         int (*vidioc_g_modulator)      (struct file *file, void *fh,
                                         struct v4l2_modulator *a);
         int (*vidioc_s_modulator)      (struct file *file, void *fh,
-                                        struct v4l2_modulator *a);
+                                        const struct v4l2_modulator *a);
         /* Crop ioctls */
         int (*vidioc_cropcap)          (struct file *file, void *fh,
                                         struct v4l2_cropcap *a);
         int (*vidioc_g_crop)           (struct file *file, void *fh,
                                         struct v4l2_crop *a);
         int (*vidioc_s_crop)           (struct file *file, void *fh,
-                                        struct v4l2_crop *a);
+                                        const struct v4l2_crop *a);
         int (*vidioc_g_selection)      (struct file *file, void *fh,
                                         struct v4l2_selection *s);
         int (*vidioc_s_selection)      (struct file *file, void *fh,
@@ -203,7 +195,7 @@ struct v4l2_ioctl_ops {
         int (*vidioc_g_jpegcomp)       (struct file *file, void *fh,
                                         struct v4l2_jpegcompression *a);
         int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,
-                                        struct v4l2_jpegcompression *a);
+                                        const struct v4l2_jpegcompression *a);
         int (*vidioc_g_enc_index)      (struct file *file, void *fh,
                                         struct v4l2_enc_idx *a);
         int (*vidioc_encoder_cmd)      (struct file *file, void *fh,
@@ -241,7 +233,7 @@ struct v4l2_ioctl_ops {
         int (*vidioc_log_status)       (struct file *file, void *fh);
 
         int (*vidioc_s_hw_freq_seek)   (struct file *file, void *fh,
-                                        struct v4l2_hw_freq_seek *a);
+                                        const struct v4l2_hw_freq_seek *a);
 
         /* Debugging ioctls */
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -281,9 +273,9 @@ struct v4l2_ioctl_ops {
                                     struct v4l2_dv_timings_cap *cap);
 
         int (*vidioc_subscribe_event)  (struct v4l2_fh *fh,
-                                        struct v4l2_event_subscription *sub);
+                                        const struct v4l2_event_subscription *sub);
         int (*vidioc_unsubscribe_event)(struct v4l2_fh *fh,
-                                        struct v4l2_event_subscription *sub);
+                                        const struct v4l2_event_subscription *sub);
 
         /* For other private ioctls */
         long (*vidioc_default)         (struct file *file, void *fh,
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 16ac4733e80d..131cc4a53675 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb);
 static inline
 unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return m2m_ctx->cap_q_ctx.num_rdy;
+        return m2m_ctx->out_q_ctx.num_rdy;
 }
 
 /**
@@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
 static inline
 unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
 {
-        return m2m_ctx->out_q_ctx.num_rdy;
+        return m2m_ctx->cap_q_ctx.num_rdy;
 }
 
 void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index c35a3545e273..b137a5e1151a 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -21,6 +21,7 @@
 #ifndef _V4L2_SUBDEV_H
 #define _V4L2_SUBDEV_H
 
+#include <linux/types.h>
 #include <linux/v4l2-subdev.h>
 #include <media/media-entity.h>
 #include <media/v4l2-common.h>
@@ -45,6 +46,7 @@ struct v4l2_fh;
 struct v4l2_subdev;
 struct v4l2_subdev_fh;
 struct tuner_setup;
+struct v4l2_mbus_frame_desc;
 
 /* decode_vbi_line */
 struct v4l2_decode_vbi_line {
@@ -120,7 +122,7 @@ struct v4l2_subdev_io_pin_config {
         each pin being configured.  This function could be called at times
         other than just subdevice initialization.
 
-   init: initialize the sensor registors to some sort of reasonable default
+   init: initialize the sensor registers to some sort of reasonable default
         values. Do not use for new drivers and should be removed in existing
         drivers.
 
@@ -194,7 +196,7 @@ struct v4l2_subdev_tuner_ops {
         int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
         int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
         int (*g_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm);
-        int (*s_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm);
+        int (*s_modulator)(struct v4l2_subdev *sd, const struct v4l2_modulator *vm);
         int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
         int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
 };
@@ -226,6 +228,36 @@ struct v4l2_subdev_audio_ops {
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
 };
 
+/* Indicates the @length field specifies maximum data length. */
+#define V4L2_MBUS_FRAME_DESC_FL_LEN_MAX         (1U << 0)
+/* Indicates user defined data format, i.e. non standard frame format. */
+#define V4L2_MBUS_FRAME_DESC_FL_BLOB            (1U << 1)
+
+/**
+ * struct v4l2_mbus_frame_desc_entry - media bus frame description structure
+ * @flags: V4L2_MBUS_FRAME_DESC_FL_* flags
+ * @pixelcode: media bus pixel code, valid if FRAME_DESC_FL_BLOB is not set
+ * @length: number of octets per frame, valid for compressed or unspecified
+ *          formats
+ */
+struct v4l2_mbus_frame_desc_entry {
+        u16 flags;
+        u32 pixelcode;
+        u32 length;
+};
+
+#define V4L2_FRAME_DESC_ENTRY_MAX       4
+
+/**
+ * struct v4l2_mbus_frame_desc - media bus data frame description
+ * @entry: frame descriptors array
+ * @num_entries: number of entries in @entry array
+ */
+struct v4l2_mbus_frame_desc {
+        struct v4l2_mbus_frame_desc_entry entry[V4L2_FRAME_DESC_ENTRY_MAX];
+        unsigned short num_entries;
+};
+
 /*
    s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
         video input devices.
@@ -274,6 +306,10 @@ struct v4l2_subdev_audio_ops {
    s_mbus_config: set a certain mediabus configuration. This operation is added
         for compatibility with soc-camera drivers and should not be used by new
         software.
+
+   s_rx_buffer: set a host allocated memory buffer for the subdev. The subdev
+        can adjust @size to a lower value and must not write more data to the
+        buffer starting at @data than the original value of @size.
  */
 struct v4l2_subdev_video_ops {
         int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
@@ -286,7 +322,7 @@ struct v4l2_subdev_video_ops {
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
         int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
         int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
-        int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
+        int (*s_crop)(struct v4l2_subdev *sd, const struct v4l2_crop *crop);
         int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*g_frame_interval)(struct v4l2_subdev *sd,
@@ -327,6 +363,8 @@ struct v4l2_subdev_video_ops {
                              struct v4l2_mbus_config *cfg);
         int (*s_mbus_config)(struct v4l2_subdev *sd,
                              const struct v4l2_mbus_config *cfg);
+        int (*s_rx_buffer)(struct v4l2_subdev *sd, void *buf,
+                           unsigned int *size);
 };
 
 /*
@@ -455,6 +493,12 @@ struct v4l2_subdev_ir_ops {
                                 struct v4l2_subdev_ir_parameters *params);
 };
 
+/**
+ * struct v4l2_subdev_pad_ops - v4l2-subdev pad level operations
+ * @get_frame_desc: get the current low level media bus frame parameters.
+ * @get_frame_desc: set the low level media bus frame parameters, @fd array
+ *                  may be adjusted by the subdev driver to device capabilities.
+ */
 struct v4l2_subdev_pad_ops {
         int (*enum_mbus_code)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
                               struct v4l2_subdev_mbus_code_enum *code);
@@ -476,11 +520,17 @@ struct v4l2_subdev_pad_ops {
                              struct v4l2_subdev_selection *sel);
         int (*set_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
                              struct v4l2_subdev_selection *sel);
+        int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid);
+        int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid);
 #ifdef CONFIG_MEDIA_CONTROLLER
         int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link,
                              struct v4l2_subdev_format *source_fmt,
                              struct v4l2_subdev_format *sink_fmt);
 #endif /* CONFIG_MEDIA_CONTROLLER */
+        int (*get_frame_desc)(struct v4l2_subdev *sd, unsigned int pad,
+                              struct v4l2_mbus_frame_desc *fd);
+        int (*set_frame_desc)(struct v4l2_subdev *sd, unsigned int pad,
+                              struct v4l2_mbus_frame_desc *fd);
 };
 
 struct v4l2_subdev_ops {
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index bf365721d6b0..d63965a1faaf 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -45,9 +45,7 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
                           void *adapter_priv,
                           struct device *device,
                           short *adapter_nr,
-                          int mfe_shared,
-                          int (*fe_ioctl_override)(struct dvb_frontend *,
-                                        unsigned int, void *, unsigned int));
+                          int mfe_shared);
 
 void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);
 
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 8dd9b6cc296b..e04252a9fea6 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -324,7 +324,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
 int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
 int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
 
-int vb2_queue_init(struct vb2_queue *q);
+int __must_check vb2_queue_init(struct vb2_queue *q);
 
 void vb2_queue_release(struct vb2_queue *q);
 
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
deleted file mode 100644
index 192f8fb7d546..000000000000
--- a/include/mtd/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-header-y += inftl-user.h
-header-y += mtd-abi.h
-header-y += mtd-user.h
-header-y += nftl-user.h
-header-y += ubi-user.h
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1b4989082244..f8cd4cf3fad8 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1218,6 +1218,7 @@ struct cfg80211_deauth_request {
         const u8 *ie;
         size_t ie_len;
         u16 reason_code;
+        bool local_state_change;
 };
 
 /**
diff --git a/include/net/flow.h b/include/net/flow.h
index e1dd5082ec7e..628e11b98c58 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -21,6 +21,7 @@ struct flowi_common {
         __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC               0x01
 #define FLOWI_FLAG_CAN_SLEEP            0x02
+#define FLOWI_FLAG_KNOWN_NH             0x04
         __u32   flowic_secid;
 };
 
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 926142ed8d7a..9497be1ad4c0 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -102,6 +102,7 @@ struct fib_info {
         unsigned char           fib_dead;
         unsigned char           fib_protocol;
         unsigned char           fib_scope;
+        unsigned char           fib_type;
         __be32                  fib_prefsrc;
         u32                     fib_priority;
         u32                     *fib_metrics;
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 4faf6612ecac..95e646641184 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -257,10 +257,12 @@ static inline struct net *read_pnet(struct net * const *pnet)
 #define __net_init
 #define __net_exit
 #define __net_initdata
+#define __net_initconst
 #else
 #define __net_init      __init
 #define __net_exit      __exit_refok
 #define __net_initdata  __initdata
+#define __net_initconst __initconst
 #endif
 
 struct pernet_operations {
diff --git a/include/net/route.h b/include/net/route.h
index da22243d2760..bc40b633a5c4 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -48,7 +48,8 @@ struct rtable {
         int                     rt_genid;
         unsigned int            rt_flags;
         __u16                   rt_type;
-        __u16                   rt_is_input;
+        __u8                    rt_is_input;
+        __u8                    rt_uses_gateway;
 
         int                     rt_iif;
 
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0fef00f5d3ce..64158aa1bb5f 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1068,7 +1068,7 @@ void sctp_outq_init(struct sctp_association *, struct sctp_outq *);
 void sctp_outq_teardown(struct sctp_outq *);
 void sctp_outq_free(struct sctp_outq*);
 int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk);
-int sctp_outq_sack(struct sctp_outq *, struct sctp_sackhdr *);
+int sctp_outq_sack(struct sctp_outq *, struct sctp_chunk *);
 int sctp_outq_is_empty(const struct sctp_outq *);
 void sctp_outq_restart(struct sctp_outq *);
 
diff --git a/include/rdma/rdma_netlink.h b/include/rdma/rdma_netlink.h
index 3c5363ab867b..bd3d8b24b420 100644
--- a/include/rdma/rdma_netlink.h
+++ b/include/rdma/rdma_netlink.h
@@ -39,6 +39,7 @@ struct rdma_cm_id_stats {
 
 struct ibnl_client_cbs {
         int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb);
+        struct module *module;
 };
 
 int ibnl_init(void);
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 0d7d67e96d43..9c8702942b61 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -127,6 +127,9 @@ struct fcp_txrdy {
  *
  * All response frames will always contain the fcp_resp template.  Some
  * will also include the fcp_resp_len template.
+ *
+ * From Table 23, the FCP_RSP_INFO can either be 4 bytes or 8 bytes, both
+ * are valid length.
  */
 struct fcp_resp {
         __u8            _fr_resvd[8];   /* reserved */
@@ -156,6 +159,9 @@ struct fcp_resp_rsp_info {
     __u8      _fr_resvd2[4];      /* reserved */
 };
 
+#define FCP_RESP_RSP_INFO_LEN4    4 /* without reserved field */
+#define FCP_RESP_RSP_INFO_LEN8    8 /* with reserved field */
+
 struct fcp_resp_with_ext {
         struct fcp_resp resp;
         struct fcp_resp_ext ext;
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 22b07cc99808..8742d853a3b8 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -327,7 +327,6 @@ struct fcoe_percpu_s {
  * @lport:                     The associated local port
  * @fcoe_pending_queue:        The pending Rx queue of skbs
  * @fcoe_pending_queue_active: Indicates if the pending queue is active
- * @priority:                  Packet priority (DCB)
  * @max_queue_depth:           Max queue depth of pending queue
  * @min_queue_depth:           Min queue depth of pending queue
  * @timer:                     The queue timer
@@ -343,7 +342,6 @@ struct fcoe_port {
         struct fc_lport       *lport;
         struct sk_buff_head   fcoe_pending_queue;
         u8                    fcoe_pending_queue_active;
-        u8                    priority;
         u32                   max_queue_depth;
         u32                   min_queue_depth;
         struct timer_list     timer;
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index ac06cc595890..de5f5d8f1f8a 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -132,18 +132,10 @@ struct scsi_cmnd {
         unsigned char tag;      /* SCSI-II queued command tag */
 };
 
+/* make sure not to use it with REQ_TYPE_BLOCK_PC commands */
 static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
 {
-        struct scsi_driver **sdp;
-
-        if (!cmd->request->rq_disk)
-                return NULL;
-
-        sdp = (struct scsi_driver **)cmd->request->rq_disk->private_data;
-        if (!sdp)
-                return NULL;
-
-        return *sdp;
+        return *(struct scsi_driver **)cmd->request->rq_disk->private_data;
 }
 
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index fdeb8dceec0f..d315a08d6c6d 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -422,6 +422,7 @@
  */
 
 struct snd_ac97;
+struct snd_pcm_chmap;
 
 struct snd_ac97_build_ops {
         int (*build_3d) (struct snd_ac97 *ac97);
@@ -528,6 +529,8 @@ struct snd_ac97 {
         struct delayed_work power_work;
 #endif
         struct device dev;
+
+        struct snd_pcm_chmap *chmaps[2]; /* channel-maps (optional) */
 };
 
 #define to_ac97_t(d) container_of(d, struct snd_ac97, dev)
diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h
index a7d8dc782e7c..abdf609c5918 100644
--- a/include/sound/ad1816a.h
+++ b/include/sound/ad1816a.h
@@ -147,6 +147,9 @@ struct snd_ad1816a {
         unsigned int c_dma_size;
 
         struct snd_timer *timer;
+#ifdef CONFIG_PM
+        unsigned short image[48];
+#endif
 };
 
 
@@ -165,11 +168,15 @@ struct snd_ad1816a {
 
 extern int snd_ad1816a_create(struct snd_card *card, unsigned long port,
                               int irq, int dma1, int dma2,
-                              struct snd_ad1816a **chip);
+                              struct snd_ad1816a *chip);
 
 extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm);
 extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);
 extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
                              struct snd_timer **rtimer);
+#ifdef CONFIG_PM
+extern void snd_ad1816a_suspend(struct snd_ad1816a *chip);
+extern void snd_ad1816a_resume(struct snd_ad1816a *chip);
+#endif
 
 #endif  /* __SOUND_AD1816A_H */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 0876a1e76aef..dfe7d441748c 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -472,6 +472,45 @@ enum {
         SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
 };
 
+/* channel positions */
+enum {
+        SNDRV_CHMAP_UNKNOWN = 0,
+        SNDRV_CHMAP_NA,         /* N/A, silent */
+        SNDRV_CHMAP_MONO,       /* mono stream */
+        /* this follows the alsa-lib mixer channel value + 3 */
+        SNDRV_CHMAP_FL,         /* front left */
+        SNDRV_CHMAP_FR,         /* front right */
+        SNDRV_CHMAP_RL,         /* rear left */
+        SNDRV_CHMAP_RR,         /* rear right */
+        SNDRV_CHMAP_FC,         /* front center */
+        SNDRV_CHMAP_LFE,        /* LFE */
+        SNDRV_CHMAP_SL,         /* side left */
+        SNDRV_CHMAP_SR,         /* side right */
+        SNDRV_CHMAP_RC,         /* rear center */
+        /* new definitions */
+        SNDRV_CHMAP_FLC,        /* front left center */
+        SNDRV_CHMAP_FRC,        /* front right center */
+        SNDRV_CHMAP_RLC,        /* rear left center */
+        SNDRV_CHMAP_RRC,        /* rear right center */
+        SNDRV_CHMAP_FLW,        /* front left wide */
+        SNDRV_CHMAP_FRW,        /* front right wide */
+        SNDRV_CHMAP_FLH,        /* front left high */
+        SNDRV_CHMAP_FCH,        /* front center high */
+        SNDRV_CHMAP_FRH,        /* front right high */
+        SNDRV_CHMAP_TC,         /* top center */
+        SNDRV_CHMAP_TFL,        /* top front left */
+        SNDRV_CHMAP_TFR,        /* top front right */
+        SNDRV_CHMAP_TFC,        /* top front center */
+        SNDRV_CHMAP_TRL,        /* top rear left */
+        SNDRV_CHMAP_TRR,        /* top rear right */
+        SNDRV_CHMAP_TRC,        /* top rear center */
+        SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
+};
+
+#define SNDRV_CHMAP_POSITION_MASK       0xffff
+#define SNDRV_CHMAP_PHASE_INVERSE       (0x01 << 16)
+#define SNDRV_CHMAP_DRIVER_SPEC         (0x02 << 16)
+
 #define SNDRV_PCM_IOCTL_PVERSION        _IOR('A', 0x00, int)
 #define SNDRV_PCM_IOCTL_INFO            _IOR('A', 0x01, struct snd_pcm_info)
 #define SNDRV_PCM_IOCTL_TSTAMP          _IOW('A', 0x02, int)
diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
index 48f2a1ff2bbc..f2912abacdf3 100644
--- a/include/sound/compress_driver.h
+++ b/include/sound/compress_driver.h
@@ -61,6 +61,7 @@ struct snd_compr_runtime {
         u64 total_bytes_available;
         u64 total_bytes_transferred;
         wait_queue_head_t sleep;
+        void *private_data;
 };
 
 /**
diff --git a/include/sound/compress_params.h b/include/sound/compress_params.h
index da4a456de032..602dc6c45d1a 100644
--- a/include/sound/compress_params.h
+++ b/include/sound/compress_params.h
@@ -72,6 +72,7 @@
 #define SND_AUDIOCODEC_IEC61937              ((__u32) 0x0000000B)
 #define SND_AUDIOCODEC_G723_1                ((__u32) 0x0000000C)
 #define SND_AUDIOCODEC_G729                  ((__u32) 0x0000000D)
+#define SND_AUDIOCODEC_MAX                   SND_AUDIOCODEC_G729
 
 /*
  * Profile and modes are listed with bit masks. This allows for a
diff --git a/include/sound/da9055.h b/include/sound/da9055.h
new file mode 100644
index 000000000000..cf1241b64d89
--- /dev/null
+++ b/include/sound/da9055.h
@@ -0,0 +1,33 @@
+/*
+ * DA9055 ALSA Soc codec driver
+ *
+ * Copyright (c) 2012 Dialog Semiconductor
+ *
+ * Tested on (Samsung SMDK6410 board + DA9055 EVB) using I2S and I2C
+ * Written by David Chen <david.chen@diasemi.com> and
+ * Ashish Chavan <ashish.chavan@kpitcummins.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef __SOUND_DA9055_H__
+#define __SOUND_DA9055_H__
+
+enum da9055_micbias_voltage {
+        DA9055_MICBIAS_1_6V = 0,
+        DA9055_MICBIAS_1_8V = 1,
+        DA9055_MICBIAS_2_1V = 2,
+        DA9055_MICBIAS_2_2V = 3,
+};
+
+struct da9055_platform_data {
+        /* Selects which of the two MicBias pins acts as the bias source */
+        bool micbias_source;
+        /* Selects the micbias voltage */
+        enum da9055_micbias_voltage micbias;
+};
+
+#endif
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 4f865df42f0f..1a33f48ebe78 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1788,7 +1788,7 @@ struct snd_emu10k1 {
         unsigned int efx_voices_mask[2];
         unsigned int next_free_voice;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         unsigned int *saved_ptr;
         unsigned int *saved_gpr;
         unsigned int *tram_val_saved;
@@ -1856,7 +1856,7 @@ unsigned short snd_emu10k1_ac97_read(struct snd_ac97 *ac97, unsigned short reg);
 void snd_emu10k1_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short data);
 unsigned int snd_emu10k1_rate_to_pitch(unsigned int rate);
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu);
 void snd_emu10k1_resume_init(struct snd_emu10k1 *emu);
 void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu);
diff --git a/include/sound/initval.h b/include/sound/initval.h
index f99a0d2ddfe7..ac62c67e6f42 100644
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -50,6 +50,20 @@
 #define SNDRV_DEFAULT_DMA_SIZE  { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
 #define SNDRV_DEFAULT_PTR       SNDRV_DEFAULT_STR
 
+#ifdef SNDRV_LEGACY_FIND_FREE_IOPORT
+static long snd_legacy_find_free_ioport(long *port_table, long size)
+{
+        while (*port_table != -1) {
+                if (request_region(*port_table, size, "ALSA test")) {
+                        release_region(*port_table, size);
+                        return *port_table;
+                }
+                port_table++;
+        }
+        return -1;
+}
+#endif
+
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
 #include <linux/interrupt.h>
 
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index c42506212649..844af65af626 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -98,8 +98,10 @@ static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
 /*
  * return the physical address at the corresponding offset
  */
-static inline dma_addr_t snd_sgbuf_get_addr(struct snd_sg_buf *sgbuf, size_t offset)
+static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,
+                                           size_t offset)
 {
+        struct snd_sg_buf *sgbuf = dmab->private_data;
         dma_addr_t addr = sgbuf->table[offset >> PAGE_SHIFT].addr;
         addr &= PAGE_MASK;
         return addr + offset % PAGE_SIZE;
@@ -108,10 +110,31 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_sg_buf *sgbuf, size_t off
 /*
  * return the virtual address at the corresponding offset
  */
-static inline void *snd_sgbuf_get_ptr(struct snd_sg_buf *sgbuf, size_t offset)
+static inline void *snd_sgbuf_get_ptr(struct snd_dma_buffer *dmab,
+                                     size_t offset)
 {
+        struct snd_sg_buf *sgbuf = dmab->private_data;
         return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE;
 }
+
+unsigned int snd_sgbuf_get_chunk_size(struct snd_dma_buffer *dmab,
+                                      unsigned int ofs, unsigned int size);
+#else
+/* non-SG versions */
+static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,
+                                            size_t offset)
+{
+        return dmab->addr + offset;
+}
+
+static inline void *snd_sgbuf_get_ptr(struct snd_dma_buffer *dmab,
+                                      size_t offset)
+{
+        return dmab->area + offset;
+}
+
+#define snd_sgbuf_get_chunk_size(dmab, ofs, size)       (size)
+
 #endif /* CONFIG_SND_DMA_SGBUF */
 
 /* allocate/release a buffer */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index d0711bc8c914..6268a4192d5c 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -437,6 +437,7 @@ struct snd_pcm_str {
         struct snd_info_entry *proc_xrun_debug_entry;
 #endif
 #endif
+        struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */
 };
 
 struct snd_pcm {
@@ -982,53 +983,42 @@ static int snd_pcm_lib_alloc_vmalloc_32_buffer
         _snd_pcm_lib_alloc_vmalloc_buffer \
                         (subs, size, GFP_KERNEL | GFP_DMA32 | __GFP_ZERO)
 
+#define snd_pcm_get_dma_buf(substream) ((substream)->runtime->dma_buffer_p)
+
 #ifdef CONFIG_SND_DMA_SGBUF
 /*
  * SG-buffer handling
  */
 #define snd_pcm_substream_sgbuf(substream) \
-        ((substream)->runtime->dma_buffer_p->private_data)
-
-static inline dma_addr_t
-snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)
-{
-        struct snd_sg_buf *sg = snd_pcm_substream_sgbuf(substream);
-        return snd_sgbuf_get_addr(sg, ofs);
-}
-
-static inline void *
-snd_pcm_sgbuf_get_ptr(struct snd_pcm_substream *substream, unsigned int ofs)
-{
-        struct snd_sg_buf *sg = snd_pcm_substream_sgbuf(substream);
-        return snd_sgbuf_get_ptr(sg, ofs);
-}
+        snd_pcm_get_dma_buf(substream)->private_data
 
 struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream,
                                     unsigned long offset);
-unsigned int snd_pcm_sgbuf_get_chunk_size(struct snd_pcm_substream *substream,
-                                          unsigned int ofs, unsigned int size);
-
 #else /* !SND_DMA_SGBUF */
 /*
  * fake using a continuous buffer
  */
+#define snd_pcm_sgbuf_ops_page  NULL
+#endif /* SND_DMA_SGBUF */
+
 static inline dma_addr_t
 snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)
 {
-        return substream->runtime->dma_addr + ofs;
+        return snd_sgbuf_get_addr(snd_pcm_get_dma_buf(substream), ofs);
 }
 
 static inline void *
 snd_pcm_sgbuf_get_ptr(struct snd_pcm_substream *substream, unsigned int ofs)
 {
-        return substream->runtime->dma_area + ofs;
+        return snd_sgbuf_get_ptr(snd_pcm_get_dma_buf(substream), ofs);
 }
 
-#define snd_pcm_sgbuf_ops_page  NULL
-
-#define snd_pcm_sgbuf_get_chunk_size(subs, ofs, size)   (size)
-
-#endif /* SND_DMA_SGBUF */
+static inline unsigned int
+snd_pcm_sgbuf_get_chunk_size(struct snd_pcm_substream *substream,
+                             unsigned int ofs, unsigned int size)
+{
+        return snd_sgbuf_get_chunk_size(snd_pcm_get_dma_buf(substream), ofs, size);
+}
 
 /* handle mmap counter - PCM mmap callback should handle this counter properly */
 static inline void snd_pcm_mmap_data_open(struct vm_area_struct *area)
@@ -1086,4 +1076,51 @@ static inline const char *snd_pcm_stream_str(struct snd_pcm_substream *substream
                 return "Capture";
 }
 
+/*
+ * PCM channel-mapping control API
+ */
+/* array element of channel maps */
+struct snd_pcm_chmap_elem {
+        unsigned char channels;
+        unsigned char map[15];
+};
+
+/* channel map information; retrieved via snd_kcontrol_chip() */
+struct snd_pcm_chmap {
+        struct snd_pcm *pcm;    /* assigned PCM instance */
+        int stream;             /* PLAYBACK or CAPTURE */
+        struct snd_kcontrol *kctl;
+        const struct snd_pcm_chmap_elem *chmap;
+        unsigned int max_channels;
+        unsigned int channel_mask;      /* optional: active channels bitmask */
+        void *private_data;     /* optional: private data pointer */
+};
+
+/* get the PCM substream assigned to the given chmap info */
+static inline struct snd_pcm_substream *
+snd_pcm_chmap_substream(struct snd_pcm_chmap *info, unsigned int idx)
+{
+        struct snd_pcm_substream *s;
+        for (s = info->pcm->streams[info->stream].substream; s; s = s->next)
+                if (s->number == idx)
+                        return s;
+        return NULL;
+}
+
+/* ALSA-standard channel maps (RL/RR prior to C/LFE) */
+extern const struct snd_pcm_chmap_elem snd_pcm_std_chmaps[];
+/* Other world's standard channel maps (C/LFE prior to RL/RR) */
+extern const struct snd_pcm_chmap_elem snd_pcm_alt_chmaps[];
+
+/* bit masks to be passed to snd_pcm_chmap.channel_mask field */
+#define SND_PCM_CHMAP_MASK_24   ((1U << 2) | (1U << 4))
+#define SND_PCM_CHMAP_MASK_246  (SND_PCM_CHMAP_MASK_24 | (1U << 6))
+#define SND_PCM_CHMAP_MASK_2468 (SND_PCM_CHMAP_MASK_246 | (1U << 8))
+
+int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
+                           const struct snd_pcm_chmap_elem *chmap,
+                           int max_channels,
+                           unsigned long private_value,
+                           struct snd_pcm_chmap **info_ret);
+
 #endif /* __SOUND_PCM_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 1f69e0af2941..628db7bca4fd 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -18,6 +18,7 @@
 
 struct snd_pcm_substream;
 struct snd_soc_dapm_widget;
+struct snd_compr_stream;
 
 /*
  * DAI hardware audio formats.
@@ -205,6 +206,8 @@ struct snd_soc_dai_driver {
         int (*remove)(struct snd_soc_dai *dai);
         int (*suspend)(struct snd_soc_dai *dai);
         int (*resume)(struct snd_soc_dai *dai);
+        /* compress dai */
+        bool compress_dai;
 
         /* ops */
         const struct snd_soc_dai_ops *ops;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index abe373d57adc..e1ef63d4a5c4 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -244,10 +244,11 @@ struct device;
 {       .id = snd_soc_dapm_supply, .name = wname, .reg = wreg,  \
         .shift = wshift, .invert = winvert, .event = wevent, \
         .event_flags = wflags}
-#define SND_SOC_DAPM_REGULATOR_SUPPLY(wname, wdelay) \
+#define SND_SOC_DAPM_REGULATOR_SUPPLY(wname, wdelay, wflags)        \
 {       .id = snd_soc_dapm_regulator_supply, .name = wname, \
         .reg = SND_SOC_NOPM, .shift = wdelay, .event = dapm_regulator_event, \
-        .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD }
+        .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD, \
+        .invert = wflags}
 
 
 /* dapm kcontrol types */
@@ -319,6 +320,9 @@ struct device;
 #define SND_SOC_DAPM_EVENT_OFF(e)       \
         (e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD))
 
+/* regulator widget flags */
+#define SND_SOC_DAPM_REGULATOR_BYPASS     0x1     /* bypass when disabled */
+
 struct snd_soc_dapm_widget;
 enum snd_soc_dapm_type;
 struct snd_soc_dapm_path;
@@ -412,6 +416,7 @@ void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);
 
 /* Mostly internal - should not normally be used */
 void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason);
+void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);
 
 /* dapm path query */
 int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
@@ -510,7 +515,6 @@ struct snd_soc_dapm_widget {
         /* dapm control */
         int reg;                                /* negative reg = no direct dapm */
         unsigned char shift;                    /* bits to shift */
-        unsigned int saved_value;               /* widget saved value */
         unsigned int value;                             /* widget current value */
         unsigned int mask;                      /* non-shifted mask */
         unsigned int on_val;                    /* on state value */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e063380f63a2..91244a096c19 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -20,8 +20,10 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/regmap.h>
+#include <linux/log2.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
+#include <sound/compress_driver.h>
 #include <sound/control.h>
 #include <sound/ac97_codec.h>
 
@@ -159,7 +161,8 @@
                  .platform_max = xmax} }
 #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmax, xtexts) \
 {       .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \
-        .max = xmax, .texts = xtexts }
+        .max = xmax, .texts = xtexts, \
+        .mask = xmax ? roundup_pow_of_two(xmax) - 1 : 0}
 #define SOC_ENUM_SINGLE(xreg, xshift, xmax, xtexts) \
         SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmax, xtexts)
 #define SOC_ENUM_SINGLE_EXT(xmax, xtexts) \
@@ -399,6 +402,7 @@ int snd_soc_platform_read(struct snd_soc_platform *platform,
 int snd_soc_platform_write(struct snd_soc_platform *platform,
                                         unsigned int reg, unsigned int val);
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
+int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);
 
 struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
                 const char *dai_link, int stream);
@@ -632,6 +636,13 @@ struct snd_soc_ops {
         int (*trigger)(struct snd_pcm_substream *, int);
 };
 
+struct snd_soc_compr_ops {
+        int (*startup)(struct snd_compr_stream *);
+        void (*shutdown)(struct snd_compr_stream *);
+        int (*set_params)(struct snd_compr_stream *);
+        int (*trigger)(struct snd_compr_stream *);
+};
+
 /* SoC cache ops */
 struct snd_soc_cache_ops {
         const char *name;
@@ -787,9 +798,12 @@ struct snd_soc_platform_driver {
         snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
                 struct snd_soc_dai *);
 
-        /* platform stream ops */
+        /* platform stream pcm ops */
         struct snd_pcm_ops *ops;
 
+        /* platform stream compress ops */
+        struct snd_compr_ops *compr_ops;
+
         /* platform stream completion event */
         int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
 
@@ -891,6 +905,7 @@ struct snd_soc_dai_link {
 
         /* machine stream operations */
         struct snd_soc_ops *ops;
+        struct snd_soc_compr_ops *compr_ops;
 };
 
 struct snd_soc_codec_conf {
@@ -1027,6 +1042,7 @@ struct snd_soc_pcm_runtime {
 
         /* runtime devices */
         struct snd_pcm *pcm;
+        struct snd_compr *compr;
         struct snd_soc_codec *codec;
         struct snd_soc_platform *platform;
         struct snd_soc_dai *codec_dai;
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index fe8590cac5c2..098c4de44945 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -28,6 +28,7 @@
 #include <media/v4l2-device.h>
 
 #define TEA575X_FMIF    10700
+#define TEA575X_AMIF      450
 
 #define TEA575X_DATA    (1 << 0)
 #define TEA575X_CLK     (1 << 1)
@@ -52,12 +53,14 @@ struct snd_tea575x {
         struct video_device vd;         /* video device */
         int radio_nr;                   /* radio_nr */
         bool tea5759;                   /* 5759 chip is present */
+        bool has_am;                    /* Device can tune to AM freqs */
         bool cannot_read_data;          /* Device cannot read the data pin */
         bool cannot_mute;               /* Device cannot mute */
         bool mute;                      /* Device is muted? */
         bool stereo;                    /* receiving stereo */
         bool tuned;                     /* tuned to a station */
         unsigned int val;               /* hw value */
+        u32 band;                       /* 0: FM, 1: FM-Japan, 2: AM */
         u32 freq;                       /* frequency */
         struct mutex mutex;
         struct snd_tea575x_ops *ops;
@@ -70,5 +73,6 @@ struct snd_tea575x {
 
 int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner);
 void snd_tea575x_exit(struct snd_tea575x *tea);
+void snd_tea575x_set_freq(struct snd_tea575x *tea);
 
 #endif /* __SOUND_TEA575X_TUNER_H */
diff --git a/include/sound/tegra_wm8903.h b/include/sound/tegra_wm8903.h
new file mode 100644
index 000000000000..57b202ee97c3
--- /dev/null
+++ b/include/sound/tegra_wm8903.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011 NVIDIA, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __SOUND_TEGRA_WM38903_H
+#define __SOUND_TEGRA_WM38903_H
+
+struct tegra_wm8903_platform_data {
+        int gpio_spkr_en;
+        int gpio_hp_det;
+        int gpio_hp_mute;
+        int gpio_int_mic_en;
+        int gpio_ext_mic_en;
+};
+
+#endif
diff --git a/include/sound/tlv.h b/include/sound/tlv.h
index a64d8fe3f855..28c65e1ada21 100644
--- a/include/sound/tlv.h
+++ b/include/sound/tlv.h
@@ -86,4 +86,12 @@
 
 #define TLV_DB_GAIN_MUTE        -9999999
 
+/*
+ * channel-mapping TLV items
+ *  TLV length must match with num_channels
+ */
+#define SNDRV_CTL_TLVT_CHMAP_FIXED      0x101   /* fixed channel position */
+#define SNDRV_CTL_TLVT_CHMAP_VAR        0x102   /* channels freely swappable */
+#define SNDRV_CTL_TLVT_CHMAP_PAIRED     0x103   /* pair-wise swappable */
+
 #endif /* __SOUND_TLV_H */
diff --git a/include/sound/version.h b/include/sound/version.h
deleted file mode 100644
index cc75024c1089..000000000000
--- a/include/sound/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* include/version.h */
-#define CONFIG_SND_VERSION "1.0.25"
-#define CONFIG_SND_DATE ""
diff --git a/include/sound/wm0010.h b/include/sound/wm0010.h
new file mode 100644
index 000000000000..3261e90815af
--- /dev/null
+++ b/include/sound/wm0010.h
@@ -0,0 +1,27 @@
+/*
+ * wm0010.h -- Platform data for WM0010 DSP Driver
+ *
+ * Copyright 2012 Wolfson Microelectronics PLC.
+ *
+ * Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#ifndef WM0010_PDATA_H
+#define WM0010_PDATA_H
+
+struct wm0010_pdata {
+        int gpio_reset;
+
+        /* Set if there is an inverter between the GPIO controlling
+         * the reset signal and the device.
+         */
+        int reset_active_high;
+        int irq_flags;
+};
+
+#endif
diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h
index 74e9a95529c5..e8ce8ee7d62d 100644
--- a/include/sound/wm8960.h
+++ b/include/sound/wm8960.h
@@ -18,7 +18,7 @@
 struct wm8960_data {
         bool capless;  /* Headphone outputs configured in capless mode */
 
-        int dres;  /* Discharge resistance for headphone outputs */
+        bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 
 #endif
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h
index eee19f63c0d8..8016fd826f5a 100644
--- a/include/sound/wm8993.h
+++ b/include/sound/wm8993.h
@@ -32,6 +32,10 @@ struct wm8993_platform_data {
         unsigned int lineout1fb:1;
         unsigned int lineout2fb:1;
 
+        /* Delay to add for microphones to stabalise after power up */
+        int micbias1_delay;
+        int micbias2_delay;
+
         /* Microphone biases: 0=0.9*AVDD1 1=0.65*AVVD1 */
         unsigned int micbias1_lvl:1;
         unsigned int micbias2_lvl:1;
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 941c84bf1065..2acd54018b64 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -13,9 +13,6 @@ struct se_subsystem_api {
 
         u8 transport_type;
 
-        unsigned int fua_write_emulated : 1;
-        unsigned int write_cache_emulated : 1;
-
         int (*attach_hba)(struct se_hba *, u32);
         void (*detach_hba)(struct se_hba *);
         int (*pmode_enable_hba)(struct se_hba *, unsigned long);
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 69fb3cfd02d7..81ddb4ae6c3f 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -62,8 +62,6 @@ struct target_core_fabric_ops {
         int (*queue_data_in)(struct se_cmd *);
         int (*queue_status)(struct se_cmd *);
         int (*queue_tm_rsp)(struct se_cmd *);
-        u16 (*set_fabric_sense_len)(struct se_cmd *, u32);
-        u16 (*get_fabric_sense_len)(void);
         /*
          * fabric module calls for target_core_fabric_configfs.c
          */
@@ -102,6 +100,9 @@ void	transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                 struct se_session *, u32, int, int, unsigned char *);
 int     transport_lookup_cmd_lun(struct se_cmd *, u32);
 int     target_setup_cmd_from_cdb(struct se_cmd *, unsigned char *);
+int     target_submit_cmd_map_sgls(struct se_cmd *, struct se_session *,
+                unsigned char *, unsigned char *, u32, u32, int, int, int,
+                struct scatterlist *, u32, struct scatterlist *, u32);
 int     target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
                 unsigned char *, u32, u32, int, int, int);
 int     target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 91b91e805673..54fab041b22a 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -445,6 +445,7 @@ TRACE_EVENT(btrfs_delayed_tree_ref,
                 __field(        u64,  ref_root          )
                 __field(        int,  level             )
                 __field(        int,  type              )
+                __field(        u64,  seq               )
         ),
 
         TP_fast_assign(
@@ -455,17 +456,19 @@ TRACE_EVENT(btrfs_delayed_tree_ref,
                 __entry->ref_root       = full_ref->root;
                 __entry->level          = full_ref->level;
                 __entry->type           = ref->type;
+                __entry->seq            = ref->seq;
         ),
 
         TP_printk("bytenr = %llu, num_bytes = %llu, action = %s, "
                   "parent = %llu(%s), ref_root = %llu(%s), level = %d, "
-                  "type = %s",
+                  "type = %s, seq = %llu",
                   (unsigned long long)__entry->bytenr,
                   (unsigned long long)__entry->num_bytes,
                   show_ref_action(__entry->action),
                   show_root_type(__entry->parent),
                   show_root_type(__entry->ref_root),
-                  __entry->level, show_ref_type(__entry->type))
+                  __entry->level, show_ref_type(__entry->type),
+                  (unsigned long long)__entry->seq)
 );
 
 TRACE_EVENT(btrfs_delayed_data_ref,
@@ -485,6 +488,7 @@ TRACE_EVENT(btrfs_delayed_data_ref,
                 __field(        u64,  owner             )
                 __field(        u64,  offset            )
                 __field(        int,  type              )
+                __field(        u64,  seq               )
         ),
 
         TP_fast_assign(
@@ -496,11 +500,12 @@ TRACE_EVENT(btrfs_delayed_data_ref,
                 __entry->owner          = full_ref->objectid;
                 __entry->offset         = full_ref->offset;
                 __entry->type           = ref->type;
+                __entry->seq            = ref->seq;
         ),
 
         TP_printk("bytenr = %llu, num_bytes = %llu, action = %s, "
                   "parent = %llu(%s), ref_root = %llu(%s), owner = %llu, "
-                  "offset = %llu, type = %s",
+                  "offset = %llu, type = %s, seq = %llu",
                   (unsigned long long)__entry->bytenr,
                   (unsigned long long)__entry->num_bytes,
                   show_ref_action(__entry->action),
@@ -508,7 +513,8 @@ TRACE_EVENT(btrfs_delayed_data_ref,
                   show_root_type(__entry->ref_root),
                   (unsigned long long)__entry->owner,
                   (unsigned long long)__entry->offset,
-                  show_ref_type(__entry->type))
+                  show_ref_type(__entry->type),
+                  (unsigned long long)__entry->seq)
 );
 
 TRACE_EVENT(btrfs_delayed_ref_head,
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 69d8a69ea831..d49b285385e8 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -26,19 +26,19 @@ TRACE_EVENT(ext4_free_inode,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16, mode                     )
                 __field(        uid_t,  uid                     )
                 __field(        gid_t,  gid                     )
                 __field(        __u64, blocks                   )
+                __field(        __u16, mode                     )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->mode   = inode->i_mode;
                 __entry->uid    = i_uid_read(inode);
                 __entry->gid    = i_gid_read(inode);
                 __entry->blocks = inode->i_blocks;
+                __entry->mode   = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu",
@@ -300,10 +300,10 @@ TRACE_EVENT(ext4_da_writepages,
                 __field(        long,   pages_skipped           )
                 __field(        loff_t, range_start             )
                 __field(        loff_t, range_end               )
+                __field(       pgoff_t, writeback_index         )
                 __field(        int,    sync_mode               )
                 __field(        char,   for_kupdate             )
                 __field(        char,   range_cyclic            )
-                __field(       pgoff_t, writeback_index         )
         ),
 
         TP_fast_assign(
@@ -313,14 +313,14 @@ TRACE_EVENT(ext4_da_writepages,
                 __entry->pages_skipped  = wbc->pages_skipped;
                 __entry->range_start    = wbc->range_start;
                 __entry->range_end      = wbc->range_end;
+                __entry->writeback_index = inode->i_mapping->writeback_index;
                 __entry->sync_mode      = wbc->sync_mode;
                 __entry->for_kupdate    = wbc->for_kupdate;
                 __entry->range_cyclic   = wbc->range_cyclic;
-                __entry->writeback_index = inode->i_mapping->writeback_index;
         ),
 
         TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
-                  "range_start %lld range_end %lld sync_mode %d"
+                  "range_start %lld range_end %lld sync_mode %d "
                   "for_kupdate %d range_cyclic %d writeback_index %lu",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->nr_to_write,
@@ -382,8 +382,8 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __field(        int,    ret                     )
                 __field(        int,    pages_written           )
                 __field(        long,   pages_skipped           )
-                __field(        int,    sync_mode               )
                 __field(       pgoff_t, writeback_index         )
+                __field(        int,    sync_mode               )
         ),
 
         TP_fast_assign(
@@ -392,8 +392,8 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __entry->ret            = ret;
                 __entry->pages_written  = pages_written;
                 __entry->pages_skipped  = wbc->pages_skipped;
-                __entry->sync_mode      = wbc->sync_mode;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
+                __entry->sync_mode      = wbc->sync_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
@@ -411,16 +411,16 @@ DECLARE_EVENT_CLASS(ext4__page_op,
         TP_ARGS(page),
 
         TP_STRUCT__entry(
-                __field(        pgoff_t, index                  )
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        pgoff_t, index                  )
 
         ),
 
         TP_fast_assign(
-                __entry->index  = page->index;
-                __entry->ino    = page->mapping->host->i_ino;
                 __entry->dev    = page->mapping->host->i_sb->s_dev;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->index  = page->index;
         ),
 
         TP_printk("dev %d,%d ino %lu page_index %lu",
@@ -456,18 +456,18 @@ TRACE_EVENT(ext4_invalidatepage,
         TP_ARGS(page, offset),
 
         TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        pgoff_t, index                  )
                 __field(        unsigned long, offset           )
-                __field(        ino_t,  ino                     )
-                __field(        dev_t,  dev                     )
 
         ),
 
         TP_fast_assign(
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+                __entry->ino    = page->mapping->host->i_ino;
                 __entry->index  = page->index;
                 __entry->offset = offset;
-                __entry->ino    = page->mapping->host->i_ino;
-                __entry->dev    = page->mapping->host->i_sb->s_dev;
         ),
 
         TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
@@ -510,8 +510,8 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  pa_pstart               )
-                __field(        __u32,  pa_len                  )
                 __field(        __u64,  pa_lstart               )
+                __field(        __u32,  pa_len                  )
 
         ),
 
@@ -519,8 +519,8 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
                 __entry->dev            = ac->ac_sb->s_dev;
                 __entry->ino            = ac->ac_inode->i_ino;
                 __entry->pa_pstart      = pa->pa_pstart;
-                __entry->pa_len         = pa->pa_len;
                 __entry->pa_lstart      = pa->pa_lstart;
+                __entry->pa_len         = pa->pa_len;
         ),
 
         TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu",
@@ -645,7 +645,6 @@ TRACE_EVENT(ext4_request_blocks,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        unsigned int, flags             )
                 __field(        unsigned int, len               )
                 __field(        __u32,  logical                 )
                 __field(        __u32,  lleft                   )
@@ -653,12 +652,12 @@ TRACE_EVENT(ext4_request_blocks,
                 __field(        __u64,  goal                    )
                 __field(        __u64,  pleft                   )
                 __field(        __u64,  pright                  )
+                __field(        unsigned int, flags             )
         ),
 
         TP_fast_assign(
                 __entry->dev    = ar->inode->i_sb->s_dev;
                 __entry->ino    = ar->inode->i_ino;
-                __entry->flags  = ar->flags;
                 __entry->len    = ar->len;
                 __entry->logical = ar->logical;
                 __entry->goal   = ar->goal;
@@ -666,6 +665,7 @@ TRACE_EVENT(ext4_request_blocks,
                 __entry->lright = ar->lright;
                 __entry->pleft  = ar->pleft;
                 __entry->pright = ar->pright;
+                __entry->flags  = ar->flags;
         ),
 
         TP_printk("dev %d,%d ino %lu flags %u len %u lblk %u goal %llu "
@@ -686,7 +686,6 @@ TRACE_EVENT(ext4_allocate_blocks,
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
                 __field(        __u64,  block                   )
-                __field(        unsigned int, flags             )
                 __field(        unsigned int, len               )
                 __field(        __u32,  logical                 )
                 __field(        __u32,  lleft                   )
@@ -694,13 +693,13 @@ TRACE_EVENT(ext4_allocate_blocks,
                 __field(        __u64,  goal                    )
                 __field(        __u64,  pleft                   )
                 __field(        __u64,  pright                  )
+                __field(        unsigned int, flags             )
         ),
 
         TP_fast_assign(
                 __entry->dev    = ar->inode->i_sb->s_dev;
                 __entry->ino    = ar->inode->i_ino;
                 __entry->block  = block;
-                __entry->flags  = ar->flags;
                 __entry->len    = ar->len;
                 __entry->logical = ar->logical;
                 __entry->goal   = ar->goal;
@@ -708,6 +707,7 @@ TRACE_EVENT(ext4_allocate_blocks,
                 __entry->lright = ar->lright;
                 __entry->pleft  = ar->pleft;
                 __entry->pright = ar->pright;
+                __entry->flags  = ar->flags;
         ),
 
         TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %u "
@@ -728,19 +728,19 @@ TRACE_EVENT(ext4_free_blocks,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  mode                    )
                 __field(        __u64,  block                   )
                 __field(        unsigned long,  count           )
                 __field(        int,    flags                   )
+                __field(        __u16,  mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
-                __entry->mode           = inode->i_mode;
                 __entry->block          = block;
                 __entry->count          = count;
                 __entry->flags          = flags;
+                __entry->mode           = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d",
@@ -783,15 +783,15 @@ TRACE_EVENT(ext4_sync_file_exit,
         TP_ARGS(inode, ret),
 
         TP_STRUCT__entry(
-                __field(        int,    ret                     )
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        int,    ret                     )
         ),
 
         TP_fast_assign(
-                __entry->ret            = ret;
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
+                __entry->ret            = ret;
         ),
 
         TP_printk("dev %d,%d ino %lu ret %d",
@@ -854,12 +854,6 @@ TRACE_EVENT(ext4_mballoc_alloc,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  found                   )
-                __field(        __u16,  groups                  )
-                __field(        __u16,  buddy                   )
-                __field(        __u16,  flags                   )
-                __field(        __u16,  tail                    )
-                __field(        __u8,   cr                      )
                 __field(        __u32,  orig_logical            )
                 __field(          int,  orig_start              )
                 __field(        __u32,  orig_group              )
@@ -872,17 +866,17 @@ TRACE_EVENT(ext4_mballoc_alloc,
                 __field(          int,  result_start            )
                 __field(        __u32,  result_group            )
                 __field(          int,  result_len              )
+                __field(        __u16,  found                   )
+                __field(        __u16,  groups                  )
+                __field(        __u16,  buddy                   )
+                __field(        __u16,  flags                   )
+                __field(        __u16,  tail                    )
+                __field(        __u8,   cr                      )
         ),
 
         TP_fast_assign(
                 __entry->dev            = ac->ac_inode->i_sb->s_dev;
                 __entry->ino            = ac->ac_inode->i_ino;
-                __entry->found          = ac->ac_found;
-                __entry->flags          = ac->ac_flags;
-                __entry->groups         = ac->ac_groups_scanned;
-                __entry->buddy          = ac->ac_buddy;
-                __entry->tail           = ac->ac_tail;
-                __entry->cr             = ac->ac_criteria;
                 __entry->orig_logical   = ac->ac_o_ex.fe_logical;
                 __entry->orig_start     = ac->ac_o_ex.fe_start;
                 __entry->orig_group     = ac->ac_o_ex.fe_group;
@@ -895,6 +889,12 @@ TRACE_EVENT(ext4_mballoc_alloc,
                 __entry->result_start   = ac->ac_f_ex.fe_start;
                 __entry->result_group   = ac->ac_f_ex.fe_group;
                 __entry->result_len     = ac->ac_f_ex.fe_len;
+                __entry->found          = ac->ac_found;
+                __entry->flags          = ac->ac_flags;
+                __entry->groups         = ac->ac_groups_scanned;
+                __entry->buddy          = ac->ac_buddy;
+                __entry->tail           = ac->ac_tail;
+                __entry->cr             = ac->ac_criteria;
         ),
 
         TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
@@ -1015,17 +1015,17 @@ TRACE_EVENT(ext4_forget,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  mode                    )
-                __field(        int,    is_metadata             )
                 __field(        __u64,  block                   )
+                __field(        int,    is_metadata             )
+                __field(        __u16,  mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->mode   = inode->i_mode;
-                __entry->is_metadata = is_metadata;
                 __entry->block  = block;
+                __entry->is_metadata = is_metadata;
+                __entry->mode   = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu",
@@ -1042,19 +1042,18 @@ TRACE_EVENT(ext4_da_update_reserve_space,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  mode                    )
                 __field(        __u64,  i_blocks                )
                 __field(        int,    used_blocks             )
                 __field(        int,    reserved_data_blocks    )
                 __field(        int,    reserved_meta_blocks    )
                 __field(        int,    allocated_meta_blocks   )
                 __field(        int,    quota_claim             )
+                __field(        __u16,  mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
                 __entry->used_blocks = used_blocks;
                 __entry->reserved_data_blocks =
@@ -1064,6 +1063,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
                 __entry->allocated_meta_blocks =
                                 EXT4_I(inode)->i_allocated_meta_blocks;
                 __entry->quota_claim = quota_claim;
+                __entry->mode   = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
@@ -1085,21 +1085,21 @@ TRACE_EVENT(ext4_da_reserve_space,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  mode                    )
                 __field(        __u64,  i_blocks                )
                 __field(        int,    md_needed               )
                 __field(        int,    reserved_data_blocks    )
                 __field(        int,    reserved_meta_blocks    )
+                __field(        __u16,  mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
                 __entry->md_needed = md_needed;
                 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
                 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
+                __entry->mode   = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d "
@@ -1119,23 +1119,23 @@ TRACE_EVENT(ext4_da_release_space,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        __u16,  mode                    )
                 __field(        __u64,  i_blocks                )
                 __field(        int,    freed_blocks            )
                 __field(        int,    reserved_data_blocks    )
                 __field(        int,    reserved_meta_blocks    )
                 __field(        int,    allocated_meta_blocks   )
+                __field(        __u16,  mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->mode   = inode->i_mode;
                 __entry->i_blocks = inode->i_blocks;
                 __entry->freed_blocks = freed_blocks;
                 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
                 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
                 __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
+                __entry->mode   = inode->i_mode;
         ),
 
         TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d "
@@ -1203,16 +1203,16 @@ TRACE_EVENT(ext4_direct_IO_enter,
         TP_ARGS(inode, offset, len, rw),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        unsigned long,  len             )
                 __field(        int,    rw                      )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->pos    = offset;
                 __entry->len    = len;
                 __entry->rw     = rw;
@@ -1231,8 +1231,8 @@ TRACE_EVENT(ext4_direct_IO_exit,
         TP_ARGS(inode, offset, len, rw, ret),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        unsigned long,  len             )
                 __field(        int,    rw                      )
@@ -1240,8 +1240,8 @@ TRACE_EVENT(ext4_direct_IO_exit,
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->pos    = offset;
                 __entry->len    = len;
                 __entry->rw     = rw;
@@ -1261,16 +1261,16 @@ TRACE_EVENT(ext4_fallocate_enter,
         TP_ARGS(inode, offset, len, mode),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        loff_t, len                     )
                 __field(        int,    mode                    )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->pos    = offset;
                 __entry->len    = len;
                 __entry->mode   = mode;
@@ -1289,16 +1289,16 @@ TRACE_EVENT(ext4_fallocate_exit,
         TP_ARGS(inode, offset, max_blocks, ret),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        loff_t, pos                     )
                 __field(        unsigned int,   blocks          )
                 __field(        int,    ret                     )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->pos    = offset;
                 __entry->blocks = max_blocks;
                 __entry->ret    = ret;
@@ -1317,17 +1317,17 @@ TRACE_EVENT(ext4_unlink_enter,
         TP_ARGS(parent, dentry),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  parent                  )
+                __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
+                __field(        ino_t,  parent                  )
                 __field(        loff_t, size                    )
-                __field(        dev_t,  dev                     )
         ),
 
         TP_fast_assign(
-                __entry->parent         = parent->i_ino;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
                 __entry->ino            = dentry->d_inode->i_ino;
+                __entry->parent         = parent->i_ino;
                 __entry->size           = dentry->d_inode->i_size;
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
         ),
 
         TP_printk("dev %d,%d ino %lu size %lld parent %lu",
@@ -1342,14 +1342,14 @@ TRACE_EVENT(ext4_unlink_exit,
         TP_ARGS(dentry, ret),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino                     )
                 __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
                 __field(        int,    ret                     )
         ),
 
         TP_fast_assign(
-                __entry->ino            = dentry->d_inode->i_ino;
                 __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ino            = dentry->d_inode->i_ino;
                 __entry->ret            = ret;
         ),
 
@@ -1365,14 +1365,14 @@ DECLARE_EVENT_CLASS(ext4__truncate,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
-                __field(        dev_t,          dev             )
+                __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
                 __field(        __u64,          blocks          )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->blocks = inode->i_blocks;
         ),
 
@@ -1403,8 +1403,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_enter,
         TP_ARGS(inode, map, ux),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    m_lblk  )
                 __field(        unsigned,       m_len   )
                 __field(        ext4_lblk_t,    u_lblk  )
@@ -1413,8 +1413,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_enter,
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
                 __entry->m_lblk         = map->m_lblk;
                 __entry->m_len          = map->m_len;
                 __entry->u_lblk         = le32_to_cpu(ux->ee_block);
@@ -1441,8 +1441,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_fastpath,
         TP_ARGS(inode, map, ux, ix),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    m_lblk  )
                 __field(        unsigned,       m_len   )
                 __field(        ext4_lblk_t,    u_lblk  )
@@ -1454,8 +1454,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_fastpath,
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
                 __entry->m_lblk         = map->m_lblk;
                 __entry->m_len          = map->m_len;
                 __entry->u_lblk         = le32_to_cpu(ux->ee_block);
@@ -1483,16 +1483,16 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_enter,
         TP_ARGS(inode, lblk, len, flags),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
-                __field(        dev_t,          dev             )
+                __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
                 __field(        ext4_lblk_t,    lblk            )
                 __field(        unsigned int,   len             )
                 __field(        unsigned int,   flags           )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->lblk   = lblk;
                 __entry->len    = len;
                 __entry->flags  = flags;
@@ -1525,19 +1525,19 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
         TP_ARGS(inode, lblk, pblk, len, ret),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
                 __field(        dev_t,          dev             )
-                __field(        ext4_lblk_t,    lblk            )
+                __field(        ino_t,          ino             )
                 __field(        ext4_fsblk_t,   pblk            )
+                __field(        ext4_lblk_t,    lblk            )
                 __field(        unsigned int,   len             )
                 __field(        int,            ret             )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
-                __entry->lblk   = lblk;
+                __entry->ino    = inode->i_ino;
                 __entry->pblk   = pblk;
+                __entry->lblk   = lblk;
                 __entry->len    = len;
                 __entry->ret    = ret;
         ),
@@ -1569,17 +1569,17 @@ TRACE_EVENT(ext4_ext_load_extent,
         TP_ARGS(inode, lblk, pblk),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
                 __field(        dev_t,          dev             )
-                __field(        ext4_lblk_t,    lblk            )
+                __field(        ino_t,          ino             )
                 __field(        ext4_fsblk_t,   pblk            )
+                __field(        ext4_lblk_t,    lblk            )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
-                __entry->lblk   = lblk;
+                __entry->ino    = inode->i_ino;
                 __entry->pblk   = pblk;
+                __entry->lblk   = lblk;
         ),
 
         TP_printk("dev %d,%d ino %lu lblk %u pblk %llu",
@@ -1594,13 +1594,13 @@ TRACE_EVENT(ext4_load_inode,
         TP_ARGS(inode),
 
         TP_STRUCT__entry(
-                __field(        ino_t,  ino             )
                 __field(        dev_t,  dev             )
+                __field(        ino_t,  ino             )
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %ld",
@@ -1615,14 +1615,14 @@ TRACE_EVENT(ext4_journal_start,
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
-                __field(          int,  nblocks                 )
                 __field(unsigned long,  ip                      )
+                __field(        int,    nblocks                 )
         ),
 
         TP_fast_assign(
                 __entry->dev     = sb->s_dev;
-                __entry->nblocks = nblocks;
                 __entry->ip      = IP;
+                __entry->nblocks = nblocks;
         ),
 
         TP_printk("dev %d,%d nblocks %d caller %pF",
@@ -1686,23 +1686,23 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
         TP_ARGS(inode, map, allocated, newblock),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
                 __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
+                __field(        int,            flags           )
                 __field(        ext4_lblk_t,    lblk            )
                 __field(        ext4_fsblk_t,   pblk            )
                 __field(        unsigned int,   len             )
-                __field(        int,            flags           )
                 __field(        unsigned int,   allocated       )
                 __field(        ext4_fsblk_t,   newblk          )
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
+                __entry->flags          = map->m_flags;
                 __entry->lblk           = map->m_lblk;
                 __entry->pblk           = map->m_pblk;
                 __entry->len            = map->m_len;
-                __entry->flags          = map->m_flags;
                 __entry->allocated      = allocated;
                 __entry->newblk         = newblock;
         ),
@@ -1724,19 +1724,19 @@ TRACE_EVENT(ext4_get_implied_cluster_alloc_exit,
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev     )
+                __field(        unsigned int,   flags   )
                 __field(        ext4_lblk_t,    lblk    )
                 __field(        ext4_fsblk_t,   pblk    )
                 __field(        unsigned int,   len     )
-                __field(        unsigned int,   flags   )
                 __field(        int,            ret     )
         ),
 
         TP_fast_assign(
                 __entry->dev    = sb->s_dev;
+                __entry->flags  = map->m_flags;
                 __entry->lblk   = map->m_lblk;
                 __entry->pblk   = map->m_pblk;
                 __entry->len    = map->m_len;
-                __entry->flags  = map->m_flags;
                 __entry->ret    = ret;
         ),
 
@@ -1753,16 +1753,16 @@ TRACE_EVENT(ext4_ext_put_in_cache,
         TP_ARGS(inode, lblk, len, start),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    lblk    )
                 __field(        unsigned int,   len     )
                 __field(        ext4_fsblk_t,   start   )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->lblk   = lblk;
                 __entry->len    = len;
                 __entry->start  = start;
@@ -1782,15 +1782,15 @@ TRACE_EVENT(ext4_ext_in_cache,
         TP_ARGS(inode, lblk, ret),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    lblk    )
                 __field(        int,            ret     )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->lblk   = lblk;
                 __entry->ret    = ret;
         ),
@@ -1810,8 +1810,8 @@ TRACE_EVENT(ext4_find_delalloc_range,
         TP_ARGS(inode, from, to, reverse, found, found_blk),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
                 __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
                 __field(        ext4_lblk_t,    from            )
                 __field(        ext4_lblk_t,    to              )
                 __field(        int,            reverse         )
@@ -1820,8 +1820,8 @@ TRACE_EVENT(ext4_find_delalloc_range,
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
                 __entry->from           = from;
                 __entry->to             = to;
                 __entry->reverse        = reverse;
@@ -1844,15 +1844,15 @@ TRACE_EVENT(ext4_get_reserved_cluster_alloc,
         TP_ARGS(inode, lblk, len),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    lblk    )
                 __field(        unsigned int,   len     )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->lblk   = lblk;
                 __entry->len    = len;
         ),
@@ -1871,18 +1871,18 @@ TRACE_EVENT(ext4_ext_show_extent,
         TP_ARGS(inode, lblk, pblk, len),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
-                __field(        ext4_lblk_t,    lblk    )
+                __field(        ino_t,          ino     )
                 __field(        ext4_fsblk_t,   pblk    )
+                __field(        ext4_lblk_t,    lblk    )
                 __field(        unsigned short, len     )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
-                __entry->lblk   = lblk;
+                __entry->ino    = inode->i_ino;
                 __entry->pblk   = pblk;
+                __entry->lblk   = lblk;
                 __entry->len    = len;
         ),
 
@@ -1902,25 +1902,25 @@ TRACE_EVENT(ext4_remove_blocks,
         TP_ARGS(inode, ex, from, to, partial_cluster),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
-                __field(        ext4_lblk_t,    ee_lblk )
-                __field(        ext4_fsblk_t,   ee_pblk )
-                __field(        unsigned short, ee_len  )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    from    )
                 __field(        ext4_lblk_t,    to      )
                 __field(        ext4_fsblk_t,   partial )
+                __field(        ext4_fsblk_t,   ee_pblk )
+                __field(        ext4_lblk_t,    ee_lblk )
+                __field(        unsigned short, ee_len  )
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
-                __entry->ee_lblk        = cpu_to_le32(ex->ee_block);
-                __entry->ee_pblk        = ext4_ext_pblock(ex);
-                __entry->ee_len         = ext4_ext_get_actual_len(ex);
+                __entry->ino            = inode->i_ino;
                 __entry->from           = from;
                 __entry->to             = to;
                 __entry->partial        = partial_cluster;
+                __entry->ee_pblk        = ext4_ext_pblock(ex);
+                __entry->ee_lblk        = cpu_to_le32(ex->ee_block);
+                __entry->ee_len         = ext4_ext_get_actual_len(ex);
         ),
 
         TP_printk("dev %d,%d ino %lu extent [%u(%llu), %u]"
@@ -1942,23 +1942,23 @@ TRACE_EVENT(ext4_ext_rm_leaf,
         TP_ARGS(inode, start, ex, partial_cluster),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
+                __field(        ext4_fsblk_t,   partial )
                 __field(        ext4_lblk_t,    start   )
                 __field(        ext4_lblk_t,    ee_lblk )
                 __field(        ext4_fsblk_t,   ee_pblk )
                 __field(        short,          ee_len  )
-                __field(        ext4_fsblk_t,   partial )
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
+                __entry->partial        = partial_cluster;
                 __entry->start          = start;
                 __entry->ee_lblk        = le32_to_cpu(ex->ee_block);
                 __entry->ee_pblk        = ext4_ext_pblock(ex);
                 __entry->ee_len         = ext4_ext_get_actual_len(ex);
-                __entry->partial        = partial_cluster;
         ),
 
         TP_printk("dev %d,%d ino %lu start_lblk %u last_extent [%u(%llu), %u]"
@@ -1978,14 +1978,14 @@ TRACE_EVENT(ext4_ext_rm_idx,
         TP_ARGS(inode, pblk),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_fsblk_t,   pblk    )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->pblk   = pblk;
         ),
 
@@ -2001,15 +2001,15 @@ TRACE_EVENT(ext4_ext_remove_space,
         TP_ARGS(inode, start, depth),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino     )
                 __field(        dev_t,          dev     )
+                __field(        ino_t,          ino     )
                 __field(        ext4_lblk_t,    start   )
                 __field(        int,            depth   )
         ),
 
         TP_fast_assign(
-                __entry->ino    = inode->i_ino;
                 __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
                 __entry->start  = start;
                 __entry->depth  = depth;
         ),
@@ -2028,8 +2028,8 @@ TRACE_EVENT(ext4_ext_remove_space_done,
         TP_ARGS(inode, start, depth, partial, eh_entries),
 
         TP_STRUCT__entry(
-                __field(        ino_t,          ino             )
                 __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
                 __field(        ext4_lblk_t,    start           )
                 __field(        int,            depth           )
                 __field(        ext4_lblk_t,    partial         )
@@ -2037,8 +2037,8 @@ TRACE_EVENT(ext4_ext_remove_space_done,
         ),
 
         TP_fast_assign(
-                __entry->ino            = inode->i_ino;
                 __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
                 __entry->start          = start;
                 __entry->depth          = depth;
                 __entry->partial        = partial;
diff --git a/include/trace/events/gfpflags.h b/include/trace/events/gfpflags.h
index d6fd8e5b14b7..9391706e9254 100644
--- a/include/trace/events/gfpflags.h
+++ b/include/trace/events/gfpflags.h
@@ -36,7 +36,6 @@
         {(unsigned long)__GFP_RECLAIMABLE,      "GFP_RECLAIMABLE"},     \
         {(unsigned long)__GFP_MOVABLE,          "GFP_MOVABLE"},         \
         {(unsigned long)__GFP_NOTRACK,          "GFP_NOTRACK"},         \
-        {(unsigned long)__GFP_NO_KSWAPD,        "GFP_NO_KSWAPD"},       \
         {(unsigned long)__GFP_OTHER_NODE,       "GFP_OTHER_NODE"}       \
         ) : "GFP_NOWAIT"
 
diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild
index aafaa5aa54d4..b73de7bb7a62 100644
--- a/include/uapi/asm-generic/Kbuild
+++ b/include/uapi/asm-generic/Kbuild
@@ -1 +1,36 @@
 # UAPI Header export list
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += errno-base.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += int-l64.h
+header-y += int-ll64.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman-common.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += shmparam.h
+header-y += siginfo.h
+header-y += signal-defs.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += ucontext.h
+header-y += unistd.h
diff --git a/include/asm-generic/auxvec.h b/include/uapi/asm-generic/auxvec.h
index b99573b0ad12..b99573b0ad12 100644
--- a/include/asm-generic/auxvec.h
+++ b/include/uapi/asm-generic/auxvec.h
diff --git a/include/uapi/asm-generic/bitsperlong.h b/include/uapi/asm-generic/bitsperlong.h
new file mode 100644
index 000000000000..23e6c416b85f
--- /dev/null
+++ b/include/uapi/asm-generic/bitsperlong.h
@@ -0,0 +1,15 @@
+#ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG
+#define _UAPI__ASM_GENERIC_BITS_PER_LONG
+
+/*
+ * There seems to be no way of detecting this automatically from user
+ * space, so 64 bit architectures should override this in their
+ * bitsperlong.h. In particular, an architecture that supports
+ * both 32 and 64 bit user space must not rely on CONFIG_64BIT
+ * to decide it, but rather check a compiler provided macro.
+ */
+#ifndef __BITS_PER_LONG
+#define __BITS_PER_LONG 32
+#endif
+
+#endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */
diff --git a/include/asm-generic/errno-base.h b/include/uapi/asm-generic/errno-base.h
index 65115978510f..65115978510f 100644
--- a/include/asm-generic/errno-base.h
+++ b/include/uapi/asm-generic/errno-base.h
diff --git a/include/asm-generic/errno.h b/include/uapi/asm-generic/errno.h
index a1331ce50445..a1331ce50445 100644
--- a/include/asm-generic/errno.h
+++ b/include/uapi/asm-generic/errno.h
diff --git a/include/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index a48937d4a5ea..a48937d4a5ea 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
diff --git a/include/uapi/asm-generic/int-l64.h b/include/uapi/asm-generic/int-l64.h
new file mode 100644
index 000000000000..978f21cae2f4
--- /dev/null
+++ b/include/uapi/asm-generic/int-l64.h
@@ -0,0 +1,34 @@
+/*
+ * asm-generic/int-l64.h
+ *
+ * Integer declarations for architectures which use "long"
+ * for 64-bit types.
+ */
+
+#ifndef _UAPI_ASM_GENERIC_INT_L64_H
+#define _UAPI_ASM_GENERIC_INT_L64_H
+
+#include <asm/bitsperlong.h>
+
+#ifndef __ASSEMBLY__
+/*
+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
+ * header files exported to user space
+ */
+
+typedef __signed__ char __s8;
+typedef unsigned char __u8;
+
+typedef __signed__ short __s16;
+typedef unsigned short __u16;
+
+typedef __signed__ int __s32;
+typedef unsigned int __u32;
+
+typedef __signed__ long __s64;
+typedef unsigned long __u64;
+
+#endif /* __ASSEMBLY__ */
+
+
+#endif /* _UAPI_ASM_GENERIC_INT_L64_H */
diff --git a/include/uapi/asm-generic/int-ll64.h b/include/uapi/asm-generic/int-ll64.h
new file mode 100644
index 000000000000..a8658b2423ba
--- /dev/null
+++ b/include/uapi/asm-generic/int-ll64.h
@@ -0,0 +1,39 @@
+/*
+ * asm-generic/int-ll64.h
+ *
+ * Integer declarations for architectures which use "long long"
+ * for 64-bit types.
+ */
+
+#ifndef _UAPI_ASM_GENERIC_INT_LL64_H
+#define _UAPI_ASM_GENERIC_INT_LL64_H
+
+#include <asm/bitsperlong.h>
+
+#ifndef __ASSEMBLY__
+/*
+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
+ * header files exported to user space
+ */
+
+typedef __signed__ char __s8;
+typedef unsigned char __u8;
+
+typedef __signed__ short __s16;
+typedef unsigned short __u16;
+
+typedef __signed__ int __s32;
+typedef unsigned int __u32;
+
+#ifdef __GNUC__
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
+#else
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+
+#endif /* _UAPI_ASM_GENERIC_INT_LL64_H */
diff --git a/include/uapi/asm-generic/ioctl.h b/include/uapi/asm-generic/ioctl.h
new file mode 100644
index 000000000000..7e7c11b52143
--- /dev/null
+++ b/include/uapi/asm-generic/ioctl.h
@@ -0,0 +1,98 @@
+#ifndef _UAPI_ASM_GENERIC_IOCTL_H
+#define _UAPI_ASM_GENERIC_IOCTL_H
+
+/* ioctl command encoding: 32 bits total, command in lower 16 bits,
+ * size of the parameter structure in the lower 14 bits of the
+ * upper 16 bits.
+ * Encoding the size of the parameter structure in the ioctl request
+ * is useful for catching programs compiled with old versions
+ * and to avoid overwriting user space outside the user buffer area.
+ * The highest 2 bits are reserved for indicating the ``access mode''.
+ * NOTE: This limits the max parameter size to 16kB -1 !
+ */
+
+/*
+ * The following is for compatibility across the various Linux
+ * platforms.  The generic ioctl numbering scheme doesn't really enforce
+ * a type field.  De facto, however, the top 8 bits of the lower 16
+ * bits are indeed used as a type field, so we might just as well make
+ * this explicit here.  Please be sure to use the decoding macros
+ * below from now on.
+ */
+#define _IOC_NRBITS     8
+#define _IOC_TYPEBITS   8
+
+/*
+ * Let any architecture override either of the following before
+ * including this file.
+ */
+
+#ifndef _IOC_SIZEBITS
+# define _IOC_SIZEBITS  14
+#endif
+
+#ifndef _IOC_DIRBITS
+# define _IOC_DIRBITS   2
+#endif
+
+#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
+#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
+#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
+#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
+
+#define _IOC_NRSHIFT    0
+#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
+#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
+#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
+
+/*
+ * Direction bits, which any architecture can choose to override
+ * before including this file.
+ */
+
+#ifndef _IOC_NONE
+# define _IOC_NONE      0U
+#endif
+
+#ifndef _IOC_WRITE
+# define _IOC_WRITE     1U
+#endif
+
+#ifndef _IOC_READ
+# define _IOC_READ      2U
+#endif
+
+#define _IOC(dir,type,nr,size) \
+        (((dir)  << _IOC_DIRSHIFT) | \
+         ((type) << _IOC_TYPESHIFT) | \
+         ((nr)   << _IOC_NRSHIFT) | \
+         ((size) << _IOC_SIZESHIFT))
+
+#ifndef __KERNEL__
+#define _IOC_TYPECHECK(t) (sizeof(t))
+#endif
+
+/* used to create numbers */
+#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
+#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOR_BAD(type,nr,size)  _IOC(_IOC_READ,(type),(nr),sizeof(size))
+#define _IOW_BAD(type,nr,size)  _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
+#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
+
+/* used to decode ioctl numbers.. */
+#define _IOC_DIR(nr)            (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
+#define _IOC_TYPE(nr)           (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
+#define _IOC_NR(nr)             (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
+#define _IOC_SIZE(nr)           (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
+
+/* ...and for the drivers/sound files... */
+
+#define IOC_IN          (_IOC_WRITE << _IOC_DIRSHIFT)
+#define IOC_OUT         (_IOC_READ << _IOC_DIRSHIFT)
+#define IOC_INOUT       ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
+#define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
+#define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
+
+#endif /* _UAPI_ASM_GENERIC_IOCTL_H */
diff --git a/include/asm-generic/ioctls.h b/include/uapi/asm-generic/ioctls.h
index 199975fac395..199975fac395 100644
--- a/include/asm-generic/ioctls.h
+++ b/include/uapi/asm-generic/ioctls.h
diff --git a/include/asm-generic/ipcbuf.h b/include/uapi/asm-generic/ipcbuf.h
index 76982b2a1b58..76982b2a1b58 100644
--- a/include/asm-generic/ipcbuf.h
+++ b/include/uapi/asm-generic/ipcbuf.h
diff --git a/include/uapi/asm-generic/kvm_para.h b/include/uapi/asm-generic/kvm_para.h
new file mode 100644
index 000000000000..486f0af73c39
--- /dev/null
+++ b/include/uapi/asm-generic/kvm_para.h
@@ -0,0 +1,4 @@
+/*
+ * There isn't anything here, but the file must not be empty or patch
+ * will delete it.
+ */
diff --git a/include/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
index d030d2c2647a..d030d2c2647a 100644
--- a/include/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
diff --git a/include/asm-generic/mman.h b/include/uapi/asm-generic/mman.h
index 32c8bd6a196d..32c8bd6a196d 100644
--- a/include/asm-generic/mman.h
+++ b/include/uapi/asm-generic/mman.h
diff --git a/include/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h
index aec850d9159e..aec850d9159e 100644
--- a/include/asm-generic/msgbuf.h
+++ b/include/uapi/asm-generic/msgbuf.h
diff --git a/include/uapi/asm-generic/param.h b/include/uapi/asm-generic/param.h
new file mode 100644
index 000000000000..5becc84396b8
--- /dev/null
+++ b/include/uapi/asm-generic/param.h
@@ -0,0 +1,19 @@
+#ifndef _UAPI__ASM_GENERIC_PARAM_H
+#define _UAPI__ASM_GENERIC_PARAM_H
+
+#ifndef HZ
+#define HZ 100
+#endif
+
+#ifndef EXEC_PAGESIZE
+#define EXEC_PAGESIZE   4096
+#endif
+
+#ifndef NOGROUP
+#define NOGROUP         (-1)
+#endif
+
+#define MAXHOSTNAMELEN  64      /* max length of hostname */
+
+
+#endif /* _UAPI__ASM_GENERIC_PARAM_H */
diff --git a/include/asm-generic/poll.h b/include/uapi/asm-generic/poll.h
index 9ce7f44aebd2..9ce7f44aebd2 100644
--- a/include/asm-generic/poll.h
+++ b/include/uapi/asm-generic/poll.h
diff --git a/include/asm-generic/posix_types.h b/include/uapi/asm-generic/posix_types.h
index fe74fccf18db..fe74fccf18db 100644
--- a/include/asm-generic/posix_types.h
+++ b/include/uapi/asm-generic/posix_types.h
diff --git a/include/uapi/asm-generic/resource.h b/include/uapi/asm-generic/resource.h
new file mode 100644
index 000000000000..f863428796d5
--- /dev/null
+++ b/include/uapi/asm-generic/resource.h
@@ -0,0 +1,68 @@
+#ifndef _UAPI_ASM_GENERIC_RESOURCE_H
+#define _UAPI_ASM_GENERIC_RESOURCE_H
+
+/*
+ * Resource limit IDs
+ *
+ * ( Compatibility detail: there are architectures that have
+ *   a different rlimit ID order in the 5-9 range and want
+ *   to keep that order for binary compatibility. The reasons
+ *   are historic and all new rlimits are identical across all
+ *   arches. If an arch has such special order for some rlimits
+ *   then it defines them prior including asm-generic/resource.h. )
+ */
+
+#define RLIMIT_CPU              0       /* CPU time in sec */
+#define RLIMIT_FSIZE            1       /* Maximum filesize */
+#define RLIMIT_DATA             2       /* max data size */
+#define RLIMIT_STACK            3       /* max stack size */
+#define RLIMIT_CORE             4       /* max core file size */
+
+#ifndef RLIMIT_RSS
+# define RLIMIT_RSS             5       /* max resident set size */
+#endif
+
+#ifndef RLIMIT_NPROC
+# define RLIMIT_NPROC           6       /* max number of processes */
+#endif
+
+#ifndef RLIMIT_NOFILE
+# define RLIMIT_NOFILE          7       /* max number of open files */
+#endif
+
+#ifndef RLIMIT_MEMLOCK
+# define RLIMIT_MEMLOCK         8       /* max locked-in-memory address space */
+#endif
+
+#ifndef RLIMIT_AS
+# define RLIMIT_AS              9       /* address space limit */
+#endif
+
+#define RLIMIT_LOCKS            10      /* maximum file locks held */
+#define RLIMIT_SIGPENDING       11      /* max number of pending signals */
+#define RLIMIT_MSGQUEUE         12      /* maximum bytes in POSIX mqueues */
+#define RLIMIT_NICE             13      /* max nice prio allowed to raise to
+                                           0-39 for nice level 19 .. -20 */
+#define RLIMIT_RTPRIO           14      /* maximum realtime priority */
+#define RLIMIT_RTTIME           15      /* timeout for RT tasks in us */
+#define RLIM_NLIMITS            16
+
+/*
+ * SuS says limits have to be unsigned.
+ * Which makes a ton more sense anyway.
+ *
+ * Some architectures override this (for compatibility reasons):
+ */
+#ifndef RLIM_INFINITY
+# define RLIM_INFINITY          (~0UL)
+#endif
+
+/*
+ * RLIMIT_STACK default maximum - some architectures override it:
+ */
+#ifndef _STK_LIM_MAX
+# define _STK_LIM_MAX           RLIM_INFINITY
+#endif
+
+
+#endif /* _UAPI_ASM_GENERIC_RESOURCE_H */
diff --git a/include/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h
index 4cb2c13e5090..4cb2c13e5090 100644
--- a/include/asm-generic/sembuf.h
+++ b/include/uapi/asm-generic/sembuf.h
diff --git a/include/asm-generic/setup.h b/include/uapi/asm-generic/setup.h
index 6fc26a51003c..6fc26a51003c 100644
--- a/include/asm-generic/setup.h
+++ b/include/uapi/asm-generic/setup.h
diff --git a/include/asm-generic/shmbuf.h b/include/uapi/asm-generic/shmbuf.h
index 5768fa60ac82..5768fa60ac82 100644
--- a/include/asm-generic/shmbuf.h
+++ b/include/uapi/asm-generic/shmbuf.h
diff --git a/include/asm-generic/shmparam.h b/include/uapi/asm-generic/shmparam.h
index 51a3852de733..51a3852de733 100644
--- a/include/asm-generic/shmparam.h
+++ b/include/uapi/asm-generic/shmparam.h
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
new file mode 100644
index 000000000000..ba5be7fdbdfe
--- /dev/null
+++ b/include/uapi/asm-generic/siginfo.h
@@ -0,0 +1,298 @@
+#ifndef _UAPI_ASM_GENERIC_SIGINFO_H
+#define _UAPI_ASM_GENERIC_SIGINFO_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+typedef union sigval {
+        int sival_int;
+        void __user *sival_ptr;
+} sigval_t;
+
+/*
+ * This is the size (including padding) of the part of the
+ * struct siginfo that is before the union.
+ */
+#ifndef __ARCH_SI_PREAMBLE_SIZE
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#endif
+
+#define SI_MAX_SIZE     128
+#ifndef SI_PAD_SIZE
+#define SI_PAD_SIZE     ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
+#endif
+
+#ifndef __ARCH_SI_UID_T
+#define __ARCH_SI_UID_T __kernel_uid32_t
+#endif
+
+/*
+ * The default "si_band" type is "long", as specified by POSIX.
+ * However, some architectures want to override this to "int"
+ * for historical compatibility reasons, so we allow that.
+ */
+#ifndef __ARCH_SI_BAND_T
+#define __ARCH_SI_BAND_T long
+#endif
+
+#ifndef __ARCH_SI_CLOCK_T
+#define __ARCH_SI_CLOCK_T __kernel_clock_t
+#endif
+
+#ifndef __ARCH_SI_ATTRIBUTES
+#define __ARCH_SI_ATTRIBUTES
+#endif
+
+#ifndef HAVE_ARCH_SIGINFO_T
+
+typedef struct siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[SI_PAD_SIZE];
+
+                /* kill() */
+                struct {
+                        __kernel_pid_t _pid;    /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        __kernel_timer_t _tid;  /* timer id */
+                        int _overrun;           /* overrun count */
+                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+                        sigval_t _sigval;       /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        __kernel_pid_t _pid;    /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        __kernel_pid_t _pid;    /* which child */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        int _status;            /* exit code */
+                        __ARCH_SI_CLOCK_T _utime;
+                        __ARCH_SI_CLOCK_T _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        void __user *_addr; /* faulting insn/memory ref. */
+#ifdef __ARCH_SI_TRAPNO
+                        int _trapno;    /* TRAP # which caused the signal */
+#endif
+                        short _addr_lsb; /* LSB of the reported address */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+
+                /* SIGSYS */
+                struct {
+                        void __user *_call_addr; /* calling user insn */
+                        int _syscall;   /* triggering system call number */
+                        unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
+                } _sigsys;
+        } _sifields;
+} __ARCH_SI_ATTRIBUTES siginfo_t;
+
+/* If the arch shares siginfo, then it has SIGSYS. */
+#define __ARCH_SIGSYS
+#endif
+
+/*
+ * How these fields are to be accessed.
+ */
+#define si_pid          _sifields._kill._pid
+#define si_uid          _sifields._kill._uid
+#define si_tid          _sifields._timer._tid
+#define si_overrun      _sifields._timer._overrun
+#define si_sys_private  _sifields._timer._sys_private
+#define si_status       _sifields._sigchld._status
+#define si_utime        _sifields._sigchld._utime
+#define si_stime        _sifields._sigchld._stime
+#define si_value        _sifields._rt._sigval
+#define si_int          _sifields._rt._sigval.sival_int
+#define si_ptr          _sifields._rt._sigval.sival_ptr
+#define si_addr         _sifields._sigfault._addr
+#ifdef __ARCH_SI_TRAPNO
+#define si_trapno       _sifields._sigfault._trapno
+#endif
+#define si_addr_lsb     _sifields._sigfault._addr_lsb
+#define si_band         _sifields._sigpoll._band
+#define si_fd           _sifields._sigpoll._fd
+#ifdef __ARCH_SIGSYS
+#define si_call_addr    _sifields._sigsys._call_addr
+#define si_syscall      _sifields._sigsys._syscall
+#define si_arch         _sifields._sigsys._arch
+#endif
+
+#ifndef __KERNEL__
+#define __SI_KILL       0
+#define __SI_TIMER      0
+#define __SI_POLL       0
+#define __SI_FAULT      0
+#define __SI_CHLD       0
+#define __SI_RT         0
+#define __SI_MESGQ      0
+#define __SI_SYS        0
+#define __SI_CODE(T,N)  (N)
+#endif
+
+/*
+ * si_code values
+ * Digital reserves positive values for kernel-generated signals.
+ */
+#define SI_USER         0               /* sent by kill, sigsend, raise */
+#define SI_KERNEL       0x80            /* sent by the kernel from somewhere */
+#define SI_QUEUE        -1              /* sent by sigqueue */
+#define SI_TIMER __SI_CODE(__SI_TIMER,-2) /* sent by timer expiration */
+#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3) /* sent by real time mesq state change */
+#define SI_ASYNCIO      -4              /* sent by AIO completion */
+#define SI_SIGIO        -5              /* sent by queued SIGIO */
+#define SI_TKILL        -6              /* sent by tkill system call */
+#define SI_DETHREAD     -7              /* sent by execve() killing subsidiary threads */
+
+#define SI_FROMUSER(siptr)      ((siptr)->si_code <= 0)
+#define SI_FROMKERNEL(siptr)    ((siptr)->si_code > 0)
+
+/*
+ * SIGILL si_codes
+ */
+#define ILL_ILLOPC      (__SI_FAULT|1)  /* illegal opcode */
+#define ILL_ILLOPN      (__SI_FAULT|2)  /* illegal operand */
+#define ILL_ILLADR      (__SI_FAULT|3)  /* illegal addressing mode */
+#define ILL_ILLTRP      (__SI_FAULT|4)  /* illegal trap */
+#define ILL_PRVOPC      (__SI_FAULT|5)  /* privileged opcode */
+#define ILL_PRVREG      (__SI_FAULT|6)  /* privileged register */
+#define ILL_COPROC      (__SI_FAULT|7)  /* coprocessor error */
+#define ILL_BADSTK      (__SI_FAULT|8)  /* internal stack error */
+#define NSIGILL         8
+
+/*
+ * SIGFPE si_codes
+ */
+#define FPE_INTDIV      (__SI_FAULT|1)  /* integer divide by zero */
+#define FPE_INTOVF      (__SI_FAULT|2)  /* integer overflow */
+#define FPE_FLTDIV      (__SI_FAULT|3)  /* floating point divide by zero */
+#define FPE_FLTOVF      (__SI_FAULT|4)  /* floating point overflow */
+#define FPE_FLTUND      (__SI_FAULT|5)  /* floating point underflow */
+#define FPE_FLTRES      (__SI_FAULT|6)  /* floating point inexact result */
+#define FPE_FLTINV      (__SI_FAULT|7)  /* floating point invalid operation */
+#define FPE_FLTSUB      (__SI_FAULT|8)  /* subscript out of range */
+#define NSIGFPE         8
+
+/*
+ * SIGSEGV si_codes
+ */
+#define SEGV_MAPERR     (__SI_FAULT|1)  /* address not mapped to object */
+#define SEGV_ACCERR     (__SI_FAULT|2)  /* invalid permissions for mapped object */
+#define NSIGSEGV        2
+
+/*
+ * SIGBUS si_codes
+ */
+#define BUS_ADRALN      (__SI_FAULT|1)  /* invalid address alignment */
+#define BUS_ADRERR      (__SI_FAULT|2)  /* non-existent physical address */
+#define BUS_OBJERR      (__SI_FAULT|3)  /* object specific hardware error */
+/* hardware memory error consumed on a machine check: action required */
+#define BUS_MCEERR_AR   (__SI_FAULT|4)
+/* hardware memory error detected in process but not consumed: action optional*/
+#define BUS_MCEERR_AO   (__SI_FAULT|5)
+#define NSIGBUS         5
+
+/*
+ * SIGTRAP si_codes
+ */
+#define TRAP_BRKPT      (__SI_FAULT|1)  /* process breakpoint */
+#define TRAP_TRACE      (__SI_FAULT|2)  /* process trace trap */
+#define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
+#define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint/watchpoint */
+#define NSIGTRAP        4
+
+/*
+ * SIGCHLD si_codes
+ */
+#define CLD_EXITED      (__SI_CHLD|1)   /* child has exited */
+#define CLD_KILLED      (__SI_CHLD|2)   /* child was killed */
+#define CLD_DUMPED      (__SI_CHLD|3)   /* child terminated abnormally */
+#define CLD_TRAPPED     (__SI_CHLD|4)   /* traced child has trapped */
+#define CLD_STOPPED     (__SI_CHLD|5)   /* child has stopped */
+#define CLD_CONTINUED   (__SI_CHLD|6)   /* stopped child has continued */
+#define NSIGCHLD        6
+
+/*
+ * SIGPOLL si_codes
+ */
+#define POLL_IN         (__SI_POLL|1)   /* data input available */
+#define POLL_OUT        (__SI_POLL|2)   /* output buffers available */
+#define POLL_MSG        (__SI_POLL|3)   /* input message available */
+#define POLL_ERR        (__SI_POLL|4)   /* i/o error */
+#define POLL_PRI        (__SI_POLL|5)   /* high priority input available */
+#define POLL_HUP        (__SI_POLL|6)   /* device disconnected */
+#define NSIGPOLL        6
+
+/*
+ * SIGSYS si_codes
+ */
+#define SYS_SECCOMP             (__SI_SYS|1)    /* seccomp triggered */
+#define NSIGSYS 1
+
+/*
+ * sigevent definitions
+ * 
+ * It seems likely that SIGEV_THREAD will have to be handled from 
+ * userspace, libpthread transmuting it to SIGEV_SIGNAL, which the
+ * thread manager then catches and does the appropriate nonsense.
+ * However, everything is written out here so as to not get lost.
+ */
+#define SIGEV_SIGNAL    0       /* notify via signal */
+#define SIGEV_NONE      1       /* other notification: meaningless */
+#define SIGEV_THREAD    2       /* deliver via thread creation */
+#define SIGEV_THREAD_ID 4       /* deliver to thread */
+
+/*
+ * This works because the alignment is ok on all current architectures
+ * but we leave open this being overridden in the future
+ */
+#ifndef __ARCH_SIGEV_PREAMBLE_SIZE
+#define __ARCH_SIGEV_PREAMBLE_SIZE      (sizeof(int) * 2 + sizeof(sigval_t))
+#endif
+
+#define SIGEV_MAX_SIZE  64
+#define SIGEV_PAD_SIZE  ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) \
+                / sizeof(int))
+
+typedef struct sigevent {
+        sigval_t sigev_value;
+        int sigev_signo;
+        int sigev_notify;
+        union {
+                int _pad[SIGEV_PAD_SIZE];
+                 int _tid;
+
+                struct {
+                        void (*_function)(sigval_t);
+                        void *_attribute;       /* really pthread_attr_t */
+                } _sigev_thread;
+        } _sigev_un;
+} sigevent_t;
+
+#define sigev_notify_function   _sigev_un._sigev_thread._function
+#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
+#define sigev_notify_thread_id   _sigev_un._tid
+
+
+#endif /* _UAPI_ASM_GENERIC_SIGINFO_H */
diff --git a/include/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h
index 00f95df54297..00f95df54297 100644
--- a/include/asm-generic/signal-defs.h
+++ b/include/uapi/asm-generic/signal-defs.h
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h
new file mode 100644
index 000000000000..0a78028984de
--- /dev/null
+++ b/include/uapi/asm-generic/signal.h
@@ -0,0 +1,123 @@
+#ifndef _UAPI__ASM_GENERIC_SIGNAL_H
+#define _UAPI__ASM_GENERIC_SIGNAL_H
+
+#include <linux/types.h>
+
+#define _NSIG           64
+#define _NSIG_BPW       __BITS_PER_LONG
+#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
+
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#ifndef SIGRTMAX
+#define SIGRTMAX        _NSIG
+#endif
+
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK indicates that a registered stack_t will be used.
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+
+/*
+ * New architectures should not define the obsolete
+ *      SA_RESTORER     0x04000000
+ */
+
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+
+#ifndef __ASSEMBLY__
+typedef struct {
+        unsigned long sig[_NSIG_WORDS];
+} sigset_t;
+
+/* not actually used, but required for linux/syscalls.h */
+typedef unsigned long old_sigset_t;
+
+#include <asm-generic/signal-defs.h>
+
+struct sigaction {
+        __sighandler_t sa_handler;
+        unsigned long sa_flags;
+#ifdef SA_RESTORER
+        __sigrestore_t sa_restorer;
+#endif
+        sigset_t sa_mask;               /* mask last for extensibility */
+};
+
+struct k_sigaction {
+        struct sigaction sa;
+};
+
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _UAPI__ASM_GENERIC_SIGNAL_H */
diff --git a/include/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
index b1bea03274d5..b1bea03274d5 100644
--- a/include/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
diff --git a/include/asm-generic/sockios.h b/include/uapi/asm-generic/sockios.h
index 9a61a369b901..9a61a369b901 100644
--- a/include/asm-generic/sockios.h
+++ b/include/uapi/asm-generic/sockios.h
diff --git a/include/asm-generic/stat.h b/include/uapi/asm-generic/stat.h
index bd8cad21998e..bd8cad21998e 100644
--- a/include/asm-generic/stat.h
+++ b/include/uapi/asm-generic/stat.h
diff --git a/include/uapi/asm-generic/statfs.h b/include/uapi/asm-generic/statfs.h
new file mode 100644
index 000000000000..0999647fca13
--- /dev/null
+++ b/include/uapi/asm-generic/statfs.h
@@ -0,0 +1,83 @@
+#ifndef _UAPI_GENERIC_STATFS_H
+#define _UAPI_GENERIC_STATFS_H
+
+#include <linux/types.h>
+
+
+/*
+ * Most 64-bit platforms use 'long', while most 32-bit platforms use '__u32'.
+ * Yes, they differ in signedness as well as size.
+ * Special cases can override it for themselves -- except for S390x, which
+ * is just a little too special for us. And MIPS, which I'm not touching
+ * with a 10' pole.
+ */
+#ifndef __statfs_word
+#if __BITS_PER_LONG == 64
+#define __statfs_word long
+#else
+#define __statfs_word __u32
+#endif
+#endif
+
+struct statfs {
+        __statfs_word f_type;
+        __statfs_word f_bsize;
+        __statfs_word f_blocks;
+        __statfs_word f_bfree;
+        __statfs_word f_bavail;
+        __statfs_word f_files;
+        __statfs_word f_ffree;
+        __kernel_fsid_t f_fsid;
+        __statfs_word f_namelen;
+        __statfs_word f_frsize;
+        __statfs_word f_flags;
+        __statfs_word f_spare[4];
+};
+
+/*
+ * ARM needs to avoid the 32-bit padding at the end, for consistency
+ * between EABI and OABI 
+ */
+#ifndef ARCH_PACK_STATFS64
+#define ARCH_PACK_STATFS64
+#endif
+
+struct statfs64 {
+        __statfs_word f_type;
+        __statfs_word f_bsize;
+        __u64 f_blocks;
+        __u64 f_bfree;
+        __u64 f_bavail;
+        __u64 f_files;
+        __u64 f_ffree;
+        __kernel_fsid_t f_fsid;
+        __statfs_word f_namelen;
+        __statfs_word f_frsize;
+        __statfs_word f_flags;
+        __statfs_word f_spare[4];
+} ARCH_PACK_STATFS64;
+
+/* 
+ * IA64 and x86_64 need to avoid the 32-bit padding at the end,
+ * to be compatible with the i386 ABI
+ */
+#ifndef ARCH_PACK_COMPAT_STATFS64
+#define ARCH_PACK_COMPAT_STATFS64
+#endif
+
+struct compat_statfs64 {
+        __u32 f_type;
+        __u32 f_bsize;
+        __u64 f_blocks;
+        __u64 f_bfree;
+        __u64 f_bavail;
+        __u64 f_files;
+        __u64 f_ffree;
+        __kernel_fsid_t f_fsid;
+        __u32 f_namelen;
+        __u32 f_frsize;
+        __u32 f_flags;
+        __u32 f_spare[4];
+} ARCH_PACK_COMPAT_STATFS64;
+
+#endif /* _UAPI_GENERIC_STATFS_H */
diff --git a/include/asm-generic/swab.h b/include/uapi/asm-generic/swab.h
index a8e9029d9eba..a8e9029d9eba 100644
--- a/include/asm-generic/swab.h
+++ b/include/uapi/asm-generic/swab.h
diff --git a/include/asm-generic/termbits.h b/include/uapi/asm-generic/termbits.h
index 232b4781aef3..232b4781aef3 100644
--- a/include/asm-generic/termbits.h
+++ b/include/uapi/asm-generic/termbits.h
diff --git a/include/uapi/asm-generic/termios.h b/include/uapi/asm-generic/termios.h
new file mode 100644
index 000000000000..088176062133
--- /dev/null
+++ b/include/uapi/asm-generic/termios.h
@@ -0,0 +1,50 @@
+#ifndef _UAPI_ASM_GENERIC_TERMIOS_H
+#define _UAPI_ASM_GENERIC_TERMIOS_H
+/*
+ * Most architectures have straight copies of the x86 code, with
+ * varying levels of bug fixes on top. Usually it's a good idea
+ * to use this generic version instead, but be careful to avoid
+ * ABI changes.
+ * New architectures should not provide their own version.
+ */
+
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
+
+#endif /* _UAPI_ASM_GENERIC_TERMIOS_H */
diff --git a/include/asm-generic/types.h b/include/uapi/asm-generic/types.h
index bd39806013b5..bd39806013b5 100644
--- a/include/asm-generic/types.h
+++ b/include/uapi/asm-generic/types.h
diff --git a/include/asm-generic/ucontext.h b/include/uapi/asm-generic/ucontext.h
index ad77343e8a9a..ad77343e8a9a 100644
--- a/include/asm-generic/ucontext.h
+++ b/include/uapi/asm-generic/ucontext.h
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
new file mode 100644
index 000000000000..6e595ba545f4
--- /dev/null
+++ b/include/uapi/asm-generic/unistd.h
@@ -0,0 +1,902 @@
+#include <asm/bitsperlong.h>
+
+/*
+ * This file contains the system call numbers, based on the
+ * layout of the x86-64 architecture, which embeds the
+ * pointer to the syscall in the table.
+ *
+ * As a basic principle, no duplication of functionality
+ * should be added, e.g. we don't use lseek when llseek
+ * is present. New architectures should use this file
+ * and implement the less feature-full calls in user space.
+ */
+
+#ifndef __SYSCALL
+#define __SYSCALL(x, y)
+#endif
+
+#if __BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)
+#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _32)
+#else
+#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _64)
+#endif
+
+#ifdef __SYSCALL_COMPAT
+#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _comp)
+#define __SC_COMP_3264(_nr, _32, _64, _comp) __SYSCALL(_nr, _comp)
+#else
+#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _sys)
+#define __SC_COMP_3264(_nr, _32, _64, _comp) __SC_3264(_nr, _32, _64)
+#endif
+
+#define __NR_io_setup 0
+__SC_COMP(__NR_io_setup, sys_io_setup, compat_sys_io_setup)
+#define __NR_io_destroy 1
+__SYSCALL(__NR_io_destroy, sys_io_destroy)
+#define __NR_io_submit 2
+__SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
+#define __NR_io_cancel 3
+__SYSCALL(__NR_io_cancel, sys_io_cancel)
+#define __NR_io_getevents 4
+__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents)
+
+/* fs/xattr.c */
+#define __NR_setxattr 5
+__SYSCALL(__NR_setxattr, sys_setxattr)
+#define __NR_lsetxattr 6
+__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
+#define __NR_fsetxattr 7
+__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
+#define __NR_getxattr 8
+__SYSCALL(__NR_getxattr, sys_getxattr)
+#define __NR_lgetxattr 9
+__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
+#define __NR_fgetxattr 10
+__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
+#define __NR_listxattr 11
+__SYSCALL(__NR_listxattr, sys_listxattr)
+#define __NR_llistxattr 12
+__SYSCALL(__NR_llistxattr, sys_llistxattr)
+#define __NR_flistxattr 13
+__SYSCALL(__NR_flistxattr, sys_flistxattr)
+#define __NR_removexattr 14
+__SYSCALL(__NR_removexattr, sys_removexattr)
+#define __NR_lremovexattr 15
+__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
+#define __NR_fremovexattr 16
+__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
+
+/* fs/dcache.c */
+#define __NR_getcwd 17
+__SYSCALL(__NR_getcwd, sys_getcwd)
+
+/* fs/cookies.c */
+#define __NR_lookup_dcookie 18
+__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)
+
+/* fs/eventfd.c */
+#define __NR_eventfd2 19
+__SYSCALL(__NR_eventfd2, sys_eventfd2)
+
+/* fs/eventpoll.c */
+#define __NR_epoll_create1 20
+__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
+#define __NR_epoll_ctl 21
+__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
+#define __NR_epoll_pwait 22
+__SC_COMP(__NR_epoll_pwait, sys_epoll_pwait, compat_sys_epoll_pwait)
+
+/* fs/fcntl.c */
+#define __NR_dup 23
+__SYSCALL(__NR_dup, sys_dup)
+#define __NR_dup3 24
+__SYSCALL(__NR_dup3, sys_dup3)
+#define __NR3264_fcntl 25
+__SC_COMP_3264(__NR3264_fcntl, sys_fcntl64, sys_fcntl, compat_sys_fcntl64)
+
+/* fs/inotify_user.c */
+#define __NR_inotify_init1 26
+__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
+#define __NR_inotify_add_watch 27
+__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
+#define __NR_inotify_rm_watch 28
+__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
+
+/* fs/ioctl.c */
+#define __NR_ioctl 29
+__SC_COMP(__NR_ioctl, sys_ioctl, compat_sys_ioctl)
+
+/* fs/ioprio.c */
+#define __NR_ioprio_set 30
+__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
+#define __NR_ioprio_get 31
+__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
+
+/* fs/locks.c */
+#define __NR_flock 32
+__SYSCALL(__NR_flock, sys_flock)
+
+/* fs/namei.c */
+#define __NR_mknodat 33
+__SYSCALL(__NR_mknodat, sys_mknodat)
+#define __NR_mkdirat 34
+__SYSCALL(__NR_mkdirat, sys_mkdirat)
+#define __NR_unlinkat 35
+__SYSCALL(__NR_unlinkat, sys_unlinkat)
+#define __NR_symlinkat 36
+__SYSCALL(__NR_symlinkat, sys_symlinkat)
+#define __NR_linkat 37
+__SYSCALL(__NR_linkat, sys_linkat)
+#define __NR_renameat 38
+__SYSCALL(__NR_renameat, sys_renameat)
+
+/* fs/namespace.c */
+#define __NR_umount2 39
+__SYSCALL(__NR_umount2, sys_umount)
+#define __NR_mount 40
+__SC_COMP(__NR_mount, sys_mount, compat_sys_mount)
+#define __NR_pivot_root 41
+__SYSCALL(__NR_pivot_root, sys_pivot_root)
+
+/* fs/nfsctl.c */
+#define __NR_nfsservctl 42
+__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
+
+/* fs/open.c */
+#define __NR3264_statfs 43
+__SC_COMP_3264(__NR3264_statfs, sys_statfs64, sys_statfs, \
+               compat_sys_statfs64)
+#define __NR3264_fstatfs 44
+__SC_COMP_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs, \
+               compat_sys_fstatfs64)
+#define __NR3264_truncate 45
+__SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate, \
+               compat_sys_truncate64)
+#define __NR3264_ftruncate 46
+__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate, \
+               compat_sys_ftruncate64)
+
+#define __NR_fallocate 47
+__SC_COMP(__NR_fallocate, sys_fallocate, compat_sys_fallocate)
+#define __NR_faccessat 48
+__SYSCALL(__NR_faccessat, sys_faccessat)
+#define __NR_chdir 49
+__SYSCALL(__NR_chdir, sys_chdir)
+#define __NR_fchdir 50
+__SYSCALL(__NR_fchdir, sys_fchdir)
+#define __NR_chroot 51
+__SYSCALL(__NR_chroot, sys_chroot)
+#define __NR_fchmod 52
+__SYSCALL(__NR_fchmod, sys_fchmod)
+#define __NR_fchmodat 53
+__SYSCALL(__NR_fchmodat, sys_fchmodat)
+#define __NR_fchownat 54
+__SYSCALL(__NR_fchownat, sys_fchownat)
+#define __NR_fchown 55
+__SYSCALL(__NR_fchown, sys_fchown)
+#define __NR_openat 56
+__SC_COMP(__NR_openat, sys_openat, compat_sys_openat)
+#define __NR_close 57
+__SYSCALL(__NR_close, sys_close)
+#define __NR_vhangup 58
+__SYSCALL(__NR_vhangup, sys_vhangup)
+
+/* fs/pipe.c */
+#define __NR_pipe2 59
+__SYSCALL(__NR_pipe2, sys_pipe2)
+
+/* fs/quota.c */
+#define __NR_quotactl 60
+__SYSCALL(__NR_quotactl, sys_quotactl)
+
+/* fs/readdir.c */
+#define __NR_getdents64 61
+__SC_COMP(__NR_getdents64, sys_getdents64, compat_sys_getdents64)
+
+/* fs/read_write.c */
+#define __NR3264_lseek 62
+__SC_3264(__NR3264_lseek, sys_llseek, sys_lseek)
+#define __NR_read 63
+__SYSCALL(__NR_read, sys_read)
+#define __NR_write 64
+__SYSCALL(__NR_write, sys_write)
+#define __NR_readv 65
+__SC_COMP(__NR_readv, sys_readv, compat_sys_readv)
+#define __NR_writev 66
+__SC_COMP(__NR_writev, sys_writev, compat_sys_writev)
+#define __NR_pread64 67
+__SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)
+#define __NR_pwrite64 68
+__SC_COMP(__NR_pwrite64, sys_pwrite64, compat_sys_pwrite64)
+#define __NR_preadv 69
+__SC_COMP(__NR_preadv, sys_preadv, compat_sys_preadv)
+#define __NR_pwritev 70
+__SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev)
+
+/* fs/sendfile.c */
+#define __NR3264_sendfile 71
+__SYSCALL(__NR3264_sendfile, sys_sendfile64)
+
+/* fs/select.c */
+#define __NR_pselect6 72
+__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6)
+#define __NR_ppoll 73
+__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll)
+
+/* fs/signalfd.c */
+#define __NR_signalfd4 74
+__SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)
+
+/* fs/splice.c */
+#define __NR_vmsplice 75
+__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice)
+#define __NR_splice 76
+__SYSCALL(__NR_splice, sys_splice)
+#define __NR_tee 77
+__SYSCALL(__NR_tee, sys_tee)
+
+/* fs/stat.c */
+#define __NR_readlinkat 78
+__SYSCALL(__NR_readlinkat, sys_readlinkat)
+#define __NR3264_fstatat 79
+__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)
+#define __NR3264_fstat 80
+__SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)
+
+/* fs/sync.c */
+#define __NR_sync 81
+__SYSCALL(__NR_sync, sys_sync)
+#define __NR_fsync 82
+__SYSCALL(__NR_fsync, sys_fsync)
+#define __NR_fdatasync 83
+__SYSCALL(__NR_fdatasync, sys_fdatasync)
+#ifdef __ARCH_WANT_SYNC_FILE_RANGE2
+#define __NR_sync_file_range2 84
+__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2, \
+          compat_sys_sync_file_range2)
+#else
+#define __NR_sync_file_range 84
+__SC_COMP(__NR_sync_file_range, sys_sync_file_range, \
+          compat_sys_sync_file_range)
+#endif
+
+/* fs/timerfd.c */
+#define __NR_timerfd_create 85
+__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
+#define __NR_timerfd_settime 86
+__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \
+          compat_sys_timerfd_settime)
+#define __NR_timerfd_gettime 87
+__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \
+          compat_sys_timerfd_gettime)
+
+/* fs/utimes.c */
+#define __NR_utimensat 88
+__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat)
+
+/* kernel/acct.c */
+#define __NR_acct 89
+__SYSCALL(__NR_acct, sys_acct)
+
+/* kernel/capability.c */
+#define __NR_capget 90
+__SYSCALL(__NR_capget, sys_capget)
+#define __NR_capset 91
+__SYSCALL(__NR_capset, sys_capset)
+
+/* kernel/exec_domain.c */
+#define __NR_personality 92
+__SYSCALL(__NR_personality, sys_personality)
+
+/* kernel/exit.c */
+#define __NR_exit 93
+__SYSCALL(__NR_exit, sys_exit)
+#define __NR_exit_group 94
+__SYSCALL(__NR_exit_group, sys_exit_group)
+#define __NR_waitid 95
+__SC_COMP(__NR_waitid, sys_waitid, compat_sys_waitid)
+
+/* kernel/fork.c */
+#define __NR_set_tid_address 96
+__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
+#define __NR_unshare 97
+__SYSCALL(__NR_unshare, sys_unshare)
+
+/* kernel/futex.c */
+#define __NR_futex 98
+__SC_COMP(__NR_futex, sys_futex, compat_sys_futex)
+#define __NR_set_robust_list 99
+__SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
+          compat_sys_set_robust_list)
+#define __NR_get_robust_list 100
+__SC_COMP(__NR_get_robust_list, sys_get_robust_list, \
+          compat_sys_get_robust_list)
+
+/* kernel/hrtimer.c */
+#define __NR_nanosleep 101
+__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep)
+
+/* kernel/itimer.c */
+#define __NR_getitimer 102
+__SC_COMP(__NR_getitimer, sys_getitimer, compat_sys_getitimer)
+#define __NR_setitimer 103
+__SC_COMP(__NR_setitimer, sys_setitimer, compat_sys_setitimer)
+
+/* kernel/kexec.c */
+#define __NR_kexec_load 104
+__SC_COMP(__NR_kexec_load, sys_kexec_load, compat_sys_kexec_load)
+
+/* kernel/module.c */
+#define __NR_init_module 105
+__SYSCALL(__NR_init_module, sys_init_module)
+#define __NR_delete_module 106
+__SYSCALL(__NR_delete_module, sys_delete_module)
+
+/* kernel/posix-timers.c */
+#define __NR_timer_create 107
+__SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
+#define __NR_timer_gettime 108
+__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime)
+#define __NR_timer_getoverrun 109
+__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
+#define __NR_timer_settime 110
+__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime)
+#define __NR_timer_delete 111
+__SYSCALL(__NR_timer_delete, sys_timer_delete)
+#define __NR_clock_settime 112
+__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime)
+#define __NR_clock_gettime 113
+__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)
+#define __NR_clock_getres 114
+__SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres)
+#define __NR_clock_nanosleep 115
+__SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \
+          compat_sys_clock_nanosleep)
+
+/* kernel/printk.c */
+#define __NR_syslog 116
+__SYSCALL(__NR_syslog, sys_syslog)
+
+/* kernel/ptrace.c */
+#define __NR_ptrace 117
+__SYSCALL(__NR_ptrace, sys_ptrace)
+
+/* kernel/sched.c */
+#define __NR_sched_setparam 118
+__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
+#define __NR_sched_setscheduler 119
+__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
+#define __NR_sched_getscheduler 120
+__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
+#define __NR_sched_getparam 121
+__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
+#define __NR_sched_setaffinity 122
+__SC_COMP(__NR_sched_setaffinity, sys_sched_setaffinity, \
+          compat_sys_sched_setaffinity)
+#define __NR_sched_getaffinity 123
+__SC_COMP(__NR_sched_getaffinity, sys_sched_getaffinity, \
+          compat_sys_sched_getaffinity)
+#define __NR_sched_yield 124
+__SYSCALL(__NR_sched_yield, sys_sched_yield)
+#define __NR_sched_get_priority_max 125
+__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
+#define __NR_sched_get_priority_min 126
+__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
+#define __NR_sched_rr_get_interval 127
+__SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \
+          compat_sys_sched_rr_get_interval)
+
+/* kernel/signal.c */
+#define __NR_restart_syscall 128
+__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
+#define __NR_kill 129
+__SYSCALL(__NR_kill, sys_kill)
+#define __NR_tkill 130
+__SYSCALL(__NR_tkill, sys_tkill)
+#define __NR_tgkill 131
+__SYSCALL(__NR_tgkill, sys_tgkill)
+#define __NR_sigaltstack 132
+__SC_COMP(__NR_sigaltstack, sys_sigaltstack, compat_sys_sigaltstack)
+#define __NR_rt_sigsuspend 133
+__SC_COMP(__NR_rt_sigsuspend, sys_rt_sigsuspend, compat_sys_rt_sigsuspend)
+#define __NR_rt_sigaction 134
+__SC_COMP(__NR_rt_sigaction, sys_rt_sigaction, compat_sys_rt_sigaction)
+#define __NR_rt_sigprocmask 135
+__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)
+#define __NR_rt_sigpending 136
+__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)
+#define __NR_rt_sigtimedwait 137
+__SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \
+          compat_sys_rt_sigtimedwait)
+#define __NR_rt_sigqueueinfo 138
+__SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \
+          compat_sys_rt_sigqueueinfo)
+#define __NR_rt_sigreturn 139
+__SC_COMP(__NR_rt_sigreturn, sys_rt_sigreturn, compat_sys_rt_sigreturn)
+
+/* kernel/sys.c */
+#define __NR_setpriority 140
+__SYSCALL(__NR_setpriority, sys_setpriority)
+#define __NR_getpriority 141
+__SYSCALL(__NR_getpriority, sys_getpriority)
+#define __NR_reboot 142
+__SYSCALL(__NR_reboot, sys_reboot)
+#define __NR_setregid 143
+__SYSCALL(__NR_setregid, sys_setregid)
+#define __NR_setgid 144
+__SYSCALL(__NR_setgid, sys_setgid)
+#define __NR_setreuid 145
+__SYSCALL(__NR_setreuid, sys_setreuid)
+#define __NR_setuid 146
+__SYSCALL(__NR_setuid, sys_setuid)
+#define __NR_setresuid 147
+__SYSCALL(__NR_setresuid, sys_setresuid)
+#define __NR_getresuid 148
+__SYSCALL(__NR_getresuid, sys_getresuid)
+#define __NR_setresgid 149
+__SYSCALL(__NR_setresgid, sys_setresgid)
+#define __NR_getresgid 150
+__SYSCALL(__NR_getresgid, sys_getresgid)
+#define __NR_setfsuid 151
+__SYSCALL(__NR_setfsuid, sys_setfsuid)
+#define __NR_setfsgid 152
+__SYSCALL(__NR_setfsgid, sys_setfsgid)
+#define __NR_times 153
+__SC_COMP(__NR_times, sys_times, compat_sys_times)
+#define __NR_setpgid 154
+__SYSCALL(__NR_setpgid, sys_setpgid)
+#define __NR_getpgid 155
+__SYSCALL(__NR_getpgid, sys_getpgid)
+#define __NR_getsid 156
+__SYSCALL(__NR_getsid, sys_getsid)
+#define __NR_setsid 157
+__SYSCALL(__NR_setsid, sys_setsid)
+#define __NR_getgroups 158
+__SYSCALL(__NR_getgroups, sys_getgroups)
+#define __NR_setgroups 159
+__SYSCALL(__NR_setgroups, sys_setgroups)
+#define __NR_uname 160
+__SYSCALL(__NR_uname, sys_newuname)
+#define __NR_sethostname 161
+__SYSCALL(__NR_sethostname, sys_sethostname)
+#define __NR_setdomainname 162
+__SYSCALL(__NR_setdomainname, sys_setdomainname)
+#define __NR_getrlimit 163
+__SC_COMP(__NR_getrlimit, sys_getrlimit, compat_sys_getrlimit)
+#define __NR_setrlimit 164
+__SC_COMP(__NR_setrlimit, sys_setrlimit, compat_sys_setrlimit)
+#define __NR_getrusage 165
+__SC_COMP(__NR_getrusage, sys_getrusage, compat_sys_getrusage)
+#define __NR_umask 166
+__SYSCALL(__NR_umask, sys_umask)
+#define __NR_prctl 167
+__SYSCALL(__NR_prctl, sys_prctl)
+#define __NR_getcpu 168
+__SYSCALL(__NR_getcpu, sys_getcpu)
+
+/* kernel/time.c */
+#define __NR_gettimeofday 169
+__SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)
+#define __NR_settimeofday 170
+__SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)
+#define __NR_adjtimex 171
+__SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex)
+
+/* kernel/timer.c */
+#define __NR_getpid 172
+__SYSCALL(__NR_getpid, sys_getpid)
+#define __NR_getppid 173
+__SYSCALL(__NR_getppid, sys_getppid)
+#define __NR_getuid 174
+__SYSCALL(__NR_getuid, sys_getuid)
+#define __NR_geteuid 175
+__SYSCALL(__NR_geteuid, sys_geteuid)
+#define __NR_getgid 176
+__SYSCALL(__NR_getgid, sys_getgid)
+#define __NR_getegid 177
+__SYSCALL(__NR_getegid, sys_getegid)
+#define __NR_gettid 178
+__SYSCALL(__NR_gettid, sys_gettid)
+#define __NR_sysinfo 179
+__SC_COMP(__NR_sysinfo, sys_sysinfo, compat_sys_sysinfo)
+
+/* ipc/mqueue.c */
+#define __NR_mq_open 180
+__SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)
+#define __NR_mq_unlink 181
+__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
+#define __NR_mq_timedsend 182
+__SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend)
+#define __NR_mq_timedreceive 183
+__SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \
+          compat_sys_mq_timedreceive)
+#define __NR_mq_notify 184
+__SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)
+#define __NR_mq_getsetattr 185
+__SC_COMP(__NR_mq_getsetattr, sys_mq_getsetattr, compat_sys_mq_getsetattr)
+
+/* ipc/msg.c */
+#define __NR_msgget 186
+__SYSCALL(__NR_msgget, sys_msgget)
+#define __NR_msgctl 187
+__SC_COMP(__NR_msgctl, sys_msgctl, compat_sys_msgctl)
+#define __NR_msgrcv 188
+__SC_COMP(__NR_msgrcv, sys_msgrcv, compat_sys_msgrcv)
+#define __NR_msgsnd 189
+__SC_COMP(__NR_msgsnd, sys_msgsnd, compat_sys_msgsnd)
+
+/* ipc/sem.c */
+#define __NR_semget 190
+__SYSCALL(__NR_semget, sys_semget)
+#define __NR_semctl 191
+__SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
+#define __NR_semtimedop 192
+__SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop)
+#define __NR_semop 193
+__SYSCALL(__NR_semop, sys_semop)
+
+/* ipc/shm.c */
+#define __NR_shmget 194
+__SYSCALL(__NR_shmget, sys_shmget)
+#define __NR_shmctl 195
+__SC_COMP(__NR_shmctl, sys_shmctl, compat_sys_shmctl)
+#define __NR_shmat 196
+__SC_COMP(__NR_shmat, sys_shmat, compat_sys_shmat)
+#define __NR_shmdt 197
+__SYSCALL(__NR_shmdt, sys_shmdt)
+
+/* net/socket.c */
+#define __NR_socket 198
+__SYSCALL(__NR_socket, sys_socket)
+#define __NR_socketpair 199
+__SYSCALL(__NR_socketpair, sys_socketpair)
+#define __NR_bind 200
+__SYSCALL(__NR_bind, sys_bind)
+#define __NR_listen 201
+__SYSCALL(__NR_listen, sys_listen)
+#define __NR_accept 202
+__SYSCALL(__NR_accept, sys_accept)
+#define __NR_connect 203
+__SYSCALL(__NR_connect, sys_connect)
+#define __NR_getsockname 204
+__SYSCALL(__NR_getsockname, sys_getsockname)
+#define __NR_getpeername 205
+__SYSCALL(__NR_getpeername, sys_getpeername)
+#define __NR_sendto 206
+__SYSCALL(__NR_sendto, sys_sendto)
+#define __NR_recvfrom 207
+__SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom)
+#define __NR_setsockopt 208
+__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt)
+#define __NR_getsockopt 209
+__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt)
+#define __NR_shutdown 210
+__SYSCALL(__NR_shutdown, sys_shutdown)
+#define __NR_sendmsg 211
+__SC_COMP(__NR_sendmsg, sys_sendmsg, compat_sys_sendmsg)
+#define __NR_recvmsg 212
+__SC_COMP(__NR_recvmsg, sys_recvmsg, compat_sys_recvmsg)
+
+/* mm/filemap.c */
+#define __NR_readahead 213
+__SC_COMP(__NR_readahead, sys_readahead, compat_sys_readahead)
+
+/* mm/nommu.c, also with MMU */
+#define __NR_brk 214
+__SYSCALL(__NR_brk, sys_brk)
+#define __NR_munmap 215
+__SYSCALL(__NR_munmap, sys_munmap)
+#define __NR_mremap 216
+__SYSCALL(__NR_mremap, sys_mremap)
+
+/* security/keys/keyctl.c */
+#define __NR_add_key 217
+__SYSCALL(__NR_add_key, sys_add_key)
+#define __NR_request_key 218
+__SYSCALL(__NR_request_key, sys_request_key)
+#define __NR_keyctl 219
+__SC_COMP(__NR_keyctl, sys_keyctl, compat_sys_keyctl)
+
+/* arch/example/kernel/sys_example.c */
+#define __NR_clone 220
+__SYSCALL(__NR_clone, sys_clone)
+#define __NR_execve 221
+__SC_COMP(__NR_execve, sys_execve, compat_sys_execve)
+
+#define __NR3264_mmap 222
+__SC_3264(__NR3264_mmap, sys_mmap2, sys_mmap)
+/* mm/fadvise.c */
+#define __NR3264_fadvise64 223
+__SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64)
+
+/* mm/, CONFIG_MMU only */
+#ifndef __ARCH_NOMMU
+#define __NR_swapon 224
+__SYSCALL(__NR_swapon, sys_swapon)
+#define __NR_swapoff 225
+__SYSCALL(__NR_swapoff, sys_swapoff)
+#define __NR_mprotect 226
+__SYSCALL(__NR_mprotect, sys_mprotect)
+#define __NR_msync 227
+__SYSCALL(__NR_msync, sys_msync)
+#define __NR_mlock 228
+__SYSCALL(__NR_mlock, sys_mlock)
+#define __NR_munlock 229
+__SYSCALL(__NR_munlock, sys_munlock)
+#define __NR_mlockall 230
+__SYSCALL(__NR_mlockall, sys_mlockall)
+#define __NR_munlockall 231
+__SYSCALL(__NR_munlockall, sys_munlockall)
+#define __NR_mincore 232
+__SYSCALL(__NR_mincore, sys_mincore)
+#define __NR_madvise 233
+__SYSCALL(__NR_madvise, sys_madvise)
+#define __NR_remap_file_pages 234
+__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
+#define __NR_mbind 235
+__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)
+#define __NR_get_mempolicy 236
+__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)
+#define __NR_set_mempolicy 237
+__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)
+#define __NR_migrate_pages 238
+__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)
+#define __NR_move_pages 239
+__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)
+#endif
+
+#define __NR_rt_tgsigqueueinfo 240
+__SC_COMP(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo, \
+          compat_sys_rt_tgsigqueueinfo)
+#define __NR_perf_event_open 241
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
+#define __NR_accept4 242
+__SYSCALL(__NR_accept4, sys_accept4)
+#define __NR_recvmmsg 243
+__SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg)
+
+/*
+ * Architectures may provide up to 16 syscalls of their own
+ * starting with this value.
+ */
+#define __NR_arch_specific_syscall 244
+
+#define __NR_wait4 260
+__SC_COMP(__NR_wait4, sys_wait4, compat_sys_wait4)
+#define __NR_prlimit64 261
+__SYSCALL(__NR_prlimit64, sys_prlimit64)
+#define __NR_fanotify_init 262
+__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
+#define __NR_fanotify_mark 263
+__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
+#define __NR_name_to_handle_at         264
+__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
+#define __NR_open_by_handle_at         265
+__SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \
+          compat_sys_open_by_handle_at)
+#define __NR_clock_adjtime 266
+__SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
+#define __NR_syncfs 267
+__SYSCALL(__NR_syncfs, sys_syncfs)
+#define __NR_setns 268
+__SYSCALL(__NR_setns, sys_setns)
+#define __NR_sendmmsg 269
+__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)
+#define __NR_process_vm_readv 270
+__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \
+          compat_sys_process_vm_readv)
+#define __NR_process_vm_writev 271
+__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
+          compat_sys_process_vm_writev)
+#define __NR_kcmp 272
+__SYSCALL(__NR_kcmp, sys_kcmp)
+
+#undef __NR_syscalls
+#define __NR_syscalls 273
+
+/*
+ * All syscalls below here should go away really,
+ * these are provided for both review and as a porting
+ * help for the C library version.
+*
+ * Last chance: are any of these important enough to
+ * enable by default?
+ */
+#ifdef __ARCH_WANT_SYSCALL_NO_AT
+#define __NR_open 1024
+__SYSCALL(__NR_open, sys_open)
+#define __NR_link 1025
+__SYSCALL(__NR_link, sys_link)
+#define __NR_unlink 1026
+__SYSCALL(__NR_unlink, sys_unlink)
+#define __NR_mknod 1027
+__SYSCALL(__NR_mknod, sys_mknod)
+#define __NR_chmod 1028
+__SYSCALL(__NR_chmod, sys_chmod)
+#define __NR_chown 1029
+__SYSCALL(__NR_chown, sys_chown)
+#define __NR_mkdir 1030
+__SYSCALL(__NR_mkdir, sys_mkdir)
+#define __NR_rmdir 1031
+__SYSCALL(__NR_rmdir, sys_rmdir)
+#define __NR_lchown 1032
+__SYSCALL(__NR_lchown, sys_lchown)
+#define __NR_access 1033
+__SYSCALL(__NR_access, sys_access)
+#define __NR_rename 1034
+__SYSCALL(__NR_rename, sys_rename)
+#define __NR_readlink 1035
+__SYSCALL(__NR_readlink, sys_readlink)
+#define __NR_symlink 1036
+__SYSCALL(__NR_symlink, sys_symlink)
+#define __NR_utimes 1037
+__SYSCALL(__NR_utimes, sys_utimes)
+#define __NR3264_stat 1038
+__SC_3264(__NR3264_stat, sys_stat64, sys_newstat)
+#define __NR3264_lstat 1039
+__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat)
+
+#undef __NR_syscalls
+#define __NR_syscalls (__NR3264_lstat+1)
+#endif /* __ARCH_WANT_SYSCALL_NO_AT */
+
+#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS
+#define __NR_pipe 1040
+__SYSCALL(__NR_pipe, sys_pipe)
+#define __NR_dup2 1041
+__SYSCALL(__NR_dup2, sys_dup2)
+#define __NR_epoll_create 1042
+__SYSCALL(__NR_epoll_create, sys_epoll_create)
+#define __NR_inotify_init 1043
+__SYSCALL(__NR_inotify_init, sys_inotify_init)
+#define __NR_eventfd 1044
+__SYSCALL(__NR_eventfd, sys_eventfd)
+#define __NR_signalfd 1045
+__SYSCALL(__NR_signalfd, sys_signalfd)
+
+#undef __NR_syscalls
+#define __NR_syscalls (__NR_signalfd+1)
+#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */
+
+#if (__BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)) && \
+     defined(__ARCH_WANT_SYSCALL_OFF_T)
+#define __NR_sendfile 1046
+__SYSCALL(__NR_sendfile, sys_sendfile)
+#define __NR_ftruncate 1047
+__SYSCALL(__NR_ftruncate, sys_ftruncate)
+#define __NR_truncate 1048
+__SYSCALL(__NR_truncate, sys_truncate)
+#define __NR_stat 1049
+__SYSCALL(__NR_stat, sys_newstat)
+#define __NR_lstat 1050
+__SYSCALL(__NR_lstat, sys_newlstat)
+#define __NR_fstat 1051
+__SYSCALL(__NR_fstat, sys_newfstat)
+#define __NR_fcntl 1052
+__SYSCALL(__NR_fcntl, sys_fcntl)
+#define __NR_fadvise64 1053
+#define __ARCH_WANT_SYS_FADVISE64
+__SYSCALL(__NR_fadvise64, sys_fadvise64)
+#define __NR_newfstatat 1054
+#define __ARCH_WANT_SYS_NEWFSTATAT
+__SYSCALL(__NR_newfstatat, sys_newfstatat)
+#define __NR_fstatfs 1055
+__SYSCALL(__NR_fstatfs, sys_fstatfs)
+#define __NR_statfs 1056
+__SYSCALL(__NR_statfs, sys_statfs)
+#define __NR_lseek 1057
+__SYSCALL(__NR_lseek, sys_lseek)
+#define __NR_mmap 1058
+__SYSCALL(__NR_mmap, sys_mmap)
+
+#undef __NR_syscalls
+#define __NR_syscalls (__NR_mmap+1)
+#endif /* 32 bit off_t syscalls */
+
+#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
+#define __NR_alarm 1059
+#define __ARCH_WANT_SYS_ALARM
+__SYSCALL(__NR_alarm, sys_alarm)
+#define __NR_getpgrp 1060
+#define __ARCH_WANT_SYS_GETPGRP
+__SYSCALL(__NR_getpgrp, sys_getpgrp)
+#define __NR_pause 1061
+#define __ARCH_WANT_SYS_PAUSE
+__SYSCALL(__NR_pause, sys_pause)
+#define __NR_time 1062
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_COMPAT_SYS_TIME
+__SYSCALL(__NR_time, sys_time)
+#define __NR_utime 1063
+#define __ARCH_WANT_SYS_UTIME
+__SYSCALL(__NR_utime, sys_utime)
+
+#define __NR_creat 1064
+__SYSCALL(__NR_creat, sys_creat)
+#define __NR_getdents 1065
+#define __ARCH_WANT_SYS_GETDENTS
+__SYSCALL(__NR_getdents, sys_getdents)
+#define __NR_futimesat 1066
+__SYSCALL(__NR_futimesat, sys_futimesat)
+#define __NR_select 1067
+#define __ARCH_WANT_SYS_SELECT
+__SYSCALL(__NR_select, sys_select)
+#define __NR_poll 1068
+__SYSCALL(__NR_poll, sys_poll)
+#define __NR_epoll_wait 1069
+__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
+#define __NR_ustat 1070
+__SYSCALL(__NR_ustat, sys_ustat)
+#define __NR_vfork 1071
+__SYSCALL(__NR_vfork, sys_vfork)
+#define __NR_oldwait4 1072
+__SYSCALL(__NR_oldwait4, sys_wait4)
+#define __NR_recv 1073
+__SYSCALL(__NR_recv, sys_recv)
+#define __NR_send 1074
+__SYSCALL(__NR_send, sys_send)
+#define __NR_bdflush 1075
+__SYSCALL(__NR_bdflush, sys_bdflush)
+#define __NR_umount 1076
+__SYSCALL(__NR_umount, sys_oldumount)
+#define __ARCH_WANT_SYS_OLDUMOUNT
+#define __NR_uselib 1077
+__SYSCALL(__NR_uselib, sys_uselib)
+#define __NR__sysctl 1078
+__SYSCALL(__NR__sysctl, sys_sysctl)
+
+#define __NR_fork 1079
+#ifdef CONFIG_MMU
+__SYSCALL(__NR_fork, sys_fork)
+#else
+__SYSCALL(__NR_fork, sys_ni_syscall)
+#endif /* CONFIG_MMU */
+
+#undef __NR_syscalls
+#define __NR_syscalls (__NR_fork+1)
+
+#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
+
+/*
+ * 32 bit systems traditionally used different
+ * syscalls for off_t and loff_t arguments, while
+ * 64 bit systems only need the off_t version.
+ * For new 32 bit platforms, there is no need to
+ * implement the old 32 bit off_t syscalls, so
+ * they take different names.
+ * Here we map the numbers so that both versions
+ * use the same syscall table layout.
+ */
+#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
+#define __NR_fcntl __NR3264_fcntl
+#define __NR_statfs __NR3264_statfs
+#define __NR_fstatfs __NR3264_fstatfs
+#define __NR_truncate __NR3264_truncate
+#define __NR_ftruncate __NR3264_ftruncate
+#define __NR_lseek __NR3264_lseek
+#define __NR_sendfile __NR3264_sendfile
+#define __NR_newfstatat __NR3264_fstatat
+#define __NR_fstat __NR3264_fstat
+#define __NR_mmap __NR3264_mmap
+#define __NR_fadvise64 __NR3264_fadvise64
+#ifdef __NR3264_stat
+#define __NR_stat __NR3264_stat
+#define __NR_lstat __NR3264_lstat
+#endif
+#else
+#define __NR_fcntl64 __NR3264_fcntl
+#define __NR_statfs64 __NR3264_statfs
+#define __NR_fstatfs64 __NR3264_fstatfs
+#define __NR_truncate64 __NR3264_truncate
+#define __NR_ftruncate64 __NR3264_ftruncate
+#define __NR_llseek __NR3264_lseek
+#define __NR_sendfile64 __NR3264_sendfile
+#define __NR_fstatat64 __NR3264_fstatat
+#define __NR_fstat64 __NR3264_fstat
+#define __NR_mmap2 __NR3264_mmap
+#define __NR_fadvise64_64 __NR3264_fadvise64
+#ifdef __NR3264_stat
+#define __NR_stat64 __NR3264_stat
+#define __NR_lstat64 __NR3264_lstat
+#endif
+#endif
diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild
index aafaa5aa54d4..ba99ce3f7372 100644
--- a/include/uapi/drm/Kbuild
+++ b/include/uapi/drm/Kbuild
@@ -1 +1,16 @@
 # UAPI Header export list
+header-y += drm.h
+header-y += drm_fourcc.h
+header-y += drm_mode.h
+header-y += drm_sarea.h
+header-y += exynos_drm.h
+header-y += i810_drm.h
+header-y += i915_drm.h
+header-y += mga_drm.h
+header-y += nouveau_drm.h
+header-y += r128_drm.h
+header-y += radeon_drm.h
+header-y += savage_drm.h
+header-y += sis_drm.h
+header-y += via_drm.h
+header-y += vmwgfx_drm.h
diff --git a/include/drm/drm.h b/include/uapi/drm/drm.h
index 1e3481edf062..1e3481edf062 100644
--- a/include/drm/drm.h
+++ b/include/uapi/drm/drm.h
diff --git a/include/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 646ae5f39f42..646ae5f39f42 100644
--- a/include/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
diff --git a/include/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 3d6301b6ec16..3d6301b6ec16 100644
--- a/include/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
diff --git a/include/drm/drm_sarea.h b/include/uapi/drm/drm_sarea.h
index 413a5642d49f..413a5642d49f 100644
--- a/include/drm/drm_sarea.h
+++ b/include/uapi/drm/drm_sarea.h
diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h
new file mode 100644
index 000000000000..c0494d586e23
--- /dev/null
+++ b/include/uapi/drm/exynos_drm.h
@@ -0,0 +1,203 @@
+/* exynos_drm.h
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ * Authors:
+ *      Inki Dae <inki.dae@samsung.com>
+ *      Joonyoung Shim <jy0922.shim@samsung.com>
+ *      Seung-Woo Kim <sw0312.kim@samsung.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _UAPI_EXYNOS_DRM_H_
+#define _UAPI_EXYNOS_DRM_H_
+
+#include <drm/drm.h>
+
+/**
+ * User-desired buffer creation information structure.
+ *
+ * @size: user-desired memory allocation size.
+ *      - this size value would be page-aligned internally.
+ * @flags: user request for setting memory type or cache attributes.
+ * @handle: returned a handle to created gem object.
+ *      - this handle will be set by gem module of kernel side.
+ */
+struct drm_exynos_gem_create {
+        uint64_t size;
+        unsigned int flags;
+        unsigned int handle;
+};
+
+/**
+ * A structure for getting buffer offset.
+ *
+ * @handle: a pointer to gem object created.
+ * @pad: just padding to be 64-bit aligned.
+ * @offset: relatived offset value of the memory region allocated.
+ *      - this value should be set by user.
+ */
+struct drm_exynos_gem_map_off {
+        unsigned int handle;
+        unsigned int pad;
+        uint64_t offset;
+};
+
+/**
+ * A structure for mapping buffer.
+ *
+ * @handle: a handle to gem object created.
+ * @pad: just padding to be 64-bit aligned.
+ * @size: memory size to be mapped.
+ * @mapped: having user virtual address mmaped.
+ *      - this variable would be filled by exynos gem module
+ *      of kernel side with user virtual address which is allocated
+ *      by do_mmap().
+ */
+struct drm_exynos_gem_mmap {
+        unsigned int handle;
+        unsigned int pad;
+        uint64_t size;
+        uint64_t mapped;
+};
+
+/**
+ * A structure to gem information.
+ *
+ * @handle: a handle to gem object created.
+ * @flags: flag value including memory type and cache attribute and
+ *      this value would be set by driver.
+ * @size: size to memory region allocated by gem and this size would
+ *      be set by driver.
+ */
+struct drm_exynos_gem_info {
+        unsigned int handle;
+        unsigned int flags;
+        uint64_t size;
+};
+
+/**
+ * A structure for user connection request of virtual display.
+ *
+ * @connection: indicate whether doing connetion or not by user.
+ * @extensions: if this value is 1 then the vidi driver would need additional
+ *      128bytes edid data.
+ * @edid: the edid data pointer from user side.
+ */
+struct drm_exynos_vidi_connection {
+        unsigned int connection;
+        unsigned int extensions;
+        uint64_t edid;
+};
+
+/* memory type definitions. */
+enum e_drm_exynos_gem_mem_type {
+        /* Physically Continuous memory and used as default. */
+        EXYNOS_BO_CONTIG        = 0 << 0,
+        /* Physically Non-Continuous memory. */
+        EXYNOS_BO_NONCONTIG     = 1 << 0,
+        /* non-cachable mapping and used as default. */
+        EXYNOS_BO_NONCACHABLE   = 0 << 1,
+        /* cachable mapping. */
+        EXYNOS_BO_CACHABLE      = 1 << 1,
+        /* write-combine mapping. */
+        EXYNOS_BO_WC            = 1 << 2,
+        EXYNOS_BO_MASK          = EXYNOS_BO_NONCONTIG | EXYNOS_BO_CACHABLE |
+                                        EXYNOS_BO_WC
+};
+
+struct drm_exynos_g2d_get_ver {
+        __u32   major;
+        __u32   minor;
+};
+
+struct drm_exynos_g2d_cmd {
+        __u32   offset;
+        __u32   data;
+};
+
+enum drm_exynos_g2d_event_type {
+        G2D_EVENT_NOT,
+        G2D_EVENT_NONSTOP,
+        G2D_EVENT_STOP,         /* not yet */
+};
+
+struct drm_exynos_g2d_set_cmdlist {
+        __u64                                   cmd;
+        __u64                                   cmd_gem;
+        __u32                                   cmd_nr;
+        __u32                                   cmd_gem_nr;
+
+        /* for g2d event */
+        __u64                                   event_type;
+        __u64                                   user_data;
+};
+
+struct drm_exynos_g2d_exec {
+        __u64                                   async;
+};
+
+#define DRM_EXYNOS_GEM_CREATE           0x00
+#define DRM_EXYNOS_GEM_MAP_OFFSET       0x01
+#define DRM_EXYNOS_GEM_MMAP             0x02
+/* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */
+#define DRM_EXYNOS_GEM_GET              0x04
+#define DRM_EXYNOS_VIDI_CONNECTION      0x07
+
+/* G2D */
+#define DRM_EXYNOS_G2D_GET_VER          0x20
+#define DRM_EXYNOS_G2D_SET_CMDLIST      0x21
+#define DRM_EXYNOS_G2D_EXEC             0x22
+
+#define DRM_IOCTL_EXYNOS_GEM_CREATE             DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
+
+#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off)
+
+#define DRM_IOCTL_EXYNOS_GEM_MMAP       DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)
+
+#define DRM_IOCTL_EXYNOS_GEM_GET        DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_GEM_GET,     struct drm_exynos_gem_info)
+
+#define DRM_IOCTL_EXYNOS_VIDI_CONNECTION        DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_VIDI_CONNECTION, struct drm_exynos_vidi_connection)
+
+#define DRM_IOCTL_EXYNOS_G2D_GET_VER            DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_GET_VER, struct drm_exynos_g2d_get_ver)
+#define DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST        DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_SET_CMDLIST, struct drm_exynos_g2d_set_cmdlist)
+#define DRM_IOCTL_EXYNOS_G2D_EXEC               DRM_IOWR(DRM_COMMAND_BASE + \
+                DRM_EXYNOS_G2D_EXEC, struct drm_exynos_g2d_exec)
+
+/* EXYNOS specific events */
+#define DRM_EXYNOS_G2D_EVENT            0x80000000
+
+struct drm_exynos_g2d_event {
+        struct drm_event        base;
+        __u64                   user_data;
+        __u32                   tv_sec;
+        __u32                   tv_usec;
+        __u32                   cmdlist_no;
+        __u32                   reserved;
+};
+
+#endif /* _UAPI_EXYNOS_DRM_H_ */
diff --git a/include/drm/i810_drm.h b/include/uapi/drm/i810_drm.h
index 7a10bb6f2c0f..7a10bb6f2c0f 100644
--- a/include/drm/i810_drm.h
+++ b/include/uapi/drm/i810_drm.h
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
new file mode 100644
index 000000000000..4322b1e7d2ed
--- /dev/null
+++ b/include/uapi/drm/i915_drm.h
@@ -0,0 +1,947 @@
+/*
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef _UAPI_I915_DRM_H_
+#define _UAPI_I915_DRM_H_
+
+#include <drm/drm.h>
+
+/* Please note that modifications to all structs defined here are
+ * subject to backwards-compatibility constraints.
+ */
+
+
+/* Each region is a minimum of 16k, and there are at most 255 of them.
+ */
+#define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use
+                                 * of chars for next/prev indices */
+#define I915_LOG_MIN_TEX_REGION_SIZE 14
+
+typedef struct _drm_i915_init {
+        enum {
+                I915_INIT_DMA = 0x01,
+                I915_CLEANUP_DMA = 0x02,
+                I915_RESUME_DMA = 0x03
+        } func;
+        unsigned int mmio_offset;
+        int sarea_priv_offset;
+        unsigned int ring_start;
+        unsigned int ring_end;
+        unsigned int ring_size;
+        unsigned int front_offset;
+        unsigned int back_offset;
+        unsigned int depth_offset;
+        unsigned int w;
+        unsigned int h;
+        unsigned int pitch;
+        unsigned int pitch_bits;
+        unsigned int back_pitch;
+        unsigned int depth_pitch;
+        unsigned int cpp;
+        unsigned int chipset;
+} drm_i915_init_t;
+
+typedef struct _drm_i915_sarea {
+        struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
+        int last_upload;        /* last time texture was uploaded */
+        int last_enqueue;       /* last time a buffer was enqueued */
+        int last_dispatch;      /* age of the most recently dispatched buffer */
+        int ctxOwner;           /* last context to upload state */
+        int texAge;
+        int pf_enabled;         /* is pageflipping allowed? */
+        int pf_active;
+        int pf_current_page;    /* which buffer is being displayed? */
+        int perf_boxes;         /* performance boxes to be displayed */
+        int width, height;      /* screen size in pixels */
+
+        drm_handle_t front_handle;
+        int front_offset;
+        int front_size;
+
+        drm_handle_t back_handle;
+        int back_offset;
+        int back_size;
+
+        drm_handle_t depth_handle;
+        int depth_offset;
+        int depth_size;
+
+        drm_handle_t tex_handle;
+        int tex_offset;
+        int tex_size;
+        int log_tex_granularity;
+        int pitch;
+        int rotation;           /* 0, 90, 180 or 270 */
+        int rotated_offset;
+        int rotated_size;
+        int rotated_pitch;
+        int virtualX, virtualY;
+
+        unsigned int front_tiled;
+        unsigned int back_tiled;
+        unsigned int depth_tiled;
+        unsigned int rotated_tiled;
+        unsigned int rotated2_tiled;
+
+        int pipeA_x;
+        int pipeA_y;
+        int pipeA_w;
+        int pipeA_h;
+        int pipeB_x;
+        int pipeB_y;
+        int pipeB_w;
+        int pipeB_h;
+
+        /* fill out some space for old userspace triple buffer */
+        drm_handle_t unused_handle;
+        __u32 unused1, unused2, unused3;
+
+        /* buffer object handles for static buffers. May change
+         * over the lifetime of the client.
+         */
+        __u32 front_bo_handle;
+        __u32 back_bo_handle;
+        __u32 unused_bo_handle;
+        __u32 depth_bo_handle;
+
+} drm_i915_sarea_t;
+
+/* due to userspace building against these headers we need some compat here */
+#define planeA_x pipeA_x
+#define planeA_y pipeA_y
+#define planeA_w pipeA_w
+#define planeA_h pipeA_h
+#define planeB_x pipeB_x
+#define planeB_y pipeB_y
+#define planeB_w pipeB_w
+#define planeB_h pipeB_h
+
+/* Flags for perf_boxes
+ */
+#define I915_BOX_RING_EMPTY    0x1
+#define I915_BOX_FLIP          0x2
+#define I915_BOX_WAIT          0x4
+#define I915_BOX_TEXTURE_LOAD  0x8
+#define I915_BOX_LOST_CONTEXT  0x10
+
+/* I915 specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_I915_INIT           0x00
+#define DRM_I915_FLUSH          0x01
+#define DRM_I915_FLIP           0x02
+#define DRM_I915_BATCHBUFFER    0x03
+#define DRM_I915_IRQ_EMIT       0x04
+#define DRM_I915_IRQ_WAIT       0x05
+#define DRM_I915_GETPARAM       0x06
+#define DRM_I915_SETPARAM       0x07
+#define DRM_I915_ALLOC          0x08
+#define DRM_I915_FREE           0x09
+#define DRM_I915_INIT_HEAP      0x0a
+#define DRM_I915_CMDBUFFER      0x0b
+#define DRM_I915_DESTROY_HEAP   0x0c
+#define DRM_I915_SET_VBLANK_PIPE        0x0d
+#define DRM_I915_GET_VBLANK_PIPE        0x0e
+#define DRM_I915_VBLANK_SWAP    0x0f
+#define DRM_I915_HWS_ADDR       0x11
+#define DRM_I915_GEM_INIT       0x13
+#define DRM_I915_GEM_EXECBUFFER 0x14
+#define DRM_I915_GEM_PIN        0x15
+#define DRM_I915_GEM_UNPIN      0x16
+#define DRM_I915_GEM_BUSY       0x17
+#define DRM_I915_GEM_THROTTLE   0x18
+#define DRM_I915_GEM_ENTERVT    0x19
+#define DRM_I915_GEM_LEAVEVT    0x1a
+#define DRM_I915_GEM_CREATE     0x1b
+#define DRM_I915_GEM_PREAD      0x1c
+#define DRM_I915_GEM_PWRITE     0x1d
+#define DRM_I915_GEM_MMAP       0x1e
+#define DRM_I915_GEM_SET_DOMAIN 0x1f
+#define DRM_I915_GEM_SW_FINISH  0x20
+#define DRM_I915_GEM_SET_TILING 0x21
+#define DRM_I915_GEM_GET_TILING 0x22
+#define DRM_I915_GEM_GET_APERTURE 0x23
+#define DRM_I915_GEM_MMAP_GTT   0x24
+#define DRM_I915_GET_PIPE_FROM_CRTC_ID  0x25
+#define DRM_I915_GEM_MADVISE    0x26
+#define DRM_I915_OVERLAY_PUT_IMAGE      0x27
+#define DRM_I915_OVERLAY_ATTRS  0x28
+#define DRM_I915_GEM_EXECBUFFER2        0x29
+#define DRM_I915_GET_SPRITE_COLORKEY    0x2a
+#define DRM_I915_SET_SPRITE_COLORKEY    0x2b
+#define DRM_I915_GEM_WAIT       0x2c
+#define DRM_I915_GEM_CONTEXT_CREATE     0x2d
+#define DRM_I915_GEM_CONTEXT_DESTROY    0x2e
+#define DRM_I915_GEM_SET_CACHING        0x2f
+#define DRM_I915_GEM_GET_CACHING        0x30
+#define DRM_I915_REG_READ               0x31
+
+#define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
+#define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
+#define DRM_IOCTL_I915_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
+#define DRM_IOCTL_I915_BATCHBUFFER      DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
+#define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
+#define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
+#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
+#define DRM_IOCTL_I915_SETPARAM         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
+#define DRM_IOCTL_I915_ALLOC            DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
+#define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
+#define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
+#define DRM_IOCTL_I915_CMDBUFFER        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
+#define DRM_IOCTL_I915_DESTROY_HEAP     DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
+#define DRM_IOCTL_I915_SET_VBLANK_PIPE  DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
+#define DRM_IOCTL_I915_GET_VBLANK_PIPE  DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
+#define DRM_IOCTL_I915_VBLANK_SWAP      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
+#define DRM_IOCTL_I915_HWS_ADDR         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_HWS_ADDR, struct drm_i915_gem_init)
+#define DRM_IOCTL_I915_GEM_INIT         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
+#define DRM_IOCTL_I915_GEM_EXECBUFFER   DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
+#define DRM_IOCTL_I915_GEM_EXECBUFFER2  DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2)
+#define DRM_IOCTL_I915_GEM_PIN          DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
+#define DRM_IOCTL_I915_GEM_UNPIN        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
+#define DRM_IOCTL_I915_GEM_BUSY         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
+#define DRM_IOCTL_I915_GEM_SET_CACHING          DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching)
+#define DRM_IOCTL_I915_GEM_GET_CACHING          DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)
+#define DRM_IOCTL_I915_GEM_THROTTLE     DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)
+#define DRM_IOCTL_I915_GEM_ENTERVT      DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)
+#define DRM_IOCTL_I915_GEM_LEAVEVT      DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)
+#define DRM_IOCTL_I915_GEM_CREATE       DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create)
+#define DRM_IOCTL_I915_GEM_PREAD        DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
+#define DRM_IOCTL_I915_GEM_PWRITE       DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
+#define DRM_IOCTL_I915_GEM_MMAP         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
+#define DRM_IOCTL_I915_GEM_MMAP_GTT     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
+#define DRM_IOCTL_I915_GEM_SET_DOMAIN   DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
+#define DRM_IOCTL_I915_GEM_SW_FINISH    DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
+#define DRM_IOCTL_I915_GEM_SET_TILING   DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
+#define DRM_IOCTL_I915_GEM_GET_TILING   DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
+#define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
+#define DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_PIPE_FROM_CRTC_ID, struct drm_i915_get_pipe_from_crtc_id)
+#define DRM_IOCTL_I915_GEM_MADVISE      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MADVISE, struct drm_i915_gem_madvise)
+#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
+#define DRM_IOCTL_I915_OVERLAY_ATTRS    DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
+#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GEM_WAIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
+#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE       DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
+#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY      DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
+#define DRM_IOCTL_I915_REG_READ                 DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read)
+
+/* Allow drivers to submit batchbuffers directly to hardware, relying
+ * on the security mechanisms provided by hardware.
+ */
+typedef struct drm_i915_batchbuffer {
+        int start;              /* agp offset */
+        int used;               /* nr bytes in use */
+        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
+        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
+        int num_cliprects;      /* mulitpass with multiple cliprects? */
+        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
+} drm_i915_batchbuffer_t;
+
+/* As above, but pass a pointer to userspace buffer which can be
+ * validated by the kernel prior to sending to hardware.
+ */
+typedef struct _drm_i915_cmdbuffer {
+        char __user *buf;       /* pointer to userspace command buffer */
+        int sz;                 /* nr bytes in buf */
+        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
+        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
+        int num_cliprects;      /* mulitpass with multiple cliprects? */
+        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
+} drm_i915_cmdbuffer_t;
+
+/* Userspace can request & wait on irq's:
+ */
+typedef struct drm_i915_irq_emit {
+        int __user *irq_seq;
+} drm_i915_irq_emit_t;
+
+typedef struct drm_i915_irq_wait {
+        int irq_seq;
+} drm_i915_irq_wait_t;
+
+/* Ioctl to query kernel params:
+ */
+#define I915_PARAM_IRQ_ACTIVE            1
+#define I915_PARAM_ALLOW_BATCHBUFFER     2
+#define I915_PARAM_LAST_DISPATCH         3
+#define I915_PARAM_CHIPSET_ID            4
+#define I915_PARAM_HAS_GEM               5
+#define I915_PARAM_NUM_FENCES_AVAIL      6
+#define I915_PARAM_HAS_OVERLAY           7
+#define I915_PARAM_HAS_PAGEFLIPPING      8
+#define I915_PARAM_HAS_EXECBUF2          9
+#define I915_PARAM_HAS_BSD               10
+#define I915_PARAM_HAS_BLT               11
+#define I915_PARAM_HAS_RELAXED_FENCING   12
+#define I915_PARAM_HAS_COHERENT_RINGS    13
+#define I915_PARAM_HAS_EXEC_CONSTANTS    14
+#define I915_PARAM_HAS_RELAXED_DELTA     15
+#define I915_PARAM_HAS_GEN7_SOL_RESET    16
+#define I915_PARAM_HAS_LLC               17
+#define I915_PARAM_HAS_ALIASING_PPGTT    18
+#define I915_PARAM_HAS_WAIT_TIMEOUT      19
+#define I915_PARAM_HAS_SEMAPHORES        20
+#define I915_PARAM_HAS_PRIME_VMAP_FLUSH  21
+#define I915_PARAM_RSVD_FOR_FUTURE_USE   22
+
+typedef struct drm_i915_getparam {
+        int param;
+        int __user *value;
+} drm_i915_getparam_t;
+
+/* Ioctl to set kernel params:
+ */
+#define I915_SETPARAM_USE_MI_BATCHBUFFER_START            1
+#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY             2
+#define I915_SETPARAM_ALLOW_BATCHBUFFER                   3
+#define I915_SETPARAM_NUM_USED_FENCES                     4
+
+typedef struct drm_i915_setparam {
+        int param;
+        int value;
+} drm_i915_setparam_t;
+
+/* A memory manager for regions of shared memory:
+ */
+#define I915_MEM_REGION_AGP 1
+
+typedef struct drm_i915_mem_alloc {
+        int region;
+        int alignment;
+        int size;
+        int __user *region_offset;      /* offset from start of fb or agp */
+} drm_i915_mem_alloc_t;
+
+typedef struct drm_i915_mem_free {
+        int region;
+        int region_offset;
+} drm_i915_mem_free_t;
+
+typedef struct drm_i915_mem_init_heap {
+        int region;
+        int size;
+        int start;
+} drm_i915_mem_init_heap_t;
+
+/* Allow memory manager to be torn down and re-initialized (eg on
+ * rotate):
+ */
+typedef struct drm_i915_mem_destroy_heap {
+        int region;
+} drm_i915_mem_destroy_heap_t;
+
+/* Allow X server to configure which pipes to monitor for vblank signals
+ */
+#define DRM_I915_VBLANK_PIPE_A  1
+#define DRM_I915_VBLANK_PIPE_B  2
+
+typedef struct drm_i915_vblank_pipe {
+        int pipe;
+} drm_i915_vblank_pipe_t;
+
+/* Schedule buffer swap at given vertical blank:
+ */
+typedef struct drm_i915_vblank_swap {
+        drm_drawable_t drawable;
+        enum drm_vblank_seq_type seqtype;
+        unsigned int sequence;
+} drm_i915_vblank_swap_t;
+
+typedef struct drm_i915_hws_addr {
+        __u64 addr;
+} drm_i915_hws_addr_t;
+
+struct drm_i915_gem_init {
+        /**
+         * Beginning offset in the GTT to be managed by the DRM memory
+         * manager.
+         */
+        __u64 gtt_start;
+        /**
+         * Ending offset in the GTT to be managed by the DRM memory
+         * manager.
+         */
+        __u64 gtt_end;
+};
+
+struct drm_i915_gem_create {
+        /**
+         * Requested size for the object.
+         *
+         * The (page-aligned) allocated size for the object will be returned.
+         */
+        __u64 size;
+        /**
+         * Returned handle for the object.
+         *
+         * Object handles are nonzero.
+         */
+        __u32 handle;
+        __u32 pad;
+};
+
+struct drm_i915_gem_pread {
+        /** Handle for the object being read. */
+        __u32 handle;
+        __u32 pad;
+        /** Offset into the object to read from */
+        __u64 offset;
+        /** Length of data to read */
+        __u64 size;
+        /**
+         * Pointer to write the data into.
+         *
+         * This is a fixed-size type for 32/64 compatibility.
+         */
+        __u64 data_ptr;
+};
+
+struct drm_i915_gem_pwrite {
+        /** Handle for the object being written to. */
+        __u32 handle;
+        __u32 pad;
+        /** Offset into the object to write to */
+        __u64 offset;
+        /** Length of data to write */
+        __u64 size;
+        /**
+         * Pointer to read the data from.
+         *
+         * This is a fixed-size type for 32/64 compatibility.
+         */
+        __u64 data_ptr;
+};
+
+struct drm_i915_gem_mmap {
+        /** Handle for the object being mapped. */
+        __u32 handle;
+        __u32 pad;
+        /** Offset in the object to map. */
+        __u64 offset;
+        /**
+         * Length of data to map.
+         *
+         * The value will be page-aligned.
+         */
+        __u64 size;
+        /**
+         * Returned pointer the data was mapped at.
+         *
+         * This is a fixed-size type for 32/64 compatibility.
+         */
+        __u64 addr_ptr;
+};
+
+struct drm_i915_gem_mmap_gtt {
+        /** Handle for the object being mapped. */
+        __u32 handle;
+        __u32 pad;
+        /**
+         * Fake offset to use for subsequent mmap call
+         *
+         * This is a fixed-size type for 32/64 compatibility.
+         */
+        __u64 offset;
+};
+
+struct drm_i915_gem_set_domain {
+        /** Handle for the object */
+        __u32 handle;
+
+        /** New read domains */
+        __u32 read_domains;
+
+        /** New write domain */
+        __u32 write_domain;
+};
+
+struct drm_i915_gem_sw_finish {
+        /** Handle for the object */
+        __u32 handle;
+};
+
+struct drm_i915_gem_relocation_entry {
+        /**
+         * Handle of the buffer being pointed to by this relocation entry.
+         *
+         * It's appealing to make this be an index into the mm_validate_entry
+         * list to refer to the buffer, but this allows the driver to create
+         * a relocation list for state buffers and not re-write it per
+         * exec using the buffer.
+         */
+        __u32 target_handle;
+
+        /**
+         * Value to be added to the offset of the target buffer to make up
+         * the relocation entry.
+         */
+        __u32 delta;
+
+        /** Offset in the buffer the relocation entry will be written into */
+        __u64 offset;
+
+        /**
+         * Offset value of the target buffer that the relocation entry was last
+         * written as.
+         *
+         * If the buffer has the same offset as last time, we can skip syncing
+         * and writing the relocation.  This value is written back out by
+         * the execbuffer ioctl when the relocation is written.
+         */
+        __u64 presumed_offset;
+
+        /**
+         * Target memory domains read by this operation.
+         */
+        __u32 read_domains;
+
+        /**
+         * Target memory domains written by this operation.
+         *
+         * Note that only one domain may be written by the whole
+         * execbuffer operation, so that where there are conflicts,
+         * the application will get -EINVAL back.
+         */
+        __u32 write_domain;
+};
+
+/** @{
+ * Intel memory domains
+ *
+ * Most of these just align with the various caches in
+ * the system and are used to flush and invalidate as
+ * objects end up cached in different domains.
+ */
+/** CPU cache */
+#define I915_GEM_DOMAIN_CPU             0x00000001
+/** Render cache, used by 2D and 3D drawing */
+#define I915_GEM_DOMAIN_RENDER          0x00000002
+/** Sampler cache, used by texture engine */
+#define I915_GEM_DOMAIN_SAMPLER         0x00000004
+/** Command queue, used to load batch buffers */
+#define I915_GEM_DOMAIN_COMMAND         0x00000008
+/** Instruction cache, used by shader programs */
+#define I915_GEM_DOMAIN_INSTRUCTION     0x00000010
+/** Vertex address cache */
+#define I915_GEM_DOMAIN_VERTEX          0x00000020
+/** GTT domain - aperture and scanout */
+#define I915_GEM_DOMAIN_GTT             0x00000040
+/** @} */
+
+struct drm_i915_gem_exec_object {
+        /**
+         * User's handle for a buffer to be bound into the GTT for this
+         * operation.
+         */
+        __u32 handle;
+
+        /** Number of relocations to be performed on this buffer */
+        __u32 relocation_count;
+        /**
+         * Pointer to array of struct drm_i915_gem_relocation_entry containing
+         * the relocations to be performed in this buffer.
+         */
+        __u64 relocs_ptr;
+
+        /** Required alignment in graphics aperture */
+        __u64 alignment;
+
+        /**
+         * Returned value of the updated offset of the object, for future
+         * presumed_offset writes.
+         */
+        __u64 offset;
+};
+
+struct drm_i915_gem_execbuffer {
+        /**
+         * List of buffers to be validated with their relocations to be
+         * performend on them.
+         *
+         * This is a pointer to an array of struct drm_i915_gem_validate_entry.
+         *
+         * These buffers must be listed in an order such that all relocations
+         * a buffer is performing refer to buffers that have already appeared
+         * in the validate list.
+         */
+        __u64 buffers_ptr;
+        __u32 buffer_count;
+
+        /** Offset in the batchbuffer to start execution from. */
+        __u32 batch_start_offset;
+        /** Bytes used in batchbuffer from batch_start_offset */
+        __u32 batch_len;
+        __u32 DR1;
+        __u32 DR4;
+        __u32 num_cliprects;
+        /** This is a struct drm_clip_rect *cliprects */
+        __u64 cliprects_ptr;
+};
+
+struct drm_i915_gem_exec_object2 {
+        /**
+         * User's handle for a buffer to be bound into the GTT for this
+         * operation.
+         */
+        __u32 handle;
+
+        /** Number of relocations to be performed on this buffer */
+        __u32 relocation_count;
+        /**
+         * Pointer to array of struct drm_i915_gem_relocation_entry containing
+         * the relocations to be performed in this buffer.
+         */
+        __u64 relocs_ptr;
+
+        /** Required alignment in graphics aperture */
+        __u64 alignment;
+
+        /**
+         * Returned value of the updated offset of the object, for future
+         * presumed_offset writes.
+         */
+        __u64 offset;
+
+#define EXEC_OBJECT_NEEDS_FENCE (1<<0)
+        __u64 flags;
+        __u64 rsvd1;
+        __u64 rsvd2;
+};
+
+struct drm_i915_gem_execbuffer2 {
+        /**
+         * List of gem_exec_object2 structs
+         */
+        __u64 buffers_ptr;
+        __u32 buffer_count;
+
+        /** Offset in the batchbuffer to start execution from. */
+        __u32 batch_start_offset;
+        /** Bytes used in batchbuffer from batch_start_offset */
+        __u32 batch_len;
+        __u32 DR1;
+        __u32 DR4;
+        __u32 num_cliprects;
+        /** This is a struct drm_clip_rect *cliprects */
+        __u64 cliprects_ptr;
+#define I915_EXEC_RING_MASK              (7<<0)
+#define I915_EXEC_DEFAULT                (0<<0)
+#define I915_EXEC_RENDER                 (1<<0)
+#define I915_EXEC_BSD                    (2<<0)
+#define I915_EXEC_BLT                    (3<<0)
+
+/* Used for switching the constants addressing mode on gen4+ RENDER ring.
+ * Gen6+ only supports relative addressing to dynamic state (default) and
+ * absolute addressing.
+ *
+ * These flags are ignored for the BSD and BLT rings.
+ */
+#define I915_EXEC_CONSTANTS_MASK        (3<<6)
+#define I915_EXEC_CONSTANTS_REL_GENERAL (0<<6) /* default */
+#define I915_EXEC_CONSTANTS_ABSOLUTE    (1<<6)
+#define I915_EXEC_CONSTANTS_REL_SURFACE (2<<6) /* gen4/5 only */
+        __u64 flags;
+        __u64 rsvd1; /* now used for context info */
+        __u64 rsvd2;
+};
+
+/** Resets the SO write offset registers for transform feedback on gen7. */
+#define I915_EXEC_GEN7_SOL_RESET        (1<<8)
+
+#define I915_EXEC_CONTEXT_ID_MASK       (0xffffffff)
+#define i915_execbuffer2_set_context_id(eb2, context) \
+        (eb2).rsvd1 = context & I915_EXEC_CONTEXT_ID_MASK
+#define i915_execbuffer2_get_context_id(eb2) \
+        ((eb2).rsvd1 & I915_EXEC_CONTEXT_ID_MASK)
+
+struct drm_i915_gem_pin {
+        /** Handle of the buffer to be pinned. */
+        __u32 handle;
+        __u32 pad;
+
+        /** alignment required within the aperture */
+        __u64 alignment;
+
+        /** Returned GTT offset of the buffer. */
+        __u64 offset;
+};
+
+struct drm_i915_gem_unpin {
+        /** Handle of the buffer to be unpinned. */
+        __u32 handle;
+        __u32 pad;
+};
+
+struct drm_i915_gem_busy {
+        /** Handle of the buffer to check for busy */
+        __u32 handle;
+
+        /** Return busy status (1 if busy, 0 if idle).
+         * The high word is used to indicate on which rings the object
+         * currently resides:
+         *  16:31 - busy (r or r/w) rings (16 render, 17 bsd, 18 blt, etc)
+         */
+        __u32 busy;
+};
+
+#define I915_CACHING_NONE               0
+#define I915_CACHING_CACHED             1
+
+struct drm_i915_gem_caching {
+        /**
+         * Handle of the buffer to set/get the caching level of. */
+        __u32 handle;
+
+        /**
+         * Cacheing level to apply or return value
+         *
+         * bits0-15 are for generic caching control (i.e. the above defined
+         * values). bits16-31 are reserved for platform-specific variations
+         * (e.g. l3$ caching on gen7). */
+        __u32 caching;
+};
+
+#define I915_TILING_NONE        0
+#define I915_TILING_X           1
+#define I915_TILING_Y           2
+
+#define I915_BIT_6_SWIZZLE_NONE         0
+#define I915_BIT_6_SWIZZLE_9            1
+#define I915_BIT_6_SWIZZLE_9_10         2
+#define I915_BIT_6_SWIZZLE_9_11         3
+#define I915_BIT_6_SWIZZLE_9_10_11      4
+/* Not seen by userland */
+#define I915_BIT_6_SWIZZLE_UNKNOWN      5
+/* Seen by userland. */
+#define I915_BIT_6_SWIZZLE_9_17         6
+#define I915_BIT_6_SWIZZLE_9_10_17      7
+
+struct drm_i915_gem_set_tiling {
+        /** Handle of the buffer to have its tiling state updated */
+        __u32 handle;
+
+        /**
+         * Tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
+         * I915_TILING_Y).
+         *
+         * This value is to be set on request, and will be updated by the
+         * kernel on successful return with the actual chosen tiling layout.
+         *
+         * The tiling mode may be demoted to I915_TILING_NONE when the system
+         * has bit 6 swizzling that can't be managed correctly by GEM.
+         *
+         * Buffer contents become undefined when changing tiling_mode.
+         */
+        __u32 tiling_mode;
+
+        /**
+         * Stride in bytes for the object when in I915_TILING_X or
+         * I915_TILING_Y.
+         */
+        __u32 stride;
+
+        /**
+         * Returned address bit 6 swizzling required for CPU access through
+         * mmap mapping.
+         */
+        __u32 swizzle_mode;
+};
+
+struct drm_i915_gem_get_tiling {
+        /** Handle of the buffer to get tiling state for. */
+        __u32 handle;
+
+        /**
+         * Current tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
+         * I915_TILING_Y).
+         */
+        __u32 tiling_mode;
+
+        /**
+         * Returned address bit 6 swizzling required for CPU access through
+         * mmap mapping.
+         */
+        __u32 swizzle_mode;
+};
+
+struct drm_i915_gem_get_aperture {
+        /** Total size of the aperture used by i915_gem_execbuffer, in bytes */
+        __u64 aper_size;
+
+        /**
+         * Available space in the aperture used by i915_gem_execbuffer, in
+         * bytes
+         */
+        __u64 aper_available_size;
+};
+
+struct drm_i915_get_pipe_from_crtc_id {
+        /** ID of CRTC being requested **/
+        __u32 crtc_id;
+
+        /** pipe of requested CRTC **/
+        __u32 pipe;
+};
+
+#define I915_MADV_WILLNEED 0
+#define I915_MADV_DONTNEED 1
+#define __I915_MADV_PURGED 2 /* internal state */
+
+struct drm_i915_gem_madvise {
+        /** Handle of the buffer to change the backing store advice */
+        __u32 handle;
+
+        /* Advice: either the buffer will be needed again in the near future,
+         *         or wont be and could be discarded under memory pressure.
+         */
+        __u32 madv;
+
+        /** Whether the backing store still exists. */
+        __u32 retained;
+};
+
+/* flags */
+#define I915_OVERLAY_TYPE_MASK          0xff
+#define I915_OVERLAY_YUV_PLANAR         0x01
+#define I915_OVERLAY_YUV_PACKED         0x02
+#define I915_OVERLAY_RGB                0x03
+
+#define I915_OVERLAY_DEPTH_MASK         0xff00
+#define I915_OVERLAY_RGB24              0x1000
+#define I915_OVERLAY_RGB16              0x2000
+#define I915_OVERLAY_RGB15              0x3000
+#define I915_OVERLAY_YUV422             0x0100
+#define I915_OVERLAY_YUV411             0x0200
+#define I915_OVERLAY_YUV420             0x0300
+#define I915_OVERLAY_YUV410             0x0400
+
+#define I915_OVERLAY_SWAP_MASK          0xff0000
+#define I915_OVERLAY_NO_SWAP            0x000000
+#define I915_OVERLAY_UV_SWAP            0x010000
+#define I915_OVERLAY_Y_SWAP             0x020000
+#define I915_OVERLAY_Y_AND_UV_SWAP      0x030000
+
+#define I915_OVERLAY_FLAGS_MASK         0xff000000
+#define I915_OVERLAY_ENABLE             0x01000000
+
+struct drm_intel_overlay_put_image {
+        /* various flags and src format description */
+        __u32 flags;
+        /* source picture description */
+        __u32 bo_handle;
+        /* stride values and offsets are in bytes, buffer relative */
+        __u16 stride_Y; /* stride for packed formats */
+        __u16 stride_UV;
+        __u32 offset_Y; /* offset for packet formats */
+        __u32 offset_U;
+        __u32 offset_V;
+        /* in pixels */
+        __u16 src_width;
+        __u16 src_height;
+        /* to compensate the scaling factors for partially covered surfaces */
+        __u16 src_scan_width;
+        __u16 src_scan_height;
+        /* output crtc description */
+        __u32 crtc_id;
+        __u16 dst_x;
+        __u16 dst_y;
+        __u16 dst_width;
+        __u16 dst_height;
+};
+
+/* flags */
+#define I915_OVERLAY_UPDATE_ATTRS       (1<<0)
+#define I915_OVERLAY_UPDATE_GAMMA       (1<<1)
+struct drm_intel_overlay_attrs {
+        __u32 flags;
+        __u32 color_key;
+        __s32 brightness;
+        __u32 contrast;
+        __u32 saturation;
+        __u32 gamma0;
+        __u32 gamma1;
+        __u32 gamma2;
+        __u32 gamma3;
+        __u32 gamma4;
+        __u32 gamma5;
+};
+
+/*
+ * Intel sprite handling
+ *
+ * Color keying works with a min/mask/max tuple.  Both source and destination
+ * color keying is allowed.
+ *
+ * Source keying:
+ * Sprite pixels within the min & max values, masked against the color channels
+ * specified in the mask field, will be transparent.  All other pixels will
+ * be displayed on top of the primary plane.  For RGB surfaces, only the min
+ * and mask fields will be used; ranged compares are not allowed.
+ *
+ * Destination keying:
+ * Primary plane pixels that match the min value, masked against the color
+ * channels specified in the mask field, will be replaced by corresponding
+ * pixels from the sprite plane.
+ *
+ * Note that source & destination keying are exclusive; only one can be
+ * active on a given plane.
+ */
+
+#define I915_SET_COLORKEY_NONE          (1<<0) /* disable color key matching */
+#define I915_SET_COLORKEY_DESTINATION   (1<<1)
+#define I915_SET_COLORKEY_SOURCE        (1<<2)
+struct drm_intel_sprite_colorkey {
+        __u32 plane_id;
+        __u32 min_value;
+        __u32 channel_mask;
+        __u32 max_value;
+        __u32 flags;
+};
+
+struct drm_i915_gem_wait {
+        /** Handle of BO we shall wait on */
+        __u32 bo_handle;
+        __u32 flags;
+        /** Number of nanoseconds to wait, Returns time remaining. */
+        __s64 timeout_ns;
+};
+
+struct drm_i915_gem_context_create {
+        /*  output: id of new context*/
+        __u32 ctx_id;
+        __u32 pad;
+};
+
+struct drm_i915_gem_context_destroy {
+        __u32 ctx_id;
+        __u32 pad;
+};
+
+struct drm_i915_reg_read {
+        __u64 offset;
+        __u64 val; /* Return value */
+};
+#endif /* _UAPI_I915_DRM_H_ */
diff --git a/include/drm/mga_drm.h b/include/uapi/drm/mga_drm.h
index 2375bfd6e5e9..2375bfd6e5e9 100644
--- a/include/drm/mga_drm.h
+++ b/include/uapi/drm/mga_drm.h
diff --git a/include/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h
index 2a5769fdf8ba..2a5769fdf8ba 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/uapi/drm/nouveau_drm.h
diff --git a/include/drm/r128_drm.h b/include/uapi/drm/r128_drm.h
index 8d8878b55f55..8d8878b55f55 100644
--- a/include/drm/r128_drm.h
+++ b/include/uapi/drm/r128_drm.h
diff --git a/include/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h
index 4766c0f6a838..4766c0f6a838 100644
--- a/include/drm/radeon_drm.h
+++ b/include/uapi/drm/radeon_drm.h
diff --git a/include/drm/savage_drm.h b/include/uapi/drm/savage_drm.h
index 818d49be2e6e..818d49be2e6e 100644
--- a/include/drm/savage_drm.h
+++ b/include/uapi/drm/savage_drm.h
diff --git a/include/drm/sis_drm.h b/include/uapi/drm/sis_drm.h
index df3763222d73..df3763222d73 100644
--- a/include/drm/sis_drm.h
+++ b/include/uapi/drm/sis_drm.h
diff --git a/include/drm/via_drm.h b/include/uapi/drm/via_drm.h
index 8b0533ccbd5a..8b0533ccbd5a 100644
--- a/include/drm/via_drm.h
+++ b/include/uapi/drm/via_drm.h
diff --git a/include/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
index bcb0912afe7a..bcb0912afe7a 100644
--- a/include/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index b0fd4d03499d..e194387ef784 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -22,3 +22,396 @@ header-y += usb/
 header-y += wimax/
 
 genhdr-y += version.h
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \
+                  $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),)
+header-y += a.out.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 += 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 += inet_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-page-flags.h
+header-y += kernel.h
+header-y += kernelcapi.h
+header-y += kexec.h
+header-y += keyboard.h
+header-y += keyctl.h
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \
+                  $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),)
+header-y += kvm.h
+endif
+
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \
+                  $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),)
+header-y += kvm_para.h
+endif
+
+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 += packet_diag.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 += sock_diag.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 += unix_diag.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
diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
new file mode 100644
index 000000000000..7caf44c7fa51
--- /dev/null
+++ b/include/uapi/linux/a.out.h
@@ -0,0 +1,274 @@
+#ifndef _UAPI__A_OUT_GNU_H__
+#define _UAPI__A_OUT_GNU_H__
+
+#define __GNU_EXEC_MACROS__
+
+#ifndef __STRUCT_EXEC_OVERRIDE__
+
+#include <asm/a.out.h>
+
+#endif /* __STRUCT_EXEC_OVERRIDE__ */
+
+#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
+#ifndef __KERNEL__
+#include <unistd.h>
+#endif
+#if defined(__i386__) || defined(__mc68000__)
+#define SEGMENT_SIZE    1024
+#else
+#ifndef SEGMENT_SIZE
+#ifndef __KERNEL__
+#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 /* _UAPI__A_OUT_GNU_H__ */
diff --git a/include/uapi/linux/acct.h b/include/uapi/linux/acct.h
new file mode 100644
index 000000000000..11b6ca3e0873
--- /dev/null
+++ b/include/uapi/linux/acct.h
@@ -0,0 +1,122 @@
+/*
+ *  BSD Process Accounting for Linux - Definitions
+ *
+ *  Author: Marco van Wieringen (mvw@planets.elm.net)
+ *
+ *  This header file contains the definitions needed to implement
+ *  BSD-style process accounting. The kernel accounting code and all
+ *  user-level programs that try to do something useful with the
+ *  process accounting log must include this file.
+ *
+ *  Copyright (C) 1995 - 1997 Marco van Wieringen - ELM Consultancy B.V.
+ *
+ */
+
+#ifndef _UAPI_LINUX_ACCT_H
+#define _UAPI_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
+
+#ifndef __KERNEL__
+#define ACCT_VERSION    2
+#define AHZ             (HZ)
+#endif  /* __KERNEL */
+
+
+#endif /* _UAPI_LINUX_ACCT_H */
diff --git a/include/uapi/linux/adb.h b/include/uapi/linux/adb.h
new file mode 100644
index 000000000000..0ea1075fc4a0
--- /dev/null
+++ b/include/uapi/linux/adb.h
@@ -0,0 +1,44 @@
+/*
+ * Definitions for ADB (Apple Desktop Bus) support.
+ */
+#ifndef _UAPI__ADB_H
+#define _UAPI__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))
+
+/* 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
+
+
+#endif /* _UAPI__ADB_H */
diff --git a/include/uapi/linux/adfs_fs.h b/include/uapi/linux/adfs_fs.h
new file mode 100644
index 000000000000..a1bf43754ddd
--- /dev/null
+++ b/include/uapi/linux/adfs_fs.h
@@ -0,0 +1,44 @@
+#ifndef _UAPI_ADFS_FS_H
+#define _UAPI_ADFS_FS_H
+
+#include <linux/types.h>
+#include <linux/magic.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)
+
+
+#endif /* _UAPI_ADFS_FS_H */
diff --git a/include/linux/affs_hardblocks.h b/include/uapi/linux/affs_hardblocks.h
index f1b948c1f592..f1b948c1f592 100644
--- a/include/linux/affs_hardblocks.h
+++ b/include/uapi/linux/affs_hardblocks.h
diff --git a/include/uapi/linux/agpgart.h b/include/uapi/linux/agpgart.h
new file mode 100644
index 000000000000..4e828cf487bc
--- /dev/null
+++ b/include/uapi/linux/agpgart.h
@@ -0,0 +1,113 @@
+/*
+ * AGPGART module version 0.99
+ * Copyright (C) 1999 Jeff Hartmann
+ * Copyright (C) 1999 Precision Insight, Inc.
+ * Copyright (C) 1999 Xi Graphics, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef _UAPI_AGP_H
+#define _UAPI_AGP_H
+
+#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;
+
+#endif                          /* __KERNEL__ */
+
+#endif /* _UAPI_AGP_H */
diff --git a/include/linux/aio_abi.h b/include/uapi/linux/aio_abi.h
index 86fa7a71336a..86fa7a71336a 100644
--- a/include/linux/aio_abi.h
+++ b/include/uapi/linux/aio_abi.h
diff --git a/include/uapi/linux/apm_bios.h b/include/uapi/linux/apm_bios.h
new file mode 100644
index 000000000000..724f409adae0
--- /dev/null
+++ b/include/uapi/linux/apm_bios.h
@@ -0,0 +1,135 @@
+/*
+ * Include file for the interface to an APM BIOS
+ * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+#ifndef _UAPI_LINUX_APM_H
+#define _UAPI_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;
+};
+
+
+/*
+ * 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
+
+
+/*
+ * 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 /* _UAPI_LINUX_APM_H */
diff --git a/include/linux/arcfb.h b/include/uapi/linux/arcfb.h
index 721e7654daeb..721e7654daeb 100644
--- a/include/linux/arcfb.h
+++ b/include/uapi/linux/arcfb.h
diff --git a/include/uapi/linux/atalk.h b/include/uapi/linux/atalk.h
new file mode 100644
index 000000000000..4bcd596e6388
--- /dev/null
+++ b/include/uapi/linux/atalk.h
@@ -0,0 +1,44 @@
+#ifndef _UAPI__LINUX_ATALK_H__
+#define _UAPI__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;
+};
+
+#endif /* _UAPI__LINUX_ATALK_H__ */
diff --git a/include/uapi/linux/atm.h b/include/uapi/linux/atm.h
new file mode 100644
index 000000000000..88399db602ac
--- /dev/null
+++ b/include/uapi/linux/atm.h
@@ -0,0 +1,241 @@
+/* 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 _UAPI_LINUX_ATM_H
+#define _UAPI_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 */
+
+#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;
+};
+
+
+typedef unsigned short atm_backend_t;
+#endif /* _UAPI_LINUX_ATM_H */
diff --git a/include/linux/atm_eni.h b/include/uapi/linux/atm_eni.h
index 34f317972551..34f317972551 100644
--- a/include/linux/atm_eni.h
+++ b/include/uapi/linux/atm_eni.h
diff --git a/include/linux/atm_he.h b/include/uapi/linux/atm_he.h
index 2a7713b597cf..2a7713b597cf 100644
--- a/include/linux/atm_he.h
+++ b/include/uapi/linux/atm_he.h
diff --git a/include/linux/atm_idt77105.h b/include/uapi/linux/atm_idt77105.h
index 8b724000aa50..8b724000aa50 100644
--- a/include/linux/atm_idt77105.h
+++ b/include/uapi/linux/atm_idt77105.h
diff --git a/include/linux/atm_nicstar.h b/include/uapi/linux/atm_nicstar.h
index 577b79f33e8d..577b79f33e8d 100644
--- a/include/linux/atm_nicstar.h
+++ b/include/uapi/linux/atm_nicstar.h
diff --git a/include/uapi/linux/atm_tcp.h b/include/uapi/linux/atm_tcp.h
new file mode 100644
index 000000000000..914e821da64d
--- /dev/null
+++ b/include/uapi/linux/atm_tcp.h
@@ -0,0 +1,61 @@
+/* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
+               driver-specific utilities) */
+
+/* Written 1997-2000 by Werner Almesberger, EPFL LRC/ICA */
+
+
+#ifndef _UAPILINUX_ATM_TCP_H
+#define _UAPILINUX_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 */
+
+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 */
+
+
+
+#endif /* _UAPILINUX_ATM_TCP_H */
diff --git a/include/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h
index 10f0fa29454f..10f0fa29454f 100644
--- a/include/linux/atm_zatm.h
+++ b/include/uapi/linux/atm_zatm.h
diff --git a/include/linux/atmapi.h b/include/uapi/linux/atmapi.h
index 8fe54d90d95b..8fe54d90d95b 100644
--- a/include/linux/atmapi.h
+++ b/include/uapi/linux/atmapi.h
diff --git a/include/linux/atmarp.h b/include/uapi/linux/atmarp.h
index 231f4bdec730..231f4bdec730 100644
--- a/include/linux/atmarp.h
+++ b/include/uapi/linux/atmarp.h
diff --git a/include/linux/atmbr2684.h b/include/uapi/linux/atmbr2684.h
index fdb2629b6189..fdb2629b6189 100644
--- a/include/linux/atmbr2684.h
+++ b/include/uapi/linux/atmbr2684.h
diff --git a/include/linux/atmclip.h b/include/uapi/linux/atmclip.h
index 02c94c448dd6..02c94c448dd6 100644
--- a/include/linux/atmclip.h
+++ b/include/uapi/linux/atmclip.h
diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h
new file mode 100644
index 000000000000..93e0ec008ca8
--- /dev/null
+++ b/include/uapi/linux/atmdev.h
@@ -0,0 +1,215 @@
+/* atmdev.h - ATM device driver declarations and various related items */
+ 
+/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
+ 
+
+#ifndef _UAPILINUX_ATMDEV_H
+#define _UAPILINUX_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"
+
+
+
+#endif /* _UAPILINUX_ATMDEV_H */
diff --git a/include/linux/atmioc.h b/include/uapi/linux/atmioc.h
index 37f67aa8f1c1..37f67aa8f1c1 100644
--- a/include/linux/atmioc.h
+++ b/include/uapi/linux/atmioc.h
diff --git a/include/linux/atmlec.h b/include/uapi/linux/atmlec.h
index 302791e3ab2b..302791e3ab2b 100644
--- a/include/linux/atmlec.h
+++ b/include/uapi/linux/atmlec.h
diff --git a/include/linux/atmmpc.h b/include/uapi/linux/atmmpc.h
index 2aba5787fa63..2aba5787fa63 100644
--- a/include/linux/atmmpc.h
+++ b/include/uapi/linux/atmmpc.h
diff --git a/include/linux/atmppp.h b/include/uapi/linux/atmppp.h
index 300dcce0c83f..300dcce0c83f 100644
--- a/include/linux/atmppp.h
+++ b/include/uapi/linux/atmppp.h
diff --git a/include/linux/atmsap.h b/include/uapi/linux/atmsap.h
index 799b104515d7..799b104515d7 100644
--- a/include/linux/atmsap.h
+++ b/include/uapi/linux/atmsap.h
diff --git a/include/linux/atmsvc.h b/include/uapi/linux/atmsvc.h
index aa71583b8da7..aa71583b8da7 100644
--- a/include/linux/atmsvc.h
+++ b/include/uapi/linux/atmsvc.h
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
new file mode 100644
index 000000000000..76352ac45f24
--- /dev/null
+++ b/include/uapi/linux/audit.h
@@ -0,0 +1,404 @@
+/* audit.h -- Auditing support
+ *
+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Written by Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+#ifndef _UAPI_LINUX_AUDIT_H_
+#define _UAPI_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];
+};
+
+#endif /* _UAPI_LINUX_AUDIT_H_ */
diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h
new file mode 100644
index 000000000000..77cdba9df274
--- /dev/null
+++ b/include/uapi/linux/auto_fs.h
@@ -0,0 +1,83 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *   
+ * linux/include/linux/auto_fs.h
+ *
+ *   Copyright 1997 Transmeta Corporation - All Rights Reserved
+ *
+ * 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 _UAPI_LINUX_AUTO_FS_H
+#define _UAPI_LINUX_AUTO_FS_H
+
+#include <linux/types.h>
+#ifndef __KERNEL__
+#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)
+
+#endif /* _UAPI_LINUX_AUTO_FS_H */
diff --git a/include/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h
index e02982fa2953..e02982fa2953 100644
--- a/include/linux/auto_fs4.h
+++ b/include/uapi/linux/auto_fs4.h
diff --git a/include/uapi/linux/auxvec.h b/include/uapi/linux/auxvec.h
new file mode 100644
index 000000000000..61594d598e7b
--- /dev/null
+++ b/include/uapi/linux/auxvec.h
@@ -0,0 +1,35 @@
+#ifndef _UAPI_LINUX_AUXVEC_H
+#define _UAPI_LINUX_AUXVEC_H
+
+#include <asm/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 */
+
+
+#endif /* _UAPI_LINUX_AUXVEC_H */
diff --git a/include/linux/ax25.h b/include/uapi/linux/ax25.h
index 74c89a41732d..74c89a41732d 100644
--- a/include/linux/ax25.h
+++ b/include/uapi/linux/ax25.h
diff --git a/include/linux/b1lli.h b/include/uapi/linux/b1lli.h
index 713f712685d3..713f712685d3 100644
--- a/include/linux/b1lli.h
+++ b/include/uapi/linux/b1lli.h
diff --git a/include/linux/baycom.h b/include/uapi/linux/baycom.h
index 81249e029dad..81249e029dad 100644
--- a/include/linux/baycom.h
+++ b/include/uapi/linux/baycom.h
diff --git a/include/linux/bfs_fs.h b/include/uapi/linux/bfs_fs.h
index 1c0b355aa515..1c0b355aa515 100644
--- a/include/linux/bfs_fs.h
+++ b/include/uapi/linux/bfs_fs.h
diff --git a/include/uapi/linux/binfmts.h b/include/uapi/linux/binfmts.h
new file mode 100644
index 000000000000..4eb5972867c0
--- /dev/null
+++ b/include/uapi/linux/binfmts.h
@@ -0,0 +1,20 @@
+#ifndef _UAPI_LINUX_BINFMTS_H
+#define _UAPI_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
+
+#endif /* _UAPI_LINUX_BINFMTS_H */
diff --git a/include/linux/blkpg.h b/include/uapi/linux/blkpg.h
index a8519446c111..a8519446c111 100644
--- a/include/linux/blkpg.h
+++ b/include/uapi/linux/blkpg.h
diff --git a/include/uapi/linux/blktrace_api.h b/include/uapi/linux/blktrace_api.h
new file mode 100644
index 000000000000..c590ca6bfbd9
--- /dev/null
+++ b/include/uapi/linux/blktrace_api.h
@@ -0,0 +1,142 @@
+#ifndef _UAPIBLKTRACE_H
+#define _UAPIBLKTRACE_H
+
+#include <linux/types.h>
+
+/*
+ * 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;
+};
+
+#endif /* _UAPIBLKTRACE_H */
diff --git a/include/linux/bpqether.h b/include/uapi/linux/bpqether.h
index a6c35e1a89ad..a6c35e1a89ad 100644
--- a/include/linux/bpqether.h
+++ b/include/uapi/linux/bpqether.h
diff --git a/include/uapi/linux/bsg.h b/include/uapi/linux/bsg.h
new file mode 100644
index 000000000000..7a12e1c0f371
--- /dev/null
+++ b/include/uapi/linux/bsg.h
@@ -0,0 +1,65 @@
+#ifndef _UAPIBSG_H
+#define _UAPIBSG_H
+
+#include <linux/types.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;
+};
+
+
+#endif /* _UAPIBSG_H */
diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild
index aafaa5aa54d4..619225b9ff2e 100644
--- a/include/uapi/linux/byteorder/Kbuild
+++ b/include/uapi/linux/byteorder/Kbuild
@@ -1 +1,3 @@
 # UAPI Header export list
+header-y += big_endian.h
+header-y += little_endian.h
diff --git a/include/uapi/linux/byteorder/big_endian.h b/include/uapi/linux/byteorder/big_endian.h
new file mode 100644
index 000000000000..672374450095
--- /dev/null
+++ b/include/uapi/linux/byteorder/big_endian.h
@@ -0,0 +1,105 @@
+#ifndef _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H
+#define _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H
+
+#ifndef __BIG_ENDIAN
+#define __BIG_ENDIAN 4321
+#endif
+#ifndef __BIG_ENDIAN_BITFIELD
+#define __BIG_ENDIAN_BITFIELD
+#endif
+
+#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)
+
+
+#endif /* _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H */
diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
new file mode 100644
index 000000000000..d876736a0017
--- /dev/null
+++ b/include/uapi/linux/byteorder/little_endian.h
@@ -0,0 +1,105 @@
+#ifndef _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H
+#define _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H
+
+#ifndef __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN 1234
+#endif
+#ifndef __LITTLE_ENDIAN_BITFIELD
+#define __LITTLE_ENDIAN_BITFIELD
+#endif
+
+#include <linux/types.h>
+#include <linux/swab.h>
+
+#define __constant_htonl(x) ((__force __be32)___constant_swab32((x)))
+#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x))
+#define __constant_htons(x) ((__force __be16)___constant_swab16((x)))
+#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x))
+#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x))
+#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x))
+#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x))
+#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x))
+#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x))
+#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x))
+#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x)))
+#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x))
+#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x)))
+#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x))
+#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x)))
+#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x))
+#define __cpu_to_le64(x) ((__force __le64)(__u64)(x))
+#define __le64_to_cpu(x) ((__force __u64)(__le64)(x))
+#define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
+#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
+#define __cpu_to_le16(x) ((__force __le16)(__u16)(x))
+#define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
+#define __cpu_to_be64(x) ((__force __be64)__swab64((x)))
+#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x))
+#define __cpu_to_be32(x) ((__force __be32)__swab32((x)))
+#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x))
+#define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
+#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
+
+static inline __le64 __cpu_to_le64p(const __u64 *p)
+{
+        return (__force __le64)*p;
+}
+static inline __u64 __le64_to_cpup(const __le64 *p)
+{
+        return (__force __u64)*p;
+}
+static inline __le32 __cpu_to_le32p(const __u32 *p)
+{
+        return (__force __le32)*p;
+}
+static inline __u32 __le32_to_cpup(const __le32 *p)
+{
+        return (__force __u32)*p;
+}
+static inline __le16 __cpu_to_le16p(const __u16 *p)
+{
+        return (__force __le16)*p;
+}
+static inline __u16 __le16_to_cpup(const __le16 *p)
+{
+        return (__force __u16)*p;
+}
+static inline __be64 __cpu_to_be64p(const __u64 *p)
+{
+        return (__force __be64)__swab64p(p);
+}
+static inline __u64 __be64_to_cpup(const __be64 *p)
+{
+        return __swab64p((__u64 *)p);
+}
+static inline __be32 __cpu_to_be32p(const __u32 *p)
+{
+        return (__force __be32)__swab32p(p);
+}
+static inline __u32 __be32_to_cpup(const __be32 *p)
+{
+        return __swab32p((__u32 *)p);
+}
+static inline __be16 __cpu_to_be16p(const __u16 *p)
+{
+        return (__force __be16)__swab16p(p);
+}
+static inline __u16 __be16_to_cpup(const __be16 *p)
+{
+        return __swab16p((__u16 *)p);
+}
+#define __cpu_to_le64s(x) do { (void)(x); } while (0)
+#define __le64_to_cpus(x) do { (void)(x); } while (0)
+#define __cpu_to_le32s(x) do { (void)(x); } while (0)
+#define __le32_to_cpus(x) do { (void)(x); } while (0)
+#define __cpu_to_le16s(x) do { (void)(x); } while (0)
+#define __le16_to_cpus(x) do { (void)(x); } while (0)
+#define __cpu_to_be64s(x) __swab64s((x))
+#define __be64_to_cpus(x) __swab64s((x))
+#define __cpu_to_be32s(x) __swab32s((x))
+#define __be32_to_cpus(x) __swab32s((x))
+#define __cpu_to_be16s(x) __swab16s((x))
+#define __be16_to_cpus(x) __swab16s((x))
+
+
+#endif /* _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H */
diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild
index aafaa5aa54d4..43396612d3a3 100644
--- a/include/uapi/linux/caif/Kbuild
+++ b/include/uapi/linux/caif/Kbuild
@@ -1 +1,3 @@
 # UAPI Header export list
+header-y += caif_socket.h
+header-y += if_caif.h
diff --git a/include/linux/caif/caif_socket.h b/include/uapi/linux/caif/caif_socket.h
index 3f3bac6af7bc..3f3bac6af7bc 100644
--- a/include/linux/caif/caif_socket.h
+++ b/include/uapi/linux/caif/caif_socket.h
diff --git a/include/linux/caif/if_caif.h b/include/uapi/linux/caif/if_caif.h
index 5e7eed4edf51..5e7eed4edf51 100644
--- a/include/linux/caif/if_caif.h
+++ b/include/uapi/linux/caif/if_caif.h
diff --git a/include/linux/can.h b/include/uapi/linux/can.h
index e52958d7c2d1..e52958d7c2d1 100644
--- a/include/linux/can.h
+++ b/include/uapi/linux/can.h
diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild
index aafaa5aa54d4..21c91bf25a29 100644
--- a/include/uapi/linux/can/Kbuild
+++ b/include/uapi/linux/can/Kbuild
@@ -1 +1,6 @@
 # UAPI Header export list
+header-y += bcm.h
+header-y += error.h
+header-y += gw.h
+header-y += netlink.h
+header-y += raw.h
diff --git a/include/linux/can/bcm.h b/include/uapi/linux/can/bcm.h
index 3ebe387fea4d..3ebe387fea4d 100644
--- a/include/linux/can/bcm.h
+++ b/include/uapi/linux/can/bcm.h
diff --git a/include/linux/can/error.h b/include/uapi/linux/can/error.h
index 7b7148bded71..7b7148bded71 100644
--- a/include/linux/can/error.h
+++ b/include/uapi/linux/can/error.h
diff --git a/include/linux/can/gw.h b/include/uapi/linux/can/gw.h
index 8e1db18c3cb6..8e1db18c3cb6 100644
--- a/include/linux/can/gw.h
+++ b/include/uapi/linux/can/gw.h
diff --git a/include/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index 14966ddb7df1..14966ddb7df1 100644
--- a/include/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
diff --git a/include/linux/can/raw.h b/include/uapi/linux/can/raw.h
index a814062b0719..a814062b0719 100644
--- a/include/linux/can/raw.h
+++ b/include/uapi/linux/can/raw.h
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h
new file mode 100644
index 000000000000..ba478fa3012e
--- /dev/null
+++ b/include/uapi/linux/capability.h
@@ -0,0 +1,358 @@
+/*
+ * This is <linux/capability.h>
+ *
+ * Andrew G. Morgan <morgan@kernel.org>
+ * Alexander Kjeldaas <astor@guardian.no>
+ * with help from Aleph1, Roland Buresund and Andrew Main.
+ *
+ * See here for the libcap library ("POSIX draft" compliance):
+ *
+ * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+ */
+
+#ifndef _UAPI_LINUX_CAPABILITY_H
+#define _UAPI_LINUX_CAPABILITY_H
+
+#include <linux/types.h>
+
+struct task_struct;
+
+/* User-level do most of the mapping between kernel and user
+   capabilities based on the version tag given by the kernel. The
+   kernel might be somewhat backwards compatible, but don't bet on
+   it. */
+
+/* Note, cap_t, is defined by POSIX (draft) to be an "opaque" pointer to
+   a set of three capability sets.  The transposition of 3*the
+   following structure to such a composite is better handled in a user
+   library since the draft standard requires the use of malloc/free
+   etc.. */
+
+#define _LINUX_CAPABILITY_VERSION_1  0x19980330
+#define _LINUX_CAPABILITY_U32S_1     1
+
+#define _LINUX_CAPABILITY_VERSION_2  0x20071026  /* deprecated - use v3 */
+#define _LINUX_CAPABILITY_U32S_2     2
+
+#define _LINUX_CAPABILITY_VERSION_3  0x20080522
+#define _LINUX_CAPABILITY_U32S_3     2
+
+typedef struct __user_cap_header_struct {
+        __u32 version;
+        int pid;
+} __user *cap_user_header_t;
+
+typedef struct __user_cap_data_struct {
+        __u32 effective;
+        __u32 permitted;
+        __u32 inheritable;
+} __user *cap_user_data_t;
+
+
+#define VFS_CAP_REVISION_MASK   0xFF000000
+#define VFS_CAP_REVISION_SHIFT  24
+#define VFS_CAP_FLAGS_MASK      ~VFS_CAP_REVISION_MASK
+#define VFS_CAP_FLAGS_EFFECTIVE 0x000001
+
+#define VFS_CAP_REVISION_1      0x01000000
+#define VFS_CAP_U32_1           1
+#define XATTR_CAPS_SZ_1         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_1))
+
+#define VFS_CAP_REVISION_2      0x02000000
+#define VFS_CAP_U32_2           2
+#define XATTR_CAPS_SZ_2         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_2))
+
+#define XATTR_CAPS_SZ           XATTR_CAPS_SZ_2
+#define VFS_CAP_U32             VFS_CAP_U32_2
+#define VFS_CAP_REVISION        VFS_CAP_REVISION_2
+
+struct vfs_cap_data {
+        __le32 magic_etc;            /* Little endian */
+        struct {
+                __le32 permitted;    /* Little endian */
+                __le32 inheritable;  /* Little endian */
+        } data[VFS_CAP_U32];
+};
+
+#ifndef __KERNEL__
+
+/*
+ * Backwardly compatible definition for source code - trapped in a
+ * 32-bit world. If you find you need this, please consider using
+ * libcap to untrap yourself...
+ */
+#define _LINUX_CAPABILITY_VERSION  _LINUX_CAPABILITY_VERSION_1
+#define _LINUX_CAPABILITY_U32S     _LINUX_CAPABILITY_U32S_1
+
+#endif
+
+
+/**
+ ** POSIX-draft defined capabilities.
+ **/
+
+/* In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
+   overrides the restriction of changing file ownership and group
+   ownership. */
+
+#define CAP_CHOWN            0
+
+/* Override all DAC access, including ACL execute access if
+   [_POSIX_ACL] is defined. Excluding DAC access covered by
+   CAP_LINUX_IMMUTABLE. */
+
+#define CAP_DAC_OVERRIDE     1
+
+/* Overrides all DAC restrictions regarding read and search on files
+   and directories, including ACL restrictions if [_POSIX_ACL] is
+   defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE. */
+
+#define CAP_DAC_READ_SEARCH  2
+
+/* Overrides all restrictions about allowed operations on files, where
+   file owner ID must be equal to the user ID, except where CAP_FSETID
+   is applicable. It doesn't override MAC and DAC restrictions. */
+
+#define CAP_FOWNER           3
+
+/* Overrides the following restrictions that the effective user ID
+   shall match the file owner ID when setting the S_ISUID and S_ISGID
+   bits on that file; that the effective group ID (or one of the
+   supplementary group IDs) shall match the file owner ID when setting
+   the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
+   cleared on successful return from chown(2) (not implemented). */
+
+#define CAP_FSETID           4
+
+/* Overrides the restriction that the real or effective user ID of a
+   process sending a signal must match the real or effective user ID
+   of the process receiving the signal. */
+
+#define CAP_KILL             5
+
+/* Allows setgid(2) manipulation */
+/* Allows setgroups(2) */
+/* Allows forged gids on socket credentials passing. */
+
+#define CAP_SETGID           6
+
+/* Allows set*uid(2) manipulation (including fsuid). */
+/* Allows forged pids on socket credentials passing. */
+
+#define CAP_SETUID           7
+
+
+/**
+ ** Linux-specific capabilities
+ **/
+
+/* Without VFS support for capabilities:
+ *   Transfer any capability in your permitted set to any pid,
+ *   remove any capability in your permitted set from any pid
+ * With VFS support for capabilities (neither of above, but)
+ *   Add any capability from current's capability bounding set
+ *       to the current process' inheritable set
+ *   Allow taking bits out of capability bounding set
+ *   Allow modification of the securebits for a process
+ */
+
+#define CAP_SETPCAP          8
+
+/* Allow modification of S_IMMUTABLE and S_APPEND file attributes */
+
+#define CAP_LINUX_IMMUTABLE  9
+
+/* Allows binding to TCP/UDP sockets below 1024 */
+/* Allows binding to ATM VCIs below 32 */
+
+#define CAP_NET_BIND_SERVICE 10
+
+/* Allow broadcasting, listen to multicast */
+
+#define CAP_NET_BROADCAST    11
+
+/* Allow interface configuration */
+/* Allow administration of IP firewall, masquerading and accounting */
+/* Allow setting debug option on sockets */
+/* Allow modification of routing tables */
+/* Allow setting arbitrary process / process group ownership on
+   sockets */
+/* Allow binding to any address for transparent proxying (also via NET_RAW) */
+/* Allow setting TOS (type of service) */
+/* Allow setting promiscuous mode */
+/* Allow clearing driver statistics */
+/* Allow multicasting */
+/* Allow read/write of device-specific registers */
+/* Allow activation of ATM control sockets */
+
+#define CAP_NET_ADMIN        12
+
+/* Allow use of RAW sockets */
+/* Allow use of PACKET sockets */
+/* Allow binding to any address for transparent proxying (also via NET_ADMIN) */
+
+#define CAP_NET_RAW          13
+
+/* Allow locking of shared memory segments */
+/* Allow mlock and mlockall (which doesn't really have anything to do
+   with IPC) */
+
+#define CAP_IPC_LOCK         14
+
+/* Override IPC ownership checks */
+
+#define CAP_IPC_OWNER        15
+
+/* Insert and remove kernel modules - modify kernel without limit */
+#define CAP_SYS_MODULE       16
+
+/* Allow ioperm/iopl access */
+/* Allow sending USB messages to any device via /proc/bus/usb */
+
+#define CAP_SYS_RAWIO        17
+
+/* Allow use of chroot() */
+
+#define CAP_SYS_CHROOT       18
+
+/* Allow ptrace() of any process */
+
+#define CAP_SYS_PTRACE       19
+
+/* Allow configuration of process accounting */
+
+#define CAP_SYS_PACCT        20
+
+/* Allow configuration of the secure attention key */
+/* Allow administration of the random device */
+/* Allow examination and configuration of disk quotas */
+/* Allow setting the domainname */
+/* Allow setting the hostname */
+/* Allow calling bdflush() */
+/* Allow mount() and umount(), setting up new smb connection */
+/* Allow some autofs root ioctls */
+/* Allow nfsservctl */
+/* Allow VM86_REQUEST_IRQ */
+/* Allow to read/write pci config on alpha */
+/* Allow irix_prctl on mips (setstacksize) */
+/* Allow flushing all cache on m68k (sys_cacheflush) */
+/* Allow removing semaphores */
+/* Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
+   and shared memory */
+/* Allow locking/unlocking of shared memory segment */
+/* Allow turning swap on/off */
+/* Allow forged pids on socket credentials passing */
+/* Allow setting readahead and flushing buffers on block devices */
+/* Allow setting geometry in floppy driver */
+/* Allow turning DMA on/off in xd driver */
+/* Allow administration of md devices (mostly the above, but some
+   extra ioctls) */
+/* Allow tuning the ide driver */
+/* Allow access to the nvram device */
+/* Allow administration of apm_bios, serial and bttv (TV) device */
+/* Allow manufacturer commands in isdn CAPI support driver */
+/* Allow reading non-standardized portions of pci configuration space */
+/* Allow DDI debug ioctl on sbpcd driver */
+/* Allow setting up serial ports */
+/* Allow sending raw qic-117 commands */
+/* Allow enabling/disabling tagged queuing on SCSI controllers and sending
+   arbitrary SCSI commands */
+/* Allow setting encryption key on loopback filesystem */
+/* Allow setting zone reclaim policy */
+
+#define CAP_SYS_ADMIN        21
+
+/* Allow use of reboot() */
+
+#define CAP_SYS_BOOT         22
+
+/* Allow raising priority and setting priority on other (different
+   UID) processes */
+/* Allow use of FIFO and round-robin (realtime) scheduling on own
+   processes and setting the scheduling algorithm used by another
+   process. */
+/* Allow setting cpu affinity on other processes */
+
+#define CAP_SYS_NICE         23
+
+/* Override resource limits. Set resource limits. */
+/* Override quota limits. */
+/* Override reserved space on ext2 filesystem */
+/* Modify data journaling mode on ext3 filesystem (uses journaling
+   resources) */
+/* NOTE: ext2 honors fsuid when checking for resource overrides, so
+   you can override using fsuid too */
+/* Override size restrictions on IPC message queues */
+/* Allow more than 64hz interrupts from the real-time clock */
+/* Override max number of consoles on console allocation */
+/* Override max number of keymaps */
+
+#define CAP_SYS_RESOURCE     24
+
+/* Allow manipulation of system clock */
+/* Allow irix_stime on mips */
+/* Allow setting the real-time clock */
+
+#define CAP_SYS_TIME         25
+
+/* Allow configuration of tty devices */
+/* Allow vhangup() of tty */
+
+#define CAP_SYS_TTY_CONFIG   26
+
+/* Allow the privileged aspects of mknod() */
+
+#define CAP_MKNOD            27
+
+/* Allow taking of leases on files */
+
+#define CAP_LEASE            28
+
+#define CAP_AUDIT_WRITE      29
+
+#define CAP_AUDIT_CONTROL    30
+
+#define CAP_SETFCAP          31
+
+/* Override MAC access.
+   The base kernel enforces no MAC policy.
+   An LSM may enforce a MAC policy, and if it does and it chooses
+   to implement capability based overrides of that policy, this is
+   the capability it should use to do so. */
+
+#define CAP_MAC_OVERRIDE     32
+
+/* Allow MAC configuration or state changes.
+   The base kernel requires no MAC configuration.
+   An LSM may enforce a MAC policy, and if it does and it chooses
+   to implement capability based checks on modifications to that
+   policy or the data required to maintain it, this is the
+   capability it should use to do so. */
+
+#define CAP_MAC_ADMIN        33
+
+/* Allow configuring the kernel's syslog (printk behaviour) */
+
+#define CAP_SYSLOG           34
+
+/* Allow triggering something that will wake the system */
+
+#define CAP_WAKE_ALARM            35
+
+/* Allow preventing system suspends */
+
+#define CAP_BLOCK_SUSPEND    36
+
+#define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
+
+#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
+
+/*
+ * Bit location of each capability (used by user-space library and kernel)
+ */
+
+#define CAP_TO_INDEX(x)     ((x) >> 5)        /* 1 << 5 == bits in __u32 */
+#define CAP_TO_MASK(x)      (1 << ((x) & 31)) /* mask for indexed __u32 */
+
+
+#endif /* _UAPI_LINUX_CAPABILITY_H */
diff --git a/include/linux/capi.h b/include/uapi/linux/capi.h
index 65100d6cb89b..65100d6cb89b 100644
--- a/include/linux/capi.h
+++ b/include/uapi/linux/capi.h
diff --git a/include/linux/cciss_defs.h b/include/uapi/linux/cciss_defs.h
index 316b670d4e33..316b670d4e33 100644
--- a/include/linux/cciss_defs.h
+++ b/include/uapi/linux/cciss_defs.h
diff --git a/include/uapi/linux/cciss_ioctl.h b/include/uapi/linux/cciss_ioctl.h
new file mode 100644
index 000000000000..bb0b9ddf7eeb
--- /dev/null
+++ b/include/uapi/linux/cciss_ioctl.h
@@ -0,0 +1,88 @@
+#ifndef _UAPICCISS_IOCTLH
+#define _UAPICCISS_IOCTLH
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/cciss_defs.h>
+
+#define CCISS_IOC_MAGIC 'B'
+
+
+typedef struct _cciss_pci_info_struct
+{
+        unsigned char   bus;
+        unsigned char   dev_fn;
+        unsigned short  domain;
+        __u32           board_id;
+} cciss_pci_info_struct; 
+
+typedef struct _cciss_coalint_struct
+{
+        __u32  delay;
+        __u32  count;
+} cciss_coalint_struct;
+
+typedef char NodeName_type[16];
+
+typedef __u32 Heartbeat_type;
+
+#define CISS_PARSCSIU2  0x0001
+#define CISS_PARCSCIU3  0x0002
+#define CISS_FIBRE1G    0x0100
+#define CISS_FIBRE2G    0x0200
+typedef __u32 BusTypes_type;
+
+typedef char FirmwareVer_type[4];
+typedef __u32 DriverVer_type;
+
+#define MAX_KMALLOC_SIZE 128000
+
+typedef struct _IOCTL_Command_struct {
+  LUNAddr_struct           LUN_info;
+  RequestBlock_struct      Request;
+  ErrorInfo_struct         error_info; 
+  WORD                     buf_size;  /* size in bytes of the buf */
+  BYTE                     __user *buf;
+} IOCTL_Command_struct;
+
+typedef struct _BIG_IOCTL_Command_struct {
+  LUNAddr_struct           LUN_info;
+  RequestBlock_struct      Request;
+  ErrorInfo_struct         error_info;
+  DWORD                    malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
+  DWORD                    buf_size;    /* size in bytes of the buf */
+                                        /* < malloc_size * MAXSGENTRIES */
+  BYTE                     __user *buf;
+} BIG_IOCTL_Command_struct;
+
+typedef struct _LogvolInfo_struct{
+        __u32   LunID;
+        int     num_opens;  /* number of opens on the logical volume */
+        int     num_parts;  /* number of partitions configured on logvol */
+} LogvolInfo_struct;
+
+#define CCISS_GETPCIINFO _IOR(CCISS_IOC_MAGIC, 1, cciss_pci_info_struct)
+
+#define CCISS_GETINTINFO _IOR(CCISS_IOC_MAGIC, 2, cciss_coalint_struct)
+#define CCISS_SETINTINFO _IOW(CCISS_IOC_MAGIC, 3, cciss_coalint_struct)
+
+#define CCISS_GETNODENAME _IOR(CCISS_IOC_MAGIC, 4, NodeName_type)
+#define CCISS_SETNODENAME _IOW(CCISS_IOC_MAGIC, 5, NodeName_type)
+
+#define CCISS_GETHEARTBEAT _IOR(CCISS_IOC_MAGIC, 6, Heartbeat_type)
+#define CCISS_GETBUSTYPES  _IOR(CCISS_IOC_MAGIC, 7, BusTypes_type)
+#define CCISS_GETFIRMVER   _IOR(CCISS_IOC_MAGIC, 8, FirmwareVer_type)
+#define CCISS_GETDRIVVER   _IOR(CCISS_IOC_MAGIC, 9, DriverVer_type)
+#define CCISS_REVALIDVOLS  _IO(CCISS_IOC_MAGIC, 10)
+#define CCISS_PASSTHRU     _IOWR(CCISS_IOC_MAGIC, 11, IOCTL_Command_struct)
+#define CCISS_DEREGDISK    _IO(CCISS_IOC_MAGIC, 12)
+
+/* no longer used... use REGNEWD instead */ 
+#define CCISS_REGNEWDISK  _IOW(CCISS_IOC_MAGIC, 13, int)
+
+#define CCISS_REGNEWD      _IO(CCISS_IOC_MAGIC, 14)
+#define CCISS_RESCANDISK   _IO(CCISS_IOC_MAGIC, 16)
+#define CCISS_GETLUNINFO   _IOR(CCISS_IOC_MAGIC, 17, LogvolInfo_struct)
+#define CCISS_BIG_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL_Command_struct)
+
+#endif /* _UAPICCISS_IOCTLH */
diff --git a/include/uapi/linux/cdrom.h b/include/uapi/linux/cdrom.h
new file mode 100644
index 000000000000..898b866b300c
--- /dev/null
+++ b/include/uapi/linux/cdrom.h
@@ -0,0 +1,912 @@
+/*
+ * -- <linux/cdrom.h>
+ * General header file for linux CD-ROM drivers 
+ * Copyright (C) 1992         David Giller, rafetmad@oxy.edu
+ *               1994, 1995   Eberhard Mönkeberg, emoenke@gwdg.de
+ *               1996         David van Leeuwen, david@tm.tno.nl
+ *               1997, 1998   Erik Andersen, andersee@debian.org
+ *               1998-2002    Jens Axboe, axboe@suse.de
+ */
+ 
+#ifndef _UAPI_LINUX_CDROM_H
+#define _UAPI_LINUX_CDROM_H
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+/*******************************************************
+ * As of Linux 2.1.x, all Linux CD-ROM application programs will use this 
+ * (and only this) include file.  It is my hope to provide Linux with
+ * a uniform interface between software accessing CD-ROMs and the various 
+ * device drivers that actually talk to the drives.  There may still be
+ * 23 different kinds of strange CD-ROM drives, but at least there will 
+ * now be one, and only one, Linux CD-ROM interface.
+ *
+ * Additionally, as of Linux 2.1.x, all Linux application programs 
+ * should use the O_NONBLOCK option when opening a CD-ROM device 
+ * for subsequent ioctl commands.  This allows for neat system errors 
+ * like "No medium found" or "Wrong medium type" upon attempting to 
+ * mount or play an empty slot, mount an audio disc, or play a data disc.
+ * Generally, changing an application program to support O_NONBLOCK
+ * is as easy as the following:
+ *       -    drive = open("/dev/cdrom", O_RDONLY);
+ *       +    drive = open("/dev/cdrom", O_RDONLY | O_NONBLOCK);
+ * It is worth the small change.
+ *
+ *  Patches for many common CD programs (provided by David A. van Leeuwen)
+ *  can be found at:  ftp://ftp.gwdg.de/pub/linux/cdrom/drivers/cm206/
+ * 
+ *******************************************************/
+
+/* When a driver supports a certain function, but the cdrom drive we are 
+ * using doesn't, we will return the error EDRIVE_CANT_DO_THIS.  We will 
+ * borrow the "Operation not supported" error from the network folks to 
+ * accomplish this.  Maybe someday we will get a more targeted error code, 
+ * but this will do for now... */
+#define EDRIVE_CANT_DO_THIS  EOPNOTSUPP
+
+/*******************************************************
+ * The CD-ROM IOCTL commands  -- these should be supported by 
+ * all the various cdrom drivers.  For the CD-ROM ioctls, we 
+ * will commandeer byte 0x53, or 'S'.
+ *******************************************************/
+#define CDROMPAUSE              0x5301 /* Pause Audio Operation */ 
+#define CDROMRESUME             0x5302 /* Resume paused Audio Operation */
+#define CDROMPLAYMSF            0x5303 /* Play Audio MSF (struct cdrom_msf) */
+#define CDROMPLAYTRKIND         0x5304 /* Play Audio Track/index 
+                                           (struct cdrom_ti) */
+#define CDROMREADTOCHDR         0x5305 /* Read TOC header 
+                                           (struct cdrom_tochdr) */
+#define CDROMREADTOCENTRY       0x5306 /* Read TOC entry 
+                                           (struct cdrom_tocentry) */
+#define CDROMSTOP               0x5307 /* Stop the cdrom drive */
+#define CDROMSTART              0x5308 /* Start the cdrom drive */
+#define CDROMEJECT              0x5309 /* Ejects the cdrom media */
+#define CDROMVOLCTRL            0x530a /* Control output volume 
+                                           (struct cdrom_volctrl) */
+#define CDROMSUBCHNL            0x530b /* Read subchannel data 
+                                           (struct cdrom_subchnl) */
+#define CDROMREADMODE2          0x530c /* Read CDROM mode 2 data (2336 Bytes) 
+                                           (struct cdrom_read) */
+#define CDROMREADMODE1          0x530d /* Read CDROM mode 1 data (2048 Bytes)
+                                           (struct cdrom_read) */
+#define CDROMREADAUDIO          0x530e /* (struct cdrom_read_audio) */
+#define CDROMEJECT_SW           0x530f /* enable(1)/disable(0) auto-ejecting */
+#define CDROMMULTISESSION       0x5310 /* Obtain the start-of-last-session 
+                                           address of multi session disks 
+                                           (struct cdrom_multisession) */
+#define CDROM_GET_MCN           0x5311 /* Obtain the "Universal Product Code" 
+                                           if available (struct cdrom_mcn) */
+#define CDROM_GET_UPC           CDROM_GET_MCN  /* This one is deprecated, 
+                                          but here anyway for compatibility */
+#define CDROMRESET              0x5312 /* hard-reset the drive */
+#define CDROMVOLREAD            0x5313 /* Get the drive's volume setting 
+                                          (struct cdrom_volctrl) */
+#define CDROMREADRAW            0x5314  /* read data in raw mode (2352 Bytes)
+                                           (struct cdrom_read) */
+/* 
+ * These ioctls are used only used in aztcd.c and optcd.c
+ */
+#define CDROMREADCOOKED         0x5315  /* read data in cooked mode */
+#define CDROMSEEK               0x5316  /* seek msf address */
+  
+/*
+ * This ioctl is only used by the scsi-cd driver.  
+   It is for playing audio in logical block addressing mode.
+ */
+#define CDROMPLAYBLK            0x5317  /* (struct cdrom_blk) */
+
+/* 
+ * These ioctls are only used in optcd.c
+ */
+#define CDROMREADALL            0x5318  /* read all 2646 bytes */
+
+/* 
+ * These ioctls are (now) only in ide-cd.c for controlling 
+ * drive spindown time.  They should be implemented in the
+ * Uniform driver, via generic packet commands, GPCMD_MODE_SELECT_10,
+ * GPCMD_MODE_SENSE_10 and the GPMODE_POWER_PAGE...
+ *  -Erik
+ */
+#define CDROMGETSPINDOWN        0x531d
+#define CDROMSETSPINDOWN        0x531e
+
+/* 
+ * These ioctls are implemented through the uniform CD-ROM driver
+ * They _will_ be adopted by all CD-ROM drivers, when all the CD-ROM
+ * drivers are eventually ported to the uniform CD-ROM driver interface.
+ */
+#define CDROMCLOSETRAY          0x5319  /* pendant of CDROMEJECT */
+#define CDROM_SET_OPTIONS       0x5320  /* Set behavior options */
+#define CDROM_CLEAR_OPTIONS     0x5321  /* Clear behavior options */
+#define CDROM_SELECT_SPEED      0x5322  /* Set the CD-ROM speed */
+#define CDROM_SELECT_DISC       0x5323  /* Select disc (for juke-boxes) */
+#define CDROM_MEDIA_CHANGED     0x5325  /* Check is media changed  */
+#define CDROM_DRIVE_STATUS      0x5326  /* Get tray position, etc. */
+#define CDROM_DISC_STATUS       0x5327  /* Get disc type, etc. */
+#define CDROM_CHANGER_NSLOTS    0x5328  /* Get number of slots */
+#define CDROM_LOCKDOOR          0x5329  /* lock or unlock door */
+#define CDROM_DEBUG             0x5330  /* Turn debug messages on/off */
+#define CDROM_GET_CAPABILITY    0x5331  /* get capabilities */
+
+/* Note that scsi/scsi_ioctl.h also uses 0x5382 - 0x5386.
+ * Future CDROM ioctls should be kept below 0x537F
+ */
+
+/* This ioctl is only used by sbpcd at the moment */
+#define CDROMAUDIOBUFSIZ        0x5382  /* set the audio buffer size */
+                                        /* conflict with SCSI_IOCTL_GET_IDLUN */
+
+/* DVD-ROM Specific ioctls */
+#define DVD_READ_STRUCT         0x5390  /* Read structure */
+#define DVD_WRITE_STRUCT        0x5391  /* Write structure */
+#define DVD_AUTH                0x5392  /* Authentication */
+
+#define CDROM_SEND_PACKET       0x5393  /* send a packet to the drive */
+#define CDROM_NEXT_WRITABLE     0x5394  /* get next writable block */
+#define CDROM_LAST_WRITTEN      0x5395  /* get last block written on disc */
+
+/*******************************************************
+ * CDROM IOCTL structures
+ *******************************************************/
+
+/* Address in MSF format */
+struct cdrom_msf0               
+{
+        __u8    minute;
+        __u8    second;
+        __u8    frame;
+};
+
+/* Address in either MSF or logical format */
+union cdrom_addr                
+{
+        struct cdrom_msf0       msf;
+        int                     lba;
+};
+
+/* This struct is used by the CDROMPLAYMSF ioctl */ 
+struct cdrom_msf 
+{
+        __u8    cdmsf_min0;     /* start minute */
+        __u8    cdmsf_sec0;     /* start second */
+        __u8    cdmsf_frame0;   /* start frame */
+        __u8    cdmsf_min1;     /* end minute */
+        __u8    cdmsf_sec1;     /* end second */
+        __u8    cdmsf_frame1;   /* end frame */
+};
+
+/* This struct is used by the CDROMPLAYTRKIND ioctl */
+struct cdrom_ti 
+{
+        __u8    cdti_trk0;      /* start track */
+        __u8    cdti_ind0;      /* start index */
+        __u8    cdti_trk1;      /* end track */
+        __u8    cdti_ind1;      /* end index */
+};
+
+/* This struct is used by the CDROMREADTOCHDR ioctl */
+struct cdrom_tochdr     
+{
+        __u8    cdth_trk0;      /* start track */
+        __u8    cdth_trk1;      /* end track */
+};
+
+/* This struct is used by the CDROMVOLCTRL and CDROMVOLREAD ioctls */
+struct cdrom_volctrl
+{
+        __u8    channel0;
+        __u8    channel1;
+        __u8    channel2;
+        __u8    channel3;
+};
+
+/* This struct is used by the CDROMSUBCHNL ioctl */
+struct cdrom_subchnl 
+{
+        __u8    cdsc_format;
+        __u8    cdsc_audiostatus;
+        __u8    cdsc_adr:       4;
+        __u8    cdsc_ctrl:      4;
+        __u8    cdsc_trk;
+        __u8    cdsc_ind;
+        union cdrom_addr cdsc_absaddr;
+        union cdrom_addr cdsc_reladdr;
+};
+
+
+/* This struct is used by the CDROMREADTOCENTRY ioctl */
+struct cdrom_tocentry 
+{
+        __u8    cdte_track;
+        __u8    cdte_adr        :4;
+        __u8    cdte_ctrl       :4;
+        __u8    cdte_format;
+        union cdrom_addr cdte_addr;
+        __u8    cdte_datamode;
+};
+
+/* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */
+struct cdrom_read      
+{
+        int     cdread_lba;
+        char    *cdread_bufaddr;
+        int     cdread_buflen;
+};
+
+/* This struct is used by the CDROMREADAUDIO ioctl */
+struct cdrom_read_audio
+{
+        union cdrom_addr addr; /* frame address */
+        __u8 addr_format;      /* CDROM_LBA or CDROM_MSF */
+        int nframes;           /* number of 2352-byte-frames to read at once */
+        __u8 __user *buf;      /* frame buffer (size: nframes*2352 bytes) */
+};
+
+/* This struct is used with the CDROMMULTISESSION ioctl */
+struct cdrom_multisession
+{
+        union cdrom_addr addr; /* frame address: start-of-last-session 
+                                   (not the new "frame 16"!).  Only valid
+                                   if the "xa_flag" is true. */
+        __u8 xa_flag;        /* 1: "is XA disk" */
+        __u8 addr_format;    /* CDROM_LBA or CDROM_MSF */
+};
+
+/* This struct is used with the CDROM_GET_MCN ioctl.  
+ * Very few audio discs actually have Universal Product Code information, 
+ * which should just be the Medium Catalog Number on the box.  Also note 
+ * that the way the codeis written on CD is _not_ uniform across all discs!
+ */  
+struct cdrom_mcn 
+{
+  __u8 medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */
+};
+
+/* This is used by the CDROMPLAYBLK ioctl */
+struct cdrom_blk 
+{
+        unsigned from;
+        unsigned short len;
+};
+
+#define CDROM_PACKET_SIZE       12
+
+#define CGC_DATA_UNKNOWN        0
+#define CGC_DATA_WRITE          1
+#define CGC_DATA_READ           2
+#define CGC_DATA_NONE           3
+
+/* for CDROM_PACKET_COMMAND ioctl */
+struct cdrom_generic_command
+{
+        unsigned char           cmd[CDROM_PACKET_SIZE];
+        unsigned char           __user *buffer;
+        unsigned int            buflen;
+        int                     stat;
+        struct request_sense    __user *sense;
+        unsigned char           data_direction;
+        int                     quiet;
+        int                     timeout;
+        void                    __user *reserved[1];    /* unused, actually */
+};
+
+/*
+ * A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336, 
+ * 2340, or 2352 bytes long.  
+
+*         Sector types of the standard CD-ROM data formats:
+ *
+ * format   sector type               user data size (bytes)
+ * -----------------------------------------------------------------------------
+ *   1     (Red Book)    CD-DA          2352    (CD_FRAMESIZE_RAW)
+ *   2     (Yellow Book) Mode1 Form1    2048    (CD_FRAMESIZE)
+ *   3     (Yellow Book) Mode1 Form2    2336    (CD_FRAMESIZE_RAW0)
+ *   4     (Green Book)  Mode2 Form1    2048    (CD_FRAMESIZE)
+ *   5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
+ *
+ *
+ *       The layout of the standard CD-ROM data formats:
+ * -----------------------------------------------------------------------------
+ * - audio (red):                  | audio_sample_bytes |
+ *                                 |        2352        |
+ *
+ * - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
+ *                                 |  12  -   4  - 2048 -  4  -   8  - 276 |
+ *
+ * - data (yellow, mode2):         | sync - head - data |
+ *                                 |  12  -   4  - 2336 |
+ *
+ * - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
+ *                                 |  12  -   4  -  8  - 2048 -  4  - 276 |
+ *
+ * - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
+ *                                 |  12  -   4  -  8  - 2324 -  4    |
+ *
+ */
+
+/* Some generally useful CD-ROM information -- mostly based on the above */
+#define CD_MINS              74 /* max. minutes per CD, not really a limit */
+#define CD_SECS              60 /* seconds per minute */
+#define CD_FRAMES            75 /* frames per second */
+#define CD_SYNC_SIZE         12 /* 12 sync bytes per raw data frame */
+#define CD_MSF_OFFSET       150 /* MSF numbering offset of first frame */
+#define CD_CHUNK_SIZE        24 /* lowest-level "data bytes piece" */
+#define CD_NUM_OF_CHUNKS     98 /* chunks per frame */
+#define CD_FRAMESIZE_SUB     96 /* subchannel data "frame" size */
+#define CD_HEAD_SIZE          4 /* header (address) bytes per raw data frame */
+#define CD_SUBHEAD_SIZE       8 /* subheader bytes per raw XA data frame */
+#define CD_EDC_SIZE           4 /* bytes EDC per most raw data frame types */
+#define CD_ZERO_SIZE          8 /* bytes zero per yellow book mode 1 frame */
+#define CD_ECC_SIZE         276 /* bytes ECC per most raw data frame types */
+#define CD_FRAMESIZE       2048 /* bytes per frame, "cooked" mode */
+#define CD_FRAMESIZE_RAW   2352 /* bytes per frame, "raw" mode */
+#define CD_FRAMESIZE_RAWER 2646 /* The maximum possible returned bytes */ 
+/* most drives don't deliver everything: */
+#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
+#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
+
+#define CD_XA_HEAD        (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) /* "before data" part of raw XA frame */
+#define CD_XA_TAIL        (CD_EDC_SIZE+CD_ECC_SIZE) /* "after data" part of raw XA frame */
+#define CD_XA_SYNC_HEAD   (CD_SYNC_SIZE+CD_XA_HEAD) /* sync bytes + header of XA frame */
+
+/* CD-ROM address types (cdrom_tocentry.cdte_format) */
+#define CDROM_LBA 0x01 /* "logical block": first frame is #0 */
+#define CDROM_MSF 0x02 /* "minute-second-frame": binary, not bcd here! */
+
+/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */
+#define CDROM_DATA_TRACK        0x04
+
+/* The leadout track is always 0xAA, regardless of # of tracks on disc */
+#define CDROM_LEADOUT           0xAA
+
+/* audio states (from SCSI-2, but seen with other drives, too) */
+#define CDROM_AUDIO_INVALID     0x00    /* audio status not supported */
+#define CDROM_AUDIO_PLAY        0x11    /* audio play operation in progress */
+#define CDROM_AUDIO_PAUSED      0x12    /* audio play operation paused */
+#define CDROM_AUDIO_COMPLETED   0x13    /* audio play successfully completed */
+#define CDROM_AUDIO_ERROR       0x14    /* audio play stopped due to error */
+#define CDROM_AUDIO_NO_STATUS   0x15    /* no current audio status to return */
+
+/* capability flags used with the uniform CD-ROM driver */ 
+#define CDC_CLOSE_TRAY          0x1     /* caddy systems _can't_ close */
+#define CDC_OPEN_TRAY           0x2     /* but _can_ eject.  */
+#define CDC_LOCK                0x4     /* disable manual eject */
+#define CDC_SELECT_SPEED        0x8     /* programmable speed */
+#define CDC_SELECT_DISC         0x10    /* select disc from juke-box */
+#define CDC_MULTI_SESSION       0x20    /* read sessions>1 */
+#define CDC_MCN                 0x40    /* Medium Catalog Number */
+#define CDC_MEDIA_CHANGED       0x80    /* media changed */
+#define CDC_PLAY_AUDIO          0x100   /* audio functions */
+#define CDC_RESET               0x200   /* hard reset device */
+#define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
+#define CDC_GENERIC_PACKET      0x1000  /* driver implements generic packets */
+#define CDC_CD_R                0x2000  /* drive is a CD-R */
+#define CDC_CD_RW               0x4000  /* drive is a CD-RW */
+#define CDC_DVD                 0x8000  /* drive is a DVD */
+#define CDC_DVD_R               0x10000 /* drive can write DVD-R */
+#define CDC_DVD_RAM             0x20000 /* drive can write DVD-RAM */
+#define CDC_MO_DRIVE            0x40000 /* drive is an MO device */
+#define CDC_MRW                 0x80000 /* drive can read MRW */
+#define CDC_MRW_W               0x100000 /* drive can write MRW */
+#define CDC_RAM                 0x200000 /* ok to open for WRITE */
+
+/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
+#define CDS_NO_INFO             0       /* if not implemented */
+#define CDS_NO_DISC             1
+#define CDS_TRAY_OPEN           2
+#define CDS_DRIVE_NOT_READY     3
+#define CDS_DISC_OK             4
+
+/* return values for the CDROM_DISC_STATUS ioctl */
+/* can also return CDS_NO_[INFO|DISC], from above */
+#define CDS_AUDIO               100
+#define CDS_DATA_1              101
+#define CDS_DATA_2              102
+#define CDS_XA_2_1              103
+#define CDS_XA_2_2              104
+#define CDS_MIXED               105
+
+/* User-configurable behavior options for the uniform CD-ROM driver */
+#define CDO_AUTO_CLOSE          0x1     /* close tray on first open() */
+#define CDO_AUTO_EJECT          0x2     /* open tray on last release() */
+#define CDO_USE_FFLAGS          0x4     /* use O_NONBLOCK information on open */
+#define CDO_LOCK                0x8     /* lock tray on open files */
+#define CDO_CHECK_TYPE          0x10    /* check type on open for data */
+
+/* Special codes used when specifying changer slots. */
+#define CDSL_NONE               (INT_MAX-1)
+#define CDSL_CURRENT            INT_MAX
+
+/* For partition based multisession access. IDE can handle 64 partitions
+ * per drive - SCSI CD-ROM's use minors to differentiate between the
+ * various drives, so we can't do multisessions the same way there.
+ * Use the -o session=x option to mount on them.
+ */
+#define CD_PART_MAX             64
+#define CD_PART_MASK            (CD_PART_MAX - 1)
+
+/*********************************************************************
+ * Generic Packet commands, MMC commands, and such
+ *********************************************************************/
+
+ /* The generic packet command opcodes for CD/DVD Logical Units,
+ * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
+#define GPCMD_BLANK                         0xa1
+#define GPCMD_CLOSE_TRACK                   0x5b
+#define GPCMD_FLUSH_CACHE                   0x35
+#define GPCMD_FORMAT_UNIT                   0x04
+#define GPCMD_GET_CONFIGURATION             0x46
+#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a
+#define GPCMD_GET_PERFORMANCE               0xac
+#define GPCMD_INQUIRY                       0x12
+#define GPCMD_LOAD_UNLOAD                   0xa6
+#define GPCMD_MECHANISM_STATUS              0xbd
+#define GPCMD_MODE_SELECT_10                0x55
+#define GPCMD_MODE_SENSE_10                 0x5a
+#define GPCMD_PAUSE_RESUME                  0x4b
+#define GPCMD_PLAY_AUDIO_10                 0x45
+#define GPCMD_PLAY_AUDIO_MSF                0x47
+#define GPCMD_PLAY_AUDIO_TI                 0x48
+#define GPCMD_PLAY_CD                       0xbc
+#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL  0x1e
+#define GPCMD_READ_10                       0x28
+#define GPCMD_READ_12                       0xa8
+#define GPCMD_READ_BUFFER                   0x3c
+#define GPCMD_READ_BUFFER_CAPACITY          0x5c
+#define GPCMD_READ_CDVD_CAPACITY            0x25
+#define GPCMD_READ_CD                       0xbe
+#define GPCMD_READ_CD_MSF                   0xb9
+#define GPCMD_READ_DISC_INFO                0x51
+#define GPCMD_READ_DVD_STRUCTURE            0xad
+#define GPCMD_READ_FORMAT_CAPACITIES        0x23
+#define GPCMD_READ_HEADER                   0x44
+#define GPCMD_READ_TRACK_RZONE_INFO         0x52
+#define GPCMD_READ_SUBCHANNEL               0x42
+#define GPCMD_READ_TOC_PMA_ATIP             0x43
+#define GPCMD_REPAIR_RZONE_TRACK            0x58
+#define GPCMD_REPORT_KEY                    0xa4
+#define GPCMD_REQUEST_SENSE                 0x03
+#define GPCMD_RESERVE_RZONE_TRACK           0x53
+#define GPCMD_SEND_CUE_SHEET                0x5d
+#define GPCMD_SCAN                          0xba
+#define GPCMD_SEEK                          0x2b
+#define GPCMD_SEND_DVD_STRUCTURE            0xbf
+#define GPCMD_SEND_EVENT                    0xa2
+#define GPCMD_SEND_KEY                      0xa3
+#define GPCMD_SEND_OPC                      0x54
+#define GPCMD_SET_READ_AHEAD                0xa7
+#define GPCMD_SET_STREAMING                 0xb6
+#define GPCMD_START_STOP_UNIT               0x1b
+#define GPCMD_STOP_PLAY_SCAN                0x4e
+#define GPCMD_TEST_UNIT_READY               0x00
+#define GPCMD_VERIFY_10                     0x2f
+#define GPCMD_WRITE_10                      0x2a
+#define GPCMD_WRITE_12                      0xaa
+#define GPCMD_WRITE_AND_VERIFY_10           0x2e
+#define GPCMD_WRITE_BUFFER                  0x3b
+/* This is listed as optional in ATAPI 2.6, but is (curiously) 
+ * missing from Mt. Fuji, Table 57.  It _is_ mentioned in Mt. Fuji
+ * Table 377 as an MMC command for SCSi devices though...  Most ATAPI
+ * drives support it. */
+#define GPCMD_SET_SPEED                     0xbb
+/* This seems to be a SCSI specific CD-ROM opcode 
+ * to play data at track/index */
+#define GPCMD_PLAYAUDIO_TI                  0x48
+/*
+ * From MS Media Status Notification Support Specification. For
+ * older drives only.
+ */
+#define GPCMD_GET_MEDIA_STATUS              0xda
+
+/* Mode page codes for mode sense/set */
+#define GPMODE_VENDOR_PAGE              0x00
+#define GPMODE_R_W_ERROR_PAGE           0x01
+#define GPMODE_WRITE_PARMS_PAGE         0x05
+#define GPMODE_WCACHING_PAGE            0x08
+#define GPMODE_AUDIO_CTL_PAGE           0x0e
+#define GPMODE_POWER_PAGE               0x1a
+#define GPMODE_FAULT_FAIL_PAGE          0x1c
+#define GPMODE_TO_PROTECT_PAGE          0x1d
+#define GPMODE_CAPABILITIES_PAGE        0x2a
+#define GPMODE_ALL_PAGES                0x3f
+/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
+ * of MODE_SENSE_POWER_PAGE */
+#define GPMODE_CDROM_PAGE               0x0d
+
+
+
+/* DVD struct types */
+#define DVD_STRUCT_PHYSICAL     0x00
+#define DVD_STRUCT_COPYRIGHT    0x01
+#define DVD_STRUCT_DISCKEY      0x02
+#define DVD_STRUCT_BCA          0x03
+#define DVD_STRUCT_MANUFACT     0x04
+
+struct dvd_layer {
+        __u8 book_version       : 4;
+        __u8 book_type          : 4;
+        __u8 min_rate           : 4;
+        __u8 disc_size          : 4;
+        __u8 layer_type         : 4;
+        __u8 track_path         : 1;
+        __u8 nlayers            : 2;
+        __u8 track_density      : 4;
+        __u8 linear_density     : 4;
+        __u8 bca                : 1;
+        __u32 start_sector;
+        __u32 end_sector;
+        __u32 end_sector_l0;
+};
+
+#define DVD_LAYERS      4
+
+struct dvd_physical {
+        __u8 type;
+        __u8 layer_num;
+        struct dvd_layer layer[DVD_LAYERS];
+};
+
+struct dvd_copyright {
+        __u8 type;
+
+        __u8 layer_num;
+        __u8 cpst;
+        __u8 rmi;
+};
+
+struct dvd_disckey {
+        __u8 type;
+
+        unsigned agid           : 2;
+        __u8 value[2048];
+};
+
+struct dvd_bca {
+        __u8 type;
+
+        int len;
+        __u8 value[188];
+};
+
+struct dvd_manufact {
+        __u8 type;
+
+        __u8 layer_num;
+        int len;
+        __u8 value[2048];
+};
+
+typedef union {
+        __u8 type;
+
+        struct dvd_physical     physical;
+        struct dvd_copyright    copyright;
+        struct dvd_disckey      disckey;
+        struct dvd_bca          bca;
+        struct dvd_manufact     manufact;
+} dvd_struct;
+
+/*
+ * DVD authentication ioctl
+ */
+
+/* Authentication states */
+#define DVD_LU_SEND_AGID        0
+#define DVD_HOST_SEND_CHALLENGE 1
+#define DVD_LU_SEND_KEY1        2
+#define DVD_LU_SEND_CHALLENGE   3
+#define DVD_HOST_SEND_KEY2      4
+
+/* Termination states */
+#define DVD_AUTH_ESTABLISHED    5
+#define DVD_AUTH_FAILURE        6
+
+/* Other functions */
+#define DVD_LU_SEND_TITLE_KEY   7
+#define DVD_LU_SEND_ASF         8
+#define DVD_INVALIDATE_AGID     9
+#define DVD_LU_SEND_RPC_STATE   10
+#define DVD_HOST_SEND_RPC_STATE 11
+
+/* State data */
+typedef __u8 dvd_key[5];                /* 40-bit value, MSB is first elem. */
+typedef __u8 dvd_challenge[10]; /* 80-bit value, MSB is first elem. */
+
+struct dvd_lu_send_agid {
+        __u8 type;
+        unsigned agid           : 2;
+};
+
+struct dvd_host_send_challenge {
+        __u8 type;
+        unsigned agid           : 2;
+
+        dvd_challenge chal;
+};
+
+struct dvd_send_key {
+        __u8 type;
+        unsigned agid           : 2;
+
+        dvd_key key;
+};
+
+struct dvd_lu_send_challenge {
+        __u8 type;
+        unsigned agid           : 2;
+
+        dvd_challenge chal;
+};
+
+#define DVD_CPM_NO_COPYRIGHT    0
+#define DVD_CPM_COPYRIGHTED     1
+
+#define DVD_CP_SEC_NONE         0
+#define DVD_CP_SEC_EXIST        1
+
+#define DVD_CGMS_UNRESTRICTED   0
+#define DVD_CGMS_SINGLE         2
+#define DVD_CGMS_RESTRICTED     3
+
+struct dvd_lu_send_title_key {
+        __u8 type;
+        unsigned agid           : 2;
+
+        dvd_key title_key;
+        int lba;
+        unsigned cpm            : 1;
+        unsigned cp_sec         : 1;
+        unsigned cgms           : 2;
+};
+
+struct dvd_lu_send_asf {
+        __u8 type;
+        unsigned agid           : 2;
+
+        unsigned asf            : 1;
+};
+
+struct dvd_host_send_rpcstate {
+        __u8 type;
+        __u8 pdrc;
+};
+
+struct dvd_lu_send_rpcstate {
+        __u8 type               : 2;
+        __u8 vra                : 3;
+        __u8 ucca               : 3;
+        __u8 region_mask;
+        __u8 rpc_scheme;
+};
+
+typedef union {
+        __u8 type;
+
+        struct dvd_lu_send_agid         lsa;
+        struct dvd_host_send_challenge  hsc;
+        struct dvd_send_key             lsk;
+        struct dvd_lu_send_challenge    lsc;
+        struct dvd_send_key             hsk;
+        struct dvd_lu_send_title_key    lstk;
+        struct dvd_lu_send_asf          lsasf;
+        struct dvd_host_send_rpcstate   hrpcs;
+        struct dvd_lu_send_rpcstate     lrpcs;
+} dvd_authinfo;
+
+struct request_sense {
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 valid              : 1;
+        __u8 error_code         : 7;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 error_code         : 7;
+        __u8 valid              : 1;
+#endif
+        __u8 segment_number;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved1          : 2;
+        __u8 ili                : 1;
+        __u8 reserved2          : 1;
+        __u8 sense_key          : 4;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 sense_key          : 4;
+        __u8 reserved2          : 1;
+        __u8 ili                : 1;
+        __u8 reserved1          : 2;
+#endif
+        __u8 information[4];
+        __u8 add_sense_len;
+        __u8 command_info[4];
+        __u8 asc;
+        __u8 ascq;
+        __u8 fruc;
+        __u8 sks[3];
+        __u8 asb[46];
+};
+
+/*
+ * feature profile
+ */
+#define CDF_RWRT        0x0020  /* "Random Writable" */
+#define CDF_HWDM        0x0024  /* "Hardware Defect Management" */
+#define CDF_MRW         0x0028
+
+/*
+ * media status bits
+ */
+#define CDM_MRW_NOTMRW                  0
+#define CDM_MRW_BGFORMAT_INACTIVE       1
+#define CDM_MRW_BGFORMAT_ACTIVE         2
+#define CDM_MRW_BGFORMAT_COMPLETE       3
+
+/*
+ * mrw address spaces
+ */
+#define MRW_LBA_DMA                     0
+#define MRW_LBA_GAA                     1
+
+/*
+ * mrw mode pages (first is deprecated) -- probed at init time and
+ * cdi->mrw_mode_page is set
+ */
+#define MRW_MODE_PC_PRE1                0x2c
+#define MRW_MODE_PC                     0x03
+
+struct mrw_feature_desc {
+        __be16 feature_code;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved1          : 2;
+        __u8 feature_version    : 4;
+        __u8 persistent         : 1;
+        __u8 curr               : 1;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 curr               : 1;
+        __u8 persistent         : 1;
+        __u8 feature_version    : 4;
+        __u8 reserved1          : 2;
+#endif
+        __u8 add_len;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved2          : 7;
+        __u8 write              : 1;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 write              : 1;
+        __u8 reserved2          : 7;
+#endif
+        __u8 reserved3;
+        __u8 reserved4;
+        __u8 reserved5;
+};
+
+/* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */
+struct rwrt_feature_desc {
+        __be16 feature_code;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved1          : 2;
+        __u8 feature_version    : 4;
+        __u8 persistent         : 1;
+        __u8 curr               : 1;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 curr               : 1;
+        __u8 persistent         : 1;
+        __u8 feature_version    : 4;
+        __u8 reserved1          : 2;
+#endif
+        __u8 add_len;
+        __u32 last_lba;
+        __u32 block_size;
+        __u16 blocking;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved2          : 7;
+        __u8 page_present       : 1;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 page_present       : 1;
+        __u8 reserved2          : 7;
+#endif
+        __u8 reserved3;
+};
+
+typedef struct {
+        __be16 disc_information_length;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved1                  : 3;
+        __u8 erasable                   : 1;
+        __u8 border_status              : 2;
+        __u8 disc_status                : 2;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 disc_status                : 2;
+        __u8 border_status              : 2;
+        __u8 erasable                   : 1;
+        __u8 reserved1                  : 3;
+#else
+#error "Please fix <asm/byteorder.h>"
+#endif
+        __u8 n_first_track;
+        __u8 n_sessions_lsb;
+        __u8 first_track_lsb;
+        __u8 last_track_lsb;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 did_v                      : 1;
+        __u8 dbc_v                      : 1;
+        __u8 uru                        : 1;
+        __u8 reserved2                  : 2;
+        __u8 dbit                       : 1;
+        __u8 mrw_status                 : 2;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 mrw_status                 : 2;
+        __u8 dbit                       : 1;
+        __u8 reserved2                  : 2;
+        __u8 uru                        : 1;
+        __u8 dbc_v                      : 1;
+        __u8 did_v                      : 1;
+#endif
+        __u8 disc_type;
+        __u8 n_sessions_msb;
+        __u8 first_track_msb;
+        __u8 last_track_msb;
+        __u32 disc_id;
+        __u32 lead_in;
+        __u32 lead_out;
+        __u8 disc_bar_code[8];
+        __u8 reserved3;
+        __u8 n_opc;
+} disc_information;
+
+typedef struct {
+        __be16 track_information_length;
+        __u8 track_lsb;
+        __u8 session_lsb;
+        __u8 reserved1;
+#if defined(__BIG_ENDIAN_BITFIELD)
+        __u8 reserved2                  : 2;
+        __u8 damage                     : 1;
+        __u8 copy                       : 1;
+        __u8 track_mode                 : 4;
+        __u8 rt                         : 1;
+        __u8 blank                      : 1;
+        __u8 packet                     : 1;
+        __u8 fp                         : 1;
+        __u8 data_mode                  : 4;
+        __u8 reserved3                  : 6;
+        __u8 lra_v                      : 1;
+        __u8 nwa_v                      : 1;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 track_mode                 : 4;
+        __u8 copy                       : 1;
+        __u8 damage                     : 1;
+        __u8 reserved2                  : 2;
+        __u8 data_mode                  : 4;
+        __u8 fp                         : 1;
+        __u8 packet                     : 1;
+        __u8 blank                      : 1;
+        __u8 rt                         : 1;
+        __u8 nwa_v                      : 1;
+        __u8 lra_v                      : 1;
+        __u8 reserved3                  : 6;
+#endif
+        __be32 track_start;
+        __be32 next_writable;
+        __be32 free_blocks;
+        __be32 fixed_packet_size;
+        __be32 track_size;
+        __be32 last_rec_address;
+} track_information;
+
+struct feature_header {
+        __u32 data_len;
+        __u8 reserved1;
+        __u8 reserved2;
+        __u16 curr_profile;
+};
+
+struct mode_page_header {
+        __be16 mode_data_length;
+        __u8 medium_type;
+        __u8 reserved1;
+        __u8 reserved2;
+        __u8 reserved3;
+        __be16 desc_length;
+};
+
+
+#endif /* _UAPI_LINUX_CDROM_H */
diff --git a/include/linux/cgroupstats.h b/include/uapi/linux/cgroupstats.h
index 3753c33160d1..3753c33160d1 100644
--- a/include/linux/cgroupstats.h
+++ b/include/uapi/linux/cgroupstats.h
diff --git a/include/linux/chio.h b/include/uapi/linux/chio.h
index d9bac7f97282..d9bac7f97282 100644
--- a/include/linux/chio.h
+++ b/include/uapi/linux/chio.h
diff --git a/include/uapi/linux/cm4000_cs.h b/include/uapi/linux/cm4000_cs.h
new file mode 100644
index 000000000000..bc51f77db918
--- /dev/null
+++ b/include/uapi/linux/cm4000_cs.h
@@ -0,0 +1,62 @@
+#ifndef _UAPI_CM4000_H_
+#define _UAPI_CM4000_H_
+
+#include <linux/types.h>
+
+#define MAX_ATR                 33
+
+#define CM4000_MAX_DEV          4
+
+/* those two structures are passed via ioctl() from/to userspace.  They are
+ * used by existing userspace programs, so I kepth the awkward "bIFSD" naming
+ * not to break compilation of userspace apps. -HW */
+
+typedef struct atreq {
+        __s32 atr_len;
+        unsigned char atr[64];
+        __s32 power_act;
+        unsigned char bIFSD;
+        unsigned char bIFSC;
+} atreq_t;
+
+
+/* what is particularly stupid in the original driver is the arch-dependent
+ * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
+ * will lay out the structure members differently than the 64bit kernel.
+ *
+ * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".
+ * On 32bit this will make no difference.  With 64bit kernels, it will make
+ * 32bit apps work, too.
+ */
+
+typedef struct ptsreq {
+        __u32 protocol; /*T=0: 2^0, T=1:  2^1*/
+        unsigned char flags;
+        unsigned char pts1;
+        unsigned char pts2;
+        unsigned char pts3;
+} ptsreq_t;
+
+#define CM_IOC_MAGIC            'c'
+#define CM_IOC_MAXNR            255
+
+#define CM_IOCGSTATUS           _IOR (CM_IOC_MAGIC, 0, unsigned char *)
+#define CM_IOCGATR              _IOWR(CM_IOC_MAGIC, 1, atreq_t *)
+#define CM_IOCSPTS              _IOW (CM_IOC_MAGIC, 2, ptsreq_t *)
+#define CM_IOCSRDR              _IO  (CM_IOC_MAGIC, 3)
+#define CM_IOCARDOFF            _IO  (CM_IOC_MAGIC, 4)
+
+#define CM_IOSDBGLVL            _IOW(CM_IOC_MAGIC, 250, int*)
+
+/* card and device states */
+#define CM_CARD_INSERTED                0x01
+#define CM_CARD_POWERED                 0x02
+#define CM_ATR_PRESENT                  0x04
+#define CM_ATR_VALID                    0x08
+#define CM_STATE_VALID                  0x0f
+/* extra info only from CM4000 */
+#define CM_NO_READER                    0x10
+#define CM_BAD_CARD                     0x20
+
+
+#endif /* _UAPI_CM4000_H_ */
diff --git a/include/uapi/linux/cn_proc.h b/include/uapi/linux/cn_proc.h
new file mode 100644
index 000000000000..0d7b49973bb3
--- /dev/null
+++ b/include/uapi/linux/cn_proc.h
@@ -0,0 +1,121 @@
+/*
+ * cn_proc.h - process events connector
+ *
+ * Copyright (C) Matt Helsley, IBM Corp. 2005
+ * Based on cn_fork.h by Nguyen Anh Quynh and Guillaume Thouvenin
+ * Copyright (C) 2005 Nguyen Anh Quynh <aquynh@gmail.com>
+ * Copyright (C) 2005 Guillaume Thouvenin <guillaume.thouvenin@bull.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef _UAPICN_PROC_H
+#define _UAPICN_PROC_H
+
+#include <linux/types.h>
+
+/*
+ * Userspace sends this enum to register with the kernel that it is listening
+ * for events on the connector.
+ */
+enum proc_cn_mcast_op {
+        PROC_CN_MCAST_LISTEN = 1,
+        PROC_CN_MCAST_IGNORE = 2
+};
+
+/*
+ * From the user's point of view, the process
+ * ID is the thread group ID and thread ID is the internal
+ * kernel "pid". So, fields are assigned as follow:
+ *
+ *  In user space     -  In  kernel space
+ *
+ * parent process ID  =  parent->tgid
+ * parent thread  ID  =  parent->pid
+ * child  process ID  =  child->tgid
+ * child  thread  ID  =  child->pid
+ */
+
+struct proc_event {
+        enum what {
+                /* Use successive bits so the enums can be used to record
+                 * sets of events as well
+                 */
+                PROC_EVENT_NONE = 0x00000000,
+                PROC_EVENT_FORK = 0x00000001,
+                PROC_EVENT_EXEC = 0x00000002,
+                PROC_EVENT_UID  = 0x00000004,
+                PROC_EVENT_GID  = 0x00000040,
+                PROC_EVENT_SID  = 0x00000080,
+                PROC_EVENT_PTRACE = 0x00000100,
+                PROC_EVENT_COMM = 0x00000200,
+                /* "next" should be 0x00000400 */
+                /* "last" is the last process event: exit */
+                PROC_EVENT_EXIT = 0x80000000
+        } what;
+        __u32 cpu;
+        __u64 __attribute__((aligned(8))) timestamp_ns;
+                /* Number of nano seconds since system boot */
+        union { /* must be last field of proc_event struct */
+                struct {
+                        __u32 err;
+                } ack;
+
+                struct fork_proc_event {
+                        __kernel_pid_t parent_pid;
+                        __kernel_pid_t parent_tgid;
+                        __kernel_pid_t child_pid;
+                        __kernel_pid_t child_tgid;
+                } fork;
+
+                struct exec_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                } exec;
+
+                struct id_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                        union {
+                                __u32 ruid; /* task uid */
+                                __u32 rgid; /* task gid */
+                        } r;
+                        union {
+                                __u32 euid;
+                                __u32 egid;
+                        } e;
+                } id;
+
+                struct sid_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                } sid;
+
+                struct ptrace_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                        __kernel_pid_t tracer_pid;
+                        __kernel_pid_t tracer_tgid;
+                } ptrace;
+
+                struct comm_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                        char           comm[16];
+                } comm;
+
+                struct exit_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                        __u32 exit_code, exit_signal;
+                } exit;
+        } event_data;
+};
+
+#endif /* _UAPICN_PROC_H */
diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
new file mode 100644
index 000000000000..695fade33c64
--- /dev/null
+++ b/include/uapi/linux/coda.h
@@ -0,0 +1,741 @@
+/* 
+   You may distribute this file under either of the two licenses that
+   follow at your discretion.
+*/
+
+/* BLURB lgpl
+
+                           Coda File System
+                              Release 5
+
+          Copyright (c) 1987-1999 Carnegie Mellon University
+                  Additional copyrights listed below
+
+This code is distributed "AS IS" without warranty of any kind under
+the terms of the GNU Library General Public Licence Version 2, as
+shown in the file LICENSE, or under the license shown below. The
+technical and financial contributors to Coda are listed in the file
+CREDITS.
+
+                        Additional copyrights 
+*/
+
+/*
+
+            Coda: an Experimental Distributed File System
+                             Release 4.0
+
+          Copyright (c) 1987-1999 Carnegie Mellon University
+                         All Rights Reserved
+
+Permission  to  use, copy, modify and distribute this software and its
+documentation is hereby granted,  provided  that  both  the  copyright
+notice  and  this  permission  notice  appear  in  all  copies  of the
+software, derivative works or  modified  versions,  and  any  portions
+thereof, and that both notices appear in supporting documentation, and
+that credit is given to Carnegie Mellon University  in  all  documents
+and publicity pertaining to direct or indirect use of this code or its
+derivatives.
+
+CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
+SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
+FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
+DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
+RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
+ANY DERIVATIVE WORK.
+
+Carnegie  Mellon  encourages  users  of  this  software  to return any
+improvements or extensions that  they  make,  and  to  grant  Carnegie
+Mellon the rights to redistribute these changes without encumbrance.
+*/
+
+/*
+ *
+ * Based on cfs.h from Mach, but revamped for increased simplicity.
+ * Linux modifications by 
+ * Peter Braam, Aug 1996
+ */
+
+#ifndef _UAPI_CODA_HEADER_
+#define _UAPI_CODA_HEADER_
+
+
+/* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */
+#if defined(__NetBSD__) || \
+  ((defined(DJGPP) || defined(__CYGWIN32__)) && !defined(KERNEL))
+#include <sys/types.h>
+#endif 
+
+#ifndef CODA_MAXSYMLINKS
+#define CODA_MAXSYMLINKS 10
+#endif
+
+#if defined(DJGPP) || defined(__CYGWIN32__)
+#ifdef KERNEL
+typedef unsigned long u_long;
+typedef unsigned int u_int;
+typedef unsigned short u_short;
+typedef u_long ino_t;
+typedef u_long dev_t;
+typedef void * caddr_t;
+#ifdef DOS
+typedef unsigned __int64 u_quad_t;
+#else 
+typedef unsigned long long u_quad_t;
+#endif
+
+#define inline
+
+struct timespec {
+        long       ts_sec;
+        long       ts_nsec;
+};
+#else  /* DJGPP but not KERNEL */
+#include <sys/time.h>
+typedef unsigned long long u_quad_t;
+#endif /* !KERNEL */
+#endif /* !DJGPP */
+
+
+#if defined(__linux__)
+#include <linux/time.h>
+#define cdev_t u_quad_t
+#ifndef __KERNEL__
+#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
+#define _UQUAD_T_ 1
+typedef unsigned long long u_quad_t;
+#endif
+#endif /* __KERNEL__ */
+#else
+#define cdev_t dev_t
+#endif
+
+#ifdef __CYGWIN32__
+struct timespec {
+        time_t  tv_sec;         /* seconds */
+        long    tv_nsec;        /* nanoseconds */
+};
+#endif
+
+#ifndef __BIT_TYPES_DEFINED__
+#define __BIT_TYPES_DEFINED__
+typedef signed char           int8_t;
+typedef unsigned char       u_int8_t;
+typedef short                int16_t;
+typedef unsigned short     u_int16_t;
+typedef int                  int32_t;
+typedef unsigned int       u_int32_t;
+#endif
+
+
+/*
+ * Cfs constants
+ */
+#define CODA_MAXNAMLEN   255
+#define CODA_MAXPATHLEN  1024
+#define CODA_MAXSYMLINK  10
+
+/* these are Coda's version of O_RDONLY etc combinations
+ * to deal with VFS open modes
+ */
+#define C_O_READ        0x001
+#define C_O_WRITE       0x002
+#define C_O_TRUNC       0x010
+#define C_O_EXCL        0x100
+#define C_O_CREAT       0x200
+
+/* these are to find mode bits in Venus */ 
+#define C_M_READ  00400
+#define C_M_WRITE 00200
+
+/* for access Venus will use */
+#define C_A_C_OK    8               /* Test for writing upon create.  */
+#define C_A_R_OK    4               /* Test for read permission.  */
+#define C_A_W_OK    2               /* Test for write permission.  */
+#define C_A_X_OK    1               /* Test for execute permission.  */
+#define C_A_F_OK    0               /* Test for existence.  */
+
+
+
+#ifndef _VENUS_DIRENT_T_
+#define _VENUS_DIRENT_T_ 1
+struct venus_dirent {
+        u_int32_t d_fileno;             /* file number of entry */
+        u_int16_t d_reclen;             /* length of this record */
+        u_int8_t  d_type;                       /* file type, see below */
+        u_int8_t  d_namlen;             /* length of string in d_name */
+        char      d_name[CODA_MAXNAMLEN + 1];/* name must be no longer than this */
+};
+#undef DIRSIZ
+#define DIRSIZ(dp)      ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + \
+                         (((dp)->d_namlen+1 + 3) &~ 3))
+
+/*
+ * File types
+ */
+#define CDT_UNKNOWN      0
+#define CDT_FIFO         1
+#define CDT_CHR          2
+#define CDT_DIR          4
+#define CDT_BLK          6
+#define CDT_REG          8
+#define CDT_LNK         10
+#define CDT_SOCK        12
+#define CDT_WHT         14
+
+/*
+ * Convert between stat structure types and directory types.
+ */
+#define IFTOCDT(mode)   (((mode) & 0170000) >> 12)
+#define CDTTOIF(dirtype)        ((dirtype) << 12)
+
+#endif
+
+#ifndef _VUID_T_
+#define _VUID_T_
+typedef u_int32_t vuid_t;
+typedef u_int32_t vgid_t;
+#endif /*_VUID_T_ */
+
+struct CodaFid {
+        u_int32_t opaque[4];
+};
+
+#define coda_f2i(fid)\
+        (fid ? (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]) : 0)
+
+#ifndef _VENUS_VATTR_T_
+#define _VENUS_VATTR_T_
+/*
+ * Vnode types.  VNON means no type.
+ */
+enum coda_vtype { C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
+
+struct coda_vattr {
+        long            va_type;        /* vnode type (for create) */
+        u_short         va_mode;        /* files access mode and type */
+        short           va_nlink;       /* number of references to file */
+        vuid_t          va_uid;         /* owner user id */
+        vgid_t          va_gid;         /* owner group id */
+        long            va_fileid;      /* file id */
+        u_quad_t        va_size;        /* file size in bytes */
+        long            va_blocksize;   /* blocksize preferred for i/o */
+        struct timespec va_atime;       /* time of last access */
+        struct timespec va_mtime;       /* time of last modification */
+        struct timespec va_ctime;       /* time file changed */
+        u_long          va_gen;         /* generation number of file */
+        u_long          va_flags;       /* flags defined for file */
+        cdev_t          va_rdev;        /* device special file represents */
+        u_quad_t        va_bytes;       /* bytes of disk space held by file */
+        u_quad_t        va_filerev;     /* file modification number */
+};
+
+#endif 
+
+/* structure used by CODA_STATFS for getting cache information from venus */
+struct coda_statfs {
+    int32_t f_blocks;
+    int32_t f_bfree;
+    int32_t f_bavail;
+    int32_t f_files;
+    int32_t f_ffree;
+};
+
+/*
+ * Kernel <--> Venus communications.
+ */
+
+#define CODA_ROOT       2
+#define CODA_OPEN_BY_FD 3
+#define CODA_OPEN       4
+#define CODA_CLOSE      5
+#define CODA_IOCTL      6
+#define CODA_GETATTR    7
+#define CODA_SETATTR    8
+#define CODA_ACCESS     9
+#define CODA_LOOKUP     10
+#define CODA_CREATE     11
+#define CODA_REMOVE     12
+#define CODA_LINK       13
+#define CODA_RENAME     14
+#define CODA_MKDIR      15
+#define CODA_RMDIR      16
+#define CODA_SYMLINK    18
+#define CODA_READLINK   19
+#define CODA_FSYNC      20
+#define CODA_VGET       22
+#define CODA_SIGNAL     23
+#define CODA_REPLACE     24 /* DOWNCALL */
+#define CODA_FLUSH       25 /* DOWNCALL */
+#define CODA_PURGEUSER   26 /* DOWNCALL */
+#define CODA_ZAPFILE     27 /* DOWNCALL */
+#define CODA_ZAPDIR      28 /* DOWNCALL */
+#define CODA_PURGEFID    30 /* DOWNCALL */
+#define CODA_OPEN_BY_PATH 31
+#define CODA_RESOLVE     32
+#define CODA_REINTEGRATE 33
+#define CODA_STATFS      34
+#define CODA_STORE       35
+#define CODA_RELEASE     36
+#define CODA_NCALLS 37
+
+#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
+
+#define VC_MAXDATASIZE      8192
+#define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
+                            VC_MAXDATASIZE  
+
+#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
+
+#define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
+
+/*
+ *        Venus <-> Coda  RPC arguments
+ */
+struct coda_in_hdr {
+    u_int32_t opcode;
+    u_int32_t unique;       /* Keep multiple outstanding msgs distinct */
+    pid_t pid;
+    pid_t pgid;
+    vuid_t uid;
+};
+
+/* Really important that opcode and unique are 1st two fields! */
+struct coda_out_hdr {
+    u_int32_t opcode;
+    u_int32_t unique;   
+    u_int32_t result;
+};
+
+/* coda_root: NO_IN */
+struct coda_root_out {
+    struct coda_out_hdr oh;
+    struct CodaFid VFid;
+};
+
+struct coda_root_in {
+    struct coda_in_hdr in;
+};
+
+/* coda_open: */
+struct coda_open_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_open_out {
+    struct coda_out_hdr oh;
+    cdev_t      dev;
+    ino_t       inode;
+};
+
+
+/* coda_store: */
+struct coda_store_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_store_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_release: */
+struct coda_release_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_release_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_close: */
+struct coda_close_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_close_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_ioctl: */
+struct coda_ioctl_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int cmd;
+    int len;
+    int rwflag;
+    char *data;                 /* Place holder for data. */
+};
+
+struct coda_ioctl_out {
+    struct coda_out_hdr oh;
+    int len;
+    caddr_t     data;           /* Place holder for data. */
+};
+
+
+/* coda_getattr: */
+struct coda_getattr_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+};
+
+struct coda_getattr_out {
+    struct coda_out_hdr oh;
+    struct coda_vattr attr;
+};
+
+
+/* coda_setattr: NO_OUT */
+struct coda_setattr_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    struct coda_vattr attr;
+};
+
+struct coda_setattr_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_access: NO_OUT */
+struct coda_access_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_access_out {
+    struct coda_out_hdr out;
+};
+
+
+/* lookup flags */
+#define CLU_CASE_SENSITIVE     0x01
+#define CLU_CASE_INSENSITIVE   0x02
+
+/* coda_lookup: */
+struct  coda_lookup_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int         name;           /* Place holder for data. */
+    int         flags;  
+};
+
+struct coda_lookup_out {
+    struct coda_out_hdr oh;
+    struct CodaFid VFid;
+    int vtype;
+};
+
+
+/* coda_create: */
+struct coda_create_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    struct coda_vattr attr;
+    int excl;
+    int mode;
+    int         name;           /* Place holder for data. */
+};
+
+struct coda_create_out {
+    struct coda_out_hdr oh;
+    struct CodaFid VFid;
+    struct coda_vattr attr;
+};
+
+
+/* coda_remove: NO_OUT */
+struct coda_remove_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int name;           /* Place holder for data. */
+};
+
+struct coda_remove_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_link: NO_OUT */
+struct coda_link_in {
+    struct coda_in_hdr ih;
+    struct CodaFid sourceFid;   /* cnode to link *to* */
+    struct CodaFid destFid;     /* Directory in which to place link */
+    int tname;          /* Place holder for data. */
+};
+
+struct coda_link_out {
+    struct coda_out_hdr out;
+};
+
+
+/* coda_rename: NO_OUT */
+struct coda_rename_in {
+    struct coda_in_hdr ih;
+    struct CodaFid sourceFid;
+    int         srcname;
+    struct CodaFid destFid;
+    int         destname;
+};
+
+struct coda_rename_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_mkdir: */
+struct coda_mkdir_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    struct coda_vattr attr;
+    int    name;                /* Place holder for data. */
+};
+
+struct coda_mkdir_out {
+    struct coda_out_hdr oh;
+    struct CodaFid VFid;
+    struct coda_vattr attr;
+};
+
+
+/* coda_rmdir: NO_OUT */
+struct coda_rmdir_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int name;           /* Place holder for data. */
+};
+
+struct coda_rmdir_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_symlink: NO_OUT */
+struct coda_symlink_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;        /* Directory to put symlink in */
+    int srcname;
+    struct coda_vattr attr;
+    int tname;
+};
+
+struct coda_symlink_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_readlink: */
+struct coda_readlink_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+};
+
+struct coda_readlink_out {
+    struct coda_out_hdr oh;
+    int count;
+    caddr_t     data;           /* Place holder for data. */
+};
+
+
+/* coda_fsync: NO_OUT */
+struct coda_fsync_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+};
+
+struct coda_fsync_out {
+    struct coda_out_hdr out;
+};
+
+/* coda_vget: */
+struct coda_vget_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+};
+
+struct coda_vget_out {
+    struct coda_out_hdr oh;
+    struct CodaFid VFid;
+    int vtype;
+};
+
+
+/* CODA_SIGNAL is out-of-band, doesn't need data. */
+/* CODA_INVALIDATE is a venus->kernel call */
+/* CODA_FLUSH is a venus->kernel call */
+
+/* coda_purgeuser: */
+/* CODA_PURGEUSER is a venus->kernel call */
+struct coda_purgeuser_out {
+    struct coda_out_hdr oh;
+    vuid_t uid;
+};
+
+/* coda_zapfile: */
+/* CODA_ZAPFILE is a venus->kernel call */
+struct coda_zapfile_out {  
+    struct coda_out_hdr oh;
+    struct CodaFid CodaFid;
+};
+
+/* coda_zapdir: */
+/* CODA_ZAPDIR is a venus->kernel call */       
+struct coda_zapdir_out {          
+    struct coda_out_hdr oh;
+    struct CodaFid CodaFid;
+};
+
+/* coda_purgefid: */
+/* CODA_PURGEFID is a venus->kernel call */     
+struct coda_purgefid_out { 
+    struct coda_out_hdr oh;
+    struct CodaFid CodaFid;
+};
+
+/* coda_replace: */
+/* CODA_REPLACE is a venus->kernel call */      
+struct coda_replace_out { /* coda_replace is a venus->kernel call */
+    struct coda_out_hdr oh;
+    struct CodaFid NewFid;
+    struct CodaFid OldFid;
+};
+
+/* coda_open_by_fd: */
+struct coda_open_by_fd_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int        flags;
+};
+
+struct coda_open_by_fd_out {
+    struct coda_out_hdr oh;
+    int fd;
+
+#ifdef __KERNEL__
+    struct file *fh; /* not passed from userspace but used in-kernel only */
+#endif
+};
+
+/* coda_open_by_path: */
+struct coda_open_by_path_in {
+    struct coda_in_hdr ih;
+    struct CodaFid VFid;
+    int flags;
+};
+
+struct coda_open_by_path_out {
+    struct coda_out_hdr oh;
+        int path;
+};
+
+/* coda_statfs: NO_IN */
+struct coda_statfs_in {
+    struct coda_in_hdr in;
+};
+
+struct coda_statfs_out {
+    struct coda_out_hdr oh;
+    struct coda_statfs stat;
+};
+
+/* 
+ * Occasionally, we don't cache the fid returned by CODA_LOOKUP. 
+ * For instance, if the fid is inconsistent. 
+ * This case is handled by setting the top bit of the type result parameter.
+ */
+#define CODA_NOCACHE          0x80000000
+
+union inputArgs {
+    struct coda_in_hdr ih;              /* NB: every struct below begins with an ih */
+    struct coda_open_in coda_open;
+    struct coda_store_in coda_store;
+    struct coda_release_in coda_release;
+    struct coda_close_in coda_close;
+    struct coda_ioctl_in coda_ioctl;
+    struct coda_getattr_in coda_getattr;
+    struct coda_setattr_in coda_setattr;
+    struct coda_access_in coda_access;
+    struct coda_lookup_in coda_lookup;
+    struct coda_create_in coda_create;
+    struct coda_remove_in coda_remove;
+    struct coda_link_in coda_link;
+    struct coda_rename_in coda_rename;
+    struct coda_mkdir_in coda_mkdir;
+    struct coda_rmdir_in coda_rmdir;
+    struct coda_symlink_in coda_symlink;
+    struct coda_readlink_in coda_readlink;
+    struct coda_fsync_in coda_fsync;
+    struct coda_vget_in coda_vget;
+    struct coda_open_by_fd_in coda_open_by_fd;
+    struct coda_open_by_path_in coda_open_by_path;
+    struct coda_statfs_in coda_statfs;
+};
+
+union outputArgs {
+    struct coda_out_hdr oh;             /* NB: every struct below begins with an oh */
+    struct coda_root_out coda_root;
+    struct coda_open_out coda_open;
+    struct coda_ioctl_out coda_ioctl;
+    struct coda_getattr_out coda_getattr;
+    struct coda_lookup_out coda_lookup;
+    struct coda_create_out coda_create;
+    struct coda_mkdir_out coda_mkdir;
+    struct coda_readlink_out coda_readlink;
+    struct coda_vget_out coda_vget;
+    struct coda_purgeuser_out coda_purgeuser;
+    struct coda_zapfile_out coda_zapfile;
+    struct coda_zapdir_out coda_zapdir;
+    struct coda_purgefid_out coda_purgefid;
+    struct coda_replace_out coda_replace;
+    struct coda_open_by_fd_out coda_open_by_fd;
+    struct coda_open_by_path_out coda_open_by_path;
+    struct coda_statfs_out coda_statfs;
+};    
+
+union coda_downcalls {
+    /* CODA_INVALIDATE is a venus->kernel call */
+    /* CODA_FLUSH is a venus->kernel call */
+    struct coda_purgeuser_out purgeuser;
+    struct coda_zapfile_out zapfile;
+    struct coda_zapdir_out zapdir;
+    struct coda_purgefid_out purgefid;
+    struct coda_replace_out replace;
+};
+
+
+/*
+ * Used for identifying usage of "Control" and pioctls
+ */
+
+#define PIOCPARM_MASK 0x0000ffff
+struct ViceIoctl {
+        void __user *in;        /* Data to be transferred in */
+        void __user *out;       /* Data to be transferred out */
+        u_short in_size;        /* Size of input buffer <= 2K */
+        u_short out_size;       /* Maximum size of output buffer, <= 2K */
+};
+
+struct PioctlData {
+        const char __user *path;
+        int follow;
+        struct ViceIoctl vi;
+};
+
+#define CODA_CONTROL            ".CONTROL"
+#define CODA_CONTROLLEN         8
+#define CTL_INO                 -1
+
+/* Data passed to mount */
+
+#define CODA_MOUNT_VERSION 1
+
+struct coda_mount_data {
+        int             version;
+        int             fd;       /* Opened device */
+};
+
+#endif /* _UAPI_CODA_HEADER_ */
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
new file mode 100644
index 000000000000..79d05981fc4b
--- /dev/null
+++ b/include/uapi/linux/coda_psdev.h
@@ -0,0 +1,27 @@
+#ifndef _UAPI__CODA_PSDEV_H
+#define _UAPI__CODA_PSDEV_H
+
+#include <linux/magic.h>
+
+#define CODA_PSDEV_MAJOR 67
+#define MAX_CODADEVS  5    /* how many do we allow */
+
+
+/* messages between coda filesystem in kernel and Venus */
+struct upc_req {
+        struct list_head    uc_chain;
+        caddr_t             uc_data;
+        u_short             uc_flags;
+        u_short             uc_inSize;  /* Size is at most 5000 bytes */
+        u_short             uc_outSize;
+        u_short             uc_opcode;  /* copied from data to save lookup */
+        int                 uc_unique;
+        wait_queue_head_t   uc_sleep;   /* process' wait queue */
+};
+
+#define CODA_REQ_ASYNC  0x1
+#define CODA_REQ_READ   0x2
+#define CODA_REQ_WRITE  0x4
+#define CODA_REQ_ABORT  0x8
+
+#endif /* _UAPI__CODA_PSDEV_H */
diff --git a/include/linux/coff.h b/include/uapi/linux/coff.h
index 6354a7fe22b2..6354a7fe22b2 100644
--- a/include/linux/coff.h
+++ b/include/uapi/linux/coff.h
diff --git a/include/uapi/linux/connector.h b/include/uapi/linux/connector.h
new file mode 100644
index 000000000000..8761a0349c74
--- /dev/null
+++ b/include/uapi/linux/connector.h
@@ -0,0 +1,77 @@
+/*
+ *      connector.h
+ * 
+ * 2004-2005 Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
+ * All rights reserved.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _UAPI__CONNECTOR_H
+#define _UAPI__CONNECTOR_H
+
+#include <linux/types.h>
+
+/*
+ * Process Events connector unique ids -- used for message routing
+ */
+#define CN_IDX_PROC                     0x1
+#define CN_VAL_PROC                     0x1
+#define CN_IDX_CIFS                     0x2
+#define CN_VAL_CIFS                     0x1
+#define CN_W1_IDX                       0x3     /* w1 communication */
+#define CN_W1_VAL                       0x1
+#define CN_IDX_V86D                     0x4
+#define CN_VAL_V86D_UVESAFB             0x1
+#define CN_IDX_BB                       0x5     /* BlackBoard, from the TSP GPL sampling framework */
+#define CN_DST_IDX                      0x6
+#define CN_DST_VAL                      0x1
+#define CN_IDX_DM                       0x7     /* Device Mapper */
+#define CN_VAL_DM_USERSPACE_LOG         0x1
+#define CN_IDX_DRBD                     0x8
+#define CN_VAL_DRBD                     0x1
+#define CN_KVP_IDX                      0x9     /* HyperV KVP */
+#define CN_KVP_VAL                      0x1     /* queries from the kernel */
+
+#define CN_NETLINK_USERS                10      /* Highest index + 1 */
+
+/*
+ * Maximum connector's message size.
+ */
+#define CONNECTOR_MAX_MSG_SIZE          16384
+
+/*
+ * idx and val are unique identifiers which 
+ * are used for message routing and 
+ * must be registered in connector.h for in-kernel usage.
+ */
+
+struct cb_id {
+        __u32 idx;
+        __u32 val;
+};
+
+struct cn_msg {
+        struct cb_id id;
+
+        __u32 seq;
+        __u32 ack;
+
+        __u16 len;              /* Length of the following data */
+        __u16 flags;
+        __u8 data[0];
+};
+
+#endif /* _UAPI__CONNECTOR_H */
diff --git a/include/linux/const.h b/include/uapi/linux/const.h
index c22c707c455d..c22c707c455d 100644
--- a/include/linux/const.h
+++ b/include/uapi/linux/const.h
diff --git a/include/uapi/linux/cramfs_fs.h b/include/uapi/linux/cramfs_fs.h
new file mode 100644
index 000000000000..e4611a9b9243
--- /dev/null
+++ b/include/uapi/linux/cramfs_fs.h
@@ -0,0 +1,88 @@
+#ifndef _UAPI__CRAMFS_H
+#define _UAPI__CRAMFS_H
+
+#include <linux/types.h>
+#include <linux/magic.h>
+
+#define CRAMFS_SIGNATURE        "Compressed ROMFS"
+
+/*
+ * Width of various bitfields in struct cramfs_inode.
+ * Primarily used to generate warnings in mkcramfs.
+ */
+#define CRAMFS_MODE_WIDTH 16
+#define CRAMFS_UID_WIDTH 16
+#define CRAMFS_SIZE_WIDTH 24
+#define CRAMFS_GID_WIDTH 8
+#define CRAMFS_NAMELEN_WIDTH 6
+#define CRAMFS_OFFSET_WIDTH 26
+
+/*
+ * Since inode.namelen is a unsigned 6-bit number, the maximum cramfs
+ * path length is 63 << 2 = 252.
+ */
+#define CRAMFS_MAXPATHLEN (((1 << CRAMFS_NAMELEN_WIDTH) - 1) << 2)
+
+/*
+ * Reasonably terse representation of the inode data.
+ */
+struct cramfs_inode {
+        __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
+        /* SIZE for device files is i_rdev */
+        __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
+        /* NAMELEN is the length of the file name, divided by 4 and
+           rounded up.  (cramfs doesn't support hard links.) */
+        /* OFFSET: For symlinks and non-empty regular files, this
+           contains the offset (divided by 4) of the file data in
+           compressed form (starting with an array of block pointers;
+           see README).  For non-empty directories it is the offset
+           (divided by 4) of the inode of the first file in that
+           directory.  For anything else, offset is zero. */
+        __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
+};
+
+struct cramfs_info {
+        __u32 crc;
+        __u32 edition;
+        __u32 blocks;
+        __u32 files;
+};
+
+/*
+ * Superblock information at the beginning of the FS.
+ */
+struct cramfs_super {
+        __u32 magic;                    /* 0x28cd3d45 - random number */
+        __u32 size;                     /* length in bytes */
+        __u32 flags;                    /* feature flags */
+        __u32 future;                   /* reserved for future use */
+        __u8 signature[16];             /* "Compressed ROMFS" */
+        struct cramfs_info fsid;        /* unique filesystem info */
+        __u8 name[16];                  /* user-defined name */
+        struct cramfs_inode root;       /* root inode data */
+};
+
+/*
+ * Feature flags
+ *
+ * 0x00000000 - 0x000000ff: features that work for all past kernels
+ * 0x00000100 - 0xffffffff: features that don't work for past kernels
+ */
+#define CRAMFS_FLAG_FSID_VERSION_2      0x00000001      /* fsid version #2 */
+#define CRAMFS_FLAG_SORTED_DIRS         0x00000002      /* sorted dirs */
+#define CRAMFS_FLAG_HOLES               0x00000100      /* support for holes */
+#define CRAMFS_FLAG_WRONG_SIGNATURE     0x00000200      /* reserved */
+#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET 0x00000400      /* shifted root fs */
+
+/*
+ * Valid values in super.flags.  Currently we refuse to mount
+ * if (flags & ~CRAMFS_SUPPORTED_FLAGS).  Maybe that should be
+ * changed to test super.future instead.
+ */
+#define CRAMFS_SUPPORTED_FLAGS  ( 0x000000ff \
+                                | CRAMFS_FLAG_HOLES \
+                                | CRAMFS_FLAG_WRONG_SIGNATURE \
+                                | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET )
+
+
+#endif /* _UAPI__CRAMFS_H */
diff --git a/include/uapi/linux/cuda.h b/include/uapi/linux/cuda.h
new file mode 100644
index 000000000000..286f9f10fce8
--- /dev/null
+++ b/include/uapi/linux/cuda.h
@@ -0,0 +1,33 @@
+/*
+ * Definitions for talking to the CUDA.  The CUDA is a microcontroller
+ * which controls the ADB, system power, RTC, and various other things.
+ *
+ * Copyright (C) 1996 Paul Mackerras.
+ */
+
+#ifndef _UAPI_LINUX_CUDA_H
+#define _UAPI_LINUX_CUDA_H
+
+/* CUDA commands (2nd byte) */
+#define CUDA_WARM_START         0
+#define CUDA_AUTOPOLL           1
+#define CUDA_GET_6805_ADDR      2
+#define CUDA_GET_TIME           3
+#define CUDA_GET_PRAM           7
+#define CUDA_SET_6805_ADDR      8
+#define CUDA_SET_TIME           9
+#define CUDA_POWERDOWN          0xa
+#define CUDA_POWERUP_TIME       0xb
+#define CUDA_SET_PRAM           0xc
+#define CUDA_MS_RESET           0xd
+#define CUDA_SEND_DFAC          0xe
+#define CUDA_RESET_SYSTEM       0x11
+#define CUDA_SET_IPL            0x12
+#define CUDA_SET_AUTO_RATE      0x14
+#define CUDA_GET_AUTO_RATE      0x16
+#define CUDA_SET_DEVICE_LIST    0x19
+#define CUDA_GET_DEVICE_LIST    0x1a
+#define CUDA_GET_SET_IIC        0x22
+
+
+#endif /* _UAPI_LINUX_CUDA_H */
diff --git a/include/uapi/linux/cyclades.h b/include/uapi/linux/cyclades.h
new file mode 100644
index 000000000000..12b587aa361c
--- /dev/null
+++ b/include/uapi/linux/cyclades.h
@@ -0,0 +1,493 @@
+/* $Revision: 3.0 $$Date: 1998/11/02 14:20:59 $
+ * linux/include/linux/cyclades.h
+ *
+ * This file was initially written by
+ * Randolph Bentson <bentson@grieg.seaslug.org> and is maintained by
+ * Ivan Passos <ivan@cyclades.com>.
+ *
+ * This file contains the general definitions for the cyclades.c driver
+ *$Log: cyclades.h,v $
+ *Revision 3.1  2002/01/29 11:36:16  henrique
+ *added throttle field on struct cyclades_port to indicate whether the
+ *port is throttled or not
+ *
+ *Revision 3.1  2000/04/19 18:52:52  ivan
+ *converted address fields to unsigned long and added fields for physical
+ *addresses on cyclades_card structure;
+ *
+ *Revision 3.0  1998/11/02 14:20:59  ivan
+ *added nports field on cyclades_card structure;
+ *
+ *Revision 2.5  1998/08/03 16:57:01  ivan
+ *added cyclades_idle_stats structure;
+ * 
+ *Revision 2.4  1998/06/01 12:09:53  ivan
+ *removed closing_wait2 from cyclades_port structure;
+ *
+ *Revision 2.3  1998/03/16 18:01:12  ivan
+ *changes in the cyclades_port structure to get it closer to the 
+ *standard serial port structure;
+ *added constants for new ioctls;
+ *
+ *Revision 2.2  1998/02/17 16:50:00  ivan
+ *changes in the cyclades_port structure (addition of shutdown_wait and 
+ *chip_rev variables);
+ *added constants for new ioctls and for CD1400 rev. numbers.
+ *
+ *Revision 2.1  1997/10/24 16:03:00  ivan
+ *added rflow (which allows enabling the CD1400 special flow control 
+ *feature) and rtsdtr_inv (which allows DTR/RTS pin inversion) to 
+ *cyclades_port structure;
+ *added Alpha support
+ *
+ *Revision 2.0  1997/06/30 10:30:00  ivan
+ *added some new doorbell command constants related to IOCTLW and
+ *UART error signaling
+ *
+ *Revision 1.8  1997/06/03 15:30:00  ivan
+ *added constant ZFIRM_HLT
+ *added constant CyPCI_Ze_win ( = 2 * Cy_PCI_Zwin)
+ *
+ *Revision 1.7  1997/03/26 10:30:00  daniel
+ *new entries at the end of cyclades_port struct to reallocate
+ *variables illegally allocated within card memory.
+ *
+ *Revision 1.6  1996/09/09 18:35:30  bentson
+ *fold in changes for Cyclom-Z -- including structures for
+ *communicating with board as well modest changes to original
+ *structures to support new features.
+ *
+ *Revision 1.5  1995/11/13 21:13:31  bentson
+ *changes suggested by Michael Chastain <mec@duracef.shout.net>
+ *to support use of this file in non-kernel applications
+ *
+ *
+ */
+
+#ifndef _UAPI_LINUX_CYCLADES_H
+#define _UAPI_LINUX_CYCLADES_H
+
+#include <linux/types.h>
+
+struct cyclades_monitor {
+        unsigned long           int_count;
+        unsigned long           char_count;
+        unsigned long           char_max;
+        unsigned long           char_last;
+};
+
+/*
+ * These stats all reflect activity since the device was last initialized.
+ * (i.e., since the port was opened with no other processes already having it
+ * open)
+ */
+struct cyclades_idle_stats {
+    __kernel_time_t in_use;     /* Time device has been in use (secs) */
+    __kernel_time_t recv_idle;  /* Time since last char received (secs) */
+    __kernel_time_t xmit_idle;  /* Time since last char transmitted (secs) */
+    unsigned long  recv_bytes;  /* Bytes received */
+    unsigned long  xmit_bytes;  /* Bytes transmitted */
+    unsigned long  overruns;    /* Input overruns */
+    unsigned long  frame_errs;  /* Input framing errors */
+    unsigned long  parity_errs; /* Input parity errors */
+};
+
+#define CYCLADES_MAGIC  0x4359
+
+#define CYGETMON                0x435901
+#define CYGETTHRESH             0x435902
+#define CYSETTHRESH             0x435903
+#define CYGETDEFTHRESH          0x435904
+#define CYSETDEFTHRESH          0x435905
+#define CYGETTIMEOUT            0x435906
+#define CYSETTIMEOUT            0x435907
+#define CYGETDEFTIMEOUT         0x435908
+#define CYSETDEFTIMEOUT         0x435909
+#define CYSETRFLOW              0x43590a
+#define CYGETRFLOW              0x43590b
+#define CYSETRTSDTR_INV         0x43590c
+#define CYGETRTSDTR_INV         0x43590d
+#define CYZSETPOLLCYCLE         0x43590e
+#define CYZGETPOLLCYCLE         0x43590f
+#define CYGETCD1400VER          0x435910
+#define CYSETWAIT               0x435912
+#define CYGETWAIT               0x435913
+
+/*************** CYCLOM-Z ADDITIONS ***************/
+
+#define CZIOC           ('M' << 8)
+#define CZ_NBOARDS      (CZIOC|0xfa)
+#define CZ_BOOT_START   (CZIOC|0xfb)
+#define CZ_BOOT_DATA    (CZIOC|0xfc)
+#define CZ_BOOT_END     (CZIOC|0xfd)
+#define CZ_TEST         (CZIOC|0xfe)
+
+#define CZ_DEF_POLL     (HZ/25)
+
+#define MAX_BOARD       4       /* Max number of boards */
+#define MAX_DEV         256     /* Max number of ports total */
+#define CYZ_MAX_SPEED   921600
+
+#define CYZ_FIFO_SIZE   16
+
+#define CYZ_BOOT_NWORDS 0x100
+struct CYZ_BOOT_CTRL {
+        unsigned short  nboard;
+        int             status[MAX_BOARD];
+        int             nchannel[MAX_BOARD];
+        int             fw_rev[MAX_BOARD];
+        unsigned long   offset;
+        unsigned long   data[CYZ_BOOT_NWORDS];
+};
+
+
+#ifndef DP_WINDOW_SIZE
+/*
+ *      Memory Window Sizes
+ */
+
+#define DP_WINDOW_SIZE          (0x00080000)    /* window size 512 Kb */
+#define ZE_DP_WINDOW_SIZE       (0x00100000)    /* window size 1 Mb (Ze and
+                                                  8Zo V.2 */
+#define CTRL_WINDOW_SIZE        (0x00000080)    /* runtime regs 128 bytes */
+
+/*
+ *      CUSTOM_REG - Cyclom-Z/PCI Custom Registers Set. The driver
+ *      normally will access only interested on the fpga_id, fpga_version,
+ *      start_cpu and stop_cpu.
+ */
+
+struct  CUSTOM_REG {
+        __u32   fpga_id;                /* FPGA Identification Register */
+        __u32   fpga_version;           /* FPGA Version Number Register */
+        __u32   cpu_start;              /* CPU start Register (write) */
+        __u32   cpu_stop;               /* CPU stop Register (write) */
+        __u32   misc_reg;               /* Miscellaneous Register */
+        __u32   idt_mode;               /* IDT mode Register */
+        __u32   uart_irq_status;        /* UART IRQ status Register */
+        __u32   clear_timer0_irq;       /* Clear timer interrupt Register */
+        __u32   clear_timer1_irq;       /* Clear timer interrupt Register */
+        __u32   clear_timer2_irq;       /* Clear timer interrupt Register */
+        __u32   test_register;          /* Test Register */
+        __u32   test_count;             /* Test Count Register */
+        __u32   timer_select;           /* Timer select register */
+        __u32   pr_uart_irq_status;     /* Prioritized UART IRQ stat Reg */
+        __u32   ram_wait_state;         /* RAM wait-state Register */
+        __u32   uart_wait_state;        /* UART wait-state Register */
+        __u32   timer_wait_state;       /* timer wait-state Register */
+        __u32   ack_wait_state;         /* ACK wait State Register */
+};
+
+/*
+ *      RUNTIME_9060 - PLX PCI9060ES local configuration and shared runtime
+ *      registers. This structure can be used to access the 9060 registers
+ *      (memory mapped).
+ */
+
+struct RUNTIME_9060 {
+        __u32   loc_addr_range; /* 00h - Local Address Range */
+        __u32   loc_addr_base;  /* 04h - Local Address Base */
+        __u32   loc_arbitr;     /* 08h - Local Arbitration */
+        __u32   endian_descr;   /* 0Ch - Big/Little Endian Descriptor */
+        __u32   loc_rom_range;  /* 10h - Local ROM Range */
+        __u32   loc_rom_base;   /* 14h - Local ROM Base */
+        __u32   loc_bus_descr;  /* 18h - Local Bus descriptor */
+        __u32   loc_range_mst;  /* 1Ch - Local Range for Master to PCI */
+        __u32   loc_base_mst;   /* 20h - Local Base for Master PCI */
+        __u32   loc_range_io;   /* 24h - Local Range for Master IO */
+        __u32   pci_base_mst;   /* 28h - PCI Base for Master PCI */
+        __u32   pci_conf_io;    /* 2Ch - PCI configuration for Master IO */
+        __u32   filler1;        /* 30h */
+        __u32   filler2;        /* 34h */
+        __u32   filler3;        /* 38h */
+        __u32   filler4;        /* 3Ch */
+        __u32   mail_box_0;     /* 40h - Mail Box 0 */
+        __u32   mail_box_1;     /* 44h - Mail Box 1 */
+        __u32   mail_box_2;     /* 48h - Mail Box 2 */
+        __u32   mail_box_3;     /* 4Ch - Mail Box 3 */
+        __u32   filler5;        /* 50h */
+        __u32   filler6;        /* 54h */
+        __u32   filler7;        /* 58h */
+        __u32   filler8;        /* 5Ch */
+        __u32   pci_doorbell;   /* 60h - PCI to Local Doorbell */
+        __u32   loc_doorbell;   /* 64h - Local to PCI Doorbell */
+        __u32   intr_ctrl_stat; /* 68h - Interrupt Control/Status */
+        __u32   init_ctrl;      /* 6Ch - EEPROM control, Init Control, etc */
+};
+
+/* Values for the Local Base Address re-map register */
+
+#define WIN_RAM         0x00000001L     /* set the sliding window to RAM */
+#define WIN_CREG        0x14000001L     /* set the window to custom Registers */
+
+/* Values timer select registers */
+
+#define TIMER_BY_1M     0x00            /* clock divided by 1M */
+#define TIMER_BY_256K   0x01            /* clock divided by 256k */
+#define TIMER_BY_128K   0x02            /* clock divided by 128k */
+#define TIMER_BY_32K    0x03            /* clock divided by 32k */
+
+/****************** ****************** *******************/
+#endif
+
+#ifndef ZFIRM_ID
+/* #include "zfwint.h" */
+/****************** ****************** *******************/
+/*
+ *      This file contains the definitions for interfacing with the
+ *      Cyclom-Z ZFIRM Firmware.
+ */
+
+/* General Constant definitions */
+
+#define MAX_CHAN        64              /* max number of channels per board */
+
+/* firmware id structure (set after boot) */
+
+#define ID_ADDRESS      0x00000180L     /* signature/pointer address */
+#define ZFIRM_ID        0x5557465AL     /* ZFIRM/U signature */
+#define ZFIRM_HLT       0x59505B5CL     /* ZFIRM needs external power supply */
+#define ZFIRM_RST       0x56040674L     /* RST signal (due to FW reset) */
+
+#define ZF_TINACT_DEF   1000            /* default inactivity timeout 
+                                           (1000 ms) */
+#define ZF_TINACT       ZF_TINACT_DEF
+
+struct  FIRM_ID {
+        __u32   signature;              /* ZFIRM/U signature */
+        __u32   zfwctrl_addr;           /* pointer to ZFW_CTRL structure */
+};
+
+/* Op. System id */
+
+#define C_OS_LINUX      0x00000030      /* generic Linux system */
+
+/* channel op_mode */
+
+#define C_CH_DISABLE    0x00000000      /* channel is disabled */
+#define C_CH_TXENABLE   0x00000001      /* channel Tx enabled */
+#define C_CH_RXENABLE   0x00000002      /* channel Rx enabled */
+#define C_CH_ENABLE     0x00000003      /* channel Tx/Rx enabled */
+#define C_CH_LOOPBACK   0x00000004      /* Loopback mode */
+
+/* comm_parity - parity */
+
+#define C_PR_NONE       0x00000000      /* None */
+#define C_PR_ODD        0x00000001      /* Odd */
+#define C_PR_EVEN       0x00000002      /* Even */
+#define C_PR_MARK       0x00000004      /* Mark */
+#define C_PR_SPACE      0x00000008      /* Space */
+#define C_PR_PARITY     0x000000ff
+
+#define C_PR_DISCARD    0x00000100      /* discard char with frame/par error */
+#define C_PR_IGNORE     0x00000200      /* ignore frame/par error */
+
+/* comm_data_l - data length and stop bits */
+
+#define C_DL_CS5        0x00000001
+#define C_DL_CS6        0x00000002
+#define C_DL_CS7        0x00000004
+#define C_DL_CS8        0x00000008
+#define C_DL_CS         0x0000000f
+#define C_DL_1STOP      0x00000010
+#define C_DL_15STOP     0x00000020
+#define C_DL_2STOP      0x00000040
+#define C_DL_STOP       0x000000f0
+
+/* interrupt enabling/status */
+
+#define C_IN_DISABLE    0x00000000      /* zero, disable interrupts */
+#define C_IN_TXBEMPTY   0x00000001      /* tx buffer empty */
+#define C_IN_TXLOWWM    0x00000002      /* tx buffer below LWM */
+#define C_IN_RXHIWM     0x00000010      /* rx buffer above HWM */
+#define C_IN_RXNNDT     0x00000020      /* rx no new data timeout */
+#define C_IN_MDCD       0x00000100      /* modem DCD change */
+#define C_IN_MDSR       0x00000200      /* modem DSR change */
+#define C_IN_MRI        0x00000400      /* modem RI change */
+#define C_IN_MCTS       0x00000800      /* modem CTS change */
+#define C_IN_RXBRK      0x00001000      /* Break received */
+#define C_IN_PR_ERROR   0x00002000      /* parity error */
+#define C_IN_FR_ERROR   0x00004000      /* frame error */
+#define C_IN_OVR_ERROR  0x00008000      /* overrun error */
+#define C_IN_RXOFL      0x00010000      /* RX buffer overflow */
+#define C_IN_IOCTLW     0x00020000      /* I/O control w/ wait */
+#define C_IN_MRTS       0x00040000      /* modem RTS drop */
+#define C_IN_ICHAR      0x00080000
+ 
+/* flow control */
+
+#define C_FL_OXX        0x00000001      /* output Xon/Xoff flow control */
+#define C_FL_IXX        0x00000002      /* output Xon/Xoff flow control */
+#define C_FL_OIXANY     0x00000004      /* output Xon/Xoff (any xon) */
+#define C_FL_SWFLOW     0x0000000f
+
+/* flow status */
+
+#define C_FS_TXIDLE     0x00000000      /* no Tx data in the buffer or UART */
+#define C_FS_SENDING    0x00000001      /* UART is sending data */
+#define C_FS_SWFLOW     0x00000002      /* Tx is stopped by received Xoff */
+
+/* rs_control/rs_status RS-232 signals */
+
+#define C_RS_PARAM      0x80000000      /* Indicates presence of parameter in 
+                                           IOCTLM command */
+#define C_RS_RTS        0x00000001      /* RTS */
+#define C_RS_DTR        0x00000004      /* DTR */
+#define C_RS_DCD        0x00000100      /* CD */
+#define C_RS_DSR        0x00000200      /* DSR */
+#define C_RS_RI         0x00000400      /* RI */
+#define C_RS_CTS        0x00000800      /* CTS */
+
+/* commands Host <-> Board */
+
+#define C_CM_RESET      0x01            /* reset/flush buffers */
+#define C_CM_IOCTL      0x02            /* re-read CH_CTRL */
+#define C_CM_IOCTLW     0x03            /* re-read CH_CTRL, intr when done */
+#define C_CM_IOCTLM     0x04            /* RS-232 outputs change */
+#define C_CM_SENDXOFF   0x10            /* send Xoff */
+#define C_CM_SENDXON    0x11            /* send Xon */
+#define C_CM_CLFLOW     0x12            /* Clear flow control (resume) */
+#define C_CM_SENDBRK    0x41            /* send break */
+#define C_CM_INTBACK    0x42            /* Interrupt back */
+#define C_CM_SET_BREAK  0x43            /* Tx break on */
+#define C_CM_CLR_BREAK  0x44            /* Tx break off */
+#define C_CM_CMD_DONE   0x45            /* Previous command done */
+#define C_CM_INTBACK2   0x46            /* Alternate Interrupt back */
+#define C_CM_TINACT     0x51            /* set inactivity detection */
+#define C_CM_IRQ_ENBL   0x52            /* enable generation of interrupts */
+#define C_CM_IRQ_DSBL   0x53            /* disable generation of interrupts */
+#define C_CM_ACK_ENBL   0x54            /* enable acknowledged interrupt mode */
+#define C_CM_ACK_DSBL   0x55            /* disable acknowledged intr mode */
+#define C_CM_FLUSH_RX   0x56            /* flushes Rx buffer */
+#define C_CM_FLUSH_TX   0x57            /* flushes Tx buffer */
+#define C_CM_Q_ENABLE   0x58            /* enables queue access from the 
+                                           driver */
+#define C_CM_Q_DISABLE  0x59            /* disables queue access from the 
+                                           driver */
+
+#define C_CM_TXBEMPTY   0x60            /* Tx buffer is empty */
+#define C_CM_TXLOWWM    0x61            /* Tx buffer low water mark */
+#define C_CM_RXHIWM     0x62            /* Rx buffer high water mark */
+#define C_CM_RXNNDT     0x63            /* rx no new data timeout */
+#define C_CM_TXFEMPTY   0x64
+#define C_CM_ICHAR      0x65
+#define C_CM_MDCD       0x70            /* modem DCD change */
+#define C_CM_MDSR       0x71            /* modem DSR change */
+#define C_CM_MRI        0x72            /* modem RI change */
+#define C_CM_MCTS       0x73            /* modem CTS change */
+#define C_CM_MRTS       0x74            /* modem RTS drop */
+#define C_CM_RXBRK      0x84            /* Break received */
+#define C_CM_PR_ERROR   0x85            /* Parity error */
+#define C_CM_FR_ERROR   0x86            /* Frame error */
+#define C_CM_OVR_ERROR  0x87            /* Overrun error */
+#define C_CM_RXOFL      0x88            /* RX buffer overflow */
+#define C_CM_CMDERROR   0x90            /* command error */
+#define C_CM_FATAL      0x91            /* fatal error */
+#define C_CM_HW_RESET   0x92            /* reset board */
+
+/*
+ *      CH_CTRL - This per port structure contains all parameters
+ *      that control an specific port. It can be seen as the
+ *      configuration registers of a "super-serial-controller".
+ */
+
+struct CH_CTRL {
+        __u32   op_mode;        /* operation mode */
+        __u32   intr_enable;    /* interrupt masking */
+        __u32   sw_flow;        /* SW flow control */
+        __u32   flow_status;    /* output flow status */
+        __u32   comm_baud;      /* baud rate  - numerically specified */
+        __u32   comm_parity;    /* parity */
+        __u32   comm_data_l;    /* data length/stop */
+        __u32   comm_flags;     /* other flags */
+        __u32   hw_flow;        /* HW flow control */
+        __u32   rs_control;     /* RS-232 outputs */
+        __u32   rs_status;      /* RS-232 inputs */
+        __u32   flow_xon;       /* xon char */
+        __u32   flow_xoff;      /* xoff char */
+        __u32   hw_overflow;    /* hw overflow counter */
+        __u32   sw_overflow;    /* sw overflow counter */
+        __u32   comm_error;     /* frame/parity error counter */
+        __u32 ichar;
+        __u32 filler[7];
+};
+
+
+/*
+ *      BUF_CTRL - This per channel structure contains
+ *      all Tx and Rx buffer control for a given channel.
+ */
+
+struct  BUF_CTRL        {
+        __u32   flag_dma;       /* buffers are in Host memory */
+        __u32   tx_bufaddr;     /* address of the tx buffer */
+        __u32   tx_bufsize;     /* tx buffer size */
+        __u32   tx_threshold;   /* tx low water mark */
+        __u32   tx_get;         /* tail index tx buf */
+        __u32   tx_put;         /* head index tx buf */
+        __u32   rx_bufaddr;     /* address of the rx buffer */
+        __u32   rx_bufsize;     /* rx buffer size */
+        __u32   rx_threshold;   /* rx high water mark */
+        __u32   rx_get;         /* tail index rx buf */
+        __u32   rx_put;         /* head index rx buf */
+        __u32   filler[5];      /* filler to align structures */
+};
+
+/*
+ *      BOARD_CTRL - This per board structure contains all global 
+ *      control fields related to the board.
+ */
+
+struct BOARD_CTRL {
+
+        /* static info provided by the on-board CPU */
+        __u32   n_channel;      /* number of channels */
+        __u32   fw_version;     /* firmware version */
+
+        /* static info provided by the driver */
+        __u32   op_system;      /* op_system id */
+        __u32   dr_version;     /* driver version */
+
+        /* board control area */
+        __u32   inactivity;     /* inactivity control */
+
+        /* host to FW commands */
+        __u32   hcmd_channel;   /* channel number */
+        __u32   hcmd_param;     /* pointer to parameters */
+
+        /* FW to Host commands */
+        __u32   fwcmd_channel;  /* channel number */
+        __u32   fwcmd_param;    /* pointer to parameters */
+        __u32   zf_int_queue_addr; /* offset for INT_QUEUE structure */
+
+        /* filler so the structures are aligned */
+        __u32   filler[6];
+};
+
+/* Host Interrupt Queue */
+
+#define QUEUE_SIZE      (10*MAX_CHAN)
+
+struct  INT_QUEUE {
+        unsigned char   intr_code[QUEUE_SIZE];
+        unsigned long   channel[QUEUE_SIZE];
+        unsigned long   param[QUEUE_SIZE];
+        unsigned long   put;
+        unsigned long   get;
+};
+
+/*
+ *      ZFW_CTRL - This is the data structure that includes all other
+ *      data structures used by the Firmware.
+ */
+ 
+struct ZFW_CTRL {
+        struct BOARD_CTRL       board_ctrl;
+        struct CH_CTRL          ch_ctrl[MAX_CHAN];
+        struct BUF_CTRL         buf_ctrl[MAX_CHAN];
+};
+
+/****************** ****************** *******************/
+#endif
+
+#endif /* _UAPI_LINUX_CYCLADES_H */
diff --git a/include/linux/cycx_cfm.h b/include/uapi/linux/cycx_cfm.h
index 032d26ed8384..032d26ed8384 100644
--- a/include/linux/cycx_cfm.h
+++ b/include/uapi/linux/cycx_cfm.h
diff --git a/include/linux/dcbnl.h b/include/uapi/linux/dcbnl.h
index 6bb43382f3f3..6bb43382f3f3 100644
--- a/include/linux/dcbnl.h
+++ b/include/uapi/linux/dcbnl.h
diff --git a/include/uapi/linux/dccp.h b/include/uapi/linux/dccp.h
new file mode 100644
index 000000000000..52a9cd7307e7
--- /dev/null
+++ b/include/uapi/linux/dccp.h
@@ -0,0 +1,237 @@
+#ifndef _UAPI_LINUX_DCCP_H
+#define _UAPI_LINUX_DCCP_H
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+/**
+ * struct dccp_hdr - generic part of DCCP packet header
+ *
+ * @dccph_sport - Relevant port on the endpoint that sent this packet
+ * @dccph_dport - Relevant port on the other endpoint
+ * @dccph_doff - Data Offset from the start of the DCCP header, in 32-bit words
+ * @dccph_ccval - Used by the HC-Sender CCID
+ * @dccph_cscov - Parts of the packet that are covered by the Checksum field
+ * @dccph_checksum - Internet checksum, depends on dccph_cscov
+ * @dccph_x - 0 = 24 bit sequence number, 1 = 48
+ * @dccph_type - packet type, see DCCP_PKT_ prefixed macros
+ * @dccph_seq - sequence number high or low order 24 bits, depends on dccph_x
+ */
+struct dccp_hdr {
+        __be16  dccph_sport,
+                dccph_dport;
+        __u8    dccph_doff;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8    dccph_cscov:4,
+                dccph_ccval:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8    dccph_ccval:4,
+                dccph_cscov:4;
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+        __sum16 dccph_checksum;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8    dccph_x:1,
+                dccph_type:4,
+                dccph_reserved:3;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8    dccph_reserved:3,
+                dccph_type:4,
+                dccph_x:1;
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+        __u8    dccph_seq2;
+        __be16  dccph_seq;
+};
+
+/**
+ * struct dccp_hdr_ext - the low bits of a 48 bit seq packet
+ *
+ * @dccph_seq_low - low 24 bits of a 48 bit seq packet
+ */
+struct dccp_hdr_ext {
+        __be32  dccph_seq_low;
+};
+
+/**
+ * struct dccp_hdr_request - Connection initiation request header
+ *
+ * @dccph_req_service - Service to which the client app wants to connect
+ */
+struct dccp_hdr_request {
+        __be32  dccph_req_service;
+};
+/**
+ * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
+ *
+ * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
+ * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
+ */
+struct dccp_hdr_ack_bits {
+        __be16  dccph_reserved1;
+        __be16  dccph_ack_nr_high;
+        __be32  dccph_ack_nr_low;
+};
+/**
+ * struct dccp_hdr_response - Connection initiation response header
+ *
+ * @dccph_resp_ack - 48 bit Acknowledgment Number Subheader (5.3)
+ * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
+ */
+struct dccp_hdr_response {
+        struct dccp_hdr_ack_bits        dccph_resp_ack;
+        __be32                          dccph_resp_service;
+};
+
+/**
+ * struct dccp_hdr_reset - Unconditionally shut down a connection
+ *
+ * @dccph_reset_ack - 48 bit Acknowledgment Number Subheader (5.6)
+ * @dccph_reset_code - one of %dccp_reset_codes
+ * @dccph_reset_data - the Data 1 ... Data 3 fields from 5.6
+ */
+struct dccp_hdr_reset {
+        struct dccp_hdr_ack_bits        dccph_reset_ack;
+        __u8                            dccph_reset_code,
+                                        dccph_reset_data[3];
+};
+
+enum dccp_pkt_type {
+        DCCP_PKT_REQUEST = 0,
+        DCCP_PKT_RESPONSE,
+        DCCP_PKT_DATA,
+        DCCP_PKT_ACK,
+        DCCP_PKT_DATAACK,
+        DCCP_PKT_CLOSEREQ,
+        DCCP_PKT_CLOSE,
+        DCCP_PKT_RESET,
+        DCCP_PKT_SYNC,
+        DCCP_PKT_SYNCACK,
+        DCCP_PKT_INVALID,
+};
+
+#define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID
+
+static inline unsigned int dccp_packet_hdr_len(const __u8 type)
+{
+        if (type == DCCP_PKT_DATA)
+                return 0;
+        if (type == DCCP_PKT_DATAACK    ||
+            type == DCCP_PKT_ACK        ||
+            type == DCCP_PKT_SYNC       ||
+            type == DCCP_PKT_SYNCACK    ||
+            type == DCCP_PKT_CLOSE      ||
+            type == DCCP_PKT_CLOSEREQ)
+                return sizeof(struct dccp_hdr_ack_bits);
+        if (type == DCCP_PKT_REQUEST)
+                return sizeof(struct dccp_hdr_request);
+        if (type == DCCP_PKT_RESPONSE)
+                return sizeof(struct dccp_hdr_response);
+        return sizeof(struct dccp_hdr_reset);
+}
+enum dccp_reset_codes {
+        DCCP_RESET_CODE_UNSPECIFIED = 0,
+        DCCP_RESET_CODE_CLOSED,
+        DCCP_RESET_CODE_ABORTED,
+        DCCP_RESET_CODE_NO_CONNECTION,
+        DCCP_RESET_CODE_PACKET_ERROR,
+        DCCP_RESET_CODE_OPTION_ERROR,
+        DCCP_RESET_CODE_MANDATORY_ERROR,
+        DCCP_RESET_CODE_CONNECTION_REFUSED,
+        DCCP_RESET_CODE_BAD_SERVICE_CODE,
+        DCCP_RESET_CODE_TOO_BUSY,
+        DCCP_RESET_CODE_BAD_INIT_COOKIE,
+        DCCP_RESET_CODE_AGGRESSION_PENALTY,
+
+        DCCP_MAX_RESET_CODES            /* Leave at the end!  */
+};
+
+/* DCCP options */
+enum {
+        DCCPO_PADDING = 0,
+        DCCPO_MANDATORY = 1,
+        DCCPO_MIN_RESERVED = 3,
+        DCCPO_MAX_RESERVED = 31,
+        DCCPO_CHANGE_L = 32,
+        DCCPO_CONFIRM_L = 33,
+        DCCPO_CHANGE_R = 34,
+        DCCPO_CONFIRM_R = 35,
+        DCCPO_NDP_COUNT = 37,
+        DCCPO_ACK_VECTOR_0 = 38,
+        DCCPO_ACK_VECTOR_1 = 39,
+        DCCPO_TIMESTAMP = 41,
+        DCCPO_TIMESTAMP_ECHO = 42,
+        DCCPO_ELAPSED_TIME = 43,
+        DCCPO_MAX = 45,
+        DCCPO_MIN_RX_CCID_SPECIFIC = 128,       /* from sender to receiver */
+        DCCPO_MAX_RX_CCID_SPECIFIC = 191,
+        DCCPO_MIN_TX_CCID_SPECIFIC = 192,       /* from receiver to sender */
+        DCCPO_MAX_TX_CCID_SPECIFIC = 255,
+};
+/* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
+#define DCCP_SINGLE_OPT_MAXLEN  253
+
+/* DCCP CCIDS */
+enum {
+        DCCPC_CCID2 = 2,
+        DCCPC_CCID3 = 3,
+};
+
+/* DCCP features (RFC 4340 section 6.4) */
+enum dccp_feature_numbers {
+        DCCPF_RESERVED = 0,
+        DCCPF_CCID = 1,
+        DCCPF_SHORT_SEQNOS = 2,
+        DCCPF_SEQUENCE_WINDOW = 3,
+        DCCPF_ECN_INCAPABLE = 4,
+        DCCPF_ACK_RATIO = 5,
+        DCCPF_SEND_ACK_VECTOR = 6,
+        DCCPF_SEND_NDP_COUNT = 7,
+        DCCPF_MIN_CSUM_COVER = 8,
+        DCCPF_DATA_CHECKSUM = 9,
+        /* 10-127 reserved */
+        DCCPF_MIN_CCID_SPECIFIC = 128,
+        DCCPF_SEND_LEV_RATE = 192,      /* RFC 4342, sec. 8.4 */
+        DCCPF_MAX_CCID_SPECIFIC = 255,
+};
+
+/* DCCP socket control message types for cmsg */
+enum dccp_cmsg_type {
+        DCCP_SCM_PRIORITY = 1,
+        DCCP_SCM_QPOLICY_MAX = 0xFFFF,
+        /* ^-- Up to here reserved exclusively for qpolicy parameters */
+        DCCP_SCM_MAX
+};
+
+/* DCCP priorities for outgoing/queued packets */
+enum dccp_packet_dequeueing_policy {
+        DCCPQ_POLICY_SIMPLE,
+        DCCPQ_POLICY_PRIO,
+        DCCPQ_POLICY_MAX
+};
+
+/* DCCP socket options */
+#define DCCP_SOCKOPT_PACKET_SIZE        1 /* XXX deprecated, without effect */
+#define DCCP_SOCKOPT_SERVICE            2
+#define DCCP_SOCKOPT_CHANGE_L           3
+#define DCCP_SOCKOPT_CHANGE_R           4
+#define DCCP_SOCKOPT_GET_CUR_MPS        5
+#define DCCP_SOCKOPT_SERVER_TIMEWAIT    6
+#define DCCP_SOCKOPT_SEND_CSCOV         10
+#define DCCP_SOCKOPT_RECV_CSCOV         11
+#define DCCP_SOCKOPT_AVAILABLE_CCIDS    12
+#define DCCP_SOCKOPT_CCID               13
+#define DCCP_SOCKOPT_TX_CCID            14
+#define DCCP_SOCKOPT_RX_CCID            15
+#define DCCP_SOCKOPT_QPOLICY_ID         16
+#define DCCP_SOCKOPT_QPOLICY_TXQLEN     17
+#define DCCP_SOCKOPT_CCID_RX_INFO       128
+#define DCCP_SOCKOPT_CCID_TX_INFO       192
+
+/* maximum number of services provided on the same listening port */
+#define DCCP_SERVICE_LIST_MAX_LEN      32
+
+
+#endif /* _UAPI_LINUX_DCCP_H */
diff --git a/include/uapi/linux/dlm.h b/include/uapi/linux/dlm.h
new file mode 100644
index 000000000000..1f73cc06168f
--- /dev/null
+++ b/include/uapi/linux/dlm.h
@@ -0,0 +1,75 @@
+/******************************************************************************
+*******************************************************************************
+**
+**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
+**  Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
+**
+**  This copyrighted material is made available to anyone wishing to use,
+**  modify, copy, or redistribute it subject to the terms and conditions
+**  of the GNU General Public License v.2.
+**
+*******************************************************************************
+******************************************************************************/
+
+#ifndef _UAPI__DLM_DOT_H__
+#define _UAPI__DLM_DOT_H__
+
+/*
+ * Interface to Distributed Lock Manager (DLM)
+ * routines and structures to use DLM lockspaces
+ */
+
+/* Lock levels and flags are here */
+#include <linux/dlmconstants.h>
+#include <linux/types.h>
+
+typedef void dlm_lockspace_t;
+
+/*
+ * Lock status block
+ *
+ * Use this structure to specify the contents of the lock value block.  For a
+ * conversion request, this structure is used to specify the lock ID of the
+ * lock.  DLM writes the status of the lock request and the lock ID assigned
+ * to the request in the lock status block.
+ *
+ * sb_lkid: the returned lock ID.  It is set on new (non-conversion) requests.
+ * It is available when dlm_lock returns.
+ *
+ * sb_lvbptr: saves or returns the contents of the lock's LVB according to rules
+ * shown for the DLM_LKF_VALBLK flag.
+ *
+ * sb_flags: DLM_SBF_DEMOTED is returned if in the process of promoting a lock,
+ * it was first demoted to NL to avoid conversion deadlock.
+ * DLM_SBF_VALNOTVALID is returned if the resource's LVB is marked invalid.
+ *
+ * sb_status: the returned status of the lock request set prior to AST
+ * execution.  Possible return values:
+ *
+ * 0 if lock request was successful
+ * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE
+ * -DLM_EUNLOCK if unlock request was successful
+ * -DLM_ECANCEL if a cancel completed successfully
+ * -EDEADLK if a deadlock was detected
+ * -ETIMEDOUT if the lock request was canceled due to a timeout
+ */
+
+#define DLM_SBF_DEMOTED         0x01
+#define DLM_SBF_VALNOTVALID     0x02
+#define DLM_SBF_ALTMODE         0x04
+
+struct dlm_lksb {
+        int      sb_status;
+        __u32    sb_lkid;
+        char     sb_flags;
+        char *   sb_lvbptr;
+};
+
+/* dlm_new_lockspace() flags */
+
+#define DLM_LSFL_TIMEWARN       0x00000002
+#define DLM_LSFL_FS             0x00000004
+#define DLM_LSFL_NEWEXCL        0x00000008
+
+
+#endif /* _UAPI__DLM_DOT_H__ */
diff --git a/include/linux/dlm_device.h b/include/uapi/linux/dlm_device.h
index 3060783c4191..3060783c4191 100644
--- a/include/linux/dlm_device.h
+++ b/include/uapi/linux/dlm_device.h
diff --git a/include/linux/dlm_netlink.h b/include/uapi/linux/dlm_netlink.h
index 647c8ef27227..647c8ef27227 100644
--- a/include/linux/dlm_netlink.h
+++ b/include/uapi/linux/dlm_netlink.h
diff --git a/include/uapi/linux/dlm_plock.h b/include/uapi/linux/dlm_plock.h
new file mode 100644
index 000000000000..6ae692c909cb
--- /dev/null
+++ b/include/uapi/linux/dlm_plock.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ */
+
+#ifndef _UAPI__DLM_PLOCK_DOT_H__
+#define _UAPI__DLM_PLOCK_DOT_H__
+
+#include <linux/types.h>
+
+#define DLM_PLOCK_MISC_NAME             "dlm_plock"
+
+#define DLM_PLOCK_VERSION_MAJOR 1
+#define DLM_PLOCK_VERSION_MINOR 2
+#define DLM_PLOCK_VERSION_PATCH 0
+
+enum {
+        DLM_PLOCK_OP_LOCK = 1,
+        DLM_PLOCK_OP_UNLOCK,
+        DLM_PLOCK_OP_GET,
+};
+
+#define DLM_PLOCK_FL_CLOSE 1
+
+struct dlm_plock_info {
+        __u32 version[3];
+        __u8 optype;
+        __u8 ex;
+        __u8 wait;
+        __u8 flags;
+        __u32 pid;
+        __s32 nodeid;
+        __s32 rv;
+        __u32 fsid;
+        __u64 number;
+        __u64 start;
+        __u64 end;
+        __u64 owner;
+};
+
+
+#endif /* _UAPI__DLM_PLOCK_DOT_H__ */
diff --git a/include/linux/dlmconstants.h b/include/uapi/linux/dlmconstants.h
index 47bf08dc7566..47bf08dc7566 100644
--- a/include/linux/dlmconstants.h
+++ b/include/uapi/linux/dlmconstants.h
diff --git a/include/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 91e3a360f611..91e3a360f611 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
diff --git a/include/linux/dm-log-userspace.h b/include/uapi/linux/dm-log-userspace.h
index 0678c2adc421..0678c2adc421 100644
--- a/include/linux/dm-log-userspace.h
+++ b/include/uapi/linux/dm-log-userspace.h
diff --git a/include/linux/dn.h b/include/uapi/linux/dn.h
index 9c50445462d9..9c50445462d9 100644
--- a/include/linux/dn.h
+++ b/include/uapi/linux/dn.h
diff --git a/include/linux/dqblk_xfs.h b/include/uapi/linux/dqblk_xfs.h
index 86552807aed9..86552807aed9 100644
--- a/include/linux/dqblk_xfs.h
+++ b/include/uapi/linux/dqblk_xfs.h
diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild
index aafaa5aa54d4..d40942cfc627 100644
--- a/include/uapi/linux/dvb/Kbuild
+++ b/include/uapi/linux/dvb/Kbuild
@@ -1 +1,9 @@
 # UAPI Header export list
+header-y += audio.h
+header-y += ca.h
+header-y += dmx.h
+header-y += frontend.h
+header-y += net.h
+header-y += osd.h
+header-y += version.h
+header-y += video.h
diff --git a/include/linux/dvb/audio.h b/include/uapi/linux/dvb/audio.h
index d47bccd604e4..d47bccd604e4 100644
--- a/include/linux/dvb/audio.h
+++ b/include/uapi/linux/dvb/audio.h
diff --git a/include/linux/dvb/ca.h b/include/uapi/linux/dvb/ca.h
index c18537f3e449..c18537f3e449 100644
--- a/include/linux/dvb/ca.h
+++ b/include/uapi/linux/dvb/ca.h
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
new file mode 100644
index 000000000000..b2a9ad8cafdc
--- /dev/null
+++ b/include/uapi/linux/dvb/dmx.h
@@ -0,0 +1,155 @@
+/*
+ * dmx.h
+ *
+ * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
+ *                  & Ralph  Metzler <ralph@convergence.de>
+ *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+#ifndef _UAPI_DVBDMX_H_
+#define _UAPI_DVBDMX_H_
+
+#include <linux/types.h>
+#ifndef __KERNEL__
+#include <time.h>
+#endif
+
+
+#define DMX_FILTER_SIZE 16
+
+typedef enum
+{
+        DMX_OUT_DECODER, /* Streaming directly to decoder. */
+        DMX_OUT_TAP,     /* Output going to a memory buffer */
+                         /* (to be retrieved via the read command).*/
+        DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
+                         /* (to be retrieved by reading from the */
+                         /* logical DVR device).                 */
+        DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
+} dmx_output_t;
+
+
+typedef enum
+{
+        DMX_IN_FRONTEND, /* Input from a front-end device.  */
+        DMX_IN_DVR       /* Input from the logical DVR device.  */
+} dmx_input_t;
+
+
+typedef enum
+{
+        DMX_PES_AUDIO0,
+        DMX_PES_VIDEO0,
+        DMX_PES_TELETEXT0,
+        DMX_PES_SUBTITLE0,
+        DMX_PES_PCR0,
+
+        DMX_PES_AUDIO1,
+        DMX_PES_VIDEO1,
+        DMX_PES_TELETEXT1,
+        DMX_PES_SUBTITLE1,
+        DMX_PES_PCR1,
+
+        DMX_PES_AUDIO2,
+        DMX_PES_VIDEO2,
+        DMX_PES_TELETEXT2,
+        DMX_PES_SUBTITLE2,
+        DMX_PES_PCR2,
+
+        DMX_PES_AUDIO3,
+        DMX_PES_VIDEO3,
+        DMX_PES_TELETEXT3,
+        DMX_PES_SUBTITLE3,
+        DMX_PES_PCR3,
+
+        DMX_PES_OTHER
+} dmx_pes_type_t;
+
+#define DMX_PES_AUDIO    DMX_PES_AUDIO0
+#define DMX_PES_VIDEO    DMX_PES_VIDEO0
+#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
+#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
+#define DMX_PES_PCR      DMX_PES_PCR0
+
+
+typedef struct dmx_filter
+{
+        __u8  filter[DMX_FILTER_SIZE];
+        __u8  mask[DMX_FILTER_SIZE];
+        __u8  mode[DMX_FILTER_SIZE];
+} dmx_filter_t;
+
+
+struct dmx_sct_filter_params
+{
+        __u16          pid;
+        dmx_filter_t   filter;
+        __u32          timeout;
+        __u32          flags;
+#define DMX_CHECK_CRC       1
+#define DMX_ONESHOT         2
+#define DMX_IMMEDIATE_START 4
+#define DMX_KERNEL_CLIENT   0x8000
+};
+
+
+struct dmx_pes_filter_params
+{
+        __u16          pid;
+        dmx_input_t    input;
+        dmx_output_t   output;
+        dmx_pes_type_t pes_type;
+        __u32          flags;
+};
+
+typedef struct dmx_caps {
+        __u32 caps;
+        int num_decoders;
+} dmx_caps_t;
+
+typedef enum {
+        DMX_SOURCE_FRONT0 = 0,
+        DMX_SOURCE_FRONT1,
+        DMX_SOURCE_FRONT2,
+        DMX_SOURCE_FRONT3,
+        DMX_SOURCE_DVR0   = 16,
+        DMX_SOURCE_DVR1,
+        DMX_SOURCE_DVR2,
+        DMX_SOURCE_DVR3
+} dmx_source_t;
+
+struct dmx_stc {
+        unsigned int num;       /* input : which STC? 0..N */
+        unsigned int base;      /* output: divisor for stc to get 90 kHz clock */
+        __u64 stc;              /* output: stc in 'base'*90 kHz units */
+};
+
+
+#define DMX_START                _IO('o', 41)
+#define DMX_STOP                 _IO('o', 42)
+#define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)
+#define DMX_SET_PES_FILTER       _IOW('o', 44, struct dmx_pes_filter_params)
+#define DMX_SET_BUFFER_SIZE      _IO('o', 45)
+#define DMX_GET_PES_PIDS         _IOR('o', 47, __u16[5])
+#define DMX_GET_CAPS             _IOR('o', 48, dmx_caps_t)
+#define DMX_SET_SOURCE           _IOW('o', 49, dmx_source_t)
+#define DMX_GET_STC              _IOWR('o', 50, struct dmx_stc)
+#define DMX_ADD_PID              _IOW('o', 51, __u16)
+#define DMX_REMOVE_PID           _IOW('o', 52, __u16)
+
+#endif /* _UAPI_DVBDMX_H_ */
diff --git a/include/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
index f50d4058c5fb..c12d452cb40d 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -62,6 +62,7 @@ typedef enum fe_caps {
         FE_CAN_8VSB                     = 0x200000,
         FE_CAN_16VSB                    = 0x400000,
         FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
+        FE_CAN_MULTISTREAM              = 0x4000000,  /* frontend supports multistream filtering */
         FE_CAN_TURBO_FEC                = 0x8000000,  /* frontend supports "turbo fec modulation" */
         FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
         FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
@@ -121,16 +122,27 @@ typedef enum fe_sec_mini_cmd {
 } fe_sec_mini_cmd_t;
 
 
+/**
+ * enum fe_status - enumerates the possible frontend status
+ * @FE_HAS_SIGNAL:      found something above the noise level
+ * @FE_HAS_CARRIER:     found a DVB signal
+ * @FE_HAS_VITERBI:     FEC is stable
+ * @FE_HAS_SYNC:        found sync bytes
+ * @FE_HAS_LOCK:        everything's working
+ * @FE_TIMEDOUT:        no lock within the last ~2 seconds
+ * @FE_REINIT:          frontend was reinitialized, application is recommended
+ *                      to reset DiSEqC, tone and parameters
+ */
+
 typedef enum fe_status {
-        FE_HAS_SIGNAL   = 0x01,   /* found something above the noise level */
-        FE_HAS_CARRIER  = 0x02,   /* found a DVB signal  */
-        FE_HAS_VITERBI  = 0x04,   /* FEC is stable  */
-        FE_HAS_SYNC     = 0x08,   /* found sync bytes  */
-        FE_HAS_LOCK     = 0x10,   /* everything's working... */
-        FE_TIMEDOUT     = 0x20,   /* no lock within the last ~2 seconds */
-        FE_REINIT       = 0x40    /* frontend was reinitialized,  */
-} fe_status_t;                    /* application is recommended to reset */
-                                  /* DiSEqC, tone and parameters */
+        FE_HAS_SIGNAL           = 0x01,
+        FE_HAS_CARRIER          = 0x02,
+        FE_HAS_VITERBI          = 0x04,
+        FE_HAS_SYNC             = 0x08,
+        FE_HAS_LOCK             = 0x10,
+        FE_TIMEDOUT             = 0x20,
+        FE_REINIT               = 0x40,
+} fe_status_t;
 
 typedef enum fe_spectral_inversion {
         INVERSION_OFF,
@@ -152,6 +164,7 @@ typedef enum fe_code_rate {
         FEC_AUTO,
         FEC_3_5,
         FEC_9_10,
+        FEC_2_5,
 } fe_code_rate_t;
 
 
@@ -169,6 +182,7 @@ typedef enum fe_modulation {
         APSK_16,
         APSK_32,
         DQPSK,
+        QAM_4_NR,
 } fe_modulation_t;
 
 typedef enum fe_transmit_mode {
@@ -179,6 +193,8 @@ typedef enum fe_transmit_mode {
         TRANSMISSION_MODE_1K,
         TRANSMISSION_MODE_16K,
         TRANSMISSION_MODE_32K,
+        TRANSMISSION_MODE_C1,
+        TRANSMISSION_MODE_C3780,
 } fe_transmit_mode_t;
 
 #if defined(__DVB_CORE__) || !defined (__KERNEL__)
@@ -202,6 +218,9 @@ typedef enum fe_guard_interval {
         GUARD_INTERVAL_1_128,
         GUARD_INTERVAL_19_128,
         GUARD_INTERVAL_19_256,
+        GUARD_INTERVAL_PN420,
+        GUARD_INTERVAL_PN595,
+        GUARD_INTERVAL_PN945,
 } fe_guard_interval_t;
 
 
@@ -213,6 +232,12 @@ typedef enum fe_hierarchy {
         HIERARCHY_AUTO
 } fe_hierarchy_t;
 
+enum fe_interleaving {
+        INTERLEAVING_NONE,
+        INTERLEAVING_AUTO,
+        INTERLEAVING_240,
+        INTERLEAVING_720,
+};
 
 #if defined(__DVB_CORE__) || !defined (__KERNEL__)
 struct dvb_qpsk_parameters {
@@ -314,9 +339,9 @@ struct dvb_frontend_event {
 
 #define DTV_ISDBT_LAYER_ENABLED 41
 
-#define DTV_ISDBS_TS_ID         42
-
-#define DTV_DVBT2_PLP_ID        43
+#define DTV_STREAM_ID           42
+#define DTV_ISDBS_TS_ID_LEGACY  DTV_STREAM_ID
+#define DTV_DVBT2_PLP_ID_LEGACY 43
 
 #define DTV_ENUM_DELSYS         44
 
@@ -337,7 +362,10 @@ struct dvb_frontend_event {
 #define DTV_ATSCMH_SCCC_CODE_MODE_C     58
 #define DTV_ATSCMH_SCCC_CODE_MODE_D     59
 
-#define DTV_MAX_COMMAND                         DTV_ATSCMH_SCCC_CODE_MODE_D
+#define DTV_INTERLEAVING                        60
+#define DTV_LNA                                 61
+
+#define DTV_MAX_COMMAND                         DTV_LNA
 
 typedef enum fe_pilot {
         PILOT_ON,
@@ -366,7 +394,7 @@ typedef enum fe_delivery_system {
         SYS_ISDBC,
         SYS_ATSC,
         SYS_ATSCMH,
-        SYS_DMBTH,
+        SYS_DTMB,
         SYS_CMMB,
         SYS_DAB,
         SYS_DVBT2,
@@ -374,8 +402,9 @@ typedef enum fe_delivery_system {
         SYS_DVBC_ANNEX_C,
 } fe_delivery_system_t;
 
-
+/* backward compatibility */
 #define SYS_DVBC_ANNEX_AC       SYS_DVBC_ANNEX_A
+#define SYS_DMBTH SYS_DTMB /* DMB-TH is legacy name, use DTMB instead */
 
 /* ATSC-MH */
 
@@ -409,6 +438,8 @@ enum atscmh_rs_code_mode {
         ATSCMH_RSCODE_RES        = 3,
 };
 
+#define NO_STREAM_ID_FILTER     (~0U)
+#define LNA_AUTO                (~0U)
 
 struct dtv_cmds_h {
         char    *name;          /* A display name for debugging purposes */
diff --git a/include/linux/dvb/net.h b/include/uapi/linux/dvb/net.h
index f451e7eb0b0b..f451e7eb0b0b 100644
--- a/include/linux/dvb/net.h
+++ b/include/uapi/linux/dvb/net.h
diff --git a/include/linux/dvb/osd.h b/include/uapi/linux/dvb/osd.h
index 880e68435832..880e68435832 100644
--- a/include/linux/dvb/osd.h
+++ b/include/uapi/linux/dvb/osd.h
diff --git a/include/linux/dvb/version.h b/include/uapi/linux/dvb/version.h
index 43d9e8d462d4..827cce7e33e3 100644
--- a/include/linux/dvb/version.h
+++ b/include/uapi/linux/dvb/version.h
@@ -24,6 +24,6 @@
 #define _DVBVERSION_H_
 
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 6
+#define DVB_API_VERSION_MINOR 9
 
 #endif /*_DVBVERSION_H_*/
diff --git a/include/uapi/linux/dvb/video.h b/include/uapi/linux/dvb/video.h
new file mode 100644
index 000000000000..d3d14a59d2d5
--- /dev/null
+++ b/include/uapi/linux/dvb/video.h
@@ -0,0 +1,274 @@
+/*
+ * video.h
+ *
+ * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
+ *                  & Ralph  Metzler <ralph@convergence.de>
+ *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+#ifndef _UAPI_DVBVIDEO_H_
+#define _UAPI_DVBVIDEO_H_
+
+#include <linux/types.h>
+#ifndef __KERNEL__
+#include <stdint.h>
+#include <time.h>
+#endif
+
+typedef enum {
+        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
+        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
+        VIDEO_FORMAT_221_1    /* 2.21:1 */
+} video_format_t;
+
+
+typedef enum {
+         VIDEO_SYSTEM_PAL,
+         VIDEO_SYSTEM_NTSC,
+         VIDEO_SYSTEM_PALN,
+         VIDEO_SYSTEM_PALNc,
+         VIDEO_SYSTEM_PALM,
+         VIDEO_SYSTEM_NTSC60,
+         VIDEO_SYSTEM_PAL60,
+         VIDEO_SYSTEM_PALM60
+} video_system_t;
+
+
+typedef enum {
+        VIDEO_PAN_SCAN,       /* use pan and scan format */
+        VIDEO_LETTER_BOX,     /* use letterbox format */
+        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
+} video_displayformat_t;
+
+typedef struct {
+        int w;
+        int h;
+        video_format_t aspect_ratio;
+} video_size_t;
+
+typedef enum {
+        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
+        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
+                               comes from the user through the write
+                               system call */
+} video_stream_source_t;
+
+
+typedef enum {
+        VIDEO_STOPPED, /* Video is stopped */
+        VIDEO_PLAYING, /* Video is currently playing */
+        VIDEO_FREEZED  /* Video is freezed */
+} video_play_state_t;
+
+
+/* Decoder commands */
+#define VIDEO_CMD_PLAY        (0)
+#define VIDEO_CMD_STOP        (1)
+#define VIDEO_CMD_FREEZE      (2)
+#define VIDEO_CMD_CONTINUE    (3)
+
+/* Flags for VIDEO_CMD_FREEZE */
+#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
+
+/* Flags for VIDEO_CMD_STOP */
+#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
+#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
+
+/* Play input formats: */
+/* The decoder has no special format requirements */
+#define VIDEO_PLAY_FMT_NONE         (0)
+/* The decoder requires full GOPs */
+#define VIDEO_PLAY_FMT_GOP          (1)
+
+/* The structure must be zeroed before use by the application
+   This ensures it can be extended safely in the future. */
+struct video_command {
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u64 pts;
+                } stop;
+
+                struct {
+                        /* 0 or 1000 specifies normal speed,
+                           1 specifies forward single stepping,
+                           -1 specifies backward single stepping,
+                           >1: playback at speed/1000 of the normal speed,
+                           <-1: reverse playback at (-speed/1000) of the normal speed. */
+                        __s32 speed;
+                        __u32 format;
+                } play;
+
+                struct {
+                        __u32 data[16];
+                } raw;
+        };
+};
+
+/* FIELD_UNKNOWN can be used if the hardware does not know whether
+   the Vsync is for an odd, even or progressive (i.e. non-interlaced)
+   field. */
+#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
+#define VIDEO_VSYNC_FIELD_ODD           (1)
+#define VIDEO_VSYNC_FIELD_EVEN          (2)
+#define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)
+
+struct video_event {
+        __s32 type;
+#define VIDEO_EVENT_SIZE_CHANGED        1
+#define VIDEO_EVENT_FRAME_RATE_CHANGED  2
+#define VIDEO_EVENT_DECODER_STOPPED     3
+#define VIDEO_EVENT_VSYNC               4
+        __kernel_time_t timestamp;
+        union {
+                video_size_t size;
+                unsigned int frame_rate;        /* in frames per 1000sec */
+                unsigned char vsync_field;      /* unknown/odd/even/progressive */
+        } u;
+};
+
+
+struct video_status {
+        int                   video_blank;   /* blank video on freeze? */
+        video_play_state_t    play_state;    /* current state of playback */
+        video_stream_source_t stream_source; /* current source (demux/memory) */
+        video_format_t        video_format;  /* current aspect ratio of stream*/
+        video_displayformat_t display_format;/* selected cropping mode */
+};
+
+
+struct video_still_picture {
+        char __user *iFrame;        /* pointer to a single iframe in memory */
+        __s32 size;
+};
+
+
+typedef
+struct video_highlight {
+        int     active;      /*    1=show highlight, 0=hide highlight */
+        __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
+                             /*    3- 0  Background pixel contrast */
+        __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
+                             /*    3- 0  Emphasis pixel-1 contrast */
+        __u8    color1;      /*    7- 4  Pattern pixel color */
+                             /*    3- 0  Background pixel color */
+        __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
+                             /*    3- 0  Emphasis pixel-1 color */
+        __u32    ypos;       /*   23-22  auto action mode */
+                             /*   21-12  start y */
+                             /*    9- 0  end y */
+        __u32    xpos;       /*   23-22  button color number */
+                             /*   21-12  start x */
+                             /*    9- 0  end x */
+} video_highlight_t;
+
+
+typedef struct video_spu {
+        int active;
+        int stream_id;
+} video_spu_t;
+
+
+typedef struct video_spu_palette {      /* SPU Palette information */
+        int length;
+        __u8 __user *palette;
+} video_spu_palette_t;
+
+
+typedef struct video_navi_pack {
+        int length;          /* 0 ... 1024 */
+        __u8 data[1024];
+} video_navi_pack_t;
+
+
+typedef __u16 video_attributes_t;
+/*   bits: descr. */
+/*   15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
+/*   13-12 TV system (0=525/60, 1=625/50) */
+/*   11-10 Aspect ratio (0=4:3, 3=16:9) */
+/*    9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca */
+/*    7    line 21-1 data present in GOP (1=yes, 0=no) */
+/*    6    line 21-2 data present in GOP (1=yes, 0=no) */
+/*    5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 */
+/*    2    source letterboxed (1=yes, 0=no) */
+/*    0    film/camera mode (0=camera, 1=film (625/50 only)) */
+
+
+/* bit definitions for capabilities: */
+/* can the hardware decode MPEG1 and/or MPEG2? */
+#define VIDEO_CAP_MPEG1   1
+#define VIDEO_CAP_MPEG2   2
+/* can you send a system and/or program stream to video device?
+   (you still have to open the video and the audio device but only
+    send the stream to the video device) */
+#define VIDEO_CAP_SYS     4
+#define VIDEO_CAP_PROG    8
+/* can the driver also handle SPU, NAVI and CSS encoded data?
+   (CSS API is not present yet) */
+#define VIDEO_CAP_SPU    16
+#define VIDEO_CAP_NAVI   32
+#define VIDEO_CAP_CSS    64
+
+
+#define VIDEO_STOP                 _IO('o', 21)
+#define VIDEO_PLAY                 _IO('o', 22)
+#define VIDEO_FREEZE               _IO('o', 23)
+#define VIDEO_CONTINUE             _IO('o', 24)
+#define VIDEO_SELECT_SOURCE        _IO('o', 25)
+#define VIDEO_SET_BLANK            _IO('o', 26)
+#define VIDEO_GET_STATUS           _IOR('o', 27, struct video_status)
+#define VIDEO_GET_EVENT            _IOR('o', 28, struct video_event)
+#define VIDEO_SET_DISPLAY_FORMAT   _IO('o', 29)
+#define VIDEO_STILLPICTURE         _IOW('o', 30, struct video_still_picture)
+#define VIDEO_FAST_FORWARD         _IO('o', 31)
+#define VIDEO_SLOWMOTION           _IO('o', 32)
+#define VIDEO_GET_CAPABILITIES     _IOR('o', 33, unsigned int)
+#define VIDEO_CLEAR_BUFFER         _IO('o',  34)
+#define VIDEO_SET_ID               _IO('o', 35)
+#define VIDEO_SET_STREAMTYPE       _IO('o', 36)
+#define VIDEO_SET_FORMAT           _IO('o', 37)
+#define VIDEO_SET_SYSTEM           _IO('o', 38)
+#define VIDEO_SET_HIGHLIGHT        _IOW('o', 39, video_highlight_t)
+#define VIDEO_SET_SPU              _IOW('o', 50, video_spu_t)
+#define VIDEO_SET_SPU_PALETTE      _IOW('o', 51, video_spu_palette_t)
+#define VIDEO_GET_NAVI             _IOR('o', 52, video_navi_pack_t)
+#define VIDEO_SET_ATTRIBUTES       _IO('o', 53)
+#define VIDEO_GET_SIZE             _IOR('o', 55, video_size_t)
+#define VIDEO_GET_FRAME_RATE       _IOR('o', 56, unsigned int)
+
+/**
+ * VIDEO_GET_PTS
+ *
+ * Read the 33 bit presentation time stamp as defined
+ * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
+ *
+ * The PTS should belong to the currently played
+ * frame if possible, but may also be a value close to it
+ * like the PTS of the last decoded frame or the last PTS
+ * extracted by the PES parser.
+ */
+#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
+
+/* Read the number of displayed frames since the decoder was started */
+#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
+
+#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
+#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
+
+#endif /* _UAPI_DVBVIDEO_H_ */
diff --git a/include/uapi/linux/edd.h b/include/uapi/linux/edd.h
new file mode 100644
index 000000000000..89240a04e4c8
--- /dev/null
+++ b/include/uapi/linux/edd.h
@@ -0,0 +1,191 @@
+/*
+ * linux/include/linux/edd.h
+ *  Copyright (C) 2002, 2003, 2004 Dell Inc.
+ *  by Matt Domsch <Matt_Domsch@dell.com>
+ *
+ * structures and definitions for the int 13h, ax={41,48}h
+ * BIOS Enhanced Disk Drive Services
+ * This is based on the T13 group document D1572 Revision 0 (August 14 2002)
+ * available at http://www.t13.org/docs2002/d1572r0.pdf.  It is
+ * very similar to D1484 Revision 3 http://www.t13.org/docs2002/d1484r3.pdf
+ *
+ * In a nutshell, arch/{i386,x86_64}/boot/setup.S populates a scratch
+ * table in the boot_params that contains a list of BIOS-enumerated
+ * boot devices.
+ * In arch/{i386,x86_64}/kernel/setup.c, this information is
+ * transferred into the edd structure, and in drivers/firmware/edd.c, that
+ * information is used to identify BIOS boot disk.  The code in setup.S
+ * is very sensitive to the size of these structures.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 as published by
+ * the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef _UAPI_LINUX_EDD_H
+#define _UAPI_LINUX_EDD_H
+
+#include <linux/types.h>
+
+#define EDDNR 0x1e9             /* addr of number of edd_info structs at EDDBUF
+                                   in boot_params - treat this as 1 byte  */
+#define EDDBUF  0xd00           /* addr of edd_info structs in boot_params */
+#define EDDMAXNR 6              /* number of edd_info structs starting at EDDBUF  */
+#define EDDEXTSIZE 8            /* change these if you muck with the structures */
+#define EDDPARMSIZE 74
+#define CHECKEXTENSIONSPRESENT 0x41
+#define GETDEVICEPARAMETERS 0x48
+#define LEGACYGETDEVICEPARAMETERS 0x08
+#define EDDMAGIC1 0x55AA
+#define EDDMAGIC2 0xAA55
+
+
+#define READ_SECTORS 0x02         /* int13 AH=0x02 is READ_SECTORS command */
+#define EDD_MBR_SIG_OFFSET 0x1B8  /* offset of signature in the MBR */
+#define EDD_MBR_SIG_BUF    0x290  /* addr in boot params */
+#define EDD_MBR_SIG_MAX 16        /* max number of signatures to store */
+#define EDD_MBR_SIG_NR_BUF 0x1ea  /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
+                                     in boot_params - treat this as 1 byte  */
+
+#ifndef __ASSEMBLY__
+
+#define EDD_EXT_FIXED_DISK_ACCESS           (1 << 0)
+#define EDD_EXT_DEVICE_LOCKING_AND_EJECTING (1 << 1)
+#define EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT (1 << 2)
+#define EDD_EXT_64BIT_EXTENSIONS            (1 << 3)
+
+#define EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT (1 << 0)
+#define EDD_INFO_GEOMETRY_VALID                (1 << 1)
+#define EDD_INFO_REMOVABLE                     (1 << 2)
+#define EDD_INFO_WRITE_VERIFY                  (1 << 3)
+#define EDD_INFO_MEDIA_CHANGE_NOTIFICATION     (1 << 4)
+#define EDD_INFO_LOCKABLE                      (1 << 5)
+#define EDD_INFO_NO_MEDIA_PRESENT              (1 << 6)
+#define EDD_INFO_USE_INT13_FN50                (1 << 7)
+
+struct edd_device_params {
+        __u16 length;
+        __u16 info_flags;
+        __u32 num_default_cylinders;
+        __u32 num_default_heads;
+        __u32 sectors_per_track;
+        __u64 number_of_sectors;
+        __u16 bytes_per_sector;
+        __u32 dpte_ptr;         /* 0xFFFFFFFF for our purposes */
+        __u16 key;              /* = 0xBEDD */
+        __u8 device_path_info_length;   /* = 44 */
+        __u8 reserved2;
+        __u16 reserved3;
+        __u8 host_bus_type[4];
+        __u8 interface_type[8];
+        union {
+                struct {
+                        __u16 base_address;
+                        __u16 reserved1;
+                        __u32 reserved2;
+                } __attribute__ ((packed)) isa;
+                struct {
+                        __u8 bus;
+                        __u8 slot;
+                        __u8 function;
+                        __u8 channel;
+                        __u32 reserved;
+                } __attribute__ ((packed)) pci;
+                /* pcix is same as pci */
+                struct {
+                        __u64 reserved;
+                } __attribute__ ((packed)) ibnd;
+                struct {
+                        __u64 reserved;
+                } __attribute__ ((packed)) xprs;
+                struct {
+                        __u64 reserved;
+                } __attribute__ ((packed)) htpt;
+                struct {
+                        __u64 reserved;
+                } __attribute__ ((packed)) unknown;
+        } interface_path;
+        union {
+                struct {
+                        __u8 device;
+                        __u8 reserved1;
+                        __u16 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
+                } __attribute__ ((packed)) ata;
+                struct {
+                        __u8 device;
+                        __u8 lun;
+                        __u8 reserved1;
+                        __u8 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
+                } __attribute__ ((packed)) atapi;
+                struct {
+                        __u16 id;
+                        __u64 lun;
+                        __u16 reserved1;
+                        __u32 reserved2;
+                } __attribute__ ((packed)) scsi;
+                struct {
+                        __u64 serial_number;
+                        __u64 reserved;
+                } __attribute__ ((packed)) usb;
+                struct {
+                        __u64 eui;
+                        __u64 reserved;
+                } __attribute__ ((packed)) i1394;
+                struct {
+                        __u64 wwid;
+                        __u64 lun;
+                } __attribute__ ((packed)) fibre;
+                struct {
+                        __u64 identity_tag;
+                        __u64 reserved;
+                } __attribute__ ((packed)) i2o;
+                struct {
+                        __u32 array_number;
+                        __u32 reserved1;
+                        __u64 reserved2;
+                } __attribute__ ((packed)) raid;
+                struct {
+                        __u8 device;
+                        __u8 reserved1;
+                        __u16 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
+                } __attribute__ ((packed)) sata;
+                struct {
+                        __u64 reserved1;
+                        __u64 reserved2;
+                } __attribute__ ((packed)) unknown;
+        } device_path;
+        __u8 reserved4;
+        __u8 checksum;
+} __attribute__ ((packed));
+
+struct edd_info {
+        __u8 device;
+        __u8 version;
+        __u16 interface_support;
+        __u16 legacy_max_cylinder;
+        __u8 legacy_max_head;
+        __u8 legacy_sectors_per_track;
+        struct edd_device_params params;
+} __attribute__ ((packed));
+
+struct edd {
+        unsigned int mbr_signature[EDD_MBR_SIG_MAX];
+        struct edd_info edd_info[EDDMAXNR];
+        unsigned char mbr_signature_nr;
+        unsigned char edd_info_nr;
+};
+
+#endif                          /*!__ASSEMBLY__ */
+
+#endif /* _UAPI_LINUX_EDD_H */
diff --git a/include/linux/efs_fs_sb.h b/include/uapi/linux/efs_fs_sb.h
index a01be90c58cc..a01be90c58cc 100644
--- a/include/linux/efs_fs_sb.h
+++ b/include/uapi/linux/efs_fs_sb.h
diff --git a/include/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 8e2b7bac4378..8e2b7bac4378 100644
--- a/include/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h
new file mode 100644
index 000000000000..3921e33aec8e
--- /dev/null
+++ b/include/uapi/linux/elf-fdpic.h
@@ -0,0 +1,34 @@
+/* elf-fdpic.h: FDPIC ELF load map
+ *
+ * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_ELF_FDPIC_H
+#define _UAPI_LINUX_ELF_FDPIC_H
+
+#include <linux/elf.h>
+
+#define PT_GNU_STACK    (PT_LOOS + 0x474e551)
+
+/* segment mappings for ELF FDPIC libraries/executables/interpreters */
+struct elf32_fdpic_loadseg {
+        Elf32_Addr      addr;           /* core address to which mapped */
+        Elf32_Addr      p_vaddr;        /* VMA recorded in file */
+        Elf32_Word      p_memsz;        /* allocation size recorded in file */
+};
+
+struct elf32_fdpic_loadmap {
+        Elf32_Half      version;        /* version of these structures, just in case... */
+        Elf32_Half      nsegs;          /* number of segments */
+        struct elf32_fdpic_loadseg segs[];
+};
+
+#define ELF32_FDPIC_LOADMAP_VERSION     0x0000
+
+#endif /* _UAPI_LINUX_ELF_FDPIC_H */
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
new file mode 100644
index 000000000000..126a8175e3e2
--- /dev/null
+++ b/include/uapi/linux/elf.h
@@ -0,0 +1,414 @@
+#ifndef _UAPI_LINUX_ELF_H
+#define _UAPI_LINUX_ELF_H
+
+#include <linux/types.h>
+#include <linux/elf-em.h>
+
+/* 32-bit ELF base types. */
+typedef __u32   Elf32_Addr;
+typedef __u16   Elf32_Half;
+typedef __u32   Elf32_Off;
+typedef __s32   Elf32_Sword;
+typedef __u32   Elf32_Word;
+
+/* 64-bit ELF base types. */
+typedef __u64   Elf64_Addr;
+typedef __u16   Elf64_Half;
+typedef __s16   Elf64_SHalf;
+typedef __u64   Elf64_Off;
+typedef __s32   Elf64_Sword;
+typedef __u32   Elf64_Word;
+typedef __u64   Elf64_Xword;
+typedef __s64   Elf64_Sxword;
+
+/* These constants are for the segment types stored in the image headers */
+#define PT_NULL    0
+#define PT_LOAD    1
+#define PT_DYNAMIC 2
+#define PT_INTERP  3
+#define PT_NOTE    4
+#define PT_SHLIB   5
+#define PT_PHDR    6
+#define PT_TLS     7               /* Thread local storage segment */
+#define PT_LOOS    0x60000000      /* OS-specific */
+#define PT_HIOS    0x6fffffff      /* OS-specific */
+#define PT_LOPROC  0x70000000
+#define PT_HIPROC  0x7fffffff
+#define PT_GNU_EH_FRAME         0x6474e550
+
+#define PT_GNU_STACK    (PT_LOOS + 0x474e551)
+
+/*
+ * Extended Numbering
+ *
+ * If the real number of program header table entries is larger than
+ * or equal to PN_XNUM(0xffff), it is set to sh_info field of the
+ * section header at index 0, and PN_XNUM is set to e_phnum
+ * field. Otherwise, the section header at index 0 is zero
+ * initialized, if it exists.
+ *
+ * Specifications are available in:
+ *
+ * - Sun microsystems: Linker and Libraries.
+ *   Part No: 817-1984-17, September 2008.
+ *   URL: http://docs.sun.com/app/docs/doc/817-1984
+ *
+ * - System V ABI AMD64 Architecture Processor Supplement
+ *   Draft Version 0.99.,
+ *   May 11, 2009.
+ *   URL: http://www.x86-64.org/
+ */
+#define PN_XNUM 0xffff
+
+/* These constants define the different elf file types */
+#define ET_NONE   0
+#define ET_REL    1
+#define ET_EXEC   2
+#define ET_DYN    3
+#define ET_CORE   4
+#define ET_LOPROC 0xff00
+#define ET_HIPROC 0xffff
+
+/* This is the info that is needed to parse the dynamic section of the file */
+#define DT_NULL         0
+#define DT_NEEDED       1
+#define DT_PLTRELSZ     2
+#define DT_PLTGOT       3
+#define DT_HASH         4
+#define DT_STRTAB       5
+#define DT_SYMTAB       6
+#define DT_RELA         7
+#define DT_RELASZ       8
+#define DT_RELAENT      9
+#define DT_STRSZ        10
+#define DT_SYMENT       11
+#define DT_INIT         12
+#define DT_FINI         13
+#define DT_SONAME       14
+#define DT_RPATH        15
+#define DT_SYMBOLIC     16
+#define DT_REL          17
+#define DT_RELSZ        18
+#define DT_RELENT       19
+#define DT_PLTREL       20
+#define DT_DEBUG        21
+#define DT_TEXTREL      22
+#define DT_JMPREL       23
+#define DT_ENCODING     32
+#define OLD_DT_LOOS     0x60000000
+#define DT_LOOS         0x6000000d
+#define DT_HIOS         0x6ffff000
+#define DT_VALRNGLO     0x6ffffd00
+#define DT_VALRNGHI     0x6ffffdff
+#define DT_ADDRRNGLO    0x6ffffe00
+#define DT_ADDRRNGHI    0x6ffffeff
+#define DT_VERSYM       0x6ffffff0
+#define DT_RELACOUNT    0x6ffffff9
+#define DT_RELCOUNT     0x6ffffffa
+#define DT_FLAGS_1      0x6ffffffb
+#define DT_VERDEF       0x6ffffffc
+#define DT_VERDEFNUM    0x6ffffffd
+#define DT_VERNEED      0x6ffffffe
+#define DT_VERNEEDNUM   0x6fffffff
+#define OLD_DT_HIOS     0x6fffffff
+#define DT_LOPROC       0x70000000
+#define DT_HIPROC       0x7fffffff
+
+/* This info is needed when parsing the symbol table */
+#define STB_LOCAL  0
+#define STB_GLOBAL 1
+#define STB_WEAK   2
+
+#define STT_NOTYPE  0
+#define STT_OBJECT  1
+#define STT_FUNC    2
+#define STT_SECTION 3
+#define STT_FILE    4
+#define STT_COMMON  5
+#define STT_TLS     6
+
+#define ELF_ST_BIND(x)          ((x) >> 4)
+#define ELF_ST_TYPE(x)          (((unsigned int) x) & 0xf)
+#define ELF32_ST_BIND(x)        ELF_ST_BIND(x)
+#define ELF32_ST_TYPE(x)        ELF_ST_TYPE(x)
+#define ELF64_ST_BIND(x)        ELF_ST_BIND(x)
+#define ELF64_ST_TYPE(x)        ELF_ST_TYPE(x)
+
+typedef struct dynamic{
+  Elf32_Sword d_tag;
+  union{
+    Elf32_Sword d_val;
+    Elf32_Addr  d_ptr;
+  } d_un;
+} Elf32_Dyn;
+
+typedef struct {
+  Elf64_Sxword d_tag;           /* entry tag value */
+  union {
+    Elf64_Xword d_val;
+    Elf64_Addr d_ptr;
+  } d_un;
+} Elf64_Dyn;
+
+/* The following are used with relocations */
+#define ELF32_R_SYM(x) ((x) >> 8)
+#define ELF32_R_TYPE(x) ((x) & 0xff)
+
+#define ELF64_R_SYM(i)                  ((i) >> 32)
+#define ELF64_R_TYPE(i)                 ((i) & 0xffffffff)
+
+typedef struct elf32_rel {
+  Elf32_Addr    r_offset;
+  Elf32_Word    r_info;
+} Elf32_Rel;
+
+typedef struct elf64_rel {
+  Elf64_Addr r_offset;  /* Location at which to apply the action */
+  Elf64_Xword r_info;   /* index and type of relocation */
+} Elf64_Rel;
+
+typedef struct elf32_rela{
+  Elf32_Addr    r_offset;
+  Elf32_Word    r_info;
+  Elf32_Sword   r_addend;
+} Elf32_Rela;
+
+typedef struct elf64_rela {
+  Elf64_Addr r_offset;  /* Location at which to apply the action */
+  Elf64_Xword r_info;   /* index and type of relocation */
+  Elf64_Sxword r_addend;        /* Constant addend used to compute value */
+} Elf64_Rela;
+
+typedef struct elf32_sym{
+  Elf32_Word    st_name;
+  Elf32_Addr    st_value;
+  Elf32_Word    st_size;
+  unsigned char st_info;
+  unsigned char st_other;
+  Elf32_Half    st_shndx;
+} Elf32_Sym;
+
+typedef struct elf64_sym {
+  Elf64_Word st_name;           /* Symbol name, index in string tbl */
+  unsigned char st_info;        /* Type and binding attributes */
+  unsigned char st_other;       /* No defined meaning, 0 */
+  Elf64_Half st_shndx;          /* Associated section index */
+  Elf64_Addr st_value;          /* Value of the symbol */
+  Elf64_Xword st_size;          /* Associated symbol size */
+} Elf64_Sym;
+
+
+#define EI_NIDENT       16
+
+typedef struct elf32_hdr{
+  unsigned char e_ident[EI_NIDENT];
+  Elf32_Half    e_type;
+  Elf32_Half    e_machine;
+  Elf32_Word    e_version;
+  Elf32_Addr    e_entry;  /* Entry point */
+  Elf32_Off     e_phoff;
+  Elf32_Off     e_shoff;
+  Elf32_Word    e_flags;
+  Elf32_Half    e_ehsize;
+  Elf32_Half    e_phentsize;
+  Elf32_Half    e_phnum;
+  Elf32_Half    e_shentsize;
+  Elf32_Half    e_shnum;
+  Elf32_Half    e_shstrndx;
+} Elf32_Ehdr;
+
+typedef struct elf64_hdr {
+  unsigned char e_ident[EI_NIDENT];     /* ELF "magic number" */
+  Elf64_Half e_type;
+  Elf64_Half e_machine;
+  Elf64_Word e_version;
+  Elf64_Addr e_entry;           /* Entry point virtual address */
+  Elf64_Off e_phoff;            /* Program header table file offset */
+  Elf64_Off e_shoff;            /* Section header table file offset */
+  Elf64_Word e_flags;
+  Elf64_Half e_ehsize;
+  Elf64_Half e_phentsize;
+  Elf64_Half e_phnum;
+  Elf64_Half e_shentsize;
+  Elf64_Half e_shnum;
+  Elf64_Half e_shstrndx;
+} Elf64_Ehdr;
+
+/* These constants define the permissions on sections in the program
+   header, p_flags. */
+#define PF_R            0x4
+#define PF_W            0x2
+#define PF_X            0x1
+
+typedef struct elf32_phdr{
+  Elf32_Word    p_type;
+  Elf32_Off     p_offset;
+  Elf32_Addr    p_vaddr;
+  Elf32_Addr    p_paddr;
+  Elf32_Word    p_filesz;
+  Elf32_Word    p_memsz;
+  Elf32_Word    p_flags;
+  Elf32_Word    p_align;
+} Elf32_Phdr;
+
+typedef struct elf64_phdr {
+  Elf64_Word p_type;
+  Elf64_Word p_flags;
+  Elf64_Off p_offset;           /* Segment file offset */
+  Elf64_Addr p_vaddr;           /* Segment virtual address */
+  Elf64_Addr p_paddr;           /* Segment physical address */
+  Elf64_Xword p_filesz;         /* Segment size in file */
+  Elf64_Xword p_memsz;          /* Segment size in memory */
+  Elf64_Xword p_align;          /* Segment alignment, file & memory */
+} Elf64_Phdr;
+
+/* sh_type */
+#define SHT_NULL        0
+#define SHT_PROGBITS    1
+#define SHT_SYMTAB      2
+#define SHT_STRTAB      3
+#define SHT_RELA        4
+#define SHT_HASH        5
+#define SHT_DYNAMIC     6
+#define SHT_NOTE        7
+#define SHT_NOBITS      8
+#define SHT_REL         9
+#define SHT_SHLIB       10
+#define SHT_DYNSYM      11
+#define SHT_NUM         12
+#define SHT_LOPROC      0x70000000
+#define SHT_HIPROC      0x7fffffff
+#define SHT_LOUSER      0x80000000
+#define SHT_HIUSER      0xffffffff
+
+/* sh_flags */
+#define SHF_WRITE       0x1
+#define SHF_ALLOC       0x2
+#define SHF_EXECINSTR   0x4
+#define SHF_MASKPROC    0xf0000000
+
+/* special section indexes */
+#define SHN_UNDEF       0
+#define SHN_LORESERVE   0xff00
+#define SHN_LOPROC      0xff00
+#define SHN_HIPROC      0xff1f
+#define SHN_ABS         0xfff1
+#define SHN_COMMON      0xfff2
+#define SHN_HIRESERVE   0xffff
+ 
+typedef struct elf32_shdr {
+  Elf32_Word    sh_name;
+  Elf32_Word    sh_type;
+  Elf32_Word    sh_flags;
+  Elf32_Addr    sh_addr;
+  Elf32_Off     sh_offset;
+  Elf32_Word    sh_size;
+  Elf32_Word    sh_link;
+  Elf32_Word    sh_info;
+  Elf32_Word    sh_addralign;
+  Elf32_Word    sh_entsize;
+} Elf32_Shdr;
+
+typedef struct elf64_shdr {
+  Elf64_Word sh_name;           /* Section name, index in string tbl */
+  Elf64_Word sh_type;           /* Type of section */
+  Elf64_Xword sh_flags;         /* Miscellaneous section attributes */
+  Elf64_Addr sh_addr;           /* Section virtual addr at execution */
+  Elf64_Off sh_offset;          /* Section file offset */
+  Elf64_Xword sh_size;          /* Size of section in bytes */
+  Elf64_Word sh_link;           /* Index of another section */
+  Elf64_Word sh_info;           /* Additional section information */
+  Elf64_Xword sh_addralign;     /* Section alignment */
+  Elf64_Xword sh_entsize;       /* Entry size if section holds table */
+} Elf64_Shdr;
+
+#define EI_MAG0         0               /* e_ident[] indexes */
+#define EI_MAG1         1
+#define EI_MAG2         2
+#define EI_MAG3         3
+#define EI_CLASS        4
+#define EI_DATA         5
+#define EI_VERSION      6
+#define EI_OSABI        7
+#define EI_PAD          8
+
+#define ELFMAG0         0x7f            /* EI_MAG */
+#define ELFMAG1         'E'
+#define ELFMAG2         'L'
+#define ELFMAG3         'F'
+#define ELFMAG          "\177ELF"
+#define SELFMAG         4
+
+#define ELFCLASSNONE    0               /* EI_CLASS */
+#define ELFCLASS32      1
+#define ELFCLASS64      2
+#define ELFCLASSNUM     3
+
+#define ELFDATANONE     0               /* e_ident[EI_DATA] */
+#define ELFDATA2LSB     1
+#define ELFDATA2MSB     2
+
+#define EV_NONE         0               /* e_version, EI_VERSION */
+#define EV_CURRENT      1
+#define EV_NUM          2
+
+#define ELFOSABI_NONE   0
+#define ELFOSABI_LINUX  3
+
+#ifndef ELF_OSABI
+#define ELF_OSABI ELFOSABI_NONE
+#endif
+
+/*
+ * Notes used in ET_CORE. Architectures export some of the arch register sets
+ * using the corresponding note types via the PTRACE_GETREGSET and
+ * PTRACE_SETREGSET requests.
+ */
+#define NT_PRSTATUS     1
+#define NT_PRFPREG      2
+#define NT_PRPSINFO     3
+#define NT_TASKSTRUCT   4
+#define NT_AUXV         6
+/*
+ * Note to userspace developers: size of NT_SIGINFO note may increase
+ * in the future to accomodate more fields, don't assume it is fixed!
+ */
+#define NT_SIGINFO      0x53494749
+#define NT_FILE         0x46494c45
+#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
+#define NT_PPC_VMX      0x100           /* PowerPC Altivec/VMX registers */
+#define NT_PPC_SPE      0x101           /* PowerPC SPE/EVR registers */
+#define NT_PPC_VSX      0x102           /* PowerPC VSX registers */
+#define NT_386_TLS      0x200           /* i386 TLS slots (struct user_desc) */
+#define NT_386_IOPERM   0x201           /* x86 io permission bitmap (1=deny) */
+#define NT_X86_XSTATE   0x202           /* x86 extended state using xsave */
+#define NT_S390_HIGH_GPRS       0x300   /* s390 upper register halves */
+#define NT_S390_TIMER   0x301           /* s390 timer register */
+#define NT_S390_TODCMP  0x302           /* s390 TOD clock comparator register */
+#define NT_S390_TODPREG 0x303           /* s390 TOD programmable register */
+#define NT_S390_CTRS    0x304           /* s390 control registers */
+#define NT_S390_PREFIX  0x305           /* s390 prefix register */
+#define NT_S390_LAST_BREAK      0x306   /* s390 breaking event address */
+#define NT_S390_SYSTEM_CALL     0x307   /* s390 system call restart data */
+#define NT_S390_TDB     0x308           /* s390 transaction diagnostic block */
+#define NT_ARM_VFP      0x400           /* ARM VFP/NEON registers */
+#define NT_ARM_TLS      0x401           /* ARM TLS register */
+#define NT_ARM_HW_BREAK 0x402           /* ARM hardware breakpoint registers */
+#define NT_ARM_HW_WATCH 0x403           /* ARM hardware watchpoint registers */
+
+
+/* Note header in a PT_NOTE section */
+typedef struct elf32_note {
+  Elf32_Word    n_namesz;       /* Name size */
+  Elf32_Word    n_descsz;       /* Content size */
+  Elf32_Word    n_type;         /* Content type */
+} Elf32_Nhdr;
+
+/* Note header in a PT_NOTE section */
+typedef struct elf64_note {
+  Elf64_Word n_namesz;  /* Name size */
+  Elf64_Word n_descsz;  /* Content size */
+  Elf64_Word n_type;    /* Content type */
+} Elf64_Nhdr;
+
+#endif /* _UAPI_LINUX_ELF_H */
diff --git a/include/uapi/linux/elfcore.h b/include/uapi/linux/elfcore.h
new file mode 100644
index 000000000000..569737cfb557
--- /dev/null
+++ b/include/uapi/linux/elfcore.h
@@ -0,0 +1,100 @@
+#ifndef _UAPI_LINUX_ELFCORE_H
+#define _UAPI_LINUX_ELFCORE_H
+
+#include <linux/types.h>
+#include <linux/signal.h>
+#include <linux/time.h>
+#include <linux/ptrace.h>
+#include <linux/elf.h>
+#include <linux/fs.h>
+
+struct elf_siginfo
+{
+        int     si_signo;                       /* signal number */
+        int     si_code;                        /* extra code */
+        int     si_errno;                       /* errno */
+};
+
+
+#ifndef __KERNEL__
+typedef elf_greg_t greg_t;
+typedef elf_gregset_t gregset_t;
+typedef elf_fpregset_t fpregset_t;
+typedef elf_fpxregset_t fpxregset_t;
+#define NGREG ELF_NGREG
+#endif
+
+/*
+ * Definitions to generate Intel SVR4-like core files.
+ * These mostly have the same names as the SVR4 types with "elf_"
+ * tacked on the front to prevent clashes with linux definitions,
+ * and the typedef forms have been avoided.  This is mostly like
+ * the SVR4 structure, but more Linuxy, with things that Linux does
+ * not support and which gdb doesn't really use excluded.
+ * Fields present but not used are marked with "XXX".
+ */
+struct elf_prstatus
+{
+#if 0
+        long    pr_flags;       /* XXX Process flags */
+        short   pr_why;         /* XXX Reason for process halt */
+        short   pr_what;        /* XXX More detailed reason */
+#endif
+        struct elf_siginfo pr_info;     /* Info associated with signal */
+        short   pr_cursig;              /* Current signal */
+        unsigned long pr_sigpend;       /* Set of pending signals */
+        unsigned long pr_sighold;       /* Set of held signals */
+#if 0
+        struct sigaltstack pr_altstack; /* Alternate stack info */
+        struct sigaction pr_action;     /* Signal action for current sig */
+#endif
+        pid_t   pr_pid;
+        pid_t   pr_ppid;
+        pid_t   pr_pgrp;
+        pid_t   pr_sid;
+        struct timeval pr_utime;        /* User time */
+        struct timeval pr_stime;        /* System time */
+        struct timeval pr_cutime;       /* Cumulative user time */
+        struct timeval pr_cstime;       /* Cumulative system time */
+#if 0
+        long    pr_instr;               /* Current instruction */
+#endif
+        elf_gregset_t pr_reg;   /* GP registers */
+#ifdef CONFIG_BINFMT_ELF_FDPIC
+        /* When using FDPIC, the loadmap addresses need to be communicated
+         * to GDB in order for GDB to do the necessary relocations.  The
+         * fields (below) used to communicate this information are placed
+         * immediately after ``pr_reg'', so that the loadmap addresses may
+         * be viewed as part of the register set if so desired.
+         */
+        unsigned long pr_exec_fdpic_loadmap;
+        unsigned long pr_interp_fdpic_loadmap;
+#endif
+        int pr_fpvalid;         /* True if math co-processor being used.  */
+};
+
+#define ELF_PRARGSZ     (80)    /* Number of chars for args */
+
+struct elf_prpsinfo
+{
+        char    pr_state;       /* numeric process state */
+        char    pr_sname;       /* char for pr_state */
+        char    pr_zomb;        /* zombie */
+        char    pr_nice;        /* nice val */
+        unsigned long pr_flag;  /* flags */
+        __kernel_uid_t  pr_uid;
+        __kernel_gid_t  pr_gid;
+        pid_t   pr_pid, pr_ppid, pr_pgrp, pr_sid;
+        /* Lots missing */
+        char    pr_fname[16];   /* filename of executable */
+        char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
+};
+
+#ifndef __KERNEL__
+typedef struct elf_prstatus prstatus_t;
+typedef struct elf_prpsinfo prpsinfo_t;
+#define PRARGSZ ELF_PRARGSZ 
+#endif
+
+
+#endif /* _UAPI_LINUX_ELFCORE_H */
diff --git a/include/uapi/linux/errno.h b/include/uapi/linux/errno.h
new file mode 100644
index 000000000000..70f2bd34e335
--- /dev/null
+++ b/include/uapi/linux/errno.h
@@ -0,0 +1 @@
+#include <asm/errno.h>
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
new file mode 100644
index 000000000000..aacd4fb7102a
--- /dev/null
+++ b/include/uapi/linux/errqueue.h
@@ -0,0 +1,26 @@
+#ifndef _UAPI_LINUX_ERRQUEUE_H
+#define _UAPI_LINUX_ERRQUEUE_H
+
+#include <linux/types.h>
+
+struct sock_extended_err {
+        __u32   ee_errno;       
+        __u8    ee_origin;
+        __u8    ee_type;
+        __u8    ee_code;
+        __u8    ee_pad;
+        __u32   ee_info;
+        __u32   ee_data;
+};
+
+#define SO_EE_ORIGIN_NONE       0
+#define SO_EE_ORIGIN_LOCAL      1
+#define SO_EE_ORIGIN_ICMP       2
+#define SO_EE_ORIGIN_ICMP6      3
+#define SO_EE_ORIGIN_TXSTATUS   4
+#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
+
+#define SO_EE_OFFENDER(ee)      ((struct sockaddr*)((ee)+1))
+
+
+#endif /* _UAPI_LINUX_ERRQUEUE_H */
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
new file mode 100644
index 000000000000..d3eaaaf1009e
--- /dev/null
+++ b/include/uapi/linux/ethtool.h
@@ -0,0 +1,1085 @@
+/*
+ * ethtool.h: Defines for Linux ethtool.
+ *
+ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
+ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
+ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
+ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
+ *                                christopher.leech@intel.com,
+ *                                scott.feldman@intel.com)
+ * Portions Copyright (C) Sun Microsystems 2008
+ */
+
+#ifndef _UAPI_LINUX_ETHTOOL_H
+#define _UAPI_LINUX_ETHTOOL_H
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+/* This should work for both 32 and 64 bit userland. */
+struct ethtool_cmd {
+        __u32   cmd;
+        __u32   supported;      /* Features this interface supports */
+        __u32   advertising;    /* Features this interface advertises */
+        __u16   speed;          /* The forced speed (lower bits) in
+                                 * Mbps. Please use
+                                 * ethtool_cmd_speed()/_set() to
+                                 * access it */
+        __u8    duplex;         /* Duplex, half or full */
+        __u8    port;           /* Which connector port */
+        __u8    phy_address;    /* MDIO PHY address (PRTAD for clause 45).
+                                 * May be read-only or read-write
+                                 * depending on the driver.
+                                 */
+        __u8    transceiver;    /* Which transceiver to use */
+        __u8    autoneg;        /* Enable or disable autonegotiation */
+        __u8    mdio_support;   /* MDIO protocols supported.  Read-only.
+                                 * Not set by all drivers.
+                                 */
+        __u32   maxtxpkt;       /* Tx pkts before generating tx int */
+        __u32   maxrxpkt;       /* Rx pkts before generating rx int */
+        __u16   speed_hi;       /* The forced speed (upper
+                                 * bits) in Mbps. Please use
+                                 * ethtool_cmd_speed()/_set() to
+                                 * access it */
+        __u8    eth_tp_mdix;    /* twisted pair MDI-X status */
+        __u8    eth_tp_mdix_ctrl; /* twisted pair MDI-X control, when set,
+                                   * link should be renegotiated if necessary
+                                   */
+        __u32   lp_advertising; /* Features the link partner advertises */
+        __u32   reserved[2];
+};
+
+static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
+                                         __u32 speed)
+{
+
+        ep->speed = (__u16)speed;
+        ep->speed_hi = (__u16)(speed >> 16);
+}
+
+static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
+{
+        return (ep->speed_hi << 16) | ep->speed;
+}
+
+/* Device supports clause 22 register access to PHY or peripherals
+ * using the interface defined in <linux/mii.h>.  This should not be
+ * set if there are known to be no such peripherals present or if
+ * the driver only emulates clause 22 registers for compatibility.
+ */
+#define ETH_MDIO_SUPPORTS_C22   1
+
+/* Device supports clause 45 register access to PHY or peripherals
+ * using the interface defined in <linux/mii.h> and <linux/mdio.h>.
+ * This should not be set if there are known to be no such peripherals
+ * present.
+ */
+#define ETH_MDIO_SUPPORTS_C45   2
+
+#define ETHTOOL_FWVERS_LEN      32
+#define ETHTOOL_BUSINFO_LEN     32
+/* these strings are set to whatever the driver author decides... */
+struct ethtool_drvinfo {
+        __u32   cmd;
+        char    driver[32];     /* driver short name, "tulip", "eepro100" */
+        char    version[32];    /* driver version string */
+        char    fw_version[ETHTOOL_FWVERS_LEN]; /* firmware version string */
+        char    bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
+                                /* For PCI devices, use pci_name(pci_dev). */
+        char    reserved1[32];
+        char    reserved2[12];
+                                /*
+                                 * Some struct members below are filled in
+                                 * using ops->get_sset_count().  Obtaining
+                                 * this info from ethtool_drvinfo is now
+                                 * deprecated; Use ETHTOOL_GSSET_INFO
+                                 * instead.
+                                 */
+        __u32   n_priv_flags;   /* number of flags valid in ETHTOOL_GPFLAGS */
+        __u32   n_stats;        /* number of u64's from ETHTOOL_GSTATS */
+        __u32   testinfo_len;
+        __u32   eedump_len;     /* Size of data from ETHTOOL_GEEPROM (bytes) */
+        __u32   regdump_len;    /* Size of data from ETHTOOL_GREGS (bytes) */
+};
+
+#define SOPASS_MAX      6
+/* wake-on-lan settings */
+struct ethtool_wolinfo {
+        __u32   cmd;
+        __u32   supported;
+        __u32   wolopts;
+        __u8    sopass[SOPASS_MAX]; /* SecureOn(tm) password */
+};
+
+/* for passing single values */
+struct ethtool_value {
+        __u32   cmd;
+        __u32   data;
+};
+
+/* for passing big chunks of data */
+struct ethtool_regs {
+        __u32   cmd;
+        __u32   version; /* driver-specific, indicates different chips/revs */
+        __u32   len; /* bytes */
+        __u8    data[0];
+};
+
+/* for passing EEPROM chunks */
+struct ethtool_eeprom {
+        __u32   cmd;
+        __u32   magic;
+        __u32   offset; /* in bytes */
+        __u32   len; /* in bytes */
+        __u8    data[0];
+};
+
+/**
+ * struct ethtool_eee - Energy Efficient Ethernet information
+ * @cmd: ETHTOOL_{G,S}EEE
+ * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
+ *      for which there is EEE support.
+ * @advertised: Mask of %ADVERTISED_* flags for the speed/duplex combinations
+ *      advertised as eee capable.
+ * @lp_advertised: Mask of %ADVERTISED_* flags for the speed/duplex
+ *      combinations advertised by the link partner as eee capable.
+ * @eee_active: Result of the eee auto negotiation.
+ * @eee_enabled: EEE configured mode (enabled/disabled).
+ * @tx_lpi_enabled: Whether the interface should assert its tx lpi, given
+ *      that eee was negotiated.
+ * @tx_lpi_timer: Time in microseconds the interface delays prior to asserting
+ *      its tx lpi (after reaching 'idle' state). Effective only when eee
+ *      was negotiated and tx_lpi_enabled was set.
+ */
+struct ethtool_eee {
+        __u32   cmd;
+        __u32   supported;
+        __u32   advertised;
+        __u32   lp_advertised;
+        __u32   eee_active;
+        __u32   eee_enabled;
+        __u32   tx_lpi_enabled;
+        __u32   tx_lpi_timer;
+        __u32   reserved[2];
+};
+
+/**
+ * struct ethtool_modinfo - plugin module eeprom information
+ * @cmd: %ETHTOOL_GMODULEINFO
+ * @type: Standard the module information conforms to %ETH_MODULE_SFF_xxxx
+ * @eeprom_len: Length of the eeprom
+ *
+ * This structure is used to return the information to
+ * properly size memory for a subsequent call to %ETHTOOL_GMODULEEEPROM.
+ * The type code indicates the eeprom data format
+ */
+struct ethtool_modinfo {
+        __u32   cmd;
+        __u32   type;
+        __u32   eeprom_len;
+        __u32   reserved[8];
+};
+
+/**
+ * struct ethtool_coalesce - coalescing parameters for IRQs and stats updates
+ * @cmd: ETHTOOL_{G,S}COALESCE
+ * @rx_coalesce_usecs: How many usecs to delay an RX interrupt after
+ *      a packet arrives.
+ * @rx_max_coalesced_frames: Maximum number of packets to receive
+ *      before an RX interrupt.
+ * @rx_coalesce_usecs_irq: Same as @rx_coalesce_usecs, except that
+ *      this value applies while an IRQ is being serviced by the host.
+ * @rx_max_coalesced_frames_irq: Same as @rx_max_coalesced_frames,
+ *      except that this value applies while an IRQ is being serviced
+ *      by the host.
+ * @tx_coalesce_usecs: How many usecs to delay a TX interrupt after
+ *      a packet is sent.
+ * @tx_max_coalesced_frames: Maximum number of packets to be sent
+ *      before a TX interrupt.
+ * @tx_coalesce_usecs_irq: Same as @tx_coalesce_usecs, except that
+ *      this value applies while an IRQ is being serviced by the host.
+ * @tx_max_coalesced_frames_irq: Same as @tx_max_coalesced_frames,
+ *      except that this value applies while an IRQ is being serviced
+ *      by the host.
+ * @stats_block_coalesce_usecs: How many usecs to delay in-memory
+ *      statistics block updates.  Some drivers do not have an
+ *      in-memory statistic block, and in such cases this value is
+ *      ignored.  This value must not be zero.
+ * @use_adaptive_rx_coalesce: Enable adaptive RX coalescing.
+ * @use_adaptive_tx_coalesce: Enable adaptive TX coalescing.
+ * @pkt_rate_low: Threshold for low packet rate (packets per second).
+ * @rx_coalesce_usecs_low: How many usecs to delay an RX interrupt after
+ *      a packet arrives, when the packet rate is below @pkt_rate_low.
+ * @rx_max_coalesced_frames_low: Maximum number of packets to be received
+ *      before an RX interrupt, when the packet rate is below @pkt_rate_low.
+ * @tx_coalesce_usecs_low: How many usecs to delay a TX interrupt after
+ *      a packet is sent, when the packet rate is below @pkt_rate_low.
+ * @tx_max_coalesced_frames_low: Maximum nuumber of packets to be sent before
+ *      a TX interrupt, when the packet rate is below @pkt_rate_low.
+ * @pkt_rate_high: Threshold for high packet rate (packets per second).
+ * @rx_coalesce_usecs_high: How many usecs to delay an RX interrupt after
+ *      a packet arrives, when the packet rate is above @pkt_rate_high.
+ * @rx_max_coalesced_frames_high: Maximum number of packets to be received
+ *      before an RX interrupt, when the packet rate is above @pkt_rate_high.
+ * @tx_coalesce_usecs_high: How many usecs to delay a TX interrupt after
+ *      a packet is sent, when the packet rate is above @pkt_rate_high.
+ * @tx_max_coalesced_frames_high: Maximum number of packets to be sent before
+ *      a TX interrupt, when the packet rate is above @pkt_rate_high.
+ * @rate_sample_interval: How often to do adaptive coalescing packet rate
+ *      sampling, measured in seconds.  Must not be zero.
+ *
+ * Each pair of (usecs, max_frames) fields specifies this exit
+ * condition for interrupt coalescing:
+ *      (usecs > 0 && time_since_first_completion >= usecs) ||
+ *      (max_frames > 0 && completed_frames >= max_frames)
+ * It is illegal to set both usecs and max_frames to zero as this
+ * would cause interrupts to never be generated.  To disable
+ * coalescing, set usecs = 0 and max_frames = 1.
+ *
+ * Some implementations ignore the value of max_frames and use the
+ * condition:
+ *      time_since_first_completion >= usecs
+ * This is deprecated.  Drivers for hardware that does not support
+ * counting completions should validate that max_frames == !rx_usecs.
+ *
+ * Adaptive RX/TX coalescing is an algorithm implemented by some
+ * drivers to improve latency under low packet rates and improve
+ * throughput under high packet rates.  Some drivers only implement
+ * one of RX or TX adaptive coalescing.  Anything not implemented by
+ * the driver causes these values to be silently ignored.
+ *
+ * When the packet rate is below @pkt_rate_high but above
+ * @pkt_rate_low (both measured in packets per second) the
+ * normal {rx,tx}_* coalescing parameters are used.
+ */
+struct ethtool_coalesce {
+        __u32   cmd;
+        __u32   rx_coalesce_usecs;
+        __u32   rx_max_coalesced_frames;
+        __u32   rx_coalesce_usecs_irq;
+        __u32   rx_max_coalesced_frames_irq;
+        __u32   tx_coalesce_usecs;
+        __u32   tx_max_coalesced_frames;
+        __u32   tx_coalesce_usecs_irq;
+        __u32   tx_max_coalesced_frames_irq;
+        __u32   stats_block_coalesce_usecs;
+        __u32   use_adaptive_rx_coalesce;
+        __u32   use_adaptive_tx_coalesce;
+        __u32   pkt_rate_low;
+        __u32   rx_coalesce_usecs_low;
+        __u32   rx_max_coalesced_frames_low;
+        __u32   tx_coalesce_usecs_low;
+        __u32   tx_max_coalesced_frames_low;
+        __u32   pkt_rate_high;
+        __u32   rx_coalesce_usecs_high;
+        __u32   rx_max_coalesced_frames_high;
+        __u32   tx_coalesce_usecs_high;
+        __u32   tx_max_coalesced_frames_high;
+        __u32   rate_sample_interval;
+};
+
+/* for configuring RX/TX ring parameters */
+struct ethtool_ringparam {
+        __u32   cmd;    /* ETHTOOL_{G,S}RINGPARAM */
+
+        /* Read only attributes.  These indicate the maximum number
+         * of pending RX/TX ring entries the driver will allow the
+         * user to set.
+         */
+        __u32   rx_max_pending;
+        __u32   rx_mini_max_pending;
+        __u32   rx_jumbo_max_pending;
+        __u32   tx_max_pending;
+
+        /* Values changeable by the user.  The valid values are
+         * in the range 1 to the "*_max_pending" counterpart above.
+         */
+        __u32   rx_pending;
+        __u32   rx_mini_pending;
+        __u32   rx_jumbo_pending;
+        __u32   tx_pending;
+};
+
+/**
+ * struct ethtool_channels - configuring number of network channel
+ * @cmd: ETHTOOL_{G,S}CHANNELS
+ * @max_rx: Read only. Maximum number of receive channel the driver support.
+ * @max_tx: Read only. Maximum number of transmit channel the driver support.
+ * @max_other: Read only. Maximum number of other channel the driver support.
+ * @max_combined: Read only. Maximum number of combined channel the driver
+ *      support. Set of queues RX, TX or other.
+ * @rx_count: Valid values are in the range 1 to the max_rx.
+ * @tx_count: Valid values are in the range 1 to the max_tx.
+ * @other_count: Valid values are in the range 1 to the max_other.
+ * @combined_count: Valid values are in the range 1 to the max_combined.
+ *
+ * This can be used to configure RX, TX and other channels.
+ */
+
+struct ethtool_channels {
+        __u32   cmd;
+        __u32   max_rx;
+        __u32   max_tx;
+        __u32   max_other;
+        __u32   max_combined;
+        __u32   rx_count;
+        __u32   tx_count;
+        __u32   other_count;
+        __u32   combined_count;
+};
+
+/* for configuring link flow control parameters */
+struct ethtool_pauseparam {
+        __u32   cmd;    /* ETHTOOL_{G,S}PAUSEPARAM */
+
+        /* If the link is being auto-negotiated (via ethtool_cmd.autoneg
+         * being true) the user may set 'autoneg' here non-zero to have the
+         * pause parameters be auto-negotiated too.  In such a case, the
+         * {rx,tx}_pause values below determine what capabilities are
+         * advertised.
+         *
+         * If 'autoneg' is zero or the link is not being auto-negotiated,
+         * then {rx,tx}_pause force the driver to use/not-use pause
+         * flow control.
+         */
+        __u32   autoneg;
+        __u32   rx_pause;
+        __u32   tx_pause;
+};
+
+#define ETH_GSTRING_LEN         32
+enum ethtool_stringset {
+        ETH_SS_TEST             = 0,
+        ETH_SS_STATS,
+        ETH_SS_PRIV_FLAGS,
+        ETH_SS_NTUPLE_FILTERS,  /* Do not use, GRXNTUPLE is now deprecated */
+        ETH_SS_FEATURES,
+};
+
+/* for passing string sets for data tagging */
+struct ethtool_gstrings {
+        __u32   cmd;            /* ETHTOOL_GSTRINGS */
+        __u32   string_set;     /* string set id e.c. ETH_SS_TEST, etc*/
+        __u32   len;            /* number of strings in the string set */
+        __u8    data[0];
+};
+
+struct ethtool_sset_info {
+        __u32   cmd;            /* ETHTOOL_GSSET_INFO */
+        __u32   reserved;
+        __u64   sset_mask;      /* input: each bit selects an sset to query */
+                                /* output: each bit a returned sset */
+        __u32   data[0];        /* ETH_SS_xxx count, in order, based on bits
+                                   in sset_mask.  One bit implies one
+                                   __u32, two bits implies two
+                                   __u32's, etc. */
+};
+
+/**
+ * enum ethtool_test_flags - flags definition of ethtool_test
+ * @ETH_TEST_FL_OFFLINE: if set perform online and offline tests, otherwise
+ *      only online tests.
+ * @ETH_TEST_FL_FAILED: Driver set this flag if test fails.
+ * @ETH_TEST_FL_EXTERNAL_LB: Application request to perform external loopback
+ *      test.
+ * @ETH_TEST_FL_EXTERNAL_LB_DONE: Driver performed the external loopback test
+ */
+
+enum ethtool_test_flags {
+        ETH_TEST_FL_OFFLINE     = (1 << 0),
+        ETH_TEST_FL_FAILED      = (1 << 1),
+        ETH_TEST_FL_EXTERNAL_LB = (1 << 2),
+        ETH_TEST_FL_EXTERNAL_LB_DONE    = (1 << 3),
+};
+
+/* for requesting NIC test and getting results*/
+struct ethtool_test {
+        __u32   cmd;            /* ETHTOOL_TEST */
+        __u32   flags;          /* ETH_TEST_FL_xxx */
+        __u32   reserved;
+        __u32   len;            /* result length, in number of u64 elements */
+        __u64   data[0];
+};
+
+/* for dumping NIC-specific statistics */
+struct ethtool_stats {
+        __u32   cmd;            /* ETHTOOL_GSTATS */
+        __u32   n_stats;        /* number of u64's being returned */
+        __u64   data[0];
+};
+
+struct ethtool_perm_addr {
+        __u32   cmd;            /* ETHTOOL_GPERMADDR */
+        __u32   size;
+        __u8    data[0];
+};
+
+/* boolean flags controlling per-interface behavior characteristics.
+ * When reading, the flag indicates whether or not a certain behavior
+ * is enabled/present.  When writing, the flag indicates whether
+ * or not the driver should turn on (set) or off (clear) a behavior.
+ *
+ * Some behaviors may read-only (unconditionally absent or present).
+ * If such is the case, return EINVAL in the set-flags operation if the
+ * flag differs from the read-only value.
+ */
+enum ethtool_flags {
+        ETH_FLAG_TXVLAN         = (1 << 7),     /* TX VLAN offload enabled */
+        ETH_FLAG_RXVLAN         = (1 << 8),     /* RX VLAN offload enabled */
+        ETH_FLAG_LRO            = (1 << 15),    /* LRO is enabled */
+        ETH_FLAG_NTUPLE         = (1 << 27),    /* N-tuple filters enabled */
+        ETH_FLAG_RXHASH         = (1 << 28),
+};
+
+/* The following structures are for supporting RX network flow
+ * classification and RX n-tuple configuration. Note, all multibyte
+ * fields, e.g., ip4src, ip4dst, psrc, pdst, spi, etc. are expected to
+ * be in network byte order.
+ */
+
+/**
+ * struct ethtool_tcpip4_spec - flow specification for TCP/IPv4 etc.
+ * @ip4src: Source host
+ * @ip4dst: Destination host
+ * @psrc: Source port
+ * @pdst: Destination port
+ * @tos: Type-of-service
+ *
+ * This can be used to specify a TCP/IPv4, UDP/IPv4 or SCTP/IPv4 flow.
+ */
+struct ethtool_tcpip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be16  psrc;
+        __be16  pdst;
+        __u8    tos;
+};
+
+/**
+ * struct ethtool_ah_espip4_spec - flow specification for IPsec/IPv4
+ * @ip4src: Source host
+ * @ip4dst: Destination host
+ * @spi: Security parameters index
+ * @tos: Type-of-service
+ *
+ * This can be used to specify an IPsec transport or tunnel over IPv4.
+ */
+struct ethtool_ah_espip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be32  spi;
+        __u8    tos;
+};
+
+#define ETH_RX_NFC_IP4  1
+
+/**
+ * struct ethtool_usrip4_spec - general flow specification for IPv4
+ * @ip4src: Source host
+ * @ip4dst: Destination host
+ * @l4_4_bytes: First 4 bytes of transport (layer 4) header
+ * @tos: Type-of-service
+ * @ip_ver: Value must be %ETH_RX_NFC_IP4; mask must be 0
+ * @proto: Transport protocol number; mask must be 0
+ */
+struct ethtool_usrip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be32  l4_4_bytes;
+        __u8    tos;
+        __u8    ip_ver;
+        __u8    proto;
+};
+
+union ethtool_flow_union {
+        struct ethtool_tcpip4_spec              tcp_ip4_spec;
+        struct ethtool_tcpip4_spec              udp_ip4_spec;
+        struct ethtool_tcpip4_spec              sctp_ip4_spec;
+        struct ethtool_ah_espip4_spec           ah_ip4_spec;
+        struct ethtool_ah_espip4_spec           esp_ip4_spec;
+        struct ethtool_usrip4_spec              usr_ip4_spec;
+        struct ethhdr                           ether_spec;
+        __u8                                    hdata[60];
+};
+
+struct ethtool_flow_ext {
+        __be16  vlan_etype;
+        __be16  vlan_tci;
+        __be32  data[2];
+};
+
+/**
+ * struct ethtool_rx_flow_spec - classification rule for RX flows
+ * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
+ * @h_u: Flow fields to match (dependent on @flow_type)
+ * @h_ext: Additional fields to match
+ * @m_u: Masks for flow field bits to be matched
+ * @m_ext: Masks for additional field bits to be matched
+ *      Note, all additional fields must be ignored unless @flow_type
+ *      includes the %FLOW_EXT flag.
+ * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
+ *      if packets should be discarded
+ * @location: Location of rule in the table.  Locations must be
+ *      numbered such that a flow matching multiple rules will be
+ *      classified according to the first (lowest numbered) rule.
+ */
+struct ethtool_rx_flow_spec {
+        __u32           flow_type;
+        union ethtool_flow_union h_u;
+        struct ethtool_flow_ext h_ext;
+        union ethtool_flow_union m_u;
+        struct ethtool_flow_ext m_ext;
+        __u64           ring_cookie;
+        __u32           location;
+};
+
+/**
+ * struct ethtool_rxnfc - command to get or set RX flow classification rules
+ * @cmd: Specific command number - %ETHTOOL_GRXFH, %ETHTOOL_SRXFH,
+ *      %ETHTOOL_GRXRINGS, %ETHTOOL_GRXCLSRLCNT, %ETHTOOL_GRXCLSRULE,
+ *      %ETHTOOL_GRXCLSRLALL, %ETHTOOL_SRXCLSRLDEL or %ETHTOOL_SRXCLSRLINS
+ * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW
+ * @data: Command-dependent value
+ * @fs: Flow classification rule
+ * @rule_cnt: Number of rules to be affected
+ * @rule_locs: Array of used rule locations
+ *
+ * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating
+ * the fields included in the flow hash, e.g. %RXH_IP_SRC.  The following
+ * structure fields must not be used.
+ *
+ * For %ETHTOOL_GRXRINGS, @data is set to the number of RX rings/queues
+ * on return.
+ *
+ * For %ETHTOOL_GRXCLSRLCNT, @rule_cnt is set to the number of defined
+ * rules on return.  If @data is non-zero on return then it is the
+ * size of the rule table, plus the flag %RX_CLS_LOC_SPECIAL if the
+ * driver supports any special location values.  If that flag is not
+ * set in @data then special location values should not be used.
+ *
+ * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an
+ * existing rule on entry and @fs contains the rule on return.
+ *
+ * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the
+ * user buffer for @rule_locs on entry.  On return, @data is the size
+ * of the rule table, @rule_cnt is the number of defined rules, and
+ * @rule_locs contains the locations of the defined rules.  Drivers
+ * must use the second parameter to get_rxnfc() instead of @rule_locs.
+ *
+ * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.
+ * @fs.@location either specifies the location to use or is a special
+ * location value with %RX_CLS_LOC_SPECIAL flag set.  On return,
+ * @fs.@location is the actual rule location.
+ *
+ * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
+ * existing rule on entry.
+ *
+ * A driver supporting the special location values for
+ * %ETHTOOL_SRXCLSRLINS may add the rule at any suitable unused
+ * location, and may remove a rule at a later location (lower
+ * priority) that matches exactly the same set of flows.  The special
+ * values are: %RX_CLS_LOC_ANY, selecting any location;
+ * %RX_CLS_LOC_FIRST, selecting the first suitable location (maximum
+ * priority); and %RX_CLS_LOC_LAST, selecting the last suitable
+ * location (minimum priority).  Additional special values may be
+ * defined in future and drivers must return -%EINVAL for any
+ * unrecognised value.
+ */
+struct ethtool_rxnfc {
+        __u32                           cmd;
+        __u32                           flow_type;
+        __u64                           data;
+        struct ethtool_rx_flow_spec     fs;
+        __u32                           rule_cnt;
+        __u32                           rule_locs[0];
+};
+
+
+/**
+ * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection
+ * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR
+ * @size: On entry, the array size of the user buffer, which may be zero.
+ *      On return from %ETHTOOL_GRXFHINDIR, the array size of the hardware
+ *      indirection table.
+ * @ring_index: RX ring/queue index for each hash value
+ *
+ * For %ETHTOOL_GRXFHINDIR, a @size of zero means that only the size
+ * should be returned.  For %ETHTOOL_SRXFHINDIR, a @size of zero means
+ * the table should be reset to default values.  This last feature
+ * is not supported by the original implementations.
+ */
+struct ethtool_rxfh_indir {
+        __u32   cmd;
+        __u32   size;
+        __u32   ring_index[0];
+};
+
+/**
+ * struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter
+ * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
+ * @h_u: Flow field values to match (dependent on @flow_type)
+ * @m_u: Masks for flow field value bits to be ignored
+ * @vlan_tag: VLAN tag to match
+ * @vlan_tag_mask: Mask for VLAN tag bits to be ignored
+ * @data: Driver-dependent data to match
+ * @data_mask: Mask for driver-dependent data bits to be ignored
+ * @action: RX ring/queue index to deliver to (non-negative) or other action
+ *      (negative, e.g. %ETHTOOL_RXNTUPLE_ACTION_DROP)
+ *
+ * For flow types %TCP_V4_FLOW, %UDP_V4_FLOW and %SCTP_V4_FLOW, where
+ * a field value and mask are both zero this is treated as if all mask
+ * bits are set i.e. the field is ignored.
+ */
+struct ethtool_rx_ntuple_flow_spec {
+        __u32            flow_type;
+        union {
+                struct ethtool_tcpip4_spec              tcp_ip4_spec;
+                struct ethtool_tcpip4_spec              udp_ip4_spec;
+                struct ethtool_tcpip4_spec              sctp_ip4_spec;
+                struct ethtool_ah_espip4_spec           ah_ip4_spec;
+                struct ethtool_ah_espip4_spec           esp_ip4_spec;
+                struct ethtool_usrip4_spec              usr_ip4_spec;
+                struct ethhdr                           ether_spec;
+                __u8                                    hdata[72];
+        } h_u, m_u;
+
+        __u16           vlan_tag;
+        __u16           vlan_tag_mask;
+        __u64           data;
+        __u64           data_mask;
+
+        __s32           action;
+#define ETHTOOL_RXNTUPLE_ACTION_DROP    (-1)    /* drop packet */
+#define ETHTOOL_RXNTUPLE_ACTION_CLEAR   (-2)    /* clear filter */
+};
+
+/**
+ * struct ethtool_rx_ntuple - command to set or clear RX flow filter
+ * @cmd: Command number - %ETHTOOL_SRXNTUPLE
+ * @fs: Flow filter specification
+ */
+struct ethtool_rx_ntuple {
+        __u32                                   cmd;
+        struct ethtool_rx_ntuple_flow_spec      fs;
+};
+
+#define ETHTOOL_FLASH_MAX_FILENAME      128
+enum ethtool_flash_op_type {
+        ETHTOOL_FLASH_ALL_REGIONS       = 0,
+};
+
+/* for passing firmware flashing related parameters */
+struct ethtool_flash {
+        __u32   cmd;
+        __u32   region;
+        char    data[ETHTOOL_FLASH_MAX_FILENAME];
+};
+
+/**
+ * struct ethtool_dump - used for retrieving, setting device dump
+ * @cmd: Command number - %ETHTOOL_GET_DUMP_FLAG, %ETHTOOL_GET_DUMP_DATA, or
+ *      %ETHTOOL_SET_DUMP
+ * @version: FW version of the dump, filled in by driver
+ * @flag: driver dependent flag for dump setting, filled in by driver during
+ *        get and filled in by ethtool for set operation.
+ *        flag must be initialized by macro ETH_FW_DUMP_DISABLE value when
+ *        firmware dump is disabled.
+ * @len: length of dump data, used as the length of the user buffer on entry to
+ *       %ETHTOOL_GET_DUMP_DATA and this is returned as dump length by driver
+ *       for %ETHTOOL_GET_DUMP_FLAG command
+ * @data: data collected for get dump data operation
+ */
+
+#define ETH_FW_DUMP_DISABLE 0
+
+struct ethtool_dump {
+        __u32   cmd;
+        __u32   version;
+        __u32   flag;
+        __u32   len;
+        __u8    data[0];
+};
+
+/* for returning and changing feature sets */
+
+/**
+ * struct ethtool_get_features_block - block with state of 32 features
+ * @available: mask of changeable features
+ * @requested: mask of features requested to be enabled if possible
+ * @active: mask of currently enabled features
+ * @never_changed: mask of features not changeable for any device
+ */
+struct ethtool_get_features_block {
+        __u32   available;
+        __u32   requested;
+        __u32   active;
+        __u32   never_changed;
+};
+
+/**
+ * struct ethtool_gfeatures - command to get state of device's features
+ * @cmd: command number = %ETHTOOL_GFEATURES
+ * @size: in: number of elements in the features[] array;
+ *       out: number of elements in features[] needed to hold all features
+ * @features: state of features
+ */
+struct ethtool_gfeatures {
+        __u32   cmd;
+        __u32   size;
+        struct ethtool_get_features_block features[0];
+};
+
+/**
+ * struct ethtool_set_features_block - block with request for 32 features
+ * @valid: mask of features to be changed
+ * @requested: values of features to be changed
+ */
+struct ethtool_set_features_block {
+        __u32   valid;
+        __u32   requested;
+};
+
+/**
+ * struct ethtool_sfeatures - command to request change in device's features
+ * @cmd: command number = %ETHTOOL_SFEATURES
+ * @size: array size of the features[] array
+ * @features: feature change masks
+ */
+struct ethtool_sfeatures {
+        __u32   cmd;
+        __u32   size;
+        struct ethtool_set_features_block features[0];
+};
+
+/**
+ * struct ethtool_ts_info - holds a device's timestamping and PHC association
+ * @cmd: command number = %ETHTOOL_GET_TS_INFO
+ * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags
+ * @phc_index: device index of the associated PHC, or -1 if there is none
+ * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values
+ * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values
+ *
+ * The bits in the 'tx_types' and 'rx_filters' fields correspond to
+ * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
+ * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
+ * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
+ */
+struct ethtool_ts_info {
+        __u32   cmd;
+        __u32   so_timestamping;
+        __s32   phc_index;
+        __u32   tx_types;
+        __u32   tx_reserved[3];
+        __u32   rx_filters;
+        __u32   rx_reserved[3];
+};
+
+/*
+ * %ETHTOOL_SFEATURES changes features present in features[].valid to the
+ * values of corresponding bits in features[].requested. Bits in .requested
+ * not set in .valid or not changeable are ignored.
+ *
+ * Returns %EINVAL when .valid contains undefined or never-changeable bits
+ * or size is not equal to required number of features words (32-bit blocks).
+ * Returns >= 0 if request was completed; bits set in the value mean:
+ *   %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not
+ *      changeable (not present in %ETHTOOL_GFEATURES' features[].available)
+ *      those bits were ignored.
+ *   %ETHTOOL_F_WISH - some or all changes requested were recorded but the
+ *      resulting state of bits masked by .valid is not equal to .requested.
+ *      Probably there are other device-specific constraints on some features
+ *      in the set. When %ETHTOOL_F_UNSUPPORTED is set, .valid is considered
+ *      here as though ignored bits were cleared.
+ *   %ETHTOOL_F_COMPAT - some or all changes requested were made by calling
+ *      compatibility functions. Requested offload state cannot be properly
+ *      managed by kernel.
+ *
+ * Meaning of bits in the masks are obtained by %ETHTOOL_GSSET_INFO (number of
+ * bits in the arrays - always multiple of 32) and %ETHTOOL_GSTRINGS commands
+ * for ETH_SS_FEATURES string set. First entry in the table corresponds to least
+ * significant bit in features[0] fields. Empty strings mark undefined features.
+ */
+enum ethtool_sfeatures_retval_bits {
+        ETHTOOL_F_UNSUPPORTED__BIT,
+        ETHTOOL_F_WISH__BIT,
+        ETHTOOL_F_COMPAT__BIT,
+};
+
+#define ETHTOOL_F_UNSUPPORTED   (1 << ETHTOOL_F_UNSUPPORTED__BIT)
+#define ETHTOOL_F_WISH          (1 << ETHTOOL_F_WISH__BIT)
+#define ETHTOOL_F_COMPAT        (1 << ETHTOOL_F_COMPAT__BIT)
+
+
+/* CMDs currently supported */
+#define ETHTOOL_GSET            0x00000001 /* Get settings. */
+#define ETHTOOL_SSET            0x00000002 /* Set settings. */
+#define ETHTOOL_GDRVINFO        0x00000003 /* Get driver info. */
+#define ETHTOOL_GREGS           0x00000004 /* Get NIC registers. */
+#define ETHTOOL_GWOL            0x00000005 /* Get wake-on-lan options. */
+#define ETHTOOL_SWOL            0x00000006 /* Set wake-on-lan options. */
+#define ETHTOOL_GMSGLVL         0x00000007 /* Get driver message level */
+#define ETHTOOL_SMSGLVL         0x00000008 /* Set driver msg level. */
+#define ETHTOOL_NWAY_RST        0x00000009 /* Restart autonegotiation. */
+/* Get link status for host, i.e. whether the interface *and* the
+ * physical port (if there is one) are up (ethtool_value). */
+#define ETHTOOL_GLINK           0x0000000a
+#define ETHTOOL_GEEPROM         0x0000000b /* Get EEPROM data */
+#define ETHTOOL_SEEPROM         0x0000000c /* Set EEPROM data. */
+#define ETHTOOL_GCOALESCE       0x0000000e /* Get coalesce config */
+#define ETHTOOL_SCOALESCE       0x0000000f /* Set coalesce config. */
+#define ETHTOOL_GRINGPARAM      0x00000010 /* Get ring parameters */
+#define ETHTOOL_SRINGPARAM      0x00000011 /* Set ring parameters. */
+#define ETHTOOL_GPAUSEPARAM     0x00000012 /* Get pause parameters */
+#define ETHTOOL_SPAUSEPARAM     0x00000013 /* Set pause parameters. */
+#define ETHTOOL_GRXCSUM         0x00000014 /* Get RX hw csum enable (ethtool_value) */
+#define ETHTOOL_SRXCSUM         0x00000015 /* Set RX hw csum enable (ethtool_value) */
+#define ETHTOOL_GTXCSUM         0x00000016 /* Get TX hw csum enable (ethtool_value) */
+#define ETHTOOL_STXCSUM         0x00000017 /* Set TX hw csum enable (ethtool_value) */
+#define ETHTOOL_GSG             0x00000018 /* Get scatter-gather enable
+                                            * (ethtool_value) */
+#define ETHTOOL_SSG             0x00000019 /* Set scatter-gather enable
+                                            * (ethtool_value). */
+#define ETHTOOL_TEST            0x0000001a /* execute NIC self-test. */
+#define ETHTOOL_GSTRINGS        0x0000001b /* get specified string set */
+#define ETHTOOL_PHYS_ID         0x0000001c /* identify the NIC */
+#define ETHTOOL_GSTATS          0x0000001d /* get NIC-specific statistics */
+#define ETHTOOL_GTSO            0x0000001e /* Get TSO enable (ethtool_value) */
+#define ETHTOOL_STSO            0x0000001f /* Set TSO enable (ethtool_value) */
+#define ETHTOOL_GPERMADDR       0x00000020 /* Get permanent hardware address */
+#define ETHTOOL_GUFO            0x00000021 /* Get UFO enable (ethtool_value) */
+#define ETHTOOL_SUFO            0x00000022 /* Set UFO enable (ethtool_value) */
+#define ETHTOOL_GGSO            0x00000023 /* Get GSO enable (ethtool_value) */
+#define ETHTOOL_SGSO            0x00000024 /* Set GSO enable (ethtool_value) */
+#define ETHTOOL_GFLAGS          0x00000025 /* Get flags bitmap(ethtool_value) */
+#define ETHTOOL_SFLAGS          0x00000026 /* Set flags bitmap(ethtool_value) */
+#define ETHTOOL_GPFLAGS         0x00000027 /* Get driver-private flags bitmap */
+#define ETHTOOL_SPFLAGS         0x00000028 /* Set driver-private flags bitmap */
+
+#define ETHTOOL_GRXFH           0x00000029 /* Get RX flow hash configuration */
+#define ETHTOOL_SRXFH           0x0000002a /* Set RX flow hash configuration */
+#define ETHTOOL_GGRO            0x0000002b /* Get GRO enable (ethtool_value) */
+#define ETHTOOL_SGRO            0x0000002c /* Set GRO enable (ethtool_value) */
+#define ETHTOOL_GRXRINGS        0x0000002d /* Get RX rings available for LB */
+#define ETHTOOL_GRXCLSRLCNT     0x0000002e /* Get RX class rule count */
+#define ETHTOOL_GRXCLSRULE      0x0000002f /* Get RX classification rule */
+#define ETHTOOL_GRXCLSRLALL     0x00000030 /* Get all RX classification rule */
+#define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
+#define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
+#define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
+#define ETHTOOL_RESET           0x00000034 /* Reset hardware */
+#define ETHTOOL_SRXNTUPLE       0x00000035 /* Add an n-tuple filter to device */
+#define ETHTOOL_GRXNTUPLE       0x00000036 /* deprecated */
+#define ETHTOOL_GSSET_INFO      0x00000037 /* Get string set info */
+#define ETHTOOL_GRXFHINDIR      0x00000038 /* Get RX flow hash indir'n table */
+#define ETHTOOL_SRXFHINDIR      0x00000039 /* Set RX flow hash indir'n table */
+
+#define ETHTOOL_GFEATURES       0x0000003a /* Get device offload settings */
+#define ETHTOOL_SFEATURES       0x0000003b /* Change device offload settings */
+#define ETHTOOL_GCHANNELS       0x0000003c /* Get no of channels */
+#define ETHTOOL_SCHANNELS       0x0000003d /* Set no of channels */
+#define ETHTOOL_SET_DUMP        0x0000003e /* Set dump settings */
+#define ETHTOOL_GET_DUMP_FLAG   0x0000003f /* Get dump settings */
+#define ETHTOOL_GET_DUMP_DATA   0x00000040 /* Get dump data */
+#define ETHTOOL_GET_TS_INFO     0x00000041 /* Get time stamping and PHC info */
+#define ETHTOOL_GMODULEINFO     0x00000042 /* Get plug-in module information */
+#define ETHTOOL_GMODULEEEPROM   0x00000043 /* Get plug-in module eeprom */
+#define ETHTOOL_GEEE            0x00000044 /* Get EEE settings */
+#define ETHTOOL_SEEE            0x00000045 /* Set EEE settings */
+
+/* compatibility with older code */
+#define SPARC_ETH_GSET          ETHTOOL_GSET
+#define SPARC_ETH_SSET          ETHTOOL_SSET
+
+/* Indicates what features are supported by the interface. */
+#define SUPPORTED_10baseT_Half          (1 << 0)
+#define SUPPORTED_10baseT_Full          (1 << 1)
+#define SUPPORTED_100baseT_Half         (1 << 2)
+#define SUPPORTED_100baseT_Full         (1 << 3)
+#define SUPPORTED_1000baseT_Half        (1 << 4)
+#define SUPPORTED_1000baseT_Full        (1 << 5)
+#define SUPPORTED_Autoneg               (1 << 6)
+#define SUPPORTED_TP                    (1 << 7)
+#define SUPPORTED_AUI                   (1 << 8)
+#define SUPPORTED_MII                   (1 << 9)
+#define SUPPORTED_FIBRE                 (1 << 10)
+#define SUPPORTED_BNC                   (1 << 11)
+#define SUPPORTED_10000baseT_Full       (1 << 12)
+#define SUPPORTED_Pause                 (1 << 13)
+#define SUPPORTED_Asym_Pause            (1 << 14)
+#define SUPPORTED_2500baseX_Full        (1 << 15)
+#define SUPPORTED_Backplane             (1 << 16)
+#define SUPPORTED_1000baseKX_Full       (1 << 17)
+#define SUPPORTED_10000baseKX4_Full     (1 << 18)
+#define SUPPORTED_10000baseKR_Full      (1 << 19)
+#define SUPPORTED_10000baseR_FEC        (1 << 20)
+#define SUPPORTED_20000baseMLD2_Full    (1 << 21)
+#define SUPPORTED_20000baseKR2_Full     (1 << 22)
+#define SUPPORTED_40000baseKR4_Full     (1 << 23)
+#define SUPPORTED_40000baseCR4_Full     (1 << 24)
+#define SUPPORTED_40000baseSR4_Full     (1 << 25)
+#define SUPPORTED_40000baseLR4_Full     (1 << 26)
+
+/* Indicates what features are advertised by the interface. */
+#define ADVERTISED_10baseT_Half         (1 << 0)
+#define ADVERTISED_10baseT_Full         (1 << 1)
+#define ADVERTISED_100baseT_Half        (1 << 2)
+#define ADVERTISED_100baseT_Full        (1 << 3)
+#define ADVERTISED_1000baseT_Half       (1 << 4)
+#define ADVERTISED_1000baseT_Full       (1 << 5)
+#define ADVERTISED_Autoneg              (1 << 6)
+#define ADVERTISED_TP                   (1 << 7)
+#define ADVERTISED_AUI                  (1 << 8)
+#define ADVERTISED_MII                  (1 << 9)
+#define ADVERTISED_FIBRE                (1 << 10)
+#define ADVERTISED_BNC                  (1 << 11)
+#define ADVERTISED_10000baseT_Full      (1 << 12)
+#define ADVERTISED_Pause                (1 << 13)
+#define ADVERTISED_Asym_Pause           (1 << 14)
+#define ADVERTISED_2500baseX_Full       (1 << 15)
+#define ADVERTISED_Backplane            (1 << 16)
+#define ADVERTISED_1000baseKX_Full      (1 << 17)
+#define ADVERTISED_10000baseKX4_Full    (1 << 18)
+#define ADVERTISED_10000baseKR_Full     (1 << 19)
+#define ADVERTISED_10000baseR_FEC       (1 << 20)
+#define ADVERTISED_20000baseMLD2_Full   (1 << 21)
+#define ADVERTISED_20000baseKR2_Full    (1 << 22)
+#define ADVERTISED_40000baseKR4_Full    (1 << 23)
+#define ADVERTISED_40000baseCR4_Full    (1 << 24)
+#define ADVERTISED_40000baseSR4_Full    (1 << 25)
+#define ADVERTISED_40000baseLR4_Full    (1 << 26)
+
+/* The following are all involved in forcing a particular link
+ * mode for the device for setting things.  When getting the
+ * devices settings, these indicate the current mode and whether
+ * it was forced up into this mode or autonegotiated.
+ */
+
+/* The forced speed, 10Mb, 100Mb, gigabit, 2.5Gb, 10GbE. */
+#define SPEED_10                10
+#define SPEED_100               100
+#define SPEED_1000              1000
+#define SPEED_2500              2500
+#define SPEED_10000             10000
+#define SPEED_UNKNOWN           -1
+
+/* Duplex, half or full. */
+#define DUPLEX_HALF             0x00
+#define DUPLEX_FULL             0x01
+#define DUPLEX_UNKNOWN          0xff
+
+/* Which connector port. */
+#define PORT_TP                 0x00
+#define PORT_AUI                0x01
+#define PORT_MII                0x02
+#define PORT_FIBRE              0x03
+#define PORT_BNC                0x04
+#define PORT_DA                 0x05
+#define PORT_NONE               0xef
+#define PORT_OTHER              0xff
+
+/* Which transceiver to use. */
+#define XCVR_INTERNAL           0x00
+#define XCVR_EXTERNAL           0x01
+#define XCVR_DUMMY1             0x02
+#define XCVR_DUMMY2             0x03
+#define XCVR_DUMMY3             0x04
+
+/* Enable or disable autonegotiation.  If this is set to enable,
+ * the forced link modes above are completely ignored.
+ */
+#define AUTONEG_DISABLE         0x00
+#define AUTONEG_ENABLE          0x01
+
+/* MDI or MDI-X status/control - if MDI/MDI_X/AUTO is set then
+ * the driver is required to renegotiate link
+ */
+#define ETH_TP_MDI_INVALID      0x00 /* status: unknown; control: unsupported */
+#define ETH_TP_MDI              0x01 /* status: MDI;     control: force MDI */
+#define ETH_TP_MDI_X            0x02 /* status: MDI-X;   control: force MDI-X */
+#define ETH_TP_MDI_AUTO         0x03 /*                  control: auto-select */
+
+/* Wake-On-Lan options. */
+#define WAKE_PHY                (1 << 0)
+#define WAKE_UCAST              (1 << 1)
+#define WAKE_MCAST              (1 << 2)
+#define WAKE_BCAST              (1 << 3)
+#define WAKE_ARP                (1 << 4)
+#define WAKE_MAGIC              (1 << 5)
+#define WAKE_MAGICSECURE        (1 << 6) /* only meaningful if WAKE_MAGIC */
+
+/* L2-L4 network traffic flow types */
+#define TCP_V4_FLOW     0x01    /* hash or spec (tcp_ip4_spec) */
+#define UDP_V4_FLOW     0x02    /* hash or spec (udp_ip4_spec) */
+#define SCTP_V4_FLOW    0x03    /* hash or spec (sctp_ip4_spec) */
+#define AH_ESP_V4_FLOW  0x04    /* hash only */
+#define TCP_V6_FLOW     0x05    /* hash only */
+#define UDP_V6_FLOW     0x06    /* hash only */
+#define SCTP_V6_FLOW    0x07    /* hash only */
+#define AH_ESP_V6_FLOW  0x08    /* hash only */
+#define AH_V4_FLOW      0x09    /* hash or spec (ah_ip4_spec) */
+#define ESP_V4_FLOW     0x0a    /* hash or spec (esp_ip4_spec) */
+#define AH_V6_FLOW      0x0b    /* hash only */
+#define ESP_V6_FLOW     0x0c    /* hash only */
+#define IP_USER_FLOW    0x0d    /* spec only (usr_ip4_spec) */
+#define IPV4_FLOW       0x10    /* hash only */
+#define IPV6_FLOW       0x11    /* hash only */
+#define ETHER_FLOW      0x12    /* spec only (ether_spec) */
+/* Flag to enable additional fields in struct ethtool_rx_flow_spec */
+#define FLOW_EXT        0x80000000
+
+/* L3-L4 network traffic flow hash options */
+#define RXH_L2DA        (1 << 1)
+#define RXH_VLAN        (1 << 2)
+#define RXH_L3_PROTO    (1 << 3)
+#define RXH_IP_SRC      (1 << 4)
+#define RXH_IP_DST      (1 << 5)
+#define RXH_L4_B_0_1    (1 << 6) /* src port in case of TCP/UDP/SCTP */
+#define RXH_L4_B_2_3    (1 << 7) /* dst port in case of TCP/UDP/SCTP */
+#define RXH_DISCARD     (1 << 31)
+
+#define RX_CLS_FLOW_DISC        0xffffffffffffffffULL
+
+/* Special RX classification rule insert location values */
+#define RX_CLS_LOC_SPECIAL      0x80000000      /* flag */
+#define RX_CLS_LOC_ANY          0xffffffff
+#define RX_CLS_LOC_FIRST        0xfffffffe
+#define RX_CLS_LOC_LAST         0xfffffffd
+
+/* EEPROM Standards for plug in modules */
+#define ETH_MODULE_SFF_8079             0x1
+#define ETH_MODULE_SFF_8079_LEN         256
+#define ETH_MODULE_SFF_8472             0x2
+#define ETH_MODULE_SFF_8472_LEN         512
+
+/* Reset flags */
+/* The reset() operation must clear the flags for the components which
+ * were actually reset.  On successful return, the flags indicate the
+ * components which were not reset, either because they do not exist
+ * in the hardware or because they cannot be reset independently.  The
+ * driver must never reset any components that were not requested.
+ */
+enum ethtool_reset_flags {
+        /* These flags represent components dedicated to the interface
+         * the command is addressed to.  Shift any flag left by
+         * ETH_RESET_SHARED_SHIFT to reset a shared component of the
+         * same type.
+         */
+        ETH_RESET_MGMT          = 1 << 0,       /* Management processor */
+        ETH_RESET_IRQ           = 1 << 1,       /* Interrupt requester */
+        ETH_RESET_DMA           = 1 << 2,       /* DMA engine */
+        ETH_RESET_FILTER        = 1 << 3,       /* Filtering/flow direction */
+        ETH_RESET_OFFLOAD       = 1 << 4,       /* Protocol offload */
+        ETH_RESET_MAC           = 1 << 5,       /* Media access controller */
+        ETH_RESET_PHY           = 1 << 6,       /* Transceiver/PHY */
+        ETH_RESET_RAM           = 1 << 7,       /* RAM shared between
+                                                 * multiple components */
+
+        ETH_RESET_DEDICATED     = 0x0000ffff,   /* All components dedicated to
+                                                 * this interface */
+        ETH_RESET_ALL           = 0xffffffff,   /* All components used by this
+                                                 * interface, even if shared */
+};
+#define ETH_RESET_SHARED_SHIFT  16
+
+#endif /* _UAPI_LINUX_ETHTOOL_H */
diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
new file mode 100644
index 000000000000..8c99ce7202c5
--- /dev/null
+++ b/include/uapi/linux/eventpoll.h
@@ -0,0 +1,66 @@
+/*
+ *  include/linux/eventpoll.h ( Efficient event polling implementation )
+ *  Copyright (C) 2001,...,2006  Davide Libenzi
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+
+#ifndef _UAPI_LINUX_EVENTPOLL_H
+#define _UAPI_LINUX_EVENTPOLL_H
+
+/* For O_CLOEXEC */
+#include <linux/fcntl.h>
+#include <linux/types.h>
+
+/* Flags for epoll_create1.  */
+#define EPOLL_CLOEXEC O_CLOEXEC
+
+/* Valid opcodes to issue to sys_epoll_ctl() */
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_DEL 2
+#define EPOLL_CTL_MOD 3
+#define EPOLL_CTL_DISABLE 4
+
+/*
+ * Request the handling of system wakeup events so as to prevent system suspends
+ * from happening while those events are being processed.
+ *
+ * Assuming neither EPOLLET nor EPOLLONESHOT is set, system suspends will not be
+ * re-allowed until epoll_wait is called again after consuming the wakeup
+ * event(s).
+ *
+ * Requires CAP_BLOCK_SUSPEND
+ */
+#define EPOLLWAKEUP (1 << 29)
+
+/* Set the One Shot behaviour for the target file descriptor */
+#define EPOLLONESHOT (1 << 30)
+
+/* Set the Edge Triggered behaviour for the target file descriptor */
+#define EPOLLET (1 << 31)
+
+/* 
+ * On x86-64 make the 64bit structure have the same alignment as the
+ * 32bit structure. This makes 32bit emulation easier.
+ *
+ * UML/x86_64 needs the same packing as x86_64
+ */
+#ifdef __x86_64__
+#define EPOLL_PACKED __attribute__((packed))
+#else
+#define EPOLL_PACKED
+#endif
+
+struct epoll_event {
+        __u32 events;
+        __u64 data;
+} EPOLL_PACKED;
+
+
+#endif /* _UAPI_LINUX_EVENTPOLL_H */
diff --git a/include/linux/fadvise.h b/include/uapi/linux/fadvise.h
index e8e747139b9a..e8e747139b9a 100644
--- a/include/linux/fadvise.h
+++ b/include/uapi/linux/fadvise.h
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
new file mode 100644
index 000000000000..990c4ccf8b61
--- /dev/null
+++ b/include/uapi/linux/falloc.h
@@ -0,0 +1,9 @@
+#ifndef _UAPI_FALLOC_H_
+#define _UAPI_FALLOC_H_
+
+#define FALLOC_FL_KEEP_SIZE     0x01 /* default is extend size */
+#define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
+#define FALLOC_FL_NO_HIDE_STALE 0x04 /* reserved codepoint */
+
+
+#endif /* _UAPI_FALLOC_H_ */
diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h
new file mode 100644
index 000000000000..030508d195d3
--- /dev/null
+++ b/include/uapi/linux/fanotify.h
@@ -0,0 +1,116 @@
+#ifndef _UAPI_LINUX_FANOTIFY_H
+#define _UAPI_LINUX_FANOTIFY_H
+
+#include <linux/types.h>
+
+/* the following events that user-space can register for */
+#define FAN_ACCESS              0x00000001      /* File was accessed */
+#define FAN_MODIFY              0x00000002      /* File was modified */
+#define FAN_CLOSE_WRITE         0x00000008      /* Writtable file closed */
+#define FAN_CLOSE_NOWRITE       0x00000010      /* Unwrittable file closed */
+#define FAN_OPEN                0x00000020      /* File was opened */
+
+#define FAN_Q_OVERFLOW          0x00004000      /* Event queued overflowed */
+
+#define FAN_OPEN_PERM           0x00010000      /* File open in perm check */
+#define FAN_ACCESS_PERM         0x00020000      /* File accessed in perm check */
+
+#define FAN_ONDIR               0x40000000      /* event occurred against dir */
+
+#define FAN_EVENT_ON_CHILD      0x08000000      /* interested in child events */
+
+/* helper events */
+#define FAN_CLOSE               (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
+
+/* flags used for fanotify_init() */
+#define FAN_CLOEXEC             0x00000001
+#define FAN_NONBLOCK            0x00000002
+
+/* These are NOT bitwise flags.  Both bits are used togther.  */
+#define FAN_CLASS_NOTIF         0x00000000
+#define FAN_CLASS_CONTENT       0x00000004
+#define FAN_CLASS_PRE_CONTENT   0x00000008
+#define FAN_ALL_CLASS_BITS      (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
+                                 FAN_CLASS_PRE_CONTENT)
+
+#define FAN_UNLIMITED_QUEUE     0x00000010
+#define FAN_UNLIMITED_MARKS     0x00000020
+
+#define FAN_ALL_INIT_FLAGS      (FAN_CLOEXEC | FAN_NONBLOCK | \
+                                 FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
+                                 FAN_UNLIMITED_MARKS)
+
+/* flags used for fanotify_modify_mark() */
+#define FAN_MARK_ADD            0x00000001
+#define FAN_MARK_REMOVE         0x00000002
+#define FAN_MARK_DONT_FOLLOW    0x00000004
+#define FAN_MARK_ONLYDIR        0x00000008
+#define FAN_MARK_MOUNT          0x00000010
+#define FAN_MARK_IGNORED_MASK   0x00000020
+#define FAN_MARK_IGNORED_SURV_MODIFY    0x00000040
+#define FAN_MARK_FLUSH          0x00000080
+
+#define FAN_ALL_MARK_FLAGS      (FAN_MARK_ADD |\
+                                 FAN_MARK_REMOVE |\
+                                 FAN_MARK_DONT_FOLLOW |\
+                                 FAN_MARK_ONLYDIR |\
+                                 FAN_MARK_MOUNT |\
+                                 FAN_MARK_IGNORED_MASK |\
+                                 FAN_MARK_IGNORED_SURV_MODIFY |\
+                                 FAN_MARK_FLUSH)
+
+/*
+ * All of the events - we build the list by hand so that we can add flags in
+ * the future and not break backward compatibility.  Apps will get only the
+ * events that they originally wanted.  Be sure to add new events here!
+ */
+#define FAN_ALL_EVENTS (FAN_ACCESS |\
+                        FAN_MODIFY |\
+                        FAN_CLOSE |\
+                        FAN_OPEN)
+
+/*
+ * All events which require a permission response from userspace
+ */
+#define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM |\
+                             FAN_ACCESS_PERM)
+
+#define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS |\
+                                 FAN_ALL_PERM_EVENTS |\
+                                 FAN_Q_OVERFLOW)
+
+#define FANOTIFY_METADATA_VERSION       3
+
+struct fanotify_event_metadata {
+        __u32 event_len;
+        __u8 vers;
+        __u8 reserved;
+        __u16 metadata_len;
+        __aligned_u64 mask;
+        __s32 fd;
+        __s32 pid;
+};
+
+struct fanotify_response {
+        __s32 fd;
+        __u32 response;
+};
+
+/* Legit userspace responses to a _PERM event */
+#define FAN_ALLOW       0x01
+#define FAN_DENY        0x02
+/* No fd set in event */
+#define FAN_NOFD        -1
+
+/* Helper functions to deal with fanotify_event_metadata buffers */
+#define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
+
+#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, \
+                                   (struct fanotify_event_metadata*)(((char *)(meta)) + \
+                                   (meta)->event_len))
+
+#define FAN_EVENT_OK(meta, len) ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && \
+                                (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \
+                                (long)(meta)->event_len <= (long)(len))
+
+#endif /* _UAPI_LINUX_FANOTIFY_H */
diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
new file mode 100644
index 000000000000..fb795c3b3c17
--- /dev/null
+++ b/include/uapi/linux/fb.h
@@ -0,0 +1,402 @@
+#ifndef _UAPI_LINUX_FB_H
+#define _UAPI_LINUX_FB_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* Definitions of frame buffers                                         */
+
+#define FB_MAX                  32      /* sufficient for now */
+
+/* ioctls
+   0x46 is 'F'                                                          */
+#define FBIOGET_VSCREENINFO     0x4600
+#define FBIOPUT_VSCREENINFO     0x4601
+#define FBIOGET_FSCREENINFO     0x4602
+#define FBIOGETCMAP             0x4604
+#define FBIOPUTCMAP             0x4605
+#define FBIOPAN_DISPLAY         0x4606
+#ifndef __KERNEL__
+#define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor)
+#endif
+/* 0x4607-0x460B are defined below */
+/* #define FBIOGET_MONITORSPEC  0x460C */
+/* #define FBIOPUT_MONITORSPEC  0x460D */
+/* #define FBIOSWITCH_MONIBIT   0x460E */
+#define FBIOGET_CON2FBMAP       0x460F
+#define FBIOPUT_CON2FBMAP       0x4610
+#define FBIOBLANK               0x4611          /* arg: 0 or vesa level + 1 */
+#define FBIOGET_VBLANK          _IOR('F', 0x12, struct fb_vblank)
+#define FBIO_ALLOC              0x4613
+#define FBIO_FREE               0x4614
+#define FBIOGET_GLYPH           0x4615
+#define FBIOGET_HWCINFO         0x4616
+#define FBIOPUT_MODEINFO        0x4617
+#define FBIOGET_DISPINFO        0x4618
+#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, __u32)
+
+#define FB_TYPE_PACKED_PIXELS           0       /* Packed Pixels        */
+#define FB_TYPE_PLANES                  1       /* Non interleaved planes */
+#define FB_TYPE_INTERLEAVED_PLANES      2       /* Interleaved planes   */
+#define FB_TYPE_TEXT                    3       /* Text/attributes      */
+#define FB_TYPE_VGA_PLANES              4       /* EGA/VGA planes       */
+#define FB_TYPE_FOURCC                  5       /* Type identified by a V4L2 FOURCC */
+
+#define FB_AUX_TEXT_MDA         0       /* Monochrome text */
+#define FB_AUX_TEXT_CGA         1       /* CGA/EGA/VGA Color text */
+#define FB_AUX_TEXT_S3_MMIO     2       /* S3 MMIO fasttext */
+#define FB_AUX_TEXT_MGA_STEP16  3       /* MGA Millenium I: text, attr, 14 reserved bytes */
+#define FB_AUX_TEXT_MGA_STEP8   4       /* other MGAs:      text, attr,  6 reserved bytes */
+#define FB_AUX_TEXT_SVGA_GROUP  8       /* 8-15: SVGA tileblit compatible modes */
+#define FB_AUX_TEXT_SVGA_MASK   7       /* lower three bits says step */
+#define FB_AUX_TEXT_SVGA_STEP2  8       /* SVGA text mode:  text, attr */
+#define FB_AUX_TEXT_SVGA_STEP4  9       /* SVGA text mode:  text, attr,  2 reserved bytes */
+#define FB_AUX_TEXT_SVGA_STEP8  10      /* SVGA text mode:  text, attr,  6 reserved bytes */
+#define FB_AUX_TEXT_SVGA_STEP16 11      /* SVGA text mode:  text, attr, 14 reserved bytes */
+#define FB_AUX_TEXT_SVGA_LAST   15      /* reserved up to 15 */
+
+#define FB_AUX_VGA_PLANES_VGA4          0       /* 16 color planes (EGA/VGA) */
+#define FB_AUX_VGA_PLANES_CFB4          1       /* CFB4 in planes (VGA) */
+#define FB_AUX_VGA_PLANES_CFB8          2       /* CFB8 in planes (VGA) */
+
+#define FB_VISUAL_MONO01                0       /* Monochr. 1=Black 0=White */
+#define FB_VISUAL_MONO10                1       /* Monochr. 1=White 0=Black */
+#define FB_VISUAL_TRUECOLOR             2       /* True color   */
+#define FB_VISUAL_PSEUDOCOLOR           3       /* Pseudo color (like atari) */
+#define FB_VISUAL_DIRECTCOLOR           4       /* Direct color */
+#define FB_VISUAL_STATIC_PSEUDOCOLOR    5       /* Pseudo color readonly */
+#define FB_VISUAL_FOURCC                6       /* Visual identified by a V4L2 FOURCC */
+
+#define FB_ACCEL_NONE           0       /* no hardware accelerator      */
+#define FB_ACCEL_ATARIBLITT     1       /* Atari Blitter                */
+#define FB_ACCEL_AMIGABLITT     2       /* Amiga Blitter                */
+#define FB_ACCEL_S3_TRIO64      3       /* Cybervision64 (S3 Trio64)    */
+#define FB_ACCEL_NCR_77C32BLT   4       /* RetinaZ3 (NCR 77C32BLT)      */
+#define FB_ACCEL_S3_VIRGE       5       /* Cybervision64/3D (S3 ViRGE)  */
+#define FB_ACCEL_ATI_MACH64GX   6       /* ATI Mach 64GX family         */
+#define FB_ACCEL_DEC_TGA        7       /* DEC 21030 TGA                */
+#define FB_ACCEL_ATI_MACH64CT   8       /* ATI Mach 64CT family         */
+#define FB_ACCEL_ATI_MACH64VT   9       /* ATI Mach 64CT family VT class */
+#define FB_ACCEL_ATI_MACH64GT   10      /* ATI Mach 64CT family GT class */
+#define FB_ACCEL_SUN_CREATOR    11      /* Sun Creator/Creator3D        */
+#define FB_ACCEL_SUN_CGSIX      12      /* Sun cg6                      */
+#define FB_ACCEL_SUN_LEO        13      /* Sun leo/zx                   */
+#define FB_ACCEL_IMS_TWINTURBO  14      /* IMS Twin Turbo               */
+#define FB_ACCEL_3DLABS_PERMEDIA2 15    /* 3Dlabs Permedia 2            */
+#define FB_ACCEL_MATROX_MGA2064W 16     /* Matrox MGA2064W (Millenium)  */
+#define FB_ACCEL_MATROX_MGA1064SG 17    /* Matrox MGA1064SG (Mystique)  */
+#define FB_ACCEL_MATROX_MGA2164W 18     /* Matrox MGA2164W (Millenium II) */
+#define FB_ACCEL_MATROX_MGA2164W_AGP 19 /* Matrox MGA2164W (Millenium II) */
+#define FB_ACCEL_MATROX_MGAG100 20      /* Matrox G100 (Productiva G100) */
+#define FB_ACCEL_MATROX_MGAG200 21      /* Matrox G200 (Myst, Mill, ...) */
+#define FB_ACCEL_SUN_CG14       22      /* Sun cgfourteen                */
+#define FB_ACCEL_SUN_BWTWO      23      /* Sun bwtwo                    */
+#define FB_ACCEL_SUN_CGTHREE    24      /* Sun cgthree                  */
+#define FB_ACCEL_SUN_TCX        25      /* Sun tcx                      */
+#define FB_ACCEL_MATROX_MGAG400 26      /* Matrox G400                  */
+#define FB_ACCEL_NV3            27      /* nVidia RIVA 128              */
+#define FB_ACCEL_NV4            28      /* nVidia RIVA TNT              */
+#define FB_ACCEL_NV5            29      /* nVidia RIVA TNT2             */
+#define FB_ACCEL_CT_6555x       30      /* C&T 6555x                    */
+#define FB_ACCEL_3DFX_BANSHEE   31      /* 3Dfx Banshee                 */
+#define FB_ACCEL_ATI_RAGE128    32      /* ATI Rage128 family           */
+#define FB_ACCEL_IGS_CYBER2000  33      /* CyberPro 2000                */
+#define FB_ACCEL_IGS_CYBER2010  34      /* CyberPro 2010                */
+#define FB_ACCEL_IGS_CYBER5000  35      /* CyberPro 5000                */
+#define FB_ACCEL_SIS_GLAMOUR    36      /* SiS 300/630/540              */
+#define FB_ACCEL_3DLABS_PERMEDIA3 37    /* 3Dlabs Permedia 3            */
+#define FB_ACCEL_ATI_RADEON     38      /* ATI Radeon family            */
+#define FB_ACCEL_I810           39      /* Intel 810/815                */
+#define FB_ACCEL_SIS_GLAMOUR_2  40      /* SiS 315, 650, 740            */
+#define FB_ACCEL_SIS_XABRE      41      /* SiS 330 ("Xabre")            */
+#define FB_ACCEL_I830           42      /* Intel 830M/845G/85x/865G     */
+#define FB_ACCEL_NV_10          43      /* nVidia Arch 10               */
+#define FB_ACCEL_NV_20          44      /* nVidia Arch 20               */
+#define FB_ACCEL_NV_30          45      /* nVidia Arch 30               */
+#define FB_ACCEL_NV_40          46      /* nVidia Arch 40               */
+#define FB_ACCEL_XGI_VOLARI_V   47      /* XGI Volari V3XT, V5, V8      */
+#define FB_ACCEL_XGI_VOLARI_Z   48      /* XGI Volari Z7                */
+#define FB_ACCEL_OMAP1610       49      /* TI OMAP16xx                  */
+#define FB_ACCEL_TRIDENT_TGUI   50      /* Trident TGUI                 */
+#define FB_ACCEL_TRIDENT_3DIMAGE 51     /* Trident 3DImage              */
+#define FB_ACCEL_TRIDENT_BLADE3D 52     /* Trident Blade3D              */
+#define FB_ACCEL_TRIDENT_BLADEXP 53     /* Trident BladeXP              */
+#define FB_ACCEL_CIRRUS_ALPINE   53     /* Cirrus Logic 543x/544x/5480  */
+#define FB_ACCEL_NEOMAGIC_NM2070 90     /* NeoMagic NM2070              */
+#define FB_ACCEL_NEOMAGIC_NM2090 91     /* NeoMagic NM2090              */
+#define FB_ACCEL_NEOMAGIC_NM2093 92     /* NeoMagic NM2093              */
+#define FB_ACCEL_NEOMAGIC_NM2097 93     /* NeoMagic NM2097              */
+#define FB_ACCEL_NEOMAGIC_NM2160 94     /* NeoMagic NM2160              */
+#define FB_ACCEL_NEOMAGIC_NM2200 95     /* NeoMagic NM2200              */
+#define FB_ACCEL_NEOMAGIC_NM2230 96     /* NeoMagic NM2230              */
+#define FB_ACCEL_NEOMAGIC_NM2360 97     /* NeoMagic NM2360              */
+#define FB_ACCEL_NEOMAGIC_NM2380 98     /* NeoMagic NM2380              */
+#define FB_ACCEL_PXA3XX          99     /* PXA3xx                       */
+
+#define FB_ACCEL_SAVAGE4        0x80    /* S3 Savage4                   */
+#define FB_ACCEL_SAVAGE3D       0x81    /* S3 Savage3D                  */
+#define FB_ACCEL_SAVAGE3D_MV    0x82    /* S3 Savage3D-MV               */
+#define FB_ACCEL_SAVAGE2000     0x83    /* S3 Savage2000                */
+#define FB_ACCEL_SAVAGE_MX_MV   0x84    /* S3 Savage/MX-MV              */
+#define FB_ACCEL_SAVAGE_MX      0x85    /* S3 Savage/MX                 */
+#define FB_ACCEL_SAVAGE_IX_MV   0x86    /* S3 Savage/IX-MV              */
+#define FB_ACCEL_SAVAGE_IX      0x87    /* S3 Savage/IX                 */
+#define FB_ACCEL_PROSAVAGE_PM   0x88    /* S3 ProSavage PM133           */
+#define FB_ACCEL_PROSAVAGE_KM   0x89    /* S3 ProSavage KM133           */
+#define FB_ACCEL_S3TWISTER_P    0x8a    /* S3 Twister                   */
+#define FB_ACCEL_S3TWISTER_K    0x8b    /* S3 TwisterK                  */
+#define FB_ACCEL_SUPERSAVAGE    0x8c    /* S3 Supersavage               */
+#define FB_ACCEL_PROSAVAGE_DDR  0x8d    /* S3 ProSavage DDR             */
+#define FB_ACCEL_PROSAVAGE_DDRK 0x8e    /* S3 ProSavage DDR-K           */
+
+#define FB_ACCEL_PUV3_UNIGFX    0xa0    /* PKUnity-v3 Unigfx            */
+
+#define FB_CAP_FOURCC           1       /* Device supports FOURCC-based formats */
+
+struct fb_fix_screeninfo {
+        char id[16];                    /* identification string eg "TT Builtin" */
+        unsigned long smem_start;       /* Start of frame buffer mem */
+                                        /* (physical address) */
+        __u32 smem_len;                 /* Length of frame buffer mem */
+        __u32 type;                     /* see FB_TYPE_*                */
+        __u32 type_aux;                 /* Interleave for interleaved Planes */
+        __u32 visual;                   /* see FB_VISUAL_*              */ 
+        __u16 xpanstep;                 /* zero if no hardware panning  */
+        __u16 ypanstep;                 /* zero if no hardware panning  */
+        __u16 ywrapstep;                /* zero if no hardware ywrap    */
+        __u32 line_length;              /* length of a line in bytes    */
+        unsigned long mmio_start;       /* Start of Memory Mapped I/O   */
+                                        /* (physical address) */
+        __u32 mmio_len;                 /* Length of Memory Mapped I/O  */
+        __u32 accel;                    /* Indicate to driver which     */
+                                        /*  specific chip/card we have  */
+        __u16 capabilities;             /* see FB_CAP_*                 */
+        __u16 reserved[2];              /* Reserved for future compatibility */
+};
+
+/* Interpretation of offset for color fields: All offsets are from the right,
+ * inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you
+ * can use the offset as right argument to <<). A pixel afterwards is a bit
+ * stream and is written to video memory as that unmodified.
+ *
+ * For pseudocolor: offset and length should be the same for all color
+ * components. Offset specifies the position of the least significant bit
+ * of the pallette index in a pixel value. Length indicates the number
+ * of available palette entries (i.e. # of entries = 1 << length).
+ */
+struct fb_bitfield {
+        __u32 offset;                   /* beginning of bitfield        */
+        __u32 length;                   /* length of bitfield           */
+        __u32 msb_right;                /* != 0 : Most significant bit is */ 
+                                        /* right */ 
+};
+
+#define FB_NONSTD_HAM           1       /* Hold-And-Modify (HAM)        */
+#define FB_NONSTD_REV_PIX_IN_B  2       /* order of pixels in each byte is reversed */
+
+#define FB_ACTIVATE_NOW         0       /* set values immediately (or vbl)*/
+#define FB_ACTIVATE_NXTOPEN     1       /* activate on next open        */
+#define FB_ACTIVATE_TEST        2       /* don't set, round up impossible */
+#define FB_ACTIVATE_MASK       15
+                                        /* values                       */
+#define FB_ACTIVATE_VBL        16       /* activate values on next vbl  */
+#define FB_CHANGE_CMAP_VBL     32       /* change colormap on vbl       */
+#define FB_ACTIVATE_ALL        64       /* change all VCs on this fb    */
+#define FB_ACTIVATE_FORCE     128       /* force apply even when no change*/
+#define FB_ACTIVATE_INV_MODE  256       /* invalidate videomode */
+
+#define FB_ACCELF_TEXT          1       /* (OBSOLETE) see fb_info.flags and vc_mode */
+
+#define FB_SYNC_HOR_HIGH_ACT    1       /* horizontal sync high active  */
+#define FB_SYNC_VERT_HIGH_ACT   2       /* vertical sync high active    */
+#define FB_SYNC_EXT             4       /* external sync                */
+#define FB_SYNC_COMP_HIGH_ACT   8       /* composite sync high active   */
+#define FB_SYNC_BROADCAST       16      /* broadcast video timings      */
+                                        /* vtotal = 144d/288n/576i => PAL  */
+                                        /* vtotal = 121d/242n/484i => NTSC */
+#define FB_SYNC_ON_GREEN        32      /* sync on green */
+
+#define FB_VMODE_NONINTERLACED  0       /* non interlaced */
+#define FB_VMODE_INTERLACED     1       /* interlaced   */
+#define FB_VMODE_DOUBLE         2       /* double scan */
+#define FB_VMODE_ODD_FLD_FIRST  4       /* interlaced: top line first */
+#define FB_VMODE_MASK           255
+
+#define FB_VMODE_YWRAP          256     /* ywrap instead of panning     */
+#define FB_VMODE_SMOOTH_XPAN    512     /* smooth xpan possible (internally used) */
+#define FB_VMODE_CONUPDATE      512     /* don't update x/yoffset       */
+
+/*
+ * Display rotation support
+ */
+#define FB_ROTATE_UR      0
+#define FB_ROTATE_CW      1
+#define FB_ROTATE_UD      2
+#define FB_ROTATE_CCW     3
+
+#define PICOS2KHZ(a) (1000000000UL/(a))
+#define KHZ2PICOS(a) (1000000000UL/(a))
+
+struct fb_var_screeninfo {
+        __u32 xres;                     /* visible resolution           */
+        __u32 yres;
+        __u32 xres_virtual;             /* virtual resolution           */
+        __u32 yres_virtual;
+        __u32 xoffset;                  /* offset from virtual to visible */
+        __u32 yoffset;                  /* resolution                   */
+
+        __u32 bits_per_pixel;           /* guess what                   */
+        __u32 grayscale;                /* 0 = color, 1 = grayscale,    */
+                                        /* >1 = FOURCC                  */
+        struct fb_bitfield red;         /* bitfield in fb mem if true color, */
+        struct fb_bitfield green;       /* else only length is significant */
+        struct fb_bitfield blue;
+        struct fb_bitfield transp;      /* transparency                 */      
+
+        __u32 nonstd;                   /* != 0 Non standard pixel format */
+
+        __u32 activate;                 /* see FB_ACTIVATE_*            */
+
+        __u32 height;                   /* height of picture in mm    */
+        __u32 width;                    /* width of picture in mm     */
+
+        __u32 accel_flags;              /* (OBSOLETE) see fb_info.flags */
+
+        /* Timing: All values in pixclocks, except pixclock (of course) */
+        __u32 pixclock;                 /* pixel clock in ps (pico seconds) */
+        __u32 left_margin;              /* time from sync to picture    */
+        __u32 right_margin;             /* time from picture to sync    */
+        __u32 upper_margin;             /* time from sync to picture    */
+        __u32 lower_margin;
+        __u32 hsync_len;                /* length of horizontal sync    */
+        __u32 vsync_len;                /* length of vertical sync      */
+        __u32 sync;                     /* see FB_SYNC_*                */
+        __u32 vmode;                    /* see FB_VMODE_*               */
+        __u32 rotate;                   /* angle we rotate counter clockwise */
+        __u32 colorspace;               /* colorspace for FOURCC-based modes */
+        __u32 reserved[4];              /* Reserved for future compatibility */
+};
+
+struct fb_cmap {
+        __u32 start;                    /* First entry  */
+        __u32 len;                      /* Number of entries */
+        __u16 *red;                     /* Red values   */
+        __u16 *green;
+        __u16 *blue;
+        __u16 *transp;                  /* transparency, can be NULL */
+};
+
+struct fb_con2fbmap {
+        __u32 console;
+        __u32 framebuffer;
+};
+
+/* VESA Blanking Levels */
+#define VESA_NO_BLANKING        0
+#define VESA_VSYNC_SUSPEND      1
+#define VESA_HSYNC_SUSPEND      2
+#define VESA_POWERDOWN          3
+
+
+enum {
+        /* screen: unblanked, hsync: on,  vsync: on */
+        FB_BLANK_UNBLANK       = VESA_NO_BLANKING,
+
+        /* screen: blanked,   hsync: on,  vsync: on */
+        FB_BLANK_NORMAL        = VESA_NO_BLANKING + 1,
+
+        /* screen: blanked,   hsync: on,  vsync: off */
+        FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1,
+
+        /* screen: blanked,   hsync: off, vsync: on */
+        FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1,
+
+        /* screen: blanked,   hsync: off, vsync: off */
+        FB_BLANK_POWERDOWN     = VESA_POWERDOWN + 1
+};
+
+#define FB_VBLANK_VBLANKING     0x001   /* currently in a vertical blank */
+#define FB_VBLANK_HBLANKING     0x002   /* currently in a horizontal blank */
+#define FB_VBLANK_HAVE_VBLANK   0x004   /* vertical blanks can be detected */
+#define FB_VBLANK_HAVE_HBLANK   0x008   /* horizontal blanks can be detected */
+#define FB_VBLANK_HAVE_COUNT    0x010   /* global retrace counter is available */
+#define FB_VBLANK_HAVE_VCOUNT   0x020   /* the vcount field is valid */
+#define FB_VBLANK_HAVE_HCOUNT   0x040   /* the hcount field is valid */
+#define FB_VBLANK_VSYNCING      0x080   /* currently in a vsync */
+#define FB_VBLANK_HAVE_VSYNC    0x100   /* verical syncs can be detected */
+
+struct fb_vblank {
+        __u32 flags;                    /* FB_VBLANK flags */
+        __u32 count;                    /* counter of retraces since boot */
+        __u32 vcount;                   /* current scanline position */
+        __u32 hcount;                   /* current scandot position */
+        __u32 reserved[4];              /* reserved for future compatibility */
+};
+
+/* Internal HW accel */
+#define ROP_COPY 0
+#define ROP_XOR  1
+
+struct fb_copyarea {
+        __u32 dx;
+        __u32 dy;
+        __u32 width;
+        __u32 height;
+        __u32 sx;
+        __u32 sy;
+};
+
+struct fb_fillrect {
+        __u32 dx;       /* screen-relative */
+        __u32 dy;
+        __u32 width;
+        __u32 height;
+        __u32 color;
+        __u32 rop;
+};
+
+struct fb_image {
+        __u32 dx;               /* Where to place image */
+        __u32 dy;
+        __u32 width;            /* Size of image */
+        __u32 height;
+        __u32 fg_color;         /* Only used when a mono bitmap */
+        __u32 bg_color;
+        __u8  depth;            /* Depth of the image */
+        const char *data;       /* Pointer to image data */
+        struct fb_cmap cmap;    /* color map info */
+};
+
+/*
+ * hardware cursor control
+ */
+
+#define FB_CUR_SETIMAGE 0x01
+#define FB_CUR_SETPOS   0x02
+#define FB_CUR_SETHOT   0x04
+#define FB_CUR_SETCMAP  0x08
+#define FB_CUR_SETSHAPE 0x10
+#define FB_CUR_SETSIZE  0x20
+#define FB_CUR_SETALL   0xFF
+
+struct fbcurpos {
+        __u16 x, y;
+};
+
+struct fb_cursor {
+        __u16 set;              /* what to set */
+        __u16 enable;           /* cursor on/off */
+        __u16 rop;              /* bitop operation */
+        const char *mask;       /* cursor mask bits */
+        struct fbcurpos hot;    /* cursor hot spot */
+        struct fb_image image;  /* Cursor image */
+};
+
+#ifdef CONFIG_FB_BACKLIGHT
+/* Settings for the generic backlight code */
+#define FB_BACKLIGHT_LEVELS     128
+#define FB_BACKLIGHT_MAX        0xFF
+#endif
+
+
+#endif /* _UAPI_LINUX_FB_H */
diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h
new file mode 100644
index 000000000000..074b886c6be0
--- /dev/null
+++ b/include/uapi/linux/fcntl.h
@@ -0,0 +1,52 @@
+#ifndef _UAPI_LINUX_FCNTL_H
+#define _UAPI_LINUX_FCNTL_H
+
+#include <asm/fcntl.h>
+
+#define F_SETLEASE      (F_LINUX_SPECIFIC_BASE + 0)
+#define F_GETLEASE      (F_LINUX_SPECIFIC_BASE + 1)
+
+/*
+ * Cancel a blocking posix lock; internal use only until we expose an
+ * asynchronous lock api to userspace:
+ */
+#define F_CANCELLK      (F_LINUX_SPECIFIC_BASE + 5)
+
+/* Create a file descriptor with FD_CLOEXEC set. */
+#define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6)
+
+/*
+ * Request nofications on a directory.
+ * See below for events that may be notified.
+ */
+#define F_NOTIFY        (F_LINUX_SPECIFIC_BASE+2)
+
+/*
+ * Set and get of pipe page size array
+ */
+#define F_SETPIPE_SZ    (F_LINUX_SPECIFIC_BASE + 7)
+#define F_GETPIPE_SZ    (F_LINUX_SPECIFIC_BASE + 8)
+
+/*
+ * Types of directory notifications that may be requested.
+ */
+#define DN_ACCESS       0x00000001      /* File accessed */
+#define DN_MODIFY       0x00000002      /* File modified */
+#define DN_CREATE       0x00000004      /* File created */
+#define DN_DELETE       0x00000008      /* File removed */
+#define DN_RENAME       0x00000010      /* File renamed */
+#define DN_ATTRIB       0x00000020      /* File changed attibutes */
+#define DN_MULTISHOT    0x80000000      /* Don't remove notifier */
+
+#define AT_FDCWD                -100    /* Special value used to indicate
+                                           openat should use the current
+                                           working directory. */
+#define AT_SYMLINK_NOFOLLOW     0x100   /* Do not follow symbolic links.  */
+#define AT_REMOVEDIR            0x200   /* Remove directory instead of
+                                           unlinking file.  */
+#define AT_SYMLINK_FOLLOW       0x400   /* Follow symbolic links.  */
+#define AT_NO_AUTOMOUNT         0x800   /* Suppress terminal automount traversal */
+#define AT_EMPTY_PATH           0x1000  /* Allow empty relative pathname */
+
+
+#endif /* _UAPI_LINUX_FCNTL_H */
diff --git a/include/uapi/linux/fd.h b/include/uapi/linux/fd.h
new file mode 100644
index 000000000000..f1f3dd5981b2
--- /dev/null
+++ b/include/uapi/linux/fd.h
@@ -0,0 +1,382 @@
+#ifndef _UAPI_LINUX_FD_H
+#define _UAPI_LINUX_FD_H
+
+#include <linux/ioctl.h>
+#include <linux/compiler.h>
+
+/* New file layout: Now the ioctl definitions immediately follow the
+ * definitions of the structures that they use */
+
+/*
+ * Geometry
+ */
+struct floppy_struct {
+        unsigned int    size,           /* nr of sectors total */
+                        sect,           /* sectors per track */
+                        head,           /* nr of heads */
+                        track,          /* nr of tracks */
+                        stretch;        /* bit 0 !=0 means double track steps */
+                                        /* bit 1 != 0 means swap sides */
+                                        /* bits 2..9 give the first sector */
+                                        /*  number (the LSB is flipped) */
+#define FD_STRETCH 1
+#define FD_SWAPSIDES 2
+#define FD_ZEROBASED 4
+#define FD_SECTBASEMASK 0x3FC
+#define FD_MKSECTBASE(s) (((s) ^ 1) << 2)
+#define FD_SECTBASE(floppy) ((((floppy)->stretch & FD_SECTBASEMASK) >> 2) ^ 1)
+
+        unsigned char   gap,            /* gap1 size */
+
+                        rate,           /* data rate. |= 0x40 for perpendicular */
+#define FD_2M 0x4
+#define FD_SIZECODEMASK 0x38
+#define FD_SIZECODE(floppy) (((((floppy)->rate&FD_SIZECODEMASK)>> 3)+ 2) %8)
+#define FD_SECTSIZE(floppy) ( (floppy)->rate & FD_2M ? \
+                             512 : 128 << FD_SIZECODE(floppy) )
+#define FD_PERP 0x40
+
+                        spec1,          /* stepping rate, head unload time */
+                        fmt_gap;        /* gap2 size */
+        const char      * name; /* used only for predefined formats */
+};
+
+
+/* commands needing write access have 0x40 set */
+/* commands needing super user access have 0x80 set */
+
+#define FDCLRPRM _IO(2, 0x41)
+/* clear user-defined parameters */
+
+#define FDSETPRM _IOW(2, 0x42, struct floppy_struct) 
+#define FDSETMEDIAPRM FDSETPRM
+/* set user-defined parameters for current media */
+
+#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct) 
+#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
+#define FDDEFMEDIAPRM FDDEFPRM
+#define FDGETMEDIAPRM FDGETPRM
+/* set/get disk parameters */
+
+
+#define FDMSGON  _IO(2,0x45)
+#define FDMSGOFF _IO(2,0x46)
+/* issue/don't issue kernel messages on media type change */
+
+
+/* 
+ * Formatting (obsolete)
+ */
+#define FD_FILL_BYTE 0xF6 /* format fill byte. */
+
+struct format_descr {
+        unsigned int device,head,track;
+};
+
+#define FDFMTBEG _IO(2,0x47)
+/* begin formatting a disk */
+#define FDFMTTRK _IOW(2,0x48, struct format_descr)
+/* format the specified track */
+#define FDFMTEND _IO(2,0x49)
+/* end formatting a disk */
+
+
+/*
+ * Error thresholds
+ */
+struct floppy_max_errors {
+        unsigned int
+          abort,      /* number of errors to be reached before aborting */
+          read_track, /* maximal number of errors permitted to read an
+                       * entire track at once */
+          reset,      /* maximal number of errors before a reset is tried */
+          recal,      /* maximal number of errors before a recalibrate is
+                       * tried */
+
+          /*
+           * Threshold for reporting FDC errors to the console.
+           * Setting this to zero may flood your screen when using
+           * ultra cheap floppies ;-)
+           */
+          reporting;
+
+};
+
+#define FDSETEMSGTRESH  _IO(2,0x4a)
+/* set fdc error reporting threshold */
+
+#define FDFLUSH  _IO(2,0x4b)
+/* flush buffers for media; either for verifying media, or for
+ * handling a media change without closing the file descriptor */
+
+#define FDSETMAXERRS _IOW(2, 0x4c, struct floppy_max_errors)
+#define FDGETMAXERRS _IOR(2, 0x0e, struct floppy_max_errors)
+/* set/get abortion and read_track threshold. See also floppy_drive_params
+ * structure */
+
+
+typedef char floppy_drive_name[16];
+#define FDGETDRVTYP _IOR(2, 0x0f, floppy_drive_name)
+/* get drive type: 5 1/4 or 3 1/2 */
+
+
+/*
+ * Drive parameters (user modifiable)
+ */
+struct floppy_drive_params {
+        signed char cmos;               /* CMOS type */
+        
+        /* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms 
+         * etc) and ND is set means no DMA. Hardcoded to 6 (HLD=6ms, use DMA).
+         */
+        unsigned long max_dtr;          /* Step rate, usec */
+        unsigned long hlt;              /* Head load/settle time, msec */
+        unsigned long hut;              /* Head unload time (remnant of 
+                                         * 8" drives) */
+        unsigned long srt;              /* Step rate, usec */
+
+        unsigned long spinup;           /* time needed for spinup (expressed
+                                         * in jiffies) */
+        unsigned long spindown;         /* timeout needed for spindown */
+        unsigned char spindown_offset;  /* decides in which position the disk
+                                         * will stop */
+        unsigned char select_delay;     /* delay to wait after select */
+        unsigned char rps;              /* rotations per second */
+        unsigned char tracks;           /* maximum number of tracks */
+        unsigned long timeout;          /* timeout for interrupt requests */
+        
+        unsigned char interleave_sect;  /* if there are more sectors, use 
+                                         * interleave */
+        
+        struct floppy_max_errors max_errors;
+        
+        char flags;                     /* various flags, including ftd_msg */
+/*
+ * Announce successful media type detection and media information loss after
+ * disk changes.
+ * Also used to enable/disable printing of overrun warnings.
+ */
+
+#define FTD_MSG 0x10
+#define FD_BROKEN_DCL 0x20
+#define FD_DEBUG 0x02
+#define FD_SILENT_DCL_CLEAR 0x4
+#define FD_INVERTED_DCL 0x80 /* must be 0x80, because of hardware 
+                                considerations */
+
+        char read_track;                /* use readtrack during probing? */
+
+/*
+ * Auto-detection. Each drive type has eight formats which are
+ * used in succession to try to read the disk. If the FDC cannot lock onto
+ * the disk, the next format is tried. This uses the variable 'probing'.
+ */
+        short autodetect[8];            /* autodetected formats */
+        
+        int checkfreq; /* how often should the drive be checked for disk 
+                        * changes */
+        int native_format; /* native format of this drive */
+};
+
+enum {
+        FD_NEED_TWADDLE_BIT,    /* more magic */
+        FD_VERIFY_BIT,          /* inquire for write protection */
+        FD_DISK_NEWCHANGE_BIT,  /* change detected, and no action undertaken yet
+                                 * to clear media change status */
+        FD_UNUSED_BIT,
+        FD_DISK_CHANGED_BIT,    /* disk has been changed since last i/o */
+        FD_DISK_WRITABLE_BIT    /* disk is writable */
+};
+
+#define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params)
+#define FDGETDRVPRM _IOR(2, 0x11, struct floppy_drive_params)
+/* set/get drive parameters */
+
+
+/*
+ * Current drive state (not directly modifiable by user, readonly)
+ */
+struct floppy_drive_struct {
+        unsigned long flags;
+/* values for these flags */
+#define FD_NEED_TWADDLE (1 << FD_NEED_TWADDLE_BIT)
+#define FD_VERIFY (1 << FD_VERIFY_BIT)
+#define FD_DISK_NEWCHANGE (1 << FD_DISK_NEWCHANGE_BIT)
+#define FD_DISK_CHANGED (1 << FD_DISK_CHANGED_BIT)
+#define FD_DISK_WRITABLE (1 << FD_DISK_WRITABLE_BIT)
+
+        unsigned long spinup_date;
+        unsigned long select_date;
+        unsigned long first_read_date;
+        short probed_format;
+        short track; /* current track */
+        short maxblock; /* id of highest block read */
+        short maxtrack; /* id of highest half track read */
+        int generation; /* how many diskchanges? */
+
+/*
+ * (User-provided) media information is _not_ discarded after a media change
+ * if the corresponding keep_data flag is non-zero. Positive values are
+ * decremented after each probe.
+ */
+        int keep_data;
+        
+        /* Prevent "aliased" accesses. */
+        int fd_ref;
+        int fd_device;
+        unsigned long last_checked; /* when was the drive last checked for a disk 
+                           * change? */
+        
+        char *dmabuf;
+        int bufblocks;
+};
+
+#define FDGETDRVSTAT _IOR(2, 0x12, struct floppy_drive_struct)
+#define FDPOLLDRVSTAT _IOR(2, 0x13, struct floppy_drive_struct)
+/* get drive state: GET returns the cached state, POLL polls for new state */
+
+
+/*
+ * reset FDC
+ */
+enum reset_mode {
+        FD_RESET_IF_NEEDED,     /* reset only if the reset flags is set */
+        FD_RESET_IF_RAWCMD,     /* obsolete */
+        FD_RESET_ALWAYS         /* reset always */
+};
+#define FDRESET _IO(2, 0x54)
+
+
+/*
+ * FDC state
+ */
+struct floppy_fdc_state {       
+        int spec1;              /* spec1 value last used */
+        int spec2;              /* spec2 value last used */
+        int dtr;
+        unsigned char version;  /* FDC version code */
+        unsigned char dor;
+        unsigned long address;  /* io address */
+        unsigned int rawcmd:2;
+        unsigned int reset:1;
+        unsigned int need_configure:1;
+        unsigned int perp_mode:2;
+        unsigned int has_fifo:1;
+        unsigned int driver_version;    /* version code for floppy driver */
+#define FD_DRIVER_VERSION 0x100
+/* user programs using the floppy API should use floppy_fdc_state to
+ * get the version number of the floppy driver that they are running
+ * on. If this version number is bigger than the one compiled into the
+ * user program (the FD_DRIVER_VERSION define), it should be prepared
+ * to bigger structures
+ */
+
+        unsigned char track[4];
+        /* Position of the heads of the 4 units attached to this FDC,
+         * as stored on the FDC. In the future, the position as stored
+         * on the FDC might not agree with the actual physical
+         * position of these drive heads. By allowing such
+         * disagreement, it will be possible to reset the FDC without
+         * incurring the expensive cost of repositioning all heads.
+         * Right now, these positions are hard wired to 0. */
+
+};
+
+#define FDGETFDCSTAT _IOR(2, 0x15, struct floppy_fdc_state)
+
+
+/*
+ * Asynchronous Write error tracking
+ */
+struct floppy_write_errors {
+        /* Write error logging.
+         *
+         * These fields can be cleared with the FDWERRORCLR ioctl.
+         * Only writes that were attempted but failed due to a physical media
+         * error are logged.  write(2) calls that fail and return an error code
+         * to the user process are not counted.
+         */
+
+        unsigned int write_errors;  /* number of physical write errors 
+                                     * encountered */
+        
+        /* position of first and last write errors */
+        unsigned long first_error_sector;
+        int           first_error_generation;
+        unsigned long last_error_sector;
+        int           last_error_generation;
+        
+        unsigned int badness; /* highest retry count for a read or write 
+                               * operation */
+};
+
+#define FDWERRORCLR  _IO(2, 0x56)
+/* clear write error and badness information */
+#define FDWERRORGET  _IOR(2, 0x17, struct floppy_write_errors)
+/* get write error and badness information */
+
+
+/*
+ * Raw commands
+ */
+/* new interface flag: now we can do them in batches */
+#define FDHAVEBATCHEDRAWCMD
+
+struct floppy_raw_cmd {
+        unsigned int flags;
+#define FD_RAW_READ 1
+#define FD_RAW_WRITE 2
+#define FD_RAW_NO_MOTOR 4
+#define FD_RAW_DISK_CHANGE 4 /* out: disk change flag was set */
+#define FD_RAW_INTR 8    /* wait for an interrupt */
+#define FD_RAW_SPIN 0x10 /* spin up the disk for this command */
+#define FD_RAW_NO_MOTOR_AFTER 0x20 /* switch the motor off after command 
+                                    * completion */
+#define FD_RAW_NEED_DISK 0x40  /* this command needs a disk to be present */
+#define FD_RAW_NEED_SEEK 0x80  /* this command uses an implied seek (soft) */
+
+/* more "in" flags */
+#define FD_RAW_MORE 0x100  /* more records follow */
+#define FD_RAW_STOP_IF_FAILURE 0x200 /* stop if we encounter a failure */
+#define FD_RAW_STOP_IF_SUCCESS 0x400 /* stop if command successful */
+#define FD_RAW_SOFTFAILURE 0x800 /* consider the return value for failure
+                                  * detection too */
+
+/* more "out" flags */
+#define FD_RAW_FAILURE 0x10000 /* command sent to fdc, fdc returned error */
+#define FD_RAW_HARDFAILURE 0x20000 /* fdc had to be reset, or timed out */
+
+        void __user *data;
+        char *kernel_data; /* location of data buffer in the kernel */
+        struct floppy_raw_cmd *next; /* used for chaining of raw cmd's 
+                                      * within the kernel */
+        long length; /* in: length of dma transfer. out: remaining bytes */
+        long phys_length; /* physical length, if different from dma length */
+        int buffer_length; /* length of allocated buffer */
+
+        unsigned char rate;
+        unsigned char cmd_count;
+        unsigned char cmd[16];
+        unsigned char reply_count;
+        unsigned char reply[16];
+        int track;
+        int resultcode;
+
+        int reserved1;
+        int reserved2;
+};
+
+#define FDRAWCMD _IO(2, 0x58)
+/* send a raw command to the fdc. Structure size not included, because of
+ * batches */
+
+#define FDTWADDLE _IO(2, 0x59)
+/* flicker motor-on bit before reading a sector. Experimental */
+
+
+#define FDEJECT _IO(2, 0x5a)
+/* eject the disk */
+
+
+
+#endif /* _UAPI_LINUX_FD_H */
diff --git a/include/linux/fdreg.h b/include/uapi/linux/fdreg.h
index 61ce64169004..61ce64169004 100644
--- a/include/linux/fdreg.h
+++ b/include/uapi/linux/fdreg.h
diff --git a/include/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 51da65b68b85..51da65b68b85 100644
--- a/include/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
diff --git a/include/linux/fiemap.h b/include/uapi/linux/fiemap.h
index d830747f5c0b..d830747f5c0b 100644
--- a/include/linux/fiemap.h
+++ b/include/uapi/linux/fiemap.h
diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h
new file mode 100644
index 000000000000..3d7922433aba
--- /dev/null
+++ b/include/uapi/linux/filter.h
@@ -0,0 +1,135 @@
+/*
+ * Linux Socket Filter Data Structures
+ */
+
+#ifndef _UAPI__LINUX_FILTER_H__
+#define _UAPI__LINUX_FILTER_H__
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+
+/*
+ * Current version of the filter code architecture.
+ */
+#define BPF_MAJOR_VERSION 1
+#define BPF_MINOR_VERSION 1
+
+/*
+ *      Try and keep these values and structures similar to BSD, especially
+ *      the BPF code definitions which need to match so you can share filters
+ */
+ 
+struct sock_filter {    /* Filter block */
+        __u16   code;   /* Actual filter code */
+        __u8    jt;     /* Jump true */
+        __u8    jf;     /* Jump false */
+        __u32   k;      /* Generic multiuse field */
+};
+
+struct sock_fprog {     /* Required for SO_ATTACH_FILTER. */
+        unsigned short          len;    /* Number of filter blocks */
+        struct sock_filter __user *filter;
+};
+
+/*
+ * Instruction classes
+ */
+
+#define BPF_CLASS(code) ((code) & 0x07)
+#define         BPF_LD          0x00
+#define         BPF_LDX         0x01
+#define         BPF_ST          0x02
+#define         BPF_STX         0x03
+#define         BPF_ALU         0x04
+#define         BPF_JMP         0x05
+#define         BPF_RET         0x06
+#define         BPF_MISC        0x07
+
+/* ld/ldx fields */
+#define BPF_SIZE(code)  ((code) & 0x18)
+#define         BPF_W           0x00
+#define         BPF_H           0x08
+#define         BPF_B           0x10
+#define BPF_MODE(code)  ((code) & 0xe0)
+#define         BPF_IMM         0x00
+#define         BPF_ABS         0x20
+#define         BPF_IND         0x40
+#define         BPF_MEM         0x60
+#define         BPF_LEN         0x80
+#define         BPF_MSH         0xa0
+
+/* alu/jmp fields */
+#define BPF_OP(code)    ((code) & 0xf0)
+#define         BPF_ADD         0x00
+#define         BPF_SUB         0x10
+#define         BPF_MUL         0x20
+#define         BPF_DIV         0x30
+#define         BPF_OR          0x40
+#define         BPF_AND         0x50
+#define         BPF_LSH         0x60
+#define         BPF_RSH         0x70
+#define         BPF_NEG         0x80
+#define         BPF_MOD         0x90
+#define         BPF_XOR         0xa0
+
+#define         BPF_JA          0x00
+#define         BPF_JEQ         0x10
+#define         BPF_JGT         0x20
+#define         BPF_JGE         0x30
+#define         BPF_JSET        0x40
+#define BPF_SRC(code)   ((code) & 0x08)
+#define         BPF_K           0x00
+#define         BPF_X           0x08
+
+/* ret - BPF_K and BPF_X also apply */
+#define BPF_RVAL(code)  ((code) & 0x18)
+#define         BPF_A           0x10
+
+/* misc */
+#define BPF_MISCOP(code) ((code) & 0xf8)
+#define         BPF_TAX         0x00
+#define         BPF_TXA         0x80
+
+#ifndef BPF_MAXINSNS
+#define BPF_MAXINSNS 4096
+#endif
+
+/*
+ * Macros for filter block array initializers.
+ */
+#ifndef BPF_STMT
+#define BPF_STMT(code, k) { (unsigned short)(code), 0, 0, k }
+#endif
+#ifndef BPF_JUMP
+#define BPF_JUMP(code, k, jt, jf) { (unsigned short)(code), jt, jf, k }
+#endif
+
+/*
+ * Number of scratch memory words for: BPF_ST and BPF_STX
+ */
+#define BPF_MEMWORDS 16
+
+/* RATIONALE. Negative offsets are invalid in BPF.
+   We use them to reference ancillary data.
+   Unlike introduction new instructions, it does not break
+   existing compilers/optimizers.
+ */
+#define SKF_AD_OFF    (-0x1000)
+#define SKF_AD_PROTOCOL 0
+#define SKF_AD_PKTTYPE  4
+#define SKF_AD_IFINDEX  8
+#define SKF_AD_NLATTR   12
+#define SKF_AD_NLATTR_NEST      16
+#define SKF_AD_MARK     20
+#define SKF_AD_QUEUE    24
+#define SKF_AD_HATYPE   28
+#define SKF_AD_RXHASH   32
+#define SKF_AD_CPU      36
+#define SKF_AD_ALU_XOR_X        40
+#define SKF_AD_MAX      44
+#define SKF_NET_OFF   (-0x100000)
+#define SKF_LL_OFF    (-0x200000)
+
+
+#endif /* _UAPI__LINUX_FILTER_H__ */
diff --git a/include/linux/firewire-cdev.h b/include/uapi/linux/firewire-cdev.h
index d50036953497..d50036953497 100644
--- a/include/linux/firewire-cdev.h
+++ b/include/uapi/linux/firewire-cdev.h
diff --git a/include/linux/firewire-constants.h b/include/uapi/linux/firewire-constants.h
index 9b4bb5fbba4b..9b4bb5fbba4b 100644
--- a/include/linux/firewire-constants.h
+++ b/include/uapi/linux/firewire-constants.h
diff --git a/include/uapi/linux/flat.h b/include/uapi/linux/flat.h
new file mode 100644
index 000000000000..88cd6baba8f3
--- /dev/null
+++ b/include/uapi/linux/flat.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2002-2003  David McCullough <davidm@snapgear.com>
+ * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
+ *                          The Silver Hammer Group, Ltd.
+ *
+ * This file provides the definitions and structures needed to
+ * support uClinux flat-format executables.
+ */
+
+#ifndef _UAPI_LINUX_FLAT_H
+#define _UAPI_LINUX_FLAT_H
+
+
+#define FLAT_VERSION                    0x00000004L
+
+#ifdef CONFIG_BINFMT_SHARED_FLAT
+#define MAX_SHARED_LIBS                 (4)
+#else
+#define MAX_SHARED_LIBS                 (1)
+#endif
+
+/*
+ * To make everything easier to port and manage cross platform
+ * development,  all fields are in network byte order.
+ */
+
+struct flat_hdr {
+        char magic[4];
+        unsigned long rev;          /* version (as above) */
+        unsigned long entry;        /* Offset of first executable instruction
+                                       with text segment from beginning of file */
+        unsigned long data_start;   /* Offset of data segment from beginning of
+                                       file */
+        unsigned long data_end;     /* Offset of end of data segment
+                                       from beginning of file */
+        unsigned long bss_end;      /* Offset of end of bss segment from beginning
+                                       of file */
+
+        /* (It is assumed that data_end through bss_end forms the bss segment.) */
+
+        unsigned long stack_size;   /* Size of stack, in bytes */
+        unsigned long reloc_start;  /* Offset of relocation records from
+                                       beginning of file */
+        unsigned long reloc_count;  /* Number of relocation records */
+        unsigned long flags;       
+        unsigned long build_date;   /* When the program/library was built */
+        unsigned long filler[5];    /* Reservered, set to zero */
+};
+
+#define FLAT_FLAG_RAM    0x0001 /* load program entirely into RAM */
+#define FLAT_FLAG_GOTPIC 0x0002 /* program is PIC with GOT */
+#define FLAT_FLAG_GZIP   0x0004 /* all but the header is compressed */
+#define FLAT_FLAG_GZDATA 0x0008 /* only data/relocs are compressed (for XIP) */
+#define FLAT_FLAG_KTRACE 0x0010 /* output useful kernel trace for debugging */
+
+
+
+#endif /* _UAPI_LINUX_FLAT_H */
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
new file mode 100644
index 000000000000..780d4c6093eb
--- /dev/null
+++ b/include/uapi/linux/fs.h
@@ -0,0 +1,202 @@
+#ifndef _UAPI_LINUX_FS_H
+#define _UAPI_LINUX_FS_H
+
+/*
+ * This file has definitions for some important file table
+ * structures etc.
+ */
+
+#include <linux/limits.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/*
+ * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
+ * the file limit at runtime and only root can increase the per-process
+ * nr_file rlimit, so it's safe to set up a ridiculously high absolute
+ * upper limit on files-per-process.
+ *
+ * Some programs (notably those using select()) may have to be 
+ * recompiled to take full advantage of the new limits..  
+ */
+
+/* Fixed constants first: */
+#undef NR_OPEN
+#define INR_OPEN_CUR 1024       /* Initial setting for nfile rlimits */
+#define INR_OPEN_MAX 4096       /* Hard limit for nfile rlimits */
+
+#define BLOCK_SIZE_BITS 10
+#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
+
+#define SEEK_SET        0       /* seek relative to beginning of file */
+#define SEEK_CUR        1       /* seek relative to current file position */
+#define SEEK_END        2       /* seek relative to end of file */
+#define SEEK_DATA       3       /* seek to the next data */
+#define SEEK_HOLE       4       /* seek to the next hole */
+#define SEEK_MAX        SEEK_HOLE
+
+struct fstrim_range {
+        __u64 start;
+        __u64 len;
+        __u64 minlen;
+};
+
+/* And dynamically-tunable limits and defaults: */
+struct files_stat_struct {
+        unsigned long nr_files;         /* read only */
+        unsigned long nr_free_files;    /* read only */
+        unsigned long max_files;                /* tunable */
+};
+
+struct inodes_stat_t {
+        int nr_inodes;
+        int nr_unused;
+        int dummy[5];           /* padding for sysctl ABI compatibility */
+};
+
+
+#define NR_FILE  8192   /* this can well be larger on a larger system */
+
+
+/*
+ * These are the fs-independent mount-flags: up to 32 flags are supported
+ */
+#define MS_RDONLY        1      /* Mount read-only */
+#define MS_NOSUID        2      /* Ignore suid and sgid bits */
+#define MS_NODEV         4      /* Disallow access to device special files */
+#define MS_NOEXEC        8      /* Disallow program execution */
+#define MS_SYNCHRONOUS  16      /* Writes are synced at once */
+#define MS_REMOUNT      32      /* Alter flags of a mounted FS */
+#define MS_MANDLOCK     64      /* Allow mandatory locks on an FS */
+#define MS_DIRSYNC      128     /* Directory modifications are synchronous */
+#define MS_NOATIME      1024    /* Do not update access times. */
+#define MS_NODIRATIME   2048    /* Do not update directory access times */
+#define MS_BIND         4096
+#define MS_MOVE         8192
+#define MS_REC          16384
+#define MS_VERBOSE      32768   /* War is peace. Verbosity is silence.
+                                   MS_VERBOSE is deprecated. */
+#define MS_SILENT       32768
+#define MS_POSIXACL     (1<<16) /* VFS does not apply the umask */
+#define MS_UNBINDABLE   (1<<17) /* change to unbindable */
+#define MS_PRIVATE      (1<<18) /* change to private */
+#define MS_SLAVE        (1<<19) /* change to slave */
+#define MS_SHARED       (1<<20) /* change to shared */
+#define MS_RELATIME     (1<<21) /* Update atime relative to mtime/ctime. */
+#define MS_KERNMOUNT    (1<<22) /* this is a kern_mount call */
+#define MS_I_VERSION    (1<<23) /* Update inode I_version field */
+#define MS_STRICTATIME  (1<<24) /* Always perform atime updates */
+#define MS_NOSEC        (1<<28)
+#define MS_BORN         (1<<29)
+#define MS_ACTIVE       (1<<30)
+#define MS_NOUSER       (1<<31)
+
+/*
+ * Superblock flags that can be altered by MS_REMOUNT
+ */
+#define MS_RMT_MASK     (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+
+/*
+ * Old magic mount flag and mask
+ */
+#define MS_MGC_VAL 0xC0ED0000
+#define MS_MGC_MSK 0xffff0000
+
+/* the read-only stuff doesn't really belong here, but any other place is
+   probably as bad and I don't want to create yet another include file. */
+
+#define BLKROSET   _IO(0x12,93) /* set device read-only (0 = read-write) */
+#define BLKROGET   _IO(0x12,94) /* get read-only status (0 = read_write) */
+#define BLKRRPART  _IO(0x12,95) /* re-read partition table */
+#define BLKGETSIZE _IO(0x12,96) /* return device size /512 (long *arg) */
+#define BLKFLSBUF  _IO(0x12,97) /* flush buffer cache */
+#define BLKRASET   _IO(0x12,98) /* set read ahead for block device */
+#define BLKRAGET   _IO(0x12,99) /* get current read ahead setting */
+#define BLKFRASET  _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
+#define BLKFRAGET  _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */
+#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
+#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
+#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
+#if 0
+#define BLKPG      _IO(0x12,105)/* See blkpg.h */
+
+/* Some people are morons.  Do not use sizeof! */
+
+#define BLKELVGET  _IOR(0x12,106,size_t)/* elevator get */
+#define BLKELVSET  _IOW(0x12,107,size_t)/* elevator set */
+/* This was here just to show that the number is taken -
+   probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */
+#endif
+/* A jump here: 108-111 have been used for various private purposes. */
+#define BLKBSZGET  _IOR(0x12,112,size_t)
+#define BLKBSZSET  _IOW(0x12,113,size_t)
+#define BLKGETSIZE64 _IOR(0x12,114,size_t)      /* return device size in bytes (u64 *arg) */
+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
+#define BLKTRACESTART _IO(0x12,116)
+#define BLKTRACESTOP _IO(0x12,117)
+#define BLKTRACETEARDOWN _IO(0x12,118)
+#define BLKDISCARD _IO(0x12,119)
+#define BLKIOMIN _IO(0x12,120)
+#define BLKIOOPT _IO(0x12,121)
+#define BLKALIGNOFF _IO(0x12,122)
+#define BLKPBSZGET _IO(0x12,123)
+#define BLKDISCARDZEROES _IO(0x12,124)
+#define BLKSECDISCARD _IO(0x12,125)
+#define BLKROTATIONAL _IO(0x12,126)
+#define BLKZEROOUT _IO(0x12,127)
+
+#define BMAP_IOCTL 1            /* obsolete - kept for compatibility */
+#define FIBMAP     _IO(0x00,1)  /* bmap access */
+#define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
+#define FIFREEZE        _IOWR('X', 119, int)    /* Freeze */
+#define FITHAW          _IOWR('X', 120, int)    /* Thaw */
+#define FITRIM          _IOWR('X', 121, struct fstrim_range)    /* Trim */
+
+#define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
+#define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
+#define FS_IOC_GETVERSION               _IOR('v', 1, long)
+#define FS_IOC_SETVERSION               _IOW('v', 2, long)
+#define FS_IOC_FIEMAP                   _IOWR('f', 11, struct fiemap)
+#define FS_IOC32_GETFLAGS               _IOR('f', 1, int)
+#define FS_IOC32_SETFLAGS               _IOW('f', 2, int)
+#define FS_IOC32_GETVERSION             _IOR('v', 1, int)
+#define FS_IOC32_SETVERSION             _IOW('v', 2, int)
+
+/*
+ * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
+ */
+#define FS_SECRM_FL                     0x00000001 /* Secure deletion */
+#define FS_UNRM_FL                      0x00000002 /* Undelete */
+#define FS_COMPR_FL                     0x00000004 /* Compress file */
+#define FS_SYNC_FL                      0x00000008 /* Synchronous updates */
+#define FS_IMMUTABLE_FL                 0x00000010 /* Immutable file */
+#define FS_APPEND_FL                    0x00000020 /* writes to file may only append */
+#define FS_NODUMP_FL                    0x00000040 /* do not dump file */
+#define FS_NOATIME_FL                   0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define FS_DIRTY_FL                     0x00000100
+#define FS_COMPRBLK_FL                  0x00000200 /* One or more compressed clusters */
+#define FS_NOCOMP_FL                    0x00000400 /* Don't compress */
+#define FS_ECOMPR_FL                    0x00000800 /* Compression error */
+/* End compression flags --- maybe not all used */
+#define FS_BTREE_FL                     0x00001000 /* btree format dir */
+#define FS_INDEX_FL                     0x00001000 /* hash-indexed directory */
+#define FS_IMAGIC_FL                    0x00002000 /* AFS directory */
+#define FS_JOURNAL_DATA_FL              0x00004000 /* Reserved for ext3 */
+#define FS_NOTAIL_FL                    0x00008000 /* file tail should not be merged */
+#define FS_DIRSYNC_FL                   0x00010000 /* dirsync behaviour (directories only) */
+#define FS_TOPDIR_FL                    0x00020000 /* Top of directory hierarchies*/
+#define FS_EXTENT_FL                    0x00080000 /* Extents */
+#define FS_DIRECTIO_FL                  0x00100000 /* Use direct i/o */
+#define FS_NOCOW_FL                     0x00800000 /* Do not cow file */
+#define FS_RESERVED_FL                  0x80000000 /* reserved for ext2 lib */
+
+#define FS_FL_USER_VISIBLE              0x0003DFFF /* User visible flags */
+#define FS_FL_USER_MODIFIABLE           0x000380FF /* User modifiable flags */
+
+
+#define SYNC_FILE_RANGE_WAIT_BEFORE     1
+#define SYNC_FILE_RANGE_WRITE           2
+#define SYNC_FILE_RANGE_WAIT_AFTER      4
+
+#endif /* _UAPI_LINUX_FS_H */
diff --git a/include/uapi/linux/fsl_hypervisor.h b/include/uapi/linux/fsl_hypervisor.h
new file mode 100644
index 000000000000..1bf04967fec4
--- /dev/null
+++ b/include/uapi/linux/fsl_hypervisor.h
@@ -0,0 +1,220 @@
+/*
+ * Freescale hypervisor ioctl and kernel interface
+ *
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc.
+ * Author: Timur Tabi <timur@freescale.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * This software is provided by Freescale Semiconductor "as is" and any
+ * express or implied warranties, including, but not limited to, the implied
+ * warranties of merchantability and fitness for a particular purpose are
+ * disclaimed. In no event shall Freescale Semiconductor be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential damages
+ * (including, but not limited to, procurement of substitute goods or services;
+ * loss of use, data, or profits; or business interruption) however caused and
+ * on any theory of liability, whether in contract, strict liability, or tort
+ * (including negligence or otherwise) arising in any way out of the use of this
+ * software, even if advised of the possibility of such damage.
+ *
+ * This file is used by the Freescale hypervisor management driver.  It can
+ * also be included by applications that need to communicate with the driver
+ * via the ioctl interface.
+ */
+
+#ifndef _UAPIFSL_HYPERVISOR_H
+#define _UAPIFSL_HYPERVISOR_H
+
+#include <linux/types.h>
+
+/**
+ * struct fsl_hv_ioctl_restart - restart a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to restart, or -1 for the
+ *             calling partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_RESTART
+ */
+struct fsl_hv_ioctl_restart {
+        __u32 ret;
+        __u32 partition;
+};
+
+/**
+ * struct fsl_hv_ioctl_status - get a partition's status
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to query, or -1 for the
+ *             calling partition
+ * @status: The returned status of the partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_GET_STATUS
+ *
+ * Values of 'status':
+ *    0 = Stopped
+ *    1 = Running
+ *    2 = Starting
+ *    3 = Stopping
+ */
+struct fsl_hv_ioctl_status {
+        __u32 ret;
+        __u32 partition;
+        __u32 status;
+};
+
+/**
+ * struct fsl_hv_ioctl_start - start a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to control
+ * @entry_point: The offset within the guest IMA to start execution
+ * @load: If non-zero, reload the partition's images before starting
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_START
+ */
+struct fsl_hv_ioctl_start {
+        __u32 ret;
+        __u32 partition;
+        __u32 entry_point;
+        __u32 load;
+};
+
+/**
+ * struct fsl_hv_ioctl_stop - stop a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to stop, or -1 for the calling
+ *             partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_STOP
+ */
+struct fsl_hv_ioctl_stop {
+        __u32 ret;
+        __u32 partition;
+};
+
+/**
+ * struct fsl_hv_ioctl_memcpy - copy memory between partitions
+ * @ret: return error code from the hypervisor
+ * @source: the partition ID of the source partition, or -1 for this
+ *          partition
+ * @target: the partition ID of the target partition, or -1 for this
+ *          partition
+ * @reserved: reserved, must be set to 0
+ * @local_addr: user-space virtual address of a buffer in the local
+ *              partition
+ * @remote_addr: guest physical address of a buffer in the
+ *           remote partition
+ * @count: the number of bytes to copy.  Both the local and remote
+ *         buffers must be at least 'count' bytes long
+ *
+ * Used by FSL_HV_IOCTL_MEMCPY
+ *
+ * The 'local' partition is the partition that calls this ioctl.  The
+ * 'remote' partition is a different partition.  The data is copied from
+ * the 'source' paritition' to the 'target' partition.
+ *
+ * The buffer in the remote partition must be guest physically
+ * contiguous.
+ *
+ * This ioctl does not support copying memory between two remote
+ * partitions or within the same partition, so either 'source' or
+ * 'target' (but not both) must be -1.  In other words, either
+ *
+ *      source == local and target == remote
+ * or
+ *      source == remote and target == local
+ */
+struct fsl_hv_ioctl_memcpy {
+        __u32 ret;
+        __u32 source;
+        __u32 target;
+        __u32 reserved; /* padding to ensure local_vaddr is aligned */
+        __u64 local_vaddr;
+        __u64 remote_paddr;
+        __u64 count;
+};
+
+/**
+ * struct fsl_hv_ioctl_doorbell - ring a doorbell
+ * @ret: return error code from the hypervisor
+ * @doorbell: the handle of the doorbell to ring doorbell
+ *
+ * Used by FSL_HV_IOCTL_DOORBELL
+ */
+struct fsl_hv_ioctl_doorbell {
+        __u32 ret;
+        __u32 doorbell;
+};
+
+/**
+ * struct fsl_hv_ioctl_prop - get/set a device tree property
+ * @ret: return error code from the hypervisor
+ * @handle: handle of partition whose tree to access
+ * @path: virtual address of path name of node to access
+ * @propname: virtual address of name of property to access
+ * @propval: virtual address of property data buffer
+ * @proplen: Size of property data buffer
+ * @reserved: reserved, must be set to 0
+ *
+ * Used by FSL_HV_IOCTL_DOORBELL
+ */
+struct fsl_hv_ioctl_prop {
+        __u32 ret;
+        __u32 handle;
+        __u64 path;
+        __u64 propname;
+        __u64 propval;
+        __u32 proplen;
+        __u32 reserved; /* padding to ensure structure is aligned */
+};
+
+/* The ioctl type, documented in ioctl-number.txt */
+#define FSL_HV_IOCTL_TYPE       0xAF
+
+/* Restart another partition */
+#define FSL_HV_IOCTL_PARTITION_RESTART \
+        _IOWR(FSL_HV_IOCTL_TYPE, 1, struct fsl_hv_ioctl_restart)
+
+/* Get a partition's status */
+#define FSL_HV_IOCTL_PARTITION_GET_STATUS \
+        _IOWR(FSL_HV_IOCTL_TYPE, 2, struct fsl_hv_ioctl_status)
+
+/* Boot another partition */
+#define FSL_HV_IOCTL_PARTITION_START \
+        _IOWR(FSL_HV_IOCTL_TYPE, 3, struct fsl_hv_ioctl_start)
+
+/* Stop this or another partition */
+#define FSL_HV_IOCTL_PARTITION_STOP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 4, struct fsl_hv_ioctl_stop)
+
+/* Copy data from one partition to another */
+#define FSL_HV_IOCTL_MEMCPY \
+        _IOWR(FSL_HV_IOCTL_TYPE, 5, struct fsl_hv_ioctl_memcpy)
+
+/* Ring a doorbell */
+#define FSL_HV_IOCTL_DOORBELL \
+        _IOWR(FSL_HV_IOCTL_TYPE, 6, struct fsl_hv_ioctl_doorbell)
+
+/* Get a property from another guest's device tree */
+#define FSL_HV_IOCTL_GETPROP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 7, struct fsl_hv_ioctl_prop)
+
+/* Set a property in another guest's device tree */
+#define FSL_HV_IOCTL_SETPROP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 8, struct fsl_hv_ioctl_prop)
+
+
+#endif /* _UAPIFSL_HYPERVISOR_H */
diff --git a/include/linux/fuse.h b/include/uapi/linux/fuse.h
index d8c713e148e3..d8c713e148e3 100644
--- a/include/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
new file mode 100644
index 000000000000..0b1f716373c7
--- /dev/null
+++ b/include/uapi/linux/futex.h
@@ -0,0 +1,152 @@
+#ifndef _UAPI_LINUX_FUTEX_H
+#define _UAPI_LINUX_FUTEX_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+/* Second argument to futex syscall */
+
+
+#define FUTEX_WAIT              0
+#define FUTEX_WAKE              1
+#define FUTEX_FD                2
+#define FUTEX_REQUEUE           3
+#define FUTEX_CMP_REQUEUE       4
+#define FUTEX_WAKE_OP           5
+#define FUTEX_LOCK_PI           6
+#define FUTEX_UNLOCK_PI         7
+#define FUTEX_TRYLOCK_PI        8
+#define FUTEX_WAIT_BITSET       9
+#define FUTEX_WAKE_BITSET       10
+#define FUTEX_WAIT_REQUEUE_PI   11
+#define FUTEX_CMP_REQUEUE_PI    12
+
+#define FUTEX_PRIVATE_FLAG      128
+#define FUTEX_CLOCK_REALTIME    256
+#define FUTEX_CMD_MASK          ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME)
+
+#define FUTEX_WAIT_PRIVATE      (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAKE_PRIVATE      (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_REQUEUE_PRIVATE   (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAKE_OP_PRIVATE   (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
+#define FUTEX_LOCK_PI_PRIVATE   (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAIT_BITSET_PRIVATE       (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAKE_BITSET_PRIVATE       (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAIT_REQUEUE_PI_PRIVATE   (FUTEX_WAIT_REQUEUE_PI | \
+                                         FUTEX_PRIVATE_FLAG)
+#define FUTEX_CMP_REQUEUE_PI_PRIVATE    (FUTEX_CMP_REQUEUE_PI | \
+                                         FUTEX_PRIVATE_FLAG)
+
+/*
+ * Support for robust futexes: the kernel cleans up held futexes at
+ * thread exit time.
+ */
+
+/*
+ * Per-lock list entry - embedded in user-space locks, somewhere close
+ * to the futex field. (Note: user-space uses a double-linked list to
+ * achieve O(1) list add and remove, but the kernel only needs to know
+ * about the forward link)
+ *
+ * NOTE: this structure is part of the syscall ABI, and must not be
+ * changed.
+ */
+struct robust_list {
+        struct robust_list __user *next;
+};
+
+/*
+ * Per-thread list head:
+ *
+ * NOTE: this structure is part of the syscall ABI, and must only be
+ * changed if the change is first communicated with the glibc folks.
+ * (When an incompatible change is done, we'll increase the structure
+ *  size, which glibc will detect)
+ */
+struct robust_list_head {
+        /*
+         * The head of the list. Points back to itself if empty:
+         */
+        struct robust_list list;
+
+        /*
+         * This relative offset is set by user-space, it gives the kernel
+         * the relative position of the futex field to examine. This way
+         * we keep userspace flexible, to freely shape its data-structure,
+         * without hardcoding any particular offset into the kernel:
+         */
+        long futex_offset;
+
+        /*
+         * The death of the thread may race with userspace setting
+         * up a lock's links. So to handle this race, userspace first
+         * sets this field to the address of the to-be-taken lock,
+         * then does the lock acquire, and then adds itself to the
+         * list, and then clears this field. Hence the kernel will
+         * always have full knowledge of all locks that the thread
+         * _might_ have taken. We check the owner TID in any case,
+         * so only truly owned locks will be handled.
+         */
+        struct robust_list __user *list_op_pending;
+};
+
+/*
+ * Are there any waiters for this robust futex:
+ */
+#define FUTEX_WAITERS           0x80000000
+
+/*
+ * The kernel signals via this bit that a thread holding a futex
+ * has exited without unlocking the futex. The kernel also does
+ * a FUTEX_WAKE on such futexes, after setting the bit, to wake
+ * up any possible waiters:
+ */
+#define FUTEX_OWNER_DIED        0x40000000
+
+/*
+ * The rest of the robust-futex field is for the TID:
+ */
+#define FUTEX_TID_MASK          0x3fffffff
+
+/*
+ * This limit protects against a deliberately circular list.
+ * (Not worth introducing an rlimit for it)
+ */
+#define ROBUST_LIST_LIMIT       2048
+
+/*
+ * bitset with all bits set for the FUTEX_xxx_BITSET OPs to request a
+ * match of any bit.
+ */
+#define FUTEX_BITSET_MATCH_ANY  0xffffffff
+
+
+#define FUTEX_OP_SET            0       /* *(int *)UADDR2 = OPARG; */
+#define FUTEX_OP_ADD            1       /* *(int *)UADDR2 += OPARG; */
+#define FUTEX_OP_OR             2       /* *(int *)UADDR2 |= OPARG; */
+#define FUTEX_OP_ANDN           3       /* *(int *)UADDR2 &= ~OPARG; */
+#define FUTEX_OP_XOR            4       /* *(int *)UADDR2 ^= OPARG; */
+
+#define FUTEX_OP_OPARG_SHIFT    8       /* Use (1 << OPARG) instead of OPARG.  */
+
+#define FUTEX_OP_CMP_EQ         0       /* if (oldval == CMPARG) wake */
+#define FUTEX_OP_CMP_NE         1       /* if (oldval != CMPARG) wake */
+#define FUTEX_OP_CMP_LT         2       /* if (oldval < CMPARG) wake */
+#define FUTEX_OP_CMP_LE         3       /* if (oldval <= CMPARG) wake */
+#define FUTEX_OP_CMP_GT         4       /* if (oldval > CMPARG) wake */
+#define FUTEX_OP_CMP_GE         5       /* if (oldval >= CMPARG) wake */
+
+/* FUTEX_WAKE_OP will perform atomically
+   int oldval = *(int *)UADDR2;
+   *(int *)UADDR2 = oldval OP OPARG;
+   if (oldval CMP CMPARG)
+     wake UADDR2;  */
+
+#define FUTEX_OP(op, oparg, cmp, cmparg) \
+  (((op & 0xf) << 28) | ((cmp & 0xf) << 24)             \
+   | ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
+
+#endif /* _UAPI_LINUX_FUTEX_H */
diff --git a/include/uapi/linux/gameport.h b/include/uapi/linux/gameport.h
new file mode 100644
index 000000000000..49b29b068f40
--- /dev/null
+++ b/include/uapi/linux/gameport.h
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 1999-2002 Vojtech Pavlik
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_GAMEPORT_H
+#define _UAPI_GAMEPORT_H
+
+
+
+#define GAMEPORT_MODE_DISABLED          0
+#define GAMEPORT_MODE_RAW               1
+#define GAMEPORT_MODE_COOKED            2
+
+#define GAMEPORT_ID_VENDOR_ANALOG       0x0001
+#define GAMEPORT_ID_VENDOR_MADCATZ      0x0002
+#define GAMEPORT_ID_VENDOR_LOGITECH     0x0003
+#define GAMEPORT_ID_VENDOR_CREATIVE     0x0004
+#define GAMEPORT_ID_VENDOR_GENIUS       0x0005
+#define GAMEPORT_ID_VENDOR_INTERACT     0x0006
+#define GAMEPORT_ID_VENDOR_MICROSOFT    0x0007
+#define GAMEPORT_ID_VENDOR_THRUSTMASTER 0x0008
+#define GAMEPORT_ID_VENDOR_GRAVIS       0x0009
+#define GAMEPORT_ID_VENDOR_GUILLEMOT    0x000a
+
+#endif /* _UAPI_GAMEPORT_H */
diff --git a/include/linux/gen_stats.h b/include/uapi/linux/gen_stats.h
index 552c8a0a12d1..552c8a0a12d1 100644
--- a/include/linux/gen_stats.h
+++ b/include/uapi/linux/gen_stats.h
diff --git a/include/uapi/linux/genetlink.h b/include/uapi/linux/genetlink.h
new file mode 100644
index 000000000000..c880a417d8a9
--- /dev/null
+++ b/include/uapi/linux/genetlink.h
@@ -0,0 +1,84 @@
+#ifndef _UAPI__LINUX_GENERIC_NETLINK_H
+#define _UAPI__LINUX_GENERIC_NETLINK_H
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+
+#define GENL_NAMSIZ     16      /* length of family name */
+
+#define GENL_MIN_ID     NLMSG_MIN_TYPE
+#define GENL_MAX_ID     1023
+
+struct genlmsghdr {
+        __u8    cmd;
+        __u8    version;
+        __u16   reserved;
+};
+
+#define GENL_HDRLEN     NLMSG_ALIGN(sizeof(struct genlmsghdr))
+
+#define GENL_ADMIN_PERM         0x01
+#define GENL_CMD_CAP_DO         0x02
+#define GENL_CMD_CAP_DUMP       0x04
+#define GENL_CMD_CAP_HASPOL     0x08
+
+/*
+ * List of reserved static generic netlink identifiers:
+ */
+#define GENL_ID_GENERATE        0
+#define GENL_ID_CTRL            NLMSG_MIN_TYPE
+
+/**************************************************************************
+ * Controller
+ **************************************************************************/
+
+enum {
+        CTRL_CMD_UNSPEC,
+        CTRL_CMD_NEWFAMILY,
+        CTRL_CMD_DELFAMILY,
+        CTRL_CMD_GETFAMILY,
+        CTRL_CMD_NEWOPS,
+        CTRL_CMD_DELOPS,
+        CTRL_CMD_GETOPS,
+        CTRL_CMD_NEWMCAST_GRP,
+        CTRL_CMD_DELMCAST_GRP,
+        CTRL_CMD_GETMCAST_GRP, /* unused */
+        __CTRL_CMD_MAX,
+};
+
+#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
+
+enum {
+        CTRL_ATTR_UNSPEC,
+        CTRL_ATTR_FAMILY_ID,
+        CTRL_ATTR_FAMILY_NAME,
+        CTRL_ATTR_VERSION,
+        CTRL_ATTR_HDRSIZE,
+        CTRL_ATTR_MAXATTR,
+        CTRL_ATTR_OPS,
+        CTRL_ATTR_MCAST_GROUPS,
+        __CTRL_ATTR_MAX,
+};
+
+#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
+
+enum {
+        CTRL_ATTR_OP_UNSPEC,
+        CTRL_ATTR_OP_ID,
+        CTRL_ATTR_OP_FLAGS,
+        __CTRL_ATTR_OP_MAX,
+};
+
+#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
+
+enum {
+        CTRL_ATTR_MCAST_GRP_UNSPEC,
+        CTRL_ATTR_MCAST_GRP_NAME,
+        CTRL_ATTR_MCAST_GRP_ID,
+        __CTRL_ATTR_MCAST_GRP_MAX,
+};
+
+#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
+
+
+#endif /* _UAPI__LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/gfs2_ondisk.h b/include/uapi/linux/gfs2_ondisk.h
index b2de1f9a88d6..b2de1f9a88d6 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/uapi/linux/gfs2_ondisk.h
diff --git a/include/linux/gigaset_dev.h b/include/uapi/linux/gigaset_dev.h
index 258ba82937e7..258ba82937e7 100644
--- a/include/linux/gigaset_dev.h
+++ b/include/uapi/linux/gigaset_dev.h
diff --git a/include/uapi/linux/hdlc.h b/include/uapi/linux/hdlc.h
new file mode 100644
index 000000000000..2c5f0aff4cf9
--- /dev/null
+++ b/include/uapi/linux/hdlc.h
@@ -0,0 +1,23 @@
+/*
+ * Generic HDLC support routines for Linux
+ *
+ * Copyright (C) 1999-2005 Krzysztof Halasa <khc@pm.waw.pl>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ */
+
+#ifndef _UAPI__HDLC_H
+#define _UAPI__HDLC_H
+
+
+#define HDLC_MAX_MTU 1500       /* Ethernet 1500 bytes */
+#if 0
+#define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */
+#else
+#define HDLC_MAX_MRU 1600 /* as required for FR network */
+#endif
+
+
+#endif /* _UAPI__HDLC_H */
diff --git a/include/uapi/linux/hdlcdrv.h b/include/uapi/linux/hdlcdrv.h
new file mode 100644
index 000000000000..ffc79c0b44a8
--- /dev/null
+++ b/include/uapi/linux/hdlcdrv.h
@@ -0,0 +1,110 @@
+/*
+ * hdlcdrv.h  -- HDLC packet radio network driver.
+ * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
+ * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA
+ */
+
+#ifndef _UAPI_HDLCDRV_H
+#define _UAPI_HDLCDRV_H
+
+/* -------------------------------------------------------------------- */
+/*
+ * structs for the IOCTL commands
+ */
+
+struct hdlcdrv_params {
+        int iobase;
+        int irq;
+        int dma;
+        int dma2;
+        int seriobase;
+        int pariobase;
+        int midiiobase;
+};      
+
+struct hdlcdrv_channel_params {
+        int tx_delay;  /* the transmitter keyup delay in 10ms units */
+        int tx_tail;   /* the transmitter keyoff delay in 10ms units */
+        int slottime;  /* the slottime in 10ms; usually 10 = 100ms */
+        int ppersist;  /* the p-persistence 0..255 */
+        int fulldup;   /* some driver do not support full duplex, setting */
+                       /* this just makes them send even if DCD is on */
+};      
+
+struct hdlcdrv_old_channel_state {
+        int ptt;
+        int dcd;
+        int ptt_keyed;
+};
+
+struct hdlcdrv_channel_state {
+        int ptt;
+        int dcd;
+        int ptt_keyed;
+        unsigned long tx_packets;
+        unsigned long tx_errors;
+        unsigned long rx_packets;
+        unsigned long rx_errors;
+};
+
+struct hdlcdrv_ioctl {
+        int cmd;
+        union {
+                struct hdlcdrv_params mp;
+                struct hdlcdrv_channel_params cp;
+                struct hdlcdrv_channel_state cs;
+                struct hdlcdrv_old_channel_state ocs;
+                unsigned int calibrate;
+                unsigned char bits;
+                char modename[128];
+                char drivername[32];
+        } data;
+};
+
+/* -------------------------------------------------------------------- */
+
+/*
+ * ioctl values
+ */
+#define HDLCDRVCTL_GETMODEMPAR       0
+#define HDLCDRVCTL_SETMODEMPAR       1
+#define HDLCDRVCTL_MODEMPARMASK      2  /* not handled by hdlcdrv */
+#define HDLCDRVCTL_GETCHANNELPAR    10
+#define HDLCDRVCTL_SETCHANNELPAR    11
+#define HDLCDRVCTL_OLDGETSTAT       20
+#define HDLCDRVCTL_CALIBRATE        21
+#define HDLCDRVCTL_GETSTAT          22
+
+/*
+ * these are mainly for debugging purposes
+ */
+#define HDLCDRVCTL_GETSAMPLES       30
+#define HDLCDRVCTL_GETBITS          31
+
+/*
+ * not handled by hdlcdrv, but by its depending drivers
+ */
+#define HDLCDRVCTL_GETMODE          40
+#define HDLCDRVCTL_SETMODE          41
+#define HDLCDRVCTL_MODELIST         42
+#define HDLCDRVCTL_DRIVERNAME       43
+
+/*
+ * mask of needed modem parameters, returned by HDLCDRVCTL_MODEMPARMASK
+ */
+#define HDLCDRV_PARMASK_IOBASE      (1<<0)
+#define HDLCDRV_PARMASK_IRQ         (1<<1)
+#define HDLCDRV_PARMASK_DMA         (1<<2)
+#define HDLCDRV_PARMASK_DMA2        (1<<3)
+#define HDLCDRV_PARMASK_SERIOBASE   (1<<4)
+#define HDLCDRV_PARMASK_PARIOBASE   (1<<5)
+#define HDLCDRV_PARMASK_MIDIIOBASE  (1<<6)
+
+/* -------------------------------------------------------------------- */
+
+
+/* -------------------------------------------------------------------- */
+
+#endif /* _UAPI_HDLCDRV_H */
+
+/* -------------------------------------------------------------------- */
diff --git a/include/linux/hdreg.h b/include/uapi/linux/hdreg.h
index 29ee2873f4a8..29ee2873f4a8 100644
--- a/include/linux/hdreg.h
+++ b/include/uapi/linux/hdreg.h
diff --git a/include/uapi/linux/hid.h b/include/uapi/linux/hid.h
new file mode 100644
index 000000000000..b60f4842bd97
--- /dev/null
+++ b/include/uapi/linux/hid.h
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+#ifndef _UAPI__HID_H
+#define _UAPI__HID_H
+
+
+
+/*
+ * USB HID (Human Interface Device) interface class code
+ */
+
+#define USB_INTERFACE_CLASS_HID         3
+
+/*
+ * USB HID interface subclass and protocol codes
+ */
+
+#define USB_INTERFACE_SUBCLASS_BOOT     1
+#define USB_INTERFACE_PROTOCOL_KEYBOARD 1
+#define USB_INTERFACE_PROTOCOL_MOUSE    2
+
+/*
+ * HID class requests
+ */
+
+#define HID_REQ_GET_REPORT              0x01
+#define HID_REQ_GET_IDLE                0x02
+#define HID_REQ_GET_PROTOCOL            0x03
+#define HID_REQ_SET_REPORT              0x09
+#define HID_REQ_SET_IDLE                0x0A
+#define HID_REQ_SET_PROTOCOL            0x0B
+
+/*
+ * HID class descriptor types
+ */
+
+#define HID_DT_HID                      (USB_TYPE_CLASS | 0x01)
+#define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
+#define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
+
+#define HID_MAX_DESCRIPTOR_SIZE         4096
+
+
+#endif /* _UAPI__HID_H */
diff --git a/include/uapi/linux/hiddev.h b/include/uapi/linux/hiddev.h
new file mode 100644
index 000000000000..7df7884bf5c4
--- /dev/null
+++ b/include/uapi/linux/hiddev.h
@@ -0,0 +1,212 @@
+/*
+ *  Copyright (c) 1999-2000 Vojtech Pavlik
+ *
+ *  Sponsored by SuSE
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
+ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
+ */
+#ifndef _UAPI_HIDDEV_H
+#define _UAPI_HIDDEV_H
+
+
+
+#include <linux/types.h>
+
+/*
+ * The event structure itself
+ */
+
+struct hiddev_event {
+        unsigned hid;
+        signed int value;
+};
+
+struct hiddev_devinfo {
+        __u32 bustype;
+        __u32 busnum;
+        __u32 devnum;
+        __u32 ifnum;
+        __s16 vendor;
+        __s16 product;
+        __s16 version;
+        __u32 num_applications;
+};
+
+struct hiddev_collection_info {
+        __u32 index;
+        __u32 type;
+        __u32 usage;
+        __u32 level;
+};
+
+#define HID_STRING_SIZE 256
+struct hiddev_string_descriptor {
+        __s32 index;
+        char value[HID_STRING_SIZE];
+};
+
+struct hiddev_report_info {
+        __u32 report_type;
+        __u32 report_id;
+        __u32 num_fields;
+};
+
+/* To do a GUSAGE/SUSAGE, fill in at least usage_code,  report_type and 
+ * report_id.  Set report_id to REPORT_ID_UNKNOWN if the rest of the fields 
+ * are unknown.  Otherwise use a usage_ref struct filled in from a previous 
+ * successful GUSAGE call to save time.  To actually send a value to the
+ * device, perform a SUSAGE first, followed by a SREPORT.  An INITREPORT or a
+ * GREPORT isn't necessary for a GUSAGE to return valid data.
+ */
+#define HID_REPORT_ID_UNKNOWN 0xffffffff
+#define HID_REPORT_ID_FIRST   0x00000100
+#define HID_REPORT_ID_NEXT    0x00000200
+#define HID_REPORT_ID_MASK    0x000000ff
+#define HID_REPORT_ID_MAX     0x000000ff
+
+#define HID_REPORT_TYPE_INPUT   1
+#define HID_REPORT_TYPE_OUTPUT  2
+#define HID_REPORT_TYPE_FEATURE 3
+#define HID_REPORT_TYPE_MIN     1
+#define HID_REPORT_TYPE_MAX     3
+
+struct hiddev_field_info {
+        __u32 report_type;
+        __u32 report_id;
+        __u32 field_index;
+        __u32 maxusage;
+        __u32 flags;
+        __u32 physical;         /* physical usage for this field */
+        __u32 logical;          /* logical usage for this field */
+        __u32 application;              /* application usage for this field */
+        __s32 logical_minimum;
+        __s32 logical_maximum;
+        __s32 physical_minimum;
+        __s32 physical_maximum;
+        __u32 unit_exponent;
+        __u32 unit;
+};
+
+/* Fill in report_type, report_id and field_index to get the information on a
+ * field.
+ */
+#define HID_FIELD_CONSTANT              0x001
+#define HID_FIELD_VARIABLE              0x002
+#define HID_FIELD_RELATIVE              0x004
+#define HID_FIELD_WRAP                  0x008   
+#define HID_FIELD_NONLINEAR             0x010
+#define HID_FIELD_NO_PREFERRED          0x020
+#define HID_FIELD_NULL_STATE            0x040
+#define HID_FIELD_VOLATILE              0x080
+#define HID_FIELD_BUFFERED_BYTE         0x100
+
+struct hiddev_usage_ref {
+        __u32 report_type;
+        __u32 report_id;
+        __u32 field_index;
+        __u32 usage_index;
+        __u32 usage_code;
+        __s32 value;
+};
+
+/* hiddev_usage_ref_multi is used for sending multiple bytes to a control.
+ * It really manifests itself as setting the value of consecutive usages */
+#define HID_MAX_MULTI_USAGES 1024
+struct hiddev_usage_ref_multi {
+        struct hiddev_usage_ref uref;
+        __u32 num_values;
+        __s32 values[HID_MAX_MULTI_USAGES];
+};
+
+/* FIELD_INDEX_NONE is returned in read() data from the kernel when flags
+ * is set to (HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT) and a new report has
+ * been sent by the device 
+ */
+#define HID_FIELD_INDEX_NONE 0xffffffff
+
+/*
+ * Protocol version.
+ */
+
+#define HID_VERSION             0x010004
+
+/*
+ * IOCTLs (0x00 - 0x7f)
+ */
+
+#define HIDIOCGVERSION          _IOR('H', 0x01, int)
+#define HIDIOCAPPLICATION       _IO('H', 0x02)
+#define HIDIOCGDEVINFO          _IOR('H', 0x03, struct hiddev_devinfo)
+#define HIDIOCGSTRING           _IOR('H', 0x04, struct hiddev_string_descriptor)
+#define HIDIOCINITREPORT        _IO('H', 0x05)
+#define HIDIOCGNAME(len)        _IOC(_IOC_READ, 'H', 0x06, len)
+#define HIDIOCGREPORT           _IOW('H', 0x07, struct hiddev_report_info)
+#define HIDIOCSREPORT           _IOW('H', 0x08, struct hiddev_report_info)
+#define HIDIOCGREPORTINFO       _IOWR('H', 0x09, struct hiddev_report_info)
+#define HIDIOCGFIELDINFO        _IOWR('H', 0x0A, struct hiddev_field_info)
+#define HIDIOCGUSAGE            _IOWR('H', 0x0B, struct hiddev_usage_ref)
+#define HIDIOCSUSAGE            _IOW('H', 0x0C, struct hiddev_usage_ref)
+#define HIDIOCGUCODE            _IOWR('H', 0x0D, struct hiddev_usage_ref)
+#define HIDIOCGFLAG             _IOR('H', 0x0E, int)
+#define HIDIOCSFLAG             _IOW('H', 0x0F, int)
+#define HIDIOCGCOLLECTIONINDEX  _IOW('H', 0x10, struct hiddev_usage_ref)
+#define HIDIOCGCOLLECTIONINFO   _IOWR('H', 0x11, struct hiddev_collection_info)
+#define HIDIOCGPHYS(len)        _IOC(_IOC_READ, 'H', 0x12, len)
+
+/* For writing/reading to multiple/consecutive usages */
+#define HIDIOCGUSAGES           _IOWR('H', 0x13, struct hiddev_usage_ref_multi)
+#define HIDIOCSUSAGES           _IOW('H', 0x14, struct hiddev_usage_ref_multi)
+
+/* 
+ * Flags to be used in HIDIOCSFLAG
+ */
+#define HIDDEV_FLAG_UREF        0x1
+#define HIDDEV_FLAG_REPORT      0x2
+#define HIDDEV_FLAGS            0x3
+
+/* To traverse the input report descriptor info for a HID device, perform the 
+ * following:
+ *
+ * rinfo.report_type = HID_REPORT_TYPE_INPUT;
+ * rinfo.report_id = HID_REPORT_ID_FIRST;
+ * ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
+ *
+ * while (ret >= 0) {
+ *      for (i = 0; i < rinfo.num_fields; i++) {
+ *              finfo.report_type = rinfo.report_type;
+ *              finfo.report_id = rinfo.report_id;
+ *              finfo.field_index = i;
+ *              ioctl(fd, HIDIOCGFIELDINFO, &finfo);
+ *              for (j = 0; j < finfo.maxusage; j++) {
+ *                      uref.report_type = rinfo.report_type;
+ *                      uref.report_id = rinfo.report_id;
+ *                      uref.field_index = i;
+ *                      uref.usage_index = j;
+ *                      ioctl(fd, HIDIOCGUCODE, &uref);
+ *                      ioctl(fd, HIDIOCGUSAGE, &uref);
+ *              }
+ *      }
+ *      rinfo.report_id |= HID_REPORT_ID_NEXT;
+ *      ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
+ * }
+ */
+
+
+#endif /* _UAPI_HIDDEV_H */
diff --git a/include/uapi/linux/hidraw.h b/include/uapi/linux/hidraw.h
new file mode 100644
index 000000000000..f5b732979a7c
--- /dev/null
+++ b/include/uapi/linux/hidraw.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2007 Jiri Kosina
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef _UAPI_HIDRAW_H
+#define _UAPI_HIDRAW_H
+
+
+
+#include <linux/hid.h>
+#include <linux/types.h>
+
+struct hidraw_report_descriptor {
+        __u32 size;
+        __u8 value[HID_MAX_DESCRIPTOR_SIZE];
+};
+
+struct hidraw_devinfo {
+        __u32 bustype;
+        __s16 vendor;
+        __s16 product;
+};
+
+/* ioctl interface */
+#define HIDIOCGRDESCSIZE        _IOR('H', 0x01, int)
+#define HIDIOCGRDESC            _IOR('H', 0x02, struct hidraw_report_descriptor)
+#define HIDIOCGRAWINFO          _IOR('H', 0x03, struct hidraw_devinfo)
+#define HIDIOCGRAWNAME(len)     _IOC(_IOC_READ, 'H', 0x04, len)
+#define HIDIOCGRAWPHYS(len)     _IOC(_IOC_READ, 'H', 0x05, len)
+/* The first byte of SFEATURE and GFEATURE is the report number */
+#define HIDIOCSFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
+#define HIDIOCGFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)
+
+#define HIDRAW_FIRST_MINOR 0
+#define HIDRAW_MAX_DEVICES 64
+/* number of reports to buffer */
+#define HIDRAW_BUFFER_SIZE 64
+
+
+/* kernel-only API declarations */
+
+#endif /* _UAPI_HIDRAW_H */
diff --git a/include/uapi/linux/hpet.h b/include/uapi/linux/hpet.h
new file mode 100644
index 000000000000..8af3c70abc8c
--- /dev/null
+++ b/include/uapi/linux/hpet.h
@@ -0,0 +1,25 @@
+#ifndef _UAPI__HPET__
+#define _UAPI__HPET__
+
+#include <linux/compiler.h>
+
+
+struct hpet_info {
+        unsigned long hi_ireqfreq;      /* Hz */
+        unsigned long hi_flags; /* information */
+        unsigned short hi_hpet;
+        unsigned short hi_timer;
+};
+
+#define HPET_INFO_PERIODIC      0x0010  /* periodic-capable comparator */
+
+#define HPET_IE_ON      _IO('h', 0x01)  /* interrupt on */
+#define HPET_IE_OFF     _IO('h', 0x02)  /* interrupt off */
+#define HPET_INFO       _IOR('h', 0x03, struct hpet_info)
+#define HPET_EPI        _IO('h', 0x04)  /* enable periodic */
+#define HPET_DPI        _IO('h', 0x05)  /* disable periodic */
+#define HPET_IRQFREQ    _IOW('h', 0x6, unsigned long)   /* IRQFREQ usec */
+
+#define MAX_HPET_TBS    8               /* maximum hpet timer blocks */
+
+#endif /* _UAPI__HPET__ */
diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild
index aafaa5aa54d4..30ab3cd3b8a5 100644
--- a/include/uapi/linux/hsi/Kbuild
+++ b/include/uapi/linux/hsi/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += hsi_char.h
diff --git a/include/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
index 76160b4f455d..76160b4f455d 100644
--- a/include/linux/hsi/hsi_char.h
+++ b/include/uapi/linux/hsi/hsi_char.h
diff --git a/include/linux/hysdn_if.h b/include/uapi/linux/hysdn_if.h
index 00236ae3b04e..00236ae3b04e 100644
--- a/include/linux/hysdn_if.h
+++ b/include/uapi/linux/hysdn_if.h
diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h
new file mode 100644
index 000000000000..3f311551795d
--- /dev/null
+++ b/include/uapi/linux/i2c-dev.h
@@ -0,0 +1,72 @@
+/*
+    i2c-dev.h - i2c-bus driver, char device interface
+
+    Copyright (C) 1995-97 Simon G. Vogl
+    Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA 02110-1301 USA.
+*/
+
+#ifndef _UAPI_LINUX_I2C_DEV_H
+#define _UAPI_LINUX_I2C_DEV_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+
+/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
+ * unsigned long, except for:
+ *      - I2C_FUNCS, takes pointer to an unsigned long
+ *      - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
+ *      - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
+ */
+#define I2C_RETRIES     0x0701  /* number of times a device address should
+                                   be polled when not acknowledging */
+#define I2C_TIMEOUT     0x0702  /* set timeout in units of 10 ms */
+
+/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
+ * are NOT supported! (due to code brokenness)
+ */
+#define I2C_SLAVE       0x0703  /* Use this slave address */
+#define I2C_SLAVE_FORCE 0x0706  /* Use this slave address, even if it
+                                   is already in use by a driver! */
+#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit */
+
+#define I2C_FUNCS       0x0705  /* Get the adapter functionality mask */
+
+#define I2C_RDWR        0x0707  /* Combined R/W transfer (one STOP only) */
+
+#define I2C_PEC         0x0708  /* != 0 to use PEC with SMBus */
+#define I2C_SMBUS       0x0720  /* SMBus transfer */
+
+
+/* This is the structure as used in the I2C_SMBUS ioctl call */
+struct i2c_smbus_ioctl_data {
+        __u8 read_write;
+        __u8 command;
+        __u32 size;
+        union i2c_smbus_data __user *data;
+};
+
+/* This is the structure as used in the I2C_RDWR ioctl call */
+struct i2c_rdwr_ioctl_data {
+        struct i2c_msg __user *msgs;    /* pointers to i2c_msgs */
+        __u32 nmsgs;                    /* number of i2c_msgs */
+};
+
+#define  I2C_RDRW_IOCTL_MAX_MSGS        42
+
+
+#endif /* _UAPI_LINUX_I2C_DEV_H */
diff --git a/include/uapi/linux/i2c.h b/include/uapi/linux/i2c.h
new file mode 100644
index 000000000000..0e949cbfd333
--- /dev/null
+++ b/include/uapi/linux/i2c.h
@@ -0,0 +1,151 @@
+/* ------------------------------------------------------------------------- */
+/*                                                                           */
+/* i2c.h - definitions for the i2c-bus interface                             */
+/*                                                                           */
+/* ------------------------------------------------------------------------- */
+/*   Copyright (C) 1995-2000 Simon G. Vogl
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA 02110-1301 USA.                                                       */
+/* ------------------------------------------------------------------------- */
+
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
+   Frodo Looijaard <frodol@dds.nl> */
+
+#ifndef _UAPI_LINUX_I2C_H
+#define _UAPI_LINUX_I2C_H
+
+#include <linux/types.h>
+
+/**
+ * struct i2c_msg - an I2C transaction segment beginning with START
+ * @addr: Slave address, either seven or ten bits.  When this is a ten
+ *      bit address, I2C_M_TEN must be set in @flags and the adapter
+ *      must support I2C_FUNC_10BIT_ADDR.
+ * @flags: I2C_M_RD is handled by all adapters.  No other flags may be
+ *      provided unless the adapter exported the relevant I2C_FUNC_*
+ *      flags through i2c_check_functionality().
+ * @len: Number of data bytes in @buf being read from or written to the
+ *      I2C slave address.  For read transactions where I2C_M_RECV_LEN
+ *      is set, the caller guarantees that this buffer can hold up to
+ *      32 bytes in addition to the initial length byte sent by the
+ *      slave (plus, if used, the SMBus PEC); and this value will be
+ *      incremented by the number of block data bytes received.
+ * @buf: The buffer into which data is read, or from which it's written.
+ *
+ * An i2c_msg is the low level representation of one segment of an I2C
+ * transaction.  It is visible to drivers in the @i2c_transfer() procedure,
+ * to userspace from i2c-dev, and to I2C adapter drivers through the
+ * @i2c_adapter.@master_xfer() method.
+ *
+ * Except when I2C "protocol mangling" is used, all I2C adapters implement
+ * the standard rules for I2C transactions.  Each transaction begins with a
+ * START.  That is followed by the slave address, and a bit encoding read
+ * versus write.  Then follow all the data bytes, possibly including a byte
+ * with SMBus PEC.  The transfer terminates with a NAK, or when all those
+ * bytes have been transferred and ACKed.  If this is the last message in a
+ * group, it is followed by a STOP.  Otherwise it is followed by the next
+ * @i2c_msg transaction segment, beginning with a (repeated) START.
+ *
+ * Alternatively, when the adapter supports I2C_FUNC_PROTOCOL_MANGLING then
+ * passing certain @flags may have changed those standard protocol behaviors.
+ * Those flags are only for use with broken/nonconforming slaves, and with
+ * adapters which are known to support the specific mangling options they
+ * need (one or more of IGNORE_NAK, NO_RD_ACK, NOSTART, and REV_DIR_ADDR).
+ */
+struct i2c_msg {
+        __u16 addr;     /* slave address                        */
+        __u16 flags;
+#define I2C_M_TEN               0x0010  /* this is a ten bit chip address */
+#define I2C_M_RD                0x0001  /* read data, from slave to master */
+#define I2C_M_STOP              0x8000  /* if I2C_FUNC_PROTOCOL_MANGLING */
+#define I2C_M_NOSTART           0x4000  /* if I2C_FUNC_NOSTART */
+#define I2C_M_REV_DIR_ADDR      0x2000  /* if I2C_FUNC_PROTOCOL_MANGLING */
+#define I2C_M_IGNORE_NAK        0x1000  /* if I2C_FUNC_PROTOCOL_MANGLING */
+#define I2C_M_NO_RD_ACK         0x0800  /* if I2C_FUNC_PROTOCOL_MANGLING */
+#define I2C_M_RECV_LEN          0x0400  /* length will be first received byte */
+        __u16 len;              /* msg length                           */
+        __u8 *buf;              /* pointer to msg data                  */
+};
+
+/* To determine what functionality is present */
+
+#define I2C_FUNC_I2C                    0x00000001
+#define I2C_FUNC_10BIT_ADDR             0x00000002
+#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_IGNORE_NAK etc. */
+#define I2C_FUNC_SMBUS_PEC              0x00000008
+#define I2C_FUNC_NOSTART                0x00000010 /* I2C_M_NOSTART */
+#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
+#define I2C_FUNC_SMBUS_QUICK            0x00010000
+#define I2C_FUNC_SMBUS_READ_BYTE        0x00020000
+#define I2C_FUNC_SMBUS_WRITE_BYTE       0x00040000
+#define I2C_FUNC_SMBUS_READ_BYTE_DATA   0x00080000
+#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA  0x00100000
+#define I2C_FUNC_SMBUS_READ_WORD_DATA   0x00200000
+#define I2C_FUNC_SMBUS_WRITE_WORD_DATA  0x00400000
+#define I2C_FUNC_SMBUS_PROC_CALL        0x00800000
+#define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000
+#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* I2C-like block xfer  */
+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* w/ 1-byte reg. addr. */
+
+#define I2C_FUNC_SMBUS_BYTE             (I2C_FUNC_SMBUS_READ_BYTE | \
+                                         I2C_FUNC_SMBUS_WRITE_BYTE)
+#define I2C_FUNC_SMBUS_BYTE_DATA        (I2C_FUNC_SMBUS_READ_BYTE_DATA | \
+                                         I2C_FUNC_SMBUS_WRITE_BYTE_DATA)
+#define I2C_FUNC_SMBUS_WORD_DATA        (I2C_FUNC_SMBUS_READ_WORD_DATA | \
+                                         I2C_FUNC_SMBUS_WRITE_WORD_DATA)
+#define I2C_FUNC_SMBUS_BLOCK_DATA       (I2C_FUNC_SMBUS_READ_BLOCK_DATA | \
+                                         I2C_FUNC_SMBUS_WRITE_BLOCK_DATA)
+#define I2C_FUNC_SMBUS_I2C_BLOCK        (I2C_FUNC_SMBUS_READ_I2C_BLOCK | \
+                                         I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)
+
+#define I2C_FUNC_SMBUS_EMUL             (I2C_FUNC_SMBUS_QUICK | \
+                                         I2C_FUNC_SMBUS_BYTE | \
+                                         I2C_FUNC_SMBUS_BYTE_DATA | \
+                                         I2C_FUNC_SMBUS_WORD_DATA | \
+                                         I2C_FUNC_SMBUS_PROC_CALL | \
+                                         I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
+                                         I2C_FUNC_SMBUS_I2C_BLOCK | \
+                                         I2C_FUNC_SMBUS_PEC)
+
+/*
+ * Data for SMBus Messages
+ */
+#define I2C_SMBUS_BLOCK_MAX     32      /* As specified in SMBus standard */
+union i2c_smbus_data {
+        __u8 byte;
+        __u16 word;
+        __u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */
+                               /* and one more for user-space compatibility */
+};
+
+/* i2c_smbus_xfer read or write markers */
+#define I2C_SMBUS_READ  1
+#define I2C_SMBUS_WRITE 0
+
+/* SMBus transaction types (size parameter in the above functions)
+   Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */
+#define I2C_SMBUS_QUICK             0
+#define I2C_SMBUS_BYTE              1
+#define I2C_SMBUS_BYTE_DATA         2
+#define I2C_SMBUS_WORD_DATA         3
+#define I2C_SMBUS_PROC_CALL         4
+#define I2C_SMBUS_BLOCK_DATA        5
+#define I2C_SMBUS_I2C_BLOCK_BROKEN  6
+#define I2C_SMBUS_BLOCK_PROC_CALL   7           /* SMBus 2.0 */
+#define I2C_SMBUS_I2C_BLOCK_DATA    8
+
+#endif /* _UAPI_LINUX_I2C_H */
diff --git a/include/linux/i2o-dev.h b/include/uapi/linux/i2o-dev.h
index a8093bfec3a6..a8093bfec3a6 100644
--- a/include/linux/i2o-dev.h
+++ b/include/uapi/linux/i2o-dev.h
diff --git a/include/linux/i8k.h b/include/uapi/linux/i8k.h
index 1c45ba505115..1c45ba505115 100644
--- a/include/linux/i8k.h
+++ b/include/uapi/linux/i8k.h
diff --git a/include/uapi/linux/icmp.h b/include/uapi/linux/icmp.h
new file mode 100644
index 000000000000..16fff055f734
--- /dev/null
+++ b/include/uapi/linux/icmp.h
@@ -0,0 +1,97 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions for the ICMP protocol.
+ *
+ * Version:     @(#)icmp.h      1.0.3   04/28/93
+ *
+ * Author:      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_ICMP_H
+#define _UAPI_LINUX_ICMP_H
+
+#include <linux/types.h>
+
+#define ICMP_ECHOREPLY          0       /* Echo Reply                   */
+#define ICMP_DEST_UNREACH       3       /* Destination Unreachable      */
+#define ICMP_SOURCE_QUENCH      4       /* Source Quench                */
+#define ICMP_REDIRECT           5       /* Redirect (change route)      */
+#define ICMP_ECHO               8       /* Echo Request                 */
+#define ICMP_TIME_EXCEEDED      11      /* Time Exceeded                */
+#define ICMP_PARAMETERPROB      12      /* Parameter Problem            */
+#define ICMP_TIMESTAMP          13      /* Timestamp Request            */
+#define ICMP_TIMESTAMPREPLY     14      /* Timestamp Reply              */
+#define ICMP_INFO_REQUEST       15      /* Information Request          */
+#define ICMP_INFO_REPLY         16      /* Information Reply            */
+#define ICMP_ADDRESS            17      /* Address Mask Request         */
+#define ICMP_ADDRESSREPLY       18      /* Address Mask Reply           */
+#define NR_ICMP_TYPES           18
+
+
+/* Codes for UNREACH. */
+#define ICMP_NET_UNREACH        0       /* Network Unreachable          */
+#define ICMP_HOST_UNREACH       1       /* Host Unreachable             */
+#define ICMP_PROT_UNREACH       2       /* Protocol Unreachable         */
+#define ICMP_PORT_UNREACH       3       /* Port Unreachable             */
+#define ICMP_FRAG_NEEDED        4       /* Fragmentation Needed/DF set  */
+#define ICMP_SR_FAILED          5       /* Source Route failed          */
+#define ICMP_NET_UNKNOWN        6
+#define ICMP_HOST_UNKNOWN       7
+#define ICMP_HOST_ISOLATED      8
+#define ICMP_NET_ANO            9
+#define ICMP_HOST_ANO           10
+#define ICMP_NET_UNR_TOS        11
+#define ICMP_HOST_UNR_TOS       12
+#define ICMP_PKT_FILTERED       13      /* Packet filtered */
+#define ICMP_PREC_VIOLATION     14      /* Precedence violation */
+#define ICMP_PREC_CUTOFF        15      /* Precedence cut off */
+#define NR_ICMP_UNREACH         15      /* instead of hardcoding immediate value */
+
+/* Codes for REDIRECT. */
+#define ICMP_REDIR_NET          0       /* Redirect Net                 */
+#define ICMP_REDIR_HOST         1       /* Redirect Host                */
+#define ICMP_REDIR_NETTOS       2       /* Redirect Net for TOS         */
+#define ICMP_REDIR_HOSTTOS      3       /* Redirect Host for TOS        */
+
+/* Codes for TIME_EXCEEDED. */
+#define ICMP_EXC_TTL            0       /* TTL count exceeded           */
+#define ICMP_EXC_FRAGTIME       1       /* Fragment Reass time exceeded */
+
+
+struct icmphdr {
+  __u8          type;
+  __u8          code;
+  __sum16       checksum;
+  union {
+        struct {
+                __be16  id;
+                __be16  sequence;
+        } echo;
+        __be32  gateway;
+        struct {
+                __be16  __unused;
+                __be16  mtu;
+        } frag;
+  } un;
+};
+
+
+/*
+ *      constants for (set|get)sockopt
+ */
+
+#define ICMP_FILTER                     1
+
+struct icmp_filter {
+        __u32           data;
+};
+
+
+#endif /* _UAPI_LINUX_ICMP_H */
diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
new file mode 100644
index 000000000000..e0133c73c304
--- /dev/null
+++ b/include/uapi/linux/icmpv6.h
@@ -0,0 +1,164 @@
+#ifndef _UAPI_LINUX_ICMPV6_H
+#define _UAPI_LINUX_ICMPV6_H
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+struct icmp6hdr {
+
+        __u8            icmp6_type;
+        __u8            icmp6_code;
+        __sum16         icmp6_cksum;
+
+
+        union {
+                __be32                  un_data32[1];
+                __be16                  un_data16[2];
+                __u8                    un_data8[4];
+
+                struct icmpv6_echo {
+                        __be16          identifier;
+                        __be16          sequence;
+                } u_echo;
+
+                struct icmpv6_nd_advt {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+                        __u32           reserved:5,
+                                        override:1,
+                                        solicited:1,
+                                        router:1,
+                                        reserved2:24;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+                        __u32           router:1,
+                                        solicited:1,
+                                        override:1,
+                                        reserved:29;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif                                          
+                } u_nd_advt;
+
+                struct icmpv6_nd_ra {
+                        __u8            hop_limit;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+                        __u8            reserved:3,
+                                        router_pref:2,
+                                        home_agent:1,
+                                        other:1,
+                                        managed:1;
+
+#elif defined(__BIG_ENDIAN_BITFIELD)
+                        __u8            managed:1,
+                                        other:1,
+                                        home_agent:1,
+                                        router_pref:2,
+                                        reserved:3;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif
+                        __be16          rt_lifetime;
+                } u_nd_ra;
+
+        } icmp6_dataun;
+
+#define icmp6_identifier        icmp6_dataun.u_echo.identifier
+#define icmp6_sequence          icmp6_dataun.u_echo.sequence
+#define icmp6_pointer           icmp6_dataun.un_data32[0]
+#define icmp6_mtu               icmp6_dataun.un_data32[0]
+#define icmp6_unused            icmp6_dataun.un_data32[0]
+#define icmp6_maxdelay          icmp6_dataun.un_data16[0]
+#define icmp6_router            icmp6_dataun.u_nd_advt.router
+#define icmp6_solicited         icmp6_dataun.u_nd_advt.solicited
+#define icmp6_override          icmp6_dataun.u_nd_advt.override
+#define icmp6_ndiscreserved     icmp6_dataun.u_nd_advt.reserved
+#define icmp6_hop_limit         icmp6_dataun.u_nd_ra.hop_limit
+#define icmp6_addrconf_managed  icmp6_dataun.u_nd_ra.managed
+#define icmp6_addrconf_other    icmp6_dataun.u_nd_ra.other
+#define icmp6_rt_lifetime       icmp6_dataun.u_nd_ra.rt_lifetime
+#define icmp6_router_pref       icmp6_dataun.u_nd_ra.router_pref
+};
+
+
+#define ICMPV6_ROUTER_PREF_LOW          0x3
+#define ICMPV6_ROUTER_PREF_MEDIUM       0x0
+#define ICMPV6_ROUTER_PREF_HIGH         0x1
+#define ICMPV6_ROUTER_PREF_INVALID      0x2
+
+#define ICMPV6_DEST_UNREACH             1
+#define ICMPV6_PKT_TOOBIG               2
+#define ICMPV6_TIME_EXCEED              3
+#define ICMPV6_PARAMPROB                4
+
+#define ICMPV6_INFOMSG_MASK             0x80
+
+#define ICMPV6_ECHO_REQUEST             128
+#define ICMPV6_ECHO_REPLY               129
+#define ICMPV6_MGM_QUERY                130
+#define ICMPV6_MGM_REPORT               131
+#define ICMPV6_MGM_REDUCTION            132
+
+#define ICMPV6_NI_QUERY                 139
+#define ICMPV6_NI_REPLY                 140
+
+#define ICMPV6_MLD2_REPORT              143
+
+#define ICMPV6_DHAAD_REQUEST            144
+#define ICMPV6_DHAAD_REPLY              145
+#define ICMPV6_MOBILE_PREFIX_SOL        146
+#define ICMPV6_MOBILE_PREFIX_ADV        147
+
+/*
+ *      Codes for Destination Unreachable
+ */
+#define ICMPV6_NOROUTE                  0
+#define ICMPV6_ADM_PROHIBITED           1
+#define ICMPV6_NOT_NEIGHBOUR            2
+#define ICMPV6_ADDR_UNREACH             3
+#define ICMPV6_PORT_UNREACH             4
+
+/*
+ *      Codes for Time Exceeded
+ */
+#define ICMPV6_EXC_HOPLIMIT             0
+#define ICMPV6_EXC_FRAGTIME             1
+
+/*
+ *      Codes for Parameter Problem
+ */
+#define ICMPV6_HDR_FIELD                0
+#define ICMPV6_UNK_NEXTHDR              1
+#define ICMPV6_UNK_OPTION               2
+
+/*
+ *      constants for (set|get)sockopt
+ */
+
+#define ICMPV6_FILTER                   1
+
+/*
+ *      ICMPV6 filter
+ */
+
+#define ICMPV6_FILTER_BLOCK             1
+#define ICMPV6_FILTER_PASS              2
+#define ICMPV6_FILTER_BLOCKOTHERS       3
+#define ICMPV6_FILTER_PASSONLY          4
+
+struct icmp6_filter {
+        __u32           data[8];
+};
+
+/*
+ *      Definitions for MLDv2
+ */
+#define MLD2_MODE_IS_INCLUDE    1
+#define MLD2_MODE_IS_EXCLUDE    2
+#define MLD2_CHANGE_TO_INCLUDE  3
+#define MLD2_CHANGE_TO_EXCLUDE  4
+#define MLD2_ALLOW_NEW_SOURCES  5
+#define MLD2_BLOCK_OLD_SOURCES  6
+
+#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } }
+
+
+#endif /* _UAPI_LINUX_ICMPV6_H */
diff --git a/include/linux/if.h b/include/uapi/linux/if.h
index 1ec407b01e46..1ec407b01e46 100644
--- a/include/linux/if.h
+++ b/include/uapi/linux/if.h
diff --git a/include/linux/if_addr.h b/include/uapi/linux/if_addr.h
index 23357ab81a77..23357ab81a77 100644
--- a/include/linux/if_addr.h
+++ b/include/uapi/linux/if_addr.h
diff --git a/include/linux/if_addrlabel.h b/include/uapi/linux/if_addrlabel.h
index 54580c298187..54580c298187 100644
--- a/include/linux/if_addrlabel.h
+++ b/include/uapi/linux/if_addrlabel.h
diff --git a/include/linux/if_alg.h b/include/uapi/linux/if_alg.h
index 0f9acce5b1ff..0f9acce5b1ff 100644
--- a/include/linux/if_alg.h
+++ b/include/uapi/linux/if_alg.h
diff --git a/include/linux/if_arcnet.h b/include/uapi/linux/if_arcnet.h
index 46e34bd0e783..46e34bd0e783 100644
--- a/include/linux/if_arcnet.h
+++ b/include/uapi/linux/if_arcnet.h
diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h
new file mode 100644
index 000000000000..82c7d1bdadeb
--- /dev/null
+++ b/include/uapi/linux/if_arp.h
@@ -0,0 +1,159 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Global definitions for the ARP (RFC 826) protocol.
+ *
+ * Version:     @(#)if_arp.h    1.0.1   04/16/93
+ *
+ * Authors:     Original taken from Berkeley UNIX 4.3, (c) UCB 1986-1988
+ *              Portions taken from the KA9Q/NOS (v2.00m PA0GRI) source.
+ *              Ross Biro
+ *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *              Florian La Roche,
+ *              Jonathan Layes <layes@loran.com>
+ *              Arnaldo Carvalho de Melo <acme@conectiva.com.br> ARPHRD_HWX25
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_IF_ARP_H
+#define _UAPI_LINUX_IF_ARP_H
+
+#include <linux/netdevice.h>
+
+/* ARP protocol HARDWARE identifiers. */
+#define ARPHRD_NETROM   0               /* from KA9Q: NET/ROM pseudo    */
+#define ARPHRD_ETHER    1               /* Ethernet 10Mbps              */
+#define ARPHRD_EETHER   2               /* Experimental Ethernet        */
+#define ARPHRD_AX25     3               /* AX.25 Level 2                */
+#define ARPHRD_PRONET   4               /* PROnet token ring            */
+#define ARPHRD_CHAOS    5               /* Chaosnet                     */
+#define ARPHRD_IEEE802  6               /* IEEE 802.2 Ethernet/TR/TB    */
+#define ARPHRD_ARCNET   7               /* ARCnet                       */
+#define ARPHRD_APPLETLK 8               /* APPLEtalk                    */
+#define ARPHRD_DLCI     15              /* Frame Relay DLCI             */
+#define ARPHRD_ATM      19              /* ATM                          */
+#define ARPHRD_METRICOM 23              /* Metricom STRIP (new IANA id) */
+#define ARPHRD_IEEE1394 24              /* IEEE 1394 IPv4 - RFC 2734    */
+#define ARPHRD_EUI64    27              /* EUI-64                       */
+#define ARPHRD_INFINIBAND 32            /* InfiniBand                   */
+
+/* Dummy types for non ARP hardware */
+#define ARPHRD_SLIP     256
+#define ARPHRD_CSLIP    257
+#define ARPHRD_SLIP6    258
+#define ARPHRD_CSLIP6   259
+#define ARPHRD_RSRVD    260             /* Notional KISS type           */
+#define ARPHRD_ADAPT    264
+#define ARPHRD_ROSE     270
+#define ARPHRD_X25      271             /* CCITT X.25                   */
+#define ARPHRD_HWX25    272             /* Boards with X.25 in firmware */
+#define ARPHRD_CAN      280             /* Controller Area Network      */
+#define ARPHRD_PPP      512
+#define ARPHRD_CISCO    513             /* Cisco HDLC                   */
+#define ARPHRD_HDLC     ARPHRD_CISCO
+#define ARPHRD_LAPB     516             /* LAPB                         */
+#define ARPHRD_DDCMP    517             /* Digital's DDCMP protocol     */
+#define ARPHRD_RAWHDLC  518             /* Raw HDLC                     */
+
+#define ARPHRD_TUNNEL   768             /* IPIP tunnel                  */
+#define ARPHRD_TUNNEL6  769             /* IP6IP6 tunnel                */
+#define ARPHRD_FRAD     770             /* Frame Relay Access Device    */
+#define ARPHRD_SKIP     771             /* SKIP vif                     */
+#define ARPHRD_LOOPBACK 772             /* Loopback device              */
+#define ARPHRD_LOCALTLK 773             /* Localtalk device             */
+#define ARPHRD_FDDI     774             /* Fiber Distributed Data Interface */
+#define ARPHRD_BIF      775             /* AP1000 BIF                   */
+#define ARPHRD_SIT      776             /* sit0 device - IPv6-in-IPv4   */
+#define ARPHRD_IPDDP    777             /* IP over DDP tunneller        */
+#define ARPHRD_IPGRE    778             /* GRE over IP                  */
+#define ARPHRD_PIMREG   779             /* PIMSM register interface     */
+#define ARPHRD_HIPPI    780             /* High Performance Parallel Interface */
+#define ARPHRD_ASH      781             /* Nexus 64Mbps Ash             */
+#define ARPHRD_ECONET   782             /* Acorn Econet                 */
+#define ARPHRD_IRDA     783             /* Linux-IrDA                   */
+/* ARP works differently on different FC media .. so  */
+#define ARPHRD_FCPP     784             /* Point to point fibrechannel  */
+#define ARPHRD_FCAL     785             /* Fibrechannel arbitrated loop */
+#define ARPHRD_FCPL     786             /* Fibrechannel public loop     */
+#define ARPHRD_FCFABRIC 787             /* Fibrechannel fabric          */
+        /* 787->799 reserved for fibrechannel media types */
+#define ARPHRD_IEEE802_TR 800           /* Magic type ident for TR      */
+#define ARPHRD_IEEE80211 801            /* IEEE 802.11                  */
+#define ARPHRD_IEEE80211_PRISM 802      /* IEEE 802.11 + Prism2 header  */
+#define ARPHRD_IEEE80211_RADIOTAP 803   /* IEEE 802.11 + radiotap header */
+#define ARPHRD_IEEE802154         804
+#define ARPHRD_IEEE802154_MONITOR 805   /* IEEE 802.15.4 network monitor */
+
+#define ARPHRD_PHONET   820             /* PhoNet media type            */
+#define ARPHRD_PHONET_PIPE 821          /* PhoNet pipe header           */
+#define ARPHRD_CAIF     822             /* CAIF media type              */
+#define ARPHRD_IP6GRE   823             /* GRE over IPv6                */
+
+#define ARPHRD_VOID       0xFFFF        /* Void type, nothing is known */
+#define ARPHRD_NONE       0xFFFE        /* zero header length */
+
+/* ARP protocol opcodes. */
+#define ARPOP_REQUEST   1               /* ARP request                  */
+#define ARPOP_REPLY     2               /* ARP reply                    */
+#define ARPOP_RREQUEST  3               /* RARP request                 */
+#define ARPOP_RREPLY    4               /* RARP reply                   */
+#define ARPOP_InREQUEST 8               /* InARP request                */
+#define ARPOP_InREPLY   9               /* InARP reply                  */
+#define ARPOP_NAK       10              /* (ATM)ARP NAK                 */
+
+
+/* ARP ioctl request. */
+struct arpreq {
+  struct sockaddr       arp_pa;         /* protocol address             */
+  struct sockaddr       arp_ha;         /* hardware address             */
+  int                   arp_flags;      /* flags                        */
+  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
+  char                  arp_dev[16];
+};
+
+struct arpreq_old {
+  struct sockaddr       arp_pa;         /* protocol address             */
+  struct sockaddr       arp_ha;         /* hardware address             */
+  int                   arp_flags;      /* flags                        */
+  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
+};
+
+/* ARP Flag values. */
+#define ATF_COM         0x02            /* completed entry (ha valid)   */
+#define ATF_PERM        0x04            /* permanent entry              */
+#define ATF_PUBL        0x08            /* publish entry                */
+#define ATF_USETRAILERS 0x10            /* has requested trailers       */
+#define ATF_NETMASK     0x20            /* want to use a netmask (only
+                                           for proxy entries) */
+#define ATF_DONTPUB     0x40            /* don't answer this addresses  */
+
+/*
+ *      This structure defines an ethernet arp header.
+ */
+
+struct arphdr {
+        __be16          ar_hrd;         /* format of hardware address   */
+        __be16          ar_pro;         /* format of protocol address   */
+        unsigned char   ar_hln;         /* length of hardware address   */
+        unsigned char   ar_pln;         /* length of protocol address   */
+        __be16          ar_op;          /* ARP opcode (command)         */
+
+#if 0
+         /*
+          *      Ethernet looks like this : This bit is variable sized however...
+          */
+        unsigned char           ar_sha[ETH_ALEN];       /* sender hardware address      */
+        unsigned char           ar_sip[4];              /* sender IP address            */
+        unsigned char           ar_tha[ETH_ALEN];       /* target hardware address      */
+        unsigned char           ar_tip[4];              /* target IP address            */
+#endif
+
+};
+
+
+#endif /* _UAPI_LINUX_IF_ARP_H */
diff --git a/include/linux/if_bonding.h b/include/uapi/linux/if_bonding.h
index a17edda8a781..a17edda8a781 100644
--- a/include/linux/if_bonding.h
+++ b/include/uapi/linux/if_bonding.h
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
new file mode 100644
index 000000000000..a8fe9549ddbc
--- /dev/null
+++ b/include/uapi/linux/if_bridge.h
@@ -0,0 +1,101 @@
+/*
+ *      Linux ethernet bridge
+ *
+ *      Authors:
+ *      Lennert Buytenhek               <buytenh@gnu.org>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IF_BRIDGE_H
+#define _UAPI_LINUX_IF_BRIDGE_H
+
+#include <linux/types.h>
+
+#define SYSFS_BRIDGE_ATTR       "bridge"
+#define SYSFS_BRIDGE_FDB        "brforward"
+#define SYSFS_BRIDGE_PORT_SUBDIR "brif"
+#define SYSFS_BRIDGE_PORT_ATTR  "brport"
+#define SYSFS_BRIDGE_PORT_LINK  "bridge"
+
+#define BRCTL_VERSION 1
+
+#define BRCTL_GET_VERSION 0
+#define BRCTL_GET_BRIDGES 1
+#define BRCTL_ADD_BRIDGE 2
+#define BRCTL_DEL_BRIDGE 3
+#define BRCTL_ADD_IF 4
+#define BRCTL_DEL_IF 5
+#define BRCTL_GET_BRIDGE_INFO 6
+#define BRCTL_GET_PORT_LIST 7
+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
+#define BRCTL_SET_BRIDGE_HELLO_TIME 9
+#define BRCTL_SET_BRIDGE_MAX_AGE 10
+#define BRCTL_SET_AGEING_TIME 11
+#define BRCTL_SET_GC_INTERVAL 12
+#define BRCTL_GET_PORT_INFO 13
+#define BRCTL_SET_BRIDGE_STP_STATE 14
+#define BRCTL_SET_BRIDGE_PRIORITY 15
+#define BRCTL_SET_PORT_PRIORITY 16
+#define BRCTL_SET_PATH_COST 17
+#define BRCTL_GET_FDB_ENTRIES 18
+
+#define BR_STATE_DISABLED 0
+#define BR_STATE_LISTENING 1
+#define BR_STATE_LEARNING 2
+#define BR_STATE_FORWARDING 3
+#define BR_STATE_BLOCKING 4
+
+struct __bridge_info {
+        __u64 designated_root;
+        __u64 bridge_id;
+        __u32 root_path_cost;
+        __u32 max_age;
+        __u32 hello_time;
+        __u32 forward_delay;
+        __u32 bridge_max_age;
+        __u32 bridge_hello_time;
+        __u32 bridge_forward_delay;
+        __u8 topology_change;
+        __u8 topology_change_detected;
+        __u8 root_port;
+        __u8 stp_enabled;
+        __u32 ageing_time;
+        __u32 gc_interval;
+        __u32 hello_timer_value;
+        __u32 tcn_timer_value;
+        __u32 topology_change_timer_value;
+        __u32 gc_timer_value;
+};
+
+struct __port_info {
+        __u64 designated_root;
+        __u64 designated_bridge;
+        __u16 port_id;
+        __u16 designated_port;
+        __u32 path_cost;
+        __u32 designated_cost;
+        __u8 state;
+        __u8 top_change_ack;
+        __u8 config_pending;
+        __u8 unused0;
+        __u32 message_age_timer_value;
+        __u32 forward_delay_timer_value;
+        __u32 hold_timer_value;
+};
+
+struct __fdb_entry {
+        __u8 mac_addr[6];
+        __u8 port_no;
+        __u8 is_local;
+        __u32 ageing_timer_value;
+        __u8 port_hi;
+        __u8 pad0;
+        __u16 unused;
+};
+
+
+#endif /* _UAPI_LINUX_IF_BRIDGE_H */
diff --git a/include/linux/if_cablemodem.h b/include/uapi/linux/if_cablemodem.h
index 9ca1007edd93..9ca1007edd93 100644
--- a/include/linux/if_cablemodem.h
+++ b/include/uapi/linux/if_cablemodem.h
diff --git a/include/uapi/linux/if_eql.h b/include/uapi/linux/if_eql.h
new file mode 100644
index 000000000000..06e818c9e7cb
--- /dev/null
+++ b/include/uapi/linux/if_eql.h
@@ -0,0 +1,54 @@
+/*
+ * Equalizer Load-balancer for serial network interfaces.
+ *
+ * (c) Copyright 1995 Simon "Guru Aleph-Null" Janes
+ * NCM: Network and Communications Management, Inc.
+ *
+ *
+ *      This software may be used and distributed according to the terms
+ *      of the GNU General Public License, incorporated herein by reference.
+ * 
+ * The author may be reached as simon@ncm.com, or C/O
+ *    NCM
+ *    Attn: Simon Janes
+ *    6803 Whittier Ave
+ *    McLean VA 22101
+ *    Phone: 1-703-847-0040 ext 103
+ */
+
+#ifndef _UAPI_LINUX_IF_EQL_H
+#define _UAPI_LINUX_IF_EQL_H
+
+#define EQL_DEFAULT_SLAVE_PRIORITY 28800
+#define EQL_DEFAULT_MAX_SLAVES     4
+#define EQL_DEFAULT_MTU            576
+#define EQL_DEFAULT_RESCHED_IVAL   HZ
+
+#define EQL_ENSLAVE     (SIOCDEVPRIVATE)
+#define EQL_EMANCIPATE  (SIOCDEVPRIVATE + 1)
+
+#define EQL_GETSLAVECFG (SIOCDEVPRIVATE + 2)
+#define EQL_SETSLAVECFG (SIOCDEVPRIVATE + 3)
+
+#define EQL_GETMASTRCFG (SIOCDEVPRIVATE + 4)
+#define EQL_SETMASTRCFG (SIOCDEVPRIVATE + 5)
+
+
+typedef struct master_config {
+        char    master_name[16];
+        int     max_slaves;
+        int     min_slaves;
+} master_config_t;
+
+typedef struct slave_config {
+        char    slave_name[16];
+        long    priority;
+} slave_config_t;
+
+typedef struct slaving_request {
+        char    slave_name[16];
+        long    priority;
+} slaving_request_t;
+
+
+#endif /* _UAPI_LINUX_IF_EQL_H */
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
new file mode 100644
index 000000000000..0343e1f0582c
--- /dev/null
+++ b/include/uapi/linux/if_ether.h
@@ -0,0 +1,135 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Global definitions for the Ethernet IEEE 802.3 interface.
+ *
+ * Version:     @(#)if_ether.h  1.0.1a  02/08/94
+ *
+ * Author:      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *              Donald Becker, <becker@super.org>
+ *              Alan Cox, <alan@lxorguk.ukuu.org.uk>
+ *              Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IF_ETHER_H
+#define _UAPI_LINUX_IF_ETHER_H
+
+#include <linux/types.h>
+
+/*
+ *      IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
+ *      and FCS/CRC (frame check sequence).
+ */
+
+#define ETH_ALEN        6               /* Octets in one ethernet addr   */
+#define ETH_HLEN        14              /* Total octets in header.       */
+#define ETH_ZLEN        60              /* Min. octets in frame sans FCS */
+#define ETH_DATA_LEN    1500            /* Max. octets in payload        */
+#define ETH_FRAME_LEN   1514            /* Max. octets in frame sans FCS */
+#define ETH_FCS_LEN     4               /* Octets in the FCS             */
+
+/*
+ *      These are the defined Ethernet Protocol ID's.
+ */
+
+#define ETH_P_LOOP      0x0060          /* Ethernet Loopback packet     */
+#define ETH_P_PUP       0x0200          /* Xerox PUP packet             */
+#define ETH_P_PUPAT     0x0201          /* Xerox PUP Addr Trans packet  */
+#define ETH_P_IP        0x0800          /* Internet Protocol packet     */
+#define ETH_P_X25       0x0805          /* CCITT X.25                   */
+#define ETH_P_ARP       0x0806          /* Address Resolution packet    */
+#define ETH_P_BPQ       0x08FF          /* G8BPQ AX.25 Ethernet Packet  [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_IEEEPUP   0x0a00          /* Xerox IEEE802.3 PUP packet */
+#define ETH_P_IEEEPUPAT 0x0a01          /* Xerox IEEE802.3 PUP Addr Trans packet */
+#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
+#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
+#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
+#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
+#define ETH_P_LAT       0x6004          /* DEC LAT                      */
+#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
+#define ETH_P_CUST      0x6006          /* DEC Customer use             */
+#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
+#define ETH_P_TEB       0x6558          /* Trans Ether Bridging         */
+#define ETH_P_RARP      0x8035          /* Reverse Addr Res packet      */
+#define ETH_P_ATALK     0x809B          /* Appletalk DDP                */
+#define ETH_P_AARP      0x80F3          /* Appletalk AARP               */
+#define ETH_P_8021Q     0x8100          /* 802.1Q VLAN Extended Header  */
+#define ETH_P_IPX       0x8137          /* IPX over DIX                 */
+#define ETH_P_IPV6      0x86DD          /* IPv6 over bluebook           */
+#define ETH_P_PAUSE     0x8808          /* IEEE Pause frames. See 802.3 31B */
+#define ETH_P_SLOW      0x8809          /* Slow Protocol. See 802.3ad 43B */
+#define ETH_P_WCCP      0x883E          /* Web-cache coordination protocol
+                                         * defined in draft-wilson-wrec-wccp-v2-00.txt */
+#define ETH_P_PPP_DISC  0x8863          /* PPPoE discovery messages     */
+#define ETH_P_PPP_SES   0x8864          /* PPPoE session messages       */
+#define ETH_P_MPLS_UC   0x8847          /* MPLS Unicast traffic         */
+#define ETH_P_MPLS_MC   0x8848          /* MPLS Multicast traffic       */
+#define ETH_P_ATMMPOA   0x884c          /* MultiProtocol Over ATM       */
+#define ETH_P_LINK_CTL  0x886c          /* HPNA, wlan link local tunnel */
+#define ETH_P_ATMFATE   0x8884          /* Frame-based ATM Transport
+                                         * over Ethernet
+                                         */
+#define ETH_P_PAE       0x888E          /* Port Access Entity (IEEE 802.1X) */
+#define ETH_P_AOE       0x88A2          /* ATA over Ethernet            */
+#define ETH_P_8021AD    0x88A8          /* 802.1ad Service VLAN         */
+#define ETH_P_802_EX1   0x88B5          /* 802.1 Local Experimental 1.  */
+#define ETH_P_TIPC      0x88CA          /* TIPC                         */
+#define ETH_P_8021AH    0x88E7          /* 802.1ah Backbone Service Tag */
+#define ETH_P_1588      0x88F7          /* IEEE 1588 Timesync */
+#define ETH_P_FCOE      0x8906          /* Fibre Channel over Ethernet  */
+#define ETH_P_TDLS      0x890D          /* TDLS */
+#define ETH_P_FIP       0x8914          /* FCoE Initialization Protocol */
+#define ETH_P_QINQ1     0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_QINQ2     0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_QINQ3     0x9300          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_EDSA      0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_AF_IUCV   0xFBFB          /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
+
+/*
+ *      Non DIX types. Won't clash for 1500 types.
+ */
+
+#define ETH_P_802_3     0x0001          /* Dummy type for 802.3 frames  */
+#define ETH_P_AX25      0x0002          /* Dummy protocol id for AX.25  */
+#define ETH_P_ALL       0x0003          /* Every packet (be careful!!!) */
+#define ETH_P_802_2     0x0004          /* 802.2 frames                 */
+#define ETH_P_SNAP      0x0005          /* Internal only                */
+#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
+#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
+#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
+#define ETH_P_LOCALTALK 0x0009          /* Localtalk pseudo type        */
+#define ETH_P_CAN       0x000C          /* CAN: Controller Area Network */
+#define ETH_P_CANFD     0x000D          /* CANFD: CAN flexible data rate*/
+#define ETH_P_PPPTALK   0x0010          /* Dummy type for Atalk over PPP*/
+#define ETH_P_TR_802_2  0x0011          /* 802.2 frames                 */
+#define ETH_P_MOBITEX   0x0015          /* Mobitex (kaz@cafe.net)       */
+#define ETH_P_CONTROL   0x0016          /* Card specific control frames */
+#define ETH_P_IRDA      0x0017          /* Linux-IrDA                   */
+#define ETH_P_ECONET    0x0018          /* Acorn Econet                 */
+#define ETH_P_HDLC      0x0019          /* HDLC frames                  */
+#define ETH_P_ARCNET    0x001A          /* 1A for ArcNet :-)            */
+#define ETH_P_DSA       0x001B          /* Distributed Switch Arch.     */
+#define ETH_P_TRAILER   0x001C          /* Trailer switch tagging       */
+#define ETH_P_PHONET    0x00F5          /* Nokia Phonet frames          */
+#define ETH_P_IEEE802154 0x00F6         /* IEEE802.15.4 frame           */
+#define ETH_P_CAIF      0x00F7          /* ST-Ericsson CAIF protocol    */
+
+/*
+ *      This is an Ethernet frame header.
+ */
+
+struct ethhdr {
+        unsigned char   h_dest[ETH_ALEN];       /* destination eth addr */
+        unsigned char   h_source[ETH_ALEN];     /* source ether addr    */
+        __be16          h_proto;                /* packet type ID field */
+} __attribute__((packed));
+
+
+#endif /* _UAPI_LINUX_IF_ETHER_H */
diff --git a/include/linux/if_fc.h b/include/uapi/linux/if_fc.h
index 6ed7f1bf35c8..6ed7f1bf35c8 100644
--- a/include/linux/if_fc.h
+++ b/include/uapi/linux/if_fc.h
diff --git a/include/uapi/linux/if_fddi.h b/include/uapi/linux/if_fddi.h
new file mode 100644
index 000000000000..0d36909c3aef
--- /dev/null
+++ b/include/uapi/linux/if_fddi.h
@@ -0,0 +1,104 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Global definitions for the ANSI FDDI interface.
+ *
+ * Version:     @(#)if_fddi.h   1.0.2   Sep 29 2004
+ *
+ * Author:      Lawrence V. Stefani, <stefani@lkg.dec.com>
+ *
+ *              if_fddi.h is based on previous if_ether.h and if_tr.h work by
+ *                      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *                      Donald Becker, <becker@super.org>
+ *                      Alan Cox, <alan@lxorguk.ukuu.org.uk>
+ *                      Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
+ *                      Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_IF_FDDI_H
+#define _UAPI_LINUX_IF_FDDI_H
+
+#include <linux/types.h>
+
+/*
+ *  Define max and min legal sizes.  The frame sizes do not include
+ *  4 byte FCS/CRC (frame check sequence).
+ */
+#define FDDI_K_ALEN                     6               /* Octets in one FDDI address */
+#define FDDI_K_8022_HLEN        16              /* Total octets in 802.2 header */
+#define FDDI_K_SNAP_HLEN        21              /* Total octets in 802.2 SNAP header */
+#define FDDI_K_8022_ZLEN        16              /* Min octets in 802.2 frame sans FCS */
+#define FDDI_K_SNAP_ZLEN        21              /* Min octets in 802.2 SNAP frame sans FCS */
+#define FDDI_K_8022_DLEN        4475    /* Max octets in 802.2 payload */
+#define FDDI_K_SNAP_DLEN        4470    /* Max octets in 802.2 SNAP payload */
+#define FDDI_K_LLC_ZLEN         13              /* Min octets in LLC frame sans FCS */
+#define FDDI_K_LLC_LEN          4491    /* Max octets in LLC frame sans FCS */
+
+/* Define FDDI Frame Control (FC) Byte values */
+#define FDDI_FC_K_VOID                                  0x00    
+#define FDDI_FC_K_NON_RESTRICTED_TOKEN  0x80    
+#define FDDI_FC_K_RESTRICTED_TOKEN              0xC0    
+#define FDDI_FC_K_SMT_MIN                               0x41
+#define FDDI_FC_K_SMT_MAX                               0x4F
+#define FDDI_FC_K_MAC_MIN                               0xC1
+#define FDDI_FC_K_MAC_MAX                               0xCF    
+#define FDDI_FC_K_ASYNC_LLC_MIN                 0x50
+#define FDDI_FC_K_ASYNC_LLC_DEF                 0x54
+#define FDDI_FC_K_ASYNC_LLC_MAX                 0x5F
+#define FDDI_FC_K_SYNC_LLC_MIN                  0xD0
+#define FDDI_FC_K_SYNC_LLC_MAX                  0xD7
+#define FDDI_FC_K_IMPLEMENTOR_MIN               0x60
+#define FDDI_FC_K_IMPLEMENTOR_MAX               0x6F
+#define FDDI_FC_K_RESERVED_MIN                  0x70
+#define FDDI_FC_K_RESERVED_MAX                  0x7F
+
+/* Define LLC and SNAP constants */
+#define FDDI_EXTENDED_SAP       0xAA
+#define FDDI_UI_CMD                     0x03
+
+/* Define 802.2 Type 1 header */
+struct fddi_8022_1_hdr {
+        __u8    dsap;                                   /* destination service access point */
+        __u8    ssap;                                   /* source service access point */
+        __u8    ctrl;                                   /* control byte #1 */
+} __attribute__((packed));
+
+/* Define 802.2 Type 2 header */
+struct fddi_8022_2_hdr {
+        __u8    dsap;                                   /* destination service access point */
+        __u8    ssap;                                   /* source service access point */
+        __u8    ctrl_1;                                 /* control byte #1 */
+        __u8    ctrl_2;                                 /* control byte #2 */
+} __attribute__((packed));
+
+/* Define 802.2 SNAP header */
+#define FDDI_K_OUI_LEN  3
+struct fddi_snap_hdr {
+        __u8    dsap;                                   /* always 0xAA */
+        __u8    ssap;                                   /* always 0xAA */
+        __u8    ctrl;                                   /* always 0x03 */
+        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
+        __be16  ethertype;                              /* packet type ID field */
+} __attribute__((packed));
+
+/* Define FDDI LLC frame header */
+struct fddihdr {
+        __u8    fc;                                             /* frame control */
+        __u8    daddr[FDDI_K_ALEN];             /* destination address */
+        __u8    saddr[FDDI_K_ALEN];             /* source address */
+        union
+                {
+                struct fddi_8022_1_hdr          llc_8022_1;
+                struct fddi_8022_2_hdr          llc_8022_2;
+                struct fddi_snap_hdr            llc_snap;
+                } hdr;
+} __attribute__((packed));
+
+
+#endif /* _UAPI_LINUX_IF_FDDI_H */
diff --git a/include/uapi/linux/if_frad.h b/include/uapi/linux/if_frad.h
new file mode 100644
index 000000000000..f25b08d5eb6b
--- /dev/null
+++ b/include/uapi/linux/if_frad.h
@@ -0,0 +1,122 @@
+/*
+ * DLCI/FRAD    Definitions for Frame Relay Access Devices.  DLCI devices are
+ *              created for each DLCI associated with a FRAD.  The FRAD driver
+ *              is not truly a network device, but the lower level device
+ *              handler.  This allows other FRAD manufacturers to use the DLCI
+ *              code, including its RFC1490 encapsulation alongside the current
+ *              implementation for the Sangoma cards.
+ *
+ * Version:     @(#)if_ifrad.h  0.15    31 Mar 96
+ *
+ * Author:      Mike McLagan <mike.mclagan@linux.org>
+ *
+ * Changes:
+ *              0.15    Mike McLagan    changed structure defs (packed)
+ *                                      re-arranged flags
+ *                                      added DLCI_RET vars
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_FRAD_H_
+#define _UAPI_FRAD_H_
+
+#include <linux/if.h>
+
+/* Structures and constants associated with the DLCI device driver */
+
+struct dlci_add
+{
+   char  devname[IFNAMSIZ];
+   short dlci;
+};
+
+#define DLCI_GET_CONF   (SIOCDEVPRIVATE + 2)
+#define DLCI_SET_CONF   (SIOCDEVPRIVATE + 3)
+
+/* 
+ * These are related to the Sangoma SDLA and should remain in order. 
+ * Code within the SDLA module is based on the specifics of this 
+ * structure.  Change at your own peril.
+ */
+struct dlci_conf {
+   short flags;
+   short CIR_fwd;
+   short Bc_fwd;
+   short Be_fwd;
+   short CIR_bwd;
+   short Bc_bwd;
+   short Be_bwd; 
+
+/* these are part of the status read */
+   short Tc_fwd;
+   short Tc_bwd;
+   short Tf_max;
+   short Tb_max;
+
+/* add any new fields here above is a mirror of sdla_dlci_conf */
+};
+
+#define DLCI_GET_SLAVE  (SIOCDEVPRIVATE + 4)
+
+/* configuration flags for DLCI */
+#define DLCI_IGNORE_CIR_OUT     0x0001
+#define DLCI_ACCOUNT_CIR_IN     0x0002
+#define DLCI_BUFFER_IF          0x0008
+
+#define DLCI_VALID_FLAGS        0x000B
+
+/* defines for the actual Frame Relay hardware */
+#define FRAD_GET_CONF   (SIOCDEVPRIVATE)
+#define FRAD_SET_CONF   (SIOCDEVPRIVATE + 1)
+
+#define FRAD_LAST_IOCTL FRAD_SET_CONF
+
+/*
+ * Based on the setup for the Sangoma SDLA.  If changes are 
+ * necessary to this structure, a routine will need to be 
+ * added to that module to copy fields.
+ */
+struct frad_conf 
+{
+   short station;
+   short flags;
+   short kbaud;
+   short clocking;
+   short mtu;
+   short T391;
+   short T392;
+   short N391;
+   short N392;
+   short N393;
+   short CIR_fwd;
+   short Bc_fwd;
+   short Be_fwd;
+   short CIR_bwd;
+   short Bc_bwd;
+   short Be_bwd;
+
+/* Add new fields here, above is a mirror of the sdla_conf */
+
+};
+
+#define FRAD_STATION_CPE        0x0000
+#define FRAD_STATION_NODE       0x0001
+
+#define FRAD_TX_IGNORE_CIR      0x0001
+#define FRAD_RX_ACCOUNT_CIR     0x0002
+#define FRAD_DROP_ABORTED       0x0004
+#define FRAD_BUFFERIF           0x0008
+#define FRAD_STATS              0x0010
+#define FRAD_MCI                0x0100
+#define FRAD_AUTODLCI           0x8000
+#define FRAD_VALID_FLAGS        0x811F
+
+#define FRAD_CLOCK_INT          0x0001
+#define FRAD_CLOCK_EXT          0x0000
+
+
+#endif /* _UAPI_FRAD_H_ */
diff --git a/include/linux/if_hippi.h b/include/uapi/linux/if_hippi.h
index cdc049f1829a..cdc049f1829a 100644
--- a/include/linux/if_hippi.h
+++ b/include/uapi/linux/if_hippi.h
diff --git a/include/linux/if_infiniband.h b/include/uapi/linux/if_infiniband.h
index 7d958475d4ac..7d958475d4ac 100644
--- a/include/linux/if_infiniband.h
+++ b/include/uapi/linux/if_infiniband.h
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
new file mode 100644
index 000000000000..5c80cb11518b
--- /dev/null
+++ b/include/uapi/linux/if_link.h
@@ -0,0 +1,429 @@
+#ifndef _UAPI_LINUX_IF_LINK_H
+#define _UAPI_LINUX_IF_LINK_H
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+
+/* This struct should be in sync with struct rtnl_link_stats64 */
+struct rtnl_link_stats {
+        __u32   rx_packets;             /* total packets received       */
+        __u32   tx_packets;             /* total packets transmitted    */
+        __u32   rx_bytes;               /* total bytes received         */
+        __u32   tx_bytes;               /* total bytes transmitted      */
+        __u32   rx_errors;              /* bad packets received         */
+        __u32   tx_errors;              /* packet transmit problems     */
+        __u32   rx_dropped;             /* no space in linux buffers    */
+        __u32   tx_dropped;             /* no space available in linux  */
+        __u32   multicast;              /* multicast packets received   */
+        __u32   collisions;
+
+        /* detailed rx_errors: */
+        __u32   rx_length_errors;
+        __u32   rx_over_errors;         /* receiver ring buff overflow  */
+        __u32   rx_crc_errors;          /* recved pkt with crc error    */
+        __u32   rx_frame_errors;        /* recv'd frame alignment error */
+        __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
+        __u32   rx_missed_errors;       /* receiver missed packet       */
+
+        /* detailed tx_errors */
+        __u32   tx_aborted_errors;
+        __u32   tx_carrier_errors;
+        __u32   tx_fifo_errors;
+        __u32   tx_heartbeat_errors;
+        __u32   tx_window_errors;
+
+        /* for cslip etc */
+        __u32   rx_compressed;
+        __u32   tx_compressed;
+};
+
+/* The main device statistics structure */
+struct rtnl_link_stats64 {
+        __u64   rx_packets;             /* total packets received       */
+        __u64   tx_packets;             /* total packets transmitted    */
+        __u64   rx_bytes;               /* total bytes received         */
+        __u64   tx_bytes;               /* total bytes transmitted      */
+        __u64   rx_errors;              /* bad packets received         */
+        __u64   tx_errors;              /* packet transmit problems     */
+        __u64   rx_dropped;             /* no space in linux buffers    */
+        __u64   tx_dropped;             /* no space available in linux  */
+        __u64   multicast;              /* multicast packets received   */
+        __u64   collisions;
+
+        /* detailed rx_errors: */
+        __u64   rx_length_errors;
+        __u64   rx_over_errors;         /* receiver ring buff overflow  */
+        __u64   rx_crc_errors;          /* recved pkt with crc error    */
+        __u64   rx_frame_errors;        /* recv'd frame alignment error */
+        __u64   rx_fifo_errors;         /* recv'r fifo overrun          */
+        __u64   rx_missed_errors;       /* receiver missed packet       */
+
+        /* detailed tx_errors */
+        __u64   tx_aborted_errors;
+        __u64   tx_carrier_errors;
+        __u64   tx_fifo_errors;
+        __u64   tx_heartbeat_errors;
+        __u64   tx_window_errors;
+
+        /* for cslip etc */
+        __u64   rx_compressed;
+        __u64   tx_compressed;
+};
+
+/* The struct should be in sync with struct ifmap */
+struct rtnl_link_ifmap {
+        __u64   mem_start;
+        __u64   mem_end;
+        __u64   base_addr;
+        __u16   irq;
+        __u8    dma;
+        __u8    port;
+};
+
+/*
+ * IFLA_AF_SPEC
+ *   Contains nested attributes for address family specific attributes.
+ *   Each address family may create a attribute with the address family
+ *   number as type and create its own attribute structure in it.
+ *
+ *   Example:
+ *   [IFLA_AF_SPEC] = {
+ *       [AF_INET] = {
+ *           [IFLA_INET_CONF] = ...,
+ *       },
+ *       [AF_INET6] = {
+ *           [IFLA_INET6_FLAGS] = ...,
+ *           [IFLA_INET6_CONF] = ...,
+ *       }
+ *   }
+ */
+
+enum {
+        IFLA_UNSPEC,
+        IFLA_ADDRESS,
+        IFLA_BROADCAST,
+        IFLA_IFNAME,
+        IFLA_MTU,
+        IFLA_LINK,
+        IFLA_QDISC,
+        IFLA_STATS,
+        IFLA_COST,
+#define IFLA_COST IFLA_COST
+        IFLA_PRIORITY,
+#define IFLA_PRIORITY IFLA_PRIORITY
+        IFLA_MASTER,
+#define IFLA_MASTER IFLA_MASTER
+        IFLA_WIRELESS,          /* Wireless Extension event - see wireless.h */
+#define IFLA_WIRELESS IFLA_WIRELESS
+        IFLA_PROTINFO,          /* Protocol specific information for a link */
+#define IFLA_PROTINFO IFLA_PROTINFO
+        IFLA_TXQLEN,
+#define IFLA_TXQLEN IFLA_TXQLEN
+        IFLA_MAP,
+#define IFLA_MAP IFLA_MAP
+        IFLA_WEIGHT,
+#define IFLA_WEIGHT IFLA_WEIGHT
+        IFLA_OPERSTATE,
+        IFLA_LINKMODE,
+        IFLA_LINKINFO,
+#define IFLA_LINKINFO IFLA_LINKINFO
+        IFLA_NET_NS_PID,
+        IFLA_IFALIAS,
+        IFLA_NUM_VF,            /* Number of VFs if device is SR-IOV PF */
+        IFLA_VFINFO_LIST,
+        IFLA_STATS64,
+        IFLA_VF_PORTS,
+        IFLA_PORT_SELF,
+        IFLA_AF_SPEC,
+        IFLA_GROUP,             /* Group the device belongs to */
+        IFLA_NET_NS_FD,
+        IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */
+        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */
+#define IFLA_PROMISCUITY IFLA_PROMISCUITY
+        IFLA_NUM_TX_QUEUES,
+        IFLA_NUM_RX_QUEUES,
+        __IFLA_MAX
+};
+
+
+#define IFLA_MAX (__IFLA_MAX - 1)
+
+/* backwards compatibility for userspace */
+#ifndef __KERNEL__
+#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
+#endif
+
+enum {
+        IFLA_INET_UNSPEC,
+        IFLA_INET_CONF,
+        __IFLA_INET_MAX,
+};
+
+#define IFLA_INET_MAX (__IFLA_INET_MAX - 1)
+
+/* ifi_flags.
+
+   IFF_* flags.
+
+   The only change is:
+   IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
+   more not changeable by user. They describe link media
+   characteristics and set by device driver.
+
+   Comments:
+   - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
+   - If neither of these three flags are set;
+     the interface is NBMA.
+
+   - IFF_MULTICAST does not mean anything special:
+   multicasts can be used on all not-NBMA links.
+   IFF_MULTICAST means that this media uses special encapsulation
+   for multicast frames. Apparently, all IFF_POINTOPOINT and
+   IFF_BROADCAST devices are able to use multicasts too.
+ */
+
+/* IFLA_LINK.
+   For usual devices it is equal ifi_index.
+   If it is a "virtual interface" (f.e. tunnel), ifi_link
+   can point to real physical interface (f.e. for bandwidth calculations),
+   or maybe 0, what means, that real media is unknown (usual
+   for IPIP tunnels, when route to endpoint is allowed to change)
+ */
+
+/* Subtype attributes for IFLA_PROTINFO */
+enum {
+        IFLA_INET6_UNSPEC,
+        IFLA_INET6_FLAGS,       /* link flags                   */
+        IFLA_INET6_CONF,        /* sysctl parameters            */
+        IFLA_INET6_STATS,       /* statistics                   */
+        IFLA_INET6_MCAST,       /* MC things. What of them?     */
+        IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
+        IFLA_INET6_ICMP6STATS,  /* statistics (icmpv6)          */
+        __IFLA_INET6_MAX
+};
+
+#define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
+
+struct ifla_cacheinfo {
+        __u32   max_reasm_len;
+        __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
+        __u32   reachable_time;
+        __u32   retrans_time;
+};
+
+enum {
+        IFLA_INFO_UNSPEC,
+        IFLA_INFO_KIND,
+        IFLA_INFO_DATA,
+        IFLA_INFO_XSTATS,
+        __IFLA_INFO_MAX,
+};
+
+#define IFLA_INFO_MAX   (__IFLA_INFO_MAX - 1)
+
+/* VLAN section */
+
+enum {
+        IFLA_VLAN_UNSPEC,
+        IFLA_VLAN_ID,
+        IFLA_VLAN_FLAGS,
+        IFLA_VLAN_EGRESS_QOS,
+        IFLA_VLAN_INGRESS_QOS,
+        __IFLA_VLAN_MAX,
+};
+
+#define IFLA_VLAN_MAX   (__IFLA_VLAN_MAX - 1)
+
+struct ifla_vlan_flags {
+        __u32   flags;
+        __u32   mask;
+};
+
+enum {
+        IFLA_VLAN_QOS_UNSPEC,
+        IFLA_VLAN_QOS_MAPPING,
+        __IFLA_VLAN_QOS_MAX
+};
+
+#define IFLA_VLAN_QOS_MAX       (__IFLA_VLAN_QOS_MAX - 1)
+
+struct ifla_vlan_qos_mapping {
+        __u32 from;
+        __u32 to;
+};
+
+/* MACVLAN section */
+enum {
+        IFLA_MACVLAN_UNSPEC,
+        IFLA_MACVLAN_MODE,
+        IFLA_MACVLAN_FLAGS,
+        __IFLA_MACVLAN_MAX,
+};
+
+#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
+
+enum macvlan_mode {
+        MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
+        MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
+        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
+        MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */
+};
+
+#define MACVLAN_FLAG_NOPROMISC  1
+
+/* VXLAN section */
+enum {
+        IFLA_VXLAN_UNSPEC,
+        IFLA_VXLAN_ID,
+        IFLA_VXLAN_GROUP,
+        IFLA_VXLAN_LINK,
+        IFLA_VXLAN_LOCAL,
+        IFLA_VXLAN_TTL,
+        IFLA_VXLAN_TOS,
+        IFLA_VXLAN_LEARNING,
+        IFLA_VXLAN_AGEING,
+        IFLA_VXLAN_LIMIT,
+        IFLA_VXLAN_PORT_RANGE,
+        __IFLA_VXLAN_MAX
+};
+#define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
+
+struct ifla_vxlan_port_range {
+        __be16  low;
+        __be16  high;
+};
+
+/* SR-IOV virtual function management section */
+
+enum {
+        IFLA_VF_INFO_UNSPEC,
+        IFLA_VF_INFO,
+        __IFLA_VF_INFO_MAX,
+};
+
+#define IFLA_VF_INFO_MAX (__IFLA_VF_INFO_MAX - 1)
+
+enum {
+        IFLA_VF_UNSPEC,
+        IFLA_VF_MAC,            /* Hardware queue specific attributes */
+        IFLA_VF_VLAN,
+        IFLA_VF_TX_RATE,        /* TX Bandwidth Allocation */
+        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
+        __IFLA_VF_MAX,
+};
+
+#define IFLA_VF_MAX (__IFLA_VF_MAX - 1)
+
+struct ifla_vf_mac {
+        __u32 vf;
+        __u8 mac[32]; /* MAX_ADDR_LEN */
+};
+
+struct ifla_vf_vlan {
+        __u32 vf;
+        __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
+        __u32 qos;
+};
+
+struct ifla_vf_tx_rate {
+        __u32 vf;
+        __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
+};
+
+struct ifla_vf_spoofchk {
+        __u32 vf;
+        __u32 setting;
+};
+
+/* VF ports management section
+ *
+ *      Nested layout of set/get msg is:
+ *
+ *              [IFLA_NUM_VF]
+ *              [IFLA_VF_PORTS]
+ *                      [IFLA_VF_PORT]
+ *                              [IFLA_PORT_*], ...
+ *                      [IFLA_VF_PORT]
+ *                              [IFLA_PORT_*], ...
+ *                      ...
+ *              [IFLA_PORT_SELF]
+ *                      [IFLA_PORT_*], ...
+ */
+
+enum {
+        IFLA_VF_PORT_UNSPEC,
+        IFLA_VF_PORT,                   /* nest */
+        __IFLA_VF_PORT_MAX,
+};
+
+#define IFLA_VF_PORT_MAX (__IFLA_VF_PORT_MAX - 1)
+
+enum {
+        IFLA_PORT_UNSPEC,
+        IFLA_PORT_VF,                   /* __u32 */
+        IFLA_PORT_PROFILE,              /* string */
+        IFLA_PORT_VSI_TYPE,             /* 802.1Qbg (pre-)standard VDP */
+        IFLA_PORT_INSTANCE_UUID,        /* binary UUID */
+        IFLA_PORT_HOST_UUID,            /* binary UUID */
+        IFLA_PORT_REQUEST,              /* __u8 */
+        IFLA_PORT_RESPONSE,             /* __u16, output only */
+        __IFLA_PORT_MAX,
+};
+
+#define IFLA_PORT_MAX (__IFLA_PORT_MAX - 1)
+
+#define PORT_PROFILE_MAX        40
+#define PORT_UUID_MAX           16
+#define PORT_SELF_VF            -1
+
+enum {
+        PORT_REQUEST_PREASSOCIATE = 0,
+        PORT_REQUEST_PREASSOCIATE_RR,
+        PORT_REQUEST_ASSOCIATE,
+        PORT_REQUEST_DISASSOCIATE,
+};
+
+enum {
+        PORT_VDP_RESPONSE_SUCCESS = 0,
+        PORT_VDP_RESPONSE_INVALID_FORMAT,
+        PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES,
+        PORT_VDP_RESPONSE_UNUSED_VTID,
+        PORT_VDP_RESPONSE_VTID_VIOLATION,
+        PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION,
+        PORT_VDP_RESPONSE_OUT_OF_SYNC,
+        /* 0x08-0xFF reserved for future VDP use */
+        PORT_PROFILE_RESPONSE_SUCCESS = 0x100,
+        PORT_PROFILE_RESPONSE_INPROGRESS,
+        PORT_PROFILE_RESPONSE_INVALID,
+        PORT_PROFILE_RESPONSE_BADSTATE,
+        PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES,
+        PORT_PROFILE_RESPONSE_ERROR,
+};
+
+struct ifla_port_vsi {
+        __u8 vsi_mgr_id;
+        __u8 vsi_type_id[3];
+        __u8 vsi_type_version;
+        __u8 pad[3];
+};
+
+
+/* IPoIB section */
+
+enum {
+        IFLA_IPOIB_UNSPEC,
+        IFLA_IPOIB_PKEY,
+        IFLA_IPOIB_MODE,
+        IFLA_IPOIB_UMCAST,
+        __IFLA_IPOIB_MAX
+};
+
+enum {
+        IPOIB_MODE_DATAGRAM  = 0, /* using unreliable datagram QPs */
+        IPOIB_MODE_CONNECTED = 1, /* using connected QPs */
+};
+
+#define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
+
+#endif /* _UAPI_LINUX_IF_LINK_H */
diff --git a/include/uapi/linux/if_ltalk.h b/include/uapi/linux/if_ltalk.h
new file mode 100644
index 000000000000..b92c1fb6ac16
--- /dev/null
+++ b/include/uapi/linux/if_ltalk.h
@@ -0,0 +1,9 @@
+#ifndef _UAPI__LINUX_LTALK_H
+#define _UAPI__LINUX_LTALK_H
+
+#define LTALK_HLEN              1
+#define LTALK_MTU               600
+#define LTALK_ALEN              1
+
+
+#endif /* _UAPI__LINUX_LTALK_H */
diff --git a/include/linux/if_packet.h b/include/uapi/linux/if_packet.h
index f3799295d231..f3799295d231 100644
--- a/include/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
diff --git a/include/uapi/linux/if_phonet.h b/include/uapi/linux/if_phonet.h
new file mode 100644
index 000000000000..f7ad9e24eb3d
--- /dev/null
+++ b/include/uapi/linux/if_phonet.h
@@ -0,0 +1,16 @@
+/*
+ * File: if_phonet.h
+ *
+ * Phonet interface kernel definitions
+ *
+ * Copyright (C) 2008 Nokia Corporation. All rights reserved.
+ */
+#ifndef _UAPILINUX_IF_PHONET_H
+#define _UAPILINUX_IF_PHONET_H
+
+#define PHONET_MIN_MTU          6       /* pn_length = 0 */
+#define PHONET_MAX_MTU          65541   /* pn_length = 0xffff */
+#define PHONET_DEV_MTU          PHONET_MAX_MTU
+
+
+#endif /* _UAPILINUX_IF_PHONET_H */
diff --git a/include/linux/if_plip.h b/include/uapi/linux/if_plip.h
index 6298c7e88b2b..6298c7e88b2b 100644
--- a/include/linux/if_plip.h
+++ b/include/uapi/linux/if_plip.h
diff --git a/include/linux/if_ppp.h b/include/uapi/linux/if_ppp.h
index 9048fabb7a4e..9048fabb7a4e 100644
--- a/include/linux/if_ppp.h
+++ b/include/uapi/linux/if_ppp.h
diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h
new file mode 100644
index 000000000000..163e8adac2d6
--- /dev/null
+++ b/include/uapi/linux/if_pppol2tp.h
@@ -0,0 +1,104 @@
+/***************************************************************************
+ * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
+ *
+ * This file supplies definitions required by the PPP over L2TP driver
+ * (l2tp_ppp.c).  All version information wrt this file is located in l2tp_ppp.c
+ *
+ * License:
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef _UAPI__LINUX_IF_PPPOL2TP_H
+#define _UAPI__LINUX_IF_PPPOL2TP_H
+
+#include <linux/types.h>
+
+
+/* Structure used to connect() the socket to a particular tunnel UDP
+ * socket over IPv4.
+ */
+struct pppol2tp_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP socket to use */
+
+        struct sockaddr_in addr;        /* IP address and port to send to */
+
+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
+};
+
+/* Structure used to connect() the socket to a particular tunnel UDP
+ * socket over IPv6.
+ */
+struct pppol2tpin6_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP socket to use */
+
+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
+
+        struct sockaddr_in6 addr;       /* IP address and port to send to */
+};
+
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
+struct pppol2tpv3_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP or IP socket to use */
+
+        struct sockaddr_in addr;        /* IP address and port to send to */
+
+        __u32 s_tunnel, s_session;      /* For matching incoming packets */
+        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
+};
+
+struct pppol2tpv3in6_addr {
+        __kernel_pid_t  pid;            /* pid that owns the fd.
+                                         * 0 => current */
+        int     fd;                     /* FD of UDP or IP socket to use */
+
+        __u32 s_tunnel, s_session;      /* For matching incoming packets */
+        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
+
+        struct sockaddr_in6 addr;       /* IP address and port to send to */
+};
+
+/* Socket options:
+ * DEBUG        - bitmask of debug message categories
+ * SENDSEQ      - 0 => don't send packets with sequence numbers
+ *                1 => send packets with sequence numbers
+ * RECVSEQ      - 0 => receive packet sequence numbers are optional
+ *                1 => drop receive packets without sequence numbers
+ * LNSMODE      - 0 => act as LAC.
+ *                1 => act as LNS.
+ * REORDERTO    - reorder timeout (in millisecs). If 0, don't try to reorder.
+ */
+enum {
+        PPPOL2TP_SO_DEBUG       = 1,
+        PPPOL2TP_SO_RECVSEQ     = 2,
+        PPPOL2TP_SO_SENDSEQ     = 3,
+        PPPOL2TP_SO_LNSMODE     = 4,
+        PPPOL2TP_SO_REORDERTO   = 5,
+};
+
+/* Debug message categories for the DEBUG socket option */
+enum {
+        PPPOL2TP_MSG_DEBUG      = (1 << 0),     /* verbose debug (if
+                                                 * compiled in) */
+        PPPOL2TP_MSG_CONTROL    = (1 << 1),     /* userspace - kernel
+                                                 * interface */
+        PPPOL2TP_MSG_SEQ        = (1 << 2),     /* sequence numbers */
+        PPPOL2TP_MSG_DATA       = (1 << 3),     /* data packets */
+};
+
+
+
+#endif /* _UAPI__LINUX_IF_PPPOL2TP_H */
diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
new file mode 100644
index 000000000000..0b46fd57c8f6
--- /dev/null
+++ b/include/uapi/linux/if_pppox.h
@@ -0,0 +1,156 @@
+/***************************************************************************
+ * Linux PPP over X - Generic PPP transport layer sockets
+ * Linux PPP over Ethernet (PPPoE) Socket Implementation (RFC 2516) 
+ *
+ * This file supplies definitions required by the PPP over Ethernet driver
+ * (pppox.c).  All version information wrt this file is located in pppox.c
+ *
+ * License:
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef _UAPI__LINUX_IF_PPPOX_H
+#define _UAPI__LINUX_IF_PPPOX_H
+
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+#include <linux/socket.h>
+#include <linux/if_ether.h>
+#include <linux/if_pppol2tp.h>
+
+/* For user-space programs to pick up these definitions
+ * which they wouldn't get otherwise without defining __KERNEL__
+ */
+#ifndef AF_PPPOX
+#define AF_PPPOX        24
+#define PF_PPPOX        AF_PPPOX
+#endif /* !(AF_PPPOX) */
+
+/************************************************************************ 
+ * PPPoE addressing definition 
+ */ 
+typedef __be16 sid_t;
+struct pppoe_addr {
+        sid_t         sid;                    /* Session identifier */
+        unsigned char remote[ETH_ALEN];       /* Remote address */
+        char          dev[IFNAMSIZ];          /* Local device to use */
+}; 
+ 
+/************************************************************************ 
+ * PPTP addressing definition
+ */
+struct pptp_addr {
+        __be16          call_id;
+        struct in_addr  sin_addr;
+};
+
+/************************************************************************
+ * Protocols supported by AF_PPPOX
+ */
+#define PX_PROTO_OE    0 /* Currently just PPPoE */
+#define PX_PROTO_OL2TP 1 /* Now L2TP also */
+#define PX_PROTO_PPTP  2
+#define PX_MAX_PROTO   3
+
+struct sockaddr_pppox {
+        __kernel_sa_family_t sa_family;       /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;          /* protocol identifier */
+        union {
+                struct pppoe_addr  pppoe;
+                struct pptp_addr   pptp;
+        } sa_addr;
+} __packed;
+
+/* The use of the above union isn't viable because the size of this
+ * struct must stay fixed over time -- applications use sizeof(struct
+ * sockaddr_pppox) to fill it. We use a protocol specific sockaddr
+ * type instead.
+ */
+struct sockaddr_pppol2tp {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tp_addr pppol2tp;
+} __packed;
+
+struct sockaddr_pppol2tpin6 {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tpin6_addr pppol2tp;
+} __packed;
+
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
+struct sockaddr_pppol2tpv3 {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tpv3_addr pppol2tp;
+} __packed;
+
+struct sockaddr_pppol2tpv3in6 {
+        __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
+        unsigned int    sa_protocol;    /* protocol identifier */
+        struct pppol2tpv3in6_addr pppol2tp;
+} __packed;
+
+/*********************************************************************
+ *
+ * ioctl interface for defining forwarding of connections
+ *
+ ********************************************************************/
+
+#define PPPOEIOCSFWD    _IOW(0xB1 ,0, size_t)
+#define PPPOEIOCDFWD    _IO(0xB1 ,1)
+/*#define PPPOEIOCGFWD  _IOWR(0xB1,2, size_t)*/
+
+/* Codes to identify message types */
+#define PADI_CODE       0x09
+#define PADO_CODE       0x07
+#define PADR_CODE       0x19
+#define PADS_CODE       0x65
+#define PADT_CODE       0xa7
+struct pppoe_tag {
+        __be16 tag_type;
+        __be16 tag_len;
+        char tag_data[0];
+} __attribute__ ((packed));
+
+/* Tag identifiers */
+#define PTT_EOL         __cpu_to_be16(0x0000)
+#define PTT_SRV_NAME    __cpu_to_be16(0x0101)
+#define PTT_AC_NAME     __cpu_to_be16(0x0102)
+#define PTT_HOST_UNIQ   __cpu_to_be16(0x0103)
+#define PTT_AC_COOKIE   __cpu_to_be16(0x0104)
+#define PTT_VENDOR      __cpu_to_be16(0x0105)
+#define PTT_RELAY_SID   __cpu_to_be16(0x0110)
+#define PTT_SRV_ERR     __cpu_to_be16(0x0201)
+#define PTT_SYS_ERR     __cpu_to_be16(0x0202)
+#define PTT_GEN_ERR     __cpu_to_be16(0x0203)
+
+struct pppoe_hdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 ver : 4;
+        __u8 type : 4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8 type : 4;
+        __u8 ver : 4;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif
+        __u8 code;
+        __be16 sid;
+        __be16 length;
+        struct pppoe_tag tag[0];
+} __packed;
+
+/* Length of entire PPPoE + PPP header */
+#define PPPOE_SES_HLEN  8
+
+
+#endif /* _UAPI__LINUX_IF_PPPOX_H */
diff --git a/include/linux/if_slip.h b/include/uapi/linux/if_slip.h
index 1eb4e3a8397a..1eb4e3a8397a 100644
--- a/include/linux/if_slip.h
+++ b/include/uapi/linux/if_slip.h
diff --git a/include/uapi/linux/if_team.h b/include/uapi/linux/if_team.h
new file mode 100644
index 000000000000..7b8fa339de30
--- /dev/null
+++ b/include/uapi/linux/if_team.h
@@ -0,0 +1,107 @@
+/*
+ * include/linux/if_team.h - Network team device driver header
+ * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IF_TEAM_H_
+#define _UAPI_LINUX_IF_TEAM_H_
+
+
+#define TEAM_STRING_MAX_LEN 32
+
+/**********************************
+ * NETLINK_GENERIC netlink family.
+ **********************************/
+
+enum {
+        TEAM_CMD_NOOP,
+        TEAM_CMD_OPTIONS_SET,
+        TEAM_CMD_OPTIONS_GET,
+        TEAM_CMD_PORT_LIST_GET,
+
+        __TEAM_CMD_MAX,
+        TEAM_CMD_MAX = (__TEAM_CMD_MAX - 1),
+};
+
+enum {
+        TEAM_ATTR_UNSPEC,
+        TEAM_ATTR_TEAM_IFINDEX,         /* u32 */
+        TEAM_ATTR_LIST_OPTION,          /* nest */
+        TEAM_ATTR_LIST_PORT,            /* nest */
+
+        __TEAM_ATTR_MAX,
+        TEAM_ATTR_MAX = __TEAM_ATTR_MAX - 1,
+};
+
+/* Nested layout of get/set msg:
+ *
+ *      [TEAM_ATTR_LIST_OPTION]
+ *              [TEAM_ATTR_ITEM_OPTION]
+ *                      [TEAM_ATTR_OPTION_*], ...
+ *              [TEAM_ATTR_ITEM_OPTION]
+ *                      [TEAM_ATTR_OPTION_*], ...
+ *              ...
+ *      [TEAM_ATTR_LIST_PORT]
+ *              [TEAM_ATTR_ITEM_PORT]
+ *                      [TEAM_ATTR_PORT_*], ...
+ *              [TEAM_ATTR_ITEM_PORT]
+ *                      [TEAM_ATTR_PORT_*], ...
+ *              ...
+ */
+
+enum {
+        TEAM_ATTR_ITEM_OPTION_UNSPEC,
+        TEAM_ATTR_ITEM_OPTION,          /* nest */
+
+        __TEAM_ATTR_ITEM_OPTION_MAX,
+        TEAM_ATTR_ITEM_OPTION_MAX = __TEAM_ATTR_ITEM_OPTION_MAX - 1,
+};
+
+enum {
+        TEAM_ATTR_OPTION_UNSPEC,
+        TEAM_ATTR_OPTION_NAME,          /* string */
+        TEAM_ATTR_OPTION_CHANGED,       /* flag */
+        TEAM_ATTR_OPTION_TYPE,          /* u8 */
+        TEAM_ATTR_OPTION_DATA,          /* dynamic */
+        TEAM_ATTR_OPTION_REMOVED,       /* flag */
+        TEAM_ATTR_OPTION_PORT_IFINDEX,  /* u32 */ /* for per-port options */
+        TEAM_ATTR_OPTION_ARRAY_INDEX,   /* u32 */ /* for array options */
+
+        __TEAM_ATTR_OPTION_MAX,
+        TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
+};
+
+enum {
+        TEAM_ATTR_ITEM_PORT_UNSPEC,
+        TEAM_ATTR_ITEM_PORT,            /* nest */
+
+        __TEAM_ATTR_ITEM_PORT_MAX,
+        TEAM_ATTR_ITEM_PORT_MAX = __TEAM_ATTR_ITEM_PORT_MAX - 1,
+};
+
+enum {
+        TEAM_ATTR_PORT_UNSPEC,
+        TEAM_ATTR_PORT_IFINDEX,         /* u32 */
+        TEAM_ATTR_PORT_CHANGED,         /* flag */
+        TEAM_ATTR_PORT_LINKUP,          /* flag */
+        TEAM_ATTR_PORT_SPEED,           /* u32 */
+        TEAM_ATTR_PORT_DUPLEX,          /* u8 */
+        TEAM_ATTR_PORT_REMOVED,         /* flag */
+
+        __TEAM_ATTR_PORT_MAX,
+        TEAM_ATTR_PORT_MAX = __TEAM_ATTR_PORT_MAX - 1,
+};
+
+/*
+ * NETLINK_GENERIC related info
+ */
+#define TEAM_GENL_NAME "team"
+#define TEAM_GENL_VERSION 0x1
+#define TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME "change_event"
+
+#endif /* _UAPI_LINUX_IF_TEAM_H_ */
diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h
new file mode 100644
index 000000000000..25a585ce23e6
--- /dev/null
+++ b/include/uapi/linux/if_tun.h
@@ -0,0 +1,94 @@
+/*
+ *  Universal TUN/TAP device driver.
+ *  Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef _UAPI__IF_TUN_H
+#define _UAPI__IF_TUN_H
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+#include <linux/filter.h>
+
+/* Read queue size */
+#define TUN_READQ_SIZE  500
+
+/* TUN device flags */
+#define TUN_TUN_DEV     0x0001  
+#define TUN_TAP_DEV     0x0002
+#define TUN_TYPE_MASK   0x000f
+
+#define TUN_FASYNC      0x0010
+#define TUN_NOCHECKSUM  0x0020
+#define TUN_NO_PI       0x0040
+#define TUN_ONE_QUEUE   0x0080
+#define TUN_PERSIST     0x0100  
+#define TUN_VNET_HDR    0x0200
+
+/* Ioctl defines */
+#define TUNSETNOCSUM  _IOW('T', 200, int) 
+#define TUNSETDEBUG   _IOW('T', 201, int) 
+#define TUNSETIFF     _IOW('T', 202, int) 
+#define TUNSETPERSIST _IOW('T', 203, int) 
+#define TUNSETOWNER   _IOW('T', 204, int)
+#define TUNSETLINK    _IOW('T', 205, int)
+#define TUNSETGROUP   _IOW('T', 206, int)
+#define TUNGETFEATURES _IOR('T', 207, unsigned int)
+#define TUNSETOFFLOAD  _IOW('T', 208, unsigned int)
+#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
+#define TUNGETIFF      _IOR('T', 210, unsigned int)
+#define TUNGETSNDBUF   _IOR('T', 211, int)
+#define TUNSETSNDBUF   _IOW('T', 212, int)
+#define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog)
+#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
+#define TUNGETVNETHDRSZ _IOR('T', 215, int)
+#define TUNSETVNETHDRSZ _IOW('T', 216, int)
+
+/* TUNSETIFF ifr flags */
+#define IFF_TUN         0x0001
+#define IFF_TAP         0x0002
+#define IFF_NO_PI       0x1000
+#define IFF_ONE_QUEUE   0x2000
+#define IFF_VNET_HDR    0x4000
+#define IFF_TUN_EXCL    0x8000
+
+/* Features for GSO (TUNSETOFFLOAD). */
+#define TUN_F_CSUM      0x01    /* You can hand me unchecksummed packets. */
+#define TUN_F_TSO4      0x02    /* I can handle TSO for IPv4 packets */
+#define TUN_F_TSO6      0x04    /* I can handle TSO for IPv6 packets */
+#define TUN_F_TSO_ECN   0x08    /* I can handle TSO with ECN bits. */
+#define TUN_F_UFO       0x10    /* I can handle UFO packets */
+
+/* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
+#define TUN_PKT_STRIP   0x0001
+struct tun_pi {
+        __u16  flags;
+        __be16 proto;
+};
+
+/*
+ * Filter spec (used for SETXXFILTER ioctls)
+ * This stuff is applicable only to the TAP (Ethernet) devices.
+ * If the count is zero the filter is disabled and the driver accepts
+ * all packets (promisc mode).
+ * If the filter is enabled in order to accept broadcast packets
+ * broadcast addr must be explicitly included in the addr list.
+ */
+#define TUN_FLT_ALLMULTI 0x0001 /* Accept all multicast packets */
+struct tun_filter {
+        __u16  flags; /* TUN_FLT_ flags see above */
+        __u16  count; /* Number of addresses */
+        __u8   addr[0][ETH_ALEN];
+};
+
+#endif /* _UAPI__IF_TUN_H */
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
new file mode 100644
index 000000000000..5db5942575fe
--- /dev/null
+++ b/include/uapi/linux/if_tunnel.h
@@ -0,0 +1,96 @@
+#ifndef _UAPI_IF_TUNNEL_H_
+#define _UAPI_IF_TUNNEL_H_
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+
+#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
+#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
+#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
+#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
+#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
+#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
+#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
+#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
+#define SIOCGET6RD      (SIOCDEVPRIVATE + 8)
+#define SIOCADD6RD      (SIOCDEVPRIVATE + 9)
+#define SIOCDEL6RD      (SIOCDEVPRIVATE + 10)
+#define SIOCCHG6RD      (SIOCDEVPRIVATE + 11)
+
+#define GRE_CSUM        __cpu_to_be16(0x8000)
+#define GRE_ROUTING     __cpu_to_be16(0x4000)
+#define GRE_KEY         __cpu_to_be16(0x2000)
+#define GRE_SEQ         __cpu_to_be16(0x1000)
+#define GRE_STRICT      __cpu_to_be16(0x0800)
+#define GRE_REC         __cpu_to_be16(0x0700)
+#define GRE_FLAGS       __cpu_to_be16(0x00F8)
+#define GRE_VERSION     __cpu_to_be16(0x0007)
+
+struct ip_tunnel_parm {
+        char                    name[IFNAMSIZ];
+        int                     link;
+        __be16                  i_flags;
+        __be16                  o_flags;
+        __be32                  i_key;
+        __be32                  o_key;
+        struct iphdr            iph;
+};
+
+/* SIT-mode i_flags */
+#define SIT_ISATAP      0x0001
+
+struct ip_tunnel_prl {
+        __be32                  addr;
+        __u16                   flags;
+        __u16                   __reserved;
+        __u32                   datalen;
+        __u32                   __reserved2;
+        /* data follows */
+};
+
+/* PRL flags */
+#define PRL_DEFAULT             0x0001
+
+struct ip_tunnel_6rd {
+        struct in6_addr         prefix;
+        __be32                  relay_prefix;
+        __u16                   prefixlen;
+        __u16                   relay_prefixlen;
+};
+
+enum {
+        IFLA_GRE_UNSPEC,
+        IFLA_GRE_LINK,
+        IFLA_GRE_IFLAGS,
+        IFLA_GRE_OFLAGS,
+        IFLA_GRE_IKEY,
+        IFLA_GRE_OKEY,
+        IFLA_GRE_LOCAL,
+        IFLA_GRE_REMOTE,
+        IFLA_GRE_TTL,
+        IFLA_GRE_TOS,
+        IFLA_GRE_PMTUDISC,
+        IFLA_GRE_ENCAP_LIMIT,
+        IFLA_GRE_FLOWINFO,
+        IFLA_GRE_FLAGS,
+        __IFLA_GRE_MAX,
+};
+
+#define IFLA_GRE_MAX    (__IFLA_GRE_MAX - 1)
+
+/* VTI-mode i_flags */
+#define VTI_ISVTI 0x0001
+
+enum {
+        IFLA_VTI_UNSPEC,
+        IFLA_VTI_LINK,
+        IFLA_VTI_IKEY,
+        IFLA_VTI_OKEY,
+        IFLA_VTI_LOCAL,
+        IFLA_VTI_REMOTE,
+        __IFLA_VTI_MAX,
+};
+
+#define IFLA_VTI_MAX    (__IFLA_VTI_MAX - 1)
+#endif /* _UAPI_IF_TUNNEL_H_ */
diff --git a/include/uapi/linux/if_vlan.h b/include/uapi/linux/if_vlan.h
new file mode 100644
index 000000000000..0744f8e65d15
--- /dev/null
+++ b/include/uapi/linux/if_vlan.h
@@ -0,0 +1,63 @@
+/*
+ * VLAN         An implementation of 802.1Q VLAN tagging.
+ *
+ * Authors:     Ben Greear <greearb@candelatech.com>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef _UAPI_LINUX_IF_VLAN_H_
+#define _UAPI_LINUX_IF_VLAN_H_
+
+
+/* VLAN IOCTLs are found in sockios.h */
+
+/* Passed in vlan_ioctl_args structure to determine behaviour. */
+enum vlan_ioctl_cmds {
+        ADD_VLAN_CMD,
+        DEL_VLAN_CMD,
+        SET_VLAN_INGRESS_PRIORITY_CMD,
+        SET_VLAN_EGRESS_PRIORITY_CMD,
+        GET_VLAN_INGRESS_PRIORITY_CMD,
+        GET_VLAN_EGRESS_PRIORITY_CMD,
+        SET_VLAN_NAME_TYPE_CMD,
+        SET_VLAN_FLAG_CMD,
+        GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
+        GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
+};
+
+enum vlan_flags {
+        VLAN_FLAG_REORDER_HDR   = 0x1,
+        VLAN_FLAG_GVRP          = 0x2,
+        VLAN_FLAG_LOOSE_BINDING = 0x4,
+};
+
+enum vlan_name_types {
+        VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
+        VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
+        VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
+        VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
+        VLAN_NAME_TYPE_HIGHEST
+};
+
+struct vlan_ioctl_args {
+        int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
+        char device1[24];
+
+        union {
+                char device2[24];
+                int VID;
+                unsigned int skb_priority;
+                unsigned int name_type;
+                unsigned int bind_type;
+                unsigned int flag; /* Matches vlan_dev_priv flags */
+        } u;
+
+        short vlan_qos;   
+};
+
+#endif /* _UAPI_LINUX_IF_VLAN_H_ */
diff --git a/include/linux/if_x25.h b/include/uapi/linux/if_x25.h
index 897765f5feb8..897765f5feb8 100644
--- a/include/linux/if_x25.h
+++ b/include/uapi/linux/if_x25.h
diff --git a/include/uapi/linux/igmp.h b/include/uapi/linux/igmp.h
new file mode 100644
index 000000000000..ccbb32aa6704
--- /dev/null
+++ b/include/uapi/linux/igmp.h
@@ -0,0 +1,128 @@
+/*
+ *      Linux NET3:     Internet Group Management Protocol  [IGMP]
+ *
+ *      Authors:
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
+ *
+ *      Extended to talk the BSD extended IGMP protocol of mrouted 3.6
+ *
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IGMP_H
+#define _UAPI_LINUX_IGMP_H
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+/*
+ *      IGMP protocol structures
+ */
+
+/*
+ *      Header in on cable format
+ */
+
+struct igmphdr {
+        __u8 type;
+        __u8 code;              /* For newer IGMP */
+        __sum16 csum;
+        __be32 group;
+};
+
+/* V3 group record types [grec_type] */
+#define IGMPV3_MODE_IS_INCLUDE          1
+#define IGMPV3_MODE_IS_EXCLUDE          2
+#define IGMPV3_CHANGE_TO_INCLUDE        3
+#define IGMPV3_CHANGE_TO_EXCLUDE        4
+#define IGMPV3_ALLOW_NEW_SOURCES        5
+#define IGMPV3_BLOCK_OLD_SOURCES        6
+
+struct igmpv3_grec {
+        __u8    grec_type;
+        __u8    grec_auxwords;
+        __be16  grec_nsrcs;
+        __be32  grec_mca;
+        __be32  grec_src[0];
+};
+
+struct igmpv3_report {
+        __u8 type;
+        __u8 resv1;
+        __be16 csum;
+        __be16 resv2;
+        __be16 ngrec;
+        struct igmpv3_grec grec[0];
+};
+
+struct igmpv3_query {
+        __u8 type;
+        __u8 code;
+        __be16 csum;
+        __be32 group;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8 qrv:3,
+             suppress:1,
+             resv:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8 resv:4,
+             suppress:1,
+             qrv:3;
+#else
+#error "Please fix <asm/byteorder.h>"
+#endif
+        __u8 qqic;
+        __be16 nsrcs;
+        __be32 srcs[0];
+};
+
+#define IGMP_HOST_MEMBERSHIP_QUERY      0x11    /* From RFC1112 */
+#define IGMP_HOST_MEMBERSHIP_REPORT     0x12    /* Ditto */
+#define IGMP_DVMRP                      0x13    /* DVMRP routing */
+#define IGMP_PIM                        0x14    /* PIM routing */
+#define IGMP_TRACE                      0x15
+#define IGMPV2_HOST_MEMBERSHIP_REPORT   0x16    /* V2 version of 0x12 */
+#define IGMP_HOST_LEAVE_MESSAGE         0x17
+#define IGMPV3_HOST_MEMBERSHIP_REPORT   0x22    /* V3 version of 0x12 */
+
+#define IGMP_MTRACE_RESP                0x1e
+#define IGMP_MTRACE                     0x1f
+
+
+/*
+ *      Use the BSD names for these for compatibility
+ */
+
+#define IGMP_DELAYING_MEMBER            0x01
+#define IGMP_IDLE_MEMBER                0x02
+#define IGMP_LAZY_MEMBER                0x03
+#define IGMP_SLEEPING_MEMBER            0x04
+#define IGMP_AWAKENING_MEMBER           0x05
+
+#define IGMP_MINLEN                     8
+
+#define IGMP_MAX_HOST_REPORT_DELAY      10      /* max delay for response to */
+                                                /* query (in seconds)   */
+
+#define IGMP_TIMER_SCALE                10      /* denotes that the igmphdr->timer field */
+                                                /* specifies time in 10th of seconds     */
+
+#define IGMP_AGE_THRESHOLD              400     /* If this host don't hear any IGMP V1  */
+                                                /* message in this period of time,      */
+                                                /* revert to IGMP v2 router.            */
+
+#define IGMP_ALL_HOSTS          htonl(0xE0000001L)
+#define IGMP_ALL_ROUTER         htonl(0xE0000002L)
+#define IGMPV3_ALL_MCR          htonl(0xE0000016L)
+#define IGMP_LOCAL_GROUP        htonl(0xE0000000L)
+#define IGMP_LOCAL_GROUP_MASK   htonl(0xFFFFFF00L)
+
+/*
+ * struct for keeping the multicast list in
+ */
+
+#endif /* _UAPI_LINUX_IGMP_H */
diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
new file mode 100644
index 000000000000..9edb441df827
--- /dev/null
+++ b/include/uapi/linux/in.h
@@ -0,0 +1,253 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions of the Internet Protocol.
+ *
+ * Version:     @(#)in.h        1.0.1   04/21/93
+ *
+ * Authors:     Original taken from the GNU Project <netinet/in.h> file.
+ *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_IN_H
+#define _UAPI_LINUX_IN_H
+
+#include <linux/types.h>
+#include <linux/socket.h>
+
+/* Standard well-defined IP protocols.  */
+enum {
+  IPPROTO_IP = 0,               /* Dummy protocol for TCP               */
+  IPPROTO_ICMP = 1,             /* Internet Control Message Protocol    */
+  IPPROTO_IGMP = 2,             /* Internet Group Management Protocol   */
+  IPPROTO_IPIP = 4,             /* IPIP tunnels (older KA9Q tunnels use 94) */
+  IPPROTO_TCP = 6,              /* Transmission Control Protocol        */
+  IPPROTO_EGP = 8,              /* Exterior Gateway Protocol            */
+  IPPROTO_PUP = 12,             /* PUP protocol                         */
+  IPPROTO_UDP = 17,             /* User Datagram Protocol               */
+  IPPROTO_IDP = 22,             /* XNS IDP protocol                     */
+  IPPROTO_DCCP = 33,            /* Datagram Congestion Control Protocol */
+  IPPROTO_RSVP = 46,            /* RSVP protocol                        */
+  IPPROTO_GRE = 47,             /* Cisco GRE tunnels (rfc 1701,1702)    */
+
+  IPPROTO_IPV6   = 41,          /* IPv6-in-IPv4 tunnelling              */
+
+  IPPROTO_ESP = 50,            /* Encapsulation Security Payload protocol */
+  IPPROTO_AH = 51,             /* Authentication Header protocol       */
+  IPPROTO_BEETPH = 94,         /* IP option pseudo header for BEET */
+  IPPROTO_PIM    = 103,         /* Protocol Independent Multicast       */
+
+  IPPROTO_COMP   = 108,                /* Compression Header protocol */
+  IPPROTO_SCTP   = 132,         /* Stream Control Transport Protocol    */
+  IPPROTO_UDPLITE = 136,        /* UDP-Lite (RFC 3828)                  */
+
+  IPPROTO_RAW    = 255,         /* Raw IP packets                       */
+  IPPROTO_MAX
+};
+
+
+/* Internet address. */
+struct in_addr {
+        __be32  s_addr;
+};
+
+#define IP_TOS          1
+#define IP_TTL          2
+#define IP_HDRINCL      3
+#define IP_OPTIONS      4
+#define IP_ROUTER_ALERT 5
+#define IP_RECVOPTS     6
+#define IP_RETOPTS      7
+#define IP_PKTINFO      8
+#define IP_PKTOPTIONS   9
+#define IP_MTU_DISCOVER 10
+#define IP_RECVERR      11
+#define IP_RECVTTL      12
+#define IP_RECVTOS      13
+#define IP_MTU          14
+#define IP_FREEBIND     15
+#define IP_IPSEC_POLICY 16
+#define IP_XFRM_POLICY  17
+#define IP_PASSSEC      18
+#define IP_TRANSPARENT  19
+
+/* BSD compatibility */
+#define IP_RECVRETOPTS  IP_RETOPTS
+
+/* TProxy original addresses */
+#define IP_ORIGDSTADDR       20
+#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
+
+#define IP_MINTTL       21
+#define IP_NODEFRAG     22
+
+/* IP_MTU_DISCOVER values */
+#define IP_PMTUDISC_DONT                0       /* Never send DF frames */
+#define IP_PMTUDISC_WANT                1       /* Use per route hints  */
+#define IP_PMTUDISC_DO                  2       /* Always DF            */
+#define IP_PMTUDISC_PROBE               3       /* Ignore dst pmtu      */
+
+#define IP_MULTICAST_IF                 32
+#define IP_MULTICAST_TTL                33
+#define IP_MULTICAST_LOOP               34
+#define IP_ADD_MEMBERSHIP               35
+#define IP_DROP_MEMBERSHIP              36
+#define IP_UNBLOCK_SOURCE               37
+#define IP_BLOCK_SOURCE                 38
+#define IP_ADD_SOURCE_MEMBERSHIP        39
+#define IP_DROP_SOURCE_MEMBERSHIP       40
+#define IP_MSFILTER                     41
+#define MCAST_JOIN_GROUP                42
+#define MCAST_BLOCK_SOURCE              43
+#define MCAST_UNBLOCK_SOURCE            44
+#define MCAST_LEAVE_GROUP               45
+#define MCAST_JOIN_SOURCE_GROUP         46
+#define MCAST_LEAVE_SOURCE_GROUP        47
+#define MCAST_MSFILTER                  48
+#define IP_MULTICAST_ALL                49
+#define IP_UNICAST_IF                   50
+
+#define MCAST_EXCLUDE   0
+#define MCAST_INCLUDE   1
+
+/* These need to appear somewhere around here */
+#define IP_DEFAULT_MULTICAST_TTL        1
+#define IP_DEFAULT_MULTICAST_LOOP       1
+
+/* Request struct for multicast socket ops */
+
+struct ip_mreq  {
+        struct in_addr imr_multiaddr;   /* IP multicast address of group */
+        struct in_addr imr_interface;   /* local IP address of interface */
+};
+
+struct ip_mreqn {
+        struct in_addr  imr_multiaddr;          /* IP multicast address of group */
+        struct in_addr  imr_address;            /* local IP address of interface */
+        int             imr_ifindex;            /* Interface index */
+};
+
+struct ip_mreq_source {
+        __be32          imr_multiaddr;
+        __be32          imr_interface;
+        __be32          imr_sourceaddr;
+};
+
+struct ip_msfilter {
+        __be32          imsf_multiaddr;
+        __be32          imsf_interface;
+        __u32           imsf_fmode;
+        __u32           imsf_numsrc;
+        __be32          imsf_slist[1];
+};
+
+#define IP_MSFILTER_SIZE(numsrc) \
+        (sizeof(struct ip_msfilter) - sizeof(__u32) \
+        + (numsrc) * sizeof(__u32))
+
+struct group_req {
+        __u32                            gr_interface;  /* interface index */
+        struct __kernel_sockaddr_storage gr_group;      /* group address */
+};
+
+struct group_source_req {
+        __u32                            gsr_interface; /* interface index */
+        struct __kernel_sockaddr_storage gsr_group;     /* group address */
+        struct __kernel_sockaddr_storage gsr_source;    /* source address */
+};
+
+struct group_filter {
+        __u32                            gf_interface;  /* interface index */
+        struct __kernel_sockaddr_storage gf_group;      /* multicast address */
+        __u32                            gf_fmode;      /* filter mode */
+        __u32                            gf_numsrc;     /* number of sources */
+        struct __kernel_sockaddr_storage gf_slist[1];   /* interface index */
+};
+
+#define GROUP_FILTER_SIZE(numsrc) \
+        (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
+        + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
+
+struct in_pktinfo {
+        int             ipi_ifindex;
+        struct in_addr  ipi_spec_dst;
+        struct in_addr  ipi_addr;
+};
+
+/* Structure describing an Internet (IP) socket address. */
+#define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
+struct sockaddr_in {
+  __kernel_sa_family_t  sin_family;     /* Address family               */
+  __be16                sin_port;       /* Port number                  */
+  struct in_addr        sin_addr;       /* Internet address             */
+
+  /* Pad to size of `struct sockaddr'. */
+  unsigned char         __pad[__SOCK_SIZE__ - sizeof(short int) -
+                        sizeof(unsigned short int) - sizeof(struct in_addr)];
+};
+#define sin_zero        __pad           /* for BSD UNIX comp. -FvK      */
+
+
+/*
+ * Definitions of the bits in an Internet address integer.
+ * On subnets, host and network parts are found according
+ * to the subnet mask, not these masks.
+ */
+#define IN_CLASSA(a)            ((((long int) (a)) & 0x80000000) == 0)
+#define IN_CLASSA_NET           0xff000000
+#define IN_CLASSA_NSHIFT        24
+#define IN_CLASSA_HOST          (0xffffffff & ~IN_CLASSA_NET)
+#define IN_CLASSA_MAX           128
+
+#define IN_CLASSB(a)            ((((long int) (a)) & 0xc0000000) == 0x80000000)
+#define IN_CLASSB_NET           0xffff0000
+#define IN_CLASSB_NSHIFT        16
+#define IN_CLASSB_HOST          (0xffffffff & ~IN_CLASSB_NET)
+#define IN_CLASSB_MAX           65536
+
+#define IN_CLASSC(a)            ((((long int) (a)) & 0xe0000000) == 0xc0000000)
+#define IN_CLASSC_NET           0xffffff00
+#define IN_CLASSC_NSHIFT        8
+#define IN_CLASSC_HOST          (0xffffffff & ~IN_CLASSC_NET)
+
+#define IN_CLASSD(a)            ((((long int) (a)) & 0xf0000000) == 0xe0000000)
+#define IN_MULTICAST(a)         IN_CLASSD(a)
+#define IN_MULTICAST_NET        0xF0000000
+
+#define IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
+#define IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
+
+/* Address to accept any incoming messages. */
+#define INADDR_ANY              ((unsigned long int) 0x00000000)
+
+/* Address to send to all hosts. */
+#define INADDR_BROADCAST        ((unsigned long int) 0xffffffff)
+
+/* Address indicating an error return. */
+#define INADDR_NONE             ((unsigned long int) 0xffffffff)
+
+/* Network number for local host loopback. */
+#define IN_LOOPBACKNET          127
+
+/* Address to loopback in software to local host.  */
+#define INADDR_LOOPBACK         0x7f000001      /* 127.0.0.1   */
+#define IN_LOOPBACK(a)          ((((long int) (a)) & 0xff000000) == 0x7f000000)
+
+/* Defines for Multicast INADDR */
+#define INADDR_UNSPEC_GROUP     0xe0000000U     /* 224.0.0.0   */
+#define INADDR_ALLHOSTS_GROUP   0xe0000001U     /* 224.0.0.1   */
+#define INADDR_ALLRTRS_GROUP    0xe0000002U     /* 224.0.0.2 */
+#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU     /* 224.0.0.255 */
+
+
+/* <asm/byteorder.h> contains the htonl type stuff.. */
+#include <asm/byteorder.h> 
+
+
+#endif /* _UAPI_LINUX_IN_H */
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
new file mode 100644
index 000000000000..1e3159989958
--- /dev/null
+++ b/include/uapi/linux/in6.h
@@ -0,0 +1,279 @@
+/*
+ *      Types and definitions for AF_INET6 
+ *      Linux INET6 implementation 
+ *
+ *      Authors:
+ *      Pedro Roque             <roque@di.fc.ul.pt>     
+ *
+ *      Sources:
+ *      IPv6 Program Interfaces for BSD Systems
+ *      <draft-ietf-ipngwg-bsd-api-05.txt>
+ *
+ *      Advanced Sockets API for IPv6
+ *      <draft-stevens-advanced-api-00.txt>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IN6_H
+#define _UAPI_LINUX_IN6_H
+
+#include <linux/types.h>
+
+/*
+ *      IPv6 address structure
+ */
+
+struct in6_addr {
+        union {
+                __u8            u6_addr8[16];
+                __be16          u6_addr16[8];
+                __be32          u6_addr32[4];
+        } in6_u;
+#define s6_addr                 in6_u.u6_addr8
+#define s6_addr16               in6_u.u6_addr16
+#define s6_addr32               in6_u.u6_addr32
+};
+
+/* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553
+ * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined
+ * in network byte order, not in host byte order as are the IPv4 equivalents
+ */
+
+struct sockaddr_in6 {
+        unsigned short int      sin6_family;    /* AF_INET6 */
+        __be16                  sin6_port;      /* Transport layer port # */
+        __be32                  sin6_flowinfo;  /* IPv6 flow information */
+        struct in6_addr         sin6_addr;      /* IPv6 address */
+        __u32                   sin6_scope_id;  /* scope id (new in RFC2553) */
+};
+
+struct ipv6_mreq {
+        /* IPv6 multicast address of group */
+        struct in6_addr ipv6mr_multiaddr;
+
+        /* local IPv6 address of interface */
+        int             ipv6mr_ifindex;
+};
+
+#define ipv6mr_acaddr   ipv6mr_multiaddr
+
+struct in6_flowlabel_req {
+        struct in6_addr flr_dst;
+        __be32  flr_label;
+        __u8    flr_action;
+        __u8    flr_share;
+        __u16   flr_flags;
+        __u16   flr_expires;
+        __u16   flr_linger;
+        __u32   __flr_pad;
+        /* Options in format of IPV6_PKTOPTIONS */
+};
+
+#define IPV6_FL_A_GET   0
+#define IPV6_FL_A_PUT   1
+#define IPV6_FL_A_RENEW 2
+
+#define IPV6_FL_F_CREATE        1
+#define IPV6_FL_F_EXCL          2
+
+#define IPV6_FL_S_NONE          0
+#define IPV6_FL_S_EXCL          1
+#define IPV6_FL_S_PROCESS       2
+#define IPV6_FL_S_USER          3
+#define IPV6_FL_S_ANY           255
+
+
+/*
+ *      Bitmask constant declarations to help applications select out the 
+ *      flow label and priority fields.
+ *
+ *      Note that this are in host byte order while the flowinfo field of
+ *      sockaddr_in6 is in network byte order.
+ */
+
+#define IPV6_FLOWINFO_FLOWLABEL         0x000fffff
+#define IPV6_FLOWINFO_PRIORITY          0x0ff00000
+
+/* These definitions are obsolete */
+#define IPV6_PRIORITY_UNCHARACTERIZED   0x0000
+#define IPV6_PRIORITY_FILLER            0x0100
+#define IPV6_PRIORITY_UNATTENDED        0x0200
+#define IPV6_PRIORITY_RESERVED1         0x0300
+#define IPV6_PRIORITY_BULK              0x0400
+#define IPV6_PRIORITY_RESERVED2         0x0500
+#define IPV6_PRIORITY_INTERACTIVE       0x0600
+#define IPV6_PRIORITY_CONTROL           0x0700
+#define IPV6_PRIORITY_8                 0x0800
+#define IPV6_PRIORITY_9                 0x0900
+#define IPV6_PRIORITY_10                0x0a00
+#define IPV6_PRIORITY_11                0x0b00
+#define IPV6_PRIORITY_12                0x0c00
+#define IPV6_PRIORITY_13                0x0d00
+#define IPV6_PRIORITY_14                0x0e00
+#define IPV6_PRIORITY_15                0x0f00
+
+/*
+ *      IPV6 extension headers
+ */
+#define IPPROTO_HOPOPTS         0       /* IPv6 hop-by-hop options      */
+#define IPPROTO_ROUTING         43      /* IPv6 routing header          */
+#define IPPROTO_FRAGMENT        44      /* IPv6 fragmentation header    */
+#define IPPROTO_ICMPV6          58      /* ICMPv6                       */
+#define IPPROTO_NONE            59      /* IPv6 no next header          */
+#define IPPROTO_DSTOPTS         60      /* IPv6 destination options     */
+#define IPPROTO_MH              135     /* IPv6 mobility header         */
+
+/*
+ *      IPv6 TLV options.
+ */
+#define IPV6_TLV_PAD1           0
+#define IPV6_TLV_PADN           1
+#define IPV6_TLV_ROUTERALERT    5
+#define IPV6_TLV_JUMBO          194
+#define IPV6_TLV_HAO            201     /* home address option */
+
+/*
+ *      IPV6 socket options
+ */
+
+#define IPV6_ADDRFORM           1
+#define IPV6_2292PKTINFO        2
+#define IPV6_2292HOPOPTS        3
+#define IPV6_2292DSTOPTS        4
+#define IPV6_2292RTHDR          5
+#define IPV6_2292PKTOPTIONS     6
+#define IPV6_CHECKSUM           7
+#define IPV6_2292HOPLIMIT       8
+#define IPV6_NEXTHOP            9
+#define IPV6_AUTHHDR            10      /* obsolete */
+#define IPV6_FLOWINFO           11
+
+#define IPV6_UNICAST_HOPS       16
+#define IPV6_MULTICAST_IF       17
+#define IPV6_MULTICAST_HOPS     18
+#define IPV6_MULTICAST_LOOP     19
+#define IPV6_ADD_MEMBERSHIP     20
+#define IPV6_DROP_MEMBERSHIP    21
+#define IPV6_ROUTER_ALERT       22
+#define IPV6_MTU_DISCOVER       23
+#define IPV6_MTU                24
+#define IPV6_RECVERR            25
+#define IPV6_V6ONLY             26
+#define IPV6_JOIN_ANYCAST       27
+#define IPV6_LEAVE_ANYCAST      28
+
+/* IPV6_MTU_DISCOVER values */
+#define IPV6_PMTUDISC_DONT              0
+#define IPV6_PMTUDISC_WANT              1
+#define IPV6_PMTUDISC_DO                2
+#define IPV6_PMTUDISC_PROBE             3
+
+/* Flowlabel */
+#define IPV6_FLOWLABEL_MGR      32
+#define IPV6_FLOWINFO_SEND      33
+
+#define IPV6_IPSEC_POLICY       34
+#define IPV6_XFRM_POLICY        35
+
+/*
+ * Multicast:
+ * Following socket options are shared between IPv4 and IPv6.
+ *
+ * MCAST_JOIN_GROUP             42
+ * MCAST_BLOCK_SOURCE           43
+ * MCAST_UNBLOCK_SOURCE         44
+ * MCAST_LEAVE_GROUP            45
+ * MCAST_JOIN_SOURCE_GROUP      46
+ * MCAST_LEAVE_SOURCE_GROUP     47
+ * MCAST_MSFILTER               48
+ */
+
+/*
+ * Advanced API (RFC3542) (1)
+ *
+ * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
+ */
+
+#define IPV6_RECVPKTINFO        49
+#define IPV6_PKTINFO            50
+#define IPV6_RECVHOPLIMIT       51
+#define IPV6_HOPLIMIT           52
+#define IPV6_RECVHOPOPTS        53
+#define IPV6_HOPOPTS            54
+#define IPV6_RTHDRDSTOPTS       55
+#define IPV6_RECVRTHDR          56
+#define IPV6_RTHDR              57
+#define IPV6_RECVDSTOPTS        58
+#define IPV6_DSTOPTS            59
+#define IPV6_RECVPATHMTU        60
+#define IPV6_PATHMTU            61
+#define IPV6_DONTFRAG           62
+#if 0   /* not yet */
+#define IPV6_USE_MIN_MTU        63
+#endif
+
+/*
+ * Netfilter (1)
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO               64
+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES       65
+ */
+
+/*
+ * Advanced API (RFC3542) (2)
+ */
+#define IPV6_RECVTCLASS         66
+#define IPV6_TCLASS             67
+
+/*
+ * Netfilter (2)
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_GET_REVISION_MATCH   68
+ * IP6T_SO_GET_REVISION_TARGET  69
+ */
+
+/* RFC5014: Source address selection */
+#define IPV6_ADDR_PREFERENCES   72
+
+#define IPV6_PREFER_SRC_TMP             0x0001
+#define IPV6_PREFER_SRC_PUBLIC          0x0002
+#define IPV6_PREFER_SRC_PUBTMP_DEFAULT  0x0100
+#define IPV6_PREFER_SRC_COA             0x0004
+#define IPV6_PREFER_SRC_HOME            0x0400
+#define IPV6_PREFER_SRC_CGA             0x0008
+#define IPV6_PREFER_SRC_NONCGA          0x0800
+
+/* RFC5082: Generalized Ttl Security Mechanism */
+#define IPV6_MINHOPCOUNT                73
+
+#define IPV6_ORIGDSTADDR        74
+#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
+#define IPV6_TRANSPARENT        75
+#define IPV6_UNICAST_IF         76
+
+/*
+ * Multicast Routing:
+ * see include/linux/mroute6.h.
+ *
+ * MRT6_INIT                    200
+ * MRT6_DONE                    201
+ * MRT6_ADD_MIF                 202
+ * MRT6_DEL_MIF                 203
+ * MRT6_ADD_MFC                 204
+ * MRT6_DEL_MFC                 205
+ * MRT6_VERSION                 206
+ * MRT6_ASSERT                  207
+ * MRT6_PIM                     208
+ * (reserved)                   209
+ */
+#endif /* _UAPI_LINUX_IN6_H */
diff --git a/include/linux/in_route.h b/include/uapi/linux/in_route.h
index b261b8c915f0..b261b8c915f0 100644
--- a/include/linux/in_route.h
+++ b/include/uapi/linux/in_route.h
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
new file mode 100644
index 000000000000..8c469af939aa
--- /dev/null
+++ b/include/uapi/linux/inet_diag.h
@@ -0,0 +1,136 @@
+#ifndef _UAPI_INET_DIAG_H_
+#define _UAPI_INET_DIAG_H_
+
+#include <linux/types.h>
+
+/* Just some random number */
+#define TCPDIAG_GETSOCK 18
+#define DCCPDIAG_GETSOCK 19
+
+#define INET_DIAG_GETSOCK_MAX 24
+
+/* Socket identity */
+struct inet_diag_sockid {
+        __be16  idiag_sport;
+        __be16  idiag_dport;
+        __be32  idiag_src[4];
+        __be32  idiag_dst[4];
+        __u32   idiag_if;
+        __u32   idiag_cookie[2];
+#define INET_DIAG_NOCOOKIE (~0U)
+};
+
+/* Request structure */
+
+struct inet_diag_req {
+        __u8    idiag_family;           /* Family of addresses. */
+        __u8    idiag_src_len;
+        __u8    idiag_dst_len;
+        __u8    idiag_ext;              /* Query extended information */
+
+        struct inet_diag_sockid id;
+
+        __u32   idiag_states;           /* States to dump */
+        __u32   idiag_dbs;              /* Tables to dump (NI) */
+};
+
+struct inet_diag_req_v2 {
+        __u8    sdiag_family;
+        __u8    sdiag_protocol;
+        __u8    idiag_ext;
+        __u8    pad;
+        __u32   idiag_states;
+        struct inet_diag_sockid id;
+};
+
+enum {
+        INET_DIAG_REQ_NONE,
+        INET_DIAG_REQ_BYTECODE,
+};
+
+#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE
+
+/* Bytecode is sequence of 4 byte commands followed by variable arguments.
+ * All the commands identified by "code" are conditional jumps forward:
+ * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
+ * length of the command and its arguments.
+ */
+ 
+struct inet_diag_bc_op {
+        unsigned char   code;
+        unsigned char   yes;
+        unsigned short  no;
+};
+
+enum {
+        INET_DIAG_BC_NOP,
+        INET_DIAG_BC_JMP,
+        INET_DIAG_BC_S_GE,
+        INET_DIAG_BC_S_LE,
+        INET_DIAG_BC_D_GE,
+        INET_DIAG_BC_D_LE,
+        INET_DIAG_BC_AUTO,
+        INET_DIAG_BC_S_COND,
+        INET_DIAG_BC_D_COND,
+};
+
+struct inet_diag_hostcond {
+        __u8    family;
+        __u8    prefix_len;
+        int     port;
+        __be32  addr[0];
+};
+
+/* Base info structure. It contains socket identity (addrs/ports/cookie)
+ * and, alas, the information shown by netstat. */
+struct inet_diag_msg {
+        __u8    idiag_family;
+        __u8    idiag_state;
+        __u8    idiag_timer;
+        __u8    idiag_retrans;
+
+        struct inet_diag_sockid id;
+
+        __u32   idiag_expires;
+        __u32   idiag_rqueue;
+        __u32   idiag_wqueue;
+        __u32   idiag_uid;
+        __u32   idiag_inode;
+};
+
+/* Extensions */
+
+enum {
+        INET_DIAG_NONE,
+        INET_DIAG_MEMINFO,
+        INET_DIAG_INFO,
+        INET_DIAG_VEGASINFO,
+        INET_DIAG_CONG,
+        INET_DIAG_TOS,
+        INET_DIAG_TCLASS,
+        INET_DIAG_SKMEMINFO,
+};
+
+#define INET_DIAG_MAX INET_DIAG_SKMEMINFO
+
+
+/* INET_DIAG_MEM */
+
+struct inet_diag_meminfo {
+        __u32   idiag_rmem;
+        __u32   idiag_wmem;
+        __u32   idiag_fmem;
+        __u32   idiag_tmem;
+};
+
+/* INET_DIAG_VEGASINFO */
+
+struct tcpvegas_info {
+        __u32   tcpv_enabled;
+        __u32   tcpv_rttcnt;
+        __u32   tcpv_rtt;
+        __u32   tcpv_minrtt;
+};
+
+
+#endif /* _UAPI_INET_DIAG_H_ */
diff --git a/include/uapi/linux/inotify.h b/include/uapi/linux/inotify.h
new file mode 100644
index 000000000000..e6bf35b2dd34
--- /dev/null
+++ b/include/uapi/linux/inotify.h
@@ -0,0 +1,74 @@
+/*
+ * Inode based directory notification for Linux
+ *
+ * Copyright (C) 2005 John McCutchan
+ */
+
+#ifndef _UAPI_LINUX_INOTIFY_H
+#define _UAPI_LINUX_INOTIFY_H
+
+/* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/fcntl.h>
+#include <linux/types.h>
+
+/*
+ * struct inotify_event - structure read from the inotify device for each event
+ *
+ * When you are watching a directory, you will receive the filename for events
+ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ */
+struct inotify_event {
+        __s32           wd;             /* watch descriptor */
+        __u32           mask;           /* watch mask */
+        __u32           cookie;         /* cookie to synchronize two events */
+        __u32           len;            /* length (including nulls) of name */
+        char            name[0];        /* stub for possible name */
+};
+
+/* the following are legal, implemented events that user-space can watch for */
+#define IN_ACCESS               0x00000001      /* File was accessed */
+#define IN_MODIFY               0x00000002      /* File was modified */
+#define IN_ATTRIB               0x00000004      /* Metadata changed */
+#define IN_CLOSE_WRITE          0x00000008      /* Writtable file was closed */
+#define IN_CLOSE_NOWRITE        0x00000010      /* Unwrittable file closed */
+#define IN_OPEN                 0x00000020      /* File was opened */
+#define IN_MOVED_FROM           0x00000040      /* File was moved from X */
+#define IN_MOVED_TO             0x00000080      /* File was moved to Y */
+#define IN_CREATE               0x00000100      /* Subfile was created */
+#define IN_DELETE               0x00000200      /* Subfile was deleted */
+#define IN_DELETE_SELF          0x00000400      /* Self was deleted */
+#define IN_MOVE_SELF            0x00000800      /* Self was moved */
+
+/* the following are legal events.  they are sent as needed to any watch */
+#define IN_UNMOUNT              0x00002000      /* Backing fs was unmounted */
+#define IN_Q_OVERFLOW           0x00004000      /* Event queued overflowed */
+#define IN_IGNORED              0x00008000      /* File was ignored */
+
+/* helper events */
+#define IN_CLOSE                (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
+#define IN_MOVE                 (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
+
+/* special flags */
+#define IN_ONLYDIR              0x01000000      /* only watch the path if it is a directory */
+#define IN_DONT_FOLLOW          0x02000000      /* don't follow a sym link */
+#define IN_EXCL_UNLINK          0x04000000      /* exclude events on unlinked objects */
+#define IN_MASK_ADD             0x20000000      /* add to the mask of an already existing watch */
+#define IN_ISDIR                0x40000000      /* event occurred against dir */
+#define IN_ONESHOT              0x80000000      /* only send event once */
+
+/*
+ * All of the events - we build the list by hand so that we can add flags in
+ * the future and not break backward compatibility.  Apps will get only the
+ * events that they originally wanted.  Be sure to add new events here!
+ */
+#define IN_ALL_EVENTS   (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
+                         IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
+                         IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
+                         IN_MOVE_SELF)
+
+/* Flags for sys_inotify_init1.  */
+#define IN_CLOEXEC O_CLOEXEC
+#define IN_NONBLOCK O_NONBLOCK
+
+
+#endif /* _UAPI_LINUX_INOTIFY_H */
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
new file mode 100644
index 000000000000..558828590a69
--- /dev/null
+++ b/include/uapi/linux/input.h
@@ -0,0 +1,1153 @@
+/*
+ * Copyright (c) 1999-2002 Vojtech Pavlik
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_INPUT_H
+#define _UAPI_INPUT_H
+
+
+#ifndef __KERNEL__
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <linux/types.h>
+#endif
+
+
+/*
+ * The event structure itself
+ */
+
+struct input_event {
+        struct timeval time;
+        __u16 type;
+        __u16 code;
+        __s32 value;
+};
+
+/*
+ * Protocol version.
+ */
+
+#define EV_VERSION              0x010001
+
+/*
+ * IOCTLs (0x00 - 0x7f)
+ */
+
+struct input_id {
+        __u16 bustype;
+        __u16 vendor;
+        __u16 product;
+        __u16 version;
+};
+
+/**
+ * struct input_absinfo - used by EVIOCGABS/EVIOCSABS ioctls
+ * @value: latest reported value for the axis.
+ * @minimum: specifies minimum value for the axis.
+ * @maximum: specifies maximum value for the axis.
+ * @fuzz: specifies fuzz value that is used to filter noise from
+ *      the event stream.
+ * @flat: values that are within this value will be discarded by
+ *      joydev interface and reported as 0 instead.
+ * @resolution: specifies resolution for the values reported for
+ *      the axis.
+ *
+ * Note that input core does not clamp reported values to the
+ * [minimum, maximum] limits, such task is left to userspace.
+ *
+ * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
+ * units per millimeter (units/mm), resolution for rotational axes
+ * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
+ */
+struct input_absinfo {
+        __s32 value;
+        __s32 minimum;
+        __s32 maximum;
+        __s32 fuzz;
+        __s32 flat;
+        __s32 resolution;
+};
+
+/**
+ * struct input_keymap_entry - used by EVIOCGKEYCODE/EVIOCSKEYCODE ioctls
+ * @scancode: scancode represented in machine-endian form.
+ * @len: length of the scancode that resides in @scancode buffer.
+ * @index: index in the keymap, may be used instead of scancode
+ * @flags: allows to specify how kernel should handle the request. For
+ *      example, setting INPUT_KEYMAP_BY_INDEX flag indicates that kernel
+ *      should perform lookup in keymap by @index instead of @scancode
+ * @keycode: key code assigned to this scancode
+ *
+ * The structure is used to retrieve and modify keymap data. Users have
+ * option of performing lookup either by @scancode itself or by @index
+ * in keymap entry. EVIOCGKEYCODE will also return scancode or index
+ * (depending on which element was used to perform lookup).
+ */
+struct input_keymap_entry {
+#define INPUT_KEYMAP_BY_INDEX   (1 << 0)
+        __u8  flags;
+        __u8  len;
+        __u16 index;
+        __u32 keycode;
+        __u8  scancode[32];
+};
+
+#define EVIOCGVERSION           _IOR('E', 0x01, int)                    /* get driver version */
+#define EVIOCGID                _IOR('E', 0x02, struct input_id)        /* get device ID */
+#define EVIOCGREP               _IOR('E', 0x03, unsigned int[2])        /* get repeat settings */
+#define EVIOCSREP               _IOW('E', 0x03, unsigned int[2])        /* set repeat settings */
+
+#define EVIOCGKEYCODE           _IOR('E', 0x04, unsigned int[2])        /* get keycode */
+#define EVIOCGKEYCODE_V2        _IOR('E', 0x04, struct input_keymap_entry)
+#define EVIOCSKEYCODE           _IOW('E', 0x04, unsigned int[2])        /* set keycode */
+#define EVIOCSKEYCODE_V2        _IOW('E', 0x04, struct input_keymap_entry)
+
+#define EVIOCGNAME(len)         _IOC(_IOC_READ, 'E', 0x06, len)         /* get device name */
+#define EVIOCGPHYS(len)         _IOC(_IOC_READ, 'E', 0x07, len)         /* get physical location */
+#define EVIOCGUNIQ(len)         _IOC(_IOC_READ, 'E', 0x08, len)         /* get unique identifier */
+#define EVIOCGPROP(len)         _IOC(_IOC_READ, 'E', 0x09, len)         /* get device properties */
+
+/**
+ * EVIOCGMTSLOTS(len) - get MT slot values
+ * @len: size of the data buffer in bytes
+ *
+ * The ioctl buffer argument should be binary equivalent to
+ *
+ * struct input_mt_request_layout {
+ *      __u32 code;
+ *      __s32 values[num_slots];
+ * };
+ *
+ * where num_slots is the (arbitrary) number of MT slots to extract.
+ *
+ * The ioctl size argument (len) is the size of the buffer, which
+ * should satisfy len = (num_slots + 1) * sizeof(__s32).  If len is
+ * too small to fit all available slots, the first num_slots are
+ * returned.
+ *
+ * Before the call, code is set to the wanted ABS_MT event type. On
+ * return, values[] is filled with the slot values for the specified
+ * ABS_MT code.
+ *
+ * If the request code is not an ABS_MT value, -EINVAL is returned.
+ */
+#define EVIOCGMTSLOTS(len)      _IOC(_IOC_READ, 'E', 0x0a, len)
+
+#define EVIOCGKEY(len)          _IOC(_IOC_READ, 'E', 0x18, len)         /* get global key state */
+#define EVIOCGLED(len)          _IOC(_IOC_READ, 'E', 0x19, len)         /* get all LEDs */
+#define EVIOCGSND(len)          _IOC(_IOC_READ, 'E', 0x1a, len)         /* get all sounds status */
+#define EVIOCGSW(len)           _IOC(_IOC_READ, 'E', 0x1b, len)         /* get all switch states */
+
+#define EVIOCGBIT(ev,len)       _IOC(_IOC_READ, 'E', 0x20 + (ev), len)  /* get event bits */
+#define EVIOCGABS(abs)          _IOR('E', 0x40 + (abs), struct input_absinfo)   /* get abs value/limits */
+#define EVIOCSABS(abs)          _IOW('E', 0xc0 + (abs), struct input_absinfo)   /* set abs value/limits */
+
+#define EVIOCSFF                _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))   /* send a force effect to a force feedback device */
+#define EVIOCRMFF               _IOW('E', 0x81, int)                    /* Erase a force effect */
+#define EVIOCGEFFECTS           _IOR('E', 0x84, int)                    /* Report number of effects playable at the same time */
+
+#define EVIOCGRAB               _IOW('E', 0x90, int)                    /* Grab/Release device */
+
+#define EVIOCSCLOCKID           _IOW('E', 0xa0, int)                    /* Set clockid to be used for timestamps */
+
+/*
+ * Device properties and quirks
+ */
+
+#define INPUT_PROP_POINTER              0x00    /* needs a pointer */
+#define INPUT_PROP_DIRECT               0x01    /* direct input devices */
+#define INPUT_PROP_BUTTONPAD            0x02    /* has button(s) under pad */
+#define INPUT_PROP_SEMI_MT              0x03    /* touch rectangle only */
+
+#define INPUT_PROP_MAX                  0x1f
+#define INPUT_PROP_CNT                  (INPUT_PROP_MAX + 1)
+
+/*
+ * Event types
+ */
+
+#define EV_SYN                  0x00
+#define EV_KEY                  0x01
+#define EV_REL                  0x02
+#define EV_ABS                  0x03
+#define EV_MSC                  0x04
+#define EV_SW                   0x05
+#define EV_LED                  0x11
+#define EV_SND                  0x12
+#define EV_REP                  0x14
+#define EV_FF                   0x15
+#define EV_PWR                  0x16
+#define EV_FF_STATUS            0x17
+#define EV_MAX                  0x1f
+#define EV_CNT                  (EV_MAX+1)
+
+/*
+ * Synchronization events.
+ */
+
+#define SYN_REPORT              0
+#define SYN_CONFIG              1
+#define SYN_MT_REPORT           2
+#define SYN_DROPPED             3
+
+/*
+ * Keys and buttons
+ *
+ * Most of the keys/buttons are modeled after USB HUT 1.12
+ * (see http://www.usb.org/developers/hidpage).
+ * Abbreviations in the comments:
+ * AC - Application Control
+ * AL - Application Launch Button
+ * SC - System Control
+ */
+
+#define KEY_RESERVED            0
+#define KEY_ESC                 1
+#define KEY_1                   2
+#define KEY_2                   3
+#define KEY_3                   4
+#define KEY_4                   5
+#define KEY_5                   6
+#define KEY_6                   7
+#define KEY_7                   8
+#define KEY_8                   9
+#define KEY_9                   10
+#define KEY_0                   11
+#define KEY_MINUS               12
+#define KEY_EQUAL               13
+#define KEY_BACKSPACE           14
+#define KEY_TAB                 15
+#define KEY_Q                   16
+#define KEY_W                   17
+#define KEY_E                   18
+#define KEY_R                   19
+#define KEY_T                   20
+#define KEY_Y                   21
+#define KEY_U                   22
+#define KEY_I                   23
+#define KEY_O                   24
+#define KEY_P                   25
+#define KEY_LEFTBRACE           26
+#define KEY_RIGHTBRACE          27
+#define KEY_ENTER               28
+#define KEY_LEFTCTRL            29
+#define KEY_A                   30
+#define KEY_S                   31
+#define KEY_D                   32
+#define KEY_F                   33
+#define KEY_G                   34
+#define KEY_H                   35
+#define KEY_J                   36
+#define KEY_K                   37
+#define KEY_L                   38
+#define KEY_SEMICOLON           39
+#define KEY_APOSTROPHE          40
+#define KEY_GRAVE               41
+#define KEY_LEFTSHIFT           42
+#define KEY_BACKSLASH           43
+#define KEY_Z                   44
+#define KEY_X                   45
+#define KEY_C                   46
+#define KEY_V                   47
+#define KEY_B                   48
+#define KEY_N                   49
+#define KEY_M                   50
+#define KEY_COMMA               51
+#define KEY_DOT                 52
+#define KEY_SLASH               53
+#define KEY_RIGHTSHIFT          54
+#define KEY_KPASTERISK          55
+#define KEY_LEFTALT             56
+#define KEY_SPACE               57
+#define KEY_CAPSLOCK            58
+#define KEY_F1                  59
+#define KEY_F2                  60
+#define KEY_F3                  61
+#define KEY_F4                  62
+#define KEY_F5                  63
+#define KEY_F6                  64
+#define KEY_F7                  65
+#define KEY_F8                  66
+#define KEY_F9                  67
+#define KEY_F10                 68
+#define KEY_NUMLOCK             69
+#define KEY_SCROLLLOCK          70
+#define KEY_KP7                 71
+#define KEY_KP8                 72
+#define KEY_KP9                 73
+#define KEY_KPMINUS             74
+#define KEY_KP4                 75
+#define KEY_KP5                 76
+#define KEY_KP6                 77
+#define KEY_KPPLUS              78
+#define KEY_KP1                 79
+#define KEY_KP2                 80
+#define KEY_KP3                 81
+#define KEY_KP0                 82
+#define KEY_KPDOT               83
+
+#define KEY_ZENKAKUHANKAKU      85
+#define KEY_102ND               86
+#define KEY_F11                 87
+#define KEY_F12                 88
+#define KEY_RO                  89
+#define KEY_KATAKANA            90
+#define KEY_HIRAGANA            91
+#define KEY_HENKAN              92
+#define KEY_KATAKANAHIRAGANA    93
+#define KEY_MUHENKAN            94
+#define KEY_KPJPCOMMA           95
+#define KEY_KPENTER             96
+#define KEY_RIGHTCTRL           97
+#define KEY_KPSLASH             98
+#define KEY_SYSRQ               99
+#define KEY_RIGHTALT            100
+#define KEY_LINEFEED            101
+#define KEY_HOME                102
+#define KEY_UP                  103
+#define KEY_PAGEUP              104
+#define KEY_LEFT                105
+#define KEY_RIGHT               106
+#define KEY_END                 107
+#define KEY_DOWN                108
+#define KEY_PAGEDOWN            109
+#define KEY_INSERT              110
+#define KEY_DELETE              111
+#define KEY_MACRO               112
+#define KEY_MUTE                113
+#define KEY_VOLUMEDOWN          114
+#define KEY_VOLUMEUP            115
+#define KEY_POWER               116     /* SC System Power Down */
+#define KEY_KPEQUAL             117
+#define KEY_KPPLUSMINUS         118
+#define KEY_PAUSE               119
+#define KEY_SCALE               120     /* AL Compiz Scale (Expose) */
+
+#define KEY_KPCOMMA             121
+#define KEY_HANGEUL             122
+#define KEY_HANGUEL             KEY_HANGEUL
+#define KEY_HANJA               123
+#define KEY_YEN                 124
+#define KEY_LEFTMETA            125
+#define KEY_RIGHTMETA           126
+#define KEY_COMPOSE             127
+
+#define KEY_STOP                128     /* AC Stop */
+#define KEY_AGAIN               129
+#define KEY_PROPS               130     /* AC Properties */
+#define KEY_UNDO                131     /* AC Undo */
+#define KEY_FRONT               132
+#define KEY_COPY                133     /* AC Copy */
+#define KEY_OPEN                134     /* AC Open */
+#define KEY_PASTE               135     /* AC Paste */
+#define KEY_FIND                136     /* AC Search */
+#define KEY_CUT                 137     /* AC Cut */
+#define KEY_HELP                138     /* AL Integrated Help Center */
+#define KEY_MENU                139     /* Menu (show menu) */
+#define KEY_CALC                140     /* AL Calculator */
+#define KEY_SETUP               141
+#define KEY_SLEEP               142     /* SC System Sleep */
+#define KEY_WAKEUP              143     /* System Wake Up */
+#define KEY_FILE                144     /* AL Local Machine Browser */
+#define KEY_SENDFILE            145
+#define KEY_DELETEFILE          146
+#define KEY_XFER                147
+#define KEY_PROG1               148
+#define KEY_PROG2               149
+#define KEY_WWW                 150     /* AL Internet Browser */
+#define KEY_MSDOS               151
+#define KEY_COFFEE              152     /* AL Terminal Lock/Screensaver */
+#define KEY_SCREENLOCK          KEY_COFFEE
+#define KEY_DIRECTION           153
+#define KEY_CYCLEWINDOWS        154
+#define KEY_MAIL                155
+#define KEY_BOOKMARKS           156     /* AC Bookmarks */
+#define KEY_COMPUTER            157
+#define KEY_BACK                158     /* AC Back */
+#define KEY_FORWARD             159     /* AC Forward */
+#define KEY_CLOSECD             160
+#define KEY_EJECTCD             161
+#define KEY_EJECTCLOSECD        162
+#define KEY_NEXTSONG            163
+#define KEY_PLAYPAUSE           164
+#define KEY_PREVIOUSSONG        165
+#define KEY_STOPCD              166
+#define KEY_RECORD              167
+#define KEY_REWIND              168
+#define KEY_PHONE               169     /* Media Select Telephone */
+#define KEY_ISO                 170
+#define KEY_CONFIG              171     /* AL Consumer Control Configuration */
+#define KEY_HOMEPAGE            172     /* AC Home */
+#define KEY_REFRESH             173     /* AC Refresh */
+#define KEY_EXIT                174     /* AC Exit */
+#define KEY_MOVE                175
+#define KEY_EDIT                176
+#define KEY_SCROLLUP            177
+#define KEY_SCROLLDOWN          178
+#define KEY_KPLEFTPAREN         179
+#define KEY_KPRIGHTPAREN        180
+#define KEY_NEW                 181     /* AC New */
+#define KEY_REDO                182     /* AC Redo/Repeat */
+
+#define KEY_F13                 183
+#define KEY_F14                 184
+#define KEY_F15                 185
+#define KEY_F16                 186
+#define KEY_F17                 187
+#define KEY_F18                 188
+#define KEY_F19                 189
+#define KEY_F20                 190
+#define KEY_F21                 191
+#define KEY_F22                 192
+#define KEY_F23                 193
+#define KEY_F24                 194
+
+#define KEY_PLAYCD              200
+#define KEY_PAUSECD             201
+#define KEY_PROG3               202
+#define KEY_PROG4               203
+#define KEY_DASHBOARD           204     /* AL Dashboard */
+#define KEY_SUSPEND             205
+#define KEY_CLOSE               206     /* AC Close */
+#define KEY_PLAY                207
+#define KEY_FASTFORWARD         208
+#define KEY_BASSBOOST           209
+#define KEY_PRINT               210     /* AC Print */
+#define KEY_HP                  211
+#define KEY_CAMERA              212
+#define KEY_SOUND               213
+#define KEY_QUESTION            214
+#define KEY_EMAIL               215
+#define KEY_CHAT                216
+#define KEY_SEARCH              217
+#define KEY_CONNECT             218
+#define KEY_FINANCE             219     /* AL Checkbook/Finance */
+#define KEY_SPORT               220
+#define KEY_SHOP                221
+#define KEY_ALTERASE            222
+#define KEY_CANCEL              223     /* AC Cancel */
+#define KEY_BRIGHTNESSDOWN      224
+#define KEY_BRIGHTNESSUP        225
+#define KEY_MEDIA               226
+
+#define KEY_SWITCHVIDEOMODE     227     /* Cycle between available video
+                                           outputs (Monitor/LCD/TV-out/etc) */
+#define KEY_KBDILLUMTOGGLE      228
+#define KEY_KBDILLUMDOWN        229
+#define KEY_KBDILLUMUP          230
+
+#define KEY_SEND                231     /* AC Send */
+#define KEY_REPLY               232     /* AC Reply */
+#define KEY_FORWARDMAIL         233     /* AC Forward Msg */
+#define KEY_SAVE                234     /* AC Save */
+#define KEY_DOCUMENTS           235
+
+#define KEY_BATTERY             236
+
+#define KEY_BLUETOOTH           237
+#define KEY_WLAN                238
+#define KEY_UWB                 239
+
+#define KEY_UNKNOWN             240
+
+#define KEY_VIDEO_NEXT          241     /* drive next video source */
+#define KEY_VIDEO_PREV          242     /* drive previous video source */
+#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
+#define KEY_BRIGHTNESS_ZERO     244     /* brightness off, use ambient */
+#define KEY_DISPLAY_OFF         245     /* display device to off state */
+
+#define KEY_WIMAX               246
+#define KEY_RFKILL              247     /* Key that controls all radios */
+
+#define KEY_MICMUTE             248     /* Mute / unmute the microphone */
+
+/* Code 255 is reserved for special needs of AT keyboard driver */
+
+#define BTN_MISC                0x100
+#define BTN_0                   0x100
+#define BTN_1                   0x101
+#define BTN_2                   0x102
+#define BTN_3                   0x103
+#define BTN_4                   0x104
+#define BTN_5                   0x105
+#define BTN_6                   0x106
+#define BTN_7                   0x107
+#define BTN_8                   0x108
+#define BTN_9                   0x109
+
+#define BTN_MOUSE               0x110
+#define BTN_LEFT                0x110
+#define BTN_RIGHT               0x111
+#define BTN_MIDDLE              0x112
+#define BTN_SIDE                0x113
+#define BTN_EXTRA               0x114
+#define BTN_FORWARD             0x115
+#define BTN_BACK                0x116
+#define BTN_TASK                0x117
+
+#define BTN_JOYSTICK            0x120
+#define BTN_TRIGGER             0x120
+#define BTN_THUMB               0x121
+#define BTN_THUMB2              0x122
+#define BTN_TOP                 0x123
+#define BTN_TOP2                0x124
+#define BTN_PINKIE              0x125
+#define BTN_BASE                0x126
+#define BTN_BASE2               0x127
+#define BTN_BASE3               0x128
+#define BTN_BASE4               0x129
+#define BTN_BASE5               0x12a
+#define BTN_BASE6               0x12b
+#define BTN_DEAD                0x12f
+
+#define BTN_GAMEPAD             0x130
+#define BTN_A                   0x130
+#define BTN_B                   0x131
+#define BTN_C                   0x132
+#define BTN_X                   0x133
+#define BTN_Y                   0x134
+#define BTN_Z                   0x135
+#define BTN_TL                  0x136
+#define BTN_TR                  0x137
+#define BTN_TL2                 0x138
+#define BTN_TR2                 0x139
+#define BTN_SELECT              0x13a
+#define BTN_START               0x13b
+#define BTN_MODE                0x13c
+#define BTN_THUMBL              0x13d
+#define BTN_THUMBR              0x13e
+
+#define BTN_DIGI                0x140
+#define BTN_TOOL_PEN            0x140
+#define BTN_TOOL_RUBBER         0x141
+#define BTN_TOOL_BRUSH          0x142
+#define BTN_TOOL_PENCIL         0x143
+#define BTN_TOOL_AIRBRUSH       0x144
+#define BTN_TOOL_FINGER         0x145
+#define BTN_TOOL_MOUSE          0x146
+#define BTN_TOOL_LENS           0x147
+#define BTN_TOOL_QUINTTAP       0x148   /* Five fingers on trackpad */
+#define BTN_TOUCH               0x14a
+#define BTN_STYLUS              0x14b
+#define BTN_STYLUS2             0x14c
+#define BTN_TOOL_DOUBLETAP      0x14d
+#define BTN_TOOL_TRIPLETAP      0x14e
+#define BTN_TOOL_QUADTAP        0x14f   /* Four fingers on trackpad */
+
+#define BTN_WHEEL               0x150
+#define BTN_GEAR_DOWN           0x150
+#define BTN_GEAR_UP             0x151
+
+#define KEY_OK                  0x160
+#define KEY_SELECT              0x161
+#define KEY_GOTO                0x162
+#define KEY_CLEAR               0x163
+#define KEY_POWER2              0x164
+#define KEY_OPTION              0x165
+#define KEY_INFO                0x166   /* AL OEM Features/Tips/Tutorial */
+#define KEY_TIME                0x167
+#define KEY_VENDOR              0x168
+#define KEY_ARCHIVE             0x169
+#define KEY_PROGRAM             0x16a   /* Media Select Program Guide */
+#define KEY_CHANNEL             0x16b
+#define KEY_FAVORITES           0x16c
+#define KEY_EPG                 0x16d
+#define KEY_PVR                 0x16e   /* Media Select Home */
+#define KEY_MHP                 0x16f
+#define KEY_LANGUAGE            0x170
+#define KEY_TITLE               0x171
+#define KEY_SUBTITLE            0x172
+#define KEY_ANGLE               0x173
+#define KEY_ZOOM                0x174
+#define KEY_MODE                0x175
+#define KEY_KEYBOARD            0x176
+#define KEY_SCREEN              0x177
+#define KEY_PC                  0x178   /* Media Select Computer */
+#define KEY_TV                  0x179   /* Media Select TV */
+#define KEY_TV2                 0x17a   /* Media Select Cable */
+#define KEY_VCR                 0x17b   /* Media Select VCR */
+#define KEY_VCR2                0x17c   /* VCR Plus */
+#define KEY_SAT                 0x17d   /* Media Select Satellite */
+#define KEY_SAT2                0x17e
+#define KEY_CD                  0x17f   /* Media Select CD */
+#define KEY_TAPE                0x180   /* Media Select Tape */
+#define KEY_RADIO               0x181
+#define KEY_TUNER               0x182   /* Media Select Tuner */
+#define KEY_PLAYER              0x183
+#define KEY_TEXT                0x184
+#define KEY_DVD                 0x185   /* Media Select DVD */
+#define KEY_AUX                 0x186
+#define KEY_MP3                 0x187
+#define KEY_AUDIO               0x188   /* AL Audio Browser */
+#define KEY_VIDEO               0x189   /* AL Movie Browser */
+#define KEY_DIRECTORY           0x18a
+#define KEY_LIST                0x18b
+#define KEY_MEMO                0x18c   /* Media Select Messages */
+#define KEY_CALENDAR            0x18d
+#define KEY_RED                 0x18e
+#define KEY_GREEN               0x18f
+#define KEY_YELLOW              0x190
+#define KEY_BLUE                0x191
+#define KEY_CHANNELUP           0x192   /* Channel Increment */
+#define KEY_CHANNELDOWN         0x193   /* Channel Decrement */
+#define KEY_FIRST               0x194
+#define KEY_LAST                0x195   /* Recall Last */
+#define KEY_AB                  0x196
+#define KEY_NEXT                0x197
+#define KEY_RESTART             0x198
+#define KEY_SLOW                0x199
+#define KEY_SHUFFLE             0x19a
+#define KEY_BREAK               0x19b
+#define KEY_PREVIOUS            0x19c
+#define KEY_DIGITS              0x19d
+#define KEY_TEEN                0x19e
+#define KEY_TWEN                0x19f
+#define KEY_VIDEOPHONE          0x1a0   /* Media Select Video Phone */
+#define KEY_GAMES               0x1a1   /* Media Select Games */
+#define KEY_ZOOMIN              0x1a2   /* AC Zoom In */
+#define KEY_ZOOMOUT             0x1a3   /* AC Zoom Out */
+#define KEY_ZOOMRESET           0x1a4   /* AC Zoom */
+#define KEY_WORDPROCESSOR       0x1a5   /* AL Word Processor */
+#define KEY_EDITOR              0x1a6   /* AL Text Editor */
+#define KEY_SPREADSHEET         0x1a7   /* AL Spreadsheet */
+#define KEY_GRAPHICSEDITOR      0x1a8   /* AL Graphics Editor */
+#define KEY_PRESENTATION        0x1a9   /* AL Presentation App */
+#define KEY_DATABASE            0x1aa   /* AL Database App */
+#define KEY_NEWS                0x1ab   /* AL Newsreader */
+#define KEY_VOICEMAIL           0x1ac   /* AL Voicemail */
+#define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
+#define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
+#define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
+#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
+#define KEY_LOGOFF              0x1b1   /* AL Logoff */
+
+#define KEY_DOLLAR              0x1b2
+#define KEY_EURO                0x1b3
+
+#define KEY_FRAMEBACK           0x1b4   /* Consumer - transport controls */
+#define KEY_FRAMEFORWARD        0x1b5
+#define KEY_CONTEXT_MENU        0x1b6   /* GenDesc - system context menu */
+#define KEY_MEDIA_REPEAT        0x1b7   /* Consumer - transport control */
+#define KEY_10CHANNELSUP        0x1b8   /* 10 channels up (10+) */
+#define KEY_10CHANNELSDOWN      0x1b9   /* 10 channels down (10-) */
+#define KEY_IMAGES              0x1ba   /* AL Image Browser */
+
+#define KEY_DEL_EOL             0x1c0
+#define KEY_DEL_EOS             0x1c1
+#define KEY_INS_LINE            0x1c2
+#define KEY_DEL_LINE            0x1c3
+
+#define KEY_FN                  0x1d0
+#define KEY_FN_ESC              0x1d1
+#define KEY_FN_F1               0x1d2
+#define KEY_FN_F2               0x1d3
+#define KEY_FN_F3               0x1d4
+#define KEY_FN_F4               0x1d5
+#define KEY_FN_F5               0x1d6
+#define KEY_FN_F6               0x1d7
+#define KEY_FN_F7               0x1d8
+#define KEY_FN_F8               0x1d9
+#define KEY_FN_F9               0x1da
+#define KEY_FN_F10              0x1db
+#define KEY_FN_F11              0x1dc
+#define KEY_FN_F12              0x1dd
+#define KEY_FN_1                0x1de
+#define KEY_FN_2                0x1df
+#define KEY_FN_D                0x1e0
+#define KEY_FN_E                0x1e1
+#define KEY_FN_F                0x1e2
+#define KEY_FN_S                0x1e3
+#define KEY_FN_B                0x1e4
+
+#define KEY_BRL_DOT1            0x1f1
+#define KEY_BRL_DOT2            0x1f2
+#define KEY_BRL_DOT3            0x1f3
+#define KEY_BRL_DOT4            0x1f4
+#define KEY_BRL_DOT5            0x1f5
+#define KEY_BRL_DOT6            0x1f6
+#define KEY_BRL_DOT7            0x1f7
+#define KEY_BRL_DOT8            0x1f8
+#define KEY_BRL_DOT9            0x1f9
+#define KEY_BRL_DOT10           0x1fa
+
+#define KEY_NUMERIC_0           0x200   /* used by phones, remote controls, */
+#define KEY_NUMERIC_1           0x201   /* and other keypads */
+#define KEY_NUMERIC_2           0x202
+#define KEY_NUMERIC_3           0x203
+#define KEY_NUMERIC_4           0x204
+#define KEY_NUMERIC_5           0x205
+#define KEY_NUMERIC_6           0x206
+#define KEY_NUMERIC_7           0x207
+#define KEY_NUMERIC_8           0x208
+#define KEY_NUMERIC_9           0x209
+#define KEY_NUMERIC_STAR        0x20a
+#define KEY_NUMERIC_POUND       0x20b
+
+#define KEY_CAMERA_FOCUS        0x210
+#define KEY_WPS_BUTTON          0x211   /* WiFi Protected Setup key */
+
+#define KEY_TOUCHPAD_TOGGLE     0x212   /* Request switch touchpad on or off */
+#define KEY_TOUCHPAD_ON         0x213
+#define KEY_TOUCHPAD_OFF        0x214
+
+#define KEY_CAMERA_ZOOMIN       0x215
+#define KEY_CAMERA_ZOOMOUT      0x216
+#define KEY_CAMERA_UP           0x217
+#define KEY_CAMERA_DOWN         0x218
+#define KEY_CAMERA_LEFT         0x219
+#define KEY_CAMERA_RIGHT        0x21a
+
+#define BTN_TRIGGER_HAPPY               0x2c0
+#define BTN_TRIGGER_HAPPY1              0x2c0
+#define BTN_TRIGGER_HAPPY2              0x2c1
+#define BTN_TRIGGER_HAPPY3              0x2c2
+#define BTN_TRIGGER_HAPPY4              0x2c3
+#define BTN_TRIGGER_HAPPY5              0x2c4
+#define BTN_TRIGGER_HAPPY6              0x2c5
+#define BTN_TRIGGER_HAPPY7              0x2c6
+#define BTN_TRIGGER_HAPPY8              0x2c7
+#define BTN_TRIGGER_HAPPY9              0x2c8
+#define BTN_TRIGGER_HAPPY10             0x2c9
+#define BTN_TRIGGER_HAPPY11             0x2ca
+#define BTN_TRIGGER_HAPPY12             0x2cb
+#define BTN_TRIGGER_HAPPY13             0x2cc
+#define BTN_TRIGGER_HAPPY14             0x2cd
+#define BTN_TRIGGER_HAPPY15             0x2ce
+#define BTN_TRIGGER_HAPPY16             0x2cf
+#define BTN_TRIGGER_HAPPY17             0x2d0
+#define BTN_TRIGGER_HAPPY18             0x2d1
+#define BTN_TRIGGER_HAPPY19             0x2d2
+#define BTN_TRIGGER_HAPPY20             0x2d3
+#define BTN_TRIGGER_HAPPY21             0x2d4
+#define BTN_TRIGGER_HAPPY22             0x2d5
+#define BTN_TRIGGER_HAPPY23             0x2d6
+#define BTN_TRIGGER_HAPPY24             0x2d7
+#define BTN_TRIGGER_HAPPY25             0x2d8
+#define BTN_TRIGGER_HAPPY26             0x2d9
+#define BTN_TRIGGER_HAPPY27             0x2da
+#define BTN_TRIGGER_HAPPY28             0x2db
+#define BTN_TRIGGER_HAPPY29             0x2dc
+#define BTN_TRIGGER_HAPPY30             0x2dd
+#define BTN_TRIGGER_HAPPY31             0x2de
+#define BTN_TRIGGER_HAPPY32             0x2df
+#define BTN_TRIGGER_HAPPY33             0x2e0
+#define BTN_TRIGGER_HAPPY34             0x2e1
+#define BTN_TRIGGER_HAPPY35             0x2e2
+#define BTN_TRIGGER_HAPPY36             0x2e3
+#define BTN_TRIGGER_HAPPY37             0x2e4
+#define BTN_TRIGGER_HAPPY38             0x2e5
+#define BTN_TRIGGER_HAPPY39             0x2e6
+#define BTN_TRIGGER_HAPPY40             0x2e7
+
+/* We avoid low common keys in module aliases so they don't get huge. */
+#define KEY_MIN_INTERESTING     KEY_MUTE
+#define KEY_MAX                 0x2ff
+#define KEY_CNT                 (KEY_MAX+1)
+
+/*
+ * Relative axes
+ */
+
+#define REL_X                   0x00
+#define REL_Y                   0x01
+#define REL_Z                   0x02
+#define REL_RX                  0x03
+#define REL_RY                  0x04
+#define REL_RZ                  0x05
+#define REL_HWHEEL              0x06
+#define REL_DIAL                0x07
+#define REL_WHEEL               0x08
+#define REL_MISC                0x09
+#define REL_MAX                 0x0f
+#define REL_CNT                 (REL_MAX+1)
+
+/*
+ * Absolute axes
+ */
+
+#define ABS_X                   0x00
+#define ABS_Y                   0x01
+#define ABS_Z                   0x02
+#define ABS_RX                  0x03
+#define ABS_RY                  0x04
+#define ABS_RZ                  0x05
+#define ABS_THROTTLE            0x06
+#define ABS_RUDDER              0x07
+#define ABS_WHEEL               0x08
+#define ABS_GAS                 0x09
+#define ABS_BRAKE               0x0a
+#define ABS_HAT0X               0x10
+#define ABS_HAT0Y               0x11
+#define ABS_HAT1X               0x12
+#define ABS_HAT1Y               0x13
+#define ABS_HAT2X               0x14
+#define ABS_HAT2Y               0x15
+#define ABS_HAT3X               0x16
+#define ABS_HAT3Y               0x17
+#define ABS_PRESSURE            0x18
+#define ABS_DISTANCE            0x19
+#define ABS_TILT_X              0x1a
+#define ABS_TILT_Y              0x1b
+#define ABS_TOOL_WIDTH          0x1c
+
+#define ABS_VOLUME              0x20
+
+#define ABS_MISC                0x28
+
+#define ABS_MT_SLOT             0x2f    /* MT slot being modified */
+#define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
+#define ABS_MT_TOUCH_MINOR      0x31    /* Minor axis (omit if circular) */
+#define ABS_MT_WIDTH_MAJOR      0x32    /* Major axis of approaching ellipse */
+#define ABS_MT_WIDTH_MINOR      0x33    /* Minor axis (omit if circular) */
+#define ABS_MT_ORIENTATION      0x34    /* Ellipse orientation */
+#define ABS_MT_POSITION_X       0x35    /* Center X touch position */
+#define ABS_MT_POSITION_Y       0x36    /* Center Y touch position */
+#define ABS_MT_TOOL_TYPE        0x37    /* Type of touching device */
+#define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
+#define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
+#define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
+#define ABS_MT_DISTANCE         0x3b    /* Contact hover distance */
+#define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
+#define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
+
+
+#define ABS_MAX                 0x3f
+#define ABS_CNT                 (ABS_MAX+1)
+
+/*
+ * Switch events
+ */
+
+#define SW_LID                  0x00  /* set = lid shut */
+#define SW_TABLET_MODE          0x01  /* set = tablet mode */
+#define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
+#define SW_RFKILL_ALL           0x03  /* rfkill master switch, type "any"
+                                         set = radio enabled */
+#define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
+#define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
+#define SW_DOCK                 0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
+#define SW_VIDEOOUT_INSERT      0x08  /* set = inserted */
+#define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
+#define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
+#define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
+#define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT        0x0d  /* set = inserted */
+#define SW_MAX                  0x0f
+#define SW_CNT                  (SW_MAX+1)
+
+/*
+ * Misc events
+ */
+
+#define MSC_SERIAL              0x00
+#define MSC_PULSELED            0x01
+#define MSC_GESTURE             0x02
+#define MSC_RAW                 0x03
+#define MSC_SCAN                0x04
+#define MSC_MAX                 0x07
+#define MSC_CNT                 (MSC_MAX+1)
+
+/*
+ * LEDs
+ */
+
+#define LED_NUML                0x00
+#define LED_CAPSL               0x01
+#define LED_SCROLLL             0x02
+#define LED_COMPOSE             0x03
+#define LED_KANA                0x04
+#define LED_SLEEP               0x05
+#define LED_SUSPEND             0x06
+#define LED_MUTE                0x07
+#define LED_MISC                0x08
+#define LED_MAIL                0x09
+#define LED_CHARGING            0x0a
+#define LED_MAX                 0x0f
+#define LED_CNT                 (LED_MAX+1)
+
+/*
+ * Autorepeat values
+ */
+
+#define REP_DELAY               0x00
+#define REP_PERIOD              0x01
+#define REP_MAX                 0x01
+#define REP_CNT                 (REP_MAX+1)
+
+/*
+ * Sounds
+ */
+
+#define SND_CLICK               0x00
+#define SND_BELL                0x01
+#define SND_TONE                0x02
+#define SND_MAX                 0x07
+#define SND_CNT                 (SND_MAX+1)
+
+/*
+ * IDs.
+ */
+
+#define ID_BUS                  0
+#define ID_VENDOR               1
+#define ID_PRODUCT              2
+#define ID_VERSION              3
+
+#define BUS_PCI                 0x01
+#define BUS_ISAPNP              0x02
+#define BUS_USB                 0x03
+#define BUS_HIL                 0x04
+#define BUS_BLUETOOTH           0x05
+#define BUS_VIRTUAL             0x06
+
+#define BUS_ISA                 0x10
+#define BUS_I8042               0x11
+#define BUS_XTKBD               0x12
+#define BUS_RS232               0x13
+#define BUS_GAMEPORT            0x14
+#define BUS_PARPORT             0x15
+#define BUS_AMIGA               0x16
+#define BUS_ADB                 0x17
+#define BUS_I2C                 0x18
+#define BUS_HOST                0x19
+#define BUS_GSC                 0x1A
+#define BUS_ATARI               0x1B
+#define BUS_SPI                 0x1C
+
+/*
+ * MT_TOOL types
+ */
+#define MT_TOOL_FINGER          0
+#define MT_TOOL_PEN             1
+#define MT_TOOL_MAX             1
+
+/*
+ * Values describing the status of a force-feedback effect
+ */
+#define FF_STATUS_STOPPED       0x00
+#define FF_STATUS_PLAYING       0x01
+#define FF_STATUS_MAX           0x01
+
+/*
+ * Structures used in ioctls to upload effects to a device
+ * They are pieces of a bigger structure (called ff_effect)
+ */
+
+/*
+ * All duration values are expressed in ms. Values above 32767 ms (0x7fff)
+ * should not be used and have unspecified results.
+ */
+
+/**
+ * struct ff_replay - defines scheduling of the force-feedback effect
+ * @length: duration of the effect
+ * @delay: delay before effect should start playing
+ */
+struct ff_replay {
+        __u16 length;
+        __u16 delay;
+};
+
+/**
+ * struct ff_trigger - defines what triggers the force-feedback effect
+ * @button: number of the button triggering the effect
+ * @interval: controls how soon the effect can be re-triggered
+ */
+struct ff_trigger {
+        __u16 button;
+        __u16 interval;
+};
+
+/**
+ * struct ff_envelope - generic force-feedback effect envelope
+ * @attack_length: duration of the attack (ms)
+ * @attack_level: level at the beginning of the attack
+ * @fade_length: duration of fade (ms)
+ * @fade_level: level at the end of fade
+ *
+ * The @attack_level and @fade_level are absolute values; when applying
+ * envelope force-feedback core will convert to positive/negative
+ * value based on polarity of the default level of the effect.
+ * Valid range for the attack and fade levels is 0x0000 - 0x7fff
+ */
+struct ff_envelope {
+        __u16 attack_length;
+        __u16 attack_level;
+        __u16 fade_length;
+        __u16 fade_level;
+};
+
+/**
+ * struct ff_constant_effect - defines parameters of a constant force-feedback effect
+ * @level: strength of the effect; may be negative
+ * @envelope: envelope data
+ */
+struct ff_constant_effect {
+        __s16 level;
+        struct ff_envelope envelope;
+};
+
+/**
+ * struct ff_ramp_effect - defines parameters of a ramp force-feedback effect
+ * @start_level: beginning strength of the effect; may be negative
+ * @end_level: final strength of the effect; may be negative
+ * @envelope: envelope data
+ */
+struct ff_ramp_effect {
+        __s16 start_level;
+        __s16 end_level;
+        struct ff_envelope envelope;
+};
+
+/**
+ * struct ff_condition_effect - defines a spring or friction force-feedback effect
+ * @right_saturation: maximum level when joystick moved all way to the right
+ * @left_saturation: same for the left side
+ * @right_coeff: controls how fast the force grows when the joystick moves
+ *      to the right
+ * @left_coeff: same for the left side
+ * @deadband: size of the dead zone, where no force is produced
+ * @center: position of the dead zone
+ */
+struct ff_condition_effect {
+        __u16 right_saturation;
+        __u16 left_saturation;
+
+        __s16 right_coeff;
+        __s16 left_coeff;
+
+        __u16 deadband;
+        __s16 center;
+};
+
+/**
+ * struct ff_periodic_effect - defines parameters of a periodic force-feedback effect
+ * @waveform: kind of the effect (wave)
+ * @period: period of the wave (ms)
+ * @magnitude: peak value
+ * @offset: mean value of the wave (roughly)
+ * @phase: 'horizontal' shift
+ * @envelope: envelope data
+ * @custom_len: number of samples (FF_CUSTOM only)
+ * @custom_data: buffer of samples (FF_CUSTOM only)
+ *
+ * Known waveforms - FF_SQUARE, FF_TRIANGLE, FF_SINE, FF_SAW_UP,
+ * FF_SAW_DOWN, FF_CUSTOM. The exact syntax FF_CUSTOM is undefined
+ * for the time being as no driver supports it yet.
+ *
+ * Note: the data pointed by custom_data is copied by the driver.
+ * You can therefore dispose of the memory after the upload/update.
+ */
+struct ff_periodic_effect {
+        __u16 waveform;
+        __u16 period;
+        __s16 magnitude;
+        __s16 offset;
+        __u16 phase;
+
+        struct ff_envelope envelope;
+
+        __u32 custom_len;
+        __s16 __user *custom_data;
+};
+
+/**
+ * struct ff_rumble_effect - defines parameters of a periodic force-feedback effect
+ * @strong_magnitude: magnitude of the heavy motor
+ * @weak_magnitude: magnitude of the light one
+ *
+ * Some rumble pads have two motors of different weight. Strong_magnitude
+ * represents the magnitude of the vibration generated by the heavy one.
+ */
+struct ff_rumble_effect {
+        __u16 strong_magnitude;
+        __u16 weak_magnitude;
+};
+
+/**
+ * struct ff_effect - defines force feedback effect
+ * @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
+ *      FF_FRICTION, FF_DAMPER, FF_RUMBLE, FF_INERTIA, or FF_CUSTOM)
+ * @id: an unique id assigned to an effect
+ * @direction: direction of the effect
+ * @trigger: trigger conditions (struct ff_trigger)
+ * @replay: scheduling of the effect (struct ff_replay)
+ * @u: effect-specific structure (one of ff_constant_effect, ff_ramp_effect,
+ *      ff_periodic_effect, ff_condition_effect, ff_rumble_effect) further
+ *      defining effect parameters
+ *
+ * This structure is sent through ioctl from the application to the driver.
+ * To create a new effect application should set its @id to -1; the kernel
+ * will return assigned @id which can later be used to update or delete
+ * this effect.
+ *
+ * Direction of the effect is encoded as follows:
+ *      0 deg -> 0x0000 (down)
+ *      90 deg -> 0x4000 (left)
+ *      180 deg -> 0x8000 (up)
+ *      270 deg -> 0xC000 (right)
+ */
+struct ff_effect {
+        __u16 type;
+        __s16 id;
+        __u16 direction;
+        struct ff_trigger trigger;
+        struct ff_replay replay;
+
+        union {
+                struct ff_constant_effect constant;
+                struct ff_ramp_effect ramp;
+                struct ff_periodic_effect periodic;
+                struct ff_condition_effect condition[2]; /* One for each axis */
+                struct ff_rumble_effect rumble;
+        } u;
+};
+
+/*
+ * Force feedback effect types
+ */
+
+#define FF_RUMBLE       0x50
+#define FF_PERIODIC     0x51
+#define FF_CONSTANT     0x52
+#define FF_SPRING       0x53
+#define FF_FRICTION     0x54
+#define FF_DAMPER       0x55
+#define FF_INERTIA      0x56
+#define FF_RAMP         0x57
+
+#define FF_EFFECT_MIN   FF_RUMBLE
+#define FF_EFFECT_MAX   FF_RAMP
+
+/*
+ * Force feedback periodic effect types
+ */
+
+#define FF_SQUARE       0x58
+#define FF_TRIANGLE     0x59
+#define FF_SINE         0x5a
+#define FF_SAW_UP       0x5b
+#define FF_SAW_DOWN     0x5c
+#define FF_CUSTOM       0x5d
+
+#define FF_WAVEFORM_MIN FF_SQUARE
+#define FF_WAVEFORM_MAX FF_CUSTOM
+
+/*
+ * Set ff device properties
+ */
+
+#define FF_GAIN         0x60
+#define FF_AUTOCENTER   0x61
+
+#define FF_MAX          0x7f
+#define FF_CNT          (FF_MAX+1)
+
+#endif /* _UAPI_INPUT_H */
diff --git a/include/linux/ioctl.h b/include/uapi/linux/ioctl.h
index aa91eb3951ef..aa91eb3951ef 100644
--- a/include/linux/ioctl.h
+++ b/include/uapi/linux/ioctl.h
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
new file mode 100644
index 000000000000..6cf06bfd841b
--- /dev/null
+++ b/include/uapi/linux/ip.h
@@ -0,0 +1,136 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions for the IP protocol.
+ *
+ * Version:     @(#)ip.h        1.0.2   04/28/93
+ *
+ * Authors:     Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_IP_H
+#define _UAPI_LINUX_IP_H
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+#define IPTOS_TOS_MASK          0x1E
+#define IPTOS_TOS(tos)          ((tos)&IPTOS_TOS_MASK)
+#define IPTOS_LOWDELAY          0x10
+#define IPTOS_THROUGHPUT        0x08
+#define IPTOS_RELIABILITY       0x04
+#define IPTOS_MINCOST           0x02
+
+#define IPTOS_PREC_MASK         0xE0
+#define IPTOS_PREC(tos)         ((tos)&IPTOS_PREC_MASK)
+#define IPTOS_PREC_NETCONTROL           0xe0
+#define IPTOS_PREC_INTERNETCONTROL      0xc0
+#define IPTOS_PREC_CRITIC_ECP           0xa0
+#define IPTOS_PREC_FLASHOVERRIDE        0x80
+#define IPTOS_PREC_FLASH                0x60
+#define IPTOS_PREC_IMMEDIATE            0x40
+#define IPTOS_PREC_PRIORITY             0x20
+#define IPTOS_PREC_ROUTINE              0x00
+
+
+/* IP options */
+#define IPOPT_COPY              0x80
+#define IPOPT_CLASS_MASK        0x60
+#define IPOPT_NUMBER_MASK       0x1f
+
+#define IPOPT_COPIED(o)         ((o)&IPOPT_COPY)
+#define IPOPT_CLASS(o)          ((o)&IPOPT_CLASS_MASK)
+#define IPOPT_NUMBER(o)         ((o)&IPOPT_NUMBER_MASK)
+
+#define IPOPT_CONTROL           0x00
+#define IPOPT_RESERVED1         0x20
+#define IPOPT_MEASUREMENT       0x40
+#define IPOPT_RESERVED2         0x60
+
+#define IPOPT_END       (0 |IPOPT_CONTROL)
+#define IPOPT_NOOP      (1 |IPOPT_CONTROL)
+#define IPOPT_SEC       (2 |IPOPT_CONTROL|IPOPT_COPY)
+#define IPOPT_LSRR      (3 |IPOPT_CONTROL|IPOPT_COPY)
+#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
+#define IPOPT_CIPSO     (6 |IPOPT_CONTROL|IPOPT_COPY)
+#define IPOPT_RR        (7 |IPOPT_CONTROL)
+#define IPOPT_SID       (8 |IPOPT_CONTROL|IPOPT_COPY)
+#define IPOPT_SSRR      (9 |IPOPT_CONTROL|IPOPT_COPY)
+#define IPOPT_RA        (20|IPOPT_CONTROL|IPOPT_COPY)
+
+#define IPVERSION       4
+#define MAXTTL          255
+#define IPDEFTTL        64
+
+#define IPOPT_OPTVAL 0
+#define IPOPT_OLEN   1
+#define IPOPT_OFFSET 2
+#define IPOPT_MINOFF 4
+#define MAX_IPOPTLEN 40
+#define IPOPT_NOP IPOPT_NOOP
+#define IPOPT_EOL IPOPT_END
+#define IPOPT_TS  IPOPT_TIMESTAMP
+
+#define IPOPT_TS_TSONLY         0               /* timestamps only */
+#define IPOPT_TS_TSANDADDR      1               /* timestamps and addresses */
+#define IPOPT_TS_PRESPEC        3               /* specified modules only */
+
+#define IPV4_BEET_PHMAXLEN 8
+
+struct iphdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8    ihl:4,
+                version:4;
+#elif defined (__BIG_ENDIAN_BITFIELD)
+        __u8    version:4,
+                ihl:4;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif
+        __u8    tos;
+        __be16  tot_len;
+        __be16  id;
+        __be16  frag_off;
+        __u8    ttl;
+        __u8    protocol;
+        __sum16 check;
+        __be32  saddr;
+        __be32  daddr;
+        /*The options start here. */
+};
+
+
+struct ip_auth_hdr {
+        __u8  nexthdr;
+        __u8  hdrlen;           /* This one is measured in 32 bit units! */
+        __be16 reserved;
+        __be32 spi;
+        __be32 seq_no;          /* Sequence number */
+        __u8  auth_data[0];     /* Variable len but >=4. Mind the 64 bit alignment! */
+};
+
+struct ip_esp_hdr {
+        __be32 spi;
+        __be32 seq_no;          /* Sequence number */
+        __u8  enc_data[0];      /* Variable len but >=8. Mind the 64 bit alignment! */
+};
+
+struct ip_comp_hdr {
+        __u8 nexthdr;
+        __u8 flags;
+        __be16 cpi;
+};
+
+struct ip_beet_phdr {
+        __u8 nexthdr;
+        __u8 hdrlen;
+        __u8 padlen;
+        __u8 reserved;
+};
+
+#endif /* _UAPI_LINUX_IP_H */
diff --git a/include/linux/ip6_tunnel.h b/include/uapi/linux/ip6_tunnel.h
index 48af63c9a48d..48af63c9a48d 100644
--- a/include/linux/ip6_tunnel.h
+++ b/include/uapi/linux/ip6_tunnel.h
diff --git a/include/linux/ip_vs.h b/include/uapi/linux/ip_vs.h
index 8a2d438dc499..8a2d438dc499 100644
--- a/include/linux/ip_vs.h
+++ b/include/uapi/linux/ip_vs.h
diff --git a/include/uapi/linux/ipc.h b/include/uapi/linux/ipc.h
new file mode 100644
index 000000000000..de08dd46ddae
--- /dev/null
+++ b/include/uapi/linux/ipc.h
@@ -0,0 +1,81 @@
+#ifndef _UAPI_LINUX_IPC_H
+#define _UAPI_LINUX_IPC_H
+
+#include <linux/types.h>
+
+#define IPC_PRIVATE ((__kernel_key_t) 0)  
+
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
+struct ipc_perm
+{
+        __kernel_key_t  key;
+        __kernel_uid_t  uid;
+        __kernel_gid_t  gid;
+        __kernel_uid_t  cuid;
+        __kernel_gid_t  cgid;
+        __kernel_mode_t mode; 
+        unsigned short  seq;
+};
+
+/* Include the definition of ipc64_perm */
+#include <asm/ipcbuf.h>
+
+/* resource get request flags */
+#define IPC_CREAT  00001000   /* create if key is nonexistent */
+#define IPC_EXCL   00002000   /* fail if key exists */
+#define IPC_NOWAIT 00004000   /* return error on wait */
+
+/* these fields are used by the DIPC package so the kernel as standard
+   should avoid using them if possible */
+   
+#define IPC_DIPC 00010000  /* make it distributed */
+#define IPC_OWN  00020000  /* this machine is the DIPC owner */
+
+/* 
+ * Control commands used with semctl, msgctl and shmctl 
+ * see also specific commands in sem.h, msg.h and shm.h
+ */
+#define IPC_RMID 0     /* remove resource */
+#define IPC_SET  1     /* set ipc_perm options */
+#define IPC_STAT 2     /* get ipc_perm options */
+#define IPC_INFO 3     /* see ipcs */
+
+/*
+ * Version flags for semctl, msgctl, and shmctl commands
+ * These are passed as bitflags or-ed with the actual command
+ */
+#define IPC_OLD 0       /* Old version (no 32-bit UID support on many
+                           architectures) */
+#define IPC_64  0x0100  /* New version (support 32-bit UIDs, bigger
+                           message sizes, etc. */
+
+/*
+ * These are used to wrap system calls.
+ *
+ * See architecture code for ugly details..
+ */
+struct ipc_kludge {
+        struct msgbuf __user *msgp;
+        long msgtyp;
+};
+
+#define SEMOP            1
+#define SEMGET           2
+#define SEMCTL           3
+#define SEMTIMEDOP       4
+#define MSGSND          11
+#define MSGRCV          12
+#define MSGGET          13
+#define MSGCTL          14
+#define SHMAT           21
+#define SHMDT           22
+#define SHMGET          23
+#define SHMCTL          24
+
+/* Used by the DIPC package, try and avoid reusing it */
+#define DIPC            25
+
+#define IPCCALL(version,op)     ((version)<<16 | (op))
+
+
+#endif /* _UAPI_LINUX_IPC_H */
diff --git a/include/uapi/linux/ipmi.h b/include/uapi/linux/ipmi.h
new file mode 100644
index 000000000000..33fbc99b3812
--- /dev/null
+++ b/include/uapi/linux/ipmi.h
@@ -0,0 +1,456 @@
+/*
+ * ipmi.h
+ *
+ * MontaVista IPMI interface
+ *
+ * Author: MontaVista Software, Inc.
+ *         Corey Minyard <minyard@mvista.com>
+ *         source@mvista.com
+ *
+ * Copyright 2002 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _UAPI__LINUX_IPMI_H
+#define _UAPI__LINUX_IPMI_H
+
+#include <linux/ipmi_msgdefs.h>
+#include <linux/compiler.h>
+
+/*
+ * This file describes an interface to an IPMI driver.  You have to
+ * have a fairly good understanding of IPMI to use this, so go read
+ * the specs first before actually trying to do anything.
+ *
+ * With that said, this driver provides a multi-user interface to the
+ * IPMI driver, and it allows multiple IPMI physical interfaces below
+ * the driver.  The physical interfaces bind as a lower layer on the
+ * driver.  They appear as interfaces to the application using this
+ * interface.
+ *
+ * Multi-user means that multiple applications may use the driver,
+ * send commands, receive responses, etc.  The driver keeps track of
+ * commands the user sends and tracks the responses.  The responses
+ * will go back to the application that send the command.  If the
+ * response doesn't come back in time, the driver will return a
+ * timeout error response to the application.  Asynchronous events
+ * from the BMC event queue will go to all users bound to the driver.
+ * The incoming event queue in the BMC will automatically be flushed
+ * if it becomes full and it is queried once a second to see if
+ * anything is in it.  Incoming commands to the driver will get
+ * delivered as commands.
+ *
+ * This driver provides two main interfaces: one for in-kernel
+ * applications and another for userland applications.  The
+ * capabilities are basically the same for both interface, although
+ * the interfaces are somewhat different.  The stuff in the
+ * #ifdef __KERNEL__ below is the in-kernel interface.  The userland
+ * interface is defined later in the file.  */
+
+
+
+/*
+ * This is an overlay for all the address types, so it's easy to
+ * determine the actual address type.  This is kind of like addresses
+ * work for sockets.
+ */
+#define IPMI_MAX_ADDR_SIZE 32
+struct ipmi_addr {
+         /* Try to take these from the "Channel Medium Type" table
+            in section 6.5 of the IPMI 1.5 manual. */
+        int   addr_type;
+        short channel;
+        char  data[IPMI_MAX_ADDR_SIZE];
+};
+
+/*
+ * When the address is not used, the type will be set to this value.
+ * The channel is the BMC's channel number for the channel (usually
+ * 0), or IPMC_BMC_CHANNEL if communicating directly with the BMC.
+ */
+#define IPMI_SYSTEM_INTERFACE_ADDR_TYPE 0x0c
+struct ipmi_system_interface_addr {
+        int           addr_type;
+        short         channel;
+        unsigned char lun;
+};
+
+/* An IPMB Address. */
+#define IPMI_IPMB_ADDR_TYPE             0x01
+/* Used for broadcast get device id as described in section 17.9 of the
+   IPMI 1.5 manual. */
+#define IPMI_IPMB_BROADCAST_ADDR_TYPE   0x41
+struct ipmi_ipmb_addr {
+        int           addr_type;
+        short         channel;
+        unsigned char slave_addr;
+        unsigned char lun;
+};
+
+/*
+ * A LAN Address.  This is an address to/from a LAN interface bridged
+ * by the BMC, not an address actually out on the LAN.
+ *
+ * A conscious decision was made here to deviate slightly from the IPMI
+ * spec.  We do not use rqSWID and rsSWID like it shows in the
+ * message.  Instead, we use remote_SWID and local_SWID.  This means
+ * that any message (a request or response) from another device will
+ * always have exactly the same address.  If you didn't do this,
+ * requests and responses from the same device would have different
+ * addresses, and that's not too cool.
+ *
+ * In this address, the remote_SWID is always the SWID the remote
+ * message came from, or the SWID we are sending the message to.
+ * local_SWID is always our SWID.  Note that having our SWID in the
+ * message is a little weird, but this is required.
+ */
+#define IPMI_LAN_ADDR_TYPE              0x04
+struct ipmi_lan_addr {
+        int           addr_type;
+        short         channel;
+        unsigned char privilege;
+        unsigned char session_handle;
+        unsigned char remote_SWID;
+        unsigned char local_SWID;
+        unsigned char lun;
+};
+
+
+/*
+ * Channel for talking directly with the BMC.  When using this
+ * channel, This is for the system interface address type only.  FIXME
+ * - is this right, or should we use -1?
+ */
+#define IPMI_BMC_CHANNEL  0xf
+#define IPMI_NUM_CHANNELS 0x10
+
+/*
+ * Used to signify an "all channel" bitmask.  This is more than the
+ * actual number of channels because this is used in userland and
+ * will cover us if the number of channels is extended.
+ */
+#define IPMI_CHAN_ALL     (~0)
+
+
+/*
+ * A raw IPMI message without any addressing.  This covers both
+ * commands and responses.  The completion code is always the first
+ * byte of data in the response (as the spec shows the messages laid
+ * out).
+ */
+struct ipmi_msg {
+        unsigned char  netfn;
+        unsigned char  cmd;
+        unsigned short data_len;
+        unsigned char  __user *data;
+};
+
+struct kernel_ipmi_msg {
+        unsigned char  netfn;
+        unsigned char  cmd;
+        unsigned short data_len;
+        unsigned char  *data;
+};
+
+/*
+ * Various defines that are useful for IPMI applications.
+ */
+#define IPMI_INVALID_CMD_COMPLETION_CODE        0xC1
+#define IPMI_TIMEOUT_COMPLETION_CODE            0xC3
+#define IPMI_UNKNOWN_ERR_COMPLETION_CODE        0xff
+
+
+/*
+ * Receive types for messages coming from the receive interface.  This
+ * is used for the receive in-kernel interface and in the receive
+ * IOCTL.
+ *
+ * The "IPMI_RESPONSE_RESPNOSE_TYPE" is a little strange sounding, but
+ * it allows you to get the message results when you send a response
+ * message.
+ */
+#define IPMI_RESPONSE_RECV_TYPE         1 /* A response to a command */
+#define IPMI_ASYNC_EVENT_RECV_TYPE      2 /* Something from the event queue */
+#define IPMI_CMD_RECV_TYPE              3 /* A command from somewhere else */
+#define IPMI_RESPONSE_RESPONSE_TYPE     4 /* The response for
+                                              a sent response, giving any
+                                              error status for sending the
+                                              response.  When you send a
+                                              response message, this will
+                                              be returned. */
+#define IPMI_OEM_RECV_TYPE              5 /* The response for OEM Channels */
+
+/* Note that async events and received commands do not have a completion
+   code as the first byte of the incoming data, unlike a response. */
+
+
+/*
+ * Modes for ipmi_set_maint_mode() and the userland IOCTL.  The AUTO
+ * setting is the default and means it will be set on certain
+ * commands.  Hard setting it on and off will override automatic
+ * operation.
+ */
+#define IPMI_MAINTENANCE_MODE_AUTO      0
+#define IPMI_MAINTENANCE_MODE_OFF       1
+#define IPMI_MAINTENANCE_MODE_ON        2
+
+
+
+/*
+ * The userland interface
+ */
+
+/*
+ * The userland interface for the IPMI driver is a standard character
+ * device, with each instance of an interface registered as a minor
+ * number under the major character device.
+ *
+ * The read and write calls do not work, to get messages in and out
+ * requires ioctl calls because of the complexity of the data.  select
+ * and poll do work, so you can wait for input using the file
+ * descriptor, you just can use read to get it.
+ *
+ * In general, you send a command down to the interface and receive
+ * responses back.  You can use the msgid value to correlate commands
+ * and responses, the driver will take care of figuring out which
+ * incoming messages are for which command and find the proper msgid
+ * value to report.  You will only receive reponses for commands you
+ * send.  Asynchronous events, however, go to all open users, so you
+ * must be ready to handle these (or ignore them if you don't care).
+ *
+ * The address type depends upon the channel type.  When talking
+ * directly to the BMC (IPMC_BMC_CHANNEL), the address is ignored
+ * (IPMI_UNUSED_ADDR_TYPE).  When talking to an IPMB channel, you must
+ * supply a valid IPMB address with the addr_type set properly.
+ *
+ * When talking to normal channels, the driver takes care of the
+ * details of formatting and sending messages on that channel.  You do
+ * not, for instance, have to format a send command, you just send
+ * whatever command you want to the channel, the driver will create
+ * the send command, automatically issue receive command and get even
+ * commands, and pass those up to the proper user.
+ */
+
+
+/* The magic IOCTL value for this interface. */
+#define IPMI_IOC_MAGIC 'i'
+
+
+/* Messages sent to the interface are this format. */
+struct ipmi_req {
+        unsigned char __user *addr; /* Address to send the message to. */
+        unsigned int  addr_len;
+
+        long    msgid; /* The sequence number for the message.  This
+                          exact value will be reported back in the
+                          response to this request if it is a command.
+                          If it is a response, this will be used as
+                          the sequence value for the response.  */
+
+        struct ipmi_msg msg;
+};
+/*
+ * Send a message to the interfaces.  error values are:
+ *   - EFAULT - an address supplied was invalid.
+ *   - EINVAL - The address supplied was not valid, or the command
+ *              was not allowed.
+ *   - EMSGSIZE - The message to was too large.
+ *   - ENOMEM - Buffers could not be allocated for the command.
+ */
+#define IPMICTL_SEND_COMMAND            _IOR(IPMI_IOC_MAGIC, 13,        \
+                                             struct ipmi_req)
+
+/* Messages sent to the interface with timing parameters are this
+   format. */
+struct ipmi_req_settime {
+        struct ipmi_req req;
+
+        /* See ipmi_request_settime() above for details on these
+           values. */
+        int          retries;
+        unsigned int retry_time_ms;
+};
+/*
+ * Send a message to the interfaces with timing parameters.  error values
+ * are:
+ *   - EFAULT - an address supplied was invalid.
+ *   - EINVAL - The address supplied was not valid, or the command
+ *              was not allowed.
+ *   - EMSGSIZE - The message to was too large.
+ *   - ENOMEM - Buffers could not be allocated for the command.
+ */
+#define IPMICTL_SEND_COMMAND_SETTIME    _IOR(IPMI_IOC_MAGIC, 21,        \
+                                             struct ipmi_req_settime)
+
+/* Messages received from the interface are this format. */
+struct ipmi_recv {
+        int     recv_type; /* Is this a command, response or an
+                              asyncronous event. */
+
+        unsigned char __user *addr;    /* Address the message was from is put
+                                   here.  The caller must supply the
+                                   memory. */
+        unsigned int  addr_len; /* The size of the address buffer.
+                                   The caller supplies the full buffer
+                                   length, this value is updated to
+                                   the actual message length when the
+                                   message is received. */
+
+        long    msgid; /* The sequence number specified in the request
+                          if this is a response.  If this is a command,
+                          this will be the sequence number from the
+                          command. */
+
+        struct ipmi_msg msg; /* The data field must point to a buffer.
+                                The data_size field must be set to the
+                                size of the message buffer.  The
+                                caller supplies the full buffer
+                                length, this value is updated to the
+                                actual message length when the message
+                                is received. */
+};
+
+/*
+ * Receive a message.  error values:
+ *  - EAGAIN - no messages in the queue.
+ *  - EFAULT - an address supplied was invalid.
+ *  - EINVAL - The address supplied was not valid.
+ *  - EMSGSIZE - The message to was too large to fit into the message buffer,
+ *               the message will be left in the buffer. */
+#define IPMICTL_RECEIVE_MSG             _IOWR(IPMI_IOC_MAGIC, 12,       \
+                                              struct ipmi_recv)
+
+/*
+ * Like RECEIVE_MSG, but if the message won't fit in the buffer, it
+ * will truncate the contents instead of leaving the data in the
+ * buffer.
+ */
+#define IPMICTL_RECEIVE_MSG_TRUNC       _IOWR(IPMI_IOC_MAGIC, 11,       \
+                                              struct ipmi_recv)
+
+/* Register to get commands from other entities on this interface. */
+struct ipmi_cmdspec {
+        unsigned char netfn;
+        unsigned char cmd;
+};
+
+/*
+ * Register to receive a specific command.  error values:
+ *   - EFAULT - an address supplied was invalid.
+ *   - EBUSY - The netfn/cmd supplied was already in use.
+ *   - ENOMEM - could not allocate memory for the entry.
+ */
+#define IPMICTL_REGISTER_FOR_CMD        _IOR(IPMI_IOC_MAGIC, 14,        \
+                                             struct ipmi_cmdspec)
+/*
+ * Unregister a regsitered command.  error values:
+ *  - EFAULT - an address supplied was invalid.
+ *  - ENOENT - The netfn/cmd was not found registered for this user.
+ */
+#define IPMICTL_UNREGISTER_FOR_CMD      _IOR(IPMI_IOC_MAGIC, 15,        \
+                                             struct ipmi_cmdspec)
+
+/*
+ * Register to get commands from other entities on specific channels.
+ * This way, you can only listen on specific channels, or have messages
+ * from some channels go to one place and other channels to someplace
+ * else.  The chans field is a bitmask, (1 << channel) for each channel.
+ * It may be IPMI_CHAN_ALL for all channels.
+ */
+struct ipmi_cmdspec_chans {
+        unsigned int netfn;
+        unsigned int cmd;
+        unsigned int chans;
+};
+
+/*
+ * Register to receive a specific command on specific channels.  error values:
+ *   - EFAULT - an address supplied was invalid.
+ *   - EBUSY - One of the netfn/cmd/chans supplied was already in use.
+ *   - ENOMEM - could not allocate memory for the entry.
+ */
+#define IPMICTL_REGISTER_FOR_CMD_CHANS  _IOR(IPMI_IOC_MAGIC, 28,        \
+                                             struct ipmi_cmdspec_chans)
+/*
+ * Unregister some netfn/cmd/chans.  error values:
+ *  - EFAULT - an address supplied was invalid.
+ *  - ENOENT - None of the netfn/cmd/chans were found registered for this user.
+ */
+#define IPMICTL_UNREGISTER_FOR_CMD_CHANS _IOR(IPMI_IOC_MAGIC, 29,       \
+                                             struct ipmi_cmdspec_chans)
+
+/*
+ * Set whether this interface receives events.  Note that the first
+ * user registered for events will get all pending events for the
+ * interface.  error values:
+ *  - EFAULT - an address supplied was invalid.
+ */
+#define IPMICTL_SET_GETS_EVENTS_CMD     _IOR(IPMI_IOC_MAGIC, 16, int)
+
+/*
+ * Set and get the slave address and LUN that we will use for our
+ * source messages.  Note that this affects the interface, not just
+ * this user, so it will affect all users of this interface.  This is
+ * so some initialization code can come in and do the OEM-specific
+ * things it takes to determine your address (if not the BMC) and set
+ * it for everyone else.  You should probably leave the LUN alone.
+ */
+struct ipmi_channel_lun_address_set {
+        unsigned short channel;
+        unsigned char  value;
+};
+#define IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD \
+        _IOR(IPMI_IOC_MAGIC, 24, struct ipmi_channel_lun_address_set)
+#define IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD \
+        _IOR(IPMI_IOC_MAGIC, 25, struct ipmi_channel_lun_address_set)
+#define IPMICTL_SET_MY_CHANNEL_LUN_CMD \
+        _IOR(IPMI_IOC_MAGIC, 26, struct ipmi_channel_lun_address_set)
+#define IPMICTL_GET_MY_CHANNEL_LUN_CMD \
+        _IOR(IPMI_IOC_MAGIC, 27, struct ipmi_channel_lun_address_set)
+/* Legacy interfaces, these only set IPMB 0. */
+#define IPMICTL_SET_MY_ADDRESS_CMD      _IOR(IPMI_IOC_MAGIC, 17, unsigned int)
+#define IPMICTL_GET_MY_ADDRESS_CMD      _IOR(IPMI_IOC_MAGIC, 18, unsigned int)
+#define IPMICTL_SET_MY_LUN_CMD          _IOR(IPMI_IOC_MAGIC, 19, unsigned int)
+#define IPMICTL_GET_MY_LUN_CMD          _IOR(IPMI_IOC_MAGIC, 20, unsigned int)
+
+/*
+ * Get/set the default timing values for an interface.  You shouldn't
+ * generally mess with these.
+ */
+struct ipmi_timing_parms {
+        int          retries;
+        unsigned int retry_time_ms;
+};
+#define IPMICTL_SET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 22, \
+                                             struct ipmi_timing_parms)
+#define IPMICTL_GET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 23, \
+                                             struct ipmi_timing_parms)
+
+/*
+ * Set the maintenance mode.  See ipmi_set_maintenance_mode() above
+ * for a description of what this does.
+ */
+#define IPMICTL_GET_MAINTENANCE_MODE_CMD        _IOR(IPMI_IOC_MAGIC, 30, int)
+#define IPMICTL_SET_MAINTENANCE_MODE_CMD        _IOW(IPMI_IOC_MAGIC, 31, int)
+
+#endif /* _UAPI__LINUX_IPMI_H */
diff --git a/include/linux/ipmi_msgdefs.h b/include/uapi/linux/ipmi_msgdefs.h
index df97e6e31e87..df97e6e31e87 100644
--- a/include/linux/ipmi_msgdefs.h
+++ b/include/uapi/linux/ipmi_msgdefs.h
diff --git a/include/linux/ipsec.h b/include/uapi/linux/ipsec.h
index d17a6302a0e9..d17a6302a0e9 100644
--- a/include/linux/ipsec.h
+++ b/include/uapi/linux/ipsec.h
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
new file mode 100644
index 000000000000..a6d7d1c536c3
--- /dev/null
+++ b/include/uapi/linux/ipv6.h
@@ -0,0 +1,164 @@
+#ifndef _UAPI_IPV6_H
+#define _UAPI_IPV6_H
+
+#include <linux/types.h>
+#include <linux/in6.h>
+#include <asm/byteorder.h>
+
+/* The latest drafts declared increase in minimal mtu up to 1280. */
+
+#define IPV6_MIN_MTU    1280
+
+/*
+ *      Advanced API
+ *      source interface/address selection, source routing, etc...
+ *      *under construction*
+ */
+
+
+struct in6_pktinfo {
+        struct in6_addr ipi6_addr;
+        int             ipi6_ifindex;
+};
+
+struct ip6_mtuinfo {
+        struct sockaddr_in6     ip6m_addr;
+        __u32                   ip6m_mtu;
+};
+
+struct in6_ifreq {
+        struct in6_addr ifr6_addr;
+        __u32           ifr6_prefixlen;
+        int             ifr6_ifindex; 
+};
+
+#define IPV6_SRCRT_STRICT       0x01    /* Deprecated; will be removed */
+#define IPV6_SRCRT_TYPE_0       0       /* Deprecated; will be removed */
+#define IPV6_SRCRT_TYPE_2       2       /* IPv6 type 2 Routing Header   */
+
+/*
+ *      routing header
+ */
+struct ipv6_rt_hdr {
+        __u8            nexthdr;
+        __u8            hdrlen;
+        __u8            type;
+        __u8            segments_left;
+
+        /*
+         *      type specific data
+         *      variable length field
+         */
+};
+
+
+struct ipv6_opt_hdr {
+        __u8            nexthdr;
+        __u8            hdrlen;
+        /* 
+         * TLV encoded option data follows.
+         */
+} __attribute__((packed));      /* required for some archs */
+
+#define ipv6_destopt_hdr ipv6_opt_hdr
+#define ipv6_hopopt_hdr  ipv6_opt_hdr
+
+
+/*
+ *      routing header type 0 (used in cmsghdr struct)
+ */
+
+struct rt0_hdr {
+        struct ipv6_rt_hdr      rt_hdr;
+        __u32                   reserved;
+        struct in6_addr         addr[0];
+
+#define rt0_type                rt_hdr.type
+};
+
+/*
+ *      routing header type 2
+ */
+
+struct rt2_hdr {
+        struct ipv6_rt_hdr      rt_hdr;
+        __u32                   reserved;
+        struct in6_addr         addr;
+
+#define rt2_type                rt_hdr.type
+};
+
+/*
+ *      home address option in destination options header
+ */
+
+struct ipv6_destopt_hao {
+        __u8                    type;
+        __u8                    length;
+        struct in6_addr         addr;
+} __attribute__((packed));
+
+/*
+ *      IPv6 fixed header
+ *
+ *      BEWARE, it is incorrect. The first 4 bits of flow_lbl
+ *      are glued to priority now, forming "class".
+ */
+
+struct ipv6hdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8                    priority:4,
+                                version:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8                    version:4,
+                                priority:4;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif
+        __u8                    flow_lbl[3];
+
+        __be16                  payload_len;
+        __u8                    nexthdr;
+        __u8                    hop_limit;
+
+        struct  in6_addr        saddr;
+        struct  in6_addr        daddr;
+};
+
+
+/* index values for the variables in ipv6_devconf */
+enum {
+        DEVCONF_FORWARDING = 0,
+        DEVCONF_HOPLIMIT,
+        DEVCONF_MTU6,
+        DEVCONF_ACCEPT_RA,
+        DEVCONF_ACCEPT_REDIRECTS,
+        DEVCONF_AUTOCONF,
+        DEVCONF_DAD_TRANSMITS,
+        DEVCONF_RTR_SOLICITS,
+        DEVCONF_RTR_SOLICIT_INTERVAL,
+        DEVCONF_RTR_SOLICIT_DELAY,
+        DEVCONF_USE_TEMPADDR,
+        DEVCONF_TEMP_VALID_LFT,
+        DEVCONF_TEMP_PREFERED_LFT,
+        DEVCONF_REGEN_MAX_RETRY,
+        DEVCONF_MAX_DESYNC_FACTOR,
+        DEVCONF_MAX_ADDRESSES,
+        DEVCONF_FORCE_MLD_VERSION,
+        DEVCONF_ACCEPT_RA_DEFRTR,
+        DEVCONF_ACCEPT_RA_PINFO,
+        DEVCONF_ACCEPT_RA_RTR_PREF,
+        DEVCONF_RTR_PROBE_INTERVAL,
+        DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
+        DEVCONF_PROXY_NDP,
+        DEVCONF_OPTIMISTIC_DAD,
+        DEVCONF_ACCEPT_SOURCE_ROUTE,
+        DEVCONF_MC_FORWARDING,
+        DEVCONF_DISABLE_IPV6,
+        DEVCONF_ACCEPT_DAD,
+        DEVCONF_FORCE_TLLAO,
+        DEVCONF_MAX
+};
+
+
+#endif /* _UAPI_IPV6_H */
diff --git a/include/uapi/linux/ipv6_route.h b/include/uapi/linux/ipv6_route.h
new file mode 100644
index 000000000000..0459664c2636
--- /dev/null
+++ b/include/uapi/linux/ipv6_route.h
@@ -0,0 +1,58 @@
+/*
+ *      Linux INET6 implementation 
+ *
+ *      Authors:
+ *      Pedro Roque             <roque@di.fc.ul.pt>     
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPI_LINUX_IPV6_ROUTE_H
+#define _UAPI_LINUX_IPV6_ROUTE_H
+
+#include <linux/types.h>
+
+#define RTF_DEFAULT     0x00010000      /* default - learned via ND     */
+#define RTF_ALLONLINK   0x00020000      /* (deprecated and will be removed)
+                                           fallback, no routers on link */
+#define RTF_ADDRCONF    0x00040000      /* addrconf route - RA          */
+#define RTF_PREFIX_RT   0x00080000      /* A prefix only route - RA     */
+#define RTF_ANYCAST     0x00100000      /* Anycast                      */
+
+#define RTF_NONEXTHOP   0x00200000      /* route with no nexthop        */
+#define RTF_EXPIRES     0x00400000
+
+#define RTF_ROUTEINFO   0x00800000      /* route information - RA       */
+
+#define RTF_CACHE       0x01000000      /* cache entry                  */
+#define RTF_FLOW        0x02000000      /* flow significant route       */
+#define RTF_POLICY      0x04000000      /* policy route                 */
+
+#define RTF_PREF(pref)  ((pref) << 27)
+#define RTF_PREF_MASK   0x18000000
+
+#define RTF_LOCAL       0x80000000
+
+
+struct in6_rtmsg {
+        struct in6_addr         rtmsg_dst;
+        struct in6_addr         rtmsg_src;
+        struct in6_addr         rtmsg_gateway;
+        __u32                   rtmsg_type;
+        __u16                   rtmsg_dst_len;
+        __u16                   rtmsg_src_len;
+        __u32                   rtmsg_metric;
+        unsigned long           rtmsg_info;
+        __u32                   rtmsg_flags;
+        int                     rtmsg_ifindex;
+};
+
+#define RTMSG_NEWDEVICE         0x11
+#define RTMSG_DELDEVICE         0x12
+#define RTMSG_NEWROUTE          0x21
+#define RTMSG_DELROUTE          0x22
+
+#endif /* _UAPI_LINUX_IPV6_ROUTE_H */
diff --git a/include/linux/ipx.h b/include/uapi/linux/ipx.h
index 3d48014cdd71..3d48014cdd71 100644
--- a/include/linux/ipx.h
+++ b/include/uapi/linux/ipx.h
diff --git a/include/linux/irda.h b/include/uapi/linux/irda.h
index a014c3252311..a014c3252311 100644
--- a/include/linux/irda.h
+++ b/include/uapi/linux/irda.h
diff --git a/include/uapi/linux/irqnr.h b/include/uapi/linux/irqnr.h
new file mode 100644
index 000000000000..ae5704fa77ad
--- /dev/null
+++ b/include/uapi/linux/irqnr.h
@@ -0,0 +1,4 @@
+/*
+ * There isn't anything here anymore, but the file must not be empty or patch
+ * will delete it.
+ */
diff --git a/include/uapi/linux/isdn.h b/include/uapi/linux/isdn.h
new file mode 100644
index 000000000000..eb1995fffc39
--- /dev/null
+++ b/include/uapi/linux/isdn.h
@@ -0,0 +1,143 @@
+/* $Id: isdn.h,v 1.125.2.3 2004/02/10 01:07:14 keil Exp $
+ *
+ * Main header for the Linux ISDN subsystem (linklevel).
+ *
+ * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
+ * Copyright 1995,96    by Thinking Objects Software GmbH Wuerzburg
+ * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
+ * 
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ */
+
+#ifndef _UAPI__ISDN_H__
+#define _UAPI__ISDN_H__
+
+#include <linux/ioctl.h>
+#include <linux/tty.h>
+
+#define ISDN_MAX_DRIVERS    32
+#define ISDN_MAX_CHANNELS   64
+
+/* New ioctl-codes */
+#define IIOCNETAIF  _IO('I',1)
+#define IIOCNETDIF  _IO('I',2)
+#define IIOCNETSCF  _IO('I',3)
+#define IIOCNETGCF  _IO('I',4)
+#define IIOCNETANM  _IO('I',5)
+#define IIOCNETDNM  _IO('I',6)
+#define IIOCNETGNM  _IO('I',7)
+#define IIOCGETSET  _IO('I',8) /* no longer supported */
+#define IIOCSETSET  _IO('I',9) /* no longer supported */
+#define IIOCSETVER  _IO('I',10)
+#define IIOCNETHUP  _IO('I',11)
+#define IIOCSETGST  _IO('I',12)
+#define IIOCSETBRJ  _IO('I',13)
+#define IIOCSIGPRF  _IO('I',14)
+#define IIOCGETPRF  _IO('I',15)
+#define IIOCSETPRF  _IO('I',16)
+#define IIOCGETMAP  _IO('I',17)
+#define IIOCSETMAP  _IO('I',18)
+#define IIOCNETASL  _IO('I',19)
+#define IIOCNETDIL  _IO('I',20)
+#define IIOCGETCPS  _IO('I',21)
+#define IIOCGETDVR  _IO('I',22)
+#define IIOCNETLCR  _IO('I',23) /* dwabc ioctl for LCR from isdnlog */
+#define IIOCNETDWRSET  _IO('I',24) /* dwabc ioctl to reset abc-values to default on a net-interface */
+
+#define IIOCNETALN  _IO('I',32)
+#define IIOCNETDLN  _IO('I',33)
+
+#define IIOCNETGPN  _IO('I',34)
+
+#define IIOCDBGVAR  _IO('I',127)
+
+#define IIOCDRVCTL  _IO('I',128)
+
+/* cisco hdlck device private ioctls */
+#define SIOCGKEEPPERIOD (SIOCDEVPRIVATE + 0)
+#define SIOCSKEEPPERIOD (SIOCDEVPRIVATE + 1)
+#define SIOCGDEBSERINT  (SIOCDEVPRIVATE + 2)
+#define SIOCSDEBSERINT  (SIOCDEVPRIVATE + 3)
+
+/* Packet encapsulations for net-interfaces */
+#define ISDN_NET_ENCAP_ETHER      0
+#define ISDN_NET_ENCAP_RAWIP      1
+#define ISDN_NET_ENCAP_IPTYP      2
+#define ISDN_NET_ENCAP_CISCOHDLC  3 /* Without SLARP and keepalive */
+#define ISDN_NET_ENCAP_SYNCPPP    4
+#define ISDN_NET_ENCAP_UIHDLC     5
+#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive    */
+#define ISDN_NET_ENCAP_X25IFACE   7 /* Documentation/networking/x25-iface.txt */
+#define ISDN_NET_ENCAP_MAX_ENCAP  ISDN_NET_ENCAP_X25IFACE
+
+/* Facility which currently uses an ISDN-channel */
+#define ISDN_USAGE_NONE       0
+#define ISDN_USAGE_RAW        1
+#define ISDN_USAGE_MODEM      2
+#define ISDN_USAGE_NET        3
+#define ISDN_USAGE_VOICE      4
+#define ISDN_USAGE_FAX        5
+#define ISDN_USAGE_MASK       7 /* Mask to get plain usage */
+#define ISDN_USAGE_DISABLED  32 /* This bit is set, if channel is disabled */
+#define ISDN_USAGE_EXCLUSIVE 64 /* This bit is set, if channel is exclusive */
+#define ISDN_USAGE_OUTGOING 128 /* This bit is set, if channel is outgoing  */
+
+#define ISDN_MODEM_NUMREG    24        /* Number of Modem-Registers        */
+#define ISDN_LMSNLEN         255 /* Length of tty's Listen-MSN string */
+#define ISDN_CMSGLEN         50  /* Length of CONNECT-Message to add for Modem */
+
+#define ISDN_MSNLEN          32
+#define NET_DV 0x06  /* Data version for isdn_net_ioctl_cfg   */
+#define TTY_DV 0x06  /* Data version for iprofd etc.          */
+
+#define INF_DV 0x01  /* Data version for /dev/isdninfo        */
+
+typedef struct {
+  char drvid[25];
+  unsigned long arg;
+} isdn_ioctl_struct;
+
+typedef struct {
+  char name[10];
+  char phone[ISDN_MSNLEN];
+  int  outgoing;
+} isdn_net_ioctl_phone;
+
+typedef struct {
+  char name[10];     /* Name of interface                     */
+  char master[10];   /* Name of Master for Bundling           */
+  char slave[10];    /* Name of Slave for Bundling            */
+  char eaz[256];     /* EAZ/MSN                               */
+  char drvid[25];    /* DriverId for Bindings                 */
+  int  onhtime;      /* Hangup-Timeout                        */
+  int  charge;       /* Charge-Units                          */
+  int  l2_proto;     /* Layer-2 protocol                      */
+  int  l3_proto;     /* Layer-3 protocol                      */
+  int  p_encap;      /* Encapsulation                         */
+  int  exclusive;    /* Channel, if bound exclusive           */
+  int  dialmax;      /* Dial Retry-Counter                    */
+  int  slavedelay;   /* Delay until slave starts up           */
+  int  cbdelay;      /* Delay before Callback                 */
+  int  chargehup;    /* Flag: Charge-Hangup                   */
+  int  ihup;         /* Flag: Hangup-Timeout on incoming line */
+  int  secure;       /* Flag: Secure                          */
+  int  callback;     /* Flag: Callback                        */
+  int  cbhup;        /* Flag: Reject Call before Callback     */
+  int  pppbind;      /* ippp device for bindings              */
+  int  chargeint;    /* Use fixed charge interval length      */
+  int  triggercps;   /* BogoCPS needed for triggering slave   */
+  int  dialtimeout;  /* Dial-Timeout                          */
+  int  dialwait;     /* Time to wait after failed dial        */
+  int  dialmode;     /* Flag: off / on / auto                 */
+} isdn_net_ioctl_cfg;
+
+#define ISDN_NET_DIALMODE_MASK  0xC0    /* bits for status                */
+#define ISDN_NET_DM_OFF         0x00    /* this interface is stopped      */
+#define ISDN_NET_DM_MANUAL      0x40    /* this interface is on (manual)  */
+#define ISDN_NET_DM_AUTO        0x80    /* this interface is autodial     */
+#define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK)
+
+
+#endif /* _UAPI__ISDN_H__ */
diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild
index aafaa5aa54d4..89e52850bf29 100644
--- a/include/uapi/linux/isdn/Kbuild
+++ b/include/uapi/linux/isdn/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += capicmd.h
diff --git a/include/linux/isdn/capicmd.h b/include/uapi/linux/isdn/capicmd.h
index b58635f722da..b58635f722da 100644
--- a/include/linux/isdn/capicmd.h
+++ b/include/uapi/linux/isdn/capicmd.h
diff --git a/include/uapi/linux/isdn_divertif.h b/include/uapi/linux/isdn_divertif.h
new file mode 100644
index 000000000000..3e3c2d898416
--- /dev/null
+++ b/include/uapi/linux/isdn_divertif.h
@@ -0,0 +1,30 @@
+/* $Id: isdn_divertif.h,v 1.4.6.1 2001/09/23 22:25:05 kai Exp $
+ *
+ * Header for the diversion supplementary interface for i4l.
+ *
+ * Author    Werner Cornelius (werner@titro.de)
+ * Copyright by Werner Cornelius (werner@titro.de)
+ *
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ */
+
+#ifndef _UAPI_LINUX_ISDN_DIVERTIF_H
+#define _UAPI_LINUX_ISDN_DIVERTIF_H
+
+/***********************************************************/
+/* magic value is also used to control version information */
+/***********************************************************/
+#define DIVERT_IF_MAGIC 0x25873401
+#define DIVERT_CMD_REG  0x00  /* register command */
+#define DIVERT_CMD_REL  0x01  /* release command */
+#define DIVERT_NO_ERR   0x00  /* return value no error */
+#define DIVERT_CMD_ERR  0x01  /* invalid cmd */
+#define DIVERT_VER_ERR  0x02  /* magic/version invalid */
+#define DIVERT_REG_ERR  0x03  /* module already registered */
+#define DIVERT_REL_ERR  0x04  /* module not registered */
+#define DIVERT_REG_NAME isdn_register_divert
+
+
+#endif /* _UAPI_LINUX_ISDN_DIVERTIF_H */
diff --git a/include/uapi/linux/isdn_ppp.h b/include/uapi/linux/isdn_ppp.h
new file mode 100644
index 000000000000..e7d7bd2aed3f
--- /dev/null
+++ b/include/uapi/linux/isdn_ppp.h
@@ -0,0 +1,67 @@
+/* Linux ISDN subsystem, sync PPP, interface to ipppd
+ *
+ * Copyright 1994-1999  by Fritz Elfert (fritz@isdn4linux.de)
+ * Copyright 1995,96    Thinking Objects Software GmbH Wuerzburg
+ * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
+ * Copyright 2000-2002  by Kai Germaschewski (kai@germaschewski.name)
+ *
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ */
+
+#ifndef _UAPI_LINUX_ISDN_PPP_H
+#define _UAPI_LINUX_ISDN_PPP_H
+
+#define CALLTYPE_INCOMING 0x1
+#define CALLTYPE_OUTGOING 0x2
+#define CALLTYPE_CALLBACK 0x4
+
+#define IPPP_VERSION    "2.2.0"
+
+struct pppcallinfo
+{
+  int calltype;
+  unsigned char local_num[64];
+  unsigned char remote_num[64];
+  int charge_units;
+};
+
+#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo)
+#define PPPIOCBUNDLE   _IOW('t',129,int)
+#define PPPIOCGMPFLAGS _IOR('t',130,int)
+#define PPPIOCSMPFLAGS _IOW('t',131,int)
+#define PPPIOCSMPMTU   _IOW('t',132,int)
+#define PPPIOCSMPMRU   _IOW('t',133,int)
+#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long [8])
+#define PPPIOCSCOMPRESSOR _IOW('t',135,int)
+#define PPPIOCGIFNAME      _IOR('t',136, char [IFNAMSIZ] )
+
+
+#define SC_MP_PROT       0x00000200
+#define SC_REJ_MP_PROT   0x00000400
+#define SC_OUT_SHORT_SEQ 0x00000800
+#define SC_IN_SHORT_SEQ  0x00004000
+
+#define SC_DECOMP_ON            0x01
+#define SC_COMP_ON              0x02
+#define SC_DECOMP_DISCARD       0x04
+#define SC_COMP_DISCARD         0x08
+#define SC_LINK_DECOMP_ON       0x10
+#define SC_LINK_COMP_ON         0x20
+#define SC_LINK_DECOMP_DISCARD  0x40
+#define SC_LINK_COMP_DISCARD    0x80
+
+#define ISDN_PPP_COMP_MAX_OPTIONS 16
+
+#define IPPP_COMP_FLAG_XMIT 0x1
+#define IPPP_COMP_FLAG_LINK 0x2
+
+struct isdn_ppp_comp_data {
+  int num;
+  unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS];
+  int optlen;
+  int flags;
+};
+
+#endif /* _UAPI_LINUX_ISDN_PPP_H */
diff --git a/include/uapi/linux/isdnif.h b/include/uapi/linux/isdnif.h
new file mode 100644
index 000000000000..246138c01c4d
--- /dev/null
+++ b/include/uapi/linux/isdnif.h
@@ -0,0 +1,56 @@
+/* $Id: isdnif.h,v 1.43.2.2 2004/01/12 23:08:35 keil Exp $
+ *
+ * Linux ISDN subsystem
+ * Definition of the interface between the subsystem and its low-level drivers.
+ *
+ * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
+ * Copyright 1995,96    Thinking Objects Software GmbH Wuerzburg
+ * 
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ */
+
+#ifndef _UAPI__ISDNIF_H__
+#define _UAPI__ISDNIF_H__
+
+
+/*
+ * Values for general protocol-selection
+ */
+#define ISDN_PTYPE_UNKNOWN   0   /* Protocol undefined   */
+#define ISDN_PTYPE_1TR6      1   /* german 1TR6-protocol */
+#define ISDN_PTYPE_EURO      2   /* EDSS1-protocol       */
+#define ISDN_PTYPE_LEASED    3   /* for leased lines     */
+#define ISDN_PTYPE_NI1       4   /* US NI-1 protocol     */
+#define ISDN_PTYPE_MAX       7   /* Max. 8 Protocols     */
+
+/*
+ * Values for Layer-2-protocol-selection
+ */
+#define ISDN_PROTO_L2_X75I   0   /* X75/LAPB with I-Frames            */
+#define ISDN_PROTO_L2_X75UI  1   /* X75/LAPB with UI-Frames           */
+#define ISDN_PROTO_L2_X75BUI 2   /* X75/LAPB with UI-Frames           */
+#define ISDN_PROTO_L2_HDLC   3   /* HDLC                              */
+#define ISDN_PROTO_L2_TRANS  4   /* Transparent (Voice)               */
+#define ISDN_PROTO_L2_X25DTE 5   /* X25/LAPB DTE mode                 */
+#define ISDN_PROTO_L2_X25DCE 6   /* X25/LAPB DCE mode                 */
+#define ISDN_PROTO_L2_V11096 7   /* V.110 bitrate adaption 9600 Baud  */
+#define ISDN_PROTO_L2_V11019 8   /* V.110 bitrate adaption 19200 Baud */
+#define ISDN_PROTO_L2_V11038 9   /* V.110 bitrate adaption 38400 Baud */
+#define ISDN_PROTO_L2_MODEM  10  /* Analog Modem on Board */
+#define ISDN_PROTO_L2_FAX    11  /* Fax Group 2/3         */
+#define ISDN_PROTO_L2_HDLC_56K 12   /* HDLC 56k                          */
+#define ISDN_PROTO_L2_MAX    15  /* Max. 16 Protocols                 */
+
+/*
+ * Values for Layer-3-protocol-selection
+ */
+#define ISDN_PROTO_L3_TRANS     0       /* Transparent */
+#define ISDN_PROTO_L3_TRANSDSP  1       /* Transparent with DSP */
+#define ISDN_PROTO_L3_FCLASS2   2       /* Fax Group 2/3 CLASS 2 */
+#define ISDN_PROTO_L3_FCLASS1   3       /* Fax Group 2/3 CLASS 1 */
+#define ISDN_PROTO_L3_MAX       7       /* Max. 8 Protocols */
+
+
+#endif /* _UAPI__ISDNIF_H__ */
diff --git a/include/linux/iso_fs.h b/include/uapi/linux/iso_fs.h
index 4688ac4284e2..4688ac4284e2 100644
--- a/include/linux/iso_fs.h
+++ b/include/uapi/linux/iso_fs.h
diff --git a/include/linux/ivtv.h b/include/uapi/linux/ivtv.h
index 42bf725751af..42bf725751af 100644
--- a/include/linux/ivtv.h
+++ b/include/uapi/linux/ivtv.h
diff --git a/include/linux/ivtvfb.h b/include/uapi/linux/ivtvfb.h
index e8b92f67f10d..e8b92f67f10d 100644
--- a/include/linux/ivtvfb.h
+++ b/include/uapi/linux/ivtvfb.h
diff --git a/include/linux/ixjuser.h b/include/uapi/linux/ixjuser.h
index 94ab5e942e53..94ab5e942e53 100644
--- a/include/linux/ixjuser.h
+++ b/include/uapi/linux/ixjuser.h
diff --git a/include/linux/jffs2.h b/include/uapi/linux/jffs2.h
index a18b719f49d4..a18b719f49d4 100644
--- a/include/linux/jffs2.h
+++ b/include/uapi/linux/jffs2.h
diff --git a/include/uapi/linux/joystick.h b/include/uapi/linux/joystick.h
new file mode 100644
index 000000000000..b856fd11c70e
--- /dev/null
+++ b/include/uapi/linux/joystick.h
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (C) 1996-2000 Vojtech Pavlik
+ *
+ *  Sponsored by SuSE
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
+ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
+ */
+#ifndef _UAPI_LINUX_JOYSTICK_H
+#define _UAPI_LINUX_JOYSTICK_H
+
+
+
+#include <linux/types.h>
+#include <linux/input.h>
+
+/*
+ * Version
+ */
+
+#define JS_VERSION              0x020100
+
+/*
+ * Types and constants for reading from /dev/js
+ */
+
+#define JS_EVENT_BUTTON         0x01    /* button pressed/released */
+#define JS_EVENT_AXIS           0x02    /* joystick moved */
+#define JS_EVENT_INIT           0x80    /* initial state of device */
+
+struct js_event {
+        __u32 time;     /* event timestamp in milliseconds */
+        __s16 value;    /* value */
+        __u8 type;      /* event type */
+        __u8 number;    /* axis/button number */
+};
+
+/*
+ * IOCTL commands for joystick driver
+ */
+
+#define JSIOCGVERSION           _IOR('j', 0x01, __u32)                          /* get driver version */
+
+#define JSIOCGAXES              _IOR('j', 0x11, __u8)                           /* get number of axes */
+#define JSIOCGBUTTONS           _IOR('j', 0x12, __u8)                           /* get number of buttons */
+#define JSIOCGNAME(len)         _IOC(_IOC_READ, 'j', 0x13, len)                 /* get identifier string */
+
+#define JSIOCSCORR              _IOW('j', 0x21, struct js_corr)                 /* set correction values */
+#define JSIOCGCORR              _IOR('j', 0x22, struct js_corr)                 /* get correction values */
+
+#define JSIOCSAXMAP             _IOW('j', 0x31, __u8[ABS_CNT])                  /* set axis mapping */
+#define JSIOCGAXMAP             _IOR('j', 0x32, __u8[ABS_CNT])                  /* get axis mapping */
+#define JSIOCSBTNMAP            _IOW('j', 0x33, __u16[KEY_MAX - BTN_MISC + 1])  /* set button mapping */
+#define JSIOCGBTNMAP            _IOR('j', 0x34, __u16[KEY_MAX - BTN_MISC + 1])  /* get button mapping */
+
+/*
+ * Types and constants for get/set correction
+ */
+
+#define JS_CORR_NONE            0x00    /* returns raw values */
+#define JS_CORR_BROKEN          0x01    /* broken line */
+
+struct js_corr {
+        __s32 coef[8];
+        __s16 prec;
+        __u16 type;
+};
+
+/*
+ * v0.x compatibility definitions
+ */
+
+#define JS_RETURN               sizeof(struct JS_DATA_TYPE)
+#define JS_TRUE                 1
+#define JS_FALSE                0
+#define JS_X_0                  0x01
+#define JS_Y_0                  0x02
+#define JS_X_1                  0x04
+#define JS_Y_1                  0x08
+#define JS_MAX                  2
+
+#define JS_DEF_TIMEOUT          0x1300
+#define JS_DEF_CORR             0
+#define JS_DEF_TIMELIMIT        10L
+
+#define JS_SET_CAL              1
+#define JS_GET_CAL              2
+#define JS_SET_TIMEOUT          3
+#define JS_GET_TIMEOUT          4
+#define JS_SET_TIMELIMIT        5
+#define JS_GET_TIMELIMIT        6
+#define JS_GET_ALL              7
+#define JS_SET_ALL              8
+
+struct JS_DATA_TYPE {
+        __s32 buttons;
+        __s32 x;
+        __s32 y;
+};
+
+struct JS_DATA_SAVE_TYPE_32 {
+        __s32 JS_TIMEOUT;
+        __s32 BUSY;
+        __s32 JS_EXPIRETIME;
+        __s32 JS_TIMELIMIT;
+        struct JS_DATA_TYPE JS_SAVE;
+        struct JS_DATA_TYPE JS_CORR;
+};
+
+struct JS_DATA_SAVE_TYPE_64 {
+        __s32 JS_TIMEOUT;
+        __s32 BUSY;
+        __s64 JS_EXPIRETIME;
+        __s64 JS_TIMELIMIT;
+        struct JS_DATA_TYPE JS_SAVE;
+        struct JS_DATA_TYPE JS_CORR;
+};
+
+
+#endif /* _UAPI_LINUX_JOYSTICK_H */
diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
new file mode 100644
index 000000000000..87b7cc439d7c
--- /dev/null
+++ b/include/uapi/linux/kd.h
@@ -0,0 +1,183 @@
+#ifndef _UAPI_LINUX_KD_H
+#define _UAPI_LINUX_KD_H
+#include <linux/types.h>
+#include <linux/compiler.h>
+
+/* 0x4B is 'K', to avoid collision with termios and vt */
+
+#define GIO_FONT        0x4B60  /* gets font in expanded form */
+#define PIO_FONT        0x4B61  /* use font in expanded form */
+
+#define GIO_FONTX       0x4B6B  /* get font using struct consolefontdesc */
+#define PIO_FONTX       0x4B6C  /* set font using struct consolefontdesc */
+struct consolefontdesc {
+        unsigned short charcount;       /* characters in font (256 or 512) */
+        unsigned short charheight;      /* scan lines per character (1-32) */
+        char __user *chardata;          /* font data in expanded form */
+};
+
+#define PIO_FONTRESET   0x4B6D  /* reset to default font */
+
+#define GIO_CMAP        0x4B70  /* gets colour palette on VGA+ */
+#define PIO_CMAP        0x4B71  /* sets colour palette on VGA+ */
+
+#define KIOCSOUND       0x4B2F  /* start sound generation (0 for off) */
+#define KDMKTONE        0x4B30  /* generate tone */
+
+#define KDGETLED        0x4B31  /* return current led state */
+#define KDSETLED        0x4B32  /* set led state [lights, not flags] */
+#define         LED_SCR         0x01    /* scroll lock led */
+#define         LED_NUM         0x02    /* num lock led */
+#define         LED_CAP         0x04    /* caps lock led */
+
+#define KDGKBTYPE       0x4B33  /* get keyboard type */
+#define         KB_84           0x01
+#define         KB_101          0x02    /* this is what we always answer */
+#define         KB_OTHER        0x03
+
+#define KDADDIO         0x4B34  /* add i/o port as valid */
+#define KDDELIO         0x4B35  /* del i/o port as valid */
+#define KDENABIO        0x4B36  /* enable i/o to video board */
+#define KDDISABIO       0x4B37  /* disable i/o to video board */
+
+#define KDSETMODE       0x4B3A  /* set text/graphics mode */
+#define         KD_TEXT         0x00
+#define         KD_GRAPHICS     0x01
+#define         KD_TEXT0        0x02    /* obsolete */
+#define         KD_TEXT1        0x03    /* obsolete */
+#define KDGETMODE       0x4B3B  /* get current mode */
+
+#define KDMAPDISP       0x4B3C  /* map display into address space */
+#define KDUNMAPDISP     0x4B3D  /* unmap display from address space */
+
+typedef char scrnmap_t;
+#define         E_TABSZ         256
+#define GIO_SCRNMAP     0x4B40  /* get screen mapping from kernel */
+#define PIO_SCRNMAP     0x4B41  /* put screen mapping table in kernel */
+#define GIO_UNISCRNMAP  0x4B69  /* get full Unicode screen mapping */
+#define PIO_UNISCRNMAP  0x4B6A  /* set full Unicode screen mapping */
+
+#define GIO_UNIMAP      0x4B66  /* get unicode-to-font mapping from kernel */
+struct unipair {
+        unsigned short unicode;
+        unsigned short fontpos;
+};
+struct unimapdesc {
+        unsigned short entry_ct;
+        struct unipair __user *entries;
+};
+#define PIO_UNIMAP      0x4B67  /* put unicode-to-font mapping in kernel */
+#define PIO_UNIMAPCLR   0x4B68  /* clear table, possibly advise hash algorithm */
+struct unimapinit {
+        unsigned short advised_hashsize;  /* 0 if no opinion */
+        unsigned short advised_hashstep;  /* 0 if no opinion */
+        unsigned short advised_hashlevel; /* 0 if no opinion */
+};
+
+#define UNI_DIRECT_BASE 0xF000  /* start of Direct Font Region */
+#define UNI_DIRECT_MASK 0x01FF  /* Direct Font Region bitmask */
+
+#define         K_RAW           0x00
+#define         K_XLATE         0x01
+#define         K_MEDIUMRAW     0x02
+#define         K_UNICODE       0x03
+#define         K_OFF           0x04
+#define KDGKBMODE       0x4B44  /* gets current keyboard mode */
+#define KDSKBMODE       0x4B45  /* sets current keyboard mode */
+
+#define         K_METABIT       0x03
+#define         K_ESCPREFIX     0x04
+#define KDGKBMETA       0x4B62  /* gets meta key handling mode */
+#define KDSKBMETA       0x4B63  /* sets meta key handling mode */
+
+#define         K_SCROLLLOCK    0x01
+#define         K_NUMLOCK       0x02
+#define         K_CAPSLOCK      0x04
+#define KDGKBLED        0x4B64  /* get led flags (not lights) */
+#define KDSKBLED        0x4B65  /* set led flags (not lights) */
+
+struct kbentry {
+        unsigned char kb_table;
+        unsigned char kb_index;
+        unsigned short kb_value;
+};
+#define         K_NORMTAB       0x00
+#define         K_SHIFTTAB      0x01
+#define         K_ALTTAB        0x02
+#define         K_ALTSHIFTTAB   0x03
+
+#define KDGKBENT        0x4B46  /* gets one entry in translation table */
+#define KDSKBENT        0x4B47  /* sets one entry in translation table */
+
+struct kbsentry {
+        unsigned char kb_func;
+        unsigned char kb_string[512];
+};
+#define KDGKBSENT       0x4B48  /* gets one function key string entry */
+#define KDSKBSENT       0x4B49  /* sets one function key string entry */
+
+struct kbdiacr {
+        unsigned char diacr, base, result;
+};
+struct kbdiacrs {
+        unsigned int kb_cnt;    /* number of entries in following array */
+        struct kbdiacr kbdiacr[256];    /* MAX_DIACR from keyboard.h */
+};
+#define KDGKBDIACR      0x4B4A  /* read kernel accent table */
+#define KDSKBDIACR      0x4B4B  /* write kernel accent table */
+
+struct kbdiacruc {
+        unsigned int diacr, base, result;
+};
+struct kbdiacrsuc {
+        unsigned int kb_cnt;    /* number of entries in following array */
+        struct kbdiacruc kbdiacruc[256];    /* MAX_DIACR from keyboard.h */
+};
+#define KDGKBDIACRUC    0x4BFA  /* read kernel accent table - UCS */
+#define KDSKBDIACRUC    0x4BFB  /* write kernel accent table - UCS */
+
+struct kbkeycode {
+        unsigned int scancode, keycode;
+};
+#define KDGETKEYCODE    0x4B4C  /* read kernel keycode table entry */
+#define KDSETKEYCODE    0x4B4D  /* write kernel keycode table entry */
+
+#define KDSIGACCEPT     0x4B4E  /* accept kbd generated signals */
+
+struct kbd_repeat {
+        int delay;      /* in msec; <= 0: don't change */
+        int period;     /* in msec; <= 0: don't change */
+                        /* earlier this field was misnamed "rate" */
+};
+
+#define KDKBDREP        0x4B52  /* set keyboard delay/repeat rate;
+                                 * actually used values are returned */
+
+#define KDFONTOP        0x4B72  /* font operations */
+
+struct console_font_op {
+        unsigned int op;        /* operation code KD_FONT_OP_* */
+        unsigned int flags;     /* KD_FONT_FLAG_* */
+        unsigned int width, height;     /* font size */
+        unsigned int charcount;
+        unsigned char __user *data;     /* font data with height fixed to 32 */
+};
+
+struct console_font {
+        unsigned int width, height;     /* font size */
+        unsigned int charcount;
+        unsigned char *data;    /* font data with height fixed to 32 */
+};
+
+#define KD_FONT_OP_SET          0       /* Set font */
+#define KD_FONT_OP_GET          1       /* Get font */
+#define KD_FONT_OP_SET_DEFAULT  2       /* Set font to default, data points to name / NULL */
+#define KD_FONT_OP_COPY         3       /* Copy from another console */
+
+#define KD_FONT_FLAG_DONT_RECALC        1       /* Don't recalculate hw charcell size [compat] */
+
+/* note: 0x4B00-0x4B4E all have had a value at some time;
+   don't reuse for the time being */
+/* note: 0x4B60-0x4B6D, 0x4B70-0x4B72 used above */
+
+#endif /* _UAPI_LINUX_KD_H */
diff --git a/include/uapi/linux/kdev_t.h b/include/uapi/linux/kdev_t.h
new file mode 100644
index 000000000000..0d881fa7eb9c
--- /dev/null
+++ b/include/uapi/linux/kdev_t.h
@@ -0,0 +1,13 @@
+#ifndef _UAPI_LINUX_KDEV_T_H
+#define _UAPI_LINUX_KDEV_T_H
+#ifndef __KERNEL__
+
+/*
+Some programs want their definitions of MAJOR and MINOR and MKDEV
+from the kernel sources. These must be the externally visible ones.
+*/
+#define MAJOR(dev)      ((dev)>>8)
+#define MINOR(dev)      ((dev) & 0xff)
+#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
+#endif /* __KERNEL__ */
+#endif /* _UAPI_LINUX_KDEV_T_H */
diff --git a/include/uapi/linux/kernel-page-flags.h b/include/uapi/linux/kernel-page-flags.h
new file mode 100644
index 000000000000..5116a0e48172
--- /dev/null
+++ b/include/uapi/linux/kernel-page-flags.h
@@ -0,0 +1,36 @@
+#ifndef _UAPILINUX_KERNEL_PAGE_FLAGS_H
+#define _UAPILINUX_KERNEL_PAGE_FLAGS_H
+
+/*
+ * Stable page flag bits exported to user space
+ */
+
+#define KPF_LOCKED              0
+#define KPF_ERROR               1
+#define KPF_REFERENCED          2
+#define KPF_UPTODATE            3
+#define KPF_DIRTY               4
+#define KPF_LRU                 5
+#define KPF_ACTIVE              6
+#define KPF_SLAB                7
+#define KPF_WRITEBACK           8
+#define KPF_RECLAIM             9
+#define KPF_BUDDY               10
+
+/* 11-20: new additions in 2.6.31 */
+#define KPF_MMAP                11
+#define KPF_ANON                12
+#define KPF_SWAPCACHE           13
+#define KPF_SWAPBACKED          14
+#define KPF_COMPOUND_HEAD       15
+#define KPF_COMPOUND_TAIL       16
+#define KPF_HUGE                17
+#define KPF_UNEVICTABLE         18
+#define KPF_HWPOISON            19
+#define KPF_NOPAGE              20
+
+#define KPF_KSM                 21
+#define KPF_THP                 22
+
+
+#endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
new file mode 100644
index 000000000000..321e399457f5
--- /dev/null
+++ b/include/uapi/linux/kernel.h
@@ -0,0 +1,13 @@
+#ifndef _UAPI_LINUX_KERNEL_H
+#define _UAPI_LINUX_KERNEL_H
+
+#include <linux/sysinfo.h>
+
+/*
+ * 'kernel.h' contains some often-used function prototypes etc
+ */
+#define __ALIGN_KERNEL(x, a)            __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
+#define __ALIGN_KERNEL_MASK(x, mask)    (((x) + (mask)) & ~(mask))
+
+
+#endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/include/uapi/linux/kernelcapi.h b/include/uapi/linux/kernelcapi.h
new file mode 100644
index 000000000000..89bf40d36d2a
--- /dev/null
+++ b/include/uapi/linux/kernelcapi.h
@@ -0,0 +1,47 @@
+/*
+ * $Id: kernelcapi.h,v 1.8.6.2 2001/02/07 11:31:31 kai Exp $
+ * 
+ * Kernel CAPI 2.0 Interface for Linux
+ * 
+ * (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
+ * 
+ */
+
+#ifndef _UAPI__KERNELCAPI_H__
+#define _UAPI__KERNELCAPI_H__
+
+#define CAPI_MAXAPPL    240     /* maximum number of applications  */
+#define CAPI_MAXCONTR   32      /* maximum number of controller    */
+#define CAPI_MAXDATAWINDOW      8
+
+
+typedef struct kcapi_flagdef {
+        int contr;
+        int flag;
+} kcapi_flagdef;
+
+typedef struct kcapi_carddef {
+        char            driver[32];
+        unsigned int    port;
+        unsigned        irq;
+        unsigned int    membase;
+        int             cardnr;
+} kcapi_carddef;
+
+/* new ioctls >= 10 */
+#define KCAPI_CMD_TRACE         10
+#define KCAPI_CMD_ADDCARD       11      /* OBSOLETE */
+
+/* 
+ * flag > 2 => trace also data
+ * flag & 1 => show trace
+ */
+#define KCAPI_TRACE_OFF                 0
+#define KCAPI_TRACE_SHORT_NO_DATA       1
+#define KCAPI_TRACE_FULL_NO_DATA        2
+#define KCAPI_TRACE_SHORT               3
+#define KCAPI_TRACE_FULL                4
+
+
+
+#endif /* _UAPI__KERNELCAPI_H__ */
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
new file mode 100644
index 000000000000..104838f65bc1
--- /dev/null
+++ b/include/uapi/linux/kexec.h
@@ -0,0 +1,54 @@
+#ifndef _UAPILINUX_KEXEC_H
+#define _UAPILINUX_KEXEC_H
+
+/* kexec system call -  It loads the new kernel to boot into.
+ * kexec does not sync, or unmount filesystems so if you need
+ * that to happen you need to do that yourself.
+ */
+
+#include <linux/types.h>
+
+/* kexec flags for different usage scenarios */
+#define KEXEC_ON_CRASH          0x00000001
+#define KEXEC_PRESERVE_CONTEXT  0x00000002
+#define KEXEC_ARCH_MASK         0xffff0000
+
+/* These values match the ELF architecture values.
+ * Unless there is a good reason that should continue to be the case.
+ */
+#define KEXEC_ARCH_DEFAULT ( 0 << 16)
+#define KEXEC_ARCH_386     ( 3 << 16)
+#define KEXEC_ARCH_X86_64  (62 << 16)
+#define KEXEC_ARCH_PPC     (20 << 16)
+#define KEXEC_ARCH_PPC64   (21 << 16)
+#define KEXEC_ARCH_IA_64   (50 << 16)
+#define KEXEC_ARCH_ARM     (40 << 16)
+#define KEXEC_ARCH_S390    (22 << 16)
+#define KEXEC_ARCH_SH      (42 << 16)
+#define KEXEC_ARCH_MIPS_LE (10 << 16)
+#define KEXEC_ARCH_MIPS    ( 8 << 16)
+
+/* The artificial cap on the number of segments passed to kexec_load. */
+#define KEXEC_SEGMENT_MAX 16
+
+#ifndef __KERNEL__
+/*
+ * This structure is used to hold the arguments that are used when
+ * loading  kernel binaries.
+ */
+struct kexec_segment {
+        const void *buf;
+        size_t bufsz;
+        const void *mem;
+        size_t memsz;
+};
+
+/* Load a new kernel image as described by the kexec_segment array
+ * consisting of passed number of segments at the entry-point address.
+ * The flags allow different useage types.
+ */
+extern int kexec_load(void *, size_t, struct kexec_segment *,
+                unsigned long int);
+#endif /* __KERNEL__ */
+
+#endif /* _UAPILINUX_KEXEC_H */
diff --git a/include/uapi/linux/keyboard.h b/include/uapi/linux/keyboard.h
new file mode 100644
index 000000000000..5a6849721ab6
--- /dev/null
+++ b/include/uapi/linux/keyboard.h
@@ -0,0 +1,443 @@
+#ifndef _UAPI__LINUX_KEYBOARD_H
+#define _UAPI__LINUX_KEYBOARD_H
+
+#include <linux/wait.h>
+
+#define KG_SHIFT        0
+#define KG_CTRL         2
+#define KG_ALT          3
+#define KG_ALTGR        1
+#define KG_SHIFTL       4
+#define KG_KANASHIFT    4
+#define KG_SHIFTR       5
+#define KG_CTRLL        6
+#define KG_CTRLR        7
+#define KG_CAPSSHIFT    8
+
+#define NR_SHIFT        9
+
+#define NR_KEYS         256
+#define MAX_NR_KEYMAPS  256
+/* This means 128Kb if all keymaps are allocated. Only the superuser
+        may increase the number of keymaps beyond MAX_NR_OF_USER_KEYMAPS. */
+#define MAX_NR_OF_USER_KEYMAPS 256      /* should be at least 7 */
+
+
+#define MAX_NR_FUNC     256     /* max nr of strings assigned to keys */
+
+#define KT_LATIN        0       /* we depend on this being zero */
+#define KT_LETTER       11      /* symbol that can be acted upon by CapsLock */
+#define KT_FN           1
+#define KT_SPEC         2
+#define KT_PAD          3
+#define KT_DEAD         4
+#define KT_CONS         5
+#define KT_CUR          6
+#define KT_SHIFT        7
+#define KT_META         8
+#define KT_ASCII        9
+#define KT_LOCK         10
+#define KT_SLOCK        12
+#define KT_DEAD2        13
+#define KT_BRL          14
+
+#define K(t,v)          (((t)<<8)|(v))
+#define KTYP(x)         ((x) >> 8)
+#define KVAL(x)         ((x) & 0xff)
+
+#define K_F1            K(KT_FN,0)
+#define K_F2            K(KT_FN,1)
+#define K_F3            K(KT_FN,2)
+#define K_F4            K(KT_FN,3)
+#define K_F5            K(KT_FN,4)
+#define K_F6            K(KT_FN,5)
+#define K_F7            K(KT_FN,6)
+#define K_F8            K(KT_FN,7)
+#define K_F9            K(KT_FN,8)
+#define K_F10           K(KT_FN,9)
+#define K_F11           K(KT_FN,10)
+#define K_F12           K(KT_FN,11)
+#define K_F13           K(KT_FN,12)
+#define K_F14           K(KT_FN,13)
+#define K_F15           K(KT_FN,14)
+#define K_F16           K(KT_FN,15)
+#define K_F17           K(KT_FN,16)
+#define K_F18           K(KT_FN,17)
+#define K_F19           K(KT_FN,18)
+#define K_F20           K(KT_FN,19)
+#define K_FIND          K(KT_FN,20)
+#define K_INSERT        K(KT_FN,21)
+#define K_REMOVE        K(KT_FN,22)
+#define K_SELECT        K(KT_FN,23)
+#define K_PGUP          K(KT_FN,24) /* PGUP is a synonym for PRIOR */
+#define K_PGDN          K(KT_FN,25) /* PGDN is a synonym for NEXT */
+#define K_MACRO         K(KT_FN,26)
+#define K_HELP          K(KT_FN,27)
+#define K_DO            K(KT_FN,28)
+#define K_PAUSE         K(KT_FN,29)
+#define K_F21           K(KT_FN,30)
+#define K_F22           K(KT_FN,31)
+#define K_F23           K(KT_FN,32)
+#define K_F24           K(KT_FN,33)
+#define K_F25           K(KT_FN,34)
+#define K_F26           K(KT_FN,35)
+#define K_F27           K(KT_FN,36)
+#define K_F28           K(KT_FN,37)
+#define K_F29           K(KT_FN,38)
+#define K_F30           K(KT_FN,39)
+#define K_F31           K(KT_FN,40)
+#define K_F32           K(KT_FN,41)
+#define K_F33           K(KT_FN,42)
+#define K_F34           K(KT_FN,43)
+#define K_F35           K(KT_FN,44)
+#define K_F36           K(KT_FN,45)
+#define K_F37           K(KT_FN,46)
+#define K_F38           K(KT_FN,47)
+#define K_F39           K(KT_FN,48)
+#define K_F40           K(KT_FN,49)
+#define K_F41           K(KT_FN,50)
+#define K_F42           K(KT_FN,51)
+#define K_F43           K(KT_FN,52)
+#define K_F44           K(KT_FN,53)
+#define K_F45           K(KT_FN,54)
+#define K_F46           K(KT_FN,55)
+#define K_F47           K(KT_FN,56)
+#define K_F48           K(KT_FN,57)
+#define K_F49           K(KT_FN,58)
+#define K_F50           K(KT_FN,59)
+#define K_F51           K(KT_FN,60)
+#define K_F52           K(KT_FN,61)
+#define K_F53           K(KT_FN,62)
+#define K_F54           K(KT_FN,63)
+#define K_F55           K(KT_FN,64)
+#define K_F56           K(KT_FN,65)
+#define K_F57           K(KT_FN,66)
+#define K_F58           K(KT_FN,67)
+#define K_F59           K(KT_FN,68)
+#define K_F60           K(KT_FN,69)
+#define K_F61           K(KT_FN,70)
+#define K_F62           K(KT_FN,71)
+#define K_F63           K(KT_FN,72)
+#define K_F64           K(KT_FN,73)
+#define K_F65           K(KT_FN,74)
+#define K_F66           K(KT_FN,75)
+#define K_F67           K(KT_FN,76)
+#define K_F68           K(KT_FN,77)
+#define K_F69           K(KT_FN,78)
+#define K_F70           K(KT_FN,79)
+#define K_F71           K(KT_FN,80)
+#define K_F72           K(KT_FN,81)
+#define K_F73           K(KT_FN,82)
+#define K_F74           K(KT_FN,83)
+#define K_F75           K(KT_FN,84)
+#define K_F76           K(KT_FN,85)
+#define K_F77           K(KT_FN,86)
+#define K_F78           K(KT_FN,87)
+#define K_F79           K(KT_FN,88)
+#define K_F80           K(KT_FN,89)
+#define K_F81           K(KT_FN,90)
+#define K_F82           K(KT_FN,91)
+#define K_F83           K(KT_FN,92)
+#define K_F84           K(KT_FN,93)
+#define K_F85           K(KT_FN,94)
+#define K_F86           K(KT_FN,95)
+#define K_F87           K(KT_FN,96)
+#define K_F88           K(KT_FN,97)
+#define K_F89           K(KT_FN,98)
+#define K_F90           K(KT_FN,99)
+#define K_F91           K(KT_FN,100)
+#define K_F92           K(KT_FN,101)
+#define K_F93           K(KT_FN,102)
+#define K_F94           K(KT_FN,103)
+#define K_F95           K(KT_FN,104)
+#define K_F96           K(KT_FN,105)
+#define K_F97           K(KT_FN,106)
+#define K_F98           K(KT_FN,107)
+#define K_F99           K(KT_FN,108)
+#define K_F100          K(KT_FN,109)
+#define K_F101          K(KT_FN,110)
+#define K_F102          K(KT_FN,111)
+#define K_F103          K(KT_FN,112)
+#define K_F104          K(KT_FN,113)
+#define K_F105          K(KT_FN,114)
+#define K_F106          K(KT_FN,115)
+#define K_F107          K(KT_FN,116)
+#define K_F108          K(KT_FN,117)
+#define K_F109          K(KT_FN,118)
+#define K_F110          K(KT_FN,119)
+#define K_F111          K(KT_FN,120)
+#define K_F112          K(KT_FN,121)
+#define K_F113          K(KT_FN,122)
+#define K_F114          K(KT_FN,123)
+#define K_F115          K(KT_FN,124)
+#define K_F116          K(KT_FN,125)
+#define K_F117          K(KT_FN,126)
+#define K_F118          K(KT_FN,127)
+#define K_F119          K(KT_FN,128)
+#define K_F120          K(KT_FN,129)
+#define K_F121          K(KT_FN,130)
+#define K_F122          K(KT_FN,131)
+#define K_F123          K(KT_FN,132)
+#define K_F124          K(KT_FN,133)
+#define K_F125          K(KT_FN,134)
+#define K_F126          K(KT_FN,135)
+#define K_F127          K(KT_FN,136)
+#define K_F128          K(KT_FN,137)
+#define K_F129          K(KT_FN,138)
+#define K_F130          K(KT_FN,139)
+#define K_F131          K(KT_FN,140)
+#define K_F132          K(KT_FN,141)
+#define K_F133          K(KT_FN,142)
+#define K_F134          K(KT_FN,143)
+#define K_F135          K(KT_FN,144)
+#define K_F136          K(KT_FN,145)
+#define K_F137          K(KT_FN,146)
+#define K_F138          K(KT_FN,147)
+#define K_F139          K(KT_FN,148)
+#define K_F140          K(KT_FN,149)
+#define K_F141          K(KT_FN,150)
+#define K_F142          K(KT_FN,151)
+#define K_F143          K(KT_FN,152)
+#define K_F144          K(KT_FN,153)
+#define K_F145          K(KT_FN,154)
+#define K_F146          K(KT_FN,155)
+#define K_F147          K(KT_FN,156)
+#define K_F148          K(KT_FN,157)
+#define K_F149          K(KT_FN,158)
+#define K_F150          K(KT_FN,159)
+#define K_F151          K(KT_FN,160)
+#define K_F152          K(KT_FN,161)
+#define K_F153          K(KT_FN,162)
+#define K_F154          K(KT_FN,163)
+#define K_F155          K(KT_FN,164)
+#define K_F156          K(KT_FN,165)
+#define K_F157          K(KT_FN,166)
+#define K_F158          K(KT_FN,167)
+#define K_F159          K(KT_FN,168)
+#define K_F160          K(KT_FN,169)
+#define K_F161          K(KT_FN,170)
+#define K_F162          K(KT_FN,171)
+#define K_F163          K(KT_FN,172)
+#define K_F164          K(KT_FN,173)
+#define K_F165          K(KT_FN,174)
+#define K_F166          K(KT_FN,175)
+#define K_F167          K(KT_FN,176)
+#define K_F168          K(KT_FN,177)
+#define K_F169          K(KT_FN,178)
+#define K_F170          K(KT_FN,179)
+#define K_F171          K(KT_FN,180)
+#define K_F172          K(KT_FN,181)
+#define K_F173          K(KT_FN,182)
+#define K_F174          K(KT_FN,183)
+#define K_F175          K(KT_FN,184)
+#define K_F176          K(KT_FN,185)
+#define K_F177          K(KT_FN,186)
+#define K_F178          K(KT_FN,187)
+#define K_F179          K(KT_FN,188)
+#define K_F180          K(KT_FN,189)
+#define K_F181          K(KT_FN,190)
+#define K_F182          K(KT_FN,191)
+#define K_F183          K(KT_FN,192)
+#define K_F184          K(KT_FN,193)
+#define K_F185          K(KT_FN,194)
+#define K_F186          K(KT_FN,195)
+#define K_F187          K(KT_FN,196)
+#define K_F188          K(KT_FN,197)
+#define K_F189          K(KT_FN,198)
+#define K_F190          K(KT_FN,199)
+#define K_F191          K(KT_FN,200)
+#define K_F192          K(KT_FN,201)
+#define K_F193          K(KT_FN,202)
+#define K_F194          K(KT_FN,203)
+#define K_F195          K(KT_FN,204)
+#define K_F196          K(KT_FN,205)
+#define K_F197          K(KT_FN,206)
+#define K_F198          K(KT_FN,207)
+#define K_F199          K(KT_FN,208)
+#define K_F200          K(KT_FN,209)
+#define K_F201          K(KT_FN,210)
+#define K_F202          K(KT_FN,211)
+#define K_F203          K(KT_FN,212)
+#define K_F204          K(KT_FN,213)
+#define K_F205          K(KT_FN,214)
+#define K_F206          K(KT_FN,215)
+#define K_F207          K(KT_FN,216)
+#define K_F208          K(KT_FN,217)
+#define K_F209          K(KT_FN,218)
+#define K_F210          K(KT_FN,219)
+#define K_F211          K(KT_FN,220)
+#define K_F212          K(KT_FN,221)
+#define K_F213          K(KT_FN,222)
+#define K_F214          K(KT_FN,223)
+#define K_F215          K(KT_FN,224)
+#define K_F216          K(KT_FN,225)
+#define K_F217          K(KT_FN,226)
+#define K_F218          K(KT_FN,227)
+#define K_F219          K(KT_FN,228)
+#define K_F220          K(KT_FN,229)
+#define K_F221          K(KT_FN,230)
+#define K_F222          K(KT_FN,231)
+#define K_F223          K(KT_FN,232)
+#define K_F224          K(KT_FN,233)
+#define K_F225          K(KT_FN,234)
+#define K_F226          K(KT_FN,235)
+#define K_F227          K(KT_FN,236)
+#define K_F228          K(KT_FN,237)
+#define K_F229          K(KT_FN,238)
+#define K_F230          K(KT_FN,239)
+#define K_F231          K(KT_FN,240)
+#define K_F232          K(KT_FN,241)
+#define K_F233          K(KT_FN,242)
+#define K_F234          K(KT_FN,243)
+#define K_F235          K(KT_FN,244)
+#define K_F236          K(KT_FN,245)
+#define K_F237          K(KT_FN,246)
+#define K_F238          K(KT_FN,247)
+#define K_F239          K(KT_FN,248)
+#define K_F240          K(KT_FN,249)
+#define K_F241          K(KT_FN,250)
+#define K_F242          K(KT_FN,251)
+#define K_F243          K(KT_FN,252)
+#define K_F244          K(KT_FN,253)
+#define K_F245          K(KT_FN,254)
+#define K_UNDO          K(KT_FN,255)
+
+
+#define K_HOLE          K(KT_SPEC,0)
+#define K_ENTER         K(KT_SPEC,1)
+#define K_SH_REGS       K(KT_SPEC,2)
+#define K_SH_MEM        K(KT_SPEC,3)
+#define K_SH_STAT       K(KT_SPEC,4)
+#define K_BREAK         K(KT_SPEC,5)
+#define K_CONS          K(KT_SPEC,6)
+#define K_CAPS          K(KT_SPEC,7)
+#define K_NUM           K(KT_SPEC,8)
+#define K_HOLD          K(KT_SPEC,9)
+#define K_SCROLLFORW    K(KT_SPEC,10)
+#define K_SCROLLBACK    K(KT_SPEC,11)
+#define K_BOOT          K(KT_SPEC,12)
+#define K_CAPSON        K(KT_SPEC,13)
+#define K_COMPOSE       K(KT_SPEC,14)
+#define K_SAK           K(KT_SPEC,15)
+#define K_DECRCONSOLE   K(KT_SPEC,16)
+#define K_INCRCONSOLE   K(KT_SPEC,17)
+#define K_SPAWNCONSOLE  K(KT_SPEC,18)
+#define K_BARENUMLOCK   K(KT_SPEC,19)
+
+#define K_ALLOCATED     K(KT_SPEC,126) /* dynamically allocated keymap */
+#define K_NOSUCHMAP     K(KT_SPEC,127) /* returned by KDGKBENT */
+
+#define K_P0            K(KT_PAD,0)
+#define K_P1            K(KT_PAD,1)
+#define K_P2            K(KT_PAD,2)
+#define K_P3            K(KT_PAD,3)
+#define K_P4            K(KT_PAD,4)
+#define K_P5            K(KT_PAD,5)
+#define K_P6            K(KT_PAD,6)
+#define K_P7            K(KT_PAD,7)
+#define K_P8            K(KT_PAD,8)
+#define K_P9            K(KT_PAD,9)
+#define K_PPLUS         K(KT_PAD,10)    /* key-pad plus */
+#define K_PMINUS        K(KT_PAD,11)    /* key-pad minus */
+#define K_PSTAR         K(KT_PAD,12)    /* key-pad asterisk (star) */
+#define K_PSLASH        K(KT_PAD,13)    /* key-pad slash */
+#define K_PENTER        K(KT_PAD,14)    /* key-pad enter */
+#define K_PCOMMA        K(KT_PAD,15)    /* key-pad comma: kludge... */
+#define K_PDOT          K(KT_PAD,16)    /* key-pad dot (period): kludge... */
+#define K_PPLUSMINUS    K(KT_PAD,17)    /* key-pad plus/minus */
+#define K_PPARENL       K(KT_PAD,18)    /* key-pad left parenthesis */
+#define K_PPARENR       K(KT_PAD,19)    /* key-pad right parenthesis */
+
+#define NR_PAD          20
+
+#define K_DGRAVE        K(KT_DEAD,0)
+#define K_DACUTE        K(KT_DEAD,1)
+#define K_DCIRCM        K(KT_DEAD,2)
+#define K_DTILDE        K(KT_DEAD,3)
+#define K_DDIERE        K(KT_DEAD,4)
+#define K_DCEDIL        K(KT_DEAD,5)
+
+#define NR_DEAD         6
+
+#define K_DOWN          K(KT_CUR,0)
+#define K_LEFT          K(KT_CUR,1)
+#define K_RIGHT         K(KT_CUR,2)
+#define K_UP            K(KT_CUR,3)
+
+#define K_SHIFT         K(KT_SHIFT,KG_SHIFT)
+#define K_CTRL          K(KT_SHIFT,KG_CTRL)
+#define K_ALT           K(KT_SHIFT,KG_ALT)
+#define K_ALTGR         K(KT_SHIFT,KG_ALTGR)
+#define K_SHIFTL        K(KT_SHIFT,KG_SHIFTL)
+#define K_SHIFTR        K(KT_SHIFT,KG_SHIFTR)
+#define K_CTRLL         K(KT_SHIFT,KG_CTRLL)
+#define K_CTRLR         K(KT_SHIFT,KG_CTRLR)
+#define K_CAPSSHIFT     K(KT_SHIFT,KG_CAPSSHIFT)
+
+#define K_ASC0          K(KT_ASCII,0)
+#define K_ASC1          K(KT_ASCII,1)
+#define K_ASC2          K(KT_ASCII,2)
+#define K_ASC3          K(KT_ASCII,3)
+#define K_ASC4          K(KT_ASCII,4)
+#define K_ASC5          K(KT_ASCII,5)
+#define K_ASC6          K(KT_ASCII,6)
+#define K_ASC7          K(KT_ASCII,7)
+#define K_ASC8          K(KT_ASCII,8)
+#define K_ASC9          K(KT_ASCII,9)
+#define K_HEX0          K(KT_ASCII,10)
+#define K_HEX1          K(KT_ASCII,11)
+#define K_HEX2          K(KT_ASCII,12)
+#define K_HEX3          K(KT_ASCII,13)
+#define K_HEX4          K(KT_ASCII,14)
+#define K_HEX5          K(KT_ASCII,15)
+#define K_HEX6          K(KT_ASCII,16)
+#define K_HEX7          K(KT_ASCII,17)
+#define K_HEX8          K(KT_ASCII,18)
+#define K_HEX9          K(KT_ASCII,19)
+#define K_HEXa          K(KT_ASCII,20)
+#define K_HEXb          K(KT_ASCII,21)
+#define K_HEXc          K(KT_ASCII,22)
+#define K_HEXd          K(KT_ASCII,23)
+#define K_HEXe          K(KT_ASCII,24)
+#define K_HEXf          K(KT_ASCII,25)
+
+#define NR_ASCII        26
+
+#define K_SHIFTLOCK     K(KT_LOCK,KG_SHIFT)
+#define K_CTRLLOCK      K(KT_LOCK,KG_CTRL)
+#define K_ALTLOCK       K(KT_LOCK,KG_ALT)
+#define K_ALTGRLOCK     K(KT_LOCK,KG_ALTGR)
+#define K_SHIFTLLOCK    K(KT_LOCK,KG_SHIFTL)
+#define K_SHIFTRLOCK    K(KT_LOCK,KG_SHIFTR)
+#define K_CTRLLLOCK     K(KT_LOCK,KG_CTRLL)
+#define K_CTRLRLOCK     K(KT_LOCK,KG_CTRLR)
+#define K_CAPSSHIFTLOCK K(KT_LOCK,KG_CAPSSHIFT)
+
+#define K_SHIFT_SLOCK   K(KT_SLOCK,KG_SHIFT)
+#define K_CTRL_SLOCK    K(KT_SLOCK,KG_CTRL)
+#define K_ALT_SLOCK     K(KT_SLOCK,KG_ALT)
+#define K_ALTGR_SLOCK   K(KT_SLOCK,KG_ALTGR)
+#define K_SHIFTL_SLOCK  K(KT_SLOCK,KG_SHIFTL)
+#define K_SHIFTR_SLOCK  K(KT_SLOCK,KG_SHIFTR)
+#define K_CTRLL_SLOCK   K(KT_SLOCK,KG_CTRLL)
+#define K_CTRLR_SLOCK   K(KT_SLOCK,KG_CTRLR)
+#define K_CAPSSHIFT_SLOCK       K(KT_SLOCK,KG_CAPSSHIFT)
+
+#define NR_LOCK         9
+
+#define K_BRL_BLANK     K(KT_BRL, 0)
+#define K_BRL_DOT1      K(KT_BRL, 1)
+#define K_BRL_DOT2      K(KT_BRL, 2)
+#define K_BRL_DOT3      K(KT_BRL, 3)
+#define K_BRL_DOT4      K(KT_BRL, 4)
+#define K_BRL_DOT5      K(KT_BRL, 5)
+#define K_BRL_DOT6      K(KT_BRL, 6)
+#define K_BRL_DOT7      K(KT_BRL, 7)
+#define K_BRL_DOT8      K(KT_BRL, 8)
+#define K_BRL_DOT9      K(KT_BRL, 9)
+#define K_BRL_DOT10     K(KT_BRL, 10)
+
+#define NR_BRL          11
+
+#define MAX_DIACR       256
+#endif /* _UAPI__LINUX_KEYBOARD_H */
diff --git a/include/linux/keyctl.h b/include/uapi/linux/keyctl.h
index c9b7f4faf97a..c9b7f4faf97a 100644
--- a/include/linux/keyctl.h
+++ b/include/uapi/linux/keyctl.h
diff --git a/include/linux/kvm.h b/include/uapi/linux/kvm.h
index 494a84c37c3e..494a84c37c3e 100644
--- a/include/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
diff --git a/include/uapi/linux/kvm_para.h b/include/uapi/linux/kvm_para.h
new file mode 100644
index 000000000000..cea2c5c72d26
--- /dev/null
+++ b/include/uapi/linux/kvm_para.h
@@ -0,0 +1,28 @@
+#ifndef _UAPI__LINUX_KVM_PARA_H
+#define _UAPI__LINUX_KVM_PARA_H
+
+/*
+ * This header file provides a method for making a hypercall to the host
+ * Architectures should define:
+ * - kvm_hypercall0, kvm_hypercall1...
+ * - kvm_arch_para_features
+ * - kvm_para_available
+ */
+
+/* Return values for hypercalls */
+#define KVM_ENOSYS              1000
+#define KVM_EFAULT              EFAULT
+#define KVM_E2BIG               E2BIG
+#define KVM_EPERM               EPERM
+
+#define KVM_HC_VAPIC_POLL_IRQ           1
+#define KVM_HC_MMU_OP                   2
+#define KVM_HC_FEATURES                 3
+#define KVM_HC_PPC_MAP_MAGIC_PAGE       4
+
+/*
+ * hypercalls use architecture specific
+ */
+#include <asm/kvm_para.h>
+
+#endif /* _UAPI__LINUX_KVM_PARA_H */
diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h
new file mode 100644
index 000000000000..8adb68160327
--- /dev/null
+++ b/include/uapi/linux/l2tp.h
@@ -0,0 +1,180 @@
+/*
+ * L2TP-over-IP socket for L2TPv3.
+ *
+ * Author: James Chapman <jchapman@katalix.com>
+ */
+
+#ifndef _UAPI_LINUX_L2TP_H_
+#define _UAPI_LINUX_L2TP_H_
+
+#include <linux/types.h>
+#include <linux/socket.h>
+#ifndef __KERNEL__
+#include <netinet/in.h>
+#endif
+
+#define IPPROTO_L2TP            115
+
+/**
+ * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets
+ * @l2tp_family:  address family number AF_L2TPIP.
+ * @l2tp_addr:    protocol specific address information
+ * @l2tp_conn_id: connection id of tunnel
+ */
+#define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
+struct sockaddr_l2tpip {
+        /* The first fields must match struct sockaddr_in */
+        __kernel_sa_family_t l2tp_family; /* AF_INET */
+        __be16          l2tp_unused;    /* INET port number (unused) */
+        struct in_addr  l2tp_addr;      /* Internet address */
+
+        __u32           l2tp_conn_id;   /* Connection ID of tunnel */
+
+        /* Pad to size of `struct sockaddr'. */
+        unsigned char   __pad[sizeof(struct sockaddr) -
+                              sizeof(__kernel_sa_family_t) -
+                              sizeof(__be16) - sizeof(struct in_addr) -
+                              sizeof(__u32)];
+};
+
+/**
+ * struct sockaddr_l2tpip6 - the sockaddr structure for L2TP-over-IPv6 sockets
+ * @l2tp_family:  address family number AF_L2TPIP.
+ * @l2tp_addr:    protocol specific address information
+ * @l2tp_conn_id: connection id of tunnel
+ */
+struct sockaddr_l2tpip6 {
+        /* The first fields must match struct sockaddr_in6 */
+        __kernel_sa_family_t l2tp_family; /* AF_INET6 */
+        __be16          l2tp_unused;    /* INET port number (unused) */
+        __be32          l2tp_flowinfo;  /* IPv6 flow information */
+        struct in6_addr l2tp_addr;      /* IPv6 address */
+        __u32           l2tp_scope_id;  /* scope id (new in RFC2553) */
+        __u32           l2tp_conn_id;   /* Connection ID of tunnel */
+};
+
+/*****************************************************************************
+ *  NETLINK_GENERIC netlink family.
+ *****************************************************************************/
+
+/*
+ * Commands.
+ * Valid TLVs of each command are:-
+ * TUNNEL_CREATE        - CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid
+ * TUNNEL_DELETE        - CONN_ID
+ * TUNNEL_MODIFY        - CONN_ID, udpcsum
+ * TUNNEL_GETSTATS      - CONN_ID, (stats)
+ * TUNNEL_GET           - CONN_ID, (...)
+ * SESSION_CREATE       - SESSION_ID, PW_TYPE, offset, data_seq, cookie, peer_cookie, offset, l2spec
+ * SESSION_DELETE       - SESSION_ID
+ * SESSION_MODIFY       - SESSION_ID, data_seq
+ * SESSION_GET          - SESSION_ID, (...)
+ * SESSION_GETSTATS     - SESSION_ID, (stats)
+ *
+ */
+enum {
+        L2TP_CMD_NOOP,
+        L2TP_CMD_TUNNEL_CREATE,
+        L2TP_CMD_TUNNEL_DELETE,
+        L2TP_CMD_TUNNEL_MODIFY,
+        L2TP_CMD_TUNNEL_GET,
+        L2TP_CMD_SESSION_CREATE,
+        L2TP_CMD_SESSION_DELETE,
+        L2TP_CMD_SESSION_MODIFY,
+        L2TP_CMD_SESSION_GET,
+        __L2TP_CMD_MAX,
+};
+
+#define L2TP_CMD_MAX                    (__L2TP_CMD_MAX - 1)
+
+/*
+ * ATTR types defined for L2TP
+ */
+enum {
+        L2TP_ATTR_NONE,                 /* no data */
+        L2TP_ATTR_PW_TYPE,              /* u16, enum l2tp_pwtype */
+        L2TP_ATTR_ENCAP_TYPE,           /* u16, enum l2tp_encap_type */
+        L2TP_ATTR_OFFSET,               /* u16 */
+        L2TP_ATTR_DATA_SEQ,             /* u16 */
+        L2TP_ATTR_L2SPEC_TYPE,          /* u8, enum l2tp_l2spec_type */
+        L2TP_ATTR_L2SPEC_LEN,           /* u8, enum l2tp_l2spec_type */
+        L2TP_ATTR_PROTO_VERSION,        /* u8 */
+        L2TP_ATTR_IFNAME,               /* string */
+        L2TP_ATTR_CONN_ID,              /* u32 */
+        L2TP_ATTR_PEER_CONN_ID,         /* u32 */
+        L2TP_ATTR_SESSION_ID,           /* u32 */
+        L2TP_ATTR_PEER_SESSION_ID,      /* u32 */
+        L2TP_ATTR_UDP_CSUM,             /* u8 */
+        L2TP_ATTR_VLAN_ID,              /* u16 */
+        L2TP_ATTR_COOKIE,               /* 0, 4 or 8 bytes */
+        L2TP_ATTR_PEER_COOKIE,          /* 0, 4 or 8 bytes */
+        L2TP_ATTR_DEBUG,                /* u32 */
+        L2TP_ATTR_RECV_SEQ,             /* u8 */
+        L2TP_ATTR_SEND_SEQ,             /* u8 */
+        L2TP_ATTR_LNS_MODE,             /* u8 */
+        L2TP_ATTR_USING_IPSEC,          /* u8 */
+        L2TP_ATTR_RECV_TIMEOUT,         /* msec */
+        L2TP_ATTR_FD,                   /* int */
+        L2TP_ATTR_IP_SADDR,             /* u32 */
+        L2TP_ATTR_IP_DADDR,             /* u32 */
+        L2TP_ATTR_UDP_SPORT,            /* u16 */
+        L2TP_ATTR_UDP_DPORT,            /* u16 */
+        L2TP_ATTR_MTU,                  /* u16 */
+        L2TP_ATTR_MRU,                  /* u16 */
+        L2TP_ATTR_STATS,                /* nested */
+        L2TP_ATTR_IP6_SADDR,            /* struct in6_addr */
+        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
+        __L2TP_ATTR_MAX,
+};
+
+#define L2TP_ATTR_MAX                   (__L2TP_ATTR_MAX - 1)
+
+/* Nested in L2TP_ATTR_STATS */
+enum {
+        L2TP_ATTR_STATS_NONE,           /* no data */
+        L2TP_ATTR_TX_PACKETS,           /* u64 */
+        L2TP_ATTR_TX_BYTES,             /* u64 */
+        L2TP_ATTR_TX_ERRORS,            /* u64 */
+        L2TP_ATTR_RX_PACKETS,           /* u64 */
+        L2TP_ATTR_RX_BYTES,             /* u64 */
+        L2TP_ATTR_RX_SEQ_DISCARDS,      /* u64 */
+        L2TP_ATTR_RX_OOS_PACKETS,       /* u64 */
+        L2TP_ATTR_RX_ERRORS,            /* u64 */
+        __L2TP_ATTR_STATS_MAX,
+};
+
+#define L2TP_ATTR_STATS_MAX             (__L2TP_ATTR_STATS_MAX - 1)
+
+enum l2tp_pwtype {
+        L2TP_PWTYPE_NONE = 0x0000,
+        L2TP_PWTYPE_ETH_VLAN = 0x0004,
+        L2TP_PWTYPE_ETH = 0x0005,
+        L2TP_PWTYPE_PPP = 0x0007,
+        L2TP_PWTYPE_PPP_AC = 0x0008,
+        L2TP_PWTYPE_IP = 0x000b,
+        __L2TP_PWTYPE_MAX
+};
+
+enum l2tp_l2spec_type {
+        L2TP_L2SPECTYPE_NONE,
+        L2TP_L2SPECTYPE_DEFAULT,
+};
+
+enum l2tp_encap_type {
+        L2TP_ENCAPTYPE_UDP,
+        L2TP_ENCAPTYPE_IP,
+};
+
+enum l2tp_seqmode {
+        L2TP_SEQ_NONE = 0,
+        L2TP_SEQ_IP = 1,
+        L2TP_SEQ_ALL = 2,
+};
+
+/*
+ * NETLINK_GENERIC related info
+ */
+#define L2TP_GENL_NAME          "l2tp"
+#define L2TP_GENL_VERSION       0x1
+
+#endif /* _UAPI_LINUX_L2TP_H_ */
diff --git a/include/linux/limits.h b/include/uapi/linux/limits.h
index 2d0f94162fb3..2d0f94162fb3 100644
--- a/include/linux/limits.h
+++ b/include/uapi/linux/limits.h
diff --git a/include/uapi/linux/llc.h b/include/uapi/linux/llc.h
new file mode 100644
index 000000000000..9c987a402473
--- /dev/null
+++ b/include/uapi/linux/llc.h
@@ -0,0 +1,84 @@
+/*
+ * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
+ *
+ * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
+ *
+ * This program can be redistributed or modified under the terms of the
+ * GNU General Public License as published by the Free Software Foundation.
+ * This program is distributed without any warranty or implied warranty
+ * of merchantability or fitness for a particular purpose.
+ *
+ * See the GNU General Public License for more details.
+ */
+#ifndef _UAPI__LINUX_LLC_H
+#define _UAPI__LINUX_LLC_H
+
+#include <linux/socket.h>
+
+#define __LLC_SOCK_SIZE__ 16    /* sizeof(sockaddr_llc), word align. */
+struct sockaddr_llc {
+        __kernel_sa_family_t sllc_family; /* AF_LLC */
+        __kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
+        unsigned char   sllc_test;
+        unsigned char   sllc_xid;
+        unsigned char   sllc_ua;        /* UA data, only for SOCK_STREAM. */
+        unsigned char   sllc_sap;
+        unsigned char   sllc_mac[IFHWADDRLEN];
+        unsigned char   __pad[__LLC_SOCK_SIZE__ -
+                              sizeof(__kernel_sa_family_t) * 2 -
+                              sizeof(unsigned char) * 4 - IFHWADDRLEN];
+};
+
+/* sockopt definitions. */
+enum llc_sockopts {
+        LLC_OPT_UNKNOWN = 0,
+        LLC_OPT_RETRY,          /* max retrans attempts. */
+        LLC_OPT_SIZE,           /* max PDU size (octets). */
+        LLC_OPT_ACK_TMR_EXP,    /* ack expire time (secs). */
+        LLC_OPT_P_TMR_EXP,      /* pf cycle expire time (secs). */
+        LLC_OPT_REJ_TMR_EXP,    /* rej sent expire time (secs). */
+        LLC_OPT_BUSY_TMR_EXP,   /* busy state expire time (secs). */
+        LLC_OPT_TX_WIN,         /* tx window size. */
+        LLC_OPT_RX_WIN,         /* rx window size. */
+        LLC_OPT_PKTINFO,        /* ancillary packet information. */
+        LLC_OPT_MAX
+};
+
+#define LLC_OPT_MAX_RETRY        100
+#define LLC_OPT_MAX_SIZE        4196
+#define LLC_OPT_MAX_WIN          127
+#define LLC_OPT_MAX_ACK_TMR_EXP   60
+#define LLC_OPT_MAX_P_TMR_EXP     60
+#define LLC_OPT_MAX_REJ_TMR_EXP   60
+#define LLC_OPT_MAX_BUSY_TMR_EXP  60
+
+/* LLC SAP types. */
+#define LLC_SAP_NULL    0x00            /* NULL SAP.                    */
+#define LLC_SAP_LLC     0x02            /* LLC Sublayer Management.     */
+#define LLC_SAP_SNA     0x04            /* SNA Path Control.            */
+#define LLC_SAP_PNM     0x0E            /* Proway Network Management.   */      
+#define LLC_SAP_IP      0x06            /* TCP/IP.                      */
+#define LLC_SAP_BSPAN   0x42            /* Bridge Spanning Tree Proto   */
+#define LLC_SAP_MMS     0x4E            /* Manufacturing Message Srv.   */
+#define LLC_SAP_8208    0x7E            /* ISO 8208                     */
+#define LLC_SAP_3COM    0x80            /* 3COM.                        */
+#define LLC_SAP_PRO     0x8E            /* Proway Active Station List   */
+#define LLC_SAP_SNAP    0xAA            /* SNAP.                        */
+#define LLC_SAP_BANYAN  0xBC            /* Banyan.                      */
+#define LLC_SAP_IPX     0xE0            /* IPX/SPX.                     */
+#define LLC_SAP_NETBEUI 0xF0            /* NetBEUI.                     */
+#define LLC_SAP_LANMGR  0xF4            /* LanManager.                  */
+#define LLC_SAP_IMPL    0xF8            /* IMPL                         */
+#define LLC_SAP_DISC    0xFC            /* Discovery                    */
+#define LLC_SAP_OSI     0xFE            /* OSI Network Layers.          */
+#define LLC_SAP_LAR     0xDC            /* LAN Address Resolution       */
+#define LLC_SAP_RM      0xD4            /* Resource Management          */
+#define LLC_SAP_GLOBAL  0xFF            /* Global SAP.                  */
+
+struct llc_pktinfo {
+        int lpi_ifindex;
+        unsigned char lpi_sap;
+        unsigned char lpi_mac[IFHWADDRLEN];
+};
+
+#endif /* _UAPI__LINUX_LLC_H */
diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h
new file mode 100644
index 000000000000..e0cecd2eabdc
--- /dev/null
+++ b/include/uapi/linux/loop.h
@@ -0,0 +1,94 @@
+/*
+ * include/linux/loop.h
+ *
+ * Written by Theodore Ts'o, 3/29/93.
+ *
+ * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
+ * permitted under the GNU General Public License.
+ */
+#ifndef _UAPI_LINUX_LOOP_H
+#define _UAPI_LINUX_LOOP_H
+
+
+#define LO_NAME_SIZE    64
+#define LO_KEY_SIZE     32
+
+
+/*
+ * Loop flags
+ */
+enum {
+        LO_FLAGS_READ_ONLY      = 1,
+        LO_FLAGS_AUTOCLEAR      = 4,
+        LO_FLAGS_PARTSCAN       = 8,
+};
+
+#include <asm/posix_types.h>    /* for __kernel_old_dev_t */
+#include <linux/types.h>        /* for __u64 */
+
+/* Backwards compatibility version */
+struct loop_info {
+        int                lo_number;           /* ioctl r/o */
+        __kernel_old_dev_t lo_device;           /* ioctl r/o */
+        unsigned long      lo_inode;            /* ioctl r/o */
+        __kernel_old_dev_t lo_rdevice;          /* ioctl r/o */
+        int                lo_offset;
+        int                lo_encrypt_type;
+        int                lo_encrypt_key_size;         /* ioctl w/o */
+        int                lo_flags;                    /* ioctl r/o */
+        char               lo_name[LO_NAME_SIZE];
+        unsigned char      lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+        unsigned long      lo_init[2];
+        char               reserved[4];
+};
+
+struct loop_info64 {
+        __u64              lo_device;                   /* ioctl r/o */
+        __u64              lo_inode;                    /* ioctl r/o */
+        __u64              lo_rdevice;                  /* ioctl r/o */
+        __u64              lo_offset;
+        __u64              lo_sizelimit;/* bytes, 0 == max available */
+        __u32              lo_number;                   /* ioctl r/o */
+        __u32              lo_encrypt_type;
+        __u32              lo_encrypt_key_size;         /* ioctl w/o */
+        __u32              lo_flags;                    /* ioctl r/o */
+        __u8               lo_file_name[LO_NAME_SIZE];
+        __u8               lo_crypt_name[LO_NAME_SIZE];
+        __u8               lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+        __u64              lo_init[2];
+};
+
+/*
+ * Loop filter types
+ */
+
+#define LO_CRYPT_NONE           0
+#define LO_CRYPT_XOR            1
+#define LO_CRYPT_DES            2
+#define LO_CRYPT_FISH2          3    /* Twofish encryption */
+#define LO_CRYPT_BLOW           4
+#define LO_CRYPT_CAST128        5
+#define LO_CRYPT_IDEA           6
+#define LO_CRYPT_DUMMY          9
+#define LO_CRYPT_SKIPJACK       10
+#define LO_CRYPT_CRYPTOAPI      18
+#define MAX_LO_CRYPT            20
+
+/*
+ * IOCTL commands --- we will commandeer 0x4C ('L')
+ */
+
+#define LOOP_SET_FD             0x4C00
+#define LOOP_CLR_FD             0x4C01
+#define LOOP_SET_STATUS         0x4C02
+#define LOOP_GET_STATUS         0x4C03
+#define LOOP_SET_STATUS64       0x4C04
+#define LOOP_GET_STATUS64       0x4C05
+#define LOOP_CHANGE_FD          0x4C06
+#define LOOP_SET_CAPACITY       0x4C07
+
+/* /dev/loop-control interface */
+#define LOOP_CTL_ADD            0x4C80
+#define LOOP_CTL_REMOVE         0x4C81
+#define LOOP_CTL_GET_FREE       0x4C82
+#endif /* _UAPI_LINUX_LOOP_H */
diff --git a/include/uapi/linux/lp.h b/include/uapi/linux/lp.h
new file mode 100644
index 000000000000..a3406a51f196
--- /dev/null
+++ b/include/uapi/linux/lp.h
@@ -0,0 +1,100 @@
+/*
+ * usr/include/linux/lp.h c.1991-1992 James Wiegand
+ * many modifications copyright (C) 1992 Michael K. Johnson
+ * Interrupt support added 1993 Nigel Gamble
+ * Removed 8255 status defines from inside __KERNEL__ Marcelo Tosatti 
+ */
+#ifndef _UAPI_LINUX_LP_H
+#define _UAPI_LINUX_LP_H
+
+
+/*
+ * Per POSIX guidelines, this module reserves the LP and lp prefixes
+ * These are the lp_table[minor].flags flags...
+ */
+#define LP_EXIST 0x0001
+#define LP_SELEC 0x0002
+#define LP_BUSY  0x0004
+#define LP_BUSY_BIT_POS 2
+#define LP_OFFL  0x0008
+#define LP_NOPA  0x0010
+#define LP_ERR   0x0020
+#define LP_ABORT 0x0040
+#define LP_CAREFUL 0x0080 /* obsoleted -arca */
+#define LP_ABORTOPEN 0x0100
+
+#define LP_TRUST_IRQ_  0x0200 /* obsolete */
+#define LP_NO_REVERSE  0x0400 /* No reverse mode available. */
+#define LP_DATA_AVAIL  0x0800 /* Data is available. */
+
+/* 
+ * bit defines for 8255 status port
+ * base + 1
+ * accessed with LP_S(minor), which gets the byte...
+ */
+#define LP_PBUSY        0x80  /* inverted input, active high */
+#define LP_PACK         0x40  /* unchanged input, active low */
+#define LP_POUTPA       0x20  /* unchanged input, active high */
+#define LP_PSELECD      0x10  /* unchanged input, active high */
+#define LP_PERRORP      0x08  /* unchanged input, active low */
+
+/* timeout for each character.  This is relative to bus cycles -- it
+ * is the count in a busy loop.  THIS IS THE VALUE TO CHANGE if you
+ * have extremely slow printing, or if the machine seems to slow down
+ * a lot when you print.  If you have slow printing, increase this
+ * number and recompile, and if your system gets bogged down, decrease
+ * this number.  This can be changed with the tunelp(8) command as well.
+ */
+
+#define LP_INIT_CHAR 1000
+
+/* The parallel port specs apparently say that there needs to be
+ * a .5usec wait before and after the strobe.
+ */
+
+#define LP_INIT_WAIT 1
+
+/* This is the amount of time that the driver waits for the printer to
+ * catch up when the printer's buffer appears to be filled.  If you
+ * want to tune this and have a fast printer (i.e. HPIIIP), decrease
+ * this number, and if you have a slow printer, increase this number.
+ * This is in hundredths of a second, the default 2 being .05 second.
+ * Or use the tunelp(8) command, which is especially nice if you want
+ * change back and forth between character and graphics printing, which
+ * are wildly different...
+ */
+
+#define LP_INIT_TIME 2
+
+/* IOCTL numbers */
+#define LPCHAR   0x0601  /* corresponds to LP_INIT_CHAR */
+#define LPTIME   0x0602  /* corresponds to LP_INIT_TIME */
+#define LPABORT  0x0604  /* call with TRUE arg to abort on error,
+                            FALSE to retry.  Default is retry.  */
+#define LPSETIRQ 0x0605  /* call with new IRQ number,
+                            or 0 for polling (no IRQ) */
+#define LPGETIRQ 0x0606  /* get the current IRQ number */
+#define LPWAIT   0x0608  /* corresponds to LP_INIT_WAIT */
+/* NOTE: LPCAREFUL is obsoleted and it' s always the default right now -arca */
+#define LPCAREFUL   0x0609  /* call with TRUE arg to require out-of-paper, off-
+                            line, and error indicators good on all writes,
+                            FALSE to ignore them.  Default is ignore. */
+#define LPABORTOPEN 0x060a  /* call with TRUE arg to abort open() on error,
+                            FALSE to ignore error.  Default is ignore.  */
+#define LPGETSTATUS 0x060b  /* return LP_S(minor) */
+#define LPRESET     0x060c  /* reset printer */
+#ifdef LP_STATS
+#define LPGETSTATS  0x060d  /* get statistics (struct lp_stats) */
+#endif
+#define LPGETFLAGS  0x060e  /* get status flags */
+#define LPSETTIMEOUT 0x060f /* set parport timeout */
+
+/* timeout for printk'ing a timeout, in jiffies (100ths of a second).
+   This is also used for re-checking error conditions if LP_ABORT is
+   not set.  This is the default behavior. */
+
+#define LP_TIMEOUT_INTERRUPT    (60 * HZ)
+#define LP_TIMEOUT_POLLED       (10 * HZ)
+
+
+#endif /* _UAPI_LINUX_LP_H */
diff --git a/include/linux/magic.h b/include/uapi/linux/magic.h
index e15192cb9cf4..e15192cb9cf4 100644
--- a/include/linux/magic.h
+++ b/include/uapi/linux/magic.h
diff --git a/include/linux/major.h b/include/uapi/linux/major.h
index 6a8ca98c9a96..6a8ca98c9a96 100644
--- a/include/linux/major.h
+++ b/include/uapi/linux/major.h
diff --git a/include/linux/map_to_7segment.h b/include/uapi/linux/map_to_7segment.h
index 12d62a54d470..12d62a54d470 100644
--- a/include/linux/map_to_7segment.h
+++ b/include/uapi/linux/map_to_7segment.h
diff --git a/include/linux/matroxfb.h b/include/uapi/linux/matroxfb.h
index 8c22a8938642..8c22a8938642 100644
--- a/include/linux/matroxfb.h
+++ b/include/uapi/linux/matroxfb.h
diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h
new file mode 100644
index 000000000000..c94a510a577e
--- /dev/null
+++ b/include/uapi/linux/mdio.h
@@ -0,0 +1,297 @@
+/*
+ * linux/mdio.h: definitions for MDIO (clause 45) transceivers
+ * Copyright 2006-2009 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#ifndef _UAPI__LINUX_MDIO_H__
+#define _UAPI__LINUX_MDIO_H__
+
+#include <linux/types.h>
+#include <linux/mii.h>
+
+/* MDIO Manageable Devices (MMDs). */
+#define MDIO_MMD_PMAPMD         1       /* Physical Medium Attachment/
+                                         * Physical Medium Dependent */
+#define MDIO_MMD_WIS            2       /* WAN Interface Sublayer */
+#define MDIO_MMD_PCS            3       /* Physical Coding Sublayer */
+#define MDIO_MMD_PHYXS          4       /* PHY Extender Sublayer */
+#define MDIO_MMD_DTEXS          5       /* DTE Extender Sublayer */
+#define MDIO_MMD_TC             6       /* Transmission Convergence */
+#define MDIO_MMD_AN             7       /* Auto-Negotiation */
+#define MDIO_MMD_C22EXT         29      /* Clause 22 extension */
+#define MDIO_MMD_VEND1          30      /* Vendor specific 1 */
+#define MDIO_MMD_VEND2          31      /* Vendor specific 2 */
+
+/* Generic MDIO registers. */
+#define MDIO_CTRL1              MII_BMCR
+#define MDIO_STAT1              MII_BMSR
+#define MDIO_DEVID1             MII_PHYSID1
+#define MDIO_DEVID2             MII_PHYSID2
+#define MDIO_SPEED              4       /* Speed ability */
+#define MDIO_DEVS1              5       /* Devices in package */
+#define MDIO_DEVS2              6
+#define MDIO_CTRL2              7       /* 10G control 2 */
+#define MDIO_STAT2              8       /* 10G status 2 */
+#define MDIO_PMA_TXDIS          9       /* 10G PMA/PMD transmit disable */
+#define MDIO_PMA_RXDET          10      /* 10G PMA/PMD receive signal detect */
+#define MDIO_PMA_EXTABLE        11      /* 10G PMA/PMD extended ability */
+#define MDIO_PKGID1             14      /* Package identifier */
+#define MDIO_PKGID2             15
+#define MDIO_AN_ADVERTISE       16      /* AN advertising (base page) */
+#define MDIO_AN_LPA             19      /* AN LP abilities (base page) */
+#define MDIO_PCS_EEE_ABLE       20      /* EEE Capability register */
+#define MDIO_PCS_EEE_WK_ERR     22      /* EEE wake error counter */
+#define MDIO_PHYXS_LNSTAT       24      /* PHY XGXS lane state */
+#define MDIO_AN_EEE_ADV         60      /* EEE advertisement */
+#define MDIO_AN_EEE_LPABLE      61      /* EEE link partner ability */
+
+/* Media-dependent registers. */
+#define MDIO_PMA_10GBT_SWAPPOL  130     /* 10GBASE-T pair swap & polarity */
+#define MDIO_PMA_10GBT_TXPWR    131     /* 10GBASE-T TX power control */
+#define MDIO_PMA_10GBT_SNR      133     /* 10GBASE-T SNR margin, lane A.
+                                         * Lanes B-D are numbered 134-136. */
+#define MDIO_PMA_10GBR_FECABLE  170     /* 10GBASE-R FEC ability */
+#define MDIO_PCS_10GBX_STAT1    24      /* 10GBASE-X PCS status 1 */
+#define MDIO_PCS_10GBRT_STAT1   32      /* 10GBASE-R/-T PCS status 1 */
+#define MDIO_PCS_10GBRT_STAT2   33      /* 10GBASE-R/-T PCS status 2 */
+#define MDIO_AN_10GBT_CTRL      32      /* 10GBASE-T auto-negotiation control */
+#define MDIO_AN_10GBT_STAT      33      /* 10GBASE-T auto-negotiation status */
+
+/* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */
+#define MDIO_PMA_LASI_RXCTRL    0x9000  /* RX_ALARM control */
+#define MDIO_PMA_LASI_TXCTRL    0x9001  /* TX_ALARM control */
+#define MDIO_PMA_LASI_CTRL      0x9002  /* LASI control */
+#define MDIO_PMA_LASI_RXSTAT    0x9003  /* RX_ALARM status */
+#define MDIO_PMA_LASI_TXSTAT    0x9004  /* TX_ALARM status */
+#define MDIO_PMA_LASI_STAT      0x9005  /* LASI status */
+
+/* Control register 1. */
+/* Enable extended speed selection */
+#define MDIO_CTRL1_SPEEDSELEXT          (BMCR_SPEED1000 | BMCR_SPEED100)
+/* All speed selection bits */
+#define MDIO_CTRL1_SPEEDSEL             (MDIO_CTRL1_SPEEDSELEXT | 0x003c)
+#define MDIO_CTRL1_FULLDPLX             BMCR_FULLDPLX
+#define MDIO_CTRL1_LPOWER               BMCR_PDOWN
+#define MDIO_CTRL1_RESET                BMCR_RESET
+#define MDIO_PMA_CTRL1_LOOPBACK         0x0001
+#define MDIO_PMA_CTRL1_SPEED1000        BMCR_SPEED1000
+#define MDIO_PMA_CTRL1_SPEED100         BMCR_SPEED100
+#define MDIO_PCS_CTRL1_LOOPBACK         BMCR_LOOPBACK
+#define MDIO_PHYXS_CTRL1_LOOPBACK       BMCR_LOOPBACK
+#define MDIO_AN_CTRL1_RESTART           BMCR_ANRESTART
+#define MDIO_AN_CTRL1_ENABLE            BMCR_ANENABLE
+#define MDIO_AN_CTRL1_XNP               0x2000  /* Enable extended next page */
+#define MDIO_PCS_CTRL1_CLKSTOP_EN       0x400   /* Stop the clock during LPI */
+
+/* 10 Gb/s */
+#define MDIO_CTRL1_SPEED10G             (MDIO_CTRL1_SPEEDSELEXT | 0x00)
+/* 10PASS-TS/2BASE-TL */
+#define MDIO_CTRL1_SPEED10P2B           (MDIO_CTRL1_SPEEDSELEXT | 0x04)
+
+/* Status register 1. */
+#define MDIO_STAT1_LPOWERABLE           0x0002  /* Low-power ability */
+#define MDIO_STAT1_LSTATUS              BMSR_LSTATUS
+#define MDIO_STAT1_FAULT                0x0080  /* Fault */
+#define MDIO_AN_STAT1_LPABLE            0x0001  /* Link partner AN ability */
+#define MDIO_AN_STAT1_ABLE              BMSR_ANEGCAPABLE
+#define MDIO_AN_STAT1_RFAULT            BMSR_RFAULT
+#define MDIO_AN_STAT1_COMPLETE          BMSR_ANEGCOMPLETE
+#define MDIO_AN_STAT1_PAGE              0x0040  /* Page received */
+#define MDIO_AN_STAT1_XNP               0x0080  /* Extended next page status */
+
+/* Speed register. */
+#define MDIO_SPEED_10G                  0x0001  /* 10G capable */
+#define MDIO_PMA_SPEED_2B               0x0002  /* 2BASE-TL capable */
+#define MDIO_PMA_SPEED_10P              0x0004  /* 10PASS-TS capable */
+#define MDIO_PMA_SPEED_1000             0x0010  /* 1000M capable */
+#define MDIO_PMA_SPEED_100              0x0020  /* 100M capable */
+#define MDIO_PMA_SPEED_10               0x0040  /* 10M capable */
+#define MDIO_PCS_SPEED_10P2B            0x0002  /* 10PASS-TS/2BASE-TL capable */
+
+/* Device present registers. */
+#define MDIO_DEVS_PRESENT(devad)        (1 << (devad))
+#define MDIO_DEVS_PMAPMD                MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)
+#define MDIO_DEVS_WIS                   MDIO_DEVS_PRESENT(MDIO_MMD_WIS)
+#define MDIO_DEVS_PCS                   MDIO_DEVS_PRESENT(MDIO_MMD_PCS)
+#define MDIO_DEVS_PHYXS                 MDIO_DEVS_PRESENT(MDIO_MMD_PHYXS)
+#define MDIO_DEVS_DTEXS                 MDIO_DEVS_PRESENT(MDIO_MMD_DTEXS)
+#define MDIO_DEVS_TC                    MDIO_DEVS_PRESENT(MDIO_MMD_TC)
+#define MDIO_DEVS_AN                    MDIO_DEVS_PRESENT(MDIO_MMD_AN)
+#define MDIO_DEVS_C22EXT                MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)
+
+/* Control register 2. */
+#define MDIO_PMA_CTRL2_TYPE             0x000f  /* PMA/PMD type selection */
+#define MDIO_PMA_CTRL2_10GBCX4          0x0000  /* 10GBASE-CX4 type */
+#define MDIO_PMA_CTRL2_10GBEW           0x0001  /* 10GBASE-EW type */
+#define MDIO_PMA_CTRL2_10GBLW           0x0002  /* 10GBASE-LW type */
+#define MDIO_PMA_CTRL2_10GBSW           0x0003  /* 10GBASE-SW type */
+#define MDIO_PMA_CTRL2_10GBLX4          0x0004  /* 10GBASE-LX4 type */
+#define MDIO_PMA_CTRL2_10GBER           0x0005  /* 10GBASE-ER type */
+#define MDIO_PMA_CTRL2_10GBLR           0x0006  /* 10GBASE-LR type */
+#define MDIO_PMA_CTRL2_10GBSR           0x0007  /* 10GBASE-SR type */
+#define MDIO_PMA_CTRL2_10GBLRM          0x0008  /* 10GBASE-LRM type */
+#define MDIO_PMA_CTRL2_10GBT            0x0009  /* 10GBASE-T type */
+#define MDIO_PMA_CTRL2_10GBKX4          0x000a  /* 10GBASE-KX4 type */
+#define MDIO_PMA_CTRL2_10GBKR           0x000b  /* 10GBASE-KR type */
+#define MDIO_PMA_CTRL2_1000BT           0x000c  /* 1000BASE-T type */
+#define MDIO_PMA_CTRL2_1000BKX          0x000d  /* 1000BASE-KX type */
+#define MDIO_PMA_CTRL2_100BTX           0x000e  /* 100BASE-TX type */
+#define MDIO_PMA_CTRL2_10BT             0x000f  /* 10BASE-T type */
+#define MDIO_PCS_CTRL2_TYPE             0x0003  /* PCS type selection */
+#define MDIO_PCS_CTRL2_10GBR            0x0000  /* 10GBASE-R type */
+#define MDIO_PCS_CTRL2_10GBX            0x0001  /* 10GBASE-X type */
+#define MDIO_PCS_CTRL2_10GBW            0x0002  /* 10GBASE-W type */
+#define MDIO_PCS_CTRL2_10GBT            0x0003  /* 10GBASE-T type */
+
+/* Status register 2. */
+#define MDIO_STAT2_RXFAULT              0x0400  /* Receive fault */
+#define MDIO_STAT2_TXFAULT              0x0800  /* Transmit fault */
+#define MDIO_STAT2_DEVPRST              0xc000  /* Device present */
+#define MDIO_STAT2_DEVPRST_VAL          0x8000  /* Device present value */
+#define MDIO_PMA_STAT2_LBABLE           0x0001  /* PMA loopback ability */
+#define MDIO_PMA_STAT2_10GBEW           0x0002  /* 10GBASE-EW ability */
+#define MDIO_PMA_STAT2_10GBLW           0x0004  /* 10GBASE-LW ability */
+#define MDIO_PMA_STAT2_10GBSW           0x0008  /* 10GBASE-SW ability */
+#define MDIO_PMA_STAT2_10GBLX4          0x0010  /* 10GBASE-LX4 ability */
+#define MDIO_PMA_STAT2_10GBER           0x0020  /* 10GBASE-ER ability */
+#define MDIO_PMA_STAT2_10GBLR           0x0040  /* 10GBASE-LR ability */
+#define MDIO_PMA_STAT2_10GBSR           0x0080  /* 10GBASE-SR ability */
+#define MDIO_PMD_STAT2_TXDISAB          0x0100  /* PMD TX disable ability */
+#define MDIO_PMA_STAT2_EXTABLE          0x0200  /* Extended abilities */
+#define MDIO_PMA_STAT2_RXFLTABLE        0x1000  /* Receive fault ability */
+#define MDIO_PMA_STAT2_TXFLTABLE        0x2000  /* Transmit fault ability */
+#define MDIO_PCS_STAT2_10GBR            0x0001  /* 10GBASE-R capable */
+#define MDIO_PCS_STAT2_10GBX            0x0002  /* 10GBASE-X capable */
+#define MDIO_PCS_STAT2_10GBW            0x0004  /* 10GBASE-W capable */
+#define MDIO_PCS_STAT2_RXFLTABLE        0x1000  /* Receive fault ability */
+#define MDIO_PCS_STAT2_TXFLTABLE        0x2000  /* Transmit fault ability */
+
+/* Transmit disable register. */
+#define MDIO_PMD_TXDIS_GLOBAL           0x0001  /* Global PMD TX disable */
+#define MDIO_PMD_TXDIS_0                0x0002  /* PMD TX disable 0 */
+#define MDIO_PMD_TXDIS_1                0x0004  /* PMD TX disable 1 */
+#define MDIO_PMD_TXDIS_2                0x0008  /* PMD TX disable 2 */
+#define MDIO_PMD_TXDIS_3                0x0010  /* PMD TX disable 3 */
+
+/* Receive signal detect register. */
+#define MDIO_PMD_RXDET_GLOBAL           0x0001  /* Global PMD RX signal detect */
+#define MDIO_PMD_RXDET_0                0x0002  /* PMD RX signal detect 0 */
+#define MDIO_PMD_RXDET_1                0x0004  /* PMD RX signal detect 1 */
+#define MDIO_PMD_RXDET_2                0x0008  /* PMD RX signal detect 2 */
+#define MDIO_PMD_RXDET_3                0x0010  /* PMD RX signal detect 3 */
+
+/* Extended abilities register. */
+#define MDIO_PMA_EXTABLE_10GCX4         0x0001  /* 10GBASE-CX4 ability */
+#define MDIO_PMA_EXTABLE_10GBLRM        0x0002  /* 10GBASE-LRM ability */
+#define MDIO_PMA_EXTABLE_10GBT          0x0004  /* 10GBASE-T ability */
+#define MDIO_PMA_EXTABLE_10GBKX4        0x0008  /* 10GBASE-KX4 ability */
+#define MDIO_PMA_EXTABLE_10GBKR         0x0010  /* 10GBASE-KR ability */
+#define MDIO_PMA_EXTABLE_1000BT         0x0020  /* 1000BASE-T ability */
+#define MDIO_PMA_EXTABLE_1000BKX        0x0040  /* 1000BASE-KX ability */
+#define MDIO_PMA_EXTABLE_100BTX         0x0080  /* 100BASE-TX ability */
+#define MDIO_PMA_EXTABLE_10BT           0x0100  /* 10BASE-T ability */
+
+/* PHY XGXS lane state register. */
+#define MDIO_PHYXS_LNSTAT_SYNC0         0x0001
+#define MDIO_PHYXS_LNSTAT_SYNC1         0x0002
+#define MDIO_PHYXS_LNSTAT_SYNC2         0x0004
+#define MDIO_PHYXS_LNSTAT_SYNC3         0x0008
+#define MDIO_PHYXS_LNSTAT_ALIGN         0x1000
+
+/* PMA 10GBASE-T pair swap & polarity */
+#define MDIO_PMA_10GBT_SWAPPOL_ABNX     0x0001  /* Pair A/B uncrossed */
+#define MDIO_PMA_10GBT_SWAPPOL_CDNX     0x0002  /* Pair C/D uncrossed */
+#define MDIO_PMA_10GBT_SWAPPOL_AREV     0x0100  /* Pair A polarity reversed */
+#define MDIO_PMA_10GBT_SWAPPOL_BREV     0x0200  /* Pair B polarity reversed */
+#define MDIO_PMA_10GBT_SWAPPOL_CREV     0x0400  /* Pair C polarity reversed */
+#define MDIO_PMA_10GBT_SWAPPOL_DREV     0x0800  /* Pair D polarity reversed */
+
+/* PMA 10GBASE-T TX power register. */
+#define MDIO_PMA_10GBT_TXPWR_SHORT      0x0001  /* Short-reach mode */
+
+/* PMA 10GBASE-T SNR registers. */
+/* Value is SNR margin in dB, clamped to range [-127, 127], plus 0x8000. */
+#define MDIO_PMA_10GBT_SNR_BIAS         0x8000
+#define MDIO_PMA_10GBT_SNR_MAX          127
+
+/* PMA 10GBASE-R FEC ability register. */
+#define MDIO_PMA_10GBR_FECABLE_ABLE     0x0001  /* FEC ability */
+#define MDIO_PMA_10GBR_FECABLE_ERRABLE  0x0002  /* FEC error indic. ability */
+
+/* PCS 10GBASE-R/-T status register 1. */
+#define MDIO_PCS_10GBRT_STAT1_BLKLK     0x0001  /* Block lock attained */
+
+/* PCS 10GBASE-R/-T status register 2. */
+#define MDIO_PCS_10GBRT_STAT2_ERR       0x00ff
+#define MDIO_PCS_10GBRT_STAT2_BER       0x3f00
+
+/* AN 10GBASE-T control register. */
+#define MDIO_AN_10GBT_CTRL_ADV10G       0x1000  /* Advertise 10GBASE-T */
+
+/* AN 10GBASE-T status register. */
+#define MDIO_AN_10GBT_STAT_LPTRR        0x0200  /* LP training reset req. */
+#define MDIO_AN_10GBT_STAT_LPLTABLE     0x0400  /* LP loop timing ability */
+#define MDIO_AN_10GBT_STAT_LP10G        0x0800  /* LP is 10GBT capable */
+#define MDIO_AN_10GBT_STAT_REMOK        0x1000  /* Remote OK */
+#define MDIO_AN_10GBT_STAT_LOCOK        0x2000  /* Local OK */
+#define MDIO_AN_10GBT_STAT_MS           0x4000  /* Master/slave config */
+#define MDIO_AN_10GBT_STAT_MSFLT        0x8000  /* Master/slave config fault */
+
+/* EEE Supported/Advertisement/LP Advertisement registers.
+ *
+ * EEE capability Register (3.20), Advertisement (7.60) and
+ * Link partner ability (7.61) registers have and can use the same identical
+ * bit masks.
+ */
+#define MDIO_AN_EEE_ADV_100TX   0x0002  /* Advertise 100TX EEE cap */
+#define MDIO_AN_EEE_ADV_1000T   0x0004  /* Advertise 1000T EEE cap */
+/* Note: the two defines above can be potentially used by the user-land
+ * and cannot remove them now.
+ * So, we define the new generic MDIO_EEE_100TX and MDIO_EEE_1000T macros
+ * using the previous ones (that can be considered obsolete).
+ */
+#define MDIO_EEE_100TX          MDIO_AN_EEE_ADV_100TX   /* 100TX EEE cap */
+#define MDIO_EEE_1000T          MDIO_AN_EEE_ADV_1000T   /* 1000T EEE cap */
+#define MDIO_EEE_10GT           0x0008  /* 10GT EEE cap */
+#define MDIO_EEE_1000KX         0x0010  /* 1000KX EEE cap */
+#define MDIO_EEE_10GKX4         0x0020  /* 10G KX4 EEE cap */
+#define MDIO_EEE_10GKR          0x0040  /* 10G KR EEE cap */
+
+/* LASI RX_ALARM control/status registers. */
+#define MDIO_PMA_LASI_RX_PHYXSLFLT      0x0001  /* PHY XS RX local fault */
+#define MDIO_PMA_LASI_RX_PCSLFLT        0x0008  /* PCS RX local fault */
+#define MDIO_PMA_LASI_RX_PMALFLT        0x0010  /* PMA/PMD RX local fault */
+#define MDIO_PMA_LASI_RX_OPTICPOWERFLT  0x0020  /* RX optical power fault */
+#define MDIO_PMA_LASI_RX_WISLFLT        0x0200  /* WIS local fault */
+
+/* LASI TX_ALARM control/status registers. */
+#define MDIO_PMA_LASI_TX_PHYXSLFLT      0x0001  /* PHY XS TX local fault */
+#define MDIO_PMA_LASI_TX_PCSLFLT        0x0008  /* PCS TX local fault */
+#define MDIO_PMA_LASI_TX_PMALFLT        0x0010  /* PMA/PMD TX local fault */
+#define MDIO_PMA_LASI_TX_LASERPOWERFLT  0x0080  /* Laser output power fault */
+#define MDIO_PMA_LASI_TX_LASERTEMPFLT   0x0100  /* Laser temperature fault */
+#define MDIO_PMA_LASI_TX_LASERBICURRFLT 0x0200  /* Laser bias current fault */
+
+/* LASI control/status registers. */
+#define MDIO_PMA_LASI_LSALARM           0x0001  /* LS_ALARM enable/status */
+#define MDIO_PMA_LASI_TXALARM           0x0002  /* TX_ALARM enable/status */
+#define MDIO_PMA_LASI_RXALARM           0x0004  /* RX_ALARM enable/status */
+
+/* Mapping between MDIO PRTAD/DEVAD and mii_ioctl_data::phy_id */
+
+#define MDIO_PHY_ID_C45                 0x8000
+#define MDIO_PHY_ID_PRTAD               0x03e0
+#define MDIO_PHY_ID_DEVAD               0x001f
+#define MDIO_PHY_ID_C45_MASK                                            \
+        (MDIO_PHY_ID_C45 | MDIO_PHY_ID_PRTAD | MDIO_PHY_ID_DEVAD)
+
+static inline __u16 mdio_phy_id_c45(int prtad, int devad)
+{
+        return MDIO_PHY_ID_C45 | (prtad << 5) | devad;
+}
+
+#endif /* _UAPI__LINUX_MDIO_H__ */
diff --git a/include/linux/media.h b/include/uapi/linux/media.h
index 0ef883327de2..0ef883327de2 100644
--- a/include/linux/media.h
+++ b/include/uapi/linux/media.h
diff --git a/include/linux/mei.h b/include/uapi/linux/mei.h
index bc0d8b69c49e..bc0d8b69c49e 100644
--- a/include/linux/mei.h
+++ b/include/uapi/linux/mei.h
diff --git a/include/uapi/linux/mempolicy.h b/include/uapi/linux/mempolicy.h
new file mode 100644
index 000000000000..23e62e0537e2
--- /dev/null
+++ b/include/uapi/linux/mempolicy.h
@@ -0,0 +1,64 @@
+/*
+ * NUMA memory policies for Linux.
+ * Copyright 2003,2004 Andi Kleen SuSE Labs
+ */
+#ifndef _UAPI_LINUX_MEMPOLICY_H
+#define _UAPI_LINUX_MEMPOLICY_H
+
+#include <linux/errno.h>
+
+
+/*
+ * Both the MPOL_* mempolicy mode and the MPOL_F_* optional mode flags are
+ * passed by the user to either set_mempolicy() or mbind() in an 'int' actual.
+ * The MPOL_MODE_FLAGS macro determines the legal set of optional mode flags.
+ */
+
+/* Policies */
+enum {
+        MPOL_DEFAULT,
+        MPOL_PREFERRED,
+        MPOL_BIND,
+        MPOL_INTERLEAVE,
+        MPOL_MAX,       /* always last member of enum */
+};
+
+enum mpol_rebind_step {
+        MPOL_REBIND_ONCE,       /* do rebind work at once(not by two step) */
+        MPOL_REBIND_STEP1,      /* first step(set all the newly nodes) */
+        MPOL_REBIND_STEP2,      /* second step(clean all the disallowed nodes)*/
+        MPOL_REBIND_NSTEP,
+};
+
+/* Flags for set_mempolicy */
+#define MPOL_F_STATIC_NODES     (1 << 15)
+#define MPOL_F_RELATIVE_NODES   (1 << 14)
+
+/*
+ * MPOL_MODE_FLAGS is the union of all possible optional mode flags passed to
+ * either set_mempolicy() or mbind().
+ */
+#define MPOL_MODE_FLAGS (MPOL_F_STATIC_NODES | MPOL_F_RELATIVE_NODES)
+
+/* Flags for get_mempolicy */
+#define MPOL_F_NODE     (1<<0)  /* return next IL mode instead of node mask */
+#define MPOL_F_ADDR     (1<<1)  /* look up vma using address */
+#define MPOL_F_MEMS_ALLOWED (1<<2) /* return allowed memories */
+
+/* Flags for mbind */
+#define MPOL_MF_STRICT  (1<<0)  /* Verify existing pages in the mapping */
+#define MPOL_MF_MOVE    (1<<1)  /* Move pages owned by this process to conform to mapping */
+#define MPOL_MF_MOVE_ALL (1<<2) /* Move every page to conform to mapping */
+#define MPOL_MF_INTERNAL (1<<3) /* Internal flags start here */
+
+/*
+ * Internal flags that share the struct mempolicy flags word with
+ * "mode flags".  These flags are allocated from bit 0 up, as they
+ * are never OR'ed into the mode in mempolicy API arguments.
+ */
+#define MPOL_F_SHARED  (1 << 0) /* identify shared policies */
+#define MPOL_F_LOCAL   (1 << 1) /* preferred local allocation */
+#define MPOL_F_REBINDING (1 << 2)       /* identify policies in rebinding */
+
+
+#endif /* _UAPI_LINUX_MEMPOLICY_H */
diff --git a/include/linux/meye.h b/include/uapi/linux/meye.h
index 0dd49954f746..0dd49954f746 100644
--- a/include/linux/meye.h
+++ b/include/uapi/linux/meye.h
diff --git a/include/uapi/linux/mii.h b/include/uapi/linux/mii.h
new file mode 100644
index 000000000000..237fac4bc17b
--- /dev/null
+++ b/include/uapi/linux/mii.h
@@ -0,0 +1,161 @@
+/*
+ * linux/mii.h: definitions for MII-compatible transceivers
+ * Originally drivers/net/sunhme.h.
+ *
+ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
+ */
+
+#ifndef _UAPI__LINUX_MII_H__
+#define _UAPI__LINUX_MII_H__
+
+#include <linux/types.h>
+#include <linux/ethtool.h>
+
+/* Generic MII registers. */
+#define MII_BMCR                0x00    /* Basic mode control register */
+#define MII_BMSR                0x01    /* Basic mode status register  */
+#define MII_PHYSID1             0x02    /* PHYS ID 1                   */
+#define MII_PHYSID2             0x03    /* PHYS ID 2                   */
+#define MII_ADVERTISE           0x04    /* Advertisement control reg   */
+#define MII_LPA                 0x05    /* Link partner ability reg    */
+#define MII_EXPANSION           0x06    /* Expansion register          */
+#define MII_CTRL1000            0x09    /* 1000BASE-T control          */
+#define MII_STAT1000            0x0a    /* 1000BASE-T status           */
+#define MII_MMD_CTRL            0x0d    /* MMD Access Control Register */
+#define MII_MMD_DATA            0x0e    /* MMD Access Data Register */
+#define MII_ESTATUS             0x0f    /* Extended Status             */
+#define MII_DCOUNTER            0x12    /* Disconnect counter          */
+#define MII_FCSCOUNTER          0x13    /* False carrier counter       */
+#define MII_NWAYTEST            0x14    /* N-way auto-neg test reg     */
+#define MII_RERRCOUNTER         0x15    /* Receive error counter       */
+#define MII_SREVISION           0x16    /* Silicon revision            */
+#define MII_RESV1               0x17    /* Reserved...                 */
+#define MII_LBRERROR            0x18    /* Lpback, rx, bypass error    */
+#define MII_PHYADDR             0x19    /* PHY address                 */
+#define MII_RESV2               0x1a    /* Reserved...                 */
+#define MII_TPISTATUS           0x1b    /* TPI status for 10mbps       */
+#define MII_NCONFIG             0x1c    /* Network interface config    */
+
+/* Basic mode control register. */
+#define BMCR_RESV               0x003f  /* Unused...                   */
+#define BMCR_SPEED1000          0x0040  /* MSB of Speed (1000)         */
+#define BMCR_CTST               0x0080  /* Collision test              */
+#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
+#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
+#define BMCR_ISOLATE            0x0400  /* Isolate data paths from MII */
+#define BMCR_PDOWN              0x0800  /* Enable low power state      */
+#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
+#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
+#define BMCR_RESET              0x8000  /* Reset to default state      */
+
+/* Basic mode status register. */
+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
+#define BMSR_JCD                0x0002  /* Jabber detected             */
+#define BMSR_LSTATUS            0x0004  /* Link status                 */
+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
+#define BMSR_RESV               0x00c0  /* Unused...                   */
+#define BMSR_ESTATEN            0x0100  /* Extended Status in R15      */
+#define BMSR_100HALF2           0x0200  /* Can do 100BASE-T2 HDX       */
+#define BMSR_100FULL2           0x0400  /* Can do 100BASE-T2 FDX       */
+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
+
+/* Advertisement control register. */
+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
+#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
+#define ADVERTISE_1000XFULL     0x0020  /* Try for 1000BASE-X full-duplex */
+#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
+#define ADVERTISE_1000XHALF     0x0040  /* Try for 1000BASE-X half-duplex */
+#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
+#define ADVERTISE_1000XPAUSE    0x0080  /* Try for 1000BASE-X pause    */
+#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
+#define ADVERTISE_1000XPSE_ASYM 0x0100  /* Try for 1000BASE-X asym pause */
+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
+#define ADVERTISE_PAUSE_CAP     0x0400  /* Try for pause               */
+#define ADVERTISE_PAUSE_ASYM    0x0800  /* Try for asymetric pause     */
+#define ADVERTISE_RESV          0x1000  /* Unused...                   */
+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
+
+#define ADVERTISE_FULL          (ADVERTISE_100FULL | ADVERTISE_10FULL | \
+                                  ADVERTISE_CSMA)
+#define ADVERTISE_ALL           (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+                                  ADVERTISE_100HALF | ADVERTISE_100FULL)
+
+/* Link partner ability register. */
+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
+#define LPA_1000XFULL           0x0020  /* Can do 1000BASE-X full-duplex */
+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
+#define LPA_1000XHALF           0x0040  /* Can do 1000BASE-X half-duplex */
+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
+#define LPA_1000XPAUSE          0x0080  /* Can do 1000BASE-X pause     */
+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
+#define LPA_1000XPAUSE_ASYM     0x0100  /* Can do 1000BASE-X pause asym*/
+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
+#define LPA_PAUSE_CAP           0x0400  /* Can pause                   */
+#define LPA_PAUSE_ASYM          0x0800  /* Can pause asymetrically     */
+#define LPA_RESV                0x1000  /* Unused...                   */
+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
+#define LPA_LPACK               0x4000  /* Link partner acked us       */
+#define LPA_NPAGE               0x8000  /* Next page bit               */
+
+#define LPA_DUPLEX              (LPA_10FULL | LPA_100FULL)
+#define LPA_100                 (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
+
+/* Expansion register for auto-negotiation. */
+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
+
+#define ESTATUS_1000_TFULL      0x2000  /* Can do 1000BT Full          */
+#define ESTATUS_1000_THALF      0x1000  /* Can do 1000BT Half          */
+
+/* N-way test register. */
+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
+
+/* 1000BASE-T Control register */
+#define ADVERTISE_1000FULL      0x0200  /* Advertise 1000BASE-T full duplex */
+#define ADVERTISE_1000HALF      0x0100  /* Advertise 1000BASE-T half duplex */
+#define CTL1000_AS_MASTER       0x0800
+#define CTL1000_ENABLE_MASTER   0x1000
+
+/* 1000BASE-T Status register */
+#define LPA_1000LOCALRXOK       0x2000  /* Link partner local receiver status */
+#define LPA_1000REMRXOK         0x1000  /* Link partner remote receiver status */
+#define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
+#define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
+
+/* Flow control flags */
+#define FLOW_CTRL_TX            0x01
+#define FLOW_CTRL_RX            0x02
+
+/* MMD Access Control register fields */
+#define MII_MMD_CTRL_DEVAD_MASK 0x1f    /* Mask MMD DEVAD*/
+#define MII_MMD_CTRL_ADDR       0x0000  /* Address */
+#define MII_MMD_CTRL_NOINCR     0x4000  /* no post increment */
+#define MII_MMD_CTRL_INCR_RDWT  0x8000  /* post increment on reads & writes */
+#define MII_MMD_CTRL_INCR_ON_WT 0xC000  /* post increment on writes only */
+
+/* This structure is used in all SIOCxMIIxxx ioctl calls */
+struct mii_ioctl_data {
+        __u16           phy_id;
+        __u16           reg_num;
+        __u16           val_in;
+        __u16           val_out;
+};
+
+#endif /* _UAPI__LINUX_MII_H__ */
diff --git a/include/linux/minix_fs.h b/include/uapi/linux/minix_fs.h
index 13fe09e0576a..13fe09e0576a 100644
--- a/include/linux/minix_fs.h
+++ b/include/uapi/linux/minix_fs.h
diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h
new file mode 100644
index 000000000000..ade4acd3a90c
--- /dev/null
+++ b/include/uapi/linux/mman.h
@@ -0,0 +1,13 @@
+#ifndef _UAPI_LINUX_MMAN_H
+#define _UAPI_LINUX_MMAN_H
+
+#include <asm/mman.h>
+
+#define MREMAP_MAYMOVE  1
+#define MREMAP_FIXED    2
+
+#define OVERCOMMIT_GUESS                0
+#define OVERCOMMIT_ALWAYS               1
+#define OVERCOMMIT_NEVER                2
+
+#endif /* _UAPI_LINUX_MMAN_H */
diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild
index aafaa5aa54d4..8c1d2cb75e33 100644
--- a/include/uapi/linux/mmc/Kbuild
+++ b/include/uapi/linux/mmc/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += ioctl.h
diff --git a/include/linux/mmc/ioctl.h b/include/uapi/linux/mmc/ioctl.h
index 1f5e68923929..1f5e68923929 100644
--- a/include/linux/mmc/ioctl.h
+++ b/include/uapi/linux/mmc/ioctl.h
diff --git a/include/linux/mmtimer.h b/include/uapi/linux/mmtimer.h
index 884cabf16088..884cabf16088 100644
--- a/include/linux/mmtimer.h
+++ b/include/uapi/linux/mmtimer.h
diff --git a/include/linux/mqueue.h b/include/uapi/linux/mqueue.h
index 8b5a79615fbf..8b5a79615fbf 100644
--- a/include/linux/mqueue.h
+++ b/include/uapi/linux/mqueue.h
diff --git a/include/uapi/linux/mroute.h b/include/uapi/linux/mroute.h
new file mode 100644
index 000000000000..16929993acc4
--- /dev/null
+++ b/include/uapi/linux/mroute.h
@@ -0,0 +1,143 @@
+#ifndef _UAPI__LINUX_MROUTE_H
+#define _UAPI__LINUX_MROUTE_H
+
+#include <linux/sockios.h>
+#include <linux/types.h>
+
+/*
+ *      Based on the MROUTING 3.5 defines primarily to keep
+ *      source compatibility with BSD.
+ *
+ *      See the mrouted code for the original history.
+ *
+ *      Protocol Independent Multicast (PIM) data structures included
+ *      Carlos Picoto (cap@di.fc.ul.pt)
+ *
+ */
+
+#define MRT_BASE        200
+#define MRT_INIT        (MRT_BASE)      /* Activate the kernel mroute code      */
+#define MRT_DONE        (MRT_BASE+1)    /* Shutdown the kernel mroute           */
+#define MRT_ADD_VIF     (MRT_BASE+2)    /* Add a virtual interface              */
+#define MRT_DEL_VIF     (MRT_BASE+3)    /* Delete a virtual interface           */
+#define MRT_ADD_MFC     (MRT_BASE+4)    /* Add a multicast forwarding entry     */
+#define MRT_DEL_MFC     (MRT_BASE+5)    /* Delete a multicast forwarding entry  */
+#define MRT_VERSION     (MRT_BASE+6)    /* Get the kernel multicast version     */
+#define MRT_ASSERT      (MRT_BASE+7)    /* Activate PIM assert mode             */
+#define MRT_PIM         (MRT_BASE+8)    /* enable PIM code                      */
+#define MRT_TABLE       (MRT_BASE+9)    /* Specify mroute table ID              */
+
+#define SIOCGETVIFCNT   SIOCPROTOPRIVATE        /* IP protocol privates */
+#define SIOCGETSGCNT    (SIOCPROTOPRIVATE+1)
+#define SIOCGETRPF      (SIOCPROTOPRIVATE+2)
+
+#define MAXVIFS         32      
+typedef unsigned long vifbitmap_t;      /* User mode code depends on this lot */
+typedef unsigned short vifi_t;
+#define ALL_VIFS        ((vifi_t)(-1))
+
+/*
+ *      Same idea as select
+ */
+ 
+#define VIFM_SET(n,m)   ((m)|=(1<<(n)))
+#define VIFM_CLR(n,m)   ((m)&=~(1<<(n)))
+#define VIFM_ISSET(n,m) ((m)&(1<<(n)))
+#define VIFM_CLRALL(m)  ((m)=0)
+#define VIFM_COPY(mfrom,mto)    ((mto)=(mfrom))
+#define VIFM_SAME(m1,m2)        ((m1)==(m2))
+
+/*
+ *      Passed by mrouted for an MRT_ADD_VIF - again we use the
+ *      mrouted 3.6 structures for compatibility
+ */
+ 
+struct vifctl {
+        vifi_t  vifc_vifi;              /* Index of VIF */
+        unsigned char vifc_flags;       /* VIFF_ flags */
+        unsigned char vifc_threshold;   /* ttl limit */
+        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
+        union {
+                struct in_addr vifc_lcl_addr;     /* Local interface address */
+                int            vifc_lcl_ifindex;  /* Local interface index   */
+        };
+        struct in_addr vifc_rmt_addr;   /* IPIP tunnel addr */
+};
+
+#define VIFF_TUNNEL             0x1     /* IPIP tunnel */
+#define VIFF_SRCRT              0x2     /* NI */
+#define VIFF_REGISTER           0x4     /* register vif */
+#define VIFF_USE_IFINDEX        0x8     /* use vifc_lcl_ifindex instead of
+                                           vifc_lcl_addr to find an interface */
+
+/*
+ *      Cache manipulation structures for mrouted and PIMd
+ */
+ 
+struct mfcctl {
+        struct in_addr mfcc_origin;             /* Origin of mcast      */
+        struct in_addr mfcc_mcastgrp;           /* Group in question    */
+        vifi_t  mfcc_parent;                    /* Where it arrived     */
+        unsigned char mfcc_ttls[MAXVIFS];       /* Where it is going    */
+        unsigned int mfcc_pkt_cnt;              /* pkt count for src-grp */
+        unsigned int mfcc_byte_cnt;
+        unsigned int mfcc_wrong_if;
+        int          mfcc_expire;
+};
+
+/* 
+ *      Group count retrieval for mrouted
+ */
+ 
+struct sioc_sg_req {
+        struct in_addr src;
+        struct in_addr grp;
+        unsigned long pktcnt;
+        unsigned long bytecnt;
+        unsigned long wrong_if;
+};
+
+/*
+ *      To get vif packet counts
+ */
+
+struct sioc_vif_req {
+        vifi_t  vifi;           /* Which iface */
+        unsigned long icount;   /* In packets */
+        unsigned long ocount;   /* Out packets */
+        unsigned long ibytes;   /* In bytes */
+        unsigned long obytes;   /* Out bytes */
+};
+
+/*
+ *      This is the format the mroute daemon expects to see IGMP control
+ *      data. Magically happens to be like an IP packet as per the original
+ */
+ 
+struct igmpmsg {
+        __u32 unused1,unused2;
+        unsigned char im_msgtype;               /* What is this */
+        unsigned char im_mbz;                   /* Must be zero */
+        unsigned char im_vif;                   /* Interface (this ought to be a vifi_t!) */
+        unsigned char unused3;
+        struct in_addr im_src,im_dst;
+};
+
+/*
+ *      That's all usermode folks
+ */
+
+
+
+#define MFC_ASSERT_THRESH (3*HZ)                /* Maximal freq. of asserts */
+
+/*
+ *      Pseudo messages used by mrouted
+ */
+
+#define IGMPMSG_NOCACHE         1               /* Kern cache fill request to mrouted */
+#define IGMPMSG_WRONGVIF        2               /* For PIM assert processing (unused) */
+#define IGMPMSG_WHOLEPKT        3               /* For PIM Register processing */
+
+
+#endif /* _UAPI__LINUX_MROUTE_H */
diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h
new file mode 100644
index 000000000000..3e89b5e7f9e3
--- /dev/null
+++ b/include/uapi/linux/mroute6.h
@@ -0,0 +1,137 @@
+#ifndef _UAPI__LINUX_MROUTE6_H
+#define _UAPI__LINUX_MROUTE6_H
+
+#include <linux/types.h>
+#include <linux/sockios.h>
+
+/*
+ *      Based on the MROUTING 3.5 defines primarily to keep
+ *      source compatibility with BSD.
+ *
+ *      See the pim6sd code for the original history.
+ *
+ *      Protocol Independent Multicast (PIM) data structures included
+ *      Carlos Picoto (cap@di.fc.ul.pt)
+ *
+ */
+
+#define MRT6_BASE       200
+#define MRT6_INIT       (MRT6_BASE)     /* Activate the kernel mroute code      */
+#define MRT6_DONE       (MRT6_BASE+1)   /* Shutdown the kernel mroute           */
+#define MRT6_ADD_MIF    (MRT6_BASE+2)   /* Add a virtual interface              */
+#define MRT6_DEL_MIF    (MRT6_BASE+3)   /* Delete a virtual interface           */
+#define MRT6_ADD_MFC    (MRT6_BASE+4)   /* Add a multicast forwarding entry     */
+#define MRT6_DEL_MFC    (MRT6_BASE+5)   /* Delete a multicast forwarding entry  */
+#define MRT6_VERSION    (MRT6_BASE+6)   /* Get the kernel multicast version     */
+#define MRT6_ASSERT     (MRT6_BASE+7)   /* Activate PIM assert mode             */
+#define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code                      */
+#define MRT6_TABLE      (MRT6_BASE+9)   /* Specify mroute table ID              */
+
+#define SIOCGETMIFCNT_IN6       SIOCPROTOPRIVATE        /* IP protocol privates */
+#define SIOCGETSGCNT_IN6        (SIOCPROTOPRIVATE+1)
+#define SIOCGETRPF      (SIOCPROTOPRIVATE+2)
+
+#define MAXMIFS         32
+typedef unsigned long mifbitmap_t;      /* User mode code depends on this lot */
+typedef unsigned short mifi_t;
+#define ALL_MIFS        ((mifi_t)(-1))
+
+#ifndef IF_SETSIZE
+#define IF_SETSIZE      256
+#endif
+
+typedef __u32           if_mask;
+#define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
+
+#if !defined(__KERNEL__)
+#if !defined(DIV_ROUND_UP)
+#define DIV_ROUND_UP(x,y)       (((x) + ((y) - 1)) / (y))
+#endif
+#endif
+
+typedef struct if_set {
+        if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
+} if_set;
+
+#define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
+#define IF_CLR(n, p)    ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
+#define IF_ISSET(n, p)  ((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
+#define IF_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
+#define IF_ZERO(p)      bzero(p, sizeof(*(p)))
+
+/*
+ *      Passed by mrouted for an MRT_ADD_MIF - again we use the
+ *      mrouted 3.6 structures for compatibility
+ */
+
+struct mif6ctl {
+        mifi_t  mif6c_mifi;             /* Index of MIF */
+        unsigned char mif6c_flags;      /* MIFF_ flags */
+        unsigned char vifc_threshold;   /* ttl limit */
+        __u16    mif6c_pifi;            /* the index of the physical IF */
+        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
+};
+
+#define MIFF_REGISTER   0x1     /* register vif */
+
+/*
+ *      Cache manipulation structures for mrouted and PIMd
+ */
+
+struct mf6cctl {
+        struct sockaddr_in6 mf6cc_origin;               /* Origin of mcast      */
+        struct sockaddr_in6 mf6cc_mcastgrp;             /* Group in question    */
+        mifi_t  mf6cc_parent;                   /* Where it arrived     */
+        struct if_set mf6cc_ifset;              /* Where it is going */
+};
+
+/*
+ *      Group count retrieval for pim6sd
+ */
+
+struct sioc_sg_req6 {
+        struct sockaddr_in6 src;
+        struct sockaddr_in6 grp;
+        unsigned long pktcnt;
+        unsigned long bytecnt;
+        unsigned long wrong_if;
+};
+
+/*
+ *      To get vif packet counts
+ */
+
+struct sioc_mif_req6 {
+        mifi_t  mifi;           /* Which iface */
+        unsigned long icount;   /* In packets */
+        unsigned long ocount;   /* Out packets */
+        unsigned long ibytes;   /* In bytes */
+        unsigned long obytes;   /* Out bytes */
+};
+
+/*
+ *      That's all usermode folks
+ */
+
+
+
+/*
+ * Structure used to communicate from kernel to multicast router.
+ * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
+ * used for IPv4 implementation). This is because this structure will be passed via an
+ * IPv6 raw socket, on which an application will only receiver the payload i.e the data after
+ * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
+ */
+
+struct mrt6msg {
+#define MRT6MSG_NOCACHE         1
+#define MRT6MSG_WRONGMIF        2
+#define MRT6MSG_WHOLEPKT        3               /* used for use level encap */
+        __u8            im6_mbz;                /* must be zero            */
+        __u8            im6_msgtype;            /* what type of message    */
+        __u16           im6_mif;                /* mif rec'd on            */
+        __u32           im6_pad;                /* padding for 64 bit arch */
+        struct in6_addr im6_src, im6_dst;
+};
+
+#endif /* _UAPI__LINUX_MROUTE6_H */
diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h
new file mode 100644
index 000000000000..996719f82e28
--- /dev/null
+++ b/include/uapi/linux/msdos_fs.h
@@ -0,0 +1,167 @@
+#ifndef _UAPI_LINUX_MSDOS_FS_H
+#define _UAPI_LINUX_MSDOS_FS_H
+
+#include <linux/types.h>
+#include <linux/magic.h>
+#include <asm/byteorder.h>
+
+/*
+ * The MS-DOS filesystem constants/structures
+ */
+
+#define SECTOR_SIZE     512             /* sector size (bytes) */
+#define SECTOR_BITS     9               /* log2(SECTOR_SIZE) */
+#define MSDOS_DPB       (MSDOS_DPS)     /* dir entries per block */
+#define MSDOS_DPB_BITS  4               /* log2(MSDOS_DPB) */
+#define MSDOS_DPS       (SECTOR_SIZE / sizeof(struct msdos_dir_entry))
+#define MSDOS_DPS_BITS  4               /* log2(MSDOS_DPS) */
+#define MSDOS_LONGNAME  256             /* maximum name length */
+#define CF_LE_W(v)      le16_to_cpu(v)
+#define CF_LE_L(v)      le32_to_cpu(v)
+#define CT_LE_W(v)      cpu_to_le16(v)
+#define CT_LE_L(v)      cpu_to_le32(v)
+
+#define MSDOS_ROOT_INO   1      /* The root inode number */
+#define MSDOS_FSINFO_INO 2      /* Used for managing the FSINFO block */
+
+#define MSDOS_DIR_BITS  5       /* log2(sizeof(struct msdos_dir_entry)) */
+
+/* directory limit */
+#define FAT_MAX_DIR_ENTRIES     (65536)
+#define FAT_MAX_DIR_SIZE        (FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS)
+
+#define ATTR_NONE       0       /* no attribute bits */
+#define ATTR_RO         1       /* read-only */
+#define ATTR_HIDDEN     2       /* hidden */
+#define ATTR_SYS        4       /* system */
+#define ATTR_VOLUME     8       /* volume label */
+#define ATTR_DIR        16      /* directory */
+#define ATTR_ARCH       32      /* archived */
+
+/* attribute bits that are copied "as is" */
+#define ATTR_UNUSED     (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
+/* bits that are used by the Windows 95/Windows NT extended FAT */
+#define ATTR_EXT        (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
+
+#define CASE_LOWER_BASE 8       /* base is lower case */
+#define CASE_LOWER_EXT  16      /* extension is lower case */
+
+#define DELETED_FLAG    0xe5    /* marks file as deleted when in name[0] */
+#define IS_FREE(n)      (!*(n) || *(n) == DELETED_FLAG)
+
+#define FAT_LFN_LEN     255     /* maximum long name length */
+#define MSDOS_NAME      11      /* maximum name length */
+#define MSDOS_SLOTS     21      /* max # of slots for short and long names */
+#define MSDOS_DOT       ".          "   /* ".", padded to MSDOS_NAME chars */
+#define MSDOS_DOTDOT    "..         "   /* "..", padded to MSDOS_NAME chars */
+
+#define FAT_FIRST_ENT(s, x)     ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
+        MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
+
+/* start of data cluster's entry (number of reserved clusters) */
+#define FAT_START_ENT   2
+
+/* maximum number of clusters */
+#define MAX_FAT12       0xFF4
+#define MAX_FAT16       0xFFF4
+#define MAX_FAT32       0x0FFFFFF6
+#define MAX_FAT(s)      (MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : \
+        MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12)
+
+/* bad cluster mark */
+#define BAD_FAT12       0xFF7
+#define BAD_FAT16       0xFFF7
+#define BAD_FAT32       0x0FFFFFF7
+
+/* standard EOF */
+#define EOF_FAT12       0xFFF
+#define EOF_FAT16       0xFFFF
+#define EOF_FAT32       0x0FFFFFFF
+
+#define FAT_ENT_FREE    (0)
+#define FAT_ENT_BAD     (BAD_FAT32)
+#define FAT_ENT_EOF     (EOF_FAT32)
+
+#define FAT_FSINFO_SIG1 0x41615252
+#define FAT_FSINFO_SIG2 0x61417272
+#define IS_FSINFO(x)    (le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 \
+                         && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2)
+
+struct __fat_dirent {
+        long            d_ino;
+        __kernel_off_t  d_off;
+        unsigned short  d_reclen;
+        char            d_name[256]; /* We must not include limits.h! */
+};
+
+/*
+ * ioctl commands
+ */
+#define VFAT_IOCTL_READDIR_BOTH         _IOR('r', 1, struct __fat_dirent[2])
+#define VFAT_IOCTL_READDIR_SHORT        _IOR('r', 2, struct __fat_dirent[2])
+/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
+#define FAT_IOCTL_GET_ATTRIBUTES        _IOR('r', 0x10, __u32)
+#define FAT_IOCTL_SET_ATTRIBUTES        _IOW('r', 0x11, __u32)
+
+struct fat_boot_sector {
+        __u8    ignored[3];     /* Boot strap short or near jump */
+        __u8    system_id[8];   /* Name - can be used to special case
+                                   partition manager volumes */
+        __u8    sector_size[2]; /* bytes per logical sector */
+        __u8    sec_per_clus;   /* sectors/cluster */
+        __le16  reserved;       /* reserved sectors */
+        __u8    fats;           /* number of FATs */
+        __u8    dir_entries[2]; /* root directory entries */
+        __u8    sectors[2];     /* number of sectors */
+        __u8    media;          /* media code */
+        __le16  fat_length;     /* sectors/FAT */
+        __le16  secs_track;     /* sectors per track */
+        __le16  heads;          /* number of heads */
+        __le32  hidden;         /* hidden sectors (unused) */
+        __le32  total_sect;     /* number of sectors (if sectors == 0) */
+
+        /* The following fields are only used by FAT32 */
+        __le32  fat32_length;   /* sectors/FAT */
+        __le16  flags;          /* bit 8: fat mirroring, low 4: active fat */
+        __u8    version[2];     /* major, minor filesystem version */
+        __le32  root_cluster;   /* first cluster in root directory */
+        __le16  info_sector;    /* filesystem info sector */
+        __le16  backup_boot;    /* backup boot sector */
+        __le16  reserved2[6];   /* Unused */
+};
+
+struct fat_boot_fsinfo {
+        __le32   signature1;    /* 0x41615252L */
+        __le32   reserved1[120];        /* Nothing as far as I can tell */
+        __le32   signature2;    /* 0x61417272L */
+        __le32   free_clusters; /* Free cluster count.  -1 if unknown */
+        __le32   next_cluster;  /* Most recently allocated cluster */
+        __le32   reserved2[4];
+};
+
+struct msdos_dir_entry {
+        __u8    name[MSDOS_NAME];/* name and extension */
+        __u8    attr;           /* attribute bits */
+        __u8    lcase;          /* Case for base and extension */
+        __u8    ctime_cs;       /* Creation time, centiseconds (0-199) */
+        __le16  ctime;          /* Creation time */
+        __le16  cdate;          /* Creation date */
+        __le16  adate;          /* Last access date */
+        __le16  starthi;        /* High 16 bits of cluster in FAT32 */
+        __le16  time,date,start;/* time, date and first cluster */
+        __le32  size;           /* file size (in bytes) */
+};
+
+/* Up to 13 characters of the name */
+struct msdos_dir_slot {
+        __u8    id;             /* sequence number for slot */
+        __u8    name0_4[10];    /* first 5 characters in name */
+        __u8    attr;           /* attribute byte */
+        __u8    reserved;       /* always 0 */
+        __u8    alias_checksum; /* checksum for 8.3 alias */
+        __u8    name5_10[12];   /* 6 more characters in name */
+        __le16   start;         /* starting cluster number, 0 in long slots */
+        __u8    name11_12[4];   /* last 2 characters in name */
+};
+
+#endif /* _UAPI_LINUX_MSDOS_FS_H */
diff --git a/include/uapi/linux/msg.h b/include/uapi/linux/msg.h
new file mode 100644
index 000000000000..78dbd2f996a3
--- /dev/null
+++ b/include/uapi/linux/msg.h
@@ -0,0 +1,75 @@
+#ifndef _UAPI_LINUX_MSG_H
+#define _UAPI_LINUX_MSG_H
+
+#include <linux/ipc.h>
+
+/* ipcs ctl commands */
+#define MSG_STAT 11
+#define MSG_INFO 12
+
+/* msgrcv options */
+#define MSG_NOERROR     010000  /* no error if message is too big */
+#define MSG_EXCEPT      020000  /* recv any msg except of specified type.*/
+
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
+struct msqid_ds {
+        struct ipc_perm msg_perm;
+        struct msg *msg_first;          /* first message on queue,unused  */
+        struct msg *msg_last;           /* last message in queue,unused */
+        __kernel_time_t msg_stime;      /* last msgsnd time */
+        __kernel_time_t msg_rtime;      /* last msgrcv time */
+        __kernel_time_t msg_ctime;      /* last change time */
+        unsigned long  msg_lcbytes;     /* Reuse junk fields for 32 bit */
+        unsigned long  msg_lqbytes;     /* ditto */
+        unsigned short msg_cbytes;      /* current number of bytes on queue */
+        unsigned short msg_qnum;        /* number of messages in queue */
+        unsigned short msg_qbytes;      /* max number of bytes on queue */
+        __kernel_ipc_pid_t msg_lspid;   /* pid of last msgsnd */
+        __kernel_ipc_pid_t msg_lrpid;   /* last receive pid */
+};
+
+/* Include the definition of msqid64_ds */
+#include <asm/msgbuf.h>
+
+/* message buffer for msgsnd and msgrcv calls */
+struct msgbuf {
+        long mtype;         /* type of message */
+        char mtext[1];      /* message text */
+};
+
+/* buffer for msgctl calls IPC_INFO, MSG_INFO */
+struct msginfo {
+        int msgpool;
+        int msgmap; 
+        int msgmax; 
+        int msgmnb; 
+        int msgmni; 
+        int msgssz; 
+        int msgtql; 
+        unsigned short  msgseg; 
+};
+
+/*
+ * Scaling factor to compute msgmni:
+ * the memory dedicated to msg queues (msgmni * msgmnb) should occupy
+ * at most 1/MSG_MEM_SCALE of the lowmem (see the formula in ipc/msg.c):
+ * up to 8MB       : msgmni = 16 (MSGMNI)
+ * 4 GB            : msgmni = 8K
+ * more than 16 GB : msgmni = 32K (IPCMNI)
+ */
+#define MSG_MEM_SCALE 32
+
+#define MSGMNI    16   /* <= IPCMNI */     /* max # of msg queue identifiers */
+#define MSGMAX  8192   /* <= INT_MAX */   /* max size of message (bytes) */
+#define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
+
+/* unused */
+#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
+#define MSGTQL  MSGMNB            /* number of system message headers */
+#define MSGMAP  MSGMNB            /* number of entries in message map */
+#define MSGSSZ  16                /* message segment size */
+#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
+#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
+
+
+#endif /* _UAPI_LINUX_MSG_H */
diff --git a/include/linux/mtio.h b/include/uapi/linux/mtio.h
index 18543e2db06f..18543e2db06f 100644
--- a/include/linux/mtio.h
+++ b/include/uapi/linux/mtio.h
diff --git a/include/uapi/linux/n_r3964.h b/include/uapi/linux/n_r3964.h
new file mode 100644
index 000000000000..81337cbf40b7
--- /dev/null
+++ b/include/uapi/linux/n_r3964.h
@@ -0,0 +1,98 @@
+/* r3964 linediscipline for linux
+ *
+ * -----------------------------------------------------------
+ * Copyright by
+ * Philips Automation Projects
+ * Kassel (Germany)
+ * -----------------------------------------------------------
+ * This software may be used and distributed according to the terms of
+ * the GNU General Public License, incorporated herein by reference.
+ *
+ * Author:
+ * L. Haag
+ *
+ * $Log: r3964.h,v $
+ * Revision 1.4  2005/12/21 19:54:24  Kurt Huwig <kurt huwig de>
+ * Fixed HZ usage on 2.6 kernels
+ * Removed unnecessary include
+ *
+ * Revision 1.3  2001/03/18 13:02:24  dwmw2
+ * Fix timer usage, use spinlocks properly.
+ *
+ * Revision 1.2  2001/03/18 12:53:15  dwmw2
+ * Merge changes in 2.4.2
+ *
+ * Revision 1.1.1.1  1998/10/13 16:43:14  dwmw2
+ * This'll screw the version control
+ *
+ * Revision 1.6  1998/09/30 00:40:38  dwmw2
+ * Updated to use kernel's N_R3964 if available
+ *
+ * Revision 1.4  1998/04/02 20:29:44  lhaag
+ * select, blocking, ...
+ *
+ * Revision 1.3  1998/02/12 18:58:43  root
+ * fixed some memory leaks
+ * calculation of checksum characters
+ *
+ * Revision 1.2  1998/02/07 13:03:17  root
+ * ioctl read_telegram
+ *
+ * Revision 1.1  1998/02/06 19:19:43  root
+ * Initial revision
+ *
+ *
+ */
+
+#ifndef _UAPI__LINUX_N_R3964_H__
+#define _UAPI__LINUX_N_R3964_H__
+
+/* line disciplines for r3964 protocol */
+
+
+/*
+ * Ioctl-commands
+ */
+
+#define R3964_ENABLE_SIGNALS      0x5301
+#define R3964_SETPRIORITY         0x5302
+#define R3964_USE_BCC             0x5303
+#define R3964_READ_TELEGRAM       0x5304
+
+/* Options for R3964_SETPRIORITY */
+#define R3964_MASTER   0
+#define R3964_SLAVE    1
+
+/* Options for R3964_ENABLE_SIGNALS */
+#define R3964_SIG_ACK   0x0001
+#define R3964_SIG_DATA  0x0002
+#define R3964_SIG_ALL   0x000f
+#define R3964_SIG_NONE  0x0000
+#define R3964_USE_SIGIO 0x1000
+
+/*
+ * r3964 operation states:
+ */
+
+/* types for msg_id: */
+enum {R3964_MSG_ACK=1, R3964_MSG_DATA };
+
+#define R3964_MAX_MSG_COUNT 32
+
+/* error codes for client messages */
+#define R3964_OK 0        /* no error. */
+#define R3964_TX_FAIL -1  /* transmission error, block NOT sent */
+#define R3964_OVERFLOW -2 /* msg queue overflow */
+
+/* the client gets this struct when calling read(fd,...): */
+struct r3964_client_message {
+          int     msg_id;
+          int     arg;
+          int     error_code;
+};
+
+#define R3964_MTU      256
+
+
+
+#endif /* _UAPI__LINUX_N_R3964_H__ */
diff --git a/include/uapi/linux/nbd.h b/include/uapi/linux/nbd.h
new file mode 100644
index 000000000000..dfb514472cbc
--- /dev/null
+++ b/include/uapi/linux/nbd.h
@@ -0,0 +1,77 @@
+/*
+ * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.
+ * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)
+ *            Made nbd_end_request() use the io_request_lock
+ * 2001 Copyright (C) Steven Whitehouse
+ *            New nbd_end_request() for compatibility with new linux block
+ *            layer code.
+ * 2003/06/24 Louis D. Langholtz <ldl@aros.net>
+ *            Removed unneeded blksize_bits field from nbd_device struct.
+ *            Cleanup PARANOIA usage & code.
+ * 2004/02/19 Paul Clements
+ *            Removed PARANOIA, plus various cleanup and comments
+ */
+
+#ifndef _UAPILINUX_NBD_H
+#define _UAPILINUX_NBD_H
+
+#include <linux/types.h>
+
+#define NBD_SET_SOCK    _IO( 0xab, 0 )
+#define NBD_SET_BLKSIZE _IO( 0xab, 1 )
+#define NBD_SET_SIZE    _IO( 0xab, 2 )
+#define NBD_DO_IT       _IO( 0xab, 3 )
+#define NBD_CLEAR_SOCK  _IO( 0xab, 4 )
+#define NBD_CLEAR_QUE   _IO( 0xab, 5 )
+#define NBD_PRINT_DEBUG _IO( 0xab, 6 )
+#define NBD_SET_SIZE_BLOCKS     _IO( 0xab, 7 )
+#define NBD_DISCONNECT  _IO( 0xab, 8 )
+#define NBD_SET_TIMEOUT _IO( 0xab, 9 )
+#define NBD_SET_FLAGS   _IO( 0xab, 10)
+
+enum {
+        NBD_CMD_READ = 0,
+        NBD_CMD_WRITE = 1,
+        NBD_CMD_DISC = 2,
+        /* there is a gap here to match userspace */
+        NBD_CMD_TRIM = 4
+};
+
+/* values for flags field */
+#define NBD_FLAG_HAS_FLAGS    (1 << 0) /* nbd-server supports flags */
+#define NBD_FLAG_READ_ONLY    (1 << 1) /* device is read-only */
+/* there is a gap here to match userspace */
+#define NBD_FLAG_SEND_TRIM    (1 << 5) /* send trim/discard */
+
+#define nbd_cmd(req) ((req)->cmd[0])
+
+/* userspace doesn't need the nbd_device structure */
+
+/* These are sent over the network in the request/reply magic fields */
+
+#define NBD_REQUEST_MAGIC 0x25609513
+#define NBD_REPLY_MAGIC 0x67446698
+/* Do *not* use magics: 0x12560953 0x96744668. */
+
+/*
+ * This is the packet used for communication between client and
+ * server. All data are in network byte order.
+ */
+struct nbd_request {
+        __be32 magic;
+        __be32 type;    /* == READ || == WRITE  */
+        char handle[8];
+        __be64 from;
+        __be32 len;
+} __attribute__((packed));
+
+/*
+ * This is the reply packet that nbd-server sends back to the client after
+ * it has completed an I/O request (or an error occurs).
+ */
+struct nbd_reply {
+        __be32 magic;
+        __be32 error;           /* 0 = ok, else error   */
+        char handle[8];         /* handle you got from request  */
+};
+#endif /* _UAPILINUX_NBD_H */
diff --git a/include/linux/ncp.h b/include/uapi/linux/ncp.h
index 99f0adeeb3f3..99f0adeeb3f3 100644
--- a/include/linux/ncp.h
+++ b/include/uapi/linux/ncp.h
diff --git a/include/linux/ncp_fs.h b/include/uapi/linux/ncp_fs.h
index e13eefef0653..e13eefef0653 100644
--- a/include/linux/ncp_fs.h
+++ b/include/uapi/linux/ncp_fs.h
diff --git a/include/linux/ncp_mount.h b/include/uapi/linux/ncp_mount.h
index dfcbea2d889f..dfcbea2d889f 100644
--- a/include/linux/ncp_mount.h
+++ b/include/uapi/linux/ncp_mount.h
diff --git a/include/linux/ncp_no.h b/include/uapi/linux/ncp_no.h
index cddaa48fb182..cddaa48fb182 100644
--- a/include/linux/ncp_no.h
+++ b/include/uapi/linux/ncp_no.h
diff --git a/include/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 275e5d65dcb2..275e5d65dcb2 100644
--- a/include/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
diff --git a/include/uapi/linux/net.h b/include/uapi/linux/net.h
new file mode 100644
index 000000000000..9457239ed219
--- /dev/null
+++ b/include/uapi/linux/net.h
@@ -0,0 +1,57 @@
+/*
+ * NET          An implementation of the SOCKET network access protocol.
+ *              This is the master header file for the Linux NET layer,
+ *              or, in plain English: the networking handling part of the
+ *              kernel.
+ *
+ * Version:     @(#)net.h       1.0.3   05/25/93
+ *
+ * Authors:     Orest Zborowski, <obz@Kodak.COM>
+ *              Ross Biro
+ *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_NET_H
+#define _UAPI_LINUX_NET_H
+
+#include <linux/socket.h>
+#include <asm/socket.h>
+
+#define NPROTO          AF_MAX
+
+#define SYS_SOCKET      1               /* sys_socket(2)                */
+#define SYS_BIND        2               /* sys_bind(2)                  */
+#define SYS_CONNECT     3               /* sys_connect(2)               */
+#define SYS_LISTEN      4               /* sys_listen(2)                */
+#define SYS_ACCEPT      5               /* sys_accept(2)                */
+#define SYS_GETSOCKNAME 6               /* sys_getsockname(2)           */
+#define SYS_GETPEERNAME 7               /* sys_getpeername(2)           */
+#define SYS_SOCKETPAIR  8               /* sys_socketpair(2)            */
+#define SYS_SEND        9               /* sys_send(2)                  */
+#define SYS_RECV        10              /* sys_recv(2)                  */
+#define SYS_SENDTO      11              /* sys_sendto(2)                */
+#define SYS_RECVFROM    12              /* sys_recvfrom(2)              */
+#define SYS_SHUTDOWN    13              /* sys_shutdown(2)              */
+#define SYS_SETSOCKOPT  14              /* sys_setsockopt(2)            */
+#define SYS_GETSOCKOPT  15              /* sys_getsockopt(2)            */
+#define SYS_SENDMSG     16              /* sys_sendmsg(2)               */
+#define SYS_RECVMSG     17              /* sys_recvmsg(2)               */
+#define SYS_ACCEPT4     18              /* sys_accept4(2)               */
+#define SYS_RECVMMSG    19              /* sys_recvmmsg(2)              */
+#define SYS_SENDMMSG    20              /* sys_sendmmsg(2)              */
+
+typedef enum {
+        SS_FREE = 0,                    /* not allocated                */
+        SS_UNCONNECTED,                 /* unconnected to any socket    */
+        SS_CONNECTING,                  /* in process of connecting     */
+        SS_CONNECTED,                   /* connected to socket          */
+        SS_DISCONNECTING                /* in process of disconnecting  */
+} socket_state;
+
+#define __SO_ACCEPTCON  (1 << 16)       /* performed a listen           */
+
+#endif /* _UAPI_LINUX_NET_H */
diff --git a/include/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h
index 2a739462caeb..2a739462caeb 100644
--- a/include/linux/net_dropmon.h
+++ b/include/uapi/linux/net_dropmon.h
diff --git a/include/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
index ae5df122e42f..ae5df122e42f 100644
--- a/include/linux/net_tstamp.h
+++ b/include/uapi/linux/net_tstamp.h
diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
new file mode 100644
index 000000000000..6b9500bc2d56
--- /dev/null
+++ b/include/uapi/linux/netdevice.h
@@ -0,0 +1,53 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions for the Interfaces handler.
+ *
+ * Version:     @(#)dev.h       1.0.10  08/12/93
+ *
+ * Authors:     Ross Biro
+ *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *              Corey Minyard <wf-rch!minyard@relay.EU.net>
+ *              Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
+ *              Alan Cox, <alan@lxorguk.ukuu.org.uk>
+ *              Bjorn Ekwall. <bj0rn@blox.se>
+ *              Pekka Riikonen <priikone@poseidon.pspt.fi>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ *              Moved to /usr/include/linux for NET3
+ */
+#ifndef _UAPI_LINUX_NETDEVICE_H
+#define _UAPI_LINUX_NETDEVICE_H
+
+#include <linux/if.h>
+#include <linux/if_ether.h>
+#include <linux/if_packet.h>
+#include <linux/if_link.h>
+
+
+#define MAX_ADDR_LEN    32              /* Largest hardware address length */
+
+/* Initial net device group. All devices belong to group 0 by default. */
+#define INIT_NETDEV_GROUP       0
+
+
+
+/* Media selection options. */
+enum {
+        IF_PORT_UNKNOWN = 0,
+        IF_PORT_10BASE2,
+        IF_PORT_10BASET,
+        IF_PORT_AUI,
+        IF_PORT_100BASET,
+        IF_PORT_100BASETX,
+        IF_PORT_100BASEFX
+};
+
+
+#endif /* _UAPI_LINUX_NETDEVICE_H */
diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
new file mode 100644
index 000000000000..f7dc0ebeeba5
--- /dev/null
+++ b/include/uapi/linux/netfilter.h
@@ -0,0 +1,72 @@
+#ifndef _UAPI__LINUX_NETFILTER_H
+#define _UAPI__LINUX_NETFILTER_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/sysctl.h>
+
+
+/* Responses from hook functions. */
+#define NF_DROP 0
+#define NF_ACCEPT 1
+#define NF_STOLEN 2
+#define NF_QUEUE 3
+#define NF_REPEAT 4
+#define NF_STOP 5
+#define NF_MAX_VERDICT NF_STOP
+
+/* we overload the higher bits for encoding auxiliary data such as the queue
+ * number or errno values. Not nice, but better than additional function
+ * arguments. */
+#define NF_VERDICT_MASK 0x000000ff
+
+/* extra verdict flags have mask 0x0000ff00 */
+#define NF_VERDICT_FLAG_QUEUE_BYPASS    0x00008000
+
+/* queue number (NF_QUEUE) or errno (NF_DROP) */
+#define NF_VERDICT_QMASK 0xffff0000
+#define NF_VERDICT_QBITS 16
+
+#define NF_QUEUE_NR(x) ((((x) << 16) & NF_VERDICT_QMASK) | NF_QUEUE)
+
+#define NF_DROP_ERR(x) (((-x) << 16) | NF_DROP)
+
+/* only for userspace compatibility */
+#ifndef __KERNEL__
+/* Generic cache responses from hook functions.
+   <= 0x2000 is used for protocol-flags. */
+#define NFC_UNKNOWN 0x4000
+#define NFC_ALTERED 0x8000
+
+/* NF_VERDICT_BITS should be 8 now, but userspace might break if this changes */
+#define NF_VERDICT_BITS 16
+#endif
+
+enum nf_inet_hooks {
+        NF_INET_PRE_ROUTING,
+        NF_INET_LOCAL_IN,
+        NF_INET_FORWARD,
+        NF_INET_LOCAL_OUT,
+        NF_INET_POST_ROUTING,
+        NF_INET_NUMHOOKS
+};
+
+enum {
+        NFPROTO_UNSPEC =  0,
+        NFPROTO_IPV4   =  2,
+        NFPROTO_ARP    =  3,
+        NFPROTO_BRIDGE =  7,
+        NFPROTO_IPV6   = 10,
+        NFPROTO_DECNET = 12,
+        NFPROTO_NUMPROTO,
+};
+
+union nf_inet_addr {
+        __u32           all[4];
+        __be32          ip;
+        __be32          ip6[4];
+        struct in_addr  in;
+        struct in6_addr in6;
+};
+
+#endif /* _UAPI__LINUX_NETFILTER_H */
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index 4afbace8e869..08f555fef13f 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -1,2 +1,78 @@
 # UAPI Header export list
 header-y += ipset/
+header-y += nf_conntrack_common.h
+header-y += nf_conntrack_ftp.h
+header-y += nf_conntrack_sctp.h
+header-y += nf_conntrack_tcp.h
+header-y += nf_conntrack_tuple_common.h
+header-y += nf_nat.h
+header-y += nfnetlink.h
+header-y += nfnetlink_acct.h
+header-y += nfnetlink_compat.h
+header-y += nfnetlink_conntrack.h
+header-y += nfnetlink_cthelper.h
+header-y += nfnetlink_cttimeout.h
+header-y += nfnetlink_log.h
+header-y += nfnetlink_queue.h
+header-y += x_tables.h
+header-y += xt_AUDIT.h
+header-y += xt_CHECKSUM.h
+header-y += xt_CLASSIFY.h
+header-y += xt_CONNMARK.h
+header-y += xt_CONNSECMARK.h
+header-y += xt_CT.h
+header-y += xt_DSCP.h
+header-y += xt_IDLETIMER.h
+header-y += xt_LED.h
+header-y += xt_LOG.h
+header-y += xt_MARK.h
+header-y += xt_NFLOG.h
+header-y += xt_NFQUEUE.h
+header-y += xt_RATEEST.h
+header-y += xt_SECMARK.h
+header-y += xt_TCPMSS.h
+header-y += xt_TCPOPTSTRIP.h
+header-y += xt_TEE.h
+header-y += xt_TPROXY.h
+header-y += xt_addrtype.h
+header-y += xt_cluster.h
+header-y += xt_comment.h
+header-y += xt_connbytes.h
+header-y += xt_connlimit.h
+header-y += xt_connmark.h
+header-y += xt_conntrack.h
+header-y += xt_cpu.h
+header-y += xt_dccp.h
+header-y += xt_devgroup.h
+header-y += xt_dscp.h
+header-y += xt_ecn.h
+header-y += xt_esp.h
+header-y += xt_hashlimit.h
+header-y += xt_helper.h
+header-y += xt_iprange.h
+header-y += xt_ipvs.h
+header-y += xt_length.h
+header-y += xt_limit.h
+header-y += xt_mac.h
+header-y += xt_mark.h
+header-y += xt_multiport.h
+header-y += xt_nfacct.h
+header-y += xt_osf.h
+header-y += xt_owner.h
+header-y += xt_physdev.h
+header-y += xt_pkttype.h
+header-y += xt_policy.h
+header-y += xt_quota.h
+header-y += xt_rateest.h
+header-y += xt_realm.h
+header-y += xt_recent.h
+header-y += xt_sctp.h
+header-y += xt_set.h
+header-y += xt_socket.h
+header-y += xt_state.h
+header-y += xt_statistic.h
+header-y += xt_string.h
+header-y += xt_tcpmss.h
+header-y += xt_tcpudp.h
+header-y += xt_time.h
+header-y += xt_u32.h
diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild
index aafaa5aa54d4..d2680423d9ab 100644
--- a/include/uapi/linux/netfilter/ipset/Kbuild
+++ b/include/uapi/linux/netfilter/ipset/Kbuild
@@ -1 +1,5 @@
 # UAPI Header export list
+header-y += ip_set.h
+header-y += ip_set_bitmap.h
+header-y += ip_set_hash.h
+header-y += ip_set_list.h
diff --git a/include/uapi/linux/netfilter/ipset/ip_set.h b/include/uapi/linux/netfilter/ipset/ip_set.h
new file mode 100644
index 000000000000..fbee42807a11
--- /dev/null
+++ b/include/uapi/linux/netfilter/ipset/ip_set.h
@@ -0,0 +1,231 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ *                         Patrick Schaaf <bof@bof.de>
+ *                         Martin Josefsson <gandalf@wlug.westbo.se>
+ * Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI_IP_SET_H
+#define _UAPI_IP_SET_H
+
+
+#include <linux/types.h>
+
+/* The protocol version */
+#define IPSET_PROTOCOL          6
+
+/* The max length of strings including NUL: set and type identifiers */
+#define IPSET_MAXNAMELEN        32
+
+/* Message types and commands */
+enum ipset_cmd {
+        IPSET_CMD_NONE,
+        IPSET_CMD_PROTOCOL,     /* 1: Return protocol version */
+        IPSET_CMD_CREATE,       /* 2: Create a new (empty) set */
+        IPSET_CMD_DESTROY,      /* 3: Destroy a (empty) set */
+        IPSET_CMD_FLUSH,        /* 4: Remove all elements from a set */
+        IPSET_CMD_RENAME,       /* 5: Rename a set */
+        IPSET_CMD_SWAP,         /* 6: Swap two sets */
+        IPSET_CMD_LIST,         /* 7: List sets */
+        IPSET_CMD_SAVE,         /* 8: Save sets */
+        IPSET_CMD_ADD,          /* 9: Add an element to a set */
+        IPSET_CMD_DEL,          /* 10: Delete an element from a set */
+        IPSET_CMD_TEST,         /* 11: Test an element in a set */
+        IPSET_CMD_HEADER,       /* 12: Get set header data only */
+        IPSET_CMD_TYPE,         /* 13: Get set type */
+        IPSET_MSG_MAX,          /* Netlink message commands */
+
+        /* Commands in userspace: */
+        IPSET_CMD_RESTORE = IPSET_MSG_MAX, /* 14: Enter restore mode */
+        IPSET_CMD_HELP,         /* 15: Get help */
+        IPSET_CMD_VERSION,      /* 16: Get program version */
+        IPSET_CMD_QUIT,         /* 17: Quit from interactive mode */
+
+        IPSET_CMD_MAX,
+
+        IPSET_CMD_COMMIT = IPSET_CMD_MAX, /* 18: Commit buffered commands */
+};
+
+/* Attributes at command level */
+enum {
+        IPSET_ATTR_UNSPEC,
+        IPSET_ATTR_PROTOCOL,    /* 1: Protocol version */
+        IPSET_ATTR_SETNAME,     /* 2: Name of the set */
+        IPSET_ATTR_TYPENAME,    /* 3: Typename */
+        IPSET_ATTR_SETNAME2 = IPSET_ATTR_TYPENAME, /* Setname at rename/swap */
+        IPSET_ATTR_REVISION,    /* 4: Settype revision */
+        IPSET_ATTR_FAMILY,      /* 5: Settype family */
+        IPSET_ATTR_FLAGS,       /* 6: Flags at command level */
+        IPSET_ATTR_DATA,        /* 7: Nested attributes */
+        IPSET_ATTR_ADT,         /* 8: Multiple data containers */
+        IPSET_ATTR_LINENO,      /* 9: Restore lineno */
+        IPSET_ATTR_PROTOCOL_MIN, /* 10: Minimal supported version number */
+        IPSET_ATTR_REVISION_MIN = IPSET_ATTR_PROTOCOL_MIN, /* type rev min */
+        __IPSET_ATTR_CMD_MAX,
+};
+#define IPSET_ATTR_CMD_MAX      (__IPSET_ATTR_CMD_MAX - 1)
+
+/* CADT specific attributes */
+enum {
+        IPSET_ATTR_IP = IPSET_ATTR_UNSPEC + 1,
+        IPSET_ATTR_IP_FROM = IPSET_ATTR_IP,
+        IPSET_ATTR_IP_TO,       /* 2 */
+        IPSET_ATTR_CIDR,        /* 3 */
+        IPSET_ATTR_PORT,        /* 4 */
+        IPSET_ATTR_PORT_FROM = IPSET_ATTR_PORT,
+        IPSET_ATTR_PORT_TO,     /* 5 */
+        IPSET_ATTR_TIMEOUT,     /* 6 */
+        IPSET_ATTR_PROTO,       /* 7 */
+        IPSET_ATTR_CADT_FLAGS,  /* 8 */
+        IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO,     /* 9 */
+        /* Reserve empty slots */
+        IPSET_ATTR_CADT_MAX = 16,
+        /* Create-only specific attributes */
+        IPSET_ATTR_GC,
+        IPSET_ATTR_HASHSIZE,
+        IPSET_ATTR_MAXELEM,
+        IPSET_ATTR_NETMASK,
+        IPSET_ATTR_PROBES,
+        IPSET_ATTR_RESIZE,
+        IPSET_ATTR_SIZE,
+        /* Kernel-only */
+        IPSET_ATTR_ELEMENTS,
+        IPSET_ATTR_REFERENCES,
+        IPSET_ATTR_MEMSIZE,
+
+        __IPSET_ATTR_CREATE_MAX,
+};
+#define IPSET_ATTR_CREATE_MAX   (__IPSET_ATTR_CREATE_MAX - 1)
+
+/* ADT specific attributes */
+enum {
+        IPSET_ATTR_ETHER = IPSET_ATTR_CADT_MAX + 1,
+        IPSET_ATTR_NAME,
+        IPSET_ATTR_NAMEREF,
+        IPSET_ATTR_IP2,
+        IPSET_ATTR_CIDR2,
+        IPSET_ATTR_IP2_TO,
+        IPSET_ATTR_IFACE,
+        __IPSET_ATTR_ADT_MAX,
+};
+#define IPSET_ATTR_ADT_MAX      (__IPSET_ATTR_ADT_MAX - 1)
+
+/* IP specific attributes */
+enum {
+        IPSET_ATTR_IPADDR_IPV4 = IPSET_ATTR_UNSPEC + 1,
+        IPSET_ATTR_IPADDR_IPV6,
+        __IPSET_ATTR_IPADDR_MAX,
+};
+#define IPSET_ATTR_IPADDR_MAX   (__IPSET_ATTR_IPADDR_MAX - 1)
+
+/* Error codes */
+enum ipset_errno {
+        IPSET_ERR_PRIVATE = 4096,
+        IPSET_ERR_PROTOCOL,
+        IPSET_ERR_FIND_TYPE,
+        IPSET_ERR_MAX_SETS,
+        IPSET_ERR_BUSY,
+        IPSET_ERR_EXIST_SETNAME2,
+        IPSET_ERR_TYPE_MISMATCH,
+        IPSET_ERR_EXIST,
+        IPSET_ERR_INVALID_CIDR,
+        IPSET_ERR_INVALID_NETMASK,
+        IPSET_ERR_INVALID_FAMILY,
+        IPSET_ERR_TIMEOUT,
+        IPSET_ERR_REFERENCED,
+        IPSET_ERR_IPADDR_IPV4,
+        IPSET_ERR_IPADDR_IPV6,
+
+        /* Type specific error codes */
+        IPSET_ERR_TYPE_SPECIFIC = 4352,
+};
+
+/* Flags at command level */
+enum ipset_cmd_flags {
+        IPSET_FLAG_BIT_EXIST    = 0,
+        IPSET_FLAG_EXIST        = (1 << IPSET_FLAG_BIT_EXIST),
+        IPSET_FLAG_BIT_LIST_SETNAME = 1,
+        IPSET_FLAG_LIST_SETNAME = (1 << IPSET_FLAG_BIT_LIST_SETNAME),
+        IPSET_FLAG_BIT_LIST_HEADER = 2,
+        IPSET_FLAG_LIST_HEADER  = (1 << IPSET_FLAG_BIT_LIST_HEADER),
+        IPSET_FLAG_CMD_MAX = 15,        /* Lower half */
+};
+
+/* Flags at CADT attribute level */
+enum ipset_cadt_flags {
+        IPSET_FLAG_BIT_BEFORE   = 0,
+        IPSET_FLAG_BEFORE       = (1 << IPSET_FLAG_BIT_BEFORE),
+        IPSET_FLAG_BIT_PHYSDEV  = 1,
+        IPSET_FLAG_PHYSDEV      = (1 << IPSET_FLAG_BIT_PHYSDEV),
+        IPSET_FLAG_BIT_NOMATCH  = 2,
+        IPSET_FLAG_NOMATCH      = (1 << IPSET_FLAG_BIT_NOMATCH),
+        IPSET_FLAG_CADT_MAX     = 15,   /* Upper half */
+};
+
+/* Commands with settype-specific attributes */
+enum ipset_adt {
+        IPSET_ADD,
+        IPSET_DEL,
+        IPSET_TEST,
+        IPSET_ADT_MAX,
+        IPSET_CREATE = IPSET_ADT_MAX,
+        IPSET_CADT_MAX,
+};
+
+/* Sets are identified by an index in kernel space. Tweak with ip_set_id_t
+ * and IPSET_INVALID_ID if you want to increase the max number of sets.
+ */
+typedef __u16 ip_set_id_t;
+
+#define IPSET_INVALID_ID                65535
+
+enum ip_set_dim {
+        IPSET_DIM_ZERO = 0,
+        IPSET_DIM_ONE,
+        IPSET_DIM_TWO,
+        IPSET_DIM_THREE,
+        /* Max dimension in elements.
+         * If changed, new revision of iptables match/target is required.
+         */
+        IPSET_DIM_MAX = 6,
+        IPSET_BIT_RETURN_NOMATCH = 7,
+};
+
+/* Option flags for kernel operations */
+enum ip_set_kopt {
+        IPSET_INV_MATCH = (1 << IPSET_DIM_ZERO),
+        IPSET_DIM_ONE_SRC = (1 << IPSET_DIM_ONE),
+        IPSET_DIM_TWO_SRC = (1 << IPSET_DIM_TWO),
+        IPSET_DIM_THREE_SRC = (1 << IPSET_DIM_THREE),
+        IPSET_RETURN_NOMATCH = (1 << IPSET_BIT_RETURN_NOMATCH),
+};
+
+
+/* Interface to iptables/ip6tables */
+
+#define SO_IP_SET               83
+
+union ip_set_name_index {
+        char name[IPSET_MAXNAMELEN];
+        ip_set_id_t index;
+};
+
+#define IP_SET_OP_GET_BYNAME    0x00000006      /* Get set index by name */
+struct ip_set_req_get_set {
+        unsigned int op;
+        unsigned int version;
+        union ip_set_name_index set;
+};
+
+#define IP_SET_OP_GET_BYINDEX   0x00000007      /* Get set name by index */
+/* Uses ip_set_req_get_set */
+
+#define IP_SET_OP_VERSION       0x00000100      /* Ask kernel version */
+struct ip_set_req_version {
+        unsigned int op;
+        unsigned int version;
+};
+
+#endif /* _UAPI_IP_SET_H */
diff --git a/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h b/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
new file mode 100644
index 000000000000..6a2c038d1888
--- /dev/null
+++ b/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
@@ -0,0 +1,13 @@
+#ifndef _UAPI__IP_SET_BITMAP_H
+#define _UAPI__IP_SET_BITMAP_H
+
+/* Bitmap type specific error codes */
+enum {
+        /* The element is out of the range of the set */
+        IPSET_ERR_BITMAP_RANGE = IPSET_ERR_TYPE_SPECIFIC,
+        /* The range exceeds the size limit of the set type */
+        IPSET_ERR_BITMAP_RANGE_SIZE,
+};
+
+
+#endif /* _UAPI__IP_SET_BITMAP_H */
diff --git a/include/uapi/linux/netfilter/ipset/ip_set_hash.h b/include/uapi/linux/netfilter/ipset/ip_set_hash.h
new file mode 100644
index 000000000000..352eeccdc7f2
--- /dev/null
+++ b/include/uapi/linux/netfilter/ipset/ip_set_hash.h
@@ -0,0 +1,21 @@
+#ifndef _UAPI__IP_SET_HASH_H
+#define _UAPI__IP_SET_HASH_H
+
+/* Hash type specific error codes */
+enum {
+        /* Hash is full */
+        IPSET_ERR_HASH_FULL = IPSET_ERR_TYPE_SPECIFIC,
+        /* Null-valued element */
+        IPSET_ERR_HASH_ELEM,
+        /* Invalid protocol */
+        IPSET_ERR_INVALID_PROTO,
+        /* Protocol missing but must be specified */
+        IPSET_ERR_MISSING_PROTO,
+        /* Range not supported */
+        IPSET_ERR_HASH_RANGE_UNSUPPORTED,
+        /* Invalid range */
+        IPSET_ERR_HASH_RANGE,
+};
+
+
+#endif /* _UAPI__IP_SET_HASH_H */
diff --git a/include/uapi/linux/netfilter/ipset/ip_set_list.h b/include/uapi/linux/netfilter/ipset/ip_set_list.h
new file mode 100644
index 000000000000..a44efaa98213
--- /dev/null
+++ b/include/uapi/linux/netfilter/ipset/ip_set_list.h
@@ -0,0 +1,21 @@
+#ifndef _UAPI__IP_SET_LIST_H
+#define _UAPI__IP_SET_LIST_H
+
+/* List type specific error codes */
+enum {
+        /* Set name to be added/deleted/tested does not exist. */
+        IPSET_ERR_NAME = IPSET_ERR_TYPE_SPECIFIC,
+        /* list:set type is not permitted to add */
+        IPSET_ERR_LOOP,
+        /* Missing reference set */
+        IPSET_ERR_BEFORE,
+        /* Reference set does not exist */
+        IPSET_ERR_NAMEREF,
+        /* Set is full */
+        IPSET_ERR_LIST_FULL,
+        /* Reference set is not added to the set */
+        IPSET_ERR_REF_EXIST,
+};
+
+
+#endif /* _UAPI__IP_SET_LIST_H */
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h
new file mode 100644
index 000000000000..1644cdd8be91
--- /dev/null
+++ b/include/uapi/linux/netfilter/nf_conntrack_common.h
@@ -0,0 +1,117 @@
+#ifndef _UAPI_NF_CONNTRACK_COMMON_H
+#define _UAPI_NF_CONNTRACK_COMMON_H
+/* Connection state tracking for netfilter.  This is separated from,
+   but required by, the NAT layer; it can also be used by an iptables
+   extension. */
+enum ip_conntrack_info {
+        /* Part of an established connection (either direction). */
+        IP_CT_ESTABLISHED,
+
+        /* Like NEW, but related to an existing connection, or ICMP error
+           (in either direction). */
+        IP_CT_RELATED,
+
+        /* Started a new connection to track (only
+           IP_CT_DIR_ORIGINAL); may be a retransmission. */
+        IP_CT_NEW,
+
+        /* >= this indicates reply direction */
+        IP_CT_IS_REPLY,
+
+        IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,
+        IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,
+        IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,   
+        /* Number of distinct IP_CT types (no NEW in reply dirn). */
+        IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
+};
+
+/* Bitset representing status of connection. */
+enum ip_conntrack_status {
+        /* It's an expected connection: bit 0 set.  This bit never changed */
+        IPS_EXPECTED_BIT = 0,
+        IPS_EXPECTED = (1 << IPS_EXPECTED_BIT),
+
+        /* We've seen packets both ways: bit 1 set.  Can be set, not unset. */
+        IPS_SEEN_REPLY_BIT = 1,
+        IPS_SEEN_REPLY = (1 << IPS_SEEN_REPLY_BIT),
+
+        /* Conntrack should never be early-expired. */
+        IPS_ASSURED_BIT = 2,
+        IPS_ASSURED = (1 << IPS_ASSURED_BIT),
+
+        /* Connection is confirmed: originating packet has left box */
+        IPS_CONFIRMED_BIT = 3,
+        IPS_CONFIRMED = (1 << IPS_CONFIRMED_BIT),
+
+        /* Connection needs src nat in orig dir.  This bit never changed. */
+        IPS_SRC_NAT_BIT = 4,
+        IPS_SRC_NAT = (1 << IPS_SRC_NAT_BIT),
+
+        /* Connection needs dst nat in orig dir.  This bit never changed. */
+        IPS_DST_NAT_BIT = 5,
+        IPS_DST_NAT = (1 << IPS_DST_NAT_BIT),
+
+        /* Both together. */
+        IPS_NAT_MASK = (IPS_DST_NAT | IPS_SRC_NAT),
+
+        /* Connection needs TCP sequence adjusted. */
+        IPS_SEQ_ADJUST_BIT = 6,
+        IPS_SEQ_ADJUST = (1 << IPS_SEQ_ADJUST_BIT),
+
+        /* NAT initialization bits. */
+        IPS_SRC_NAT_DONE_BIT = 7,
+        IPS_SRC_NAT_DONE = (1 << IPS_SRC_NAT_DONE_BIT),
+
+        IPS_DST_NAT_DONE_BIT = 8,
+        IPS_DST_NAT_DONE = (1 << IPS_DST_NAT_DONE_BIT),
+
+        /* Both together */
+        IPS_NAT_DONE_MASK = (IPS_DST_NAT_DONE | IPS_SRC_NAT_DONE),
+
+        /* Connection is dying (removed from lists), can not be unset. */
+        IPS_DYING_BIT = 9,
+        IPS_DYING = (1 << IPS_DYING_BIT),
+
+        /* Connection has fixed timeout. */
+        IPS_FIXED_TIMEOUT_BIT = 10,
+        IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
+
+        /* Conntrack is a template */
+        IPS_TEMPLATE_BIT = 11,
+        IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT),
+
+        /* Conntrack is a fake untracked entry */
+        IPS_UNTRACKED_BIT = 12,
+        IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
+
+        /* Conntrack got a helper explicitly attached via CT target. */
+        IPS_HELPER_BIT = 13,
+        IPS_HELPER = (1 << IPS_HELPER_BIT),
+};
+
+/* Connection tracking event types */
+enum ip_conntrack_events {
+        IPCT_NEW,               /* new conntrack */
+        IPCT_RELATED,           /* related conntrack */
+        IPCT_DESTROY,           /* destroyed conntrack */
+        IPCT_REPLY,             /* connection has seen two-way traffic */
+        IPCT_ASSURED,           /* connection status has changed to assured */
+        IPCT_PROTOINFO,         /* protocol information has changed */
+        IPCT_HELPER,            /* new helper has been set */
+        IPCT_MARK,              /* new mark has been set */
+        IPCT_NATSEQADJ,         /* NAT is doing sequence adjustment */
+        IPCT_SECMARK,           /* new security mark has been set */
+};
+
+enum ip_conntrack_expect_events {
+        IPEXP_NEW,              /* new expectation */
+        IPEXP_DESTROY,          /* destroyed expectation */
+};
+
+/* expectation flags */
+#define NF_CT_EXPECT_PERMANENT          0x1
+#define NF_CT_EXPECT_INACTIVE           0x2
+#define NF_CT_EXPECT_USERSPACE          0x4
+
+
+#endif /* _UAPI_NF_CONNTRACK_COMMON_H */
diff --git a/include/uapi/linux/netfilter/nf_conntrack_ftp.h b/include/uapi/linux/netfilter/nf_conntrack_ftp.h
new file mode 100644
index 000000000000..1030315a41b5
--- /dev/null
+++ b/include/uapi/linux/netfilter/nf_conntrack_ftp.h
@@ -0,0 +1,18 @@
+#ifndef _UAPI_NF_CONNTRACK_FTP_H
+#define _UAPI_NF_CONNTRACK_FTP_H
+/* FTP tracking. */
+
+/* This enum is exposed to userspace */
+enum nf_ct_ftp_type {
+        /* PORT command from client */
+        NF_CT_FTP_PORT,
+        /* PASV response from server */
+        NF_CT_FTP_PASV,
+        /* EPRT command from client */
+        NF_CT_FTP_EPRT,
+        /* EPSV response from server */
+        NF_CT_FTP_EPSV,
+};
+
+
+#endif /* _UAPI_NF_CONNTRACK_FTP_H */
diff --git a/include/linux/netfilter/nf_conntrack_sctp.h b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
index ceeefe6681b5..ceeefe6681b5 100644
--- a/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
diff --git a/include/uapi/linux/netfilter/nf_conntrack_tcp.h b/include/uapi/linux/netfilter/nf_conntrack_tcp.h
new file mode 100644
index 000000000000..9993a421201c
--- /dev/null
+++ b/include/uapi/linux/netfilter/nf_conntrack_tcp.h
@@ -0,0 +1,51 @@
+#ifndef _UAPI_NF_CONNTRACK_TCP_H
+#define _UAPI_NF_CONNTRACK_TCP_H
+/* TCP tracking. */
+
+#include <linux/types.h>
+
+/* This is exposed to userspace (ctnetlink) */
+enum tcp_conntrack {
+        TCP_CONNTRACK_NONE,
+        TCP_CONNTRACK_SYN_SENT,
+        TCP_CONNTRACK_SYN_RECV,
+        TCP_CONNTRACK_ESTABLISHED,
+        TCP_CONNTRACK_FIN_WAIT,
+        TCP_CONNTRACK_CLOSE_WAIT,
+        TCP_CONNTRACK_LAST_ACK,
+        TCP_CONNTRACK_TIME_WAIT,
+        TCP_CONNTRACK_CLOSE,
+        TCP_CONNTRACK_LISTEN,   /* obsolete */
+#define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
+        TCP_CONNTRACK_MAX,
+        TCP_CONNTRACK_IGNORE,
+        TCP_CONNTRACK_RETRANS,
+        TCP_CONNTRACK_UNACK,
+        TCP_CONNTRACK_TIMEOUT_MAX
+};
+
+/* Window scaling is advertised by the sender */
+#define IP_CT_TCP_FLAG_WINDOW_SCALE             0x01
+
+/* SACK is permitted by the sender */
+#define IP_CT_TCP_FLAG_SACK_PERM                0x02
+
+/* This sender sent FIN first */
+#define IP_CT_TCP_FLAG_CLOSE_INIT               0x04
+
+/* Be liberal in window checking */
+#define IP_CT_TCP_FLAG_BE_LIBERAL               0x08
+
+/* Has unacknowledged data */
+#define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED      0x10
+
+/* The field td_maxack has been set */
+#define IP_CT_TCP_FLAG_MAXACK_SET               0x20
+
+struct nf_ct_tcp_flags {
+        __u8 flags;
+        __u8 mask;
+};
+
+
+#endif /* _UAPI_NF_CONNTRACK_TCP_H */
diff --git a/include/linux/netfilter/nf_conntrack_tuple_common.h b/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
index 2f6bbc5b8125..2f6bbc5b8125 100644
--- a/include/linux/netfilter/nf_conntrack_tuple_common.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/include/linux/netfilter/nf_nat.h b/include/uapi/linux/netfilter/nf_nat.h
index bf0cc373ffb6..bf0cc373ffb6 100644
--- a/include/linux/netfilter/nf_nat.h
+++ b/include/uapi/linux/netfilter/nf_nat.h
diff --git a/include/uapi/linux/netfilter/nfnetlink.h b/include/uapi/linux/netfilter/nfnetlink.h
new file mode 100644
index 000000000000..4a4efafad5f4
--- /dev/null
+++ b/include/uapi/linux/netfilter/nfnetlink.h
@@ -0,0 +1,56 @@
+#ifndef _UAPI_NFNETLINK_H
+#define _UAPI_NFNETLINK_H
+#include <linux/types.h>
+#include <linux/netfilter/nfnetlink_compat.h>
+
+enum nfnetlink_groups {
+        NFNLGRP_NONE,
+#define NFNLGRP_NONE                    NFNLGRP_NONE
+        NFNLGRP_CONNTRACK_NEW,
+#define NFNLGRP_CONNTRACK_NEW           NFNLGRP_CONNTRACK_NEW
+        NFNLGRP_CONNTRACK_UPDATE,
+#define NFNLGRP_CONNTRACK_UPDATE        NFNLGRP_CONNTRACK_UPDATE
+        NFNLGRP_CONNTRACK_DESTROY,
+#define NFNLGRP_CONNTRACK_DESTROY       NFNLGRP_CONNTRACK_DESTROY
+        NFNLGRP_CONNTRACK_EXP_NEW,
+#define NFNLGRP_CONNTRACK_EXP_NEW       NFNLGRP_CONNTRACK_EXP_NEW
+        NFNLGRP_CONNTRACK_EXP_UPDATE,
+#define NFNLGRP_CONNTRACK_EXP_UPDATE    NFNLGRP_CONNTRACK_EXP_UPDATE
+        NFNLGRP_CONNTRACK_EXP_DESTROY,
+#define NFNLGRP_CONNTRACK_EXP_DESTROY   NFNLGRP_CONNTRACK_EXP_DESTROY
+        __NFNLGRP_MAX,
+};
+#define NFNLGRP_MAX     (__NFNLGRP_MAX - 1)
+
+/* General form of address family dependent message.
+ */
+struct nfgenmsg {
+        __u8  nfgen_family;             /* AF_xxx */
+        __u8  version;          /* nfnetlink version */
+        __be16    res_id;               /* resource id */
+};
+
+#define NFNETLINK_V0    0
+
+/* netfilter netlink message types are split in two pieces:
+ * 8 bit subsystem, 8bit operation.
+ */
+
+#define NFNL_SUBSYS_ID(x)       ((x & 0xff00) >> 8)
+#define NFNL_MSG_TYPE(x)        (x & 0x00ff)
+
+/* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS()
+ * won't work anymore */
+#define NFNL_SUBSYS_NONE                0
+#define NFNL_SUBSYS_CTNETLINK           1
+#define NFNL_SUBSYS_CTNETLINK_EXP       2
+#define NFNL_SUBSYS_QUEUE               3
+#define NFNL_SUBSYS_ULOG                4
+#define NFNL_SUBSYS_OSF                 5
+#define NFNL_SUBSYS_IPSET               6
+#define NFNL_SUBSYS_ACCT                7
+#define NFNL_SUBSYS_CTNETLINK_TIMEOUT   8
+#define NFNL_SUBSYS_CTHELPER            9
+#define NFNL_SUBSYS_COUNT               10
+
+#endif /* _UAPI_NFNETLINK_H */
diff --git a/include/uapi/linux/netfilter/nfnetlink_acct.h b/include/uapi/linux/netfilter/nfnetlink_acct.h
new file mode 100644
index 000000000000..c7b6269e760b
--- /dev/null
+++ b/include/uapi/linux/netfilter/nfnetlink_acct.h
@@ -0,0 +1,27 @@
+#ifndef _UAPI_NFNL_ACCT_H_
+#define _UAPI_NFNL_ACCT_H_
+
+#ifndef NFACCT_NAME_MAX
+#define NFACCT_NAME_MAX         32
+#endif
+
+enum nfnl_acct_msg_types {
+        NFNL_MSG_ACCT_NEW,
+        NFNL_MSG_ACCT_GET,
+        NFNL_MSG_ACCT_GET_CTRZERO,
+        NFNL_MSG_ACCT_DEL,
+        NFNL_MSG_ACCT_MAX
+};
+
+enum nfnl_acct_type {
+        NFACCT_UNSPEC,
+        NFACCT_NAME,
+        NFACCT_PKTS,
+        NFACCT_BYTES,
+        NFACCT_USE,
+        __NFACCT_MAX
+};
+#define NFACCT_MAX (__NFACCT_MAX - 1)
+
+
+#endif /* _UAPI_NFNL_ACCT_H_ */
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/uapi/linux/netfilter/nfnetlink_compat.h
index ffb95036bbd4..ffb95036bbd4 100644
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/uapi/linux/netfilter/nfnetlink_compat.h
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index 43bfe3e1685b..43bfe3e1685b 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
diff --git a/include/linux/netfilter/nfnetlink_cthelper.h b/include/uapi/linux/netfilter/nfnetlink_cthelper.h
index 33659f6fad3e..33659f6fad3e 100644
--- a/include/linux/netfilter/nfnetlink_cthelper.h
+++ b/include/uapi/linux/netfilter/nfnetlink_cthelper.h
diff --git a/include/linux/netfilter/nfnetlink_cttimeout.h b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
index a2810a7c5e30..a2810a7c5e30 100644
--- a/include/linux/netfilter/nfnetlink_cttimeout.h
+++ b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/uapi/linux/netfilter/nfnetlink_log.h
index 90c2c9575bac..90c2c9575bac 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/uapi/linux/netfilter/nfnetlink_log.h
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/uapi/linux/netfilter/nfnetlink_queue.h
index 70ec8c2bc11a..70ec8c2bc11a 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/uapi/linux/netfilter/nfnetlink_queue.h
diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h
new file mode 100644
index 000000000000..c36969b91533
--- /dev/null
+++ b/include/uapi/linux/netfilter/x_tables.h
@@ -0,0 +1,187 @@
+#ifndef _UAPI_X_TABLES_H
+#define _UAPI_X_TABLES_H
+#include <linux/kernel.h>
+#include <linux/types.h>
+
+#define XT_FUNCTION_MAXNAMELEN 30
+#define XT_EXTENSION_MAXNAMELEN 29
+#define XT_TABLE_MAXNAMELEN 32
+
+struct xt_entry_match {
+        union {
+                struct {
+                        __u16 match_size;
+
+                        /* Used by userspace */
+                        char name[XT_EXTENSION_MAXNAMELEN];
+                        __u8 revision;
+                } user;
+                struct {
+                        __u16 match_size;
+
+                        /* Used inside the kernel */
+                        struct xt_match *match;
+                } kernel;
+
+                /* Total length */
+                __u16 match_size;
+        } u;
+
+        unsigned char data[0];
+};
+
+struct xt_entry_target {
+        union {
+                struct {
+                        __u16 target_size;
+
+                        /* Used by userspace */
+                        char name[XT_EXTENSION_MAXNAMELEN];
+                        __u8 revision;
+                } user;
+                struct {
+                        __u16 target_size;
+
+                        /* Used inside the kernel */
+                        struct xt_target *target;
+                } kernel;
+
+                /* Total length */
+                __u16 target_size;
+        } u;
+
+        unsigned char data[0];
+};
+
+#define XT_TARGET_INIT(__name, __size)                                         \
+{                                                                              \
+        .target.u.user = {                                                     \
+                .target_size    = XT_ALIGN(__size),                            \
+                .name           = __name,                                      \
+        },                                                                     \
+}
+
+struct xt_standard_target {
+        struct xt_entry_target target;
+        int verdict;
+};
+
+struct xt_error_target {
+        struct xt_entry_target target;
+        char errorname[XT_FUNCTION_MAXNAMELEN];
+};
+
+/* The argument to IPT_SO_GET_REVISION_*.  Returns highest revision
+ * kernel supports, if >= revision. */
+struct xt_get_revision {
+        char name[XT_EXTENSION_MAXNAMELEN];
+        __u8 revision;
+};
+
+/* CONTINUE verdict for targets */
+#define XT_CONTINUE 0xFFFFFFFF
+
+/* For standard target */
+#define XT_RETURN (-NF_REPEAT - 1)
+
+/* this is a dummy structure to find out the alignment requirement for a struct
+ * containing all the fundamental data types that are used in ipt_entry,
+ * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
+ * personal pleasure to remove it -HW
+ */
+struct _xt_align {
+        __u8 u8;
+        __u16 u16;
+        __u32 u32;
+        __u64 u64;
+};
+
+#define XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _xt_align))
+
+/* Standard return verdict, or do jump. */
+#define XT_STANDARD_TARGET ""
+/* Error verdict. */
+#define XT_ERROR_TARGET "ERROR"
+
+#define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
+#define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
+
+struct xt_counters {
+        __u64 pcnt, bcnt;                       /* Packet and byte counters */
+};
+
+/* The argument to IPT_SO_ADD_COUNTERS. */
+struct xt_counters_info {
+        /* Which table. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        unsigned int num_counters;
+
+        /* The counters (actually `number' of these). */
+        struct xt_counters counters[0];
+};
+
+#define XT_INV_PROTO            0x40    /* Invert the sense of PROTO. */
+
+#ifndef __KERNEL__
+/* fn returns 0 to continue iteration */
+#define XT_MATCH_ITERATE(type, e, fn, args...)                  \
+({                                                              \
+        unsigned int __i;                                       \
+        int __ret = 0;                                          \
+        struct xt_entry_match *__m;                             \
+                                                                \
+        for (__i = sizeof(type);                                \
+             __i < (e)->target_offset;                          \
+             __i += __m->u.match_size) {                        \
+                __m = (void *)e + __i;                          \
+                                                                \
+                __ret = fn(__m , ## args);                      \
+                if (__ret != 0)                                 \
+                        break;                                  \
+        }                                                       \
+        __ret;                                                  \
+})
+
+/* fn returns 0 to continue iteration */
+#define XT_ENTRY_ITERATE_CONTINUE(type, entries, size, n, fn, args...) \
+({                                                              \
+        unsigned int __i, __n;                                  \
+        int __ret = 0;                                          \
+        type *__entry;                                          \
+                                                                \
+        for (__i = 0, __n = 0; __i < (size);                    \
+             __i += __entry->next_offset, __n++) {              \
+                __entry = (void *)(entries) + __i;              \
+                if (__n < n)                                    \
+                        continue;                               \
+                                                                \
+                __ret = fn(__entry , ## args);                  \
+                if (__ret != 0)                                 \
+                        break;                                  \
+        }                                                       \
+        __ret;                                                  \
+})
+
+/* fn returns 0 to continue iteration */
+#define XT_ENTRY_ITERATE(type, entries, size, fn, args...) \
+        XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args)
+
+#endif /* !__KERNEL__ */
+
+/* pos is normally a struct ipt_entry/ip6t_entry/etc. */
+#define xt_entry_foreach(pos, ehead, esize) \
+        for ((pos) = (typeof(pos))(ehead); \
+             (pos) < (typeof(pos))((char *)(ehead) + (esize)); \
+             (pos) = (typeof(pos))((char *)(pos) + (pos)->next_offset))
+
+/* can only be xt_entry_match, so no use of typeof here */
+#define xt_ematch_foreach(pos, entry) \
+        for ((pos) = (struct xt_entry_match *)entry->elems; \
+             (pos) < (struct xt_entry_match *)((char *)(entry) + \
+                     (entry)->target_offset); \
+             (pos) = (struct xt_entry_match *)((char *)(pos) + \
+                     (pos)->u.match_size))
+
+
+#endif /* _UAPI_X_TABLES_H */
diff --git a/include/linux/netfilter/xt_AUDIT.h b/include/uapi/linux/netfilter/xt_AUDIT.h
index 38751d2ea52b..38751d2ea52b 100644
--- a/include/linux/netfilter/xt_AUDIT.h
+++ b/include/uapi/linux/netfilter/xt_AUDIT.h
diff --git a/include/linux/netfilter/xt_CHECKSUM.h b/include/uapi/linux/netfilter/xt_CHECKSUM.h
index 9a2e4661654e..9a2e4661654e 100644
--- a/include/linux/netfilter/xt_CHECKSUM.h
+++ b/include/uapi/linux/netfilter/xt_CHECKSUM.h
diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/uapi/linux/netfilter/xt_CLASSIFY.h
index a813bf14dd63..a813bf14dd63 100644
--- a/include/linux/netfilter/xt_CLASSIFY.h
+++ b/include/uapi/linux/netfilter/xt_CLASSIFY.h
diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
index 2f2e48ec8023..2f2e48ec8023 100644
--- a/include/linux/netfilter/xt_CONNMARK.h
+++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
diff --git a/include/linux/netfilter/xt_CONNSECMARK.h b/include/uapi/linux/netfilter/xt_CONNSECMARK.h
index b973ff80fa1e..b973ff80fa1e 100644
--- a/include/linux/netfilter/xt_CONNSECMARK.h
+++ b/include/uapi/linux/netfilter/xt_CONNSECMARK.h
diff --git a/include/linux/netfilter/xt_CT.h b/include/uapi/linux/netfilter/xt_CT.h
index a064b8af360c..a064b8af360c 100644
--- a/include/linux/netfilter/xt_CT.h
+++ b/include/uapi/linux/netfilter/xt_CT.h
diff --git a/include/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
index 648e0b3bed29..648e0b3bed29 100644
--- a/include/linux/netfilter/xt_DSCP.h
+++ b/include/uapi/linux/netfilter/xt_DSCP.h
diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/uapi/linux/netfilter/xt_IDLETIMER.h
index 208ae9387331..208ae9387331 100644
--- a/include/linux/netfilter/xt_IDLETIMER.h
+++ b/include/uapi/linux/netfilter/xt_IDLETIMER.h
diff --git a/include/linux/netfilter/xt_LED.h b/include/uapi/linux/netfilter/xt_LED.h
index f5509e7524d3..f5509e7524d3 100644
--- a/include/linux/netfilter/xt_LED.h
+++ b/include/uapi/linux/netfilter/xt_LED.h
diff --git a/include/linux/netfilter/xt_LOG.h b/include/uapi/linux/netfilter/xt_LOG.h
index cac079095305..cac079095305 100644
--- a/include/linux/netfilter/xt_LOG.h
+++ b/include/uapi/linux/netfilter/xt_LOG.h
diff --git a/include/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
index 41c456deba22..41c456deba22 100644
--- a/include/linux/netfilter/xt_MARK.h
+++ b/include/uapi/linux/netfilter/xt_MARK.h
diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/uapi/linux/netfilter/xt_NFLOG.h
index 87b58311ce6b..87b58311ce6b 100644
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/uapi/linux/netfilter/xt_NFLOG.h
diff --git a/include/linux/netfilter/xt_NFQUEUE.h b/include/uapi/linux/netfilter/xt_NFQUEUE.h
index 9eafdbbb401c..9eafdbbb401c 100644
--- a/include/linux/netfilter/xt_NFQUEUE.h
+++ b/include/uapi/linux/netfilter/xt_NFQUEUE.h
diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/uapi/linux/netfilter/xt_RATEEST.h
index 6605e20ad8cf..6605e20ad8cf 100644
--- a/include/linux/netfilter/xt_RATEEST.h
+++ b/include/uapi/linux/netfilter/xt_RATEEST.h
diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/uapi/linux/netfilter/xt_SECMARK.h
index 989092bd6274..989092bd6274 100644
--- a/include/linux/netfilter/xt_SECMARK.h
+++ b/include/uapi/linux/netfilter/xt_SECMARK.h
diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/uapi/linux/netfilter/xt_TCPMSS.h
index 9a6960afc134..9a6960afc134 100644
--- a/include/linux/netfilter/xt_TCPMSS.h
+++ b/include/uapi/linux/netfilter/xt_TCPMSS.h
diff --git a/include/linux/netfilter/xt_TCPOPTSTRIP.h b/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
index 7157318499c2..7157318499c2 100644
--- a/include/linux/netfilter/xt_TCPOPTSTRIP.h
+++ b/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/include/linux/netfilter/xt_TEE.h b/include/uapi/linux/netfilter/xt_TEE.h
index 5c21d5c829af..5c21d5c829af 100644
--- a/include/linux/netfilter/xt_TEE.h
+++ b/include/uapi/linux/netfilter/xt_TEE.h
diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/uapi/linux/netfilter/xt_TPROXY.h
index 902043c2073f..902043c2073f 100644
--- a/include/linux/netfilter/xt_TPROXY.h
+++ b/include/uapi/linux/netfilter/xt_TPROXY.h
diff --git a/include/linux/netfilter/xt_addrtype.h b/include/uapi/linux/netfilter/xt_addrtype.h
index b156baa9d55e..b156baa9d55e 100644
--- a/include/linux/netfilter/xt_addrtype.h
+++ b/include/uapi/linux/netfilter/xt_addrtype.h
diff --git a/include/linux/netfilter/xt_cluster.h b/include/uapi/linux/netfilter/xt_cluster.h
index 9b883c8fbf54..9b883c8fbf54 100644
--- a/include/linux/netfilter/xt_cluster.h
+++ b/include/uapi/linux/netfilter/xt_cluster.h
diff --git a/include/linux/netfilter/xt_comment.h b/include/uapi/linux/netfilter/xt_comment.h
index 0ea5e79f5bd7..0ea5e79f5bd7 100644
--- a/include/linux/netfilter/xt_comment.h
+++ b/include/uapi/linux/netfilter/xt_comment.h
diff --git a/include/linux/netfilter/xt_connbytes.h b/include/uapi/linux/netfilter/xt_connbytes.h
index f1d6c15bd9e3..f1d6c15bd9e3 100644
--- a/include/linux/netfilter/xt_connbytes.h
+++ b/include/uapi/linux/netfilter/xt_connbytes.h
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/uapi/linux/netfilter/xt_connlimit.h
index f1656096121e..f1656096121e 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/uapi/linux/netfilter/xt_connlimit.h
diff --git a/include/linux/netfilter/xt_connmark.h b/include/uapi/linux/netfilter/xt_connmark.h
index efc17a8305fb..efc17a8305fb 100644
--- a/include/linux/netfilter/xt_connmark.h
+++ b/include/uapi/linux/netfilter/xt_connmark.h
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/uapi/linux/netfilter/xt_conntrack.h
index e3c041d54020..e3c041d54020 100644
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/uapi/linux/netfilter/xt_conntrack.h
diff --git a/include/linux/netfilter/xt_cpu.h b/include/uapi/linux/netfilter/xt_cpu.h
index 93c7f11d8f42..93c7f11d8f42 100644
--- a/include/linux/netfilter/xt_cpu.h
+++ b/include/uapi/linux/netfilter/xt_cpu.h
diff --git a/include/linux/netfilter/xt_dccp.h b/include/uapi/linux/netfilter/xt_dccp.h
index a579e1b6f040..a579e1b6f040 100644
--- a/include/linux/netfilter/xt_dccp.h
+++ b/include/uapi/linux/netfilter/xt_dccp.h
diff --git a/include/linux/netfilter/xt_devgroup.h b/include/uapi/linux/netfilter/xt_devgroup.h
index 1babde0ec900..1babde0ec900 100644
--- a/include/linux/netfilter/xt_devgroup.h
+++ b/include/uapi/linux/netfilter/xt_devgroup.h
diff --git a/include/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
index 15f8932ad5ce..15f8932ad5ce 100644
--- a/include/linux/netfilter/xt_dscp.h
+++ b/include/uapi/linux/netfilter/xt_dscp.h
diff --git a/include/linux/netfilter/xt_ecn.h b/include/uapi/linux/netfilter/xt_ecn.h
index 7158fca364f2..7158fca364f2 100644
--- a/include/linux/netfilter/xt_ecn.h
+++ b/include/uapi/linux/netfilter/xt_ecn.h
diff --git a/include/linux/netfilter/xt_esp.h b/include/uapi/linux/netfilter/xt_esp.h
index ee6882408000..ee6882408000 100644
--- a/include/linux/netfilter/xt_esp.h
+++ b/include/uapi/linux/netfilter/xt_esp.h
diff --git a/include/uapi/linux/netfilter/xt_hashlimit.h b/include/uapi/linux/netfilter/xt_hashlimit.h
new file mode 100644
index 000000000000..cbfc43d1af68
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_hashlimit.h
@@ -0,0 +1,73 @@
+#ifndef _UAPI_XT_HASHLIMIT_H
+#define _UAPI_XT_HASHLIMIT_H
+
+#include <linux/types.h>
+
+/* timings are in milliseconds. */
+#define XT_HASHLIMIT_SCALE 10000
+/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
+ * seconds, or one packet every 59 hours.
+ */
+
+/* packet length accounting is done in 16-byte steps */
+#define XT_HASHLIMIT_BYTE_SHIFT 4
+
+/* details of this structure hidden by the implementation */
+struct xt_hashlimit_htable;
+
+enum {
+        XT_HASHLIMIT_HASH_DIP = 1 << 0,
+        XT_HASHLIMIT_HASH_DPT = 1 << 1,
+        XT_HASHLIMIT_HASH_SIP = 1 << 2,
+        XT_HASHLIMIT_HASH_SPT = 1 << 3,
+        XT_HASHLIMIT_INVERT   = 1 << 4,
+        XT_HASHLIMIT_BYTES    = 1 << 5,
+};
+
+struct hashlimit_cfg {
+        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
+        __u32 avg;    /* Average secs between packets * scale */
+        __u32 burst;  /* Period multiplier for upper limit. */
+
+        /* user specified */
+        __u32 size;             /* how many buckets */
+        __u32 max;              /* max number of entries */
+        __u32 gc_interval;      /* gc interval */
+        __u32 expire;   /* when do entries expire? */
+};
+
+struct xt_hashlimit_info {
+        char name [IFNAMSIZ];           /* name */
+        struct hashlimit_cfg cfg;
+
+        /* Used internally by the kernel */
+        struct xt_hashlimit_htable *hinfo;
+        union {
+                void *ptr;
+                struct xt_hashlimit_info *master;
+        } u;
+};
+
+struct hashlimit_cfg1 {
+        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
+        __u32 avg;    /* Average secs between packets * scale */
+        __u32 burst;  /* Period multiplier for upper limit. */
+
+        /* user specified */
+        __u32 size;             /* how many buckets */
+        __u32 max;              /* max number of entries */
+        __u32 gc_interval;      /* gc interval */
+        __u32 expire;   /* when do entries expire? */
+
+        __u8 srcmask, dstmask;
+};
+
+struct xt_hashlimit_mtinfo1 {
+        char name[IFNAMSIZ];
+        struct hashlimit_cfg1 cfg;
+
+        /* Used internally by the kernel */
+        struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
+};
+
+#endif /* _UAPI_XT_HASHLIMIT_H */
diff --git a/include/linux/netfilter/xt_helper.h b/include/uapi/linux/netfilter/xt_helper.h
index 6b42763f999d..6b42763f999d 100644
--- a/include/linux/netfilter/xt_helper.h
+++ b/include/uapi/linux/netfilter/xt_helper.h
diff --git a/include/linux/netfilter/xt_iprange.h b/include/uapi/linux/netfilter/xt_iprange.h
index 25fd7cf851f0..25fd7cf851f0 100644
--- a/include/linux/netfilter/xt_iprange.h
+++ b/include/uapi/linux/netfilter/xt_iprange.h
diff --git a/include/linux/netfilter/xt_ipvs.h b/include/uapi/linux/netfilter/xt_ipvs.h
index eff34ac18808..eff34ac18808 100644
--- a/include/linux/netfilter/xt_ipvs.h
+++ b/include/uapi/linux/netfilter/xt_ipvs.h
diff --git a/include/linux/netfilter/xt_length.h b/include/uapi/linux/netfilter/xt_length.h
index b82ed7c4b1e0..b82ed7c4b1e0 100644
--- a/include/linux/netfilter/xt_length.h
+++ b/include/uapi/linux/netfilter/xt_length.h
diff --git a/include/linux/netfilter/xt_limit.h b/include/uapi/linux/netfilter/xt_limit.h
index bb47fc4d2ade..bb47fc4d2ade 100644
--- a/include/linux/netfilter/xt_limit.h
+++ b/include/uapi/linux/netfilter/xt_limit.h
diff --git a/include/linux/netfilter/xt_mac.h b/include/uapi/linux/netfilter/xt_mac.h
index b892cdc67e06..b892cdc67e06 100644
--- a/include/linux/netfilter/xt_mac.h
+++ b/include/uapi/linux/netfilter/xt_mac.h
diff --git a/include/linux/netfilter/xt_mark.h b/include/uapi/linux/netfilter/xt_mark.h
index ecadc40d5cde..ecadc40d5cde 100644
--- a/include/linux/netfilter/xt_mark.h
+++ b/include/uapi/linux/netfilter/xt_mark.h
diff --git a/include/linux/netfilter/xt_multiport.h b/include/uapi/linux/netfilter/xt_multiport.h
index 5b7e72dfffc5..5b7e72dfffc5 100644
--- a/include/linux/netfilter/xt_multiport.h
+++ b/include/uapi/linux/netfilter/xt_multiport.h
diff --git a/include/linux/netfilter/xt_nfacct.h b/include/uapi/linux/netfilter/xt_nfacct.h
index 3e19c8a86576..3e19c8a86576 100644
--- a/include/linux/netfilter/xt_nfacct.h
+++ b/include/uapi/linux/netfilter/xt_nfacct.h
diff --git a/include/linux/netfilter/xt_osf.h b/include/uapi/linux/netfilter/xt_osf.h
index 18afa495f973..18afa495f973 100644
--- a/include/linux/netfilter/xt_osf.h
+++ b/include/uapi/linux/netfilter/xt_osf.h
diff --git a/include/linux/netfilter/xt_owner.h b/include/uapi/linux/netfilter/xt_owner.h
index 2081761714b5..2081761714b5 100644
--- a/include/linux/netfilter/xt_owner.h
+++ b/include/uapi/linux/netfilter/xt_owner.h
diff --git a/include/uapi/linux/netfilter/xt_physdev.h b/include/uapi/linux/netfilter/xt_physdev.h
new file mode 100644
index 000000000000..db7a2982e9c0
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_physdev.h
@@ -0,0 +1,23 @@
+#ifndef _UAPI_XT_PHYSDEV_H
+#define _UAPI_XT_PHYSDEV_H
+
+#include <linux/types.h>
+
+
+#define XT_PHYSDEV_OP_IN                0x01
+#define XT_PHYSDEV_OP_OUT               0x02
+#define XT_PHYSDEV_OP_BRIDGED           0x04
+#define XT_PHYSDEV_OP_ISIN              0x08
+#define XT_PHYSDEV_OP_ISOUT             0x10
+#define XT_PHYSDEV_OP_MASK              (0x20 - 1)
+
+struct xt_physdev_info {
+        char physindev[IFNAMSIZ];
+        char in_mask[IFNAMSIZ];
+        char physoutdev[IFNAMSIZ];
+        char out_mask[IFNAMSIZ];
+        __u8 invert;
+        __u8 bitmask;
+};
+
+#endif /* _UAPI_XT_PHYSDEV_H */
diff --git a/include/linux/netfilter/xt_pkttype.h b/include/uapi/linux/netfilter/xt_pkttype.h
index f265cf52faea..f265cf52faea 100644
--- a/include/linux/netfilter/xt_pkttype.h
+++ b/include/uapi/linux/netfilter/xt_pkttype.h
diff --git a/include/linux/netfilter/xt_policy.h b/include/uapi/linux/netfilter/xt_policy.h
index be8ead05c316..be8ead05c316 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/uapi/linux/netfilter/xt_policy.h
diff --git a/include/linux/netfilter/xt_quota.h b/include/uapi/linux/netfilter/xt_quota.h
index 9314723f39ca..9314723f39ca 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/include/uapi/linux/netfilter/xt_quota.h
diff --git a/include/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
index d40a6196842a..d40a6196842a 100644
--- a/include/linux/netfilter/xt_rateest.h
+++ b/include/uapi/linux/netfilter/xt_rateest.h
diff --git a/include/linux/netfilter/xt_realm.h b/include/uapi/linux/netfilter/xt_realm.h
index d4a82ee56a02..d4a82ee56a02 100644
--- a/include/linux/netfilter/xt_realm.h
+++ b/include/uapi/linux/netfilter/xt_realm.h
diff --git a/include/linux/netfilter/xt_recent.h b/include/uapi/linux/netfilter/xt_recent.h
index 6ef36c113e89..6ef36c113e89 100644
--- a/include/linux/netfilter/xt_recent.h
+++ b/include/uapi/linux/netfilter/xt_recent.h
diff --git a/include/linux/netfilter/xt_sctp.h b/include/uapi/linux/netfilter/xt_sctp.h
index 29287be696a2..29287be696a2 100644
--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/uapi/linux/netfilter/xt_sctp.h
diff --git a/include/linux/netfilter/xt_set.h b/include/uapi/linux/netfilter/xt_set.h
index e3a9978f259f..e3a9978f259f 100644
--- a/include/linux/netfilter/xt_set.h
+++ b/include/uapi/linux/netfilter/xt_set.h
diff --git a/include/linux/netfilter/xt_socket.h b/include/uapi/linux/netfilter/xt_socket.h
index 26d7217bd4f1..26d7217bd4f1 100644
--- a/include/linux/netfilter/xt_socket.h
+++ b/include/uapi/linux/netfilter/xt_socket.h
diff --git a/include/linux/netfilter/xt_state.h b/include/uapi/linux/netfilter/xt_state.h
index 7b32de886613..7b32de886613 100644
--- a/include/linux/netfilter/xt_state.h
+++ b/include/uapi/linux/netfilter/xt_state.h
diff --git a/include/linux/netfilter/xt_statistic.h b/include/uapi/linux/netfilter/xt_statistic.h
index 4e983ef0c968..4e983ef0c968 100644
--- a/include/linux/netfilter/xt_statistic.h
+++ b/include/uapi/linux/netfilter/xt_statistic.h
diff --git a/include/linux/netfilter/xt_string.h b/include/uapi/linux/netfilter/xt_string.h
index 235347c02eab..235347c02eab 100644
--- a/include/linux/netfilter/xt_string.h
+++ b/include/uapi/linux/netfilter/xt_string.h
diff --git a/include/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
index fbac56b9e667..fbac56b9e667 100644
--- a/include/linux/netfilter/xt_tcpmss.h
+++ b/include/uapi/linux/netfilter/xt_tcpmss.h
diff --git a/include/linux/netfilter/xt_tcpudp.h b/include/uapi/linux/netfilter/xt_tcpudp.h
index 38aa7b399021..38aa7b399021 100644
--- a/include/linux/netfilter/xt_tcpudp.h
+++ b/include/uapi/linux/netfilter/xt_tcpudp.h
diff --git a/include/linux/netfilter/xt_time.h b/include/uapi/linux/netfilter/xt_time.h
index 095886019396..095886019396 100644
--- a/include/linux/netfilter/xt_time.h
+++ b/include/uapi/linux/netfilter/xt_time.h
diff --git a/include/linux/netfilter/xt_u32.h b/include/uapi/linux/netfilter/xt_u32.h
index 04d1bfea03c2..04d1bfea03c2 100644
--- a/include/linux/netfilter/xt_u32.h
+++ b/include/uapi/linux/netfilter/xt_u32.h
diff --git a/include/linux/netfilter_arp.h b/include/uapi/linux/netfilter_arp.h
index 92bc6ddcbf73..92bc6ddcbf73 100644
--- a/include/linux/netfilter_arp.h
+++ b/include/uapi/linux/netfilter_arp.h
diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild
index aafaa5aa54d4..62d5637cc0ac 100644
--- a/include/uapi/linux/netfilter_arp/Kbuild
+++ b/include/uapi/linux/netfilter_arp/Kbuild
@@ -1 +1,3 @@
 # UAPI Header export list
+header-y += arp_tables.h
+header-y += arpt_mangle.h
diff --git a/include/uapi/linux/netfilter_arp/arp_tables.h b/include/uapi/linux/netfilter_arp/arp_tables.h
new file mode 100644
index 000000000000..a5a86a4db6b3
--- /dev/null
+++ b/include/uapi/linux/netfilter_arp/arp_tables.h
@@ -0,0 +1,206 @@
+/*
+ *      Format of an ARP firewall descriptor
+ *
+ *      src, tgt, src_mask, tgt_mask, arpop, arpop_mask are always stored in
+ *      network byte order.
+ *      flags are stored in host byte order (of course).
+ */
+
+#ifndef _UAPI_ARPTABLES_H
+#define _UAPI_ARPTABLES_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/netfilter_arp.h>
+
+#include <linux/netfilter/x_tables.h>
+
+#ifndef __KERNEL__
+#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
+#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
+#define arpt_entry_target xt_entry_target
+#define arpt_standard_target xt_standard_target
+#define arpt_error_target xt_error_target
+#define ARPT_CONTINUE XT_CONTINUE
+#define ARPT_RETURN XT_RETURN
+#define arpt_counters_info xt_counters_info
+#define arpt_counters xt_counters
+#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET
+#define ARPT_ERROR_TARGET XT_ERROR_TARGET
+#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \
+        XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)
+#endif
+
+#define ARPT_DEV_ADDR_LEN_MAX 16
+
+struct arpt_devaddr_info {
+        char addr[ARPT_DEV_ADDR_LEN_MAX];
+        char mask[ARPT_DEV_ADDR_LEN_MAX];
+};
+
+/* Yes, Virginia, you have to zero the padding. */
+struct arpt_arp {
+        /* Source and target IP addr */
+        struct in_addr src, tgt;
+        /* Mask for src and target IP addr */
+        struct in_addr smsk, tmsk;
+
+        /* Device hw address length, src+target device addresses */
+        __u8 arhln, arhln_mask;
+        struct arpt_devaddr_info src_devaddr;
+        struct arpt_devaddr_info tgt_devaddr;
+
+        /* ARP operation code. */
+        __be16 arpop, arpop_mask;
+
+        /* ARP hardware address and protocol address format. */
+        __be16 arhrd, arhrd_mask;
+        __be16 arpro, arpro_mask;
+
+        /* The protocol address length is only accepted if it is 4
+         * so there is no use in offering a way to do filtering on it.
+         */
+
+        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
+        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
+
+        /* Flags word */
+        __u8 flags;
+        /* Inverse flags */
+        __u16 invflags;
+};
+
+/* Values for "flag" field in struct arpt_ip (general arp structure).
+ * No flags defined yet.
+ */
+#define ARPT_F_MASK             0x00    /* All possible flag bits mask. */
+
+/* Values for "inv" field in struct arpt_arp. */
+#define ARPT_INV_VIA_IN         0x0001  /* Invert the sense of IN IFACE. */
+#define ARPT_INV_VIA_OUT        0x0002  /* Invert the sense of OUT IFACE */
+#define ARPT_INV_SRCIP          0x0004  /* Invert the sense of SRC IP. */
+#define ARPT_INV_TGTIP          0x0008  /* Invert the sense of TGT IP. */
+#define ARPT_INV_SRCDEVADDR     0x0010  /* Invert the sense of SRC DEV ADDR. */
+#define ARPT_INV_TGTDEVADDR     0x0020  /* Invert the sense of TGT DEV ADDR. */
+#define ARPT_INV_ARPOP          0x0040  /* Invert the sense of ARP OP. */
+#define ARPT_INV_ARPHRD         0x0080  /* Invert the sense of ARP HRD. */
+#define ARPT_INV_ARPPRO         0x0100  /* Invert the sense of ARP PRO. */
+#define ARPT_INV_ARPHLN         0x0200  /* Invert the sense of ARP HLN. */
+#define ARPT_INV_MASK           0x03FF  /* All possible flag bits mask. */
+
+/* This structure defines each of the firewall rules.  Consists of 3
+   parts which are 1) general ARP header stuff 2) match specific
+   stuff 3) the target to perform if the rule matches */
+struct arpt_entry
+{
+        struct arpt_arp arp;
+
+        /* Size of arpt_entry + matches */
+        __u16 target_offset;
+        /* Size of arpt_entry + matches + target */
+        __u16 next_offset;
+
+        /* Back pointer */
+        unsigned int comefrom;
+
+        /* Packet and byte counters. */
+        struct xt_counters counters;
+
+        /* The matches (if any), then the target. */
+        unsigned char elems[0];
+};
+
+/*
+ * New IP firewall options for [gs]etsockopt at the RAW IP level.
+ * Unlike BSD Linux inherits IP options so you don't have to use a raw
+ * socket for this. Instead we check rights in the calls.
+ *
+ * ATTENTION: check linux/in.h before adding new number here.
+ */
+#define ARPT_BASE_CTL           96
+
+#define ARPT_SO_SET_REPLACE             (ARPT_BASE_CTL)
+#define ARPT_SO_SET_ADD_COUNTERS        (ARPT_BASE_CTL + 1)
+#define ARPT_SO_SET_MAX                 ARPT_SO_SET_ADD_COUNTERS
+
+#define ARPT_SO_GET_INFO                (ARPT_BASE_CTL)
+#define ARPT_SO_GET_ENTRIES             (ARPT_BASE_CTL + 1)
+/* #define ARPT_SO_GET_REVISION_MATCH   (APRT_BASE_CTL + 2) */
+#define ARPT_SO_GET_REVISION_TARGET     (ARPT_BASE_CTL + 3)
+#define ARPT_SO_GET_MAX                 (ARPT_SO_GET_REVISION_TARGET)
+
+/* The argument to ARPT_SO_GET_INFO */
+struct arpt_getinfo {
+        /* Which table: caller fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Kernel fills these in. */
+        /* Which hook entry points are valid: bitmask */
+        unsigned int valid_hooks;
+
+        /* Hook entry points: one per netfilter hook. */
+        unsigned int hook_entry[NF_ARP_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_ARP_NUMHOOKS];
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Size of entries. */
+        unsigned int size;
+};
+
+/* The argument to ARPT_SO_SET_REPLACE. */
+struct arpt_replace {
+        /* Which table. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Which hook entry points are valid: bitmask.  You can't
+           change this. */
+        unsigned int valid_hooks;
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Total size of new entries */
+        unsigned int size;
+
+        /* Hook entry points. */
+        unsigned int hook_entry[NF_ARP_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_ARP_NUMHOOKS];
+
+        /* Information about old entries: */
+        /* Number of counters (must be equal to current number of entries). */
+        unsigned int num_counters;
+        /* The old entries' counters. */
+        struct xt_counters __user *counters;
+
+        /* The entries (hang off end: not really an array). */
+        struct arpt_entry entries[0];
+};
+
+/* The argument to ARPT_SO_GET_ENTRIES. */
+struct arpt_get_entries {
+        /* Which table: user fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* User fills this in: total entry size. */
+        unsigned int size;
+
+        /* The entries. */
+        struct arpt_entry entrytable[0];
+};
+
+/* Helper functions */
+static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
+{
+        return (void *)e + e->target_offset;
+}
+
+/*
+ *      Main firewall chains definitions and global var's definitions.
+ */
+#endif /* _UAPI_ARPTABLES_H */
diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/uapi/linux/netfilter_arp/arpt_mangle.h
index 250f502902bb..250f502902bb 100644
--- a/include/linux/netfilter_arp/arpt_mangle.h
+++ b/include/uapi/linux/netfilter_arp/arpt_mangle.h
diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h
new file mode 100644
index 000000000000..a5eda6db8d79
--- /dev/null
+++ b/include/uapi/linux/netfilter_bridge.h
@@ -0,0 +1,27 @@
+#ifndef _UAPI__LINUX_BRIDGE_NETFILTER_H
+#define _UAPI__LINUX_BRIDGE_NETFILTER_H
+
+/* bridge-specific defines for netfilter. 
+ */
+
+#include <linux/netfilter.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/if_pppox.h>
+
+/* Bridge Hooks */
+/* After promisc drops, checksum checks. */
+#define NF_BR_PRE_ROUTING       0
+/* If the packet is destined for this box. */
+#define NF_BR_LOCAL_IN          1
+/* If the packet is destined for another interface. */
+#define NF_BR_FORWARD           2
+/* Packets coming from a local process. */
+#define NF_BR_LOCAL_OUT         3
+/* Packets about to hit the wire. */
+#define NF_BR_POST_ROUTING      4
+/* Not really a hook, but used for the ebtables broute table */
+#define NF_BR_BROUTING          5
+#define NF_BR_NUMHOOKS          6
+
+#endif /* _UAPI__LINUX_BRIDGE_NETFILTER_H */
diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild
index aafaa5aa54d4..348717c3a22f 100644
--- a/include/uapi/linux/netfilter_bridge/Kbuild
+++ b/include/uapi/linux/netfilter_bridge/Kbuild
@@ -1 +1,19 @@
 # UAPI Header export list
+header-y += ebt_802_3.h
+header-y += ebt_among.h
+header-y += ebt_arp.h
+header-y += ebt_arpreply.h
+header-y += ebt_ip.h
+header-y += ebt_ip6.h
+header-y += ebt_limit.h
+header-y += ebt_log.h
+header-y += ebt_mark_m.h
+header-y += ebt_mark_t.h
+header-y += ebt_nat.h
+header-y += ebt_nflog.h
+header-y += ebt_pkttype.h
+header-y += ebt_redirect.h
+header-y += ebt_stp.h
+header-y += ebt_ulog.h
+header-y += ebt_vlan.h
+header-y += ebtables.h
diff --git a/include/uapi/linux/netfilter_bridge/ebt_802_3.h b/include/uapi/linux/netfilter_bridge/ebt_802_3.h
new file mode 100644
index 000000000000..5bf84912a082
--- /dev/null
+++ b/include/uapi/linux/netfilter_bridge/ebt_802_3.h
@@ -0,0 +1,62 @@
+#ifndef _UAPI__LINUX_BRIDGE_EBT_802_3_H
+#define _UAPI__LINUX_BRIDGE_EBT_802_3_H
+
+#include <linux/types.h>
+
+#define EBT_802_3_SAP 0x01
+#define EBT_802_3_TYPE 0x02
+
+#define EBT_802_3_MATCH "802_3"
+
+/*
+ * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
+ * to discover what kind of packet we're carrying. 
+ */
+#define CHECK_TYPE 0xaa
+
+/*
+ * Control field may be one or two bytes.  If the first byte has
+ * the value 0x03 then the entire length is one byte, otherwise it is two.
+ * One byte controls are used in Unnumbered Information frames.
+ * Two byte controls are used in Numbered Information frames.
+ */
+#define IS_UI 0x03
+
+#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
+
+/* ui has one byte ctrl, ni has two */
+struct hdr_ui {
+        __u8 dsap;
+        __u8 ssap;
+        __u8 ctrl;
+        __u8 orig[3];
+        __be16 type;
+};
+
+struct hdr_ni {
+        __u8 dsap;
+        __u8 ssap;
+        __be16 ctrl;
+        __u8  orig[3];
+        __be16 type;
+};
+
+struct ebt_802_3_hdr {
+        __u8  daddr[6];
+        __u8  saddr[6];
+        __be16 len;
+        union {
+                struct hdr_ui ui;
+                struct hdr_ni ni;
+        } llc;
+};
+
+
+struct ebt_802_3_info {
+        __u8  sap;
+        __be16 type;
+        __u8  bitmask;
+        __u8  invflags;
+};
+
+#endif /* _UAPI__LINUX_BRIDGE_EBT_802_3_H */
diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/uapi/linux/netfilter_bridge/ebt_among.h
index bd4e3ad0b706..bd4e3ad0b706 100644
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_among.h
diff --git a/include/linux/netfilter_bridge/ebt_arp.h b/include/uapi/linux/netfilter_bridge/ebt_arp.h
index 522f3e427f49..522f3e427f49 100644
--- a/include/linux/netfilter_bridge/ebt_arp.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_arp.h
diff --git a/include/linux/netfilter_bridge/ebt_arpreply.h b/include/uapi/linux/netfilter_bridge/ebt_arpreply.h
index 7e77896e1fbf..7e77896e1fbf 100644
--- a/include/linux/netfilter_bridge/ebt_arpreply.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/uapi/linux/netfilter_bridge/ebt_ip.h
index c4bbc41b0ea4..c4bbc41b0ea4 100644
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_ip.h
diff --git a/include/linux/netfilter_bridge/ebt_ip6.h b/include/uapi/linux/netfilter_bridge/ebt_ip6.h
index 42b889682721..42b889682721 100644
--- a/include/linux/netfilter_bridge/ebt_ip6.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_ip6.h
diff --git a/include/linux/netfilter_bridge/ebt_limit.h b/include/uapi/linux/netfilter_bridge/ebt_limit.h
index 66d80b30ba0e..66d80b30ba0e 100644
--- a/include/linux/netfilter_bridge/ebt_limit.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_limit.h
diff --git a/include/linux/netfilter_bridge/ebt_log.h b/include/uapi/linux/netfilter_bridge/ebt_log.h
index 7e7f1d1fe494..7e7f1d1fe494 100644
--- a/include/linux/netfilter_bridge/ebt_log.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_log.h
diff --git a/include/linux/netfilter_bridge/ebt_mark_m.h b/include/uapi/linux/netfilter_bridge/ebt_mark_m.h
index 410f9e5a71d4..410f9e5a71d4 100644
--- a/include/linux/netfilter_bridge/ebt_mark_m.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/include/linux/netfilter_bridge/ebt_mark_t.h b/include/uapi/linux/netfilter_bridge/ebt_mark_t.h
index 7d5a268a4311..7d5a268a4311 100644
--- a/include/linux/netfilter_bridge/ebt_mark_t.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/include/linux/netfilter_bridge/ebt_nat.h b/include/uapi/linux/netfilter_bridge/ebt_nat.h
index 5e74e3b03bd6..5e74e3b03bd6 100644
--- a/include/linux/netfilter_bridge/ebt_nat.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_nat.h
diff --git a/include/linux/netfilter_bridge/ebt_nflog.h b/include/uapi/linux/netfilter_bridge/ebt_nflog.h
index df829fce9125..df829fce9125 100644
--- a/include/linux/netfilter_bridge/ebt_nflog.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_nflog.h
diff --git a/include/linux/netfilter_bridge/ebt_pkttype.h b/include/uapi/linux/netfilter_bridge/ebt_pkttype.h
index c241badcd036..c241badcd036 100644
--- a/include/linux/netfilter_bridge/ebt_pkttype.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/include/linux/netfilter_bridge/ebt_redirect.h b/include/uapi/linux/netfilter_bridge/ebt_redirect.h
index dd9622ce8488..dd9622ce8488 100644
--- a/include/linux/netfilter_bridge/ebt_redirect.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_redirect.h
diff --git a/include/linux/netfilter_bridge/ebt_stp.h b/include/uapi/linux/netfilter_bridge/ebt_stp.h
index 1025b9f5fb7d..1025b9f5fb7d 100644
--- a/include/linux/netfilter_bridge/ebt_stp.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_stp.h
diff --git a/include/linux/netfilter_bridge/ebt_ulog.h b/include/uapi/linux/netfilter_bridge/ebt_ulog.h
index 89a6becb5269..89a6becb5269 100644
--- a/include/linux/netfilter_bridge/ebt_ulog.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_ulog.h
diff --git a/include/linux/netfilter_bridge/ebt_vlan.h b/include/uapi/linux/netfilter_bridge/ebt_vlan.h
index 967d1d5cf98d..967d1d5cf98d 100644
--- a/include/linux/netfilter_bridge/ebt_vlan.h
+++ b/include/uapi/linux/netfilter_bridge/ebt_vlan.h
diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h
new file mode 100644
index 000000000000..ba993360dbe9
--- /dev/null
+++ b/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -0,0 +1,268 @@
+/*
+ *  ebtables
+ *
+ *      Authors:
+ *      Bart De Schuymer                <bdschuym@pandora.be>
+ *
+ *  ebtables.c,v 2.0, April, 2002
+ *
+ *  This code is stongly inspired on the iptables code which is
+ *  Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
+ */
+
+#ifndef _UAPI__LINUX_BRIDGE_EFF_H
+#define _UAPI__LINUX_BRIDGE_EFF_H
+#include <linux/if.h>
+#include <linux/netfilter_bridge.h>
+#include <linux/if_ether.h>
+
+#define EBT_TABLE_MAXNAMELEN 32
+#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
+#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
+
+/* verdicts >0 are "branches" */
+#define EBT_ACCEPT   -1
+#define EBT_DROP     -2
+#define EBT_CONTINUE -3
+#define EBT_RETURN   -4
+#define NUM_STANDARD_TARGETS   4
+/* ebtables target modules store the verdict inside an int. We can
+ * reclaim a part of this int for backwards compatible extensions.
+ * The 4 lsb are more than enough to store the verdict. */
+#define EBT_VERDICT_BITS 0x0000000F
+
+struct xt_match;
+struct xt_target;
+
+struct ebt_counter {
+        uint64_t pcnt;
+        uint64_t bcnt;
+};
+
+struct ebt_replace {
+        char name[EBT_TABLE_MAXNAMELEN];
+        unsigned int valid_hooks;
+        /* nr of rules in the table */
+        unsigned int nentries;
+        /* total size of the entries */
+        unsigned int entries_size;
+        /* start of the chains */
+        struct ebt_entries __user *hook_entry[NF_BR_NUMHOOKS];
+        /* nr of counters userspace expects back */
+        unsigned int num_counters;
+        /* where the kernel will put the old counters */
+        struct ebt_counter __user *counters;
+        char __user *entries;
+};
+
+struct ebt_replace_kernel {
+        char name[EBT_TABLE_MAXNAMELEN];
+        unsigned int valid_hooks;
+        /* nr of rules in the table */
+        unsigned int nentries;
+        /* total size of the entries */
+        unsigned int entries_size;
+        /* start of the chains */
+        struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
+        /* nr of counters userspace expects back */
+        unsigned int num_counters;
+        /* where the kernel will put the old counters */
+        struct ebt_counter *counters;
+        char *entries;
+};
+
+struct ebt_entries {
+        /* this field is always set to zero
+         * See EBT_ENTRY_OR_ENTRIES.
+         * Must be same size as ebt_entry.bitmask */
+        unsigned int distinguisher;
+        /* the chain name */
+        char name[EBT_CHAIN_MAXNAMELEN];
+        /* counter offset for this chain */
+        unsigned int counter_offset;
+        /* one standard (accept, drop, return) per hook */
+        int policy;
+        /* nr. of entries */
+        unsigned int nentries;
+        /* entry list */
+        char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
+};
+
+/* used for the bitmask of struct ebt_entry */
+
+/* This is a hack to make a difference between an ebt_entry struct and an
+ * ebt_entries struct when traversing the entries from start to end.
+ * Using this simplifies the code a lot, while still being able to use
+ * ebt_entries.
+ * Contrary, iptables doesn't use something like ebt_entries and therefore uses
+ * different techniques for naming the policy and such. So, iptables doesn't
+ * need a hack like this.
+ */
+#define EBT_ENTRY_OR_ENTRIES 0x01
+/* these are the normal masks */
+#define EBT_NOPROTO 0x02
+#define EBT_802_3 0x04
+#define EBT_SOURCEMAC 0x08
+#define EBT_DESTMAC 0x10
+#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \
+   | EBT_ENTRY_OR_ENTRIES)
+
+#define EBT_IPROTO 0x01
+#define EBT_IIN 0x02
+#define EBT_IOUT 0x04
+#define EBT_ISOURCE 0x8
+#define EBT_IDEST 0x10
+#define EBT_ILOGICALIN 0x20
+#define EBT_ILOGICALOUT 0x40
+#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
+   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
+
+struct ebt_entry_match {
+        union {
+                char name[EBT_FUNCTION_MAXNAMELEN];
+                struct xt_match *match;
+        } u;
+        /* size of data */
+        unsigned int match_size;
+        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
+};
+
+struct ebt_entry_watcher {
+        union {
+                char name[EBT_FUNCTION_MAXNAMELEN];
+                struct xt_target *watcher;
+        } u;
+        /* size of data */
+        unsigned int watcher_size;
+        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
+};
+
+struct ebt_entry_target {
+        union {
+                char name[EBT_FUNCTION_MAXNAMELEN];
+                struct xt_target *target;
+        } u;
+        /* size of data */
+        unsigned int target_size;
+        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
+};
+
+#define EBT_STANDARD_TARGET "standard"
+struct ebt_standard_target {
+        struct ebt_entry_target target;
+        int verdict;
+};
+
+/* one entry */
+struct ebt_entry {
+        /* this needs to be the first field */
+        unsigned int bitmask;
+        unsigned int invflags;
+        __be16 ethproto;
+        /* the physical in-dev */
+        char in[IFNAMSIZ];
+        /* the logical in-dev */
+        char logical_in[IFNAMSIZ];
+        /* the physical out-dev */
+        char out[IFNAMSIZ];
+        /* the logical out-dev */
+        char logical_out[IFNAMSIZ];
+        unsigned char sourcemac[ETH_ALEN];
+        unsigned char sourcemsk[ETH_ALEN];
+        unsigned char destmac[ETH_ALEN];
+        unsigned char destmsk[ETH_ALEN];
+        /* sizeof ebt_entry + matches */
+        unsigned int watchers_offset;
+        /* sizeof ebt_entry + matches + watchers */
+        unsigned int target_offset;
+        /* sizeof ebt_entry + matches + watchers + target */
+        unsigned int next_offset;
+        unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
+};
+
+/* {g,s}etsockopt numbers */
+#define EBT_BASE_CTL            128
+
+#define EBT_SO_SET_ENTRIES      (EBT_BASE_CTL)
+#define EBT_SO_SET_COUNTERS     (EBT_SO_SET_ENTRIES+1)
+#define EBT_SO_SET_MAX          (EBT_SO_SET_COUNTERS+1)
+
+#define EBT_SO_GET_INFO         (EBT_BASE_CTL)
+#define EBT_SO_GET_ENTRIES      (EBT_SO_GET_INFO+1)
+#define EBT_SO_GET_INIT_INFO    (EBT_SO_GET_ENTRIES+1)
+#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
+#define EBT_SO_GET_MAX          (EBT_SO_GET_INIT_ENTRIES+1)
+
+
+/* blatently stolen from ip_tables.h
+ * fn returns 0 to continue iteration */
+#define EBT_MATCH_ITERATE(e, fn, args...)                   \
+({                                                          \
+        unsigned int __i;                                   \
+        int __ret = 0;                                      \
+        struct ebt_entry_match *__match;                    \
+                                                            \
+        for (__i = sizeof(struct ebt_entry);                \
+             __i < (e)->watchers_offset;                    \
+             __i += __match->match_size +                   \
+             sizeof(struct ebt_entry_match)) {              \
+                __match = (void *)(e) + __i;                \
+                                                            \
+                __ret = fn(__match , ## args);              \
+                if (__ret != 0)                             \
+                        break;                              \
+        }                                                   \
+        if (__ret == 0) {                                   \
+                if (__i != (e)->watchers_offset)            \
+                        __ret = -EINVAL;                    \
+        }                                                   \
+        __ret;                                              \
+})
+
+#define EBT_WATCHER_ITERATE(e, fn, args...)                 \
+({                                                          \
+        unsigned int __i;                                   \
+        int __ret = 0;                                      \
+        struct ebt_entry_watcher *__watcher;                \
+                                                            \
+        for (__i = e->watchers_offset;                      \
+             __i < (e)->target_offset;                      \
+             __i += __watcher->watcher_size +               \
+             sizeof(struct ebt_entry_watcher)) {            \
+                __watcher = (void *)(e) + __i;              \
+                                                            \
+                __ret = fn(__watcher , ## args);            \
+                if (__ret != 0)                             \
+                        break;                              \
+        }                                                   \
+        if (__ret == 0) {                                   \
+                if (__i != (e)->target_offset)              \
+                        __ret = -EINVAL;                    \
+        }                                                   \
+        __ret;                                              \
+})
+
+#define EBT_ENTRY_ITERATE(entries, size, fn, args...)       \
+({                                                          \
+        unsigned int __i;                                   \
+        int __ret = 0;                                      \
+        struct ebt_entry *__entry;                          \
+                                                            \
+        for (__i = 0; __i < (size);) {                      \
+                __entry = (void *)(entries) + __i;          \
+                __ret = fn(__entry , ## args);              \
+                if (__ret != 0)                             \
+                        break;                              \
+                if (__entry->bitmask != 0)                  \
+                        __i += __entry->next_offset;        \
+                else                                        \
+                        __i += sizeof(struct ebt_entries);  \
+        }                                                   \
+        if (__ret == 0) {                                   \
+                if (__i != (size))                          \
+                        __ret = -EINVAL;                    \
+        }                                                   \
+        __ret;                                              \
+})
+
+#endif /* _UAPI__LINUX_BRIDGE_EFF_H */
diff --git a/include/linux/netfilter_decnet.h b/include/uapi/linux/netfilter_decnet.h
index 0b09732aacd5..0b09732aacd5 100644
--- a/include/linux/netfilter_decnet.h
+++ b/include/uapi/linux/netfilter_decnet.h
diff --git a/include/uapi/linux/netfilter_ipv4.h b/include/uapi/linux/netfilter_ipv4.h
new file mode 100644
index 000000000000..91ddd1f6fd4b
--- /dev/null
+++ b/include/uapi/linux/netfilter_ipv4.h
@@ -0,0 +1,81 @@
+/* IPv4-specific defines for netfilter. 
+ * (C)1998 Rusty Russell -- This code is GPL.
+ */
+#ifndef _UAPI__LINUX_IP_NETFILTER_H
+#define _UAPI__LINUX_IP_NETFILTER_H
+
+
+#include <linux/netfilter.h>
+
+/* only for userspace compatibility */
+#ifndef __KERNEL__
+
+#include <limits.h> /* for INT_MIN, INT_MAX */
+
+/* IP Cache bits. */
+/* Src IP address. */
+#define NFC_IP_SRC              0x0001
+/* Dest IP address. */
+#define NFC_IP_DST              0x0002
+/* Input device. */
+#define NFC_IP_IF_IN            0x0004
+/* Output device. */
+#define NFC_IP_IF_OUT           0x0008
+/* TOS. */
+#define NFC_IP_TOS              0x0010
+/* Protocol. */
+#define NFC_IP_PROTO            0x0020
+/* IP options. */
+#define NFC_IP_OPTIONS          0x0040
+/* Frag & flags. */
+#define NFC_IP_FRAG             0x0080
+
+/* Per-protocol information: only matters if proto match. */
+/* TCP flags. */
+#define NFC_IP_TCPFLAGS         0x0100
+/* Source port. */
+#define NFC_IP_SRC_PT           0x0200
+/* Dest port. */
+#define NFC_IP_DST_PT           0x0400
+/* Something else about the proto */
+#define NFC_IP_PROTO_UNKNOWN    0x2000
+
+/* IP Hooks */
+/* After promisc drops, checksum checks. */
+#define NF_IP_PRE_ROUTING       0
+/* If the packet is destined for this box. */
+#define NF_IP_LOCAL_IN          1
+/* If the packet is destined for another interface. */
+#define NF_IP_FORWARD           2
+/* Packets coming from a local process. */
+#define NF_IP_LOCAL_OUT         3
+/* Packets about to hit the wire. */
+#define NF_IP_POST_ROUTING      4
+#define NF_IP_NUMHOOKS          5
+#endif /* ! __KERNEL__ */
+
+enum nf_ip_hook_priorities {
+        NF_IP_PRI_FIRST = INT_MIN,
+        NF_IP_PRI_CONNTRACK_DEFRAG = -400,
+        NF_IP_PRI_RAW = -300,
+        NF_IP_PRI_SELINUX_FIRST = -225,
+        NF_IP_PRI_CONNTRACK = -200,
+        NF_IP_PRI_MANGLE = -150,
+        NF_IP_PRI_NAT_DST = -100,
+        NF_IP_PRI_FILTER = 0,
+        NF_IP_PRI_SECURITY = 50,
+        NF_IP_PRI_NAT_SRC = 100,
+        NF_IP_PRI_SELINUX_LAST = 225,
+        NF_IP_PRI_CONNTRACK_HELPER = 300,
+        NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
+        NF_IP_PRI_LAST = INT_MAX,
+};
+
+/* Arguments for setsockopt SOL_IP: */
+/* 2.0 firewalling went from 64 through 71 (and +256, +512, etc). */
+/* 2.2 firewalling (+ masq) went from 64 through 76 */
+/* 2.4 firewalling went 64 through 67. */
+#define SO_ORIGINAL_DST 80
+
+
+#endif /* _UAPI__LINUX_IP_NETFILTER_H */
diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild
index aafaa5aa54d4..fb008437dde1 100644
--- a/include/uapi/linux/netfilter_ipv4/Kbuild
+++ b/include/uapi/linux/netfilter_ipv4/Kbuild
@@ -1 +1,11 @@
 # UAPI Header export list
+header-y += ip_tables.h
+header-y += ipt_CLUSTERIP.h
+header-y += ipt_ECN.h
+header-y += ipt_LOG.h
+header-y += ipt_REJECT.h
+header-y += ipt_TTL.h
+header-y += ipt_ULOG.h
+header-y += ipt_ah.h
+header-y += ipt_ecn.h
+header-y += ipt_ttl.h
diff --git a/include/uapi/linux/netfilter_ipv4/ip_tables.h b/include/uapi/linux/netfilter_ipv4/ip_tables.h
new file mode 100644
index 000000000000..f1e6ef256034
--- /dev/null
+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
@@ -0,0 +1,229 @@
+/*
+ * 25-Jul-1998 Major changes to allow for ip chain table
+ *
+ * 3-Jan-2000 Named tables to allow packet selection for different uses.
+ */
+
+/*
+ *      Format of an IP firewall descriptor
+ *
+ *      src, dst, src_mask, dst_mask are always stored in network byte order.
+ *      flags are stored in host byte order (of course).
+ *      Port numbers are stored in HOST byte order.
+ */
+
+#ifndef _UAPI_IPTABLES_H
+#define _UAPI_IPTABLES_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/netfilter_ipv4.h>
+
+#include <linux/netfilter/x_tables.h>
+
+#ifndef __KERNEL__
+#define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
+#define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
+#define ipt_match xt_match
+#define ipt_target xt_target
+#define ipt_table xt_table
+#define ipt_get_revision xt_get_revision
+#define ipt_entry_match xt_entry_match
+#define ipt_entry_target xt_entry_target
+#define ipt_standard_target xt_standard_target
+#define ipt_error_target xt_error_target
+#define ipt_counters xt_counters
+#define IPT_CONTINUE XT_CONTINUE
+#define IPT_RETURN XT_RETURN
+
+/* This group is older than old (iptables < v1.4.0-rc1~89) */
+#include <linux/netfilter/xt_tcpudp.h>
+#define ipt_udp xt_udp
+#define ipt_tcp xt_tcp
+#define IPT_TCP_INV_SRCPT       XT_TCP_INV_SRCPT
+#define IPT_TCP_INV_DSTPT       XT_TCP_INV_DSTPT
+#define IPT_TCP_INV_FLAGS       XT_TCP_INV_FLAGS
+#define IPT_TCP_INV_OPTION      XT_TCP_INV_OPTION
+#define IPT_TCP_INV_MASK        XT_TCP_INV_MASK
+#define IPT_UDP_INV_SRCPT       XT_UDP_INV_SRCPT
+#define IPT_UDP_INV_DSTPT       XT_UDP_INV_DSTPT
+#define IPT_UDP_INV_MASK        XT_UDP_INV_MASK
+
+/* The argument to IPT_SO_ADD_COUNTERS. */
+#define ipt_counters_info xt_counters_info
+/* Standard return verdict, or do jump. */
+#define IPT_STANDARD_TARGET XT_STANDARD_TARGET
+/* Error verdict. */
+#define IPT_ERROR_TARGET XT_ERROR_TARGET
+
+/* fn returns 0 to continue iteration */
+#define IPT_MATCH_ITERATE(e, fn, args...) \
+        XT_MATCH_ITERATE(struct ipt_entry, e, fn, ## args)
+
+/* fn returns 0 to continue iteration */
+#define IPT_ENTRY_ITERATE(entries, size, fn, args...) \
+        XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args)
+#endif
+
+/* Yes, Virginia, you have to zero the padding. */
+struct ipt_ip {
+        /* Source and destination IP addr */
+        struct in_addr src, dst;
+        /* Mask for src and dest IP addr */
+        struct in_addr smsk, dmsk;
+        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
+        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
+
+        /* Protocol, 0 = ANY */
+        __u16 proto;
+
+        /* Flags word */
+        __u8 flags;
+        /* Inverse flags */
+        __u8 invflags;
+};
+
+/* Values for "flag" field in struct ipt_ip (general ip structure). */
+#define IPT_F_FRAG              0x01    /* Set if rule is a fragment rule */
+#define IPT_F_GOTO              0x02    /* Set if jump is a goto */
+#define IPT_F_MASK              0x03    /* All possible flag bits mask. */
+
+/* Values for "inv" field in struct ipt_ip. */
+#define IPT_INV_VIA_IN          0x01    /* Invert the sense of IN IFACE. */
+#define IPT_INV_VIA_OUT         0x02    /* Invert the sense of OUT IFACE */
+#define IPT_INV_TOS             0x04    /* Invert the sense of TOS. */
+#define IPT_INV_SRCIP           0x08    /* Invert the sense of SRC IP. */
+#define IPT_INV_DSTIP           0x10    /* Invert the sense of DST OP. */
+#define IPT_INV_FRAG            0x20    /* Invert the sense of FRAG. */
+#define IPT_INV_PROTO           XT_INV_PROTO
+#define IPT_INV_MASK            0x7F    /* All possible flag bits mask. */
+
+/* This structure defines each of the firewall rules.  Consists of 3
+   parts which are 1) general IP header stuff 2) match specific
+   stuff 3) the target to perform if the rule matches */
+struct ipt_entry {
+        struct ipt_ip ip;
+
+        /* Mark with fields that we care about. */
+        unsigned int nfcache;
+
+        /* Size of ipt_entry + matches */
+        __u16 target_offset;
+        /* Size of ipt_entry + matches + target */
+        __u16 next_offset;
+
+        /* Back pointer */
+        unsigned int comefrom;
+
+        /* Packet and byte counters. */
+        struct xt_counters counters;
+
+        /* The matches (if any), then the target. */
+        unsigned char elems[0];
+};
+
+/*
+ * New IP firewall options for [gs]etsockopt at the RAW IP level.
+ * Unlike BSD Linux inherits IP options so you don't have to use a raw
+ * socket for this. Instead we check rights in the calls.
+ *
+ * ATTENTION: check linux/in.h before adding new number here.
+ */
+#define IPT_BASE_CTL            64
+
+#define IPT_SO_SET_REPLACE      (IPT_BASE_CTL)
+#define IPT_SO_SET_ADD_COUNTERS (IPT_BASE_CTL + 1)
+#define IPT_SO_SET_MAX          IPT_SO_SET_ADD_COUNTERS
+
+#define IPT_SO_GET_INFO                 (IPT_BASE_CTL)
+#define IPT_SO_GET_ENTRIES              (IPT_BASE_CTL + 1)
+#define IPT_SO_GET_REVISION_MATCH       (IPT_BASE_CTL + 2)
+#define IPT_SO_GET_REVISION_TARGET      (IPT_BASE_CTL + 3)
+#define IPT_SO_GET_MAX                  IPT_SO_GET_REVISION_TARGET
+
+/* ICMP matching stuff */
+struct ipt_icmp {
+        __u8 type;                              /* type to match */
+        __u8 code[2];                           /* range of code */
+        __u8 invflags;                          /* Inverse flags */
+};
+
+/* Values for "inv" field for struct ipt_icmp. */
+#define IPT_ICMP_INV    0x01    /* Invert the sense of type/code test */
+
+/* The argument to IPT_SO_GET_INFO */
+struct ipt_getinfo {
+        /* Which table: caller fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Kernel fills these in. */
+        /* Which hook entry points are valid: bitmask */
+        unsigned int valid_hooks;
+
+        /* Hook entry points: one per netfilter hook. */
+        unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_INET_NUMHOOKS];
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Size of entries. */
+        unsigned int size;
+};
+
+/* The argument to IPT_SO_SET_REPLACE. */
+struct ipt_replace {
+        /* Which table. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Which hook entry points are valid: bitmask.  You can't
+           change this. */
+        unsigned int valid_hooks;
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Total size of new entries */
+        unsigned int size;
+
+        /* Hook entry points. */
+        unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_INET_NUMHOOKS];
+
+        /* Information about old entries: */
+        /* Number of counters (must be equal to current number of entries). */
+        unsigned int num_counters;
+        /* The old entries' counters. */
+        struct xt_counters __user *counters;
+
+        /* The entries (hang off end: not really an array). */
+        struct ipt_entry entries[0];
+};
+
+/* The argument to IPT_SO_GET_ENTRIES. */
+struct ipt_get_entries {
+        /* Which table: user fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* User fills this in: total entry size. */
+        unsigned int size;
+
+        /* The entries. */
+        struct ipt_entry entrytable[0];
+};
+
+/* Helper functions */
+static __inline__ struct xt_entry_target *
+ipt_get_target(struct ipt_entry *e)
+{
+        return (void *)e + e->target_offset;
+}
+
+/*
+ *      Main firewall chains definitions and global var's definitions.
+ */
+#endif /* _UAPI_IPTABLES_H */
diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
index c6a204c97047..c6a204c97047 100644
--- a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
index bb88d5315a4d..bb88d5315a4d 100644
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/uapi/linux/netfilter_ipv4/ipt_LOG.h
index 5d8152077d71..5d8152077d71 100644
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/include/linux/netfilter_ipv4/ipt_REJECT.h b/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
index 4293a1ad1b01..4293a1ad1b01 100644
--- a/include/linux/netfilter_ipv4/ipt_REJECT.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/include/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
index f6ac169d92f9..f6ac169d92f9 100644
--- a/include/linux/netfilter_ipv4/ipt_TTL.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/uapi/linux/netfilter_ipv4/ipt_ULOG.h
index 417aad280bcc..417aad280bcc 100644
--- a/include/linux/netfilter_ipv4/ipt_ULOG.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/include/linux/netfilter_ipv4/ipt_ah.h b/include/uapi/linux/netfilter_ipv4/ipt_ah.h
index 4e02bb0119e3..4e02bb0119e3 100644
--- a/include/linux/netfilter_ipv4/ipt_ah.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ah.h
diff --git a/include/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
index 0e0c063dbf60..0e0c063dbf60 100644
--- a/include/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/include/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
index 37bee4442486..37bee4442486 100644
--- a/include/linux/netfilter_ipv4/ipt_ttl.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/include/uapi/linux/netfilter_ipv6.h b/include/uapi/linux/netfilter_ipv6.h
new file mode 100644
index 000000000000..12497c6c7949
--- /dev/null
+++ b/include/uapi/linux/netfilter_ipv6.h
@@ -0,0 +1,79 @@
+/* IPv6-specific defines for netfilter. 
+ * (C)1998 Rusty Russell -- This code is GPL.
+ * (C)1999 David Jeffery
+ *   this header was blatantly ripped from netfilter_ipv4.h 
+ *   it's amazing what adding a bunch of 6s can do =8^)
+ */
+#ifndef _UAPI__LINUX_IP6_NETFILTER_H
+#define _UAPI__LINUX_IP6_NETFILTER_H
+
+
+#include <linux/netfilter.h>
+
+/* only for userspace compatibility */
+#ifndef __KERNEL__
+
+#include <limits.h> /* for INT_MIN, INT_MAX */
+
+/* IP Cache bits. */
+/* Src IP address. */
+#define NFC_IP6_SRC              0x0001
+/* Dest IP address. */
+#define NFC_IP6_DST              0x0002
+/* Input device. */
+#define NFC_IP6_IF_IN            0x0004
+/* Output device. */
+#define NFC_IP6_IF_OUT           0x0008
+/* TOS. */
+#define NFC_IP6_TOS              0x0010
+/* Protocol. */
+#define NFC_IP6_PROTO            0x0020
+/* IP options. */
+#define NFC_IP6_OPTIONS          0x0040
+/* Frag & flags. */
+#define NFC_IP6_FRAG             0x0080
+
+
+/* Per-protocol information: only matters if proto match. */
+/* TCP flags. */
+#define NFC_IP6_TCPFLAGS         0x0100
+/* Source port. */
+#define NFC_IP6_SRC_PT           0x0200
+/* Dest port. */
+#define NFC_IP6_DST_PT           0x0400
+/* Something else about the proto */
+#define NFC_IP6_PROTO_UNKNOWN    0x2000
+
+/* IP6 Hooks */
+/* After promisc drops, checksum checks. */
+#define NF_IP6_PRE_ROUTING      0
+/* If the packet is destined for this box. */
+#define NF_IP6_LOCAL_IN         1
+/* If the packet is destined for another interface. */
+#define NF_IP6_FORWARD          2
+/* Packets coming from a local process. */
+#define NF_IP6_LOCAL_OUT                3
+/* Packets about to hit the wire. */
+#define NF_IP6_POST_ROUTING     4
+#define NF_IP6_NUMHOOKS         5
+#endif /* ! __KERNEL__ */
+
+
+enum nf_ip6_hook_priorities {
+        NF_IP6_PRI_FIRST = INT_MIN,
+        NF_IP6_PRI_CONNTRACK_DEFRAG = -400,
+        NF_IP6_PRI_RAW = -300,
+        NF_IP6_PRI_SELINUX_FIRST = -225,
+        NF_IP6_PRI_CONNTRACK = -200,
+        NF_IP6_PRI_MANGLE = -150,
+        NF_IP6_PRI_NAT_DST = -100,
+        NF_IP6_PRI_FILTER = 0,
+        NF_IP6_PRI_SECURITY = 50,
+        NF_IP6_PRI_NAT_SRC = 100,
+        NF_IP6_PRI_SELINUX_LAST = 225,
+        NF_IP6_PRI_CONNTRACK_HELPER = 300,
+        NF_IP6_PRI_LAST = INT_MAX,
+};
+
+
+#endif /* _UAPI__LINUX_IP6_NETFILTER_H */
diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild
index aafaa5aa54d4..75a668ca2353 100644
--- a/include/uapi/linux/netfilter_ipv6/Kbuild
+++ b/include/uapi/linux/netfilter_ipv6/Kbuild
@@ -1 +1,13 @@
 # UAPI Header export list
+header-y += ip6_tables.h
+header-y += ip6t_HL.h
+header-y += ip6t_LOG.h
+header-y += ip6t_NPT.h
+header-y += ip6t_REJECT.h
+header-y += ip6t_ah.h
+header-y += ip6t_frag.h
+header-y += ip6t_hl.h
+header-y += ip6t_ipv6header.h
+header-y += ip6t_mh.h
+header-y += ip6t_opts.h
+header-y += ip6t_rt.h
diff --git a/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
new file mode 100644
index 000000000000..bf1ef65cc582
--- /dev/null
+++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
@@ -0,0 +1,267 @@
+/*
+ * 25-Jul-1998 Major changes to allow for ip chain table
+ *
+ * 3-Jan-2000 Named tables to allow packet selection for different uses.
+ */
+
+/*
+ *      Format of an IP6 firewall descriptor
+ *
+ *      src, dst, src_mask, dst_mask are always stored in network byte order.
+ *      flags are stored in host byte order (of course).
+ *      Port numbers are stored in HOST byte order.
+ */
+
+#ifndef _UAPI_IP6_TABLES_H
+#define _UAPI_IP6_TABLES_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/netfilter_ipv6.h>
+
+#include <linux/netfilter/x_tables.h>
+
+#ifndef __KERNEL__
+#define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
+#define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
+#define ip6t_match xt_match
+#define ip6t_target xt_target
+#define ip6t_table xt_table
+#define ip6t_get_revision xt_get_revision
+#define ip6t_entry_match xt_entry_match
+#define ip6t_entry_target xt_entry_target
+#define ip6t_standard_target xt_standard_target
+#define ip6t_error_target xt_error_target
+#define ip6t_counters xt_counters
+#define IP6T_CONTINUE XT_CONTINUE
+#define IP6T_RETURN XT_RETURN
+
+/* Pre-iptables-1.4.0 */
+#include <linux/netfilter/xt_tcpudp.h>
+#define ip6t_tcp xt_tcp
+#define ip6t_udp xt_udp
+#define IP6T_TCP_INV_SRCPT      XT_TCP_INV_SRCPT
+#define IP6T_TCP_INV_DSTPT      XT_TCP_INV_DSTPT
+#define IP6T_TCP_INV_FLAGS      XT_TCP_INV_FLAGS
+#define IP6T_TCP_INV_OPTION     XT_TCP_INV_OPTION
+#define IP6T_TCP_INV_MASK       XT_TCP_INV_MASK
+#define IP6T_UDP_INV_SRCPT      XT_UDP_INV_SRCPT
+#define IP6T_UDP_INV_DSTPT      XT_UDP_INV_DSTPT
+#define IP6T_UDP_INV_MASK       XT_UDP_INV_MASK
+
+#define ip6t_counters_info xt_counters_info
+#define IP6T_STANDARD_TARGET XT_STANDARD_TARGET
+#define IP6T_ERROR_TARGET XT_ERROR_TARGET
+#define IP6T_MATCH_ITERATE(e, fn, args...) \
+        XT_MATCH_ITERATE(struct ip6t_entry, e, fn, ## args)
+#define IP6T_ENTRY_ITERATE(entries, size, fn, args...) \
+        XT_ENTRY_ITERATE(struct ip6t_entry, entries, size, fn, ## args)
+#endif
+
+/* Yes, Virginia, you have to zero the padding. */
+struct ip6t_ip6 {
+        /* Source and destination IP6 addr */
+        struct in6_addr src, dst;               
+        /* Mask for src and dest IP6 addr */
+        struct in6_addr smsk, dmsk;
+        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
+        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
+
+        /* Upper protocol number
+         * - The allowed value is 0 (any) or protocol number of last parsable
+         *   header, which is 50 (ESP), 59 (No Next Header), 135 (MH), or
+         *   the non IPv6 extension headers.
+         * - The protocol numbers of IPv6 extension headers except of ESP and
+         *   MH do not match any packets.
+         * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
+         */
+        __u16 proto;
+        /* TOS to match iff flags & IP6T_F_TOS */
+        __u8 tos;
+
+        /* Flags word */
+        __u8 flags;
+        /* Inverse flags */
+        __u8 invflags;
+};
+
+/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
+#define IP6T_F_PROTO            0x01    /* Set if rule cares about upper 
+                                           protocols */
+#define IP6T_F_TOS              0x02    /* Match the TOS. */
+#define IP6T_F_GOTO             0x04    /* Set if jump is a goto */
+#define IP6T_F_MASK             0x07    /* All possible flag bits mask. */
+
+/* Values for "inv" field in struct ip6t_ip6. */
+#define IP6T_INV_VIA_IN         0x01    /* Invert the sense of IN IFACE. */
+#define IP6T_INV_VIA_OUT                0x02    /* Invert the sense of OUT IFACE */
+#define IP6T_INV_TOS            0x04    /* Invert the sense of TOS. */
+#define IP6T_INV_SRCIP          0x08    /* Invert the sense of SRC IP. */
+#define IP6T_INV_DSTIP          0x10    /* Invert the sense of DST OP. */
+#define IP6T_INV_FRAG           0x20    /* Invert the sense of FRAG. */
+#define IP6T_INV_PROTO          XT_INV_PROTO
+#define IP6T_INV_MASK           0x7F    /* All possible flag bits mask. */
+
+/* This structure defines each of the firewall rules.  Consists of 3
+   parts which are 1) general IP header stuff 2) match specific
+   stuff 3) the target to perform if the rule matches */
+struct ip6t_entry {
+        struct ip6t_ip6 ipv6;
+
+        /* Mark with fields that we care about. */
+        unsigned int nfcache;
+
+        /* Size of ipt_entry + matches */
+        __u16 target_offset;
+        /* Size of ipt_entry + matches + target */
+        __u16 next_offset;
+
+        /* Back pointer */
+        unsigned int comefrom;
+
+        /* Packet and byte counters. */
+        struct xt_counters counters;
+
+        /* The matches (if any), then the target. */
+        unsigned char elems[0];
+};
+
+/* Standard entry */
+struct ip6t_standard {
+        struct ip6t_entry entry;
+        struct xt_standard_target target;
+};
+
+struct ip6t_error {
+        struct ip6t_entry entry;
+        struct xt_error_target target;
+};
+
+#define IP6T_ENTRY_INIT(__size)                                                \
+{                                                                              \
+        .target_offset  = sizeof(struct ip6t_entry),                           \
+        .next_offset    = (__size),                                            \
+}
+
+#define IP6T_STANDARD_INIT(__verdict)                                          \
+{                                                                              \
+        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_standard)),       \
+        .target         = XT_TARGET_INIT(XT_STANDARD_TARGET,                   \
+                                         sizeof(struct xt_standard_target)),   \
+        .target.verdict = -(__verdict) - 1,                                    \
+}
+
+#define IP6T_ERROR_INIT                                                        \
+{                                                                              \
+        .entry          = IP6T_ENTRY_INIT(sizeof(struct ip6t_error)),          \
+        .target         = XT_TARGET_INIT(XT_ERROR_TARGET,                      \
+                                         sizeof(struct xt_error_target)),      \
+        .target.errorname = "ERROR",                                           \
+}
+
+/*
+ * New IP firewall options for [gs]etsockopt at the RAW IP level.
+ * Unlike BSD Linux inherits IP options so you don't have to use
+ * a raw socket for this. Instead we check rights in the calls.
+ *
+ * ATTENTION: check linux/in6.h before adding new number here.
+ */
+#define IP6T_BASE_CTL                   64
+
+#define IP6T_SO_SET_REPLACE             (IP6T_BASE_CTL)
+#define IP6T_SO_SET_ADD_COUNTERS        (IP6T_BASE_CTL + 1)
+#define IP6T_SO_SET_MAX                 IP6T_SO_SET_ADD_COUNTERS
+
+#define IP6T_SO_GET_INFO                (IP6T_BASE_CTL)
+#define IP6T_SO_GET_ENTRIES             (IP6T_BASE_CTL + 1)
+#define IP6T_SO_GET_REVISION_MATCH      (IP6T_BASE_CTL + 4)
+#define IP6T_SO_GET_REVISION_TARGET     (IP6T_BASE_CTL + 5)
+#define IP6T_SO_GET_MAX                 IP6T_SO_GET_REVISION_TARGET
+
+/* ICMP matching stuff */
+struct ip6t_icmp {
+        __u8 type;                              /* type to match */
+        __u8 code[2];                           /* range of code */
+        __u8 invflags;                          /* Inverse flags */
+};
+
+/* Values for "inv" field for struct ipt_icmp. */
+#define IP6T_ICMP_INV   0x01    /* Invert the sense of type/code test */
+
+/* The argument to IP6T_SO_GET_INFO */
+struct ip6t_getinfo {
+        /* Which table: caller fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Kernel fills these in. */
+        /* Which hook entry points are valid: bitmask */
+        unsigned int valid_hooks;
+
+        /* Hook entry points: one per netfilter hook. */
+        unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_INET_NUMHOOKS];
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Size of entries. */
+        unsigned int size;
+};
+
+/* The argument to IP6T_SO_SET_REPLACE. */
+struct ip6t_replace {
+        /* Which table. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* Which hook entry points are valid: bitmask.  You can't
+           change this. */
+        unsigned int valid_hooks;
+
+        /* Number of entries */
+        unsigned int num_entries;
+
+        /* Total size of new entries */
+        unsigned int size;
+
+        /* Hook entry points. */
+        unsigned int hook_entry[NF_INET_NUMHOOKS];
+
+        /* Underflow points. */
+        unsigned int underflow[NF_INET_NUMHOOKS];
+
+        /* Information about old entries: */
+        /* Number of counters (must be equal to current number of entries). */
+        unsigned int num_counters;
+        /* The old entries' counters. */
+        struct xt_counters __user *counters;
+
+        /* The entries (hang off end: not really an array). */
+        struct ip6t_entry entries[0];
+};
+
+/* The argument to IP6T_SO_GET_ENTRIES. */
+struct ip6t_get_entries {
+        /* Which table: user fills this in. */
+        char name[XT_TABLE_MAXNAMELEN];
+
+        /* User fills this in: total entry size. */
+        unsigned int size;
+
+        /* The entries. */
+        struct ip6t_entry entrytable[0];
+};
+
+/* Helper functions */
+static __inline__ struct xt_entry_target *
+ip6t_get_target(struct ip6t_entry *e)
+{
+        return (void *)e + e->target_offset;
+}
+
+/*
+ *      Main firewall chains definitions and global var's definitions.
+ */
+
+#endif /* _UAPI_IP6_TABLES_H */
diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
index ebd8ead1bb63..ebd8ead1bb63 100644
--- a/include/linux/netfilter_ipv6/ip6t_HL.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
index 3dd0bc4e0735..3dd0bc4e0735 100644
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/include/linux/netfilter_ipv6/ip6t_NPT.h b/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
index f763355481b5..f763355481b5 100644
--- a/include/linux/netfilter_ipv6/ip6t_NPT.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
index 205ed62e4605..205ed62e4605 100644
--- a/include/linux/netfilter_ipv6/ip6t_REJECT.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/include/linux/netfilter_ipv6/ip6t_ah.h b/include/uapi/linux/netfilter_ipv6/ip6t_ah.h
index 5da2b65cb3ad..5da2b65cb3ad 100644
--- a/include/linux/netfilter_ipv6/ip6t_ah.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/include/linux/netfilter_ipv6/ip6t_frag.h b/include/uapi/linux/netfilter_ipv6/ip6t_frag.h
index b47f61b9e082..b47f61b9e082 100644
--- a/include/linux/netfilter_ipv6/ip6t_frag.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/include/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
index 6e76dbc6c19a..6e76dbc6c19a 100644
--- a/include/linux/netfilter_ipv6/ip6t_hl.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
index efae3a20c214..efae3a20c214 100644
--- a/include/linux/netfilter_ipv6/ip6t_ipv6header.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/include/linux/netfilter_ipv6/ip6t_mh.h b/include/uapi/linux/netfilter_ipv6/ip6t_mh.h
index a7729a5025cd..a7729a5025cd 100644
--- a/include/linux/netfilter_ipv6/ip6t_mh.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/include/linux/netfilter_ipv6/ip6t_opts.h b/include/uapi/linux/netfilter_ipv6/ip6t_opts.h
index 17d419a811fd..17d419a811fd 100644
--- a/include/linux/netfilter_ipv6/ip6t_opts.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/include/linux/netfilter_ipv6/ip6t_rt.h b/include/uapi/linux/netfilter_ipv6/ip6t_rt.h
index 7605a5ff81cd..7605a5ff81cd 100644
--- a/include/linux/netfilter_ipv6/ip6t_rt.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
new file mode 100644
index 000000000000..78d5b8a546d6
--- /dev/null
+++ b/include/uapi/linux/netlink.h
@@ -0,0 +1,153 @@
+#ifndef _UAPI__LINUX_NETLINK_H
+#define _UAPI__LINUX_NETLINK_H
+
+#include <linux/socket.h> /* for __kernel_sa_family_t */
+#include <linux/types.h>
+
+#define NETLINK_ROUTE           0       /* Routing/device hook                          */
+#define NETLINK_UNUSED          1       /* Unused number                                */
+#define NETLINK_USERSOCK        2       /* Reserved for user mode socket protocols      */
+#define NETLINK_FIREWALL        3       /* Unused number, formerly ip_queue             */
+#define NETLINK_SOCK_DIAG       4       /* socket monitoring                            */
+#define NETLINK_NFLOG           5       /* netfilter/iptables ULOG */
+#define NETLINK_XFRM            6       /* ipsec */
+#define NETLINK_SELINUX         7       /* SELinux event notifications */
+#define NETLINK_ISCSI           8       /* Open-iSCSI */
+#define NETLINK_AUDIT           9       /* auditing */
+#define NETLINK_FIB_LOOKUP      10      
+#define NETLINK_CONNECTOR       11
+#define NETLINK_NETFILTER       12      /* netfilter subsystem */
+#define NETLINK_IP6_FW          13
+#define NETLINK_DNRTMSG         14      /* DECnet routing messages */
+#define NETLINK_KOBJECT_UEVENT  15      /* Kernel messages to userspace */
+#define NETLINK_GENERIC         16
+/* leave room for NETLINK_DM (DM Events) */
+#define NETLINK_SCSITRANSPORT   18      /* SCSI Transports */
+#define NETLINK_ECRYPTFS        19
+#define NETLINK_RDMA            20
+#define NETLINK_CRYPTO          21      /* Crypto layer */
+
+#define NETLINK_INET_DIAG       NETLINK_SOCK_DIAG
+
+#define MAX_LINKS 32            
+
+struct sockaddr_nl {
+        __kernel_sa_family_t    nl_family;      /* AF_NETLINK   */
+        unsigned short  nl_pad;         /* zero         */
+        __u32           nl_pid;         /* port ID      */
+        __u32           nl_groups;      /* multicast groups mask */
+};
+
+struct nlmsghdr {
+        __u32           nlmsg_len;      /* Length of message including header */
+        __u16           nlmsg_type;     /* Message content */
+        __u16           nlmsg_flags;    /* Additional flags */
+        __u32           nlmsg_seq;      /* Sequence number */
+        __u32           nlmsg_pid;      /* Sending process port ID */
+};
+
+/* Flags values */
+
+#define NLM_F_REQUEST           1       /* It is request message.       */
+#define NLM_F_MULTI             2       /* Multipart message, terminated by NLMSG_DONE */
+#define NLM_F_ACK               4       /* Reply with ack, with zero or error code */
+#define NLM_F_ECHO              8       /* Echo this request            */
+#define NLM_F_DUMP_INTR         16      /* Dump was inconsistent due to sequence change */
+
+/* Modifiers to GET request */
+#define NLM_F_ROOT      0x100   /* specify tree root    */
+#define NLM_F_MATCH     0x200   /* return all matching  */
+#define NLM_F_ATOMIC    0x400   /* atomic GET           */
+#define NLM_F_DUMP      (NLM_F_ROOT|NLM_F_MATCH)
+
+/* Modifiers to NEW request */
+#define NLM_F_REPLACE   0x100   /* Override existing            */
+#define NLM_F_EXCL      0x200   /* Do not touch, if it exists   */
+#define NLM_F_CREATE    0x400   /* Create, if it does not exist */
+#define NLM_F_APPEND    0x800   /* Add to end of list           */
+
+/*
+   4.4BSD ADD           NLM_F_CREATE|NLM_F_EXCL
+   4.4BSD CHANGE        NLM_F_REPLACE
+
+   True CHANGE          NLM_F_CREATE|NLM_F_REPLACE
+   Append               NLM_F_CREATE
+   Check                NLM_F_EXCL
+ */
+
+#define NLMSG_ALIGNTO   4U
+#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
+#define NLMSG_HDRLEN     ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
+#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN))
+#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
+#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
+#define NLMSG_NEXT(nlh,len)      ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
+                                  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
+#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
+                           (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
+                           (nlh)->nlmsg_len <= (len))
+#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
+
+#define NLMSG_NOOP              0x1     /* Nothing.             */
+#define NLMSG_ERROR             0x2     /* Error                */
+#define NLMSG_DONE              0x3     /* End of a dump        */
+#define NLMSG_OVERRUN           0x4     /* Data lost            */
+
+#define NLMSG_MIN_TYPE          0x10    /* < 0x10: reserved control messages */
+
+struct nlmsgerr {
+        int             error;
+        struct nlmsghdr msg;
+};
+
+#define NETLINK_ADD_MEMBERSHIP  1
+#define NETLINK_DROP_MEMBERSHIP 2
+#define NETLINK_PKTINFO         3
+#define NETLINK_BROADCAST_ERROR 4
+#define NETLINK_NO_ENOBUFS      5
+
+struct nl_pktinfo {
+        __u32   group;
+};
+
+#define NET_MAJOR 36            /* Major 36 is reserved for networking                                          */
+
+enum {
+        NETLINK_UNCONNECTED = 0,
+        NETLINK_CONNECTED,
+};
+
+/*
+ *  <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)-->
+ * +---------------------+- - -+- - - - - - - - - -+- - -+
+ * |        Header       | Pad |     Payload       | Pad |
+ * |   (struct nlattr)   | ing |                   | ing |
+ * +---------------------+- - -+- - - - - - - - - -+- - -+
+ *  <-------------- nlattr->nla_len -------------->
+ */
+
+struct nlattr {
+        __u16           nla_len;
+        __u16           nla_type;
+};
+
+/*
+ * nla_type (16 bits)
+ * +---+---+-------------------------------+
+ * | N | O | Attribute Type                |
+ * +---+---+-------------------------------+
+ * N := Carries nested attributes
+ * O := Payload stored in network byte order
+ *
+ * Note: The N and O flag are mutually exclusive.
+ */
+#define NLA_F_NESTED            (1 << 15)
+#define NLA_F_NET_BYTEORDER     (1 << 14)
+#define NLA_TYPE_MASK           ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
+
+#define NLA_ALIGNTO             4
+#define NLA_ALIGN(len)          (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
+#define NLA_HDRLEN              ((int) NLA_ALIGN(sizeof(struct nlattr)))
+
+
+#endif /* _UAPI__LINUX_NETLINK_H */
diff --git a/include/linux/netrom.h b/include/uapi/linux/netrom.h
index af7313cc9cb6..af7313cc9cb6 100644
--- a/include/linux/netrom.h
+++ b/include/uapi/linux/netrom.h
diff --git a/include/linux/nfc.h b/include/uapi/linux/nfc.h
index d908d17da56d..d908d17da56d 100644
--- a/include/linux/nfc.h
+++ b/include/uapi/linux/nfc.h
diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h
new file mode 100644
index 000000000000..5199a36dd574
--- /dev/null
+++ b/include/uapi/linux/nfs.h
@@ -0,0 +1,131 @@
+/*
+ * NFS protocol definitions
+ *
+ * This file contains constants mostly for Version 2 of the protocol,
+ * but also has a couple of NFSv3 bits in (notably the error codes).
+ */
+#ifndef _UAPI_LINUX_NFS_H
+#define _UAPI_LINUX_NFS_H
+
+#define NFS_PROGRAM     100003
+#define NFS_PORT        2049
+#define NFS_MAXDATA     8192
+#define NFS_MAXPATHLEN  1024
+#define NFS_MAXNAMLEN   255
+#define NFS_MAXGROUPS   16
+#define NFS_FHSIZE      32
+#define NFS_COOKIESIZE  4
+#define NFS_FIFO_DEV    (-1)
+#define NFSMODE_FMT     0170000
+#define NFSMODE_DIR     0040000
+#define NFSMODE_CHR     0020000
+#define NFSMODE_BLK     0060000
+#define NFSMODE_REG     0100000
+#define NFSMODE_LNK     0120000
+#define NFSMODE_SOCK    0140000
+#define NFSMODE_FIFO    0010000
+
+#define NFS_MNT_PROGRAM         100005
+#define NFS_MNT_VERSION         1
+#define NFS_MNT3_VERSION        3
+
+#define NFS_PIPE_DIRNAME "nfs"
+
+/*
+ * NFS stats. The good thing with these values is that NFSv3 errors are
+ * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
+ * no-one uses anyway), so we can happily mix code as long as we make sure
+ * no NFSv3 errors are returned to NFSv2 clients.
+ * Error codes that have a `--' in the v2 column are not part of the
+ * standard, but seem to be widely used nevertheless.
+ */
+ enum nfs_stat {
+        NFS_OK = 0,                     /* v2 v3 v4 */
+        NFSERR_PERM = 1,                /* v2 v3 v4 */
+        NFSERR_NOENT = 2,               /* v2 v3 v4 */
+        NFSERR_IO = 5,                  /* v2 v3 v4 */
+        NFSERR_NXIO = 6,                /* v2 v3 v4 */
+        NFSERR_EAGAIN = 11,             /* v2 v3 */
+        NFSERR_ACCES = 13,              /* v2 v3 v4 */
+        NFSERR_EXIST = 17,              /* v2 v3 v4 */
+        NFSERR_XDEV = 18,               /*    v3 v4 */
+        NFSERR_NODEV = 19,              /* v2 v3 v4 */
+        NFSERR_NOTDIR = 20,             /* v2 v3 v4 */
+        NFSERR_ISDIR = 21,              /* v2 v3 v4 */
+        NFSERR_INVAL = 22,              /* v2 v3 v4 */
+        NFSERR_FBIG = 27,               /* v2 v3 v4 */
+        NFSERR_NOSPC = 28,              /* v2 v3 v4 */
+        NFSERR_ROFS = 30,               /* v2 v3 v4 */
+        NFSERR_MLINK = 31,              /*    v3 v4 */
+        NFSERR_OPNOTSUPP = 45,          /* v2 v3 */
+        NFSERR_NAMETOOLONG = 63,        /* v2 v3 v4 */
+        NFSERR_NOTEMPTY = 66,           /* v2 v3 v4 */
+        NFSERR_DQUOT = 69,              /* v2 v3 v4 */
+        NFSERR_STALE = 70,              /* v2 v3 v4 */
+        NFSERR_REMOTE = 71,             /* v2 v3 */
+        NFSERR_WFLUSH = 99,             /* v2    */
+        NFSERR_BADHANDLE = 10001,       /*    v3 v4 */
+        NFSERR_NOT_SYNC = 10002,        /*    v3 */
+        NFSERR_BAD_COOKIE = 10003,      /*    v3 v4 */
+        NFSERR_NOTSUPP = 10004,         /*    v3 v4 */
+        NFSERR_TOOSMALL = 10005,        /*    v3 v4 */
+        NFSERR_SERVERFAULT = 10006,     /*    v3 v4 */
+        NFSERR_BADTYPE = 10007,         /*    v3 v4 */
+        NFSERR_JUKEBOX = 10008,         /*    v3 v4 */
+        NFSERR_SAME = 10009,            /*       v4 */
+        NFSERR_DENIED = 10010,          /*       v4 */
+        NFSERR_EXPIRED = 10011,         /*       v4 */
+        NFSERR_LOCKED = 10012,          /*       v4 */
+        NFSERR_GRACE = 10013,           /*       v4 */
+        NFSERR_FHEXPIRED = 10014,       /*       v4 */
+        NFSERR_SHARE_DENIED = 10015,    /*       v4 */
+        NFSERR_WRONGSEC = 10016,        /*       v4 */
+        NFSERR_CLID_INUSE = 10017,      /*       v4 */
+        NFSERR_RESOURCE = 10018,        /*       v4 */
+        NFSERR_MOVED = 10019,           /*       v4 */
+        NFSERR_NOFILEHANDLE = 10020,    /*       v4 */
+        NFSERR_MINOR_VERS_MISMATCH = 10021,   /* v4 */
+        NFSERR_STALE_CLIENTID = 10022,  /*       v4 */
+        NFSERR_STALE_STATEID = 10023,   /*       v4 */
+        NFSERR_OLD_STATEID = 10024,     /*       v4 */
+        NFSERR_BAD_STATEID = 10025,     /*       v4 */  
+        NFSERR_BAD_SEQID = 10026,       /*       v4 */
+        NFSERR_NOT_SAME = 10027,        /*       v4 */
+        NFSERR_LOCK_RANGE = 10028,      /*       v4 */
+        NFSERR_SYMLINK = 10029,         /*       v4 */
+        NFSERR_RESTOREFH = 10030,       /*       v4 */
+        NFSERR_LEASE_MOVED = 10031,     /*       v4 */
+        NFSERR_ATTRNOTSUPP = 10032,     /*       v4 */
+        NFSERR_NO_GRACE = 10033,        /*       v4 */
+        NFSERR_RECLAIM_BAD = 10034,     /*       v4 */
+        NFSERR_RECLAIM_CONFLICT = 10035,/*       v4 */
+        NFSERR_BAD_XDR = 10036,         /*       v4 */
+        NFSERR_LOCKS_HELD = 10037,      /*       v4 */
+        NFSERR_OPENMODE = 10038,       /*       v4 */
+        NFSERR_BADOWNER = 10039,       /*       v4 */
+        NFSERR_BADCHAR = 10040,        /*       v4 */
+        NFSERR_BADNAME = 10041,        /*       v4 */
+        NFSERR_BAD_RANGE = 10042,      /*       v4 */
+        NFSERR_LOCK_NOTSUPP = 10043,   /*       v4 */
+        NFSERR_OP_ILLEGAL = 10044,     /*       v4 */
+        NFSERR_DEADLOCK = 10045,       /*       v4 */
+        NFSERR_FILE_OPEN = 10046,      /*       v4 */
+        NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
+        NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
+};
+
+/* NFSv2 file types - beware, these are not the same in NFSv3 */
+
+enum nfs_ftype {
+        NFNON = 0,
+        NFREG = 1,
+        NFDIR = 2,
+        NFBLK = 3,
+        NFCHR = 4,
+        NFLNK = 5,
+        NFSOCK = 6,
+        NFBAD = 7,
+        NFFIFO = 8
+};
+
+#endif /* _UAPI_LINUX_NFS_H */
diff --git a/include/linux/nfs2.h b/include/uapi/linux/nfs2.h
index fde24b30cc9e..fde24b30cc9e 100644
--- a/include/linux/nfs2.h
+++ b/include/uapi/linux/nfs2.h
diff --git a/include/uapi/linux/nfs3.h b/include/uapi/linux/nfs3.h
new file mode 100644
index 000000000000..231ef4e69829
--- /dev/null
+++ b/include/uapi/linux/nfs3.h
@@ -0,0 +1,97 @@
+/*
+ * NFSv3 protocol definitions
+ */
+#ifndef _UAPI_LINUX_NFS3_H
+#define _UAPI_LINUX_NFS3_H
+
+#define NFS3_PORT               2049
+#define NFS3_MAXDATA            32768
+#define NFS3_MAXPATHLEN         PATH_MAX
+#define NFS3_MAXNAMLEN          NAME_MAX
+#define NFS3_MAXGROUPS          16
+#define NFS3_FHSIZE             64
+#define NFS3_COOKIESIZE         4
+#define NFS3_CREATEVERFSIZE     8
+#define NFS3_COOKIEVERFSIZE     8
+#define NFS3_WRITEVERFSIZE      8
+#define NFS3_FIFO_DEV           (-1)
+#define NFS3MODE_FMT            0170000
+#define NFS3MODE_DIR            0040000
+#define NFS3MODE_CHR            0020000
+#define NFS3MODE_BLK            0060000
+#define NFS3MODE_REG            0100000
+#define NFS3MODE_LNK            0120000
+#define NFS3MODE_SOCK           0140000
+#define NFS3MODE_FIFO           0010000
+
+/* Flags for access() call */
+#define NFS3_ACCESS_READ        0x0001
+#define NFS3_ACCESS_LOOKUP      0x0002
+#define NFS3_ACCESS_MODIFY      0x0004
+#define NFS3_ACCESS_EXTEND      0x0008
+#define NFS3_ACCESS_DELETE      0x0010
+#define NFS3_ACCESS_EXECUTE     0x0020
+#define NFS3_ACCESS_FULL        0x003f
+
+/* Flags for create mode */
+enum nfs3_createmode {
+        NFS3_CREATE_UNCHECKED = 0,
+        NFS3_CREATE_GUARDED = 1,
+        NFS3_CREATE_EXCLUSIVE = 2
+};
+
+/* NFSv3 file system properties */
+#define NFS3_FSF_LINK           0x0001
+#define NFS3_FSF_SYMLINK        0x0002
+#define NFS3_FSF_HOMOGENEOUS    0x0008
+#define NFS3_FSF_CANSETTIME     0x0010
+/* Some shorthands. See fs/nfsd/nfs3proc.c */
+#define NFS3_FSF_DEFAULT        0x001B
+#define NFS3_FSF_BILLYBOY       0x0018
+#define NFS3_FSF_READONLY       0x0008
+
+enum nfs3_ftype {
+        NF3NON  = 0,
+        NF3REG  = 1,
+        NF3DIR  = 2,
+        NF3BLK  = 3,
+        NF3CHR  = 4,
+        NF3LNK  = 5,
+        NF3SOCK = 6,
+        NF3FIFO = 7,    /* changed from NFSv2 (was 8) */
+        NF3BAD  = 8
+};
+
+struct nfs3_fh {
+        unsigned short size;
+        unsigned char  data[NFS3_FHSIZE];
+};
+
+#define NFS3_VERSION            3
+#define NFS3PROC_NULL           0
+#define NFS3PROC_GETATTR        1
+#define NFS3PROC_SETATTR        2
+#define NFS3PROC_LOOKUP         3
+#define NFS3PROC_ACCESS         4
+#define NFS3PROC_READLINK       5
+#define NFS3PROC_READ           6
+#define NFS3PROC_WRITE          7
+#define NFS3PROC_CREATE         8
+#define NFS3PROC_MKDIR          9
+#define NFS3PROC_SYMLINK        10
+#define NFS3PROC_MKNOD          11
+#define NFS3PROC_REMOVE         12
+#define NFS3PROC_RMDIR          13
+#define NFS3PROC_RENAME         14
+#define NFS3PROC_LINK           15
+#define NFS3PROC_READDIR        16
+#define NFS3PROC_READDIRPLUS    17
+#define NFS3PROC_FSSTAT         18
+#define NFS3PROC_FSINFO         19
+#define NFS3PROC_PATHCONF       20
+#define NFS3PROC_COMMIT         21
+
+#define NFS_MNT3_VERSION        3
+ 
+
+#endif /* _UAPI_LINUX_NFS3_H */
diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
new file mode 100644
index 000000000000..788128ebac45
--- /dev/null
+++ b/include/uapi/linux/nfs4.h
@@ -0,0 +1,178 @@
+/*
+ *  include/linux/nfs4.h
+ *
+ *  NFSv4 protocol definitions.
+ *
+ *  Copyright (c) 2002 The Regents of the University of Michigan.
+ *  All rights reserved.
+ *
+ *  Kendrick Smith <kmsmith@umich.edu>
+ *  Andy Adamson   <andros@umich.edu>
+ */
+
+#ifndef _UAPI_LINUX_NFS4_H
+#define _UAPI_LINUX_NFS4_H
+
+#include <linux/types.h>
+
+#define NFS4_BITMAP_SIZE        2
+#define NFS4_VERIFIER_SIZE      8
+#define NFS4_STATEID_SEQID_SIZE 4
+#define NFS4_STATEID_OTHER_SIZE 12
+#define NFS4_STATEID_SIZE       (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE)
+#define NFS4_FHSIZE             128
+#define NFS4_MAXPATHLEN         PATH_MAX
+#define NFS4_MAXNAMLEN          NAME_MAX
+#define NFS4_OPAQUE_LIMIT       1024
+#define NFS4_MAX_SESSIONID_LEN  16
+
+#define NFS4_ACCESS_READ        0x0001
+#define NFS4_ACCESS_LOOKUP      0x0002
+#define NFS4_ACCESS_MODIFY      0x0004
+#define NFS4_ACCESS_EXTEND      0x0008
+#define NFS4_ACCESS_DELETE      0x0010
+#define NFS4_ACCESS_EXECUTE     0x0020
+
+#define NFS4_FH_PERSISTENT              0x0000
+#define NFS4_FH_NOEXPIRE_WITH_OPEN      0x0001
+#define NFS4_FH_VOLATILE_ANY            0x0002
+#define NFS4_FH_VOL_MIGRATION           0x0004
+#define NFS4_FH_VOL_RENAME              0x0008
+
+#define NFS4_OPEN_RESULT_CONFIRM 0x0002
+#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
+
+#define NFS4_SHARE_ACCESS_MASK  0x000F
+#define NFS4_SHARE_ACCESS_READ  0x0001
+#define NFS4_SHARE_ACCESS_WRITE 0x0002
+#define NFS4_SHARE_ACCESS_BOTH  0x0003
+#define NFS4_SHARE_DENY_READ    0x0001
+#define NFS4_SHARE_DENY_WRITE   0x0002
+#define NFS4_SHARE_DENY_BOTH    0x0003
+
+/* nfs41 */
+#define NFS4_SHARE_WANT_MASK            0xFF00
+#define NFS4_SHARE_WANT_NO_PREFERENCE   0x0000
+#define NFS4_SHARE_WANT_READ_DELEG      0x0100
+#define NFS4_SHARE_WANT_WRITE_DELEG     0x0200
+#define NFS4_SHARE_WANT_ANY_DELEG       0x0300
+#define NFS4_SHARE_WANT_NO_DELEG        0x0400
+#define NFS4_SHARE_WANT_CANCEL          0x0500
+
+#define NFS4_SHARE_WHEN_MASK            0xF0000
+#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL        0x10000
+#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED          0x20000
+
+#define NFS4_CDFC4_FORE 0x1
+#define NFS4_CDFC4_BACK 0x2
+#define NFS4_CDFC4_BOTH 0x3
+#define NFS4_CDFC4_FORE_OR_BOTH 0x3
+#define NFS4_CDFC4_BACK_OR_BOTH 0x7
+
+#define NFS4_CDFS4_FORE 0x1
+#define NFS4_CDFS4_BACK 0x2
+#define NFS4_CDFS4_BOTH 0x3
+
+#define NFS4_SET_TO_SERVER_TIME 0
+#define NFS4_SET_TO_CLIENT_TIME 1
+
+#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
+#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
+#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
+#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
+
+#define ACL4_SUPPORT_ALLOW_ACL 0x01
+#define ACL4_SUPPORT_DENY_ACL  0x02
+#define ACL4_SUPPORT_AUDIT_ACL 0x04
+#define ACL4_SUPPORT_ALARM_ACL 0x08
+
+#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
+#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
+#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
+#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
+#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
+#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
+#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
+
+#define NFS4_ACE_READ_DATA                    0x00000001
+#define NFS4_ACE_LIST_DIRECTORY               0x00000001
+#define NFS4_ACE_WRITE_DATA                   0x00000002
+#define NFS4_ACE_ADD_FILE                     0x00000002
+#define NFS4_ACE_APPEND_DATA                  0x00000004
+#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
+#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
+#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
+#define NFS4_ACE_EXECUTE                      0x00000020
+#define NFS4_ACE_DELETE_CHILD                 0x00000040
+#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
+#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
+#define NFS4_ACE_DELETE                       0x00010000
+#define NFS4_ACE_READ_ACL                     0x00020000
+#define NFS4_ACE_WRITE_ACL                    0x00040000
+#define NFS4_ACE_WRITE_OWNER                  0x00080000
+#define NFS4_ACE_SYNCHRONIZE                  0x00100000
+#define NFS4_ACE_GENERIC_READ                 0x00120081
+#define NFS4_ACE_GENERIC_WRITE                0x00160106
+#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
+#define NFS4_ACE_MASK_ALL                     0x001F01FF
+
+#define EXCHGID4_FLAG_SUPP_MOVED_REFER          0x00000001
+#define EXCHGID4_FLAG_SUPP_MOVED_MIGR           0x00000002
+#define EXCHGID4_FLAG_BIND_PRINC_STATEID        0x00000100
+
+#define EXCHGID4_FLAG_USE_NON_PNFS              0x00010000
+#define EXCHGID4_FLAG_USE_PNFS_MDS              0x00020000
+#define EXCHGID4_FLAG_USE_PNFS_DS               0x00040000
+#define EXCHGID4_FLAG_MASK_PNFS                 0x00070000
+
+#define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A       0x40000000
+#define EXCHGID4_FLAG_CONFIRMED_R               0x80000000
+/*
+ * Since the validity of these bits depends on whether
+ * they're set in the argument or response, have separate
+ * invalid flag masks for arg (_A) and resp (_R).
+ */
+#define EXCHGID4_FLAG_MASK_A                    0x40070103
+#define EXCHGID4_FLAG_MASK_R                    0x80070103
+
+#define SEQ4_STATUS_CB_PATH_DOWN                0x00000001
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING    0x00000002
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED     0x00000004
+#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED   0x00000008
+#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED  0x00000010
+#define SEQ4_STATUS_ADMIN_STATE_REVOKED         0x00000020
+#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED    0x00000040
+#define SEQ4_STATUS_LEASE_MOVED                 0x00000080
+#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED      0x00000100
+#define SEQ4_STATUS_CB_PATH_DOWN_SESSION        0x00000200
+#define SEQ4_STATUS_BACKCHANNEL_FAULT           0x00000400
+
+#define NFS4_SECINFO_STYLE4_CURRENT_FH  0
+#define NFS4_SECINFO_STYLE4_PARENT      1
+
+#define NFS4_MAX_UINT64 (~(u64)0)
+
+/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
+ * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
+ */
+#define NFS4_MAX_OPS   8
+
+/* Our NFS4 client back channel server only wants the cb_sequene and the
+ * actual operation per compound
+ */
+#define NFS4_MAX_BACK_CHANNEL_OPS 2
+
+enum nfs4_acl_whotype {
+        NFS4_ACL_WHO_NAMED = 0,
+        NFS4_ACL_WHO_OWNER,
+        NFS4_ACL_WHO_GROUP,
+        NFS4_ACL_WHO_EVERYONE,
+};
+
+#endif /* _UAPI_LINUX_NFS4_H */
+
+/*
+ * Local variables:
+ *  c-basic-offset: 8
+ * End:
+ */
diff --git a/include/linux/nfs4_mount.h b/include/uapi/linux/nfs4_mount.h
index a0dcf6655657..a0dcf6655657 100644
--- a/include/linux/nfs4_mount.h
+++ b/include/uapi/linux/nfs4_mount.h
diff --git a/include/uapi/linux/nfs_fs.h b/include/uapi/linux/nfs_fs.h
new file mode 100644
index 000000000000..49142287999c
--- /dev/null
+++ b/include/uapi/linux/nfs_fs.h
@@ -0,0 +1,61 @@
+/*
+ *  linux/include/linux/nfs_fs.h
+ *
+ *  Copyright (C) 1992  Rick Sladkey
+ *
+ *  OS-specific nfs filesystem definitions and declarations
+ */
+
+#ifndef _UAPI_LINUX_NFS_FS_H
+#define _UAPI_LINUX_NFS_FS_H
+
+#include <linux/magic.h>
+
+/* Default timeout values */
+#define NFS_DEF_UDP_TIMEO       (11)
+#define NFS_DEF_UDP_RETRANS     (3)
+#define NFS_DEF_TCP_TIMEO       (600)
+#define NFS_DEF_TCP_RETRANS     (2)
+
+#define NFS_MAX_UDP_TIMEOUT     (60*HZ)
+#define NFS_MAX_TCP_TIMEOUT     (600*HZ)
+
+#define NFS_DEF_ACREGMIN        (3)
+#define NFS_DEF_ACREGMAX        (60)
+#define NFS_DEF_ACDIRMIN        (30)
+#define NFS_DEF_ACDIRMAX        (60)
+
+/*
+ * When flushing a cluster of dirty pages, there can be different
+ * strategies:
+ */
+#define FLUSH_SYNC              1       /* file being synced, or contention */
+#define FLUSH_STABLE            4       /* commit to stable storage */
+#define FLUSH_LOWPRI            8       /* low priority background flush */
+#define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
+#define FLUSH_COND_STABLE       32      /* conditional stable write - only stable
+                                         * if everything fits in one RPC */
+
+
+/*
+ * NFS debug flags
+ */
+#define NFSDBG_VFS              0x0001
+#define NFSDBG_DIRCACHE         0x0002
+#define NFSDBG_LOOKUPCACHE      0x0004
+#define NFSDBG_PAGECACHE        0x0008
+#define NFSDBG_PROC             0x0010
+#define NFSDBG_XDR              0x0020
+#define NFSDBG_FILE             0x0040
+#define NFSDBG_ROOT             0x0080
+#define NFSDBG_CALLBACK         0x0100
+#define NFSDBG_CLIENT           0x0200
+#define NFSDBG_MOUNT            0x0400
+#define NFSDBG_FSCACHE          0x0800
+#define NFSDBG_PNFS             0x1000
+#define NFSDBG_PNFS_LD          0x2000
+#define NFSDBG_STATE            0x4000
+#define NFSDBG_ALL              0xFFFF
+
+
+#endif /* _UAPI_LINUX_NFS_FS_H */
diff --git a/include/uapi/linux/nfs_idmap.h b/include/uapi/linux/nfs_idmap.h
new file mode 100644
index 000000000000..8d4b1c7b24d4
--- /dev/null
+++ b/include/uapi/linux/nfs_idmap.h
@@ -0,0 +1,65 @@
+/*
+ * include/linux/nfs_idmap.h
+ *
+ *  UID and GID to name mapping for clients.
+ *
+ *  Copyright (c) 2002 The Regents of the University of Michigan.
+ *  All rights reserved.
+ *
+ *  Marius Aamodt Eriksen <marius@umich.edu>
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. Neither the name of the University nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _UAPINFS_IDMAP_H
+#define _UAPINFS_IDMAP_H
+
+#include <linux/types.h>
+
+/* XXX from bits/utmp.h  */
+#define IDMAP_NAMESZ  128
+
+#define IDMAP_TYPE_USER  0
+#define IDMAP_TYPE_GROUP 1
+
+#define IDMAP_CONV_IDTONAME 0
+#define IDMAP_CONV_NAMETOID 1
+
+#define IDMAP_STATUS_INVALIDMSG 0x01
+#define IDMAP_STATUS_AGAIN      0x02
+#define IDMAP_STATUS_LOOKUPFAIL 0x04
+#define IDMAP_STATUS_SUCCESS    0x08
+
+struct idmap_msg {
+        __u8  im_type;
+        __u8  im_conv;
+        char  im_name[IDMAP_NAMESZ];
+        __u32 im_id;
+        __u8  im_status;
+};
+
+
+#endif /* _UAPINFS_IDMAP_H */
diff --git a/include/linux/nfs_mount.h b/include/uapi/linux/nfs_mount.h
index 576bddd72e04..576bddd72e04 100644
--- a/include/linux/nfs_mount.h
+++ b/include/uapi/linux/nfs_mount.h
diff --git a/include/uapi/linux/nfsacl.h b/include/uapi/linux/nfsacl.h
new file mode 100644
index 000000000000..9bb9771a107f
--- /dev/null
+++ b/include/uapi/linux/nfsacl.h
@@ -0,0 +1,29 @@
+/*
+ * File: linux/nfsacl.h
+ *
+ * (C) 2003 Andreas Gruenbacher <agruen@suse.de>
+ */
+#ifndef _UAPI__LINUX_NFSACL_H
+#define _UAPI__LINUX_NFSACL_H
+
+#define NFS_ACL_PROGRAM 100227
+
+#define ACLPROC2_GETACL         1
+#define ACLPROC2_SETACL         2
+#define ACLPROC2_GETATTR        3
+#define ACLPROC2_ACCESS         4
+
+#define ACLPROC3_GETACL         1
+#define ACLPROC3_SETACL         2
+
+
+/* Flags for the getacl/setacl mode */
+#define NFS_ACL                 0x0001
+#define NFS_ACLCNT              0x0002
+#define NFS_DFACL               0x0004
+#define NFS_DFACLCNT            0x0008
+
+/* Flag for Default ACL entries */
+#define NFS_ACL_DEFAULT         0x1000
+
+#endif /* _UAPI__LINUX_NFSACL_H */
diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild
index aafaa5aa54d4..c11bc404053c 100644
--- a/include/uapi/linux/nfsd/Kbuild
+++ b/include/uapi/linux/nfsd/Kbuild
@@ -1 +1,6 @@
 # UAPI Header export list
+header-y += cld.h
+header-y += debug.h
+header-y += export.h
+header-y += nfsfh.h
+header-y += stats.h
diff --git a/include/linux/nfsd/cld.h b/include/uapi/linux/nfsd/cld.h
index f14a9ab06f1f..f14a9ab06f1f 100644
--- a/include/linux/nfsd/cld.h
+++ b/include/uapi/linux/nfsd/cld.h
diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h
new file mode 100644
index 000000000000..a6f453c740b8
--- /dev/null
+++ b/include/uapi/linux/nfsd/debug.h
@@ -0,0 +1,40 @@
+/*
+ * linux/include/linux/nfsd/debug.h
+ *
+ * Debugging-related stuff for nfsd
+ *
+ * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPILINUX_NFSD_DEBUG_H
+#define _UAPILINUX_NFSD_DEBUG_H
+
+#include <linux/sunrpc/debug.h>
+
+/*
+ * Enable debugging for nfsd.
+ * Requires RPC_DEBUG.
+ */
+#ifdef RPC_DEBUG
+# define NFSD_DEBUG             1
+#endif
+
+/*
+ * knfsd debug flags
+ */
+#define NFSDDBG_SOCK            0x0001
+#define NFSDDBG_FH              0x0002
+#define NFSDDBG_EXPORT          0x0004
+#define NFSDDBG_SVC             0x0008
+#define NFSDDBG_PROC            0x0010
+#define NFSDDBG_FILEOP          0x0020
+#define NFSDDBG_AUTH            0x0040
+#define NFSDDBG_REPCACHE        0x0080
+#define NFSDDBG_XDR             0x0100
+#define NFSDDBG_LOCKD           0x0200
+#define NFSDDBG_ALL             0x7FFF
+#define NFSDDBG_NOCHANGE        0xFFFF
+
+
+
+#endif /* _UAPILINUX_NFSD_DEBUG_H */
diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h
new file mode 100644
index 000000000000..cf47c313794e
--- /dev/null
+++ b/include/uapi/linux/nfsd/export.h
@@ -0,0 +1,58 @@
+/*
+ * include/linux/nfsd/export.h
+ * 
+ * Public declarations for NFS exports. The definitions for the
+ * syscall interface are in nfsctl.h
+ *
+ * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPINFSD_EXPORT_H
+#define _UAPINFSD_EXPORT_H
+
+# include <linux/types.h>
+
+/*
+ * Important limits for the exports stuff.
+ */
+#define NFSCLNT_IDMAX           1024
+#define NFSCLNT_ADDRMAX         16
+#define NFSCLNT_KEYMAX          32
+
+/*
+ * Export flags.
+ */
+#define NFSEXP_READONLY         0x0001
+#define NFSEXP_INSECURE_PORT    0x0002
+#define NFSEXP_ROOTSQUASH       0x0004
+#define NFSEXP_ALLSQUASH        0x0008
+#define NFSEXP_ASYNC            0x0010
+#define NFSEXP_GATHERED_WRITES  0x0020
+/* 40 80 100 currently unused */
+#define NFSEXP_NOHIDE           0x0200
+#define NFSEXP_NOSUBTREECHECK   0x0400
+#define NFSEXP_NOAUTHNLM        0x0800          /* Don't authenticate NLM requests - just trust */
+#define NFSEXP_MSNFS            0x1000  /* do silly things that MS clients expect; no longer supported */
+#define NFSEXP_FSID             0x2000
+#define NFSEXP_CROSSMOUNT       0x4000
+#define NFSEXP_NOACL            0x8000  /* reserved for possible ACL related use */
+/*
+ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
+ * clients, and only to the single directory that is the root of the
+ * export; further lookup and readdir operations are treated as if every
+ * subdirectory was a mountpoint, and ignored if they are not themselves
+ * exported.  This is used by nfsd and mountd to construct the NFSv4
+ * pseudofilesystem, which provides access only to paths leading to each
+ * exported filesystem.
+ */
+#define NFSEXP_V4ROOT           0x10000
+/* All flags that we claim to support.  (Note we don't support NOACL.) */
+#define NFSEXP_ALLFLAGS         0x17E3F
+
+/* The flags that may vary depending on security flavor: */
+#define NFSEXP_SECINFO_FLAGS    (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
+                                        | NFSEXP_ALLSQUASH \
+                                        | NFSEXP_INSECURE_PORT)
+
+
+#endif /* _UAPINFSD_EXPORT_H */
diff --git a/include/uapi/linux/nfsd/nfsfh.h b/include/uapi/linux/nfsd/nfsfh.h
new file mode 100644
index 000000000000..616e3b396476
--- /dev/null
+++ b/include/uapi/linux/nfsd/nfsfh.h
@@ -0,0 +1,122 @@
+/*
+ * include/linux/nfsd/nfsfh.h
+ *
+ * This file describes the layout of the file handles as passed
+ * over the wire.
+ *
+ * Earlier versions of knfsd used to sign file handles using keyed MD5
+ * or SHA. I've removed this code, because it doesn't give you more
+ * security than blocking external access to port 2049 on your firewall.
+ *
+ * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPI_LINUX_NFSD_FH_H
+#define _UAPI_LINUX_NFSD_FH_H
+
+#include <linux/types.h>
+#include <linux/nfs.h>
+#include <linux/nfs2.h>
+#include <linux/nfs3.h>
+#include <linux/nfs4.h>
+
+/*
+ * This is the old "dentry style" Linux NFSv2 file handle.
+ *
+ * The xino and xdev fields are currently used to transport the
+ * ino/dev of the exported inode.
+ */
+struct nfs_fhbase_old {
+        __u32           fb_dcookie;     /* dentry cookie - always 0xfeebbaca */
+        __u32           fb_ino;         /* our inode number */
+        __u32           fb_dirino;      /* dir inode number, 0 for directories */
+        __u32           fb_dev;         /* our device */
+        __u32           fb_xdev;
+        __u32           fb_xino;
+        __u32           fb_generation;
+};
+
+/*
+ * This is the new flexible, extensible style NFSv2/v3 file handle.
+ * by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
+ *
+ * The file handle starts with a sequence of four-byte words.
+ * The first word contains a version number (1) and three descriptor bytes
+ * that tell how the remaining 3 variable length fields should be handled.
+ * These three bytes are auth_type, fsid_type and fileid_type.
+ *
+ * All four-byte values are in host-byte-order.
+ *
+ * The auth_type field specifies how the filehandle can be authenticated
+ * This might allow a file to be confirmed to be in a writable part of a
+ * filetree without checking the path from it up to the root.
+ * Current values:
+ *     0  - No authentication.  fb_auth is 0 bytes long
+ * Possible future values:
+ *     1  - 4 bytes taken from MD5 hash of the remainer of the file handle
+ *          prefixed by a secret and with the important export flags.
+ *
+ * The fsid_type identifies how the filesystem (or export point) is
+ *    encoded.
+ *  Current values:
+ *     0  - 4 byte device id (ms-2-bytes major, ls-2-bytes minor), 4byte inode number
+ *        NOTE: we cannot use the kdev_t device id value, because kdev_t.h
+ *              says we mustn't.  We must break it up and reassemble.
+ *     1  - 4 byte user specified identifier
+ *     2  - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED
+ *     3  - 4 byte device id, encoded for user-space, 4 byte inode number
+ *     4  - 4 byte inode number and 4 byte uuid
+ *     5  - 8 byte uuid
+ *     6  - 16 byte uuid
+ *     7  - 8 byte inode number and 16 byte uuid
+ *
+ * The fileid_type identified how the file within the filesystem is encoded.
+ * This is (will be) passed to, and set by, the underlying filesystem if it supports
+ * filehandle operations.  The filesystem must not use the value '0' or '0xff' and may
+ * only use the values 1 and 2 as defined below:
+ *  Current values:
+ *    0   - The root, or export point, of the filesystem.  fb_fileid is 0 bytes.
+ *    1   - 32bit inode number, 32 bit generation number.
+ *    2   - 32bit inode number, 32 bit generation number, 32 bit parent directory inode number.
+ *
+ */
+struct nfs_fhbase_new {
+        __u8            fb_version;     /* == 1, even => nfs_fhbase_old */
+        __u8            fb_auth_type;
+        __u8            fb_fsid_type;
+        __u8            fb_fileid_type;
+        __u32           fb_auth[1];
+/*      __u32           fb_fsid[0]; floating */
+/*      __u32           fb_fileid[0]; floating */
+};
+
+struct knfsd_fh {
+        unsigned int    fh_size;        /* significant for NFSv3.
+                                         * Points to the current size while building
+                                         * a new file handle
+                                         */
+        union {
+                struct nfs_fhbase_old   fh_old;
+                __u32                   fh_pad[NFS4_FHSIZE/4];
+                struct nfs_fhbase_new   fh_new;
+        } fh_base;
+};
+
+#define ofh_dcookie             fh_base.fh_old.fb_dcookie
+#define ofh_ino                 fh_base.fh_old.fb_ino
+#define ofh_dirino              fh_base.fh_old.fb_dirino
+#define ofh_dev                 fh_base.fh_old.fb_dev
+#define ofh_xdev                fh_base.fh_old.fb_xdev
+#define ofh_xino                fh_base.fh_old.fb_xino
+#define ofh_generation          fh_base.fh_old.fb_generation
+
+#define fh_version              fh_base.fh_new.fb_version
+#define fh_fsid_type            fh_base.fh_new.fb_fsid_type
+#define fh_auth_type            fh_base.fh_new.fb_auth_type
+#define fh_fileid_type          fh_base.fh_new.fb_fileid_type
+#define fh_auth                 fh_base.fh_new.fb_auth
+#define fh_fsid                 fh_base.fh_new.fb_auth
+
+
+
+#endif /* _UAPI_LINUX_NFSD_FH_H */
diff --git a/include/uapi/linux/nfsd/stats.h b/include/uapi/linux/nfsd/stats.h
new file mode 100644
index 000000000000..9fb7a0644263
--- /dev/null
+++ b/include/uapi/linux/nfsd/stats.h
@@ -0,0 +1,17 @@
+/*
+ * linux/include/linux/nfsd/stats.h
+ *
+ * Statistics for NFS server.
+ *
+ * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPILINUX_NFSD_STATS_H
+#define _UAPILINUX_NFSD_STATS_H
+
+#include <linux/nfs4.h>
+
+/* thread usage wraps very million seconds (approx one fortnight) */
+#define NFSD_USAGE_WRAP (HZ*1000000)
+
+#endif /* _UAPILINUX_NFSD_STATS_H */
diff --git a/include/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 7df9b500c804..7df9b500c804 100644
--- a/include/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
diff --git a/include/uapi/linux/nubus.h b/include/uapi/linux/nubus.h
new file mode 100644
index 000000000000..77513d2b5638
--- /dev/null
+++ b/include/uapi/linux/nubus.h
@@ -0,0 +1,244 @@
+/*
+  nubus.h: various definitions and prototypes for NuBus drivers to use.
+
+  Originally written by Alan Cox.
+
+  Hacked to death by C. Scott Ananian and David Huggins-Daines.
+  
+  Some of the constants in here are from the corresponding
+  NetBSD/OpenBSD header file, by Allen Briggs.  We figured out the
+  rest of them on our own. */
+
+#ifndef _UAPILINUX_NUBUS_H
+#define _UAPILINUX_NUBUS_H
+
+#include <linux/types.h>
+
+enum nubus_category {
+        NUBUS_CAT_BOARD          = 0x0001,
+        NUBUS_CAT_DISPLAY        = 0x0003,
+        NUBUS_CAT_NETWORK        = 0x0004,
+        NUBUS_CAT_COMMUNICATIONS = 0x0006,
+        NUBUS_CAT_FONT           = 0x0009,
+        NUBUS_CAT_CPU            = 0x000A,
+        /* For lack of a better name */
+        NUBUS_CAT_DUODOCK        = 0x0020
+};
+
+enum nubus_type_network {
+        NUBUS_TYPE_ETHERNET      = 0x0001,
+        NUBUS_TYPE_RS232         = 0x0002
+};
+
+enum nubus_type_display {
+        NUBUS_TYPE_VIDEO         = 0x0001
+};
+
+enum nubus_type_cpu {
+        NUBUS_TYPE_68020         = 0x0003,
+        NUBUS_TYPE_68030         = 0x0004,
+        NUBUS_TYPE_68040         = 0x0005
+};
+
+/* Known <Cat,Type,SW,HW> tuples: (according to TattleTech and Slots)
+ *  68030 motherboards: <10,4,0,24>
+ *  68040 motherboards: <10,5,0,24>
+ *  DuoDock Plus: <32,1,1,2>
+ *
+ *  Toby Frame Buffer card: <3,1,1,1>
+ *  RBV built-in video (IIci): <3,1,1,24>
+ *  Valkyrie built-in video (Q630): <3,1,1,46>
+ *  Macintosh Display Card: <3,1,1,25>
+ *  Sonora built-in video (P460): <3,1,1,34>
+ *  Jet framebuffer (DuoDock Plus): <3,1,1,41>
+ *
+ *  SONIC comm-slot/on-board and DuoDock Ethernet: <4,1,1,272>
+ *  SONIC LC-PDS Ethernet (Dayna, but like Apple 16-bit, sort of): <4,1,1,271>
+ *  Apple SONIC LC-PDS Ethernet ("Apple Ethernet LC Twisted-Pair Card"): <4,1,0,281>
+ *  Sonic Systems Ethernet A-Series Card: <4,1,268,256>
+ *  Asante MacCon NuBus-A: <4,1,260,256> (alpha-1.0,1.1 revision)
+ *   ROM on the above card: <2,1,0,0>
+ *  Cabletron ethernet card: <4,1,1,265>
+ *  Farallon ethernet card: <4,1,268,256> (identical to Sonic Systems card)
+ *  Kinetics EtherPort IIN: <4,1,259,262>
+ *  API Engineering EtherRun_LCa PDS enet card: <4,1,282,256>
+ *
+ *  Add your devices to the list!  You can obtain the "Slots" utility
+ *  from Apple's FTP site at:
+ *  ftp://dev.apple.com/devworld/Tool_Chest/Devices_-_Hardware/NuBus_Slot_Manager/
+ *
+ *  Alternately, TattleTech can be found at any Info-Mac mirror site.  
+ *  or from its distribution site: ftp://ftp.decismkr.com/dms
+ */
+
+/* DrSW: Uniquely identifies the software interface to a board.  This
+   is usually the one you want to look at when writing a driver.  It's
+   not as useful as you think, though, because as we should know by
+   now (duh), "Apple Compatible" can mean a lot of things... */
+
+/* Add known DrSW values here */
+enum nubus_drsw {
+        /* NUBUS_CAT_DISPLAY */
+        NUBUS_DRSW_APPLE        = 0x0001,
+        NUBUS_DRSW_APPLE_HIRES  = 0x0013, /* MacII HiRes card driver */
+        
+        /* NUBUS_CAT_NETWORK */
+        NUBUS_DRSW_3COM         = 0x0000,
+        NUBUS_DRSW_CABLETRON    = 0x0001,
+        NUBUS_DRSW_SONIC_LC     = 0x0001,
+        NUBUS_DRSW_KINETICS     = 0x0103,
+        NUBUS_DRSW_ASANTE       = 0x0104,
+        NUBUS_DRSW_TECHWORKS    = 0x0109,
+        NUBUS_DRSW_DAYNA        = 0x010b,
+        NUBUS_DRSW_FARALLON     = 0x010c,
+        NUBUS_DRSW_APPLE_SN     = 0x010f,
+        NUBUS_DRSW_DAYNA2       = 0x0115,
+        NUBUS_DRSW_FOCUS        = 0x011a,
+        NUBUS_DRSW_ASANTE_CS    = 0x011d, /* use asante SMC9194 driver */
+        NUBUS_DRSW_DAYNA_LC     = 0x011e,
+
+        /* NUBUS_CAT_CPU */
+        NUBUS_DRSW_NONE         = 0x0000,
+};
+
+/* DrHW: Uniquely identifies the hardware interface to a board (or at
+   least, it should...  some video cards are known to incorrectly
+   identify themselves as Toby cards) */
+
+/* Add known DrHW values here */
+enum nubus_drhw {
+        /* NUBUS_CAT_DISPLAY */
+        NUBUS_DRHW_APPLE_TFB      = 0x0001, /* Toby frame buffer card */
+        NUBUS_DRHW_APPLE_WVC      = 0x0006, /* Apple Workstation Video Card */
+        NUBUS_DRHW_SIGMA_CLRMAX   = 0x0007, /* Sigma Design ColorMax */
+        NUBUS_DRHW_APPLE_SE30     = 0x0009, /* Apple SE/30 video */
+        NUBUS_DRHW_APPLE_HRVC     = 0x0013, /* Mac II High-Res Video Card */
+        NUBUS_DRHW_APPLE_PVC      = 0x0017, /* Mac II Portrait Video Card */
+        NUBUS_DRHW_APPLE_RBV1     = 0x0018, /* IIci RBV video */
+        NUBUS_DRHW_APPLE_MDC      = 0x0019, /* Macintosh Display Card */
+        NUBUS_DRHW_APPLE_SONORA   = 0x0022, /* Sonora built-in video */
+        NUBUS_DRHW_APPLE_24AC     = 0x002b, /* Mac 24AC Video Card */
+        NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,
+        NUBUS_DRHW_APPLE_JET      = 0x0029, /* Jet framebuffer (DuoDock) */
+        NUBUS_DRHW_SMAC_GFX       = 0x0105, /* SuperMac GFX */
+        NUBUS_DRHW_RASTER_CB264   = 0x013B, /* RasterOps ColorBoard 264 */
+        NUBUS_DRHW_MICRON_XCEED   = 0x0146, /* Micron Exceed color */
+        NUBUS_DRHW_RDIUS_GSC      = 0x0153, /* Radius GS/C */
+        NUBUS_DRHW_SMAC_SPEC8     = 0x017B, /* SuperMac Spectrum/8 */
+        NUBUS_DRHW_SMAC_SPEC24    = 0x017C, /* SuperMac Spectrum/24 */
+        NUBUS_DRHW_RASTER_CB364   = 0x026F, /* RasterOps ColorBoard 364 */
+        NUBUS_DRHW_RDIUS_DCGX     = 0x027C, /* Radius DirectColor/GX */
+        NUBUS_DRHW_RDIUS_PC8      = 0x0291, /* Radius PrecisionColor 8 */
+        NUBUS_DRHW_LAPIS_PCS8     = 0x0292, /* Lapis ProColorServer 8 */
+        NUBUS_DRHW_RASTER_24XLI   = 0x02A0, /* RasterOps 8/24 XLi */
+        NUBUS_DRHW_RASTER_PBPGT   = 0x02A5, /* RasterOps PaintBoard Prism GT */
+        NUBUS_DRHW_EMACH_FSX      = 0x02AE, /* E-Machines Futura SX */
+        NUBUS_DRHW_RASTER_24XLTV  = 0x02B7, /* RasterOps 24XLTV */
+        NUBUS_DRHW_SMAC_THUND24   = 0x02CB, /* SuperMac Thunder/24 */
+        NUBUS_DRHW_SMAC_THUNDLGHT = 0x03D9, /* SuperMac ThunderLight */
+        NUBUS_DRHW_RDIUS_PC24XP   = 0x0406, /* Radius PrecisionColor 24Xp */
+        NUBUS_DRHW_RDIUS_PC24X    = 0x040A, /* Radius PrecisionColor 24X */
+        NUBUS_DRHW_RDIUS_PC8XJ    = 0x040B, /* Radius PrecisionColor 8XJ */
+        
+        /* NUBUS_CAT_NETWORK */
+        NUBUS_DRHW_INTERLAN       = 0x0100,
+        NUBUS_DRHW_SMC9194        = 0x0101,
+        NUBUS_DRHW_KINETICS       = 0x0106,
+        NUBUS_DRHW_CABLETRON      = 0x0109,
+        NUBUS_DRHW_ASANTE_LC      = 0x010f,
+        NUBUS_DRHW_SONIC          = 0x0110,
+        NUBUS_DRHW_TECHWORKS      = 0x0112,
+        NUBUS_DRHW_APPLE_SONIC_NB = 0x0118,
+        NUBUS_DRHW_APPLE_SONIC_LC = 0x0119,
+        NUBUS_DRHW_FOCUS          = 0x011c,
+        NUBUS_DRHW_SONNET         = 0x011d,
+};
+
+/* Resource IDs: These are the identifiers for the various weird and
+   wonderful tidbits of information that may or may not reside in the
+   NuBus ROM directory. */
+enum nubus_res_id {
+        NUBUS_RESID_TYPE         = 0x0001,
+        NUBUS_RESID_NAME         = 0x0002,
+        NUBUS_RESID_ICON         = 0x0003,
+        NUBUS_RESID_DRVRDIR      = 0x0004,
+        NUBUS_RESID_LOADREC      = 0x0005,
+        NUBUS_RESID_BOOTREC      = 0x0006,
+        NUBUS_RESID_FLAGS        = 0x0007,
+        NUBUS_RESID_HWDEVID      = 0x0008,
+        NUBUS_RESID_MINOR_BASEOS = 0x000a,
+        NUBUS_RESID_MINOR_LENGTH = 0x000b,
+        NUBUS_RESID_MAJOR_BASEOS = 0x000c,
+        NUBUS_RESID_MAJOR_LENGTH = 0x000d,
+        NUBUS_RESID_CICN         = 0x000f,
+        NUBUS_RESID_ICL8         = 0x0010,
+        NUBUS_RESID_ICL4         = 0x0011,
+};
+
+/* Category-specific resources. */
+enum nubus_board_res_id {
+        NUBUS_RESID_BOARDID      = 0x0020,
+        NUBUS_RESID_PRAMINITDATA = 0x0021,
+        NUBUS_RESID_PRIMARYINIT  = 0x0022,
+        NUBUS_RESID_TIMEOUTCONST = 0x0023,
+        NUBUS_RESID_VENDORINFO   = 0x0024,
+        NUBUS_RESID_BOARDFLAGS   = 0x0025,
+        NUBUS_RESID_SECONDINIT   = 0x0026,
+
+        /* Not sure why Apple put these next two in here */
+        NUBUS_RESID_VIDNAMES     = 0x0041,
+        NUBUS_RESID_VIDMODES     = 0x007e
+};
+
+/* Fields within the vendor info directory */
+enum nubus_vendor_res_id {
+        NUBUS_RESID_VEND_ID     = 0x0001,
+        NUBUS_RESID_VEND_SERIAL = 0x0002,
+        NUBUS_RESID_VEND_REV    = 0x0003,
+        NUBUS_RESID_VEND_PART   = 0x0004,
+        NUBUS_RESID_VEND_DATE   = 0x0005
+};
+
+enum nubus_net_res_id {
+        NUBUS_RESID_MAC_ADDRESS  = 0x0080
+};
+
+enum nubus_cpu_res_id {
+        NUBUS_RESID_MEMINFO      = 0x0081,
+        NUBUS_RESID_ROMINFO      = 0x0082
+};
+
+enum nubus_display_res_id {
+        NUBUS_RESID_GAMMADIR    = 0x0040,
+        NUBUS_RESID_FIRSTMODE   = 0x0080,
+        NUBUS_RESID_SECONDMODE  = 0x0081,
+        NUBUS_RESID_THIRDMODE   = 0x0082,
+        NUBUS_RESID_FOURTHMODE  = 0x0083,
+        NUBUS_RESID_FIFTHMODE   = 0x0084,
+        NUBUS_RESID_SIXTHMODE   = 0x0085
+};
+
+struct nubus_dir
+{
+        unsigned char *base;
+        unsigned char *ptr;
+        int done;
+        int mask;
+};
+
+struct nubus_dirent
+{
+        unsigned char *base;
+        unsigned char type;
+        __u32 data;     /* Actually 24bits used */
+        int mask;
+};
+
+
+/* We'd like to get rid of this eventually.  Only daynaport.c uses it now. */
+static inline void *nubus_slot_addr(int slot)
+{
+        return (void *)(0xF0000000|(slot<<24));
+}
+
+#endif /* _UAPILINUX_NUBUS_H */
diff --git a/include/uapi/linux/nvram.h b/include/uapi/linux/nvram.h
new file mode 100644
index 000000000000..0986c4337383
--- /dev/null
+++ b/include/uapi/linux/nvram.h
@@ -0,0 +1,16 @@
+#ifndef _UAPI_LINUX_NVRAM_H
+#define _UAPI_LINUX_NVRAM_H
+
+#include <linux/ioctl.h>
+
+/* /dev/nvram ioctls */
+#define NVRAM_INIT      _IO('p', 0x40) /* initialize NVRAM and set checksum */
+#define NVRAM_SETCKS    _IO('p', 0x41) /* recalculate checksum */
+
+/* for all current systems, this is where NVRAM starts */
+#define NVRAM_FIRST_BYTE    14
+/* all these functions expect an NVRAM offset, not an absolute */
+#define NVRAM_OFFSET(x)   ((x)-NVRAM_FIRST_BYTE)
+
+
+#endif /* _UAPI_LINUX_NVRAM_H */
diff --git a/include/linux/omap3isp.h b/include/uapi/linux/omap3isp.h
index c73a34c3434d..c090cf9249bb 100644
--- a/include/linux/omap3isp.h
+++ b/include/uapi/linux/omap3isp.h
@@ -28,6 +28,7 @@
 #define OMAP3_ISP_USER_H
 
 #include <linux/types.h>
+#include <linux/videodev2.h>
 
 /*
  * Private IOCTLs
@@ -427,7 +428,7 @@ struct omap3isp_ccdc_update_config {
 #define OMAP3ISP_PREV_COLOR_CONV        (1 << 8)
 #define OMAP3ISP_PREV_YC_LIMIT          (1 << 9)
 #define OMAP3ISP_PREV_DEFECT_COR        (1 << 10)
-#define OMAP3ISP_PREV_GAMMABYPASS       (1 << 11)
+/* Bit 11 was OMAP3ISP_PREV_GAMMABYPASS, now merged with OMAP3ISP_PREV_GAMMA */
 #define OMAP3ISP_PREV_DRK_FRM_CAPTURE   (1 << 12)
 #define OMAP3ISP_PREV_DRK_FRM_SUBTRACT  (1 << 13)
 #define OMAP3ISP_PREV_LENS_SHADING      (1 << 14)
@@ -436,6 +437,7 @@ struct omap3isp_ccdc_update_config {
 
 #define OMAP3ISP_PREV_NF_TBL_SIZE       64
 #define OMAP3ISP_PREV_CFA_TBL_SIZE      576
+#define OMAP3ISP_PREV_CFA_BLK_SIZE      (OMAP3ISP_PREV_CFA_TBL_SIZE / 4)
 #define OMAP3ISP_PREV_GAMMA_TBL_SIZE    1024
 #define OMAP3ISP_PREV_YENH_TBL_SIZE     128
 
@@ -477,7 +479,7 @@ struct omap3isp_prev_cfa {
         enum omap3isp_cfa_fmt format;
         __u8 gradthrs_vert;
         __u8 gradthrs_horz;
-        __u32 table[OMAP3ISP_PREV_CFA_TBL_SIZE];
+        __u32 table[4][OMAP3ISP_PREV_CFA_BLK_SIZE];
 };
 
 /**
diff --git a/include/uapi/linux/omapfb.h b/include/uapi/linux/omapfb.h
new file mode 100644
index 000000000000..7c97bc00ac6d
--- /dev/null
+++ b/include/uapi/linux/omapfb.h
@@ -0,0 +1,222 @@
+/*
+ * File: include/linux/omapfb.h
+ *
+ * Framebuffer driver for TI OMAP boards
+ *
+ * Copyright (C) 2004 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _UAPI__LINUX_OMAPFB_H__
+#define _UAPI__LINUX_OMAPFB_H__
+
+#include <linux/fb.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/* IOCTL commands. */
+
+#define OMAP_IOW(num, dtype)    _IOW('O', num, dtype)
+#define OMAP_IOR(num, dtype)    _IOR('O', num, dtype)
+#define OMAP_IOWR(num, dtype)   _IOWR('O', num, dtype)
+#define OMAP_IO(num)            _IO('O', num)
+
+#define OMAPFB_MIRROR           OMAP_IOW(31, int)
+#define OMAPFB_SYNC_GFX         OMAP_IO(37)
+#define OMAPFB_VSYNC            OMAP_IO(38)
+#define OMAPFB_SET_UPDATE_MODE  OMAP_IOW(40, int)
+#define OMAPFB_GET_CAPS         OMAP_IOR(42, struct omapfb_caps)
+#define OMAPFB_GET_UPDATE_MODE  OMAP_IOW(43, int)
+#define OMAPFB_LCD_TEST         OMAP_IOW(45, int)
+#define OMAPFB_CTRL_TEST        OMAP_IOW(46, int)
+#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
+#define OMAPFB_SET_COLOR_KEY    OMAP_IOW(50, struct omapfb_color_key)
+#define OMAPFB_GET_COLOR_KEY    OMAP_IOW(51, struct omapfb_color_key)
+#define OMAPFB_SETUP_PLANE      OMAP_IOW(52, struct omapfb_plane_info)
+#define OMAPFB_QUERY_PLANE      OMAP_IOW(53, struct omapfb_plane_info)
+#define OMAPFB_UPDATE_WINDOW    OMAP_IOW(54, struct omapfb_update_window)
+#define OMAPFB_SETUP_MEM        OMAP_IOW(55, struct omapfb_mem_info)
+#define OMAPFB_QUERY_MEM        OMAP_IOW(56, struct omapfb_mem_info)
+#define OMAPFB_WAITFORVSYNC     OMAP_IO(57)
+#define OMAPFB_MEMORY_READ      OMAP_IOR(58, struct omapfb_memory_read)
+#define OMAPFB_GET_OVERLAY_COLORMODE OMAP_IOR(59, struct omapfb_ovl_colormode)
+#define OMAPFB_WAITFORGO        OMAP_IO(60)
+#define OMAPFB_GET_VRAM_INFO    OMAP_IOR(61, struct omapfb_vram_info)
+#define OMAPFB_SET_TEARSYNC     OMAP_IOW(62, struct omapfb_tearsync_info)
+#define OMAPFB_GET_DISPLAY_INFO OMAP_IOR(63, struct omapfb_display_info)
+
+#define OMAPFB_CAPS_GENERIC_MASK        0x00000fff
+#define OMAPFB_CAPS_LCDC_MASK           0x00fff000
+#define OMAPFB_CAPS_PANEL_MASK          0xff000000
+
+#define OMAPFB_CAPS_MANUAL_UPDATE       0x00001000
+#define OMAPFB_CAPS_TEARSYNC            0x00002000
+#define OMAPFB_CAPS_PLANE_RELOCATE_MEM  0x00004000
+#define OMAPFB_CAPS_PLANE_SCALE         0x00008000
+#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000
+#define OMAPFB_CAPS_WINDOW_SCALE        0x00020000
+#define OMAPFB_CAPS_WINDOW_OVERLAY      0x00040000
+#define OMAPFB_CAPS_WINDOW_ROTATE       0x00080000
+#define OMAPFB_CAPS_SET_BACKLIGHT       0x01000000
+
+/* Values from DSP must map to lower 16-bits */
+#define OMAPFB_FORMAT_MASK              0x00ff
+#define OMAPFB_FORMAT_FLAG_DOUBLE       0x0100
+#define OMAPFB_FORMAT_FLAG_TEARSYNC     0x0200
+#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC  0x0400
+#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY       0x0800
+#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY      0x1000
+
+#define OMAPFB_MEMTYPE_SDRAM            0
+#define OMAPFB_MEMTYPE_SRAM             1
+#define OMAPFB_MEMTYPE_MAX              1
+
+#define OMAPFB_MEM_IDX_ENABLED  0x80
+#define OMAPFB_MEM_IDX_MASK     0x7f
+
+enum omapfb_color_format {
+        OMAPFB_COLOR_RGB565 = 0,
+        OMAPFB_COLOR_YUV422,
+        OMAPFB_COLOR_YUV420,
+        OMAPFB_COLOR_CLUT_8BPP,
+        OMAPFB_COLOR_CLUT_4BPP,
+        OMAPFB_COLOR_CLUT_2BPP,
+        OMAPFB_COLOR_CLUT_1BPP,
+        OMAPFB_COLOR_RGB444,
+        OMAPFB_COLOR_YUY422,
+
+        OMAPFB_COLOR_ARGB16,
+        OMAPFB_COLOR_RGB24U,    /* RGB24, 32-bit container */
+        OMAPFB_COLOR_RGB24P,    /* RGB24, 24-bit container */
+        OMAPFB_COLOR_ARGB32,
+        OMAPFB_COLOR_RGBA32,
+        OMAPFB_COLOR_RGBX32,
+};
+
+struct omapfb_update_window {
+        __u32 x, y;
+        __u32 width, height;
+        __u32 format;
+        __u32 out_x, out_y;
+        __u32 out_width, out_height;
+        __u32 reserved[8];
+};
+
+struct omapfb_update_window_old {
+        __u32 x, y;
+        __u32 width, height;
+        __u32 format;
+};
+
+enum omapfb_plane {
+        OMAPFB_PLANE_GFX = 0,
+        OMAPFB_PLANE_VID1,
+        OMAPFB_PLANE_VID2,
+};
+
+enum omapfb_channel_out {
+        OMAPFB_CHANNEL_OUT_LCD = 0,
+        OMAPFB_CHANNEL_OUT_DIGIT,
+};
+
+struct omapfb_plane_info {
+        __u32 pos_x;
+        __u32 pos_y;
+        __u8  enabled;
+        __u8  channel_out;
+        __u8  mirror;
+        __u8  mem_idx;
+        __u32 out_width;
+        __u32 out_height;
+        __u32 reserved2[12];
+};
+
+struct omapfb_mem_info {
+        __u32 size;
+        __u8  type;
+        __u8  reserved[3];
+};
+
+struct omapfb_caps {
+        __u32 ctrl;
+        __u32 plane_color;
+        __u32 wnd_color;
+};
+
+enum omapfb_color_key_type {
+        OMAPFB_COLOR_KEY_DISABLED = 0,
+        OMAPFB_COLOR_KEY_GFX_DST,
+        OMAPFB_COLOR_KEY_VID_SRC,
+};
+
+struct omapfb_color_key {
+        __u8  channel_out;
+        __u32 background;
+        __u32 trans_key;
+        __u8  key_type;
+};
+
+enum omapfb_update_mode {
+        OMAPFB_UPDATE_DISABLED = 0,
+        OMAPFB_AUTO_UPDATE,
+        OMAPFB_MANUAL_UPDATE
+};
+
+struct omapfb_memory_read {
+        __u16 x;
+        __u16 y;
+        __u16 w;
+        __u16 h;
+        size_t buffer_size;
+        void __user *buffer;
+};
+
+struct omapfb_ovl_colormode {
+        __u8 overlay_idx;
+        __u8 mode_idx;
+        __u32 bits_per_pixel;
+        __u32 nonstd;
+        struct fb_bitfield red;
+        struct fb_bitfield green;
+        struct fb_bitfield blue;
+        struct fb_bitfield transp;
+};
+
+struct omapfb_vram_info {
+        __u32 total;
+        __u32 free;
+        __u32 largest_free_block;
+        __u32 reserved[5];
+};
+
+struct omapfb_tearsync_info {
+        __u8 enabled;
+        __u8 reserved1[3];
+        __u16 line;
+        __u16 reserved2;
+};
+
+struct omapfb_display_info {
+        __u16 xres;
+        __u16 yres;
+        __u32 width;    /* phys width of the display in micrometers */
+        __u32 height;   /* phys height of the display in micrometers */
+        __u32 reserved[5];
+};
+
+
+#endif /* _UAPI__LINUX_OMAPFB_H__ */
diff --git a/include/uapi/linux/oom.h b/include/uapi/linux/oom.h
new file mode 100644
index 000000000000..a49c4afc7060
--- /dev/null
+++ b/include/uapi/linux/oom.h
@@ -0,0 +1,11 @@
+#ifndef _UAPI__INCLUDE_LINUX_OOM_H
+#define _UAPI__INCLUDE_LINUX_OOM_H
+
+/*
+ * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for
+ * pid.
+ */
+#define OOM_SCORE_ADJ_MIN       (-1000)
+#define OOM_SCORE_ADJ_MAX       1000
+
+#endif /* _UAPI__INCLUDE_LINUX_OOM_H */
diff --git a/include/linux/packet_diag.h b/include/uapi/linux/packet_diag.h
index 93f5fa94a431..93f5fa94a431 100644
--- a/include/linux/packet_diag.h
+++ b/include/uapi/linux/packet_diag.h
diff --git a/include/linux/param.h b/include/uapi/linux/param.h
index 092e92f67b50..092e92f67b50 100644
--- a/include/linux/param.h
+++ b/include/uapi/linux/param.h
diff --git a/include/uapi/linux/parport.h b/include/uapi/linux/parport.h
new file mode 100644
index 000000000000..f41388f88dc3
--- /dev/null
+++ b/include/uapi/linux/parport.h
@@ -0,0 +1,95 @@
+/*
+ * Any part of this program may be used in documents licensed under
+ * the GNU Free Documentation License, Version 1.1 or any later version
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _UAPI_PARPORT_H_
+#define _UAPI_PARPORT_H_
+
+/* Start off with user-visible constants */
+
+/* Maximum of 16 ports per machine */
+#define PARPORT_MAX  16
+
+/* Magic numbers */
+#define PARPORT_IRQ_NONE  -1
+#define PARPORT_DMA_NONE  -1
+#define PARPORT_IRQ_AUTO  -2
+#define PARPORT_DMA_AUTO  -2
+#define PARPORT_DMA_NOFIFO -3
+#define PARPORT_DISABLE   -2
+#define PARPORT_IRQ_PROBEONLY -3
+#define PARPORT_IOHI_AUTO -1
+
+#define PARPORT_CONTROL_STROBE    0x1
+#define PARPORT_CONTROL_AUTOFD    0x2
+#define PARPORT_CONTROL_INIT      0x4
+#define PARPORT_CONTROL_SELECT    0x8
+
+#define PARPORT_STATUS_ERROR      0x8
+#define PARPORT_STATUS_SELECT     0x10
+#define PARPORT_STATUS_PAPEROUT   0x20
+#define PARPORT_STATUS_ACK        0x40
+#define PARPORT_STATUS_BUSY       0x80
+
+/* Type classes for Plug-and-Play probe.  */
+typedef enum {
+        PARPORT_CLASS_LEGACY = 0,       /* Non-IEEE1284 device */
+        PARPORT_CLASS_PRINTER,
+        PARPORT_CLASS_MODEM,
+        PARPORT_CLASS_NET,
+        PARPORT_CLASS_HDC,              /* Hard disk controller */
+        PARPORT_CLASS_PCMCIA,
+        PARPORT_CLASS_MEDIA,            /* Multimedia device */
+        PARPORT_CLASS_FDC,              /* Floppy disk controller */
+        PARPORT_CLASS_PORTS,
+        PARPORT_CLASS_SCANNER,
+        PARPORT_CLASS_DIGCAM,
+        PARPORT_CLASS_OTHER,            /* Anything else */
+        PARPORT_CLASS_UNSPEC,           /* No CLS field in ID */
+        PARPORT_CLASS_SCSIADAPTER
+} parport_device_class;
+
+/* The "modes" entry in parport is a bit field representing the
+   capabilities of the hardware. */
+#define PARPORT_MODE_PCSPP      (1<<0) /* IBM PC registers available. */
+#define PARPORT_MODE_TRISTATE   (1<<1) /* Can tristate. */
+#define PARPORT_MODE_EPP        (1<<2) /* Hardware EPP. */
+#define PARPORT_MODE_ECP        (1<<3) /* Hardware ECP. */
+#define PARPORT_MODE_COMPAT     (1<<4) /* Hardware 'printer protocol'. */
+#define PARPORT_MODE_DMA        (1<<5) /* Hardware can DMA. */
+#define PARPORT_MODE_SAFEININT  (1<<6) /* SPP registers accessible in IRQ. */
+
+/* IEEE1284 modes: 
+   Nibble mode, byte mode, ECP, ECPRLE and EPP are their own
+   'extensibility request' values.  Others are special.
+   'Real' ECP modes must have the IEEE1284_MODE_ECP bit set.  */
+#define IEEE1284_MODE_NIBBLE             0
+#define IEEE1284_MODE_BYTE              (1<<0)
+#define IEEE1284_MODE_COMPAT            (1<<8)
+#define IEEE1284_MODE_BECP              (1<<9) /* Bounded ECP mode */
+#define IEEE1284_MODE_ECP               (1<<4)
+#define IEEE1284_MODE_ECPRLE            (IEEE1284_MODE_ECP | (1<<5))
+#define IEEE1284_MODE_ECPSWE            (1<<10) /* Software-emulated */
+#define IEEE1284_MODE_EPP               (1<<6)
+#define IEEE1284_MODE_EPPSL             (1<<11) /* EPP 1.7 */
+#define IEEE1284_MODE_EPPSWE            (1<<12) /* Software-emulated */
+#define IEEE1284_DEVICEID               (1<<2)  /* This is a flag */
+#define IEEE1284_EXT_LINK               (1<<14) /* This flag causes the
+                                                 * extensibility link to
+                                                 * be requested, using
+                                                 * bits 0-6. */
+
+/* For the benefit of parport_read/write, you can use these with
+ * parport_negotiate to use address operations.  They have no effect
+ * other than to make parport_read/write use address transfers. */
+#define IEEE1284_ADDR                   (1<<13) /* This is a flag */
+#define IEEE1284_DATA                    0      /* So is this */
+
+/* Flags for block transfer operations. */
+#define PARPORT_EPP_FAST                (1<<0) /* Unreliable counts. */
+#define PARPORT_W91284PIC               (1<<1) /* have a Warp9 w91284pic in the device */
+
+/* The rest is for the kernel only */
+#endif /* _UAPI_PARPORT_H_ */
diff --git a/include/uapi/linux/patchkey.h b/include/uapi/linux/patchkey.h
new file mode 100644
index 000000000000..1bda0e56bc5e
--- /dev/null
+++ b/include/uapi/linux/patchkey.h
@@ -0,0 +1,37 @@
+/*
+ * <linux/patchkey.h> -- definition of _PATCHKEY macro
+ *
+ * Copyright (C) 2005 Stuart Brady
+ *
+ * This exists because awe_voice.h defined its own _PATCHKEY and it wasn't
+ * clear whether removing this would break anything in userspace.
+ *
+ * Do not include this file directly.  Please use <sys/soundcard.h> instead.
+ * For kernel code, use <linux/soundcard.h>
+ */
+
+#ifndef _LINUX_PATCHKEY_H_INDIRECT
+#error "patchkey.h included directly"
+#endif
+
+#ifndef _UAPI_LINUX_PATCHKEY_H
+#define _UAPI_LINUX_PATCHKEY_H
+
+/* Endian macros. */
+#ifndef __KERNEL__
+#  include <endian.h>
+#endif
+
+#if !defined(__KERNEL__)
+#if defined(__BYTE_ORDER)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+#    define _PATCHKEY(id) (0xfd00|id)
+#  elif __BYTE_ORDER == __LITTLE_ENDIAN
+#    define _PATCHKEY(id) ((id<<8)|0x00fd)
+#  else
+#    error "could not determine byte order"
+#  endif
+#endif
+#endif
+
+#endif /* _UAPI_LINUX_PATCHKEY_H */
diff --git a/include/uapi/linux/pci.h b/include/uapi/linux/pci.h
new file mode 100644
index 000000000000..3c292bc0d1c1
--- /dev/null
+++ b/include/uapi/linux/pci.h
@@ -0,0 +1,41 @@
+/*
+ *      pci.h
+ *
+ *      PCI defines and function prototypes
+ *      Copyright 1994, Drew Eckhardt
+ *      Copyright 1997--1999 Martin Mares <mj@ucw.cz>
+ *
+ *      For more information, please consult the following manuals (look at
+ *      http://www.pcisig.com/ for how to get them):
+ *
+ *      PCI BIOS Specification
+ *      PCI Local Bus Specification
+ *      PCI to PCI Bridge Specification
+ *      PCI System Design Guide
+ */
+
+#ifndef _UAPILINUX_PCI_H
+#define _UAPILINUX_PCI_H
+
+#include <linux/pci_regs.h>     /* The pci register defines */
+
+/*
+ * The PCI interface treats multi-function devices as independent
+ * devices.  The slot/function address of each device is encoded
+ * in a single byte as follows:
+ *
+ *      7:3 = slot
+ *      2:0 = function
+ */
+#define PCI_DEVFN(slot, func)   ((((slot) & 0x1f) << 3) | ((func) & 0x07))
+#define PCI_SLOT(devfn)         (((devfn) >> 3) & 0x1f)
+#define PCI_FUNC(devfn)         ((devfn) & 0x07)
+
+/* Ioctls for /proc/bus/pci/X/Y nodes. */
+#define PCIIOC_BASE             ('P' << 24 | 'C' << 16 | 'I' << 8)
+#define PCIIOC_CONTROLLER       (PCIIOC_BASE | 0x00)    /* Get controller for PCI device. */
+#define PCIIOC_MMAP_IS_IO       (PCIIOC_BASE | 0x01)    /* Set mmap state to I/O space. */
+#define PCIIOC_MMAP_IS_MEM      (PCIIOC_BASE | 0x02)    /* Set mmap state to MEM space. */
+#define PCIIOC_WRITE_COMBINE    (PCIIOC_BASE | 0x03)    /* Enable/disable write-combining. */
+
+#endif /* _UAPILINUX_PCI_H */
diff --git a/include/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 20ae747ddf34..20ae747ddf34 100644
--- a/include/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
new file mode 100644
index 000000000000..4f63c05d27c9
--- /dev/null
+++ b/include/uapi/linux/perf_event.h
@@ -0,0 +1,615 @@
+/*
+ * Performance events:
+ *
+ *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
+ *    Copyright (C) 2008-2011, Red Hat, Inc., Ingo Molnar
+ *    Copyright (C) 2008-2011, Red Hat, Inc., Peter Zijlstra
+ *
+ * Data type definitions, declarations, prototypes.
+ *
+ *    Started by: Thomas Gleixner and Ingo Molnar
+ *
+ * For licencing details see kernel-base/COPYING
+ */
+#ifndef _UAPI_LINUX_PERF_EVENT_H
+#define _UAPI_LINUX_PERF_EVENT_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <asm/byteorder.h>
+
+/*
+ * User-space ABI bits:
+ */
+
+/*
+ * attr.type
+ */
+enum perf_type_id {
+        PERF_TYPE_HARDWARE                      = 0,
+        PERF_TYPE_SOFTWARE                      = 1,
+        PERF_TYPE_TRACEPOINT                    = 2,
+        PERF_TYPE_HW_CACHE                      = 3,
+        PERF_TYPE_RAW                           = 4,
+        PERF_TYPE_BREAKPOINT                    = 5,
+
+        PERF_TYPE_MAX,                          /* non-ABI */
+};
+
+/*
+ * Generalized performance event event_id types, used by the
+ * attr.event_id parameter of the sys_perf_event_open()
+ * syscall:
+ */
+enum perf_hw_id {
+        /*
+         * Common hardware events, generalized by the kernel:
+         */
+        PERF_COUNT_HW_CPU_CYCLES                = 0,
+        PERF_COUNT_HW_INSTRUCTIONS              = 1,
+        PERF_COUNT_HW_CACHE_REFERENCES          = 2,
+        PERF_COUNT_HW_CACHE_MISSES              = 3,
+        PERF_COUNT_HW_BRANCH_INSTRUCTIONS       = 4,
+        PERF_COUNT_HW_BRANCH_MISSES             = 5,
+        PERF_COUNT_HW_BUS_CYCLES                = 6,
+        PERF_COUNT_HW_STALLED_CYCLES_FRONTEND   = 7,
+        PERF_COUNT_HW_STALLED_CYCLES_BACKEND    = 8,
+        PERF_COUNT_HW_REF_CPU_CYCLES            = 9,
+
+        PERF_COUNT_HW_MAX,                      /* non-ABI */
+};
+
+/*
+ * Generalized hardware cache events:
+ *
+ *       { L1-D, L1-I, LLC, ITLB, DTLB, BPU, NODE } x
+ *       { read, write, prefetch } x
+ *       { accesses, misses }
+ */
+enum perf_hw_cache_id {
+        PERF_COUNT_HW_CACHE_L1D                 = 0,
+        PERF_COUNT_HW_CACHE_L1I                 = 1,
+        PERF_COUNT_HW_CACHE_LL                  = 2,
+        PERF_COUNT_HW_CACHE_DTLB                = 3,
+        PERF_COUNT_HW_CACHE_ITLB                = 4,
+        PERF_COUNT_HW_CACHE_BPU                 = 5,
+        PERF_COUNT_HW_CACHE_NODE                = 6,
+
+        PERF_COUNT_HW_CACHE_MAX,                /* non-ABI */
+};
+
+enum perf_hw_cache_op_id {
+        PERF_COUNT_HW_CACHE_OP_READ             = 0,
+        PERF_COUNT_HW_CACHE_OP_WRITE            = 1,
+        PERF_COUNT_HW_CACHE_OP_PREFETCH         = 2,
+
+        PERF_COUNT_HW_CACHE_OP_MAX,             /* non-ABI */
+};
+
+enum perf_hw_cache_op_result_id {
+        PERF_COUNT_HW_CACHE_RESULT_ACCESS       = 0,
+        PERF_COUNT_HW_CACHE_RESULT_MISS         = 1,
+
+        PERF_COUNT_HW_CACHE_RESULT_MAX,         /* non-ABI */
+};
+
+/*
+ * Special "software" events provided by the kernel, even if the hardware
+ * does not support performance events. These events measure various
+ * physical and sw events of the kernel (and allow the profiling of them as
+ * well):
+ */
+enum perf_sw_ids {
+        PERF_COUNT_SW_CPU_CLOCK                 = 0,
+        PERF_COUNT_SW_TASK_CLOCK                = 1,
+        PERF_COUNT_SW_PAGE_FAULTS               = 2,
+        PERF_COUNT_SW_CONTEXT_SWITCHES          = 3,
+        PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
+        PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
+        PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
+        PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
+        PERF_COUNT_SW_EMULATION_FAULTS          = 8,
+
+        PERF_COUNT_SW_MAX,                      /* non-ABI */
+};
+
+/*
+ * Bits that can be set in attr.sample_type to request information
+ * in the overflow packets.
+ */
+enum perf_event_sample_format {
+        PERF_SAMPLE_IP                          = 1U << 0,
+        PERF_SAMPLE_TID                         = 1U << 1,
+        PERF_SAMPLE_TIME                        = 1U << 2,
+        PERF_SAMPLE_ADDR                        = 1U << 3,
+        PERF_SAMPLE_READ                        = 1U << 4,
+        PERF_SAMPLE_CALLCHAIN                   = 1U << 5,
+        PERF_SAMPLE_ID                          = 1U << 6,
+        PERF_SAMPLE_CPU                         = 1U << 7,
+        PERF_SAMPLE_PERIOD                      = 1U << 8,
+        PERF_SAMPLE_STREAM_ID                   = 1U << 9,
+        PERF_SAMPLE_RAW                         = 1U << 10,
+        PERF_SAMPLE_BRANCH_STACK                = 1U << 11,
+        PERF_SAMPLE_REGS_USER                   = 1U << 12,
+        PERF_SAMPLE_STACK_USER                  = 1U << 13,
+
+        PERF_SAMPLE_MAX = 1U << 14,             /* non-ABI */
+};
+
+/*
+ * values to program into branch_sample_type when PERF_SAMPLE_BRANCH is set
+ *
+ * If the user does not pass priv level information via branch_sample_type,
+ * the kernel uses the event's priv level. Branch and event priv levels do
+ * not have to match. Branch priv level is checked for permissions.
+ *
+ * The branch types can be combined, however BRANCH_ANY covers all types
+ * of branches and therefore it supersedes all the other types.
+ */
+enum perf_branch_sample_type {
+        PERF_SAMPLE_BRANCH_USER         = 1U << 0, /* user branches */
+        PERF_SAMPLE_BRANCH_KERNEL       = 1U << 1, /* kernel branches */
+        PERF_SAMPLE_BRANCH_HV           = 1U << 2, /* hypervisor branches */
+
+        PERF_SAMPLE_BRANCH_ANY          = 1U << 3, /* any branch types */
+        PERF_SAMPLE_BRANCH_ANY_CALL     = 1U << 4, /* any call branch */
+        PERF_SAMPLE_BRANCH_ANY_RETURN   = 1U << 5, /* any return branch */
+        PERF_SAMPLE_BRANCH_IND_CALL     = 1U << 6, /* indirect calls */
+
+        PERF_SAMPLE_BRANCH_MAX          = 1U << 7, /* non-ABI */
+};
+
+#define PERF_SAMPLE_BRANCH_PLM_ALL \
+        (PERF_SAMPLE_BRANCH_USER|\
+         PERF_SAMPLE_BRANCH_KERNEL|\
+         PERF_SAMPLE_BRANCH_HV)
+
+/*
+ * Values to determine ABI of the registers dump.
+ */
+enum perf_sample_regs_abi {
+        PERF_SAMPLE_REGS_ABI_NONE       = 0,
+        PERF_SAMPLE_REGS_ABI_32         = 1,
+        PERF_SAMPLE_REGS_ABI_64         = 2,
+};
+
+/*
+ * The format of the data returned by read() on a perf event fd,
+ * as specified by attr.read_format:
+ *
+ * struct read_format {
+ *      { u64           value;
+ *        { u64         time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
+ *        { u64         time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
+ *        { u64         id;           } && PERF_FORMAT_ID
+ *      } && !PERF_FORMAT_GROUP
+ *
+ *      { u64           nr;
+ *        { u64         time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
+ *        { u64         time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
+ *        { u64         value;
+ *          { u64       id;           } && PERF_FORMAT_ID
+ *        }             cntr[nr];
+ *      } && PERF_FORMAT_GROUP
+ * };
+ */
+enum perf_event_read_format {
+        PERF_FORMAT_TOTAL_TIME_ENABLED          = 1U << 0,
+        PERF_FORMAT_TOTAL_TIME_RUNNING          = 1U << 1,
+        PERF_FORMAT_ID                          = 1U << 2,
+        PERF_FORMAT_GROUP                       = 1U << 3,
+
+        PERF_FORMAT_MAX = 1U << 4,              /* non-ABI */
+};
+
+#define PERF_ATTR_SIZE_VER0     64      /* sizeof first published struct */
+#define PERF_ATTR_SIZE_VER1     72      /* add: config2 */
+#define PERF_ATTR_SIZE_VER2     80      /* add: branch_sample_type */
+#define PERF_ATTR_SIZE_VER3     96      /* add: sample_regs_user */
+                                        /* add: sample_stack_user */
+
+/*
+ * Hardware event_id to monitor via a performance monitoring event:
+ */
+struct perf_event_attr {
+
+        /*
+         * Major type: hardware/software/tracepoint/etc.
+         */
+        __u32                   type;
+
+        /*
+         * Size of the attr structure, for fwd/bwd compat.
+         */
+        __u32                   size;
+
+        /*
+         * Type specific configuration information.
+         */
+        __u64                   config;
+
+        union {
+                __u64           sample_period;
+                __u64           sample_freq;
+        };
+
+        __u64                   sample_type;
+        __u64                   read_format;
+
+        __u64                   disabled       :  1, /* off by default        */
+                                inherit        :  1, /* children inherit it   */
+                                pinned         :  1, /* must always be on PMU */
+                                exclusive      :  1, /* only group on PMU     */
+                                exclude_user   :  1, /* don't count user      */
+                                exclude_kernel :  1, /* ditto kernel          */
+                                exclude_hv     :  1, /* ditto hypervisor      */
+                                exclude_idle   :  1, /* don't count when idle */
+                                mmap           :  1, /* include mmap data     */
+                                comm           :  1, /* include comm data     */
+                                freq           :  1, /* use freq, not period  */
+                                inherit_stat   :  1, /* per task counts       */
+                                enable_on_exec :  1, /* next exec enables     */
+                                task           :  1, /* trace fork/exit       */
+                                watermark      :  1, /* wakeup_watermark      */
+                                /*
+                                 * precise_ip:
+                                 *
+                                 *  0 - SAMPLE_IP can have arbitrary skid
+                                 *  1 - SAMPLE_IP must have constant skid
+                                 *  2 - SAMPLE_IP requested to have 0 skid
+                                 *  3 - SAMPLE_IP must have 0 skid
+                                 *
+                                 *  See also PERF_RECORD_MISC_EXACT_IP
+                                 */
+                                precise_ip     :  2, /* skid constraint       */
+                                mmap_data      :  1, /* non-exec mmap data    */
+                                sample_id_all  :  1, /* sample_type all events */
+
+                                exclude_host   :  1, /* don't count in host   */
+                                exclude_guest  :  1, /* don't count in guest  */
+
+                                exclude_callchain_kernel : 1, /* exclude kernel callchains */
+                                exclude_callchain_user   : 1, /* exclude user callchains */
+
+                                __reserved_1   : 41;
+
+        union {
+                __u32           wakeup_events;    /* wakeup every n events */
+                __u32           wakeup_watermark; /* bytes before wakeup   */
+        };
+
+        __u32                   bp_type;
+        union {
+                __u64           bp_addr;
+                __u64           config1; /* extension of config */
+        };
+        union {
+                __u64           bp_len;
+                __u64           config2; /* extension of config1 */
+        };
+        __u64   branch_sample_type; /* enum perf_branch_sample_type */
+
+        /*
+         * Defines set of user regs to dump on samples.
+         * See asm/perf_regs.h for details.
+         */
+        __u64   sample_regs_user;
+
+        /*
+         * Defines size of the user stack to dump on samples.
+         */
+        __u32   sample_stack_user;
+
+        /* Align to u64. */
+        __u32   __reserved_2;
+};
+
+#define perf_flags(attr)        (*(&(attr)->read_format + 1))
+
+/*
+ * Ioctls that can be done on a perf event fd:
+ */
+#define PERF_EVENT_IOC_ENABLE           _IO ('$', 0)
+#define PERF_EVENT_IOC_DISABLE          _IO ('$', 1)
+#define PERF_EVENT_IOC_REFRESH          _IO ('$', 2)
+#define PERF_EVENT_IOC_RESET            _IO ('$', 3)
+#define PERF_EVENT_IOC_PERIOD           _IOW('$', 4, __u64)
+#define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
+#define PERF_EVENT_IOC_SET_FILTER       _IOW('$', 6, char *)
+
+enum perf_event_ioc_flags {
+        PERF_IOC_FLAG_GROUP             = 1U << 0,
+};
+
+/*
+ * Structure of the page that can be mapped via mmap
+ */
+struct perf_event_mmap_page {
+        __u32   version;                /* version number of this structure */
+        __u32   compat_version;         /* lowest version this is compat with */
+
+        /*
+         * Bits needed to read the hw events in user-space.
+         *
+         *   u32 seq, time_mult, time_shift, idx, width;
+         *   u64 count, enabled, running;
+         *   u64 cyc, time_offset;
+         *   s64 pmc = 0;
+         *
+         *   do {
+         *     seq = pc->lock;
+         *     barrier()
+         *
+         *     enabled = pc->time_enabled;
+         *     running = pc->time_running;
+         *
+         *     if (pc->cap_usr_time && enabled != running) {
+         *       cyc = rdtsc();
+         *       time_offset = pc->time_offset;
+         *       time_mult   = pc->time_mult;
+         *       time_shift  = pc->time_shift;
+         *     }
+         *
+         *     idx = pc->index;
+         *     count = pc->offset;
+         *     if (pc->cap_usr_rdpmc && idx) {
+         *       width = pc->pmc_width;
+         *       pmc = rdpmc(idx - 1);
+         *     }
+         *
+         *     barrier();
+         *   } while (pc->lock != seq);
+         *
+         * NOTE: for obvious reason this only works on self-monitoring
+         *       processes.
+         */
+        __u32   lock;                   /* seqlock for synchronization */
+        __u32   index;                  /* hardware event identifier */
+        __s64   offset;                 /* add to hardware event value */
+        __u64   time_enabled;           /* time event active */
+        __u64   time_running;           /* time event on cpu */
+        union {
+                __u64   capabilities;
+                __u64   cap_usr_time  : 1,
+                        cap_usr_rdpmc : 1,
+                        cap_____res   : 62;
+        };
+
+        /*
+         * If cap_usr_rdpmc this field provides the bit-width of the value
+         * read using the rdpmc() or equivalent instruction. This can be used
+         * to sign extend the result like:
+         *
+         *   pmc <<= 64 - width;
+         *   pmc >>= 64 - width; // signed shift right
+         *   count += pmc;
+         */
+        __u16   pmc_width;
+
+        /*
+         * If cap_usr_time the below fields can be used to compute the time
+         * delta since time_enabled (in ns) using rdtsc or similar.
+         *
+         *   u64 quot, rem;
+         *   u64 delta;
+         *
+         *   quot = (cyc >> time_shift);
+         *   rem = cyc & ((1 << time_shift) - 1);
+         *   delta = time_offset + quot * time_mult +
+         *              ((rem * time_mult) >> time_shift);
+         *
+         * Where time_offset,time_mult,time_shift and cyc are read in the
+         * seqcount loop described above. This delta can then be added to
+         * enabled and possible running (if idx), improving the scaling:
+         *
+         *   enabled += delta;
+         *   if (idx)
+         *     running += delta;
+         *
+         *   quot = count / running;
+         *   rem  = count % running;
+         *   count = quot * enabled + (rem * enabled) / running;
+         */
+        __u16   time_shift;
+        __u32   time_mult;
+        __u64   time_offset;
+
+                /*
+                 * Hole for extension of the self monitor capabilities
+                 */
+
+        __u64   __reserved[120];        /* align to 1k */
+
+        /*
+         * Control data for the mmap() data buffer.
+         *
+         * User-space reading the @data_head value should issue an rmb(), on
+         * SMP capable platforms, after reading this value -- see
+         * perf_event_wakeup().
+         *
+         * When the mapping is PROT_WRITE the @data_tail value should be
+         * written by userspace to reflect the last read data. In this case
+         * the kernel will not over-write unread data.
+         */
+        __u64   data_head;              /* head in the data section */
+        __u64   data_tail;              /* user-space written tail */
+};
+
+#define PERF_RECORD_MISC_CPUMODE_MASK           (7 << 0)
+#define PERF_RECORD_MISC_CPUMODE_UNKNOWN        (0 << 0)
+#define PERF_RECORD_MISC_KERNEL                 (1 << 0)
+#define PERF_RECORD_MISC_USER                   (2 << 0)
+#define PERF_RECORD_MISC_HYPERVISOR             (3 << 0)
+#define PERF_RECORD_MISC_GUEST_KERNEL           (4 << 0)
+#define PERF_RECORD_MISC_GUEST_USER             (5 << 0)
+
+/*
+ * Indicates that the content of PERF_SAMPLE_IP points to
+ * the actual instruction that triggered the event. See also
+ * perf_event_attr::precise_ip.
+ */
+#define PERF_RECORD_MISC_EXACT_IP               (1 << 14)
+/*
+ * Reserve the last bit to indicate some extended misc field
+ */
+#define PERF_RECORD_MISC_EXT_RESERVED           (1 << 15)
+
+struct perf_event_header {
+        __u32   type;
+        __u16   misc;
+        __u16   size;
+};
+
+enum perf_event_type {
+
+        /*
+         * If perf_event_attr.sample_id_all is set then all event types will
+         * have the sample_type selected fields related to where/when
+         * (identity) an event took place (TID, TIME, ID, CPU, STREAM_ID)
+         * described in PERF_RECORD_SAMPLE below, it will be stashed just after
+         * the perf_event_header and the fields already present for the existing
+         * fields, i.e. at the end of the payload. That way a newer perf.data
+         * file will be supported by older perf tools, with these new optional
+         * fields being ignored.
+         *
+         * The MMAP events record the PROT_EXEC mappings so that we can
+         * correlate userspace IPs to code. They have the following structure:
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u32                             pid, tid;
+         *      u64                             addr;
+         *      u64                             len;
+         *      u64                             pgoff;
+         *      char                            filename[];
+         * };
+         */
+        PERF_RECORD_MMAP                        = 1,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u64                             id;
+         *      u64                             lost;
+         * };
+         */
+        PERF_RECORD_LOST                        = 2,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u32                             pid, tid;
+         *      char                            comm[];
+         * };
+         */
+        PERF_RECORD_COMM                        = 3,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, ppid;
+         *      u32                             tid, ptid;
+         *      u64                             time;
+         * };
+         */
+        PERF_RECORD_EXIT                        = 4,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u64                             time;
+         *      u64                             id;
+         *      u64                             stream_id;
+         * };
+         */
+        PERF_RECORD_THROTTLE                    = 5,
+        PERF_RECORD_UNTHROTTLE                  = 6,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, ppid;
+         *      u32                             tid, ptid;
+         *      u64                             time;
+         * };
+         */
+        PERF_RECORD_FORK                        = 7,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, tid;
+         *
+         *      struct read_format              values;
+         * };
+         */
+        PERF_RECORD_READ                        = 8,
+
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      { u64                   ip;       } && PERF_SAMPLE_IP
+         *      { u32                   pid, tid; } && PERF_SAMPLE_TID
+         *      { u64                   time;     } && PERF_SAMPLE_TIME
+         *      { u64                   addr;     } && PERF_SAMPLE_ADDR
+         *      { u64                   id;       } && PERF_SAMPLE_ID
+         *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
+         *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
+         *      { u64                   period;   } && PERF_SAMPLE_PERIOD
+         *
+         *      { struct read_format    values;   } && PERF_SAMPLE_READ
+         *
+         *      { u64                   nr,
+         *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
+         *
+         *      #
+         *      # The RAW record below is opaque data wrt the ABI
+         *      #
+         *      # That is, the ABI doesn't make any promises wrt to
+         *      # the stability of its content, it may vary depending
+         *      # on event, hardware, kernel version and phase of
+         *      # the moon.
+         *      #
+         *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
+         *      #
+         *
+         *      { u32                   size;
+         *        char                  data[size];}&& PERF_SAMPLE_RAW
+         *
+         *      { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
+         *
+         *      { u64                   abi; # enum perf_sample_regs_abi
+         *        u64                   regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
+         *
+         *      { u64                   size;
+         *        char                  data[size];
+         *        u64                   dyn_size; } && PERF_SAMPLE_STACK_USER
+         * };
+         */
+        PERF_RECORD_SAMPLE                      = 9,
+
+        PERF_RECORD_MAX,                        /* non-ABI */
+};
+
+#define PERF_MAX_STACK_DEPTH            127
+
+enum perf_callchain_context {
+        PERF_CONTEXT_HV                 = (__u64)-32,
+        PERF_CONTEXT_KERNEL             = (__u64)-128,
+        PERF_CONTEXT_USER               = (__u64)-512,
+
+        PERF_CONTEXT_GUEST              = (__u64)-2048,
+        PERF_CONTEXT_GUEST_KERNEL       = (__u64)-2176,
+        PERF_CONTEXT_GUEST_USER         = (__u64)-2560,
+
+        PERF_CONTEXT_MAX                = (__u64)-4095,
+};
+
+#define PERF_FLAG_FD_NO_GROUP           (1U << 0)
+#define PERF_FLAG_FD_OUTPUT             (1U << 1)
+#define PERF_FLAG_PID_CGROUP            (1U << 2) /* pid=cgroup id, per-cpu mode only */
+
+#endif /* _UAPI_LINUX_PERF_EVENT_H */
diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
new file mode 100644
index 000000000000..aa169c4339d2
--- /dev/null
+++ b/include/uapi/linux/personality.h
@@ -0,0 +1,69 @@
+#ifndef _UAPI_LINUX_PERSONALITY_H
+#define _UAPI_LINUX_PERSONALITY_H
+
+
+/*
+ * Flags for bug emulation.
+ *
+ * These occupy the top three bytes.
+ */
+enum {
+        UNAME26 =               0x0020000,
+        ADDR_NO_RANDOMIZE =     0x0040000,      /* disable randomization of VA space */
+        FDPIC_FUNCPTRS =        0x0080000,      /* userspace function ptrs point to descriptors
+                                                 * (signal handling)
+                                                 */
+        MMAP_PAGE_ZERO =        0x0100000,
+        ADDR_COMPAT_LAYOUT =    0x0200000,
+        READ_IMPLIES_EXEC =     0x0400000,
+        ADDR_LIMIT_32BIT =      0x0800000,
+        SHORT_INODE =           0x1000000,
+        WHOLE_SECONDS =         0x2000000,
+        STICKY_TIMEOUTS =       0x4000000,
+        ADDR_LIMIT_3GB =        0x8000000,
+};
+
+/*
+ * Security-relevant compatibility flags that must be
+ * cleared upon setuid or setgid exec:
+ */
+#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC  | \
+                            ADDR_NO_RANDOMIZE  | \
+                            ADDR_COMPAT_LAYOUT | \
+                            MMAP_PAGE_ZERO)
+
+/*
+ * Personality types.
+ *
+ * These go in the low byte.  Avoid using the top bit, it will
+ * conflict with error returns.
+ */
+enum {
+        PER_LINUX =             0x0000,
+        PER_LINUX_32BIT =       0x0000 | ADDR_LIMIT_32BIT,
+        PER_LINUX_FDPIC =       0x0000 | FDPIC_FUNCPTRS,
+        PER_SVR4 =              0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
+        PER_SVR3 =              0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
+        PER_SCOSVR3 =           0x0003 | STICKY_TIMEOUTS |
+                                         WHOLE_SECONDS | SHORT_INODE,
+        PER_OSR5 =              0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS,
+        PER_WYSEV386 =          0x0004 | STICKY_TIMEOUTS | SHORT_INODE,
+        PER_ISCR4 =             0x0005 | STICKY_TIMEOUTS,
+        PER_BSD =               0x0006,
+        PER_SUNOS =             0x0006 | STICKY_TIMEOUTS,
+        PER_XENIX =             0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
+        PER_LINUX32 =           0x0008,
+        PER_LINUX32_3GB =       0x0008 | ADDR_LIMIT_3GB,
+        PER_IRIX32 =            0x0009 | STICKY_TIMEOUTS,/* IRIX5 32-bit */
+        PER_IRIXN32 =           0x000a | STICKY_TIMEOUTS,/* IRIX6 new 32-bit */
+        PER_IRIX64 =            0x000b | STICKY_TIMEOUTS,/* IRIX6 64-bit */
+        PER_RISCOS =            0x000c,
+        PER_SOLARIS =           0x000d | STICKY_TIMEOUTS,
+        PER_UW7 =               0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
+        PER_OSF4 =              0x000f,                  /* OSF/1 v4 */
+        PER_HPUX =              0x0010,
+        PER_MASK =              0x00ff,
+};
+
+
+#endif /* _UAPI_LINUX_PERSONALITY_H */
diff --git a/include/linux/pfkeyv2.h b/include/uapi/linux/pfkeyv2.h
index 0b80c806631f..0b80c806631f 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/uapi/linux/pfkeyv2.h
diff --git a/include/linux/pg.h b/include/uapi/linux/pg.h
index db994bb0c794..db994bb0c794 100644
--- a/include/linux/pg.h
+++ b/include/uapi/linux/pg.h
diff --git a/include/linux/phantom.h b/include/uapi/linux/phantom.h
index 94dd6645c60a..94dd6645c60a 100644
--- a/include/linux/phantom.h
+++ b/include/uapi/linux/phantom.h
diff --git a/include/uapi/linux/phonet.h b/include/uapi/linux/phonet.h
new file mode 100644
index 000000000000..a3e1d65b3ed9
--- /dev/null
+++ b/include/uapi/linux/phonet.h
@@ -0,0 +1,185 @@
+/**
+ * file phonet.h
+ *
+ * Phonet sockets kernel interface
+ *
+ * Copyright (C) 2008 Nokia Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _UAPILINUX_PHONET_H
+#define _UAPILINUX_PHONET_H
+
+#include <linux/types.h>
+#include <linux/socket.h>
+
+/* Automatic protocol selection */
+#define PN_PROTO_TRANSPORT      0
+/* Phonet datagram socket */
+#define PN_PROTO_PHONET         1
+/* Phonet pipe */
+#define PN_PROTO_PIPE           2
+#define PHONET_NPROTO           3
+
+/* Socket options for SOL_PNPIPE level */
+#define PNPIPE_ENCAP            1
+#define PNPIPE_IFINDEX          2
+#define PNPIPE_HANDLE           3
+#define PNPIPE_INITSTATE        4
+
+#define PNADDR_ANY              0
+#define PNADDR_BROADCAST        0xFC
+#define PNPORT_RESOURCE_ROUTING 0
+
+/* Values for PNPIPE_ENCAP option */
+#define PNPIPE_ENCAP_NONE       0
+#define PNPIPE_ENCAP_IP         1
+
+/* ioctls */
+#define SIOCPNGETOBJECT         (SIOCPROTOPRIVATE + 0)
+#define SIOCPNENABLEPIPE        (SIOCPROTOPRIVATE + 13)
+#define SIOCPNADDRESOURCE       (SIOCPROTOPRIVATE + 14)
+#define SIOCPNDELRESOURCE       (SIOCPROTOPRIVATE + 15)
+
+/* Phonet protocol header */
+struct phonethdr {
+        __u8    pn_rdev;
+        __u8    pn_sdev;
+        __u8    pn_res;
+        __be16  pn_length;
+        __u8    pn_robj;
+        __u8    pn_sobj;
+} __attribute__((packed));
+
+/* Common Phonet payload header */
+struct phonetmsg {
+        __u8    pn_trans_id;    /* transaction ID */
+        __u8    pn_msg_id;      /* message type */
+        union {
+                struct {
+                        __u8    pn_submsg_id;   /* message subtype */
+                        __u8    pn_data[5];
+                } base;
+                struct {
+                        __u16   pn_e_res_id;    /* extended resource ID */
+                        __u8    pn_e_submsg_id; /* message subtype */
+                        __u8    pn_e_data[3];
+                } ext;
+        } pn_msg_u;
+};
+#define PN_COMMON_MESSAGE       0xF0
+#define PN_COMMGR               0x10
+#define PN_PREFIX               0xE0 /* resource for extended messages */
+#define pn_submsg_id            pn_msg_u.base.pn_submsg_id
+#define pn_e_submsg_id          pn_msg_u.ext.pn_e_submsg_id
+#define pn_e_res_id             pn_msg_u.ext.pn_e_res_id
+#define pn_data                 pn_msg_u.base.pn_data
+#define pn_e_data               pn_msg_u.ext.pn_e_data
+
+/* data for unreachable errors */
+#define PN_COMM_SERVICE_NOT_IDENTIFIED_RESP     0x01
+#define PN_COMM_ISA_ENTITY_NOT_REACHABLE_RESP   0x14
+#define pn_orig_msg_id          pn_data[0]
+#define pn_status               pn_data[1]
+#define pn_e_orig_msg_id        pn_e_data[0]
+#define pn_e_status             pn_e_data[1]
+
+/* Phonet socket address structure */
+struct sockaddr_pn {
+        __kernel_sa_family_t spn_family;
+        __u8 spn_obj;
+        __u8 spn_dev;
+        __u8 spn_resource;
+        __u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3];
+} __attribute__((packed));
+
+/* Well known address */
+#define PN_DEV_PC       0x10
+
+static inline __u16 pn_object(__u8 addr, __u16 port)
+{
+        return (addr << 8) | (port & 0x3ff);
+}
+
+static inline __u8 pn_obj(__u16 handle)
+{
+        return handle & 0xff;
+}
+
+static inline __u8 pn_dev(__u16 handle)
+{
+        return handle >> 8;
+}
+
+static inline __u16 pn_port(__u16 handle)
+{
+        return handle & 0x3ff;
+}
+
+static inline __u8 pn_addr(__u16 handle)
+{
+        return (handle >> 8) & 0xfc;
+}
+
+static inline void pn_sockaddr_set_addr(struct sockaddr_pn *spn, __u8 addr)
+{
+        spn->spn_dev &= 0x03;
+        spn->spn_dev |= addr & 0xfc;
+}
+
+static inline void pn_sockaddr_set_port(struct sockaddr_pn *spn, __u16 port)
+{
+        spn->spn_dev &= 0xfc;
+        spn->spn_dev |= (port >> 8) & 0x03;
+        spn->spn_obj = port & 0xff;
+}
+
+static inline void pn_sockaddr_set_object(struct sockaddr_pn *spn,
+                                                __u16 handle)
+{
+        spn->spn_dev = pn_dev(handle);
+        spn->spn_obj = pn_obj(handle);
+}
+
+static inline void pn_sockaddr_set_resource(struct sockaddr_pn *spn,
+                                                __u8 resource)
+{
+        spn->spn_resource = resource;
+}
+
+static inline __u8 pn_sockaddr_get_addr(const struct sockaddr_pn *spn)
+{
+        return spn->spn_dev & 0xfc;
+}
+
+static inline __u16 pn_sockaddr_get_port(const struct sockaddr_pn *spn)
+{
+        return ((spn->spn_dev & 0x03) << 8) | spn->spn_obj;
+}
+
+static inline __u16 pn_sockaddr_get_object(const struct sockaddr_pn *spn)
+{
+        return pn_object(spn->spn_dev, spn->spn_obj);
+}
+
+static inline __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn)
+{
+        return spn->spn_resource;
+}
+
+/* Phonet device ioctl requests */
+
+#endif /* _UAPILINUX_PHONET_H */
diff --git a/include/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 082eafaf026b..082eafaf026b 100644
--- a/include/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
diff --git a/include/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 32aef0a439ef..32aef0a439ef 100644
--- a/include/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
diff --git a/include/uapi/linux/pktcdvd.h b/include/uapi/linux/pktcdvd.h
new file mode 100644
index 000000000000..2640b9d4e243
--- /dev/null
+++ b/include/uapi/linux/pktcdvd.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
+ * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ * Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and
+ * DVD-RW devices.
+ *
+ */
+#ifndef _UAPI__PKTCDVD_H
+#define _UAPI__PKTCDVD_H
+
+#include <linux/types.h>
+
+/*
+ * 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
+ */
+#define PACKET_DEBUG            1
+
+#define MAX_WRITERS             8
+
+#define PKT_RB_POOL_SIZE        512
+
+/*
+ * How long we should hold a non-full packet before starting data gathering.
+ */
+#define PACKET_WAIT_TIME        (HZ * 5 / 1000)
+
+/*
+ * use drive write caching -- we need deferred error handling to be
+ * able to successfully recover with this option (drive will return good
+ * status as soon as the cdb is validated).
+ */
+#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
+#define USE_WCACHING            1
+#else
+#define USE_WCACHING            0
+#endif
+
+/*
+ * No user-servicable parts beyond this point ->
+ */
+
+/*
+ * device types
+ */
+#define PACKET_CDR              1
+#define PACKET_CDRW             2
+#define PACKET_DVDR             3
+#define PACKET_DVDRW            4
+
+/*
+ * flags
+ */
+#define PACKET_WRITABLE         1       /* pd is writable */
+#define PACKET_NWA_VALID        2       /* next writable address valid */
+#define PACKET_LRA_VALID        3       /* last recorded address valid */
+#define PACKET_MERGE_SEGS       4       /* perform segment merging to keep */
+                                        /* underlying cdrom device happy */
+
+/*
+ * Disc status -- from READ_DISC_INFO
+ */
+#define PACKET_DISC_EMPTY       0
+#define PACKET_DISC_INCOMPLETE  1
+#define PACKET_DISC_COMPLETE    2
+#define PACKET_DISC_OTHER       3
+
+/*
+ * write type, and corresponding data block type
+ */
+#define PACKET_MODE1            1
+#define PACKET_MODE2            2
+#define PACKET_BLOCK_MODE1      8
+#define PACKET_BLOCK_MODE2      10
+
+/*
+ * Last session/border status
+ */
+#define PACKET_SESSION_EMPTY            0
+#define PACKET_SESSION_INCOMPLETE       1
+#define PACKET_SESSION_RESERVED         2
+#define PACKET_SESSION_COMPLETE         3
+
+#define PACKET_MCN                      "4a656e734178626f65323030300000"
+
+#undef PACKET_USE_LS
+
+#define PKT_CTRL_CMD_SETUP      0
+#define PKT_CTRL_CMD_TEARDOWN   1
+#define PKT_CTRL_CMD_STATUS     2
+
+struct pkt_ctrl_command {
+        __u32 command;                          /* in: Setup, teardown, status */
+        __u32 dev_index;                        /* in/out: Device index */
+        __u32 dev;                              /* in/out: Device nr for cdrw device */
+        __u32 pkt_dev;                          /* in/out: Device nr for packet device */
+        __u32 num_devices;                      /* out: Largest device index + 1 */
+        __u32 padding;                          /* Not used */
+};
+
+/*
+ * packet ioctls
+ */
+#define PACKET_IOCTL_MAGIC      ('X')
+#define PACKET_CTRL_CMD         _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
+
+
+#endif /* _UAPI__PKTCDVD_H */
diff --git a/include/uapi/linux/pmu.h b/include/uapi/linux/pmu.h
new file mode 100644
index 000000000000..caead364b6eb
--- /dev/null
+++ b/include/uapi/linux/pmu.h
@@ -0,0 +1,139 @@
+/*
+ * Definitions for talking to the PMU.  The PMU is a microcontroller
+ * which controls battery charging and system power on PowerBook 3400
+ * and 2400 models as well as the RTC and various other things.
+ *
+ * Copyright (C) 1998 Paul Mackerras.
+ */
+
+#ifndef _UAPI_LINUX_PMU_H
+#define _UAPI_LINUX_PMU_H
+
+#define PMU_DRIVER_VERSION      2
+
+/*
+ * PMU commands
+ */
+#define PMU_POWER_CTRL0         0x10    /* control power of some devices */
+#define PMU_POWER_CTRL          0x11    /* control power of some devices */
+#define PMU_ADB_CMD             0x20    /* send ADB packet */
+#define PMU_ADB_POLL_OFF        0x21    /* disable ADB auto-poll */
+#define PMU_WRITE_NVRAM         0x33    /* write non-volatile RAM */
+#define PMU_READ_NVRAM          0x3b    /* read non-volatile RAM */
+#define PMU_SET_RTC             0x30    /* set real-time clock */
+#define PMU_READ_RTC            0x38    /* read real-time clock */
+#define PMU_SET_VOLBUTTON       0x40    /* set volume up/down position */
+#define PMU_BACKLIGHT_BRIGHT    0x41    /* set backlight brightness */
+#define PMU_GET_VOLBUTTON       0x48    /* get volume up/down position */
+#define PMU_PCEJECT             0x4c    /* eject PC-card from slot */
+#define PMU_BATTERY_STATE       0x6b    /* report battery state etc. */
+#define PMU_SMART_BATTERY_STATE 0x6f    /* report battery state (new way) */
+#define PMU_SET_INTR_MASK       0x70    /* set PMU interrupt mask */
+#define PMU_INT_ACK             0x78    /* read interrupt bits */
+#define PMU_SHUTDOWN            0x7e    /* turn power off */
+#define PMU_CPU_SPEED           0x7d    /* control CPU speed on some models */
+#define PMU_SLEEP               0x7f    /* put CPU to sleep */
+#define PMU_POWER_EVENTS        0x8f    /* Send power-event commands to PMU */
+#define PMU_I2C_CMD             0x9a    /* I2C operations */
+#define PMU_RESET               0xd0    /* reset CPU */
+#define PMU_GET_BRIGHTBUTTON    0xd9    /* report brightness up/down pos */
+#define PMU_GET_COVER           0xdc    /* report cover open/closed */
+#define PMU_SYSTEM_READY        0xdf    /* tell PMU we are awake */
+#define PMU_GET_VERSION         0xea    /* read the PMU version */
+
+/* Bits to use with the PMU_POWER_CTRL0 command */
+#define PMU_POW0_ON             0x80    /* OR this to power ON the device */
+#define PMU_POW0_OFF            0x00    /* leave bit 7 to 0 to power it OFF */
+#define PMU_POW0_HARD_DRIVE     0x04    /* Hard drive power (on wallstreet/lombard ?) */
+
+/* Bits to use with the PMU_POWER_CTRL command */
+#define PMU_POW_ON              0x80    /* OR this to power ON the device */
+#define PMU_POW_OFF             0x00    /* leave bit 7 to 0 to power it OFF */
+#define PMU_POW_BACKLIGHT       0x01    /* backlight power */
+#define PMU_POW_CHARGER         0x02    /* battery charger power */
+#define PMU_POW_IRLED           0x04    /* IR led power (on wallstreet) */
+#define PMU_POW_MEDIABAY        0x08    /* media bay power (wallstreet/lombard ?) */
+
+/* Bits in PMU interrupt and interrupt mask bytes */
+#define PMU_INT_PCEJECT         0x04    /* PC-card eject buttons */
+#define PMU_INT_SNDBRT          0x08    /* sound/brightness up/down buttons */
+#define PMU_INT_ADB             0x10    /* ADB autopoll or reply data */
+#define PMU_INT_BATTERY         0x20    /* Battery state change */
+#define PMU_INT_ENVIRONMENT     0x40    /* Environment interrupts */
+#define PMU_INT_TICK            0x80    /* 1-second tick interrupt */
+
+/* Other bits in PMU interrupt valid when PMU_INT_ADB is set */
+#define PMU_INT_ADB_AUTO        0x04    /* ADB autopoll, when PMU_INT_ADB */
+#define PMU_INT_WAITING_CHARGER 0x01    /* ??? */
+#define PMU_INT_AUTO_SRQ_POLL   0x02    /* ??? */
+
+/* Bits in the environement message (either obtained via PMU_GET_COVER,
+ * or via PMU_INT_ENVIRONMENT on core99 */
+#define PMU_ENV_LID_CLOSED      0x01    /* The lid is closed */
+
+/* I2C related definitions */
+#define PMU_I2C_MODE_SIMPLE     0
+#define PMU_I2C_MODE_STDSUB     1
+#define PMU_I2C_MODE_COMBINED   2
+
+#define PMU_I2C_BUS_STATUS      0
+#define PMU_I2C_BUS_SYSCLK      1
+#define PMU_I2C_BUS_POWER       2
+
+#define PMU_I2C_STATUS_OK       0
+#define PMU_I2C_STATUS_DATAREAD 1
+#define PMU_I2C_STATUS_BUSY     0xfe
+
+
+/* Kind of PMU (model) */
+enum {
+        PMU_UNKNOWN,
+        PMU_OHARE_BASED,        /* 2400, 3400, 3500 (old G3 powerbook) */
+        PMU_HEATHROW_BASED,     /* PowerBook G3 series */
+        PMU_PADDINGTON_BASED,   /* 1999 PowerBook G3 */
+        PMU_KEYLARGO_BASED,     /* Core99 motherboard (PMU99) */
+        PMU_68K_V1,             /* 68K PMU, version 1 */
+        PMU_68K_V2,             /* 68K PMU, version 2 */
+};
+
+/* PMU PMU_POWER_EVENTS commands */
+enum {
+        PMU_PWR_GET_POWERUP_EVENTS      = 0x00,
+        PMU_PWR_SET_POWERUP_EVENTS      = 0x01,
+        PMU_PWR_CLR_POWERUP_EVENTS      = 0x02,
+        PMU_PWR_GET_WAKEUP_EVENTS       = 0x03,
+        PMU_PWR_SET_WAKEUP_EVENTS       = 0x04,
+        PMU_PWR_CLR_WAKEUP_EVENTS       = 0x05,
+};
+
+/* Power events wakeup bits */
+enum {
+        PMU_PWR_WAKEUP_KEY              = 0x01, /* Wake on key press */
+        PMU_PWR_WAKEUP_AC_INSERT        = 0x02, /* Wake on AC adapter plug */
+        PMU_PWR_WAKEUP_AC_CHANGE        = 0x04,
+        PMU_PWR_WAKEUP_LID_OPEN         = 0x08,
+        PMU_PWR_WAKEUP_RING             = 0x10,
+};
+        
+/*
+ * Ioctl commands for the /dev/pmu device
+ */
+#include <linux/ioctl.h>
+
+/* no param */
+#define PMU_IOC_SLEEP           _IO('B', 0)
+/* out param: u32*      backlight value: 0 to 15 */
+#define PMU_IOC_GET_BACKLIGHT   _IOR('B', 1, size_t)
+/* in param: u32        backlight value: 0 to 15 */
+#define PMU_IOC_SET_BACKLIGHT   _IOW('B', 2, size_t)
+/* out param: u32*      PMU model */
+#define PMU_IOC_GET_MODEL       _IOR('B', 3, size_t)
+/* out param: u32*      has_adb: 0 or 1 */
+#define PMU_IOC_HAS_ADB         _IOR('B', 4, size_t) 
+/* out param: u32*      can_sleep: 0 or 1 */
+#define PMU_IOC_CAN_SLEEP       _IOR('B', 5, size_t) 
+/* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
+#define PMU_IOC_GRAB_BACKLIGHT  _IOR('B', 6, size_t) 
+
+
+#endif /* _UAPI_LINUX_PMU_H */
diff --git a/include/uapi/linux/poll.h b/include/uapi/linux/poll.h
new file mode 100644
index 000000000000..2001fedfb223
--- /dev/null
+++ b/include/uapi/linux/poll.h
@@ -0,0 +1 @@
+#include <asm/poll.h>
diff --git a/include/linux/posix_types.h b/include/uapi/linux/posix_types.h
index 988f76e636e3..988f76e636e3 100644
--- a/include/linux/posix_types.h
+++ b/include/uapi/linux/posix_types.h
diff --git a/include/linux/ppdev.h b/include/uapi/linux/ppdev.h
index dc18c5d23ebe..dc18c5d23ebe 100644
--- a/include/linux/ppdev.h
+++ b/include/uapi/linux/ppdev.h
diff --git a/include/uapi/linux/ppp-comp.h b/include/uapi/linux/ppp-comp.h
new file mode 100644
index 000000000000..0a15bbb04e19
--- /dev/null
+++ b/include/uapi/linux/ppp-comp.h
@@ -0,0 +1,93 @@
+/*
+ * ppp-comp.h - Definitions for doing PPP packet compression.
+ *
+ * Copyright 1994-1998 Paul Mackerras.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  version 2 as published by the Free Software Foundation.
+ */
+#ifndef _UAPI_NET_PPP_COMP_H
+#define _UAPI_NET_PPP_COMP_H
+
+
+/*
+ * CCP codes.
+ */
+
+#define CCP_CONFREQ     1
+#define CCP_CONFACK     2
+#define CCP_TERMREQ     5
+#define CCP_TERMACK     6
+#define CCP_RESETREQ    14
+#define CCP_RESETACK    15
+
+/*
+ * Max # bytes for a CCP option
+ */
+
+#define CCP_MAX_OPTION_LENGTH   32
+
+/*
+ * Parts of a CCP packet.
+ */
+
+#define CCP_CODE(dp)            ((dp)[0])
+#define CCP_ID(dp)              ((dp)[1])
+#define CCP_LENGTH(dp)          (((dp)[2] << 8) + (dp)[3])
+#define CCP_HDRLEN              4
+
+#define CCP_OPT_CODE(dp)        ((dp)[0])
+#define CCP_OPT_LENGTH(dp)      ((dp)[1])
+#define CCP_OPT_MINLEN          2
+
+/*
+ * Definitions for BSD-Compress.
+ */
+
+#define CI_BSD_COMPRESS         21      /* config. option for BSD-Compress */
+#define CILEN_BSD_COMPRESS      3       /* length of config. option */
+
+/* Macros for handling the 3rd byte of the BSD-Compress config option. */
+#define BSD_NBITS(x)            ((x) & 0x1F)    /* number of bits requested */
+#define BSD_VERSION(x)          ((x) >> 5)      /* version of option format */
+#define BSD_CURRENT_VERSION     1               /* current version number */
+#define BSD_MAKE_OPT(v, n)      (((v) << 5) | (n))
+
+#define BSD_MIN_BITS            9       /* smallest code size supported */
+#define BSD_MAX_BITS            15      /* largest code size supported */
+
+/*
+ * Definitions for Deflate.
+ */
+
+#define CI_DEFLATE              26      /* config option for Deflate */
+#define CI_DEFLATE_DRAFT        24      /* value used in original draft RFC */
+#define CILEN_DEFLATE           4       /* length of its config option */
+
+#define DEFLATE_MIN_SIZE        9
+#define DEFLATE_MAX_SIZE        15
+#define DEFLATE_METHOD_VAL      8
+#define DEFLATE_SIZE(x)         (((x) >> 4) + 8)
+#define DEFLATE_METHOD(x)       ((x) & 0x0F)
+#define DEFLATE_MAKE_OPT(w)     ((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
+#define DEFLATE_CHK_SEQUENCE    0
+
+/*
+ * Definitions for MPPE.
+ */
+
+#define CI_MPPE                18      /* config option for MPPE */
+#define CILEN_MPPE              6      /* length of config option */
+
+/*
+ * Definitions for other, as yet unsupported, compression methods.
+ */
+
+#define CI_PREDICTOR_1          1       /* config option for Predictor-1 */
+#define CILEN_PREDICTOR_1       2       /* length of its config option */
+#define CI_PREDICTOR_2          2       /* config option for Predictor-2 */
+#define CILEN_PREDICTOR_2       2       /* length of its config option */
+
+
+#endif /* _UAPI_NET_PPP_COMP_H */
diff --git a/include/linux/ppp-ioctl.h b/include/uapi/linux/ppp-ioctl.h
index 2d9a8859550a..2d9a8859550a 100644
--- a/include/linux/ppp-ioctl.h
+++ b/include/uapi/linux/ppp-ioctl.h
diff --git a/include/uapi/linux/ppp_defs.h b/include/uapi/linux/ppp_defs.h
new file mode 100644
index 000000000000..283fc05dbbda
--- /dev/null
+++ b/include/uapi/linux/ppp_defs.h
@@ -0,0 +1,150 @@
+/*
+ * ppp_defs.h - PPP definitions.
+ *
+ * Copyright 1994-2000 Paul Mackerras.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  version 2 as published by the Free Software Foundation.
+ */
+#include <linux/types.h>
+
+#ifndef _UAPI_PPP_DEFS_H_
+#define _UAPI_PPP_DEFS_H_
+
+/*
+ * The basic PPP frame.
+ */
+#define PPP_HDRLEN      4       /* octets for standard ppp header */
+#define PPP_FCSLEN      2       /* octets for FCS */
+#define PPP_MRU         1500    /* default MRU = max length of info field */
+
+#define PPP_ADDRESS(p)  (((__u8 *)(p))[0])
+#define PPP_CONTROL(p)  (((__u8 *)(p))[1])
+#define PPP_PROTOCOL(p) ((((__u8 *)(p))[2] << 8) + ((__u8 *)(p))[3])
+
+/*
+ * Significant octet values.
+ */
+#define PPP_ALLSTATIONS 0xff    /* All-Stations broadcast address */
+#define PPP_UI          0x03    /* Unnumbered Information */
+#define PPP_FLAG        0x7e    /* Flag Sequence */
+#define PPP_ESCAPE      0x7d    /* Asynchronous Control Escape */
+#define PPP_TRANS       0x20    /* Asynchronous transparency modifier */
+
+/*
+ * Protocol field values.
+ */
+#define PPP_IP          0x21    /* Internet Protocol */
+#define PPP_AT          0x29    /* AppleTalk Protocol */
+#define PPP_IPX         0x2b    /* IPX protocol */
+#define PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
+#define PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
+#define PPP_MP          0x3d    /* Multilink protocol */
+#define PPP_IPV6        0x57    /* Internet Protocol Version 6 */
+#define PPP_COMPFRAG    0xfb    /* fragment compressed below bundle */
+#define PPP_COMP        0xfd    /* compressed packet */
+#define PPP_MPLS_UC     0x0281  /* Multi Protocol Label Switching - Unicast */
+#define PPP_MPLS_MC     0x0283  /* Multi Protocol Label Switching - Multicast */
+#define PPP_IPCP        0x8021  /* IP Control Protocol */
+#define PPP_ATCP        0x8029  /* AppleTalk Control Protocol */
+#define PPP_IPXCP       0x802b  /* IPX Control Protocol */
+#define PPP_IPV6CP      0x8057  /* IPv6 Control Protocol */
+#define PPP_CCPFRAG     0x80fb  /* CCP at link level (below MP bundle) */
+#define PPP_CCP         0x80fd  /* Compression Control Protocol */
+#define PPP_MPLSCP      0x80fd  /* MPLS Control Protocol */
+#define PPP_LCP         0xc021  /* Link Control Protocol */
+#define PPP_PAP         0xc023  /* Password Authentication Protocol */
+#define PPP_LQR         0xc025  /* Link Quality Report protocol */
+#define PPP_CHAP        0xc223  /* Cryptographic Handshake Auth. Protocol */
+#define PPP_CBCP        0xc029  /* Callback Control Protocol */
+
+/*
+ * Values for FCS calculations.
+ */
+
+#define PPP_INITFCS     0xffff  /* Initial FCS value */
+#define PPP_GOODFCS     0xf0b8  /* Good final FCS value */
+
+
+/*
+ * Extended asyncmap - allows any character to be escaped.
+ */
+
+typedef __u32           ext_accm[8];
+
+/*
+ * What to do with network protocol (NP) packets.
+ */
+enum NPmode {
+    NPMODE_PASS,                /* pass the packet through */
+    NPMODE_DROP,                /* silently drop the packet */
+    NPMODE_ERROR,               /* return an error */
+    NPMODE_QUEUE                /* save it up for later. */
+};
+
+/*
+ * Statistics for LQRP and pppstats
+ */
+struct pppstat  {
+    __u32       ppp_discards;   /* # frames discarded */
+
+    __u32       ppp_ibytes;     /* bytes received */
+    __u32       ppp_ioctects;   /* bytes received not in error */
+    __u32       ppp_ipackets;   /* packets received */
+    __u32       ppp_ierrors;    /* receive errors */
+    __u32       ppp_ilqrs;      /* # LQR frames received */
+
+    __u32       ppp_obytes;     /* raw bytes sent */
+    __u32       ppp_ooctects;   /* frame bytes sent */
+    __u32       ppp_opackets;   /* packets sent */
+    __u32       ppp_oerrors;    /* transmit errors */ 
+    __u32       ppp_olqrs;      /* # LQR frames sent */
+};
+
+struct vjstat {
+    __u32       vjs_packets;    /* outbound packets */
+    __u32       vjs_compressed; /* outbound compressed packets */
+    __u32       vjs_searches;   /* searches for connection state */
+    __u32       vjs_misses;     /* times couldn't find conn. state */
+    __u32       vjs_uncompressedin; /* inbound uncompressed packets */
+    __u32       vjs_compressedin;   /* inbound compressed packets */
+    __u32       vjs_errorin;    /* inbound unknown type packets */
+    __u32       vjs_tossed;     /* inbound packets tossed because of error */
+};
+
+struct compstat {
+    __u32       unc_bytes;      /* total uncompressed bytes */
+    __u32       unc_packets;    /* total uncompressed packets */
+    __u32       comp_bytes;     /* compressed bytes */
+    __u32       comp_packets;   /* compressed packets */
+    __u32       inc_bytes;      /* incompressible bytes */
+    __u32       inc_packets;    /* incompressible packets */
+
+    /* the compression ratio is defined as in_count / bytes_out */
+    __u32       in_count;       /* Bytes received */
+    __u32       bytes_out;      /* Bytes transmitted */
+
+    double      ratio;          /* not computed in kernel. */
+};
+
+struct ppp_stats {
+    struct pppstat      p;      /* basic PPP statistics */
+    struct vjstat       vj;     /* VJ header compression statistics */
+};
+
+struct ppp_comp_stats {
+    struct compstat     c;      /* packet compression statistics */
+    struct compstat     d;      /* packet decompression statistics */
+};
+
+/*
+ * The following structure records the time in seconds since
+ * the last NP packet was sent or received.
+ */
+struct ppp_idle {
+    __kernel_time_t xmit_idle;  /* time since last NP packet sent */
+    __kernel_time_t recv_idle;  /* time since last NP packet received */
+};
+
+#endif /* _UAPI_PPP_DEFS_H_ */
diff --git a/include/linux/pps.h b/include/uapi/linux/pps.h
index a9bb1d93451a..a9bb1d93451a 100644
--- a/include/linux/pps.h
+++ b/include/uapi/linux/pps.h
diff --git a/include/linux/prctl.h b/include/uapi/linux/prctl.h
index 289760f424aa..289760f424aa 100644
--- a/include/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
diff --git a/include/linux/ptp_clock.h b/include/uapi/linux/ptp_clock.h
index 94e981f810a2..94e981f810a2 100644
--- a/include/linux/ptp_clock.h
+++ b/include/uapi/linux/ptp_clock.h
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
new file mode 100644
index 000000000000..1ef6c056a9e4
--- /dev/null
+++ b/include/uapi/linux/ptrace.h
@@ -0,0 +1,81 @@
+#ifndef _UAPI_LINUX_PTRACE_H
+#define _UAPI_LINUX_PTRACE_H
+/* ptrace.h */
+/* structs and defines to help the user use the ptrace system call. */
+
+/* has the defines to get at the registers. */
+
+
+#define PTRACE_TRACEME             0
+#define PTRACE_PEEKTEXT            1
+#define PTRACE_PEEKDATA            2
+#define PTRACE_PEEKUSR             3
+#define PTRACE_POKETEXT            4
+#define PTRACE_POKEDATA            5
+#define PTRACE_POKEUSR             6
+#define PTRACE_CONT                7
+#define PTRACE_KILL                8
+#define PTRACE_SINGLESTEP          9
+
+#define PTRACE_ATTACH             16
+#define PTRACE_DETACH             17
+
+#define PTRACE_SYSCALL            24
+
+/* 0x4200-0x4300 are reserved for architecture-independent additions.  */
+#define PTRACE_SETOPTIONS       0x4200
+#define PTRACE_GETEVENTMSG      0x4201
+#define PTRACE_GETSIGINFO       0x4202
+#define PTRACE_SETSIGINFO       0x4203
+
+/*
+ * Generic ptrace interface that exports the architecture specific regsets
+ * using the corresponding NT_* types (which are also used in the core dump).
+ * Please note that the NT_PRSTATUS note type in a core dump contains a full
+ * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
+ * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
+ * other user_regset flavors, the user_regset layout and the ELF core dump note
+ * payload are exactly the same layout.
+ *
+ * This interface usage is as follows:
+ *      struct iovec iov = { buf, len};
+ *
+ *      ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov);
+ *
+ * On the successful completion, iov.len will be updated by the kernel,
+ * specifying how much the kernel has written/read to/from the user's iov.buf.
+ */
+#define PTRACE_GETREGSET        0x4204
+#define PTRACE_SETREGSET        0x4205
+
+#define PTRACE_SEIZE            0x4206
+#define PTRACE_INTERRUPT        0x4207
+#define PTRACE_LISTEN           0x4208
+
+/* Wait extended result codes for the above trace options.  */
+#define PTRACE_EVENT_FORK       1
+#define PTRACE_EVENT_VFORK      2
+#define PTRACE_EVENT_CLONE      3
+#define PTRACE_EVENT_EXEC       4
+#define PTRACE_EVENT_VFORK_DONE 5
+#define PTRACE_EVENT_EXIT       6
+#define PTRACE_EVENT_SECCOMP    7
+/* Extended result codes which enabled by means other than options.  */
+#define PTRACE_EVENT_STOP       128
+
+/* Options set using PTRACE_SETOPTIONS or using PTRACE_SEIZE @data param */
+#define PTRACE_O_TRACESYSGOOD   1
+#define PTRACE_O_TRACEFORK      (1 << PTRACE_EVENT_FORK)
+#define PTRACE_O_TRACEVFORK     (1 << PTRACE_EVENT_VFORK)
+#define PTRACE_O_TRACECLONE     (1 << PTRACE_EVENT_CLONE)
+#define PTRACE_O_TRACEEXEC      (1 << PTRACE_EVENT_EXEC)
+#define PTRACE_O_TRACEVFORKDONE (1 << PTRACE_EVENT_VFORK_DONE)
+#define PTRACE_O_TRACEEXIT      (1 << PTRACE_EVENT_EXIT)
+#define PTRACE_O_TRACESECCOMP   (1 << PTRACE_EVENT_SECCOMP)
+
+#define PTRACE_O_MASK           0x000000ff
+
+#include <asm/ptrace.h>
+
+
+#endif /* _UAPI_LINUX_PTRACE_H */
diff --git a/include/linux/qnx4_fs.h b/include/uapi/linux/qnx4_fs.h
index 8b9aee1a9ce3..8b9aee1a9ce3 100644
--- a/include/linux/qnx4_fs.h
+++ b/include/uapi/linux/qnx4_fs.h
diff --git a/include/linux/qnxtypes.h b/include/uapi/linux/qnxtypes.h
index bebbe5cc4fb8..bebbe5cc4fb8 100644
--- a/include/linux/qnxtypes.h
+++ b/include/uapi/linux/qnxtypes.h
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
new file mode 100644
index 000000000000..3b6cfbeb086d
--- /dev/null
+++ b/include/uapi/linux/quota.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Elz at The University of Melbourne.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _UAPI_LINUX_QUOTA_
+#define _UAPI_LINUX_QUOTA_
+
+#include <linux/errno.h>
+#include <linux/types.h>
+
+#define __DQUOT_VERSION__       "dquot_6.5.2"
+
+#define MAXQUOTAS 2
+#define USRQUOTA  0             /* element used for user quotas */
+#define GRPQUOTA  1             /* element used for group quotas */
+
+/*
+ * Definitions for the default names of the quotas files.
+ */
+#define INITQFNAMES { \
+        "user",    /* USRQUOTA */ \
+        "group",   /* GRPQUOTA */ \
+        "undefined", \
+};
+
+/*
+ * Command definitions for the 'quotactl' system call.
+ * The commands are broken into a main command defined below
+ * and a subcommand that is used to convey the type of
+ * quota that is being manipulated (see above).
+ */
+#define SUBCMDMASK  0x00ff
+#define SUBCMDSHIFT 8
+#define QCMD(cmd, type)  (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
+
+#define Q_SYNC     0x800001     /* sync disk copy of a filesystems quotas */
+#define Q_QUOTAON  0x800002     /* turn quotas on */
+#define Q_QUOTAOFF 0x800003     /* turn quotas off */
+#define Q_GETFMT   0x800004     /* get quota format used on given filesystem */
+#define Q_GETINFO  0x800005     /* get information about quota files */
+#define Q_SETINFO  0x800006     /* set information about quota files */
+#define Q_GETQUOTA 0x800007     /* get user quota structure */
+#define Q_SETQUOTA 0x800008     /* set user quota structure */
+
+/* Quota format type IDs */
+#define QFMT_VFS_OLD 1
+#define QFMT_VFS_V0 2
+#define QFMT_OCFS2 3
+#define QFMT_VFS_V1 4
+
+/* Size of block in which space limits are passed through the quota
+ * interface */
+#define QIF_DQBLKSIZE_BITS 10
+#define QIF_DQBLKSIZE (1 << QIF_DQBLKSIZE_BITS)
+
+/*
+ * Quota structure used for communication with userspace via quotactl
+ * Following flags are used to specify which fields are valid
+ */
+enum {
+        QIF_BLIMITS_B = 0,
+        QIF_SPACE_B,
+        QIF_ILIMITS_B,
+        QIF_INODES_B,
+        QIF_BTIME_B,
+        QIF_ITIME_B,
+};
+
+#define QIF_BLIMITS     (1 << QIF_BLIMITS_B)
+#define QIF_SPACE       (1 << QIF_SPACE_B)
+#define QIF_ILIMITS     (1 << QIF_ILIMITS_B)
+#define QIF_INODES      (1 << QIF_INODES_B)
+#define QIF_BTIME       (1 << QIF_BTIME_B)
+#define QIF_ITIME       (1 << QIF_ITIME_B)
+#define QIF_LIMITS      (QIF_BLIMITS | QIF_ILIMITS)
+#define QIF_USAGE       (QIF_SPACE | QIF_INODES)
+#define QIF_TIMES       (QIF_BTIME | QIF_ITIME)
+#define QIF_ALL         (QIF_LIMITS | QIF_USAGE | QIF_TIMES)
+
+struct if_dqblk {
+        __u64 dqb_bhardlimit;
+        __u64 dqb_bsoftlimit;
+        __u64 dqb_curspace;
+        __u64 dqb_ihardlimit;
+        __u64 dqb_isoftlimit;
+        __u64 dqb_curinodes;
+        __u64 dqb_btime;
+        __u64 dqb_itime;
+        __u32 dqb_valid;
+};
+
+/*
+ * Structure used for setting quota information about file via quotactl
+ * Following flags are used to specify which fields are valid
+ */
+#define IIF_BGRACE      1
+#define IIF_IGRACE      2
+#define IIF_FLAGS       4
+#define IIF_ALL         (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
+
+struct if_dqinfo {
+        __u64 dqi_bgrace;
+        __u64 dqi_igrace;
+        __u32 dqi_flags;
+        __u32 dqi_valid;
+};
+
+/*
+ * Definitions for quota netlink interface
+ */
+#define QUOTA_NL_NOWARN 0
+#define QUOTA_NL_IHARDWARN 1            /* Inode hardlimit reached */
+#define QUOTA_NL_ISOFTLONGWARN 2        /* Inode grace time expired */
+#define QUOTA_NL_ISOFTWARN 3            /* Inode softlimit reached */
+#define QUOTA_NL_BHARDWARN 4            /* Block hardlimit reached */
+#define QUOTA_NL_BSOFTLONGWARN 5        /* Block grace time expired */
+#define QUOTA_NL_BSOFTWARN 6            /* Block softlimit reached */
+#define QUOTA_NL_IHARDBELOW 7           /* Usage got below inode hardlimit */
+#define QUOTA_NL_ISOFTBELOW 8           /* Usage got below inode softlimit */
+#define QUOTA_NL_BHARDBELOW 9           /* Usage got below block hardlimit */
+#define QUOTA_NL_BSOFTBELOW 10          /* Usage got below block softlimit */
+
+enum {
+        QUOTA_NL_C_UNSPEC,
+        QUOTA_NL_C_WARNING,
+        __QUOTA_NL_C_MAX,
+};
+#define QUOTA_NL_C_MAX (__QUOTA_NL_C_MAX - 1)
+
+enum {
+        QUOTA_NL_A_UNSPEC,
+        QUOTA_NL_A_QTYPE,
+        QUOTA_NL_A_EXCESS_ID,
+        QUOTA_NL_A_WARNING,
+        QUOTA_NL_A_DEV_MAJOR,
+        QUOTA_NL_A_DEV_MINOR,
+        QUOTA_NL_A_CAUSED_ID,
+        __QUOTA_NL_A_MAX,
+};
+#define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
+
+
+#endif /* _UAPI_LINUX_QUOTA_ */
diff --git a/include/linux/radeonfb.h b/include/uapi/linux/radeonfb.h
index 8c4bbdecc44f..8c4bbdecc44f 100644
--- a/include/linux/radeonfb.h
+++ b/include/uapi/linux/radeonfb.h
diff --git a/include/uapi/linux/random.h b/include/uapi/linux/random.h
new file mode 100644
index 000000000000..7471b5b3b8ba
--- /dev/null
+++ b/include/uapi/linux/random.h
@@ -0,0 +1,50 @@
+/*
+ * include/linux/random.h
+ *
+ * Include file for the random number generator.
+ */
+
+#ifndef _UAPI_LINUX_RANDOM_H
+#define _UAPI_LINUX_RANDOM_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/irqnr.h>
+
+/* ioctl()'s for the random number generator */
+
+/* Get the entropy count. */
+#define RNDGETENTCNT    _IOR( 'R', 0x00, int )
+
+/* Add to (or subtract from) the entropy count.  (Superuser only.) */
+#define RNDADDTOENTCNT  _IOW( 'R', 0x01, int )
+
+/* Get the contents of the entropy pool.  (Superuser only.) */
+#define RNDGETPOOL      _IOR( 'R', 0x02, int [2] )
+
+/* 
+ * Write bytes into the entropy pool and add to the entropy count.
+ * (Superuser only.)
+ */
+#define RNDADDENTROPY   _IOW( 'R', 0x03, int [2] )
+
+/* Clear entropy count to 0.  (Superuser only.) */
+#define RNDZAPENTCNT    _IO( 'R', 0x04 )
+
+/* Clear the entropy pool and associated counters.  (Superuser only.) */
+#define RNDCLEARPOOL    _IO( 'R', 0x06 )
+
+struct rand_pool_info {
+        int     entropy_count;
+        int     buf_size;
+        __u32   buf[0];
+};
+
+struct rnd_state {
+        __u32 s1, s2, s3;
+};
+
+/* Exported functions */
+
+
+#endif /* _UAPI_LINUX_RANDOM_H */
diff --git a/include/linux/raw.h b/include/uapi/linux/raw.h
index 62d543e70603..62d543e70603 100644
--- a/include/linux/raw.h
+++ b/include/uapi/linux/raw.h
diff --git a/include/linux/rds.h b/include/uapi/linux/rds.h
index 91950950aa59..91950950aa59 100644
--- a/include/linux/rds.h
+++ b/include/uapi/linux/rds.h
diff --git a/include/uapi/linux/reboot.h b/include/uapi/linux/reboot.h
new file mode 100644
index 000000000000..09d056d4fc50
--- /dev/null
+++ b/include/uapi/linux/reboot.h
@@ -0,0 +1,39 @@
+#ifndef _UAPI_LINUX_REBOOT_H
+#define _UAPI_LINUX_REBOOT_H
+
+/*
+ * Magic values required to use _reboot() system call.
+ */
+
+#define LINUX_REBOOT_MAGIC1     0xfee1dead
+#define LINUX_REBOOT_MAGIC2     672274793
+#define LINUX_REBOOT_MAGIC2A    85072278
+#define LINUX_REBOOT_MAGIC2B    369367448
+#define LINUX_REBOOT_MAGIC2C    537993216
+
+
+/*
+ * Commands accepted by the _reboot() system call.
+ *
+ * RESTART     Restart system using default command and mode.
+ * HALT        Stop OS and give system control to ROM monitor, if any.
+ * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
+ * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
+ * POWER_OFF   Stop OS and remove all power from system, if possible.
+ * RESTART2    Restart system using given command string.
+ * SW_SUSPEND  Suspend system using software suspend if compiled in.
+ * KEXEC       Restart system using a previously loaded Linux kernel
+ */
+
+#define LINUX_REBOOT_CMD_RESTART        0x01234567
+#define LINUX_REBOOT_CMD_HALT           0xCDEF0123
+#define LINUX_REBOOT_CMD_CAD_ON         0x89ABCDEF
+#define LINUX_REBOOT_CMD_CAD_OFF        0x00000000
+#define LINUX_REBOOT_CMD_POWER_OFF      0x4321FEDC
+#define LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
+#define LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
+#define LINUX_REBOOT_CMD_KEXEC          0x45584543
+
+
+
+#endif /* _UAPI_LINUX_REBOOT_H */
diff --git a/include/linux/reiserfs_fs.h b/include/uapi/linux/reiserfs_fs.h
index ea3700cd7367..ea3700cd7367 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/uapi/linux/reiserfs_fs.h
diff --git a/include/linux/reiserfs_xattr.h b/include/uapi/linux/reiserfs_xattr.h
index d8ce17c2459a..d8ce17c2459a 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/uapi/linux/reiserfs_xattr.h
diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h
new file mode 100644
index 000000000000..e0ed28477f48
--- /dev/null
+++ b/include/uapi/linux/resource.h
@@ -0,0 +1,80 @@
+#ifndef _UAPI_LINUX_RESOURCE_H
+#define _UAPI_LINUX_RESOURCE_H
+
+#include <linux/time.h>
+#include <linux/types.h>
+
+/*
+ * Resource control/accounting header file for linux
+ */
+
+/*
+ * Definition of struct rusage taken from BSD 4.3 Reno
+ * 
+ * We don't support all of these yet, but we might as well have them....
+ * Otherwise, each time we add new items, programs which depend on this
+ * structure will lose.  This reduces the chances of that happening.
+ */
+#define RUSAGE_SELF     0
+#define RUSAGE_CHILDREN (-1)
+#define RUSAGE_BOTH     (-2)            /* sys_wait4() uses this */
+#define RUSAGE_THREAD   1               /* only the calling thread */
+
+struct  rusage {
+        struct timeval ru_utime;        /* user time used */
+        struct timeval ru_stime;        /* system time used */
+        long    ru_maxrss;              /* maximum resident set size */
+        long    ru_ixrss;               /* integral shared memory size */
+        long    ru_idrss;               /* integral unshared data size */
+        long    ru_isrss;               /* integral unshared stack size */
+        long    ru_minflt;              /* page reclaims */
+        long    ru_majflt;              /* page faults */
+        long    ru_nswap;               /* swaps */
+        long    ru_inblock;             /* block input operations */
+        long    ru_oublock;             /* block output operations */
+        long    ru_msgsnd;              /* messages sent */
+        long    ru_msgrcv;              /* messages received */
+        long    ru_nsignals;            /* signals received */
+        long    ru_nvcsw;               /* voluntary context switches */
+        long    ru_nivcsw;              /* involuntary " */
+};
+
+struct rlimit {
+        unsigned long   rlim_cur;
+        unsigned long   rlim_max;
+};
+
+#define RLIM64_INFINITY         (~0ULL)
+
+struct rlimit64 {
+        __u64 rlim_cur;
+        __u64 rlim_max;
+};
+
+#define PRIO_MIN        (-20)
+#define PRIO_MAX        20
+
+#define PRIO_PROCESS    0
+#define PRIO_PGRP       1
+#define PRIO_USER       2
+
+/*
+ * Limit the stack by to some sane default: root can always
+ * increase this limit if needed..  8MB seems reasonable.
+ */
+#define _STK_LIM        (8*1024*1024)
+
+/*
+ * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
+ * and other sensitive information are never written to disk.
+ */
+#define MLOCK_LIMIT     ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
+
+/*
+ * Due to binary compatibility, the actual resource numbers
+ * may be different for different linux versions..
+ */
+#include <asm/resource.h>
+
+
+#endif /* _UAPI_LINUX_RESOURCE_H */
diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
new file mode 100644
index 000000000000..2753c6cc9740
--- /dev/null
+++ b/include/uapi/linux/rfkill.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2006 - 2007 Ivo van Doorn
+ * Copyright (C) 2007 Dmitry Torokhov
+ * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef _UAPI__RFKILL_H
+#define _UAPI__RFKILL_H
+
+
+#include <linux/types.h>
+
+/* define userspace visible states */
+#define RFKILL_STATE_SOFT_BLOCKED       0
+#define RFKILL_STATE_UNBLOCKED          1
+#define RFKILL_STATE_HARD_BLOCKED       2
+
+/**
+ * enum rfkill_type - type of rfkill switch.
+ *
+ * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
+ * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
+ * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
+ * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
+ * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
+ * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
+ * @RFKILL_TYPE_GPS: switch is on a GPS device.
+ * @RFKILL_TYPE_FM: switch is on a FM radio device.
+ * @NUM_RFKILL_TYPES: number of defined rfkill types
+ */
+enum rfkill_type {
+        RFKILL_TYPE_ALL = 0,
+        RFKILL_TYPE_WLAN,
+        RFKILL_TYPE_BLUETOOTH,
+        RFKILL_TYPE_UWB,
+        RFKILL_TYPE_WIMAX,
+        RFKILL_TYPE_WWAN,
+        RFKILL_TYPE_GPS,
+        RFKILL_TYPE_FM,
+        NUM_RFKILL_TYPES,
+};
+
+/**
+ * enum rfkill_operation - operation types
+ * @RFKILL_OP_ADD: a device was added
+ * @RFKILL_OP_DEL: a device was removed
+ * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
+ * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
+ */
+enum rfkill_operation {
+        RFKILL_OP_ADD = 0,
+        RFKILL_OP_DEL,
+        RFKILL_OP_CHANGE,
+        RFKILL_OP_CHANGE_ALL,
+};
+
+/**
+ * struct rfkill_event - events for userspace on /dev/rfkill
+ * @idx: index of dev rfkill
+ * @type: type of the rfkill struct
+ * @op: operation code
+ * @hard: hard state (0/1)
+ * @soft: soft state (0/1)
+ *
+ * Structure used for userspace communication on /dev/rfkill,
+ * used for events from the kernel and control to the kernel.
+ */
+struct rfkill_event {
+        __u32 idx;
+        __u8  type;
+        __u8  op;
+        __u8  soft, hard;
+} __attribute__((packed));
+
+/*
+ * We are planning to be backward and forward compatible with changes
+ * to the event struct, by adding new, optional, members at the end.
+ * When reading an event (whether the kernel from userspace or vice
+ * versa) we need to accept anything that's at least as large as the
+ * version 1 event size, but might be able to accept other sizes in
+ * the future.
+ *
+ * One exception is the kernel -- we already have two event sizes in
+ * that we've made the 'hard' member optional since our only option
+ * is to ignore it anyway.
+ */
+#define RFKILL_EVENT_SIZE_V1    8
+
+/* ioctl for turning off rfkill-input (if present) */
+#define RFKILL_IOC_MAGIC        'R'
+#define RFKILL_IOC_NOINPUT      1
+#define RFKILL_IOCTL_NOINPUT    _IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
+
+/* and that's all userspace gets */
+
+#endif /* _UAPI__RFKILL_H */
diff --git a/include/linux/romfs_fs.h b/include/uapi/linux/romfs_fs.h
index 5f57f93b284f..5f57f93b284f 100644
--- a/include/linux/romfs_fs.h
+++ b/include/uapi/linux/romfs_fs.h
diff --git a/include/linux/rose.h b/include/uapi/linux/rose.h
index 1fcfe95893b8..1fcfe95893b8 100644
--- a/include/linux/rose.h
+++ b/include/uapi/linux/rose.h
diff --git a/include/linux/route.h b/include/uapi/linux/route.h
index 6600708311c8..6600708311c8 100644
--- a/include/linux/route.h
+++ b/include/uapi/linux/route.h
diff --git a/include/uapi/linux/rtc.h b/include/uapi/linux/rtc.h
new file mode 100644
index 000000000000..f8c82e6f25d5
--- /dev/null
+++ b/include/uapi/linux/rtc.h
@@ -0,0 +1,107 @@
+/*
+ * Generic RTC interface.
+ * This version contains the part of the user interface to the Real Time Clock
+ * service. It is used with both the legacy mc146818 and also  EFI
+ * Struct rtc_time and first 12 ioctl by Paul Gortmaker, 1996 - separated out
+ * from <linux/mc146818rtc.h> to this file for 2.4 kernels.
+ *
+ * Copyright (C) 1999 Hewlett-Packard Co.
+ * Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com>
+ */
+#ifndef _UAPI_LINUX_RTC_H_
+#define _UAPI_LINUX_RTC_H_
+
+/*
+ * The struct used to pass data via the following ioctl. Similar to the
+ * struct tm in <time.h>, but it needs to be here so that the kernel
+ * source is self contained, allowing cross-compiles, etc. etc.
+ */
+
+struct rtc_time {
+        int tm_sec;
+        int tm_min;
+        int tm_hour;
+        int tm_mday;
+        int tm_mon;
+        int tm_year;
+        int tm_wday;
+        int tm_yday;
+        int tm_isdst;
+};
+
+/*
+ * This data structure is inspired by the EFI (v0.92) wakeup
+ * alarm API.
+ */
+struct rtc_wkalrm {
+        unsigned char enabled;  /* 0 = alarm disabled, 1 = alarm enabled */
+        unsigned char pending;  /* 0 = alarm not pending, 1 = alarm pending */
+        struct rtc_time time;   /* time the alarm is set to */
+};
+
+/*
+ * Data structure to control PLL correction some better RTC feature
+ * pll_value is used to get or set current value of correction,
+ * the rest of the struct is used to query HW capabilities.
+ * This is modeled after the RTC used in Q40/Q60 computers but
+ * should be sufficiently flexible for other devices
+ *
+ * +ve pll_value means clock will run faster by
+ *   pll_value*pll_posmult/pll_clock
+ * -ve pll_value means clock will run slower by
+ *   pll_value*pll_negmult/pll_clock
+ */
+
+struct rtc_pll_info {
+        int pll_ctrl;       /* placeholder for fancier control */
+        int pll_value;      /* get/set correction value */
+        int pll_max;        /* max +ve (faster) adjustment value */
+        int pll_min;        /* max -ve (slower) adjustment value */
+        int pll_posmult;    /* factor for +ve correction */
+        int pll_negmult;    /* factor for -ve correction */
+        long pll_clock;     /* base PLL frequency */
+};
+
+/*
+ * ioctl calls that are permitted to the /dev/rtc interface, if
+ * any of the RTC drivers are enabled.
+ */
+
+#define RTC_AIE_ON      _IO('p', 0x01)  /* Alarm int. enable on         */
+#define RTC_AIE_OFF     _IO('p', 0x02)  /* ... off                      */
+#define RTC_UIE_ON      _IO('p', 0x03)  /* Update int. enable on        */
+#define RTC_UIE_OFF     _IO('p', 0x04)  /* ... off                      */
+#define RTC_PIE_ON      _IO('p', 0x05)  /* Periodic int. enable on      */
+#define RTC_PIE_OFF     _IO('p', 0x06)  /* ... off                      */
+#define RTC_WIE_ON      _IO('p', 0x0f)  /* Watchdog int. enable on      */
+#define RTC_WIE_OFF     _IO('p', 0x10)  /* ... off                      */
+
+#define RTC_ALM_SET     _IOW('p', 0x07, struct rtc_time) /* Set alarm time  */
+#define RTC_ALM_READ    _IOR('p', 0x08, struct rtc_time) /* Read alarm time */
+#define RTC_RD_TIME     _IOR('p', 0x09, struct rtc_time) /* Read RTC time   */
+#define RTC_SET_TIME    _IOW('p', 0x0a, struct rtc_time) /* Set RTC time    */
+#define RTC_IRQP_READ   _IOR('p', 0x0b, unsigned long)   /* Read IRQ rate   */
+#define RTC_IRQP_SET    _IOW('p', 0x0c, unsigned long)   /* Set IRQ rate    */
+#define RTC_EPOCH_READ  _IOR('p', 0x0d, unsigned long)   /* Read epoch      */
+#define RTC_EPOCH_SET   _IOW('p', 0x0e, unsigned long)   /* Set epoch       */
+
+#define RTC_WKALM_SET   _IOW('p', 0x0f, struct rtc_wkalrm)/* Set wakeup alarm*/
+#define RTC_WKALM_RD    _IOR('p', 0x10, struct rtc_wkalrm)/* Get wakeup alarm*/
+
+#define RTC_PLL_GET     _IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */
+#define RTC_PLL_SET     _IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
+
+#define RTC_VL_READ     _IOR('p', 0x13, int)    /* Voltage low detector */
+#define RTC_VL_CLR      _IO('p', 0x14)          /* Clear voltage low information */
+
+/* interrupt flags */
+#define RTC_IRQF 0x80   /* Any of the following is active */
+#define RTC_PF 0x40     /* Periodic interrupt */
+#define RTC_AF 0x20     /* Alarm interrupt */
+#define RTC_UF 0x10     /* Update interrupt for 1Hz RTC */
+
+
+#define RTC_MAX_FREQ    8192
+
+
+#endif /* _UAPI_LINUX_RTC_H_ */
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
new file mode 100644
index 000000000000..fcd768b09f6e
--- /dev/null
+++ b/include/uapi/linux/rtnetlink.h
@@ -0,0 +1,612 @@
+#ifndef _UAPI__LINUX_RTNETLINK_H
+#define _UAPI__LINUX_RTNETLINK_H
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+#include <linux/if_link.h>
+#include <linux/if_addr.h>
+#include <linux/neighbour.h>
+
+/* rtnetlink families. Values up to 127 are reserved for real address
+ * families, values above 128 may be used arbitrarily.
+ */
+#define RTNL_FAMILY_IPMR                128
+#define RTNL_FAMILY_IP6MR               129
+#define RTNL_FAMILY_MAX                 129
+
+/****
+ *              Routing/neighbour discovery messages.
+ ****/
+
+/* Types of messages */
+
+enum {
+        RTM_BASE        = 16,
+#define RTM_BASE        RTM_BASE
+
+        RTM_NEWLINK     = 16,
+#define RTM_NEWLINK     RTM_NEWLINK
+        RTM_DELLINK,
+#define RTM_DELLINK     RTM_DELLINK
+        RTM_GETLINK,
+#define RTM_GETLINK     RTM_GETLINK
+        RTM_SETLINK,
+#define RTM_SETLINK     RTM_SETLINK
+
+        RTM_NEWADDR     = 20,
+#define RTM_NEWADDR     RTM_NEWADDR
+        RTM_DELADDR,
+#define RTM_DELADDR     RTM_DELADDR
+        RTM_GETADDR,
+#define RTM_GETADDR     RTM_GETADDR
+
+        RTM_NEWROUTE    = 24,
+#define RTM_NEWROUTE    RTM_NEWROUTE
+        RTM_DELROUTE,
+#define RTM_DELROUTE    RTM_DELROUTE
+        RTM_GETROUTE,
+#define RTM_GETROUTE    RTM_GETROUTE
+
+        RTM_NEWNEIGH    = 28,
+#define RTM_NEWNEIGH    RTM_NEWNEIGH
+        RTM_DELNEIGH,
+#define RTM_DELNEIGH    RTM_DELNEIGH
+        RTM_GETNEIGH,
+#define RTM_GETNEIGH    RTM_GETNEIGH
+
+        RTM_NEWRULE     = 32,
+#define RTM_NEWRULE     RTM_NEWRULE
+        RTM_DELRULE,
+#define RTM_DELRULE     RTM_DELRULE
+        RTM_GETRULE,
+#define RTM_GETRULE     RTM_GETRULE
+
+        RTM_NEWQDISC    = 36,
+#define RTM_NEWQDISC    RTM_NEWQDISC
+        RTM_DELQDISC,
+#define RTM_DELQDISC    RTM_DELQDISC
+        RTM_GETQDISC,
+#define RTM_GETQDISC    RTM_GETQDISC
+
+        RTM_NEWTCLASS   = 40,
+#define RTM_NEWTCLASS   RTM_NEWTCLASS
+        RTM_DELTCLASS,
+#define RTM_DELTCLASS   RTM_DELTCLASS
+        RTM_GETTCLASS,
+#define RTM_GETTCLASS   RTM_GETTCLASS
+
+        RTM_NEWTFILTER  = 44,
+#define RTM_NEWTFILTER  RTM_NEWTFILTER
+        RTM_DELTFILTER,
+#define RTM_DELTFILTER  RTM_DELTFILTER
+        RTM_GETTFILTER,
+#define RTM_GETTFILTER  RTM_GETTFILTER
+
+        RTM_NEWACTION   = 48,
+#define RTM_NEWACTION   RTM_NEWACTION
+        RTM_DELACTION,
+#define RTM_DELACTION   RTM_DELACTION
+        RTM_GETACTION,
+#define RTM_GETACTION   RTM_GETACTION
+
+        RTM_NEWPREFIX   = 52,
+#define RTM_NEWPREFIX   RTM_NEWPREFIX
+
+        RTM_GETMULTICAST = 58,
+#define RTM_GETMULTICAST RTM_GETMULTICAST
+
+        RTM_GETANYCAST  = 62,
+#define RTM_GETANYCAST  RTM_GETANYCAST
+
+        RTM_NEWNEIGHTBL = 64,
+#define RTM_NEWNEIGHTBL RTM_NEWNEIGHTBL
+        RTM_GETNEIGHTBL = 66,
+#define RTM_GETNEIGHTBL RTM_GETNEIGHTBL
+        RTM_SETNEIGHTBL,
+#define RTM_SETNEIGHTBL RTM_SETNEIGHTBL
+
+        RTM_NEWNDUSEROPT = 68,
+#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
+
+        RTM_NEWADDRLABEL = 72,
+#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
+        RTM_DELADDRLABEL,
+#define RTM_DELADDRLABEL RTM_DELADDRLABEL
+        RTM_GETADDRLABEL,
+#define RTM_GETADDRLABEL RTM_GETADDRLABEL
+
+        RTM_GETDCB = 78,
+#define RTM_GETDCB RTM_GETDCB
+        RTM_SETDCB,
+#define RTM_SETDCB RTM_SETDCB
+
+        __RTM_MAX,
+#define RTM_MAX         (((__RTM_MAX + 3) & ~3) - 1)
+};
+
+#define RTM_NR_MSGTYPES (RTM_MAX + 1 - RTM_BASE)
+#define RTM_NR_FAMILIES (RTM_NR_MSGTYPES >> 2)
+#define RTM_FAM(cmd)    (((cmd) - RTM_BASE) >> 2)
+
+/* 
+   Generic structure for encapsulation of optional route information.
+   It is reminiscent of sockaddr, but with sa_family replaced
+   with attribute type.
+ */
+
+struct rtattr {
+        unsigned short  rta_len;
+        unsigned short  rta_type;
+};
+
+/* Macros to handle rtattributes */
+
+#define RTA_ALIGNTO     4
+#define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
+#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \
+                         (rta)->rta_len >= sizeof(struct rtattr) && \
+                         (rta)->rta_len <= (len))
+#define RTA_NEXT(rta,attrlen)   ((attrlen) -= RTA_ALIGN((rta)->rta_len), \
+                                 (struct rtattr*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len)))
+#define RTA_LENGTH(len) (RTA_ALIGN(sizeof(struct rtattr)) + (len))
+#define RTA_SPACE(len)  RTA_ALIGN(RTA_LENGTH(len))
+#define RTA_DATA(rta)   ((void*)(((char*)(rta)) + RTA_LENGTH(0)))
+#define RTA_PAYLOAD(rta) ((int)((rta)->rta_len) - RTA_LENGTH(0))
+
+
+
+
+/******************************************************************************
+ *              Definitions used in routing table administration.
+ ****/
+
+struct rtmsg {
+        unsigned char           rtm_family;
+        unsigned char           rtm_dst_len;
+        unsigned char           rtm_src_len;
+        unsigned char           rtm_tos;
+
+        unsigned char           rtm_table;      /* Routing table id */
+        unsigned char           rtm_protocol;   /* Routing protocol; see below  */
+        unsigned char           rtm_scope;      /* See below */ 
+        unsigned char           rtm_type;       /* See below    */
+
+        unsigned                rtm_flags;
+};
+
+/* rtm_type */
+
+enum {
+        RTN_UNSPEC,
+        RTN_UNICAST,            /* Gateway or direct route      */
+        RTN_LOCAL,              /* Accept locally               */
+        RTN_BROADCAST,          /* Accept locally as broadcast,
+                                   send as broadcast */
+        RTN_ANYCAST,            /* Accept locally as broadcast,
+                                   but send as unicast */
+        RTN_MULTICAST,          /* Multicast route              */
+        RTN_BLACKHOLE,          /* Drop                         */
+        RTN_UNREACHABLE,        /* Destination is unreachable   */
+        RTN_PROHIBIT,           /* Administratively prohibited  */
+        RTN_THROW,              /* Not in this table            */
+        RTN_NAT,                /* Translate this address       */
+        RTN_XRESOLVE,           /* Use external resolver        */
+        __RTN_MAX
+};
+
+#define RTN_MAX (__RTN_MAX - 1)
+
+
+/* rtm_protocol */
+
+#define RTPROT_UNSPEC   0
+#define RTPROT_REDIRECT 1       /* Route installed by ICMP redirects;
+                                   not used by current IPv4 */
+#define RTPROT_KERNEL   2       /* Route installed by kernel            */
+#define RTPROT_BOOT     3       /* Route installed during boot          */
+#define RTPROT_STATIC   4       /* Route installed by administrator     */
+
+/* Values of protocol >= RTPROT_STATIC are not interpreted by kernel;
+   they are just passed from user and back as is.
+   It will be used by hypothetical multiple routing daemons.
+   Note that protocol values should be standardized in order to
+   avoid conflicts.
+ */
+
+#define RTPROT_GATED    8       /* Apparently, GateD */
+#define RTPROT_RA       9       /* RDISC/ND router advertisements */
+#define RTPROT_MRT      10      /* Merit MRT */
+#define RTPROT_ZEBRA    11      /* Zebra */
+#define RTPROT_BIRD     12      /* BIRD */
+#define RTPROT_DNROUTED 13      /* DECnet routing daemon */
+#define RTPROT_XORP     14      /* XORP */
+#define RTPROT_NTK      15      /* Netsukuku */
+#define RTPROT_DHCP     16      /* DHCP client */
+
+/* rtm_scope
+
+   Really it is not scope, but sort of distance to the destination.
+   NOWHERE are reserved for not existing destinations, HOST is our
+   local addresses, LINK are destinations, located on directly attached
+   link and UNIVERSE is everywhere in the Universe.
+
+   Intermediate values are also possible f.e. interior routes
+   could be assigned a value between UNIVERSE and LINK.
+*/
+
+enum rt_scope_t {
+        RT_SCOPE_UNIVERSE=0,
+/* User defined values  */
+        RT_SCOPE_SITE=200,
+        RT_SCOPE_LINK=253,
+        RT_SCOPE_HOST=254,
+        RT_SCOPE_NOWHERE=255
+};
+
+/* rtm_flags */
+
+#define RTM_F_NOTIFY            0x100   /* Notify user of route change  */
+#define RTM_F_CLONED            0x200   /* This route is cloned         */
+#define RTM_F_EQUALIZE          0x400   /* Multipath equalizer: NI      */
+#define RTM_F_PREFIX            0x800   /* Prefix addresses             */
+
+/* Reserved table identifiers */
+
+enum rt_class_t {
+        RT_TABLE_UNSPEC=0,
+/* User defined values */
+        RT_TABLE_COMPAT=252,
+        RT_TABLE_DEFAULT=253,
+        RT_TABLE_MAIN=254,
+        RT_TABLE_LOCAL=255,
+        RT_TABLE_MAX=0xFFFFFFFF
+};
+
+
+/* Routing message attributes */
+
+enum rtattr_type_t {
+        RTA_UNSPEC,
+        RTA_DST,
+        RTA_SRC,
+        RTA_IIF,
+        RTA_OIF,
+        RTA_GATEWAY,
+        RTA_PRIORITY,
+        RTA_PREFSRC,
+        RTA_METRICS,
+        RTA_MULTIPATH,
+        RTA_PROTOINFO, /* no longer used */
+        RTA_FLOW,
+        RTA_CACHEINFO,
+        RTA_SESSION, /* no longer used */
+        RTA_MP_ALGO, /* no longer used */
+        RTA_TABLE,
+        RTA_MARK,
+        __RTA_MAX
+};
+
+#define RTA_MAX (__RTA_MAX - 1)
+
+#define RTM_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg))))
+#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
+
+/* RTM_MULTIPATH --- array of struct rtnexthop.
+ *
+ * "struct rtnexthop" describes all necessary nexthop information,
+ * i.e. parameters of path to a destination via this nexthop.
+ *
+ * At the moment it is impossible to set different prefsrc, mtu, window
+ * and rtt for different paths from multipath.
+ */
+
+struct rtnexthop {
+        unsigned short          rtnh_len;
+        unsigned char           rtnh_flags;
+        unsigned char           rtnh_hops;
+        int                     rtnh_ifindex;
+};
+
+/* rtnh_flags */
+
+#define RTNH_F_DEAD             1       /* Nexthop is dead (used by multipath)  */
+#define RTNH_F_PERVASIVE        2       /* Do recursive gateway lookup  */
+#define RTNH_F_ONLINK           4       /* Gateway is forced on link    */
+
+/* Macros to handle hexthops */
+
+#define RTNH_ALIGNTO    4
+#define RTNH_ALIGN(len) ( ((len)+RTNH_ALIGNTO-1) & ~(RTNH_ALIGNTO-1) )
+#define RTNH_OK(rtnh,len) ((rtnh)->rtnh_len >= sizeof(struct rtnexthop) && \
+                           ((int)(rtnh)->rtnh_len) <= (len))
+#define RTNH_NEXT(rtnh) ((struct rtnexthop*)(((char*)(rtnh)) + RTNH_ALIGN((rtnh)->rtnh_len)))
+#define RTNH_LENGTH(len) (RTNH_ALIGN(sizeof(struct rtnexthop)) + (len))
+#define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
+#define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
+
+/* RTM_CACHEINFO */
+
+struct rta_cacheinfo {
+        __u32   rta_clntref;
+        __u32   rta_lastuse;
+        __s32   rta_expires;
+        __u32   rta_error;
+        __u32   rta_used;
+
+#define RTNETLINK_HAVE_PEERINFO 1
+        __u32   rta_id;
+        __u32   rta_ts;
+        __u32   rta_tsage;
+};
+
+/* RTM_METRICS --- array of struct rtattr with types of RTAX_* */
+
+enum {
+        RTAX_UNSPEC,
+#define RTAX_UNSPEC RTAX_UNSPEC
+        RTAX_LOCK,
+#define RTAX_LOCK RTAX_LOCK
+        RTAX_MTU,
+#define RTAX_MTU RTAX_MTU
+        RTAX_WINDOW,
+#define RTAX_WINDOW RTAX_WINDOW
+        RTAX_RTT,
+#define RTAX_RTT RTAX_RTT
+        RTAX_RTTVAR,
+#define RTAX_RTTVAR RTAX_RTTVAR
+        RTAX_SSTHRESH,
+#define RTAX_SSTHRESH RTAX_SSTHRESH
+        RTAX_CWND,
+#define RTAX_CWND RTAX_CWND
+        RTAX_ADVMSS,
+#define RTAX_ADVMSS RTAX_ADVMSS
+        RTAX_REORDERING,
+#define RTAX_REORDERING RTAX_REORDERING
+        RTAX_HOPLIMIT,
+#define RTAX_HOPLIMIT RTAX_HOPLIMIT
+        RTAX_INITCWND,
+#define RTAX_INITCWND RTAX_INITCWND
+        RTAX_FEATURES,
+#define RTAX_FEATURES RTAX_FEATURES
+        RTAX_RTO_MIN,
+#define RTAX_RTO_MIN RTAX_RTO_MIN
+        RTAX_INITRWND,
+#define RTAX_INITRWND RTAX_INITRWND
+        __RTAX_MAX
+};
+
+#define RTAX_MAX (__RTAX_MAX - 1)
+
+#define RTAX_FEATURE_ECN        0x00000001
+#define RTAX_FEATURE_SACK       0x00000002
+#define RTAX_FEATURE_TIMESTAMP  0x00000004
+#define RTAX_FEATURE_ALLFRAG    0x00000008
+
+struct rta_session {
+        __u8    proto;
+        __u8    pad1;
+        __u16   pad2;
+
+        union {
+                struct {
+                        __u16   sport;
+                        __u16   dport;
+                } ports;
+
+                struct {
+                        __u8    type;
+                        __u8    code;
+                        __u16   ident;
+                } icmpt;
+
+                __u32           spi;
+        } u;
+};
+
+/****
+ *              General form of address family dependent message.
+ ****/
+
+struct rtgenmsg {
+        unsigned char           rtgen_family;
+};
+
+/*****************************************************************
+ *              Link layer specific messages.
+ ****/
+
+/* struct ifinfomsg
+ * passes link level specific information, not dependent
+ * on network protocol.
+ */
+
+struct ifinfomsg {
+        unsigned char   ifi_family;
+        unsigned char   __ifi_pad;
+        unsigned short  ifi_type;               /* ARPHRD_* */
+        int             ifi_index;              /* Link index   */
+        unsigned        ifi_flags;              /* IFF_* flags  */
+        unsigned        ifi_change;             /* IFF_* change mask */
+};
+
+/********************************************************************
+ *              prefix information 
+ ****/
+
+struct prefixmsg {
+        unsigned char   prefix_family;
+        unsigned char   prefix_pad1;
+        unsigned short  prefix_pad2;
+        int             prefix_ifindex;
+        unsigned char   prefix_type;
+        unsigned char   prefix_len;
+        unsigned char   prefix_flags;
+        unsigned char   prefix_pad3;
+};
+
+enum 
+{
+        PREFIX_UNSPEC,
+        PREFIX_ADDRESS,
+        PREFIX_CACHEINFO,
+        __PREFIX_MAX
+};
+
+#define PREFIX_MAX      (__PREFIX_MAX - 1)
+
+struct prefix_cacheinfo {
+        __u32   preferred_time;
+        __u32   valid_time;
+};
+
+
+/*****************************************************************
+ *              Traffic control messages.
+ ****/
+
+struct tcmsg {
+        unsigned char   tcm_family;
+        unsigned char   tcm__pad1;
+        unsigned short  tcm__pad2;
+        int             tcm_ifindex;
+        __u32           tcm_handle;
+        __u32           tcm_parent;
+        __u32           tcm_info;
+};
+
+enum {
+        TCA_UNSPEC,
+        TCA_KIND,
+        TCA_OPTIONS,
+        TCA_STATS,
+        TCA_XSTATS,
+        TCA_RATE,
+        TCA_FCNT,
+        TCA_STATS2,
+        TCA_STAB,
+        __TCA_MAX
+};
+
+#define TCA_MAX (__TCA_MAX - 1)
+
+#define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
+#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
+
+/********************************************************************
+ *              Neighbor Discovery userland options
+ ****/
+
+struct nduseroptmsg {
+        unsigned char   nduseropt_family;
+        unsigned char   nduseropt_pad1;
+        unsigned short  nduseropt_opts_len;     /* Total length of options */
+        int             nduseropt_ifindex;
+        __u8            nduseropt_icmp_type;
+        __u8            nduseropt_icmp_code;
+        unsigned short  nduseropt_pad2;
+        unsigned int    nduseropt_pad3;
+        /* Followed by one or more ND options */
+};
+
+enum {
+        NDUSEROPT_UNSPEC,
+        NDUSEROPT_SRCADDR,
+        __NDUSEROPT_MAX
+};
+
+#define NDUSEROPT_MAX   (__NDUSEROPT_MAX - 1)
+
+#ifndef __KERNEL__
+/* RTnetlink multicast groups - backwards compatibility for userspace */
+#define RTMGRP_LINK             1
+#define RTMGRP_NOTIFY           2
+#define RTMGRP_NEIGH            4
+#define RTMGRP_TC               8
+
+#define RTMGRP_IPV4_IFADDR      0x10
+#define RTMGRP_IPV4_MROUTE      0x20
+#define RTMGRP_IPV4_ROUTE       0x40
+#define RTMGRP_IPV4_RULE        0x80
+
+#define RTMGRP_IPV6_IFADDR      0x100
+#define RTMGRP_IPV6_MROUTE      0x200
+#define RTMGRP_IPV6_ROUTE       0x400
+#define RTMGRP_IPV6_IFINFO      0x800
+
+#define RTMGRP_DECnet_IFADDR    0x1000
+#define RTMGRP_DECnet_ROUTE     0x4000
+
+#define RTMGRP_IPV6_PREFIX      0x20000
+#endif
+
+/* RTnetlink multicast groups */
+enum rtnetlink_groups {
+        RTNLGRP_NONE,
+#define RTNLGRP_NONE            RTNLGRP_NONE
+        RTNLGRP_LINK,
+#define RTNLGRP_LINK            RTNLGRP_LINK
+        RTNLGRP_NOTIFY,
+#define RTNLGRP_NOTIFY          RTNLGRP_NOTIFY
+        RTNLGRP_NEIGH,
+#define RTNLGRP_NEIGH           RTNLGRP_NEIGH
+        RTNLGRP_TC,
+#define RTNLGRP_TC              RTNLGRP_TC
+        RTNLGRP_IPV4_IFADDR,
+#define RTNLGRP_IPV4_IFADDR     RTNLGRP_IPV4_IFADDR
+        RTNLGRP_IPV4_MROUTE,
+#define RTNLGRP_IPV4_MROUTE     RTNLGRP_IPV4_MROUTE
+        RTNLGRP_IPV4_ROUTE,
+#define RTNLGRP_IPV4_ROUTE      RTNLGRP_IPV4_ROUTE
+        RTNLGRP_IPV4_RULE,
+#define RTNLGRP_IPV4_RULE       RTNLGRP_IPV4_RULE
+        RTNLGRP_IPV6_IFADDR,
+#define RTNLGRP_IPV6_IFADDR     RTNLGRP_IPV6_IFADDR
+        RTNLGRP_IPV6_MROUTE,
+#define RTNLGRP_IPV6_MROUTE     RTNLGRP_IPV6_MROUTE
+        RTNLGRP_IPV6_ROUTE,
+#define RTNLGRP_IPV6_ROUTE      RTNLGRP_IPV6_ROUTE
+        RTNLGRP_IPV6_IFINFO,
+#define RTNLGRP_IPV6_IFINFO     RTNLGRP_IPV6_IFINFO
+        RTNLGRP_DECnet_IFADDR,
+#define RTNLGRP_DECnet_IFADDR   RTNLGRP_DECnet_IFADDR
+        RTNLGRP_NOP2,
+        RTNLGRP_DECnet_ROUTE,
+#define RTNLGRP_DECnet_ROUTE    RTNLGRP_DECnet_ROUTE
+        RTNLGRP_DECnet_RULE,
+#define RTNLGRP_DECnet_RULE     RTNLGRP_DECnet_RULE
+        RTNLGRP_NOP4,
+        RTNLGRP_IPV6_PREFIX,
+#define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
+        RTNLGRP_IPV6_RULE,
+#define RTNLGRP_IPV6_RULE       RTNLGRP_IPV6_RULE
+        RTNLGRP_ND_USEROPT,
+#define RTNLGRP_ND_USEROPT      RTNLGRP_ND_USEROPT
+        RTNLGRP_PHONET_IFADDR,
+#define RTNLGRP_PHONET_IFADDR   RTNLGRP_PHONET_IFADDR
+        RTNLGRP_PHONET_ROUTE,
+#define RTNLGRP_PHONET_ROUTE    RTNLGRP_PHONET_ROUTE
+        RTNLGRP_DCB,
+#define RTNLGRP_DCB             RTNLGRP_DCB
+        __RTNLGRP_MAX
+};
+#define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
+
+/* TC action piece */
+struct tcamsg {
+        unsigned char   tca_family;
+        unsigned char   tca__pad1;
+        unsigned short  tca__pad2;
+};
+#define TA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))
+#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
+#define TCA_ACT_TAB 1 /* attr type must be >=1 */       
+#define TCAA_MAX 1
+
+/* New extended info filters for IFLA_EXT_MASK */
+#define RTEXT_FILTER_VF         (1 << 0)
+
+/* End of information exported to user level */
+
+
+
+#endif /* _UAPI__LINUX_RTNETLINK_H */
diff --git a/include/uapi/linux/scc.h b/include/uapi/linux/scc.h
new file mode 100644
index 000000000000..72b6b8153374
--- /dev/null
+++ b/include/uapi/linux/scc.h
@@ -0,0 +1,172 @@
+/* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */
+
+#ifndef _UAPI_SCC_H
+#define _UAPI_SCC_H
+
+
+/* selection of hardware types */
+
+#define PA0HZP          0x00    /* hardware type for PA0HZP SCC card and compatible */
+#define EAGLE           0x01    /* hardware type for EAGLE card */
+#define PC100           0x02    /* hardware type for PC100 card */
+#define PRIMUS          0x04    /* hardware type for PRIMUS-PC (DG9BL) card */
+#define DRSI            0x08    /* hardware type for DRSI PC*Packet card */
+#define BAYCOM          0x10    /* hardware type for BayCom (U)SCC */
+
+/* DEV ioctl() commands */
+
+enum SCC_ioctl_cmds {
+        SIOCSCCRESERVED = SIOCDEVPRIVATE,
+        SIOCSCCCFG,
+        SIOCSCCINI,
+        SIOCSCCCHANINI,
+        SIOCSCCSMEM,
+        SIOCSCCGKISS,
+        SIOCSCCSKISS,
+        SIOCSCCGSTAT,
+        SIOCSCCCAL
+};
+
+/* Device parameter control (from WAMPES) */
+
+enum L1_params {
+        PARAM_DATA,
+        PARAM_TXDELAY,
+        PARAM_PERSIST,
+        PARAM_SLOTTIME,
+        PARAM_TXTAIL,
+        PARAM_FULLDUP,
+        PARAM_SOFTDCD,          /* was: PARAM_HW */
+        PARAM_MUTE,             /* ??? */
+        PARAM_DTR,
+        PARAM_RTS,
+        PARAM_SPEED,
+        PARAM_ENDDELAY,         /* ??? */
+        PARAM_GROUP,
+        PARAM_IDLE,
+        PARAM_MIN,
+        PARAM_MAXKEY,
+        PARAM_WAIT,
+        PARAM_MAXDEFER,
+        PARAM_TX,
+        PARAM_HWEVENT = 31,
+        PARAM_RETURN = 255      /* reset kiss mode */
+};
+
+/* fulldup parameter */
+
+enum FULLDUP_modes {
+        KISS_DUPLEX_HALF,       /* normal CSMA operation */
+        KISS_DUPLEX_FULL,       /* fullduplex, key down trx after transmission */
+        KISS_DUPLEX_LINK,       /* fullduplex, key down trx after 'idletime' sec */
+        KISS_DUPLEX_OPTIMA      /* fullduplex, let the protocol layer control the hw */
+};
+
+/* misc. parameters */
+
+#define TIMER_OFF       65535U  /* to switch off timers */
+#define NO_SUCH_PARAM   65534U  /* param not implemented */
+
+/* HWEVENT parameter */
+
+enum HWEVENT_opts {
+        HWEV_DCD_ON,
+        HWEV_DCD_OFF,
+        HWEV_ALL_SENT
+};
+
+/* channel grouping */
+
+#define RXGROUP         0100    /* if set, only tx when all channels clear */
+#define TXGROUP         0200    /* if set, don't transmit simultaneously */
+
+/* Tx/Rx clock sources */
+
+enum CLOCK_sources {
+        CLK_DPLL,       /* normal halfduplex operation */
+        CLK_EXTERNAL,   /* external clocking (G3RUH/DF9IC modems) */
+        CLK_DIVIDER,    /* Rx = DPLL, Tx = divider (fullduplex with */
+                        /* modems without clock regeneration */
+        CLK_BRG         /* experimental fullduplex mode with DPLL/BRG for */
+                        /* MODEMs without clock recovery */
+};
+
+/* Tx state */
+
+enum TX_state {
+        TXS_IDLE,       /* Transmitter off, no data pending */
+        TXS_BUSY,       /* waiting for permission to send / tailtime */
+        TXS_ACTIVE,     /* Transmitter on, sending data */
+        TXS_NEWFRAME,   /* reset CRC and send (next) frame */
+        TXS_IDLE2,      /* Transmitter on, no data pending */
+        TXS_WAIT,       /* Waiting for Mintime to expire */
+        TXS_TIMEOUT     /* We had a transmission timeout */
+};
+
+typedef unsigned long io_port;  /* type definition for an 'io port address' */
+
+/* SCC statistical information */
+
+struct scc_stat {
+        long rxints;            /* Receiver interrupts */
+        long txints;            /* Transmitter interrupts */
+        long exints;            /* External/status interrupts */
+        long spints;            /* Special receiver interrupts */
+
+        long txframes;          /* Packets sent */
+        long rxframes;          /* Number of Frames Actually Received */
+        long rxerrs;            /* CRC Errors */
+        long txerrs;            /* KISS errors */
+        
+        unsigned int nospace;   /* "Out of buffers" */
+        unsigned int rx_over;   /* Receiver Overruns */
+        unsigned int tx_under;  /* Transmitter Underruns */
+
+        unsigned int tx_state;  /* Transmitter state */
+        int tx_queued;          /* tx frames enqueued */
+
+        unsigned int maxqueue;  /* allocated tx_buffers */
+        unsigned int bufsize;   /* used buffersize */
+};
+
+struct scc_modem {
+        long speed;             /* Line speed, bps */
+        char clocksrc;          /* 0 = DPLL, 1 = external, 2 = divider */
+        char nrz;               /* NRZ instead of NRZI */       
+};
+
+struct scc_kiss_cmd {
+        int      command;       /* one of the KISS-Commands defined above */
+        unsigned param;         /* KISS-Param */
+};
+
+struct scc_hw_config {
+        io_port data_a;         /* data port channel A */
+        io_port ctrl_a;         /* control port channel A */
+        io_port data_b;         /* data port channel B */
+        io_port ctrl_b;         /* control port channel B */
+        io_port vector_latch;   /* INTACK-Latch (#) */
+        io_port special;        /* special function port */
+
+        int     irq;            /* irq */
+        long    clock;          /* clock */
+        char    option;         /* command for function port */
+
+        char brand;             /* hardware type */
+        char escc;              /* use ext. features of a 8580/85180/85280 */
+};
+
+/* (#) only one INTACK latch allowed. */
+
+
+struct scc_mem_config {
+        unsigned int dummy;
+        unsigned int bufsize;
+};
+
+struct scc_calibrate {
+        unsigned int time;
+        unsigned char pattern;
+};
+
+#endif /* _UAPI_SCC_H */
diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h
new file mode 100644
index 000000000000..5a0f945927ac
--- /dev/null
+++ b/include/uapi/linux/sched.h
@@ -0,0 +1,46 @@
+#ifndef _UAPI_LINUX_SCHED_H
+#define _UAPI_LINUX_SCHED_H
+
+/*
+ * cloning flags:
+ */
+#define CSIGNAL         0x000000ff      /* signal mask to be sent at exit */
+#define CLONE_VM        0x00000100      /* set if VM shared between processes */
+#define CLONE_FS        0x00000200      /* set if fs info shared between processes */
+#define CLONE_FILES     0x00000400      /* set if open files shared between processes */
+#define CLONE_SIGHAND   0x00000800      /* set if signal handlers and blocked signals shared */
+#define CLONE_PTRACE    0x00002000      /* set if we want to let tracing continue on the child too */
+#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
+#define CLONE_PARENT    0x00008000      /* set if we want to have the same parent as the cloner */
+#define CLONE_THREAD    0x00010000      /* Same thread group? */
+#define CLONE_NEWNS     0x00020000      /* New namespace group? */
+#define CLONE_SYSVSEM   0x00040000      /* share system V SEM_UNDO semantics */
+#define CLONE_SETTLS    0x00080000      /* create a new TLS for the child */
+#define CLONE_PARENT_SETTID     0x00100000      /* set the TID in the parent */
+#define CLONE_CHILD_CLEARTID    0x00200000      /* clear the TID in the child */
+#define CLONE_DETACHED          0x00400000      /* Unused, ignored */
+#define CLONE_UNTRACED          0x00800000      /* set if the tracing process can't force CLONE_PTRACE on this clone */
+#define CLONE_CHILD_SETTID      0x01000000      /* set the TID in the child */
+/* 0x02000000 was previously the unused CLONE_STOPPED (Start in stopped state)
+   and is now available for re-use. */
+#define CLONE_NEWUTS            0x04000000      /* New utsname group? */
+#define CLONE_NEWIPC            0x08000000      /* New ipcs */
+#define CLONE_NEWUSER           0x10000000      /* New user namespace */
+#define CLONE_NEWPID            0x20000000      /* New pid namespace */
+#define CLONE_NEWNET            0x40000000      /* New network namespace */
+#define CLONE_IO                0x80000000      /* Clone io context */
+
+/*
+ * Scheduling policies
+ */
+#define SCHED_NORMAL            0
+#define SCHED_FIFO              1
+#define SCHED_RR                2
+#define SCHED_BATCH             3
+/* SCHED_ISO: reserved but not implemented yet */
+#define SCHED_IDLE              5
+/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */
+#define SCHED_RESET_ON_FORK     0x40000000
+
+
+#endif /* _UAPI_LINUX_SCHED_H */
diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
new file mode 100644
index 000000000000..7530e7447620
--- /dev/null
+++ b/include/uapi/linux/screen_info.h
@@ -0,0 +1,74 @@
+#ifndef _UAPI_SCREEN_INFO_H
+#define _UAPI_SCREEN_INFO_H
+
+#include <linux/types.h>
+
+/*
+ * These are set up by the setup-routine at boot-time:
+ */
+
+struct screen_info {
+        __u8  orig_x;           /* 0x00 */
+        __u8  orig_y;           /* 0x01 */
+        __u16 ext_mem_k;        /* 0x02 */
+        __u16 orig_video_page;  /* 0x04 */
+        __u8  orig_video_mode;  /* 0x06 */
+        __u8  orig_video_cols;  /* 0x07 */
+        __u8  flags;            /* 0x08 */
+        __u8  unused2;          /* 0x09 */
+        __u16 orig_video_ega_bx;/* 0x0a */
+        __u16 unused3;          /* 0x0c */
+        __u8  orig_video_lines; /* 0x0e */
+        __u8  orig_video_isVGA; /* 0x0f */
+        __u16 orig_video_points;/* 0x10 */
+
+        /* VESA graphic mode -- linear frame buffer */
+        __u16 lfb_width;        /* 0x12 */
+        __u16 lfb_height;       /* 0x14 */
+        __u16 lfb_depth;        /* 0x16 */
+        __u32 lfb_base;         /* 0x18 */
+        __u32 lfb_size;         /* 0x1c */
+        __u16 cl_magic, cl_offset; /* 0x20 */
+        __u16 lfb_linelength;   /* 0x24 */
+        __u8  red_size;         /* 0x26 */
+        __u8  red_pos;          /* 0x27 */
+        __u8  green_size;       /* 0x28 */
+        __u8  green_pos;        /* 0x29 */
+        __u8  blue_size;        /* 0x2a */
+        __u8  blue_pos;         /* 0x2b */
+        __u8  rsvd_size;        /* 0x2c */
+        __u8  rsvd_pos;         /* 0x2d */
+        __u16 vesapm_seg;       /* 0x2e */
+        __u16 vesapm_off;       /* 0x30 */
+        __u16 pages;            /* 0x32 */
+        __u16 vesa_attributes;  /* 0x34 */
+        __u32 capabilities;     /* 0x36 */
+        __u8  _reserved[6];     /* 0x3a */
+} __attribute__((packed));
+
+#define VIDEO_TYPE_MDA          0x10    /* Monochrome Text Display      */
+#define VIDEO_TYPE_CGA          0x11    /* CGA Display                  */
+#define VIDEO_TYPE_EGAM         0x20    /* EGA/VGA in Monochrome Mode   */
+#define VIDEO_TYPE_EGAC         0x21    /* EGA in Color Mode            */
+#define VIDEO_TYPE_VGAC         0x22    /* VGA+ in Color Mode           */
+#define VIDEO_TYPE_VLFB         0x23    /* VESA VGA in graphic mode     */
+
+#define VIDEO_TYPE_PICA_S3      0x30    /* ACER PICA-61 local S3 video  */
+#define VIDEO_TYPE_MIPS_G364    0x31    /* MIPS Magnum 4000 G364 video  */
+#define VIDEO_TYPE_SGI          0x33    /* Various SGI graphics hardware */
+
+#define VIDEO_TYPE_TGAC         0x40    /* DEC TGA */
+
+#define VIDEO_TYPE_SUN          0x50    /* Sun frame buffer. */
+#define VIDEO_TYPE_SUNPCI       0x51    /* Sun PCI based frame buffer. */
+
+#define VIDEO_TYPE_PMAC         0x60    /* PowerMacintosh frame buffer. */
+
+#define VIDEO_TYPE_EFI          0x70    /* EFI graphic mode             */
+
+#define VIDEO_FLAGS_NOCURSOR    (1 << 0) /* The video mode has no cursor set */
+
+#define VIDEO_CAPABILITY_SKIP_QUIRKS    (1 << 0)
+
+
+#endif /* _UAPI_SCREEN_INFO_H */
diff --git a/include/uapi/linux/sdla.h b/include/uapi/linux/sdla.h
new file mode 100644
index 000000000000..95eaff9c9e49
--- /dev/null
+++ b/include/uapi/linux/sdla.h
@@ -0,0 +1,116 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Global definitions for the Frame relay interface.
+ *
+ * Version:     @(#)if_ifrad.h  0.20    13 Apr 96
+ *
+ * Author:      Mike McLagan <mike.mclagan@linux.org>
+ *
+ * Changes:
+ *              0.15    Mike McLagan    Structure packing
+ *
+ *              0.20    Mike McLagan    New flags for S508 buffer handling
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _UAPISDLA_H
+#define _UAPISDLA_H
+
+/* adapter type */
+#define SDLA_TYPES
+#define SDLA_S502A                      5020
+#define SDLA_S502E                      5021
+#define SDLA_S503                       5030
+#define SDLA_S507                       5070
+#define SDLA_S508                       5080
+#define SDLA_S509                       5090
+#define SDLA_UNKNOWN                    -1
+
+/* port selection flags for the S508 */
+#define SDLA_S508_PORT_V35              0x00
+#define SDLA_S508_PORT_RS232            0x02
+
+/* Z80 CPU speeds */
+#define SDLA_CPU_3M                     0x00
+#define SDLA_CPU_5M                     0x01
+#define SDLA_CPU_7M                     0x02
+#define SDLA_CPU_8M                     0x03
+#define SDLA_CPU_10M                    0x04
+#define SDLA_CPU_16M                    0x05
+#define SDLA_CPU_12M                    0x06
+
+/* some private IOCTLs */
+#define SDLA_IDENTIFY                   (FRAD_LAST_IOCTL + 1)
+#define SDLA_CPUSPEED                   (FRAD_LAST_IOCTL + 2)
+#define SDLA_PROTOCOL                   (FRAD_LAST_IOCTL + 3)
+
+#define SDLA_CLEARMEM                   (FRAD_LAST_IOCTL + 4)
+#define SDLA_WRITEMEM                   (FRAD_LAST_IOCTL + 5)
+#define SDLA_READMEM                    (FRAD_LAST_IOCTL + 6)
+
+struct sdla_mem {
+   int  addr;
+   int  len;
+   void __user *data;
+};
+
+#define SDLA_START                      (FRAD_LAST_IOCTL + 7)
+#define SDLA_STOP                       (FRAD_LAST_IOCTL + 8)
+
+/* some offsets in the Z80's memory space */
+#define SDLA_NMIADDR                    0x0000
+#define SDLA_CONF_ADDR                  0x0010
+#define SDLA_S502A_NMIADDR              0x0066
+#define SDLA_CODE_BASEADDR              0x0100
+#define SDLA_WINDOW_SIZE                0x2000
+#define SDLA_ADDR_MASK                  0x1FFF
+
+/* largest handleable block of data */
+#define SDLA_MAX_DATA                   4080
+#define SDLA_MAX_MTU                    4072    /* MAX_DATA - sizeof(fradhdr) */
+#define SDLA_MAX_DLCI                   24
+
+/* this should be the same as frad_conf */
+struct sdla_conf {
+   short station;
+   short config;
+   short kbaud;
+   short clocking;
+   short max_frm;
+   short T391;
+   short T392;
+   short N391;
+   short N392;
+   short N393;
+   short CIR_fwd;
+   short Bc_fwd;
+   short Be_fwd;
+   short CIR_bwd;
+   short Bc_bwd;
+   short Be_bwd;
+};
+
+/* this should be the same as dlci_conf */
+struct sdla_dlci_conf {
+   short config;
+   short CIR_fwd;
+   short Bc_fwd;
+   short Be_fwd;
+   short CIR_bwd;
+   short Bc_bwd;
+   short Be_bwd; 
+   short Tc_fwd;
+   short Tc_bwd;
+   short Tf_max;
+   short Tb_max;
+};
+
+
+#endif /* _UAPISDLA_H */
diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h
new file mode 100644
index 000000000000..ac2dc9f72973
--- /dev/null
+++ b/include/uapi/linux/seccomp.h
@@ -0,0 +1,47 @@
+#ifndef _UAPI_LINUX_SECCOMP_H
+#define _UAPI_LINUX_SECCOMP_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+
+/* Valid values for seccomp.mode and prctl(PR_SET_SECCOMP, <mode>) */
+#define SECCOMP_MODE_DISABLED   0 /* seccomp is not in use. */
+#define SECCOMP_MODE_STRICT     1 /* uses hard-coded filter. */
+#define SECCOMP_MODE_FILTER     2 /* uses user-supplied filter. */
+
+/*
+ * All BPF programs must return a 32-bit value.
+ * The bottom 16-bits are for optional return data.
+ * The upper 16-bits are ordered from least permissive values to most.
+ *
+ * The ordering ensures that a min_t() over composed return values always
+ * selects the least permissive choice.
+ */
+#define SECCOMP_RET_KILL        0x00000000U /* kill the task immediately */
+#define SECCOMP_RET_TRAP        0x00030000U /* disallow and force a SIGSYS */
+#define SECCOMP_RET_ERRNO       0x00050000U /* returns an errno */
+#define SECCOMP_RET_TRACE       0x7ff00000U /* pass to a tracer or disallow */
+#define SECCOMP_RET_ALLOW       0x7fff0000U /* allow */
+
+/* Masks for the return value sections. */
+#define SECCOMP_RET_ACTION      0x7fff0000U
+#define SECCOMP_RET_DATA        0x0000ffffU
+
+/**
+ * struct seccomp_data - the format the BPF program executes over.
+ * @nr: the system call number
+ * @arch: indicates system call convention as an AUDIT_ARCH_* value
+ *        as defined in <linux/audit.h>.
+ * @instruction_pointer: at the time of the system call.
+ * @args: up to 6 system call arguments always stored as 64-bit values
+ *        regardless of the architecture.
+ */
+struct seccomp_data {
+        int nr;
+        __u32 arch;
+        __u64 instruction_pointer;
+        __u64 args[6];
+};
+
+#endif /* _UAPI_LINUX_SECCOMP_H */
diff --git a/include/uapi/linux/securebits.h b/include/uapi/linux/securebits.h
new file mode 100644
index 000000000000..985aac9e6bf8
--- /dev/null
+++ b/include/uapi/linux/securebits.h
@@ -0,0 +1,51 @@
+#ifndef _UAPI_LINUX_SECUREBITS_H
+#define _UAPI_LINUX_SECUREBITS_H
+
+/* Each securesetting is implemented using two bits. One bit specifies
+   whether the setting is on or off. The other bit specify whether the
+   setting is locked or not. A setting which is locked cannot be
+   changed from user-level. */
+#define issecure_mask(X)        (1 << (X))
+
+#define SECUREBITS_DEFAULT 0x00000000
+
+/* When set UID 0 has no special privileges. When unset, we support
+   inheritance of root-permissions and suid-root executable under
+   compatibility mode. We raise the effective and inheritable bitmasks
+   *of the executable file* if the effective uid of the new process is
+   0. If the real uid is 0, we raise the effective (legacy) bit of the
+   executable file. */
+#define SECURE_NOROOT                   0
+#define SECURE_NOROOT_LOCKED            1  /* make bit-0 immutable */
+
+#define SECBIT_NOROOT           (issecure_mask(SECURE_NOROOT))
+#define SECBIT_NOROOT_LOCKED    (issecure_mask(SECURE_NOROOT_LOCKED))
+
+/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
+   When unset, to provide compatiblility with old programs relying on
+   set*uid to gain/lose privilege, transitions to/from uid 0 cause
+   capabilities to be gained/lost. */
+#define SECURE_NO_SETUID_FIXUP          2
+#define SECURE_NO_SETUID_FIXUP_LOCKED   3  /* make bit-2 immutable */
+
+#define SECBIT_NO_SETUID_FIXUP  (issecure_mask(SECURE_NO_SETUID_FIXUP))
+#define SECBIT_NO_SETUID_FIXUP_LOCKED \
+                        (issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
+
+/* When set, a process can retain its capabilities even after
+   transitioning to a non-root user (the set-uid fixup suppressed by
+   bit 2). Bit-4 is cleared when a process calls exec(); setting both
+   bit 4 and 5 will create a barrier through exec that no exec()'d
+   child can use this feature again. */
+#define SECURE_KEEP_CAPS                4
+#define SECURE_KEEP_CAPS_LOCKED         5  /* make bit-4 immutable */
+
+#define SECBIT_KEEP_CAPS        (issecure_mask(SECURE_KEEP_CAPS))
+#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
+
+#define SECURE_ALL_BITS         (issecure_mask(SECURE_NOROOT) | \
+                                 issecure_mask(SECURE_NO_SETUID_FIXUP) | \
+                                 issecure_mask(SECURE_KEEP_CAPS))
+#define SECURE_ALL_LOCKS        (SECURE_ALL_BITS << 1)
+
+#endif /* _UAPI_LINUX_SECUREBITS_H */
diff --git a/include/linux/selinux_netlink.h b/include/uapi/linux/selinux_netlink.h
index d239797785cf..d239797785cf 100644
--- a/include/linux/selinux_netlink.h
+++ b/include/uapi/linux/selinux_netlink.h
diff --git a/include/uapi/linux/sem.h b/include/uapi/linux/sem.h
new file mode 100644
index 000000000000..541fce03b50c
--- /dev/null
+++ b/include/uapi/linux/sem.h
@@ -0,0 +1,80 @@
+#ifndef _UAPI_LINUX_SEM_H
+#define _UAPI_LINUX_SEM_H
+
+#include <linux/ipc.h>
+
+/* semop flags */
+#define SEM_UNDO        0x1000  /* undo the operation on exit */
+
+/* semctl Command Definitions. */
+#define GETPID  11       /* get sempid */
+#define GETVAL  12       /* get semval */
+#define GETALL  13       /* get all semval's */
+#define GETNCNT 14       /* get semncnt */
+#define GETZCNT 15       /* get semzcnt */
+#define SETVAL  16       /* set semval */
+#define SETALL  17       /* set all semval's */
+
+/* ipcs ctl cmds */
+#define SEM_STAT 18
+#define SEM_INFO 19
+
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
+struct semid_ds {
+        struct ipc_perm sem_perm;               /* permissions .. see ipc.h */
+        __kernel_time_t sem_otime;              /* last semop time */
+        __kernel_time_t sem_ctime;              /* last change time */
+        struct sem      *sem_base;              /* ptr to first semaphore in array */
+        struct sem_queue *sem_pending;          /* pending operations to be processed */
+        struct sem_queue **sem_pending_last;    /* last pending operation */
+        struct sem_undo *undo;                  /* undo requests on this array */
+        unsigned short  sem_nsems;              /* no. of semaphores in array */
+};
+
+/* Include the definition of semid64_ds */
+#include <asm/sembuf.h>
+
+/* semop system calls takes an array of these. */
+struct sembuf {
+        unsigned short  sem_num;        /* semaphore index in array */
+        short           sem_op;         /* semaphore operation */
+        short           sem_flg;        /* operation flags */
+};
+
+/* arg for semctl system calls. */
+union semun {
+        int val;                        /* value for SETVAL */
+        struct semid_ds __user *buf;    /* buffer for IPC_STAT & IPC_SET */
+        unsigned short __user *array;   /* array for GETALL & SETALL */
+        struct seminfo __user *__buf;   /* buffer for IPC_INFO */
+        void __user *__pad;
+};
+
+struct  seminfo {
+        int semmap;
+        int semmni;
+        int semmns;
+        int semmnu;
+        int semmsl;
+        int semopm;
+        int semume;
+        int semusz;
+        int semvmx;
+        int semaem;
+};
+
+#define SEMMNI  128             /* <= IPCMNI  max # of semaphore identifiers */
+#define SEMMSL  250             /* <= 8 000 max num of semaphores per id */
+#define SEMMNS  (SEMMNI*SEMMSL) /* <= INT_MAX max # of semaphores in system */
+#define SEMOPM  32              /* <= 1 000 max num of ops per semop call */
+#define SEMVMX  32767           /* <= 32767 semaphore maximum value */
+#define SEMAEM  SEMVMX          /* adjust on exit max value */
+
+/* unused */
+#define SEMUME  SEMOPM          /* max num of undo entries per process */
+#define SEMMNU  SEMMNS          /* num of undo structures system wide */
+#define SEMMAP  SEMMNS          /* # of entries in semaphore map */
+#define SEMUSZ  20              /* sizeof struct sem_undo */
+
+
+#endif /* _UAPI_LINUX_SEM_H */
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
new file mode 100644
index 000000000000..5e0d0ed61cf3
--- /dev/null
+++ b/include/uapi/linux/serial.h
@@ -0,0 +1,126 @@
+/*
+ * include/linux/serial.h
+ *
+ * Copyright (C) 1992 by Theodore Ts'o.
+ * 
+ * Redistribution of this file is permitted under the terms of the GNU 
+ * Public License (GPL)
+ */
+
+#ifndef _UAPI_LINUX_SERIAL_H
+#define _UAPI_LINUX_SERIAL_H
+
+#include <linux/types.h>
+
+#include <linux/tty_flags.h>
+
+
+struct serial_struct {
+        int     type;
+        int     line;
+        unsigned int    port;
+        int     irq;
+        int     flags;
+        int     xmit_fifo_size;
+        int     custom_divisor;
+        int     baud_base;
+        unsigned short  close_delay;
+        char    io_type;
+        char    reserved_char[1];
+        int     hub6;
+        unsigned short  closing_wait; /* time to wait before closing */
+        unsigned short  closing_wait2; /* no longer used... */
+        unsigned char   *iomem_base;
+        unsigned short  iomem_reg_shift;
+        unsigned int    port_high;
+        unsigned long   iomap_base;     /* cookie passed into ioremap */
+};
+
+/*
+ * For the close wait times, 0 means wait forever for serial port to
+ * flush its output.  65535 means don't wait at all.
+ */
+#define ASYNC_CLOSING_WAIT_INF  0
+#define ASYNC_CLOSING_WAIT_NONE 65535
+
+/*
+ * These are the supported serial types.
+ */
+#define PORT_UNKNOWN    0
+#define PORT_8250       1
+#define PORT_16450      2
+#define PORT_16550      3
+#define PORT_16550A     4
+#define PORT_CIRRUS     5       /* usurped by cyclades.c */
+#define PORT_16650      6
+#define PORT_16650V2    7
+#define PORT_16750      8
+#define PORT_STARTECH   9       /* usurped by cyclades.c */
+#define PORT_16C950     10      /* Oxford Semiconductor */
+#define PORT_16654      11
+#define PORT_16850      12
+#define PORT_RSA        13      /* RSA-DV II/S card */
+#define PORT_MAX        13
+
+#define SERIAL_IO_PORT  0
+#define SERIAL_IO_HUB6  1
+#define SERIAL_IO_MEM   2
+
+#define UART_CLEAR_FIFO         0x01
+#define UART_USE_FIFO           0x02
+#define UART_STARTECH           0x04
+#define UART_NATSEMI            0x08
+
+
+/*
+ * Multiport serial configuration structure --- external structure
+ */
+struct serial_multiport_struct {
+        int             irq;
+        int             port1;
+        unsigned char   mask1, match1;
+        int             port2;
+        unsigned char   mask2, match2;
+        int             port3;
+        unsigned char   mask3, match3;
+        int             port4;
+        unsigned char   mask4, match4;
+        int             port_monitor;
+        int     reserved[32];
+};
+
+/*
+ * Serial input interrupt line counters -- external structure
+ * Four lines can interrupt: CTS, DSR, RI, DCD
+ */
+struct serial_icounter_struct {
+        int cts, dsr, rng, dcd;
+        int rx, tx;
+        int frame, overrun, parity, brk;
+        int buf_overrun;
+        int reserved[9];
+};
+
+/*
+ * Serial interface for controlling RS485 settings on chips with suitable
+ * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
+ * platform. The set function returns the new state, with any unsupported bits
+ * reverted appropriately.
+ */
+
+struct serial_rs485 {
+        __u32   flags;                  /* RS485 feature flags */
+#define SER_RS485_ENABLED               (1 << 0)        /* If enabled */
+#define SER_RS485_RTS_ON_SEND           (1 << 1)        /* Logical level for
+                                                           RTS pin when
+                                                           sending */
+#define SER_RS485_RTS_AFTER_SEND        (1 << 2)        /* Logical level for
+                                                           RTS pin after sent*/
+#define SER_RS485_RX_DURING_TX          (1 << 4)
+        __u32   delay_rts_before_send;  /* Delay before send (milliseconds) */
+        __u32   delay_rts_after_send;   /* Delay after send (milliseconds) */
+        __u32   padding[5];             /* Memory is cheap, new structs
+                                           are a royal PITA .. */
+};
+
+#endif /* _UAPI_LINUX_SERIAL_H */
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
new file mode 100644
index 000000000000..7e1ab20adc03
--- /dev/null
+++ b/include/uapi/linux/serial_core.h
@@ -0,0 +1,219 @@
+/*
+ *  linux/drivers/char/serial_core.h
+ *
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _UAPILINUX_SERIAL_CORE_H
+#define _UAPILINUX_SERIAL_CORE_H
+
+#include <linux/serial.h>
+
+/*
+ * The type definitions.  These are from Ted Ts'o's serial.h
+ */
+#define PORT_UNKNOWN    0
+#define PORT_8250       1
+#define PORT_16450      2
+#define PORT_16550      3
+#define PORT_16550A     4
+#define PORT_CIRRUS     5
+#define PORT_16650      6
+#define PORT_16650V2    7
+#define PORT_16750      8
+#define PORT_STARTECH   9
+#define PORT_16C950     10
+#define PORT_16654      11
+#define PORT_16850      12
+#define PORT_RSA        13
+#define PORT_NS16550A   14
+#define PORT_XSCALE     15
+#define PORT_RM9000     16      /* PMC-Sierra RM9xxx internal UART */
+#define PORT_OCTEON     17      /* Cavium OCTEON internal UART */
+#define PORT_AR7        18      /* Texas Instruments AR7 internal UART */
+#define PORT_U6_16550A  19      /* ST-Ericsson U6xxx internal UART */
+#define PORT_TEGRA      20      /* NVIDIA Tegra internal UART */
+#define PORT_XR17D15X   21      /* Exar XR17D15x UART */
+#define PORT_LPC3220    22      /* NXP LPC32xx SoC "Standard" UART */
+#define PORT_8250_CIR   23      /* CIR infrared port, has its own driver */
+#define PORT_MAX_8250   23      /* max port ID */
+
+/*
+ * ARM specific type numbers.  These are not currently guaranteed
+ * to be implemented, and will change in the future.  These are
+ * separate so any additions to the old serial.c that occur before
+ * we are merged can be easily merged here.
+ */
+#define PORT_PXA        31
+#define PORT_AMBA       32
+#define PORT_CLPS711X   33
+#define PORT_SA1100     34
+#define PORT_UART00     35
+#define PORT_21285      37
+
+/* Sparc type numbers.  */
+#define PORT_SUNZILOG   38
+#define PORT_SUNSAB     39
+
+/* DEC */
+#define PORT_DZ         46
+#define PORT_ZS         47
+
+/* Parisc type numbers. */
+#define PORT_MUX        48
+
+/* Atmel AT91 / AT32 SoC */
+#define PORT_ATMEL      49
+
+/* Macintosh Zilog type numbers */
+#define PORT_MAC_ZILOG  50      /* m68k : not yet implemented */
+#define PORT_PMAC_ZILOG 51
+
+/* SH-SCI */
+#define PORT_SCI        52
+#define PORT_SCIF       53
+#define PORT_IRDA       54
+
+/* Samsung S3C2410 SoC and derivatives thereof */
+#define PORT_S3C2410    55
+
+/* SGI IP22 aka Indy / Challenge S / Indigo 2 */
+#define PORT_IP22ZILOG  56
+
+/* Sharp LH7a40x -- an ARM9 SoC series */
+#define PORT_LH7A40X    57
+
+/* PPC CPM type number */
+#define PORT_CPM        58
+
+/* MPC52xx (and MPC512x) type numbers */
+#define PORT_MPC52xx    59
+
+/* IBM icom */
+#define PORT_ICOM       60
+
+/* Samsung S3C2440 SoC */
+#define PORT_S3C2440    61
+
+/* Motorola i.MX SoC */
+#define PORT_IMX        62
+
+/* Marvell MPSC */
+#define PORT_MPSC       63
+
+/* TXX9 type number */
+#define PORT_TXX9       64
+
+/* NEC VR4100 series SIU/DSIU */
+#define PORT_VR41XX_SIU         65
+#define PORT_VR41XX_DSIU        66
+
+/* Samsung S3C2400 SoC */
+#define PORT_S3C2400    67
+
+/* M32R SIO */
+#define PORT_M32R_SIO   68
+
+/*Digi jsm */
+#define PORT_JSM        69
+
+#define PORT_PNX8XXX    70
+
+/* Hilscher netx */
+#define PORT_NETX       71
+
+/* SUN4V Hypervisor Console */
+#define PORT_SUNHV      72
+
+#define PORT_S3C2412    73
+
+/* Xilinx uartlite */
+#define PORT_UARTLITE   74
+
+/* Blackfin bf5xx */
+#define PORT_BFIN       75
+
+/* Micrel KS8695 */
+#define PORT_KS8695     76
+
+/* Broadcom SB1250, etc. SOC */
+#define PORT_SB1250_DUART       77
+
+/* Freescale ColdFire */
+#define PORT_MCF        78
+
+/* Blackfin SPORT */
+#define PORT_BFIN_SPORT         79
+
+/* MN10300 on-chip UART numbers */
+#define PORT_MN10300            80
+#define PORT_MN10300_CTS        81
+
+#define PORT_SC26XX     82
+
+/* SH-SCI */
+#define PORT_SCIFA      83
+
+#define PORT_S3C6400    84
+
+/* NWPSERIAL */
+#define PORT_NWPSERIAL  85
+
+/* MAX3100 */
+#define PORT_MAX3100    86
+
+/* Timberdale UART */
+#define PORT_TIMBUART   87
+
+/* Qualcomm MSM SoCs */
+#define PORT_MSM        88
+
+/* BCM63xx family SoCs */
+#define PORT_BCM63XX    89
+
+/* Aeroflex Gaisler GRLIB APBUART */
+#define PORT_APBUART    90
+
+/* Altera UARTs */
+#define PORT_ALTERA_JTAGUART    91
+#define PORT_ALTERA_UART        92
+
+/* SH-SCI */
+#define PORT_SCIFB      93
+
+/* MAX310X */
+#define PORT_MAX310X    94
+
+/* High Speed UART for Medfield */
+#define PORT_MFD        95
+
+/* TI OMAP-UART */
+#define PORT_OMAP       96
+
+/* VIA VT8500 SoC */
+#define PORT_VT8500     97
+
+/* Xilinx PSS UART */
+#define PORT_XUARTPS    98
+
+/* Atheros AR933X SoC */
+#define PORT_AR933X     99
+
+/* Energy Micro efm32 SoC */
+#define PORT_EFMUART   100
+
+
+#endif /* _UAPILINUX_SERIAL_CORE_H */
diff --git a/include/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
index 5ed325e88a81..5ed325e88a81 100644
--- a/include/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h
new file mode 100644
index 000000000000..9f53fa7fc132
--- /dev/null
+++ b/include/uapi/linux/serio.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 1999-2002 Vojtech Pavlik
+*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_SERIO_H
+#define _UAPI_SERIO_H
+
+
+#include <linux/ioctl.h>
+
+#define SPIOCSTYPE      _IOW('q', 0x01, unsigned long)
+
+
+/*
+ * bit masks for use in "interrupt" flags (3rd argument)
+ */
+#define SERIO_TIMEOUT   1
+#define SERIO_PARITY    2
+#define SERIO_FRAME     4
+
+/*
+ * Serio types
+ */
+#define SERIO_XT        0x00
+#define SERIO_8042      0x01
+#define SERIO_RS232     0x02
+#define SERIO_HIL_MLC   0x03
+#define SERIO_PS_PSTHRU 0x05
+#define SERIO_8042_XL   0x06
+
+/*
+ * Serio protocols
+ */
+#define SERIO_UNKNOWN   0x00
+#define SERIO_MSC       0x01
+#define SERIO_SUN       0x02
+#define SERIO_MS        0x03
+#define SERIO_MP        0x04
+#define SERIO_MZ        0x05
+#define SERIO_MZP       0x06
+#define SERIO_MZPP      0x07
+#define SERIO_VSXXXAA   0x08
+#define SERIO_SUNKBD    0x10
+#define SERIO_WARRIOR   0x18
+#define SERIO_SPACEORB  0x19
+#define SERIO_MAGELLAN  0x1a
+#define SERIO_SPACEBALL 0x1b
+#define SERIO_GUNZE     0x1c
+#define SERIO_IFORCE    0x1d
+#define SERIO_STINGER   0x1e
+#define SERIO_NEWTON    0x1f
+#define SERIO_STOWAWAY  0x20
+#define SERIO_H3600     0x21
+#define SERIO_PS2SER    0x22
+#define SERIO_TWIDKBD   0x23
+#define SERIO_TWIDJOY   0x24
+#define SERIO_HIL       0x25
+#define SERIO_SNES232   0x26
+#define SERIO_SEMTECH   0x27
+#define SERIO_LKKBD     0x28
+#define SERIO_ELO       0x29
+#define SERIO_MICROTOUCH        0x30
+#define SERIO_PENMOUNT  0x31
+#define SERIO_TOUCHRIGHT        0x32
+#define SERIO_TOUCHWIN  0x33
+#define SERIO_TAOSEVM   0x34
+#define SERIO_FUJITSU   0x35
+#define SERIO_ZHENHUA   0x36
+#define SERIO_INEXIO    0x37
+#define SERIO_TOUCHIT213        0x38
+#define SERIO_W8001     0x39
+#define SERIO_DYNAPRO   0x3a
+#define SERIO_HAMPSHIRE 0x3b
+#define SERIO_PS2MULT   0x3c
+#define SERIO_TSC40     0x3d
+
+#endif /* _UAPI_SERIO_H */
diff --git a/include/uapi/linux/shm.h b/include/uapi/linux/shm.h
new file mode 100644
index 000000000000..ec36fa1a83a4
--- /dev/null
+++ b/include/uapi/linux/shm.h
@@ -0,0 +1,79 @@
+#ifndef _UAPI_LINUX_SHM_H_
+#define _UAPI_LINUX_SHM_H_
+
+#include <linux/ipc.h>
+#include <linux/errno.h>
+#ifndef __KERNEL__
+#include <unistd.h>
+#endif
+
+/*
+ * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can
+ * be increased by sysctl
+ */
+
+#define SHMMAX 0x2000000                 /* max shared seg size (bytes) */
+#define SHMMIN 1                         /* min shared seg size (bytes) */
+#define SHMMNI 4096                      /* max num of segs system wide */
+#ifndef __KERNEL__
+#define SHMALL (SHMMAX/getpagesize()*(SHMMNI/16))
+#endif
+#define SHMSEG SHMMNI                    /* max shared segs per process */
+
+
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
+struct shmid_ds {
+        struct ipc_perm         shm_perm;       /* operation perms */
+        int                     shm_segsz;      /* size of segment (bytes) */
+        __kernel_time_t         shm_atime;      /* last attach time */
+        __kernel_time_t         shm_dtime;      /* last detach time */
+        __kernel_time_t         shm_ctime;      /* last change time */
+        __kernel_ipc_pid_t      shm_cpid;       /* pid of creator */
+        __kernel_ipc_pid_t      shm_lpid;       /* pid of last operator */
+        unsigned short          shm_nattch;     /* no. of current attaches */
+        unsigned short          shm_unused;     /* compatibility */
+        void                    *shm_unused2;   /* ditto - used by DIPC */
+        void                    *shm_unused3;   /* unused */
+};
+
+/* Include the definition of shmid64_ds and shminfo64 */
+#include <asm/shmbuf.h>
+
+/* permission flag for shmget */
+#define SHM_R           0400    /* or S_IRUGO from <linux/stat.h> */
+#define SHM_W           0200    /* or S_IWUGO from <linux/stat.h> */
+
+/* mode for attach */
+#define SHM_RDONLY      010000  /* read-only access */
+#define SHM_RND         020000  /* round attach address to SHMLBA boundary */
+#define SHM_REMAP       040000  /* take-over region on attach */
+#define SHM_EXEC        0100000 /* execution access */
+
+/* super user shmctl commands */
+#define SHM_LOCK        11
+#define SHM_UNLOCK      12
+
+/* ipcs ctl commands */
+#define SHM_STAT        13
+#define SHM_INFO        14
+
+/* Obsolete, used only for backwards compatibility */
+struct  shminfo {
+        int shmmax;
+        int shmmin;
+        int shmmni;
+        int shmseg;
+        int shmall;
+};
+
+struct shm_info {
+        int used_ids;
+        unsigned long shm_tot;  /* total allocated shm */
+        unsigned long shm_rss;  /* total resident shm */
+        unsigned long shm_swp;  /* total swapped shm */
+        unsigned long swap_attempts;
+        unsigned long swap_successes;
+};
+
+
+#endif /* _UAPI_LINUX_SHM_H_ */
diff --git a/include/uapi/linux/signal.h b/include/uapi/linux/signal.h
new file mode 100644
index 000000000000..dff452ed6d00
--- /dev/null
+++ b/include/uapi/linux/signal.h
@@ -0,0 +1,8 @@
+#ifndef _UAPI_LINUX_SIGNAL_H
+#define _UAPI_LINUX_SIGNAL_H
+
+#include <asm/signal.h>
+#include <asm/siginfo.h>
+
+
+#endif /* _UAPI_LINUX_SIGNAL_H */
diff --git a/include/uapi/linux/signalfd.h b/include/uapi/linux/signalfd.h
new file mode 100644
index 000000000000..492c6def340d
--- /dev/null
+++ b/include/uapi/linux/signalfd.h
@@ -0,0 +1,52 @@
+/*
+ *  include/linux/signalfd.h
+ *
+ *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+
+#ifndef _UAPI_LINUX_SIGNALFD_H
+#define _UAPI_LINUX_SIGNALFD_H
+
+#include <linux/types.h>
+/* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/fcntl.h>
+
+/* Flags for signalfd4.  */
+#define SFD_CLOEXEC O_CLOEXEC
+#define SFD_NONBLOCK O_NONBLOCK
+
+struct signalfd_siginfo {
+        __u32 ssi_signo;
+        __s32 ssi_errno;
+        __s32 ssi_code;
+        __u32 ssi_pid;
+        __u32 ssi_uid;
+        __s32 ssi_fd;
+        __u32 ssi_tid;
+        __u32 ssi_band;
+        __u32 ssi_overrun;
+        __u32 ssi_trapno;
+        __s32 ssi_status;
+        __s32 ssi_int;
+        __u64 ssi_ptr;
+        __u64 ssi_utime;
+        __u64 ssi_stime;
+        __u64 ssi_addr;
+        __u16 ssi_addr_lsb;
+
+        /*
+         * Pad strcture to 128 bytes. Remember to update the
+         * pad size when you add new members. We use a fixed
+         * size structure to avoid compatibility problems with
+         * future versions, and we leave extra space for additional
+         * members. We use fixed size members because this strcture
+         * comes out of a read(2) and we really don't want to have
+         * a compat on read(2).
+         */
+        __u8 __pad[46];
+};
+
+
+
+#endif /* _UAPI_LINUX_SIGNALFD_H */
diff --git a/include/linux/snmp.h b/include/uapi/linux/snmp.h
index fdfba235f9f1..fdfba235f9f1 100644
--- a/include/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
diff --git a/include/uapi/linux/sock_diag.h b/include/uapi/linux/sock_diag.h
new file mode 100644
index 000000000000..b00e29efb161
--- /dev/null
+++ b/include/uapi/linux/sock_diag.h
@@ -0,0 +1,26 @@
+#ifndef _UAPI__SOCK_DIAG_H__
+#define _UAPI__SOCK_DIAG_H__
+
+#include <linux/types.h>
+
+#define SOCK_DIAG_BY_FAMILY 20
+
+struct sock_diag_req {
+        __u8    sdiag_family;
+        __u8    sdiag_protocol;
+};
+
+enum {
+        SK_MEMINFO_RMEM_ALLOC,
+        SK_MEMINFO_RCVBUF,
+        SK_MEMINFO_WMEM_ALLOC,
+        SK_MEMINFO_SNDBUF,
+        SK_MEMINFO_FWD_ALLOC,
+        SK_MEMINFO_WMEM_QUEUED,
+        SK_MEMINFO_OPTMEM,
+        SK_MEMINFO_BACKLOG,
+
+        SK_MEMINFO_VARS,
+};
+
+#endif /* _UAPI__SOCK_DIAG_H__ */
diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h
new file mode 100644
index 000000000000..76ab0c68561e
--- /dev/null
+++ b/include/uapi/linux/socket.h
@@ -0,0 +1,21 @@
+#ifndef _UAPI_LINUX_SOCKET_H
+#define _UAPI_LINUX_SOCKET_H
+
+/*
+ * Desired design of maximum size and alignment (see RFC2553)
+ */
+#define _K_SS_MAXSIZE   128     /* Implementation specific max size */
+#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
+                                /* Implementation specific desired alignment */
+
+typedef unsigned short __kernel_sa_family_t;
+
+struct __kernel_sockaddr_storage {
+        __kernel_sa_family_t    ss_family;              /* address family */
+        /* Following field(s) are implementation specific */
+        char            __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
+                                /* space to achieve desired size, */
+                                /* _SS_MAXSIZE value minus size of ss_family */
+} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));   /* force desired alignment */
+
+#endif /* _UAPI_LINUX_SOCKET_H */
diff --git a/include/linux/sockios.h b/include/uapi/linux/sockios.h
index 7997a506ad41..7997a506ad41 100644
--- a/include/linux/sockios.h
+++ b/include/uapi/linux/sockios.h
diff --git a/include/linux/som.h b/include/uapi/linux/som.h
index 166594e4e7be..166594e4e7be 100644
--- a/include/linux/som.h
+++ b/include/uapi/linux/som.h
diff --git a/include/uapi/linux/sonet.h b/include/uapi/linux/sonet.h
new file mode 100644
index 000000000000..cc54acee81ba
--- /dev/null
+++ b/include/uapi/linux/sonet.h
@@ -0,0 +1,60 @@
+/* sonet.h - SONET/SHD physical layer control */
+ 
+/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
+ 
+
+#ifndef _UAPILINUX_SONET_H
+#define _UAPILINUX_SONET_H
+
+#define __SONET_ITEMS \
+    __HANDLE_ITEM(section_bip);         /* section parity errors (B1) */ \
+    __HANDLE_ITEM(line_bip);            /* line parity errors (B2) */ \
+    __HANDLE_ITEM(path_bip);            /* path parity errors (B3) */ \
+    __HANDLE_ITEM(line_febe);           /* line parity errors at remote */ \
+    __HANDLE_ITEM(path_febe);           /* path parity errors at remote */ \
+    __HANDLE_ITEM(corr_hcs);            /* correctable header errors */ \
+    __HANDLE_ITEM(uncorr_hcs);          /* uncorrectable header errors */ \
+    __HANDLE_ITEM(tx_cells);            /* cells sent */ \
+    __HANDLE_ITEM(rx_cells);            /* cells received */
+
+struct sonet_stats {
+#define __HANDLE_ITEM(i) int i
+        __SONET_ITEMS
+#undef __HANDLE_ITEM
+} __attribute__ ((packed));
+
+
+#define SONET_GETSTAT   _IOR('a',ATMIOC_PHYTYP,struct sonet_stats)
+                                        /* get statistics */
+#define SONET_GETSTATZ  _IOR('a',ATMIOC_PHYTYP+1,struct sonet_stats)
+                                        /* ... and zero counters */
+#define SONET_SETDIAG   _IOWR('a',ATMIOC_PHYTYP+2,int)
+                                        /* set error insertion */
+#define SONET_CLRDIAG   _IOWR('a',ATMIOC_PHYTYP+3,int)
+                                        /* clear error insertion */
+#define SONET_GETDIAG   _IOR('a',ATMIOC_PHYTYP+4,int)
+                                        /* query error insertion */
+#define SONET_SETFRAMING _IOW('a',ATMIOC_PHYTYP+5,int)
+                                        /* set framing mode (SONET/SDH) */
+#define SONET_GETFRAMING _IOR('a',ATMIOC_PHYTYP+6,int)
+                                        /* get framing mode */
+#define SONET_GETFRSENSE _IOR('a',ATMIOC_PHYTYP+7, \
+  unsigned char[SONET_FRSENSE_SIZE])    /* get framing sense information */
+
+#define SONET_INS_SBIP    1             /* section BIP */
+#define SONET_INS_LBIP    2             /* line BIP */
+#define SONET_INS_PBIP    4             /* path BIP */
+#define SONET_INS_FRAME   8             /* out of frame */
+#define SONET_INS_LOS    16             /* set line to zero */
+#define SONET_INS_LAIS   32             /* line alarm indication signal */
+#define SONET_INS_PAIS   64             /* path alarm indication signal */
+#define SONET_INS_HCS   128             /* insert HCS error */
+
+#define SONET_FRAME_SONET 0             /* SONET STS-3 framing */
+#define SONET_FRAME_SDH   1             /* SDH STM-1 framing */
+
+#define SONET_FRSENSE_SIZE 6            /* C1[3],H1[3] (0xff for unknown) */
+
+
+
+#endif /* _UAPILINUX_SONET_H */
diff --git a/include/uapi/linux/sonypi.h b/include/uapi/linux/sonypi.h
new file mode 100644
index 000000000000..85078a283573
--- /dev/null
+++ b/include/uapi/linux/sonypi.h
@@ -0,0 +1,146 @@
+/*
+ * Sony Programmable I/O Control Device driver for VAIO
+ *
+ * Copyright (C) 2001-2005 Stelian Pop <stelian@popies.net>
+ *
+ * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
+
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
+ *
+ * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
+ *
+ * Copyright (C) 2001 Junichi Morita <jun1m@mars.dti.ne.jp>
+ *
+ * Copyright (C) 2000 Takaya Kinjo <t-kinjo@tc4.so-net.ne.jp>
+ *
+ * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
+ *
+ * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _UAPI_SONYPI_H_
+#define _UAPI_SONYPI_H_
+
+#include <linux/types.h>
+
+/* events the user application reading /dev/sonypi can use */
+
+#define SONYPI_EVENT_IGNORE                      0
+#define SONYPI_EVENT_JOGDIAL_DOWN                1
+#define SONYPI_EVENT_JOGDIAL_UP                  2
+#define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED        3
+#define SONYPI_EVENT_JOGDIAL_UP_PRESSED          4
+#define SONYPI_EVENT_JOGDIAL_PRESSED             5
+#define SONYPI_EVENT_JOGDIAL_RELEASED            6      /* obsolete */
+#define SONYPI_EVENT_CAPTURE_PRESSED             7
+#define SONYPI_EVENT_CAPTURE_RELEASED            8      /* obsolete */
+#define SONYPI_EVENT_CAPTURE_PARTIALPRESSED      9
+#define SONYPI_EVENT_CAPTURE_PARTIALRELEASED    10
+#define SONYPI_EVENT_FNKEY_ESC                  11
+#define SONYPI_EVENT_FNKEY_F1                   12
+#define SONYPI_EVENT_FNKEY_F2                   13
+#define SONYPI_EVENT_FNKEY_F3                   14
+#define SONYPI_EVENT_FNKEY_F4                   15
+#define SONYPI_EVENT_FNKEY_F5                   16
+#define SONYPI_EVENT_FNKEY_F6                   17
+#define SONYPI_EVENT_FNKEY_F7                   18
+#define SONYPI_EVENT_FNKEY_F8                   19
+#define SONYPI_EVENT_FNKEY_F9                   20
+#define SONYPI_EVENT_FNKEY_F10                  21
+#define SONYPI_EVENT_FNKEY_F11                  22
+#define SONYPI_EVENT_FNKEY_F12                  23
+#define SONYPI_EVENT_FNKEY_1                    24
+#define SONYPI_EVENT_FNKEY_2                    25
+#define SONYPI_EVENT_FNKEY_D                    26
+#define SONYPI_EVENT_FNKEY_E                    27
+#define SONYPI_EVENT_FNKEY_F                    28
+#define SONYPI_EVENT_FNKEY_S                    29
+#define SONYPI_EVENT_FNKEY_B                    30
+#define SONYPI_EVENT_BLUETOOTH_PRESSED          31
+#define SONYPI_EVENT_PKEY_P1                    32
+#define SONYPI_EVENT_PKEY_P2                    33
+#define SONYPI_EVENT_PKEY_P3                    34
+#define SONYPI_EVENT_BACK_PRESSED               35
+#define SONYPI_EVENT_LID_CLOSED                 36
+#define SONYPI_EVENT_LID_OPENED                 37
+#define SONYPI_EVENT_BLUETOOTH_ON               38
+#define SONYPI_EVENT_BLUETOOTH_OFF              39
+#define SONYPI_EVENT_HELP_PRESSED               40
+#define SONYPI_EVENT_FNKEY_ONLY                 41
+#define SONYPI_EVENT_JOGDIAL_FAST_DOWN          42
+#define SONYPI_EVENT_JOGDIAL_FAST_UP            43
+#define SONYPI_EVENT_JOGDIAL_FAST_DOWN_PRESSED  44
+#define SONYPI_EVENT_JOGDIAL_FAST_UP_PRESSED    45
+#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN         46
+#define SONYPI_EVENT_JOGDIAL_VFAST_UP           47
+#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN_PRESSED 48
+#define SONYPI_EVENT_JOGDIAL_VFAST_UP_PRESSED   49
+#define SONYPI_EVENT_ZOOM_PRESSED               50
+#define SONYPI_EVENT_THUMBPHRASE_PRESSED        51
+#define SONYPI_EVENT_MEYE_FACE                  52
+#define SONYPI_EVENT_MEYE_OPPOSITE              53
+#define SONYPI_EVENT_MEMORYSTICK_INSERT         54
+#define SONYPI_EVENT_MEMORYSTICK_EJECT          55
+#define SONYPI_EVENT_ANYBUTTON_RELEASED         56
+#define SONYPI_EVENT_BATTERY_INSERT             57
+#define SONYPI_EVENT_BATTERY_REMOVE             58
+#define SONYPI_EVENT_FNKEY_RELEASED             59
+#define SONYPI_EVENT_WIRELESS_ON                60
+#define SONYPI_EVENT_WIRELESS_OFF               61
+#define SONYPI_EVENT_ZOOM_IN_PRESSED            62
+#define SONYPI_EVENT_ZOOM_OUT_PRESSED           63
+#define SONYPI_EVENT_CD_EJECT_PRESSED           64
+#define SONYPI_EVENT_MODEKEY_PRESSED            65
+#define SONYPI_EVENT_PKEY_P4                    66
+#define SONYPI_EVENT_PKEY_P5                    67
+#define SONYPI_EVENT_SETTINGKEY_PRESSED         68
+#define SONYPI_EVENT_VOLUME_INC_PRESSED         69
+#define SONYPI_EVENT_VOLUME_DEC_PRESSED         70
+#define SONYPI_EVENT_BRIGHTNESS_PRESSED         71
+#define SONYPI_EVENT_MEDIA_PRESSED              72
+#define SONYPI_EVENT_VENDOR_PRESSED             73
+
+/* get/set brightness */
+#define SONYPI_IOCGBRT          _IOR('v', 0, __u8)
+#define SONYPI_IOCSBRT          _IOW('v', 0, __u8)
+
+/* get battery full capacity/remaining capacity */
+#define SONYPI_IOCGBAT1CAP      _IOR('v', 2, __u16)
+#define SONYPI_IOCGBAT1REM      _IOR('v', 3, __u16)
+#define SONYPI_IOCGBAT2CAP      _IOR('v', 4, __u16)
+#define SONYPI_IOCGBAT2REM      _IOR('v', 5, __u16)
+
+/* get battery flags: battery1/battery2/ac adapter present */
+#define SONYPI_BFLAGS_B1        0x01
+#define SONYPI_BFLAGS_B2        0x02
+#define SONYPI_BFLAGS_AC        0x04
+#define SONYPI_IOCGBATFLAGS     _IOR('v', 7, __u8)
+
+/* get/set bluetooth subsystem state on/off */
+#define SONYPI_IOCGBLUE         _IOR('v', 8, __u8)
+#define SONYPI_IOCSBLUE         _IOW('v', 9, __u8)
+
+/* get/set fan state on/off */
+#define SONYPI_IOCGFAN          _IOR('v', 10, __u8)
+#define SONYPI_IOCSFAN          _IOW('v', 11, __u8)
+
+/* get temperature (C) */
+#define SONYPI_IOCGTEMP         _IOR('v', 12, __u8)
+
+
+#endif /* _UAPI_SONYPI_H_ */
diff --git a/include/uapi/linux/sound.h b/include/uapi/linux/sound.h
new file mode 100644
index 000000000000..014c9117c224
--- /dev/null
+++ b/include/uapi/linux/sound.h
@@ -0,0 +1,31 @@
+#ifndef _UAPI_LINUX_SOUND_H
+#define _UAPI_LINUX_SOUND_H
+
+/*
+ * Minor numbers for the sound driver.
+ */
+
+#include <linux/fs.h>
+
+#define SND_DEV_CTL             0       /* Control port /dev/mixer */
+#define SND_DEV_SEQ             1       /* Sequencer output /dev/sequencer (FM
+                                                synthesizer and MIDI output) */
+#define SND_DEV_MIDIN           2       /* Raw midi access */
+#define SND_DEV_DSP             3       /* Digitized voice /dev/dsp */
+#define SND_DEV_AUDIO           4       /* Sparc compatible /dev/audio */
+#define SND_DEV_DSP16           5       /* Like /dev/dsp but 16 bits/sample */
+/* #define SND_DEV_STATUS       6 */    /* /dev/sndstat (obsolete) */
+#define SND_DEV_UNUSED          6
+#define SND_DEV_AWFM            7       /* Reserved */
+#define SND_DEV_SEQ2            8       /* /dev/sequencer, level 2 interface */
+/* #define SND_DEV_SNDPROC      9 */    /* /dev/sndproc for programmable devices (not used) */
+/* #define SND_DEV_DMMIDI       9 */
+#define SND_DEV_SYNTH           9       /* Raw synth access /dev/synth (same as /dev/dmfm) */
+#define SND_DEV_DMFM            10      /* Raw synth access /dev/dmfm */
+#define SND_DEV_UNKNOWN11       11
+#define SND_DEV_ADSP            12      /* Like /dev/dsp (obsolete) */
+#define SND_DEV_AMIDI           13      /* Like /dev/midi (obsolete) */
+#define SND_DEV_ADMMIDI         14      /* Like /dev/dmmidi (onsolete) */
+
+
+#endif /* _UAPI_LINUX_SOUND_H */
diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h
new file mode 100644
index 000000000000..f3b21f989872
--- /dev/null
+++ b/include/uapi/linux/soundcard.h
@@ -0,0 +1,1282 @@
+/*
+ * Copyright by Hannu Savolainen 1993-1997
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer. 2.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _UAPISOUNDCARD_H
+#define _UAPISOUNDCARD_H
+
+
+/*
+ * OSS interface version. With versions earlier than 3.6 this value is
+ * an integer with value less than 361. In versions 3.6 and later
+ * it's a six digit hexadecimal value. For example value
+ * of 0x030600 represents OSS version 3.6.0.
+ * Use ioctl(fd, OSS_GETVERSION, &int) to get the version number of
+ * the currently active driver.
+ */
+#define SOUND_VERSION   0x030802
+#define OPEN_SOUND_SYSTEM
+
+/* In Linux we need to be prepared for cross compiling */
+#include <linux/ioctl.h>
+
+/* Endian macros. */
+#ifndef __KERNEL__
+#  include <endian.h>
+#endif
+
+/*
+ *      Supported card ID numbers (Should be somewhere else?)
+ */
+
+#define SNDCARD_ADLIB           1
+#define SNDCARD_SB              2
+#define SNDCARD_PAS             3
+#define SNDCARD_GUS             4
+#define SNDCARD_MPU401          5
+#define SNDCARD_SB16            6
+#define SNDCARD_SB16MIDI        7
+#define SNDCARD_UART6850        8
+#define SNDCARD_GUS16           9
+#define SNDCARD_MSS             10
+#define SNDCARD_PSS             11
+#define SNDCARD_SSCAPE          12
+#define SNDCARD_PSS_MPU         13
+#define SNDCARD_PSS_MSS         14
+#define SNDCARD_SSCAPE_MSS      15
+#define SNDCARD_TRXPRO          16
+#define SNDCARD_TRXPRO_SB       17
+#define SNDCARD_TRXPRO_MPU      18
+#define SNDCARD_MAD16           19
+#define SNDCARD_MAD16_MPU       20
+#define SNDCARD_CS4232          21
+#define SNDCARD_CS4232_MPU      22
+#define SNDCARD_MAUI            23
+#define SNDCARD_PSEUDO_MSS      24
+#define SNDCARD_GUSPNP          25
+#define SNDCARD_UART401         26
+/* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
+
+/***********************************
+ * IOCTL Commands for /dev/sequencer
+ */
+
+#ifndef _SIOWR
+#if defined(_IOWR) && (defined(_AIX) || (!defined(sun) && !defined(sparc) && !defined(__sparc__) && !defined(__INCioctlh) && !defined(__Lynx__)))
+/* Use already defined ioctl defines if they exist (except with Sun or Sparc) */
+#define SIOCPARM_MASK   IOCPARM_MASK
+#define SIOC_VOID       IOC_VOID
+#define SIOC_OUT        IOC_OUT
+#define SIOC_IN         IOC_IN
+#define SIOC_INOUT      IOC_INOUT
+#define _SIOC_SIZE      _IOC_SIZE
+#define _SIOC_DIR       _IOC_DIR
+#define _SIOC_NONE      _IOC_NONE
+#define _SIOC_READ      _IOC_READ
+#define _SIOC_WRITE     _IOC_WRITE
+#define _SIO            _IO
+#define _SIOR           _IOR
+#define _SIOW           _IOW
+#define _SIOWR          _IOWR
+#else
+
+/* Ioctl's have the command encoded in the lower word,
+ * and the size of any in or out parameters in the upper
+ * word.  The high 2 bits of the upper word are used
+ * to encode the in/out status of the parameter; for now
+ * we restrict parameters to at most 8191 bytes.
+ */
+/* #define      SIOCTYPE                (0xff<<8) */
+#define SIOCPARM_MASK   0x1fff          /* parameters must be < 8192 bytes */
+#define SIOC_VOID       0x00000000      /* no parameters */
+#define SIOC_OUT        0x20000000      /* copy out parameters */
+#define SIOC_IN         0x40000000      /* copy in parameters */
+#define SIOC_INOUT      (SIOC_IN|SIOC_OUT)
+/* the 0x20000000 is so we can distinguish new ioctl's from old */
+#define _SIO(x,y)       ((int)(SIOC_VOID|(x<<8)|y))
+#define _SIOR(x,y,t)    ((int)(SIOC_OUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
+#define _SIOW(x,y,t)    ((int)(SIOC_IN|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
+/* this should be _SIORW, but stdio got there first */
+#define _SIOWR(x,y,t)   ((int)(SIOC_INOUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
+#define _SIOC_SIZE(x)   ((x>>16)&SIOCPARM_MASK) 
+#define _SIOC_DIR(x)    (x & 0xf0000000)
+#define _SIOC_NONE      SIOC_VOID
+#define _SIOC_READ      SIOC_OUT
+#define _SIOC_WRITE     SIOC_IN
+#  endif /* _IOWR */
+#endif  /* !_SIOWR */
+
+#define SNDCTL_SEQ_RESET                _SIO  ('Q', 0)
+#define SNDCTL_SEQ_SYNC                 _SIO  ('Q', 1)
+#define SNDCTL_SYNTH_INFO               _SIOWR('Q', 2, struct synth_info)
+#define SNDCTL_SEQ_CTRLRATE             _SIOWR('Q', 3, int)     /* Set/get timer resolution (HZ) */
+#define SNDCTL_SEQ_GETOUTCOUNT          _SIOR ('Q', 4, int)
+#define SNDCTL_SEQ_GETINCOUNT           _SIOR ('Q', 5, int)
+#define SNDCTL_SEQ_PERCMODE             _SIOW ('Q', 6, int)
+#define SNDCTL_FM_LOAD_INSTR            _SIOW ('Q', 7, struct sbi_instrument)   /* Obsolete. Don't use!!!!!! */
+#define SNDCTL_SEQ_TESTMIDI             _SIOW ('Q', 8, int)
+#define SNDCTL_SEQ_RESETSAMPLES         _SIOW ('Q', 9, int)
+#define SNDCTL_SEQ_NRSYNTHS             _SIOR ('Q',10, int)
+#define SNDCTL_SEQ_NRMIDIS              _SIOR ('Q',11, int)
+#define SNDCTL_MIDI_INFO                _SIOWR('Q',12, struct midi_info)
+#define SNDCTL_SEQ_THRESHOLD            _SIOW ('Q',13, int)
+#define SNDCTL_SYNTH_MEMAVL             _SIOWR('Q',14, int)     /* in=dev#, out=memsize */
+#define SNDCTL_FM_4OP_ENABLE            _SIOW ('Q',15, int)     /* in=dev# */
+#define SNDCTL_SEQ_PANIC                _SIO  ('Q',17)
+#define SNDCTL_SEQ_OUTOFBAND            _SIOW ('Q',18, struct seq_event_rec)
+#define SNDCTL_SEQ_GETTIME              _SIOR ('Q',19, int)
+#define SNDCTL_SYNTH_ID                 _SIOWR('Q',20, struct synth_info)
+#define SNDCTL_SYNTH_CONTROL            _SIOWR('Q',21, struct synth_control)
+#define SNDCTL_SYNTH_REMOVESAMPLE       _SIOWR('Q',22, struct remove_sample)
+
+typedef struct synth_control
+{
+        int devno;      /* Synthesizer # */
+        char data[4000]; /* Device spesific command/data record */
+}synth_control;
+
+typedef struct remove_sample
+{
+        int devno;      /* Synthesizer # */
+        int bankno;     /* MIDI bank # (0=General MIDI) */
+        int instrno;    /* MIDI instrument number */
+} remove_sample;
+
+typedef struct seq_event_rec {
+                unsigned char arr[8];
+} seq_event_rec;
+
+#define SNDCTL_TMR_TIMEBASE             _SIOWR('T', 1, int)
+#define SNDCTL_TMR_START                _SIO  ('T', 2)
+#define SNDCTL_TMR_STOP                 _SIO  ('T', 3)
+#define SNDCTL_TMR_CONTINUE             _SIO  ('T', 4)
+#define SNDCTL_TMR_TEMPO                _SIOWR('T', 5, int)
+#define SNDCTL_TMR_SOURCE               _SIOWR('T', 6, int)
+#       define TMR_INTERNAL             0x00000001
+#       define TMR_EXTERNAL             0x00000002
+#               define TMR_MODE_MIDI    0x00000010
+#               define TMR_MODE_FSK     0x00000020
+#               define TMR_MODE_CLS     0x00000040
+#               define TMR_MODE_SMPTE   0x00000080
+#define SNDCTL_TMR_METRONOME            _SIOW ('T', 7, int)
+#define SNDCTL_TMR_SELECT               _SIOW ('T', 8, int)
+
+/*
+ * Some big endian/little endian handling macros
+ */
+
+#define _LINUX_PATCHKEY_H_INDIRECT
+#include <linux/patchkey.h>
+#undef _LINUX_PATCHKEY_H_INDIRECT
+
+#if !defined(__KERNEL__)
+# if defined(__BYTE_ORDER)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+#    define AFMT_S16_NE AFMT_S16_BE
+#  elif __BYTE_ORDER == __LITTLE_ENDIAN
+#    define AFMT_S16_NE AFMT_S16_LE
+#  else
+#    error "could not determine byte order"
+#  endif
+# endif
+#endif
+
+/*
+ *      Sample loading mechanism for internal synthesizers (/dev/sequencer)
+ *      The following patch_info structure has been designed to support
+ *      Gravis UltraSound. It tries to be universal format for uploading
+ *      sample based patches but is probably too limited.
+ *
+ *      (PBD) As Hannu guessed, the GUS structure is too limited for 
+ *      the WaveFront, but this is the right place for a constant definition.
+ */
+
+struct patch_info {
+                unsigned short key;             /* Use WAVE_PATCH here */
+#define WAVE_PATCH         _PATCHKEY(0x04)
+#define GUS_PATCH          WAVE_PATCH
+#define WAVEFRONT_PATCH    _PATCHKEY(0x06)
+
+                short device_no;        /* Synthesizer number */
+                short instr_no;         /* Midi pgm# */
+
+                unsigned int mode;
+/*
+ * The least significant byte has the same format than the GUS .PAT
+ * files
+ */
+#define WAVE_16_BITS    0x01    /* bit 0 = 8 or 16 bit wave data. */
+#define WAVE_UNSIGNED   0x02    /* bit 1 = Signed - Unsigned data. */
+#define WAVE_LOOPING    0x04    /* bit 2 = looping enabled-1. */
+#define WAVE_BIDIR_LOOP 0x08    /* bit 3 = Set is bidirectional looping. */
+#define WAVE_LOOP_BACK  0x10    /* bit 4 = Set is looping backward. */
+#define WAVE_SUSTAIN_ON 0x20    /* bit 5 = Turn sustaining on. (Env. pts. 3)*/
+#define WAVE_ENVELOPES  0x40    /* bit 6 = Enable envelopes - 1 */
+#define WAVE_FAST_RELEASE 0x80  /* bit 7 = Shut off immediately after note off */
+                                /*      (use the env_rate/env_offs fields). */
+/* Linux specific bits */
+#define WAVE_VIBRATO    0x00010000      /* The vibrato info is valid */
+#define WAVE_TREMOLO    0x00020000      /* The tremolo info is valid */
+#define WAVE_SCALE      0x00040000      /* The scaling info is valid */
+#define WAVE_FRACTIONS  0x00080000      /* Fraction information is valid */
+/* Reserved bits */
+#define WAVE_ROM        0x40000000      /* For future use */
+#define WAVE_MULAW      0x20000000      /* For future use */
+/* Other bits must be zeroed */
+
+                int len;        /* Size of the wave data in bytes */
+                int loop_start, loop_end; /* Byte offsets from the beginning */
+
+/* 
+ * The base_freq and base_note fields are used when computing the
+ * playback speed for a note. The base_note defines the tone frequency
+ * which is heard if the sample is played using the base_freq as the
+ * playback speed.
+ *
+ * The low_note and high_note fields define the minimum and maximum note
+ * frequencies for which this sample is valid. It is possible to define
+ * more than one samples for an instrument number at the same time. The
+ * low_note and high_note fields are used to select the most suitable one.
+ *
+ * The fields base_note, high_note and low_note should contain
+ * the note frequency multiplied by 1000. For example value for the
+ * middle A is 440*1000.
+ */
+
+                unsigned int base_freq;
+                unsigned int base_note;
+                unsigned int high_note;
+                unsigned int low_note;
+                int panning;    /* -128=left, 127=right */
+                int detuning;
+
+/*      New fields introduced in version 1.99.5 */
+
+       /* Envelope. Enabled by mode bit WAVE_ENVELOPES  */
+                unsigned char   env_rate[ 6 ];   /* GUS HW ramping rate */
+                unsigned char   env_offset[ 6 ]; /* 255 == 100% */
+
+        /* 
+         * The tremolo, vibrato and scale info are not supported yet.
+         * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
+         * WAVE_SCALE
+         */
+
+                unsigned char   tremolo_sweep;
+                unsigned char   tremolo_rate;
+                unsigned char   tremolo_depth;
+        
+                unsigned char   vibrato_sweep;
+                unsigned char   vibrato_rate;
+                unsigned char   vibrato_depth;
+
+                int             scale_frequency;
+                unsigned int    scale_factor;           /* from 0 to 2048 or 0 to 2 */
+        
+                int             volume;
+                int             fractions;
+                int             reserved1;
+                int             spare[2];
+                char data[1];   /* The waveform data starts here */
+        };
+
+struct sysex_info {
+                short key;              /* Use SYSEX_PATCH or MAUI_PATCH here */
+#define SYSEX_PATCH     _PATCHKEY(0x05)
+#define MAUI_PATCH      _PATCHKEY(0x06)
+                short device_no;        /* Synthesizer number */
+                int len;        /* Size of the sysex data in bytes */
+                unsigned char data[1];  /* Sysex data starts here */
+        };
+
+/*
+ * /dev/sequencer input events.
+ *
+ * The data written to the /dev/sequencer is a stream of events. Events
+ * are records of 4 or 8 bytes. The first byte defines the size. 
+ * Any number of events can be written with a write call. There
+ * is a set of macros for sending these events. Use these macros if you
+ * want to maximize portability of your program.
+ *
+ * Events SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO. Are also input events.
+ * (All input events are currently 4 bytes long. Be prepared to support
+ * 8 byte events also. If you receive any event having first byte >= 128,
+ * it's a 8 byte event.
+ *
+ * The events are documented at the end of this file.
+ *
+ * Normal events (4 bytes)
+ * There is also a 8 byte version of most of the 4 byte events. The
+ * 8 byte one is recommended.
+ */
+#define SEQ_NOTEOFF             0
+#define SEQ_FMNOTEOFF           SEQ_NOTEOFF     /* Just old name */
+#define SEQ_NOTEON              1
+#define SEQ_FMNOTEON            SEQ_NOTEON
+#define SEQ_WAIT                TMR_WAIT_ABS
+#define SEQ_PGMCHANGE           3
+#define SEQ_FMPGMCHANGE         SEQ_PGMCHANGE
+#define SEQ_SYNCTIMER           TMR_START
+#define SEQ_MIDIPUTC            5
+#define SEQ_DRUMON              6       /*** OBSOLETE ***/
+#define SEQ_DRUMOFF             7       /*** OBSOLETE ***/
+#define SEQ_ECHO                TMR_ECHO        /* For synching programs with output */
+#define SEQ_AFTERTOUCH          9
+#define SEQ_CONTROLLER          10
+
+/*******************************************
+ *      Midi controller numbers
+ *******************************************
+ * Controllers 0 to 31 (0x00 to 0x1f) and
+ * 32 to 63 (0x20 to 0x3f) are continuous
+ * controllers.
+ * In the MIDI 1.0 these controllers are sent using
+ * two messages. Controller numbers 0 to 31 are used
+ * to send the MSB and the controller numbers 32 to 63
+ * are for the LSB. Note that just 7 bits are used in MIDI bytes.
+ */
+
+#define    CTL_BANK_SELECT              0x00
+#define    CTL_MODWHEEL                 0x01
+#define    CTL_BREATH                   0x02
+/*              undefined               0x03 */
+#define    CTL_FOOT                     0x04
+#define    CTL_PORTAMENTO_TIME          0x05
+#define    CTL_DATA_ENTRY               0x06
+#define    CTL_MAIN_VOLUME              0x07
+#define    CTL_BALANCE                  0x08
+/*              undefined               0x09 */
+#define    CTL_PAN                      0x0a
+#define    CTL_EXPRESSION               0x0b
+/*              undefined               0x0c */
+/*              undefined               0x0d */
+/*              undefined               0x0e */
+/*              undefined               0x0f */
+#define    CTL_GENERAL_PURPOSE1 0x10
+#define    CTL_GENERAL_PURPOSE2 0x11
+#define    CTL_GENERAL_PURPOSE3 0x12
+#define    CTL_GENERAL_PURPOSE4 0x13
+/*              undefined               0x14 - 0x1f */
+
+/*              undefined               0x20 */
+/* The controller numbers 0x21 to 0x3f are reserved for the */
+/* least significant bytes of the controllers 0x00 to 0x1f. */
+/* These controllers are not recognised by the driver. */
+
+/* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
+/* 0=OFF and 127=ON (intermediate values are possible) */
+#define    CTL_DAMPER_PEDAL             0x40
+#define    CTL_SUSTAIN                  0x40    /* Alias */
+#define    CTL_HOLD                     0x40    /* Alias */
+#define    CTL_PORTAMENTO               0x41
+#define    CTL_SOSTENUTO                0x42
+#define    CTL_SOFT_PEDAL               0x43
+/*              undefined               0x44 */
+#define    CTL_HOLD2                    0x45
+/*              undefined               0x46 - 0x4f */
+
+#define    CTL_GENERAL_PURPOSE5 0x50
+#define    CTL_GENERAL_PURPOSE6 0x51
+#define    CTL_GENERAL_PURPOSE7 0x52
+#define    CTL_GENERAL_PURPOSE8 0x53
+/*              undefined               0x54 - 0x5a */
+#define    CTL_EXT_EFF_DEPTH            0x5b
+#define    CTL_TREMOLO_DEPTH            0x5c
+#define    CTL_CHORUS_DEPTH             0x5d
+#define    CTL_DETUNE_DEPTH             0x5e
+#define    CTL_CELESTE_DEPTH            0x5e    /* Alias for the above one */
+#define    CTL_PHASER_DEPTH             0x5f
+#define    CTL_DATA_INCREMENT           0x60
+#define    CTL_DATA_DECREMENT           0x61
+#define    CTL_NONREG_PARM_NUM_LSB      0x62
+#define    CTL_NONREG_PARM_NUM_MSB      0x63
+#define    CTL_REGIST_PARM_NUM_LSB      0x64
+#define    CTL_REGIST_PARM_NUM_MSB      0x65
+/*              undefined               0x66 - 0x78 */
+/*              reserved                0x79 - 0x7f */
+
+/* Pseudo controllers (not midi compatible) */
+#define    CTRL_PITCH_BENDER            255
+#define    CTRL_PITCH_BENDER_RANGE      254
+#define    CTRL_EXPRESSION              253     /* Obsolete */
+#define    CTRL_MAIN_VOLUME             252     /* Obsolete */
+#define SEQ_BALANCE             11
+#define SEQ_VOLMODE             12
+
+/*
+ * Volume mode decides how volumes are used
+ */
+
+#define VOL_METHOD_ADAGIO       1
+#define VOL_METHOD_LINEAR       2
+
+/*
+ * Note! SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO are used also as
+ *       input events.
+ */
+
+/*
+ * Event codes 0xf0 to 0xfc are reserved for future extensions.
+ */
+
+#define SEQ_FULLSIZE            0xfd    /* Long events */
+/*
+ *      SEQ_FULLSIZE events are used for loading patches/samples to the
+ *      synthesizer devices. These events are passed directly to the driver
+ *      of the associated synthesizer device. There is no limit to the size
+ *      of the extended events. These events are not queued but executed
+ *      immediately when the write() is called (execution can take several
+ *      seconds of time). 
+ *
+ *      When a SEQ_FULLSIZE message is written to the device, it must
+ *      be written using exactly one write() call. Other events cannot
+ *      be mixed to the same write.
+ *      
+ *      For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the 
+ *      /dev/sequencer. Don't write other data together with the instrument structure
+ *      Set the key field of the structure to FM_PATCH. The device field is used to
+ *      route the patch to the corresponding device.
+ *
+ *      For wave table use struct patch_info. Initialize the key field
+ *      to WAVE_PATCH.
+ */
+#define SEQ_PRIVATE             0xfe    /* Low level HW dependent events (8 bytes) */
+#define SEQ_EXTENDED            0xff    /* Extended events (8 bytes) OBSOLETE */
+
+/*
+ * Record for FM patches
+ */
+
+typedef unsigned char sbi_instr_data[32];
+
+struct sbi_instrument {
+                unsigned short  key;    /* FM_PATCH or OPL3_PATCH */
+#define FM_PATCH        _PATCHKEY(0x01)
+#define OPL3_PATCH      _PATCHKEY(0x03)
+                short           device;         /*      Synth# (0-4)    */
+                int             channel;        /*      Program# to be initialized      */
+                sbi_instr_data  operators;      /*      Register settings for operator cells (.SBI format)      */
+        };
+
+struct synth_info {     /* Read only */
+                char    name[30];
+                int     device;         /* 0-N. INITIALIZE BEFORE CALLING */
+                int     synth_type;
+#define SYNTH_TYPE_FM                   0
+#define SYNTH_TYPE_SAMPLE               1
+#define SYNTH_TYPE_MIDI                 2       /* Midi interface */
+
+                int     synth_subtype;
+#define FM_TYPE_ADLIB                   0x00
+#define FM_TYPE_OPL3                    0x01
+#define MIDI_TYPE_MPU401                0x401
+
+#define SAMPLE_TYPE_BASIC               0x10
+#define SAMPLE_TYPE_GUS                 SAMPLE_TYPE_BASIC
+#define SAMPLE_TYPE_WAVEFRONT           0x11
+
+                int     perc_mode;      /* No longer supported */
+                int     nr_voices;
+                int     nr_drums;       /* Obsolete field */
+                int     instr_bank_size;
+                unsigned int    capabilities;   
+#define SYNTH_CAP_PERCMODE              0x00000001 /* No longer used */
+#define SYNTH_CAP_OPL3                  0x00000002 /* Set if OPL3 supported */
+#define SYNTH_CAP_INPUT                 0x00000004 /* Input (MIDI) device */
+                int     dummies[19];    /* Reserve space */
+        };
+
+struct sound_timer_info {
+                char name[32];
+                int caps;
+        };
+
+#define MIDI_CAP_MPU401         1               /* MPU-401 intelligent mode */
+
+struct midi_info {
+                char            name[30];
+                int             device;         /* 0-N. INITIALIZE BEFORE CALLING */
+                unsigned int    capabilities;   /* To be defined later */
+                int             dev_type;
+                int             dummies[18];    /* Reserve space */
+        };
+
+/********************************************
+ * ioctl commands for the /dev/midi##
+ */
+typedef struct {
+                unsigned char cmd;
+                char nr_args, nr_returns;
+                unsigned char data[30];
+        } mpu_command_rec;
+
+#define SNDCTL_MIDI_PRETIME             _SIOWR('m', 0, int)
+#define SNDCTL_MIDI_MPUMODE             _SIOWR('m', 1, int)
+#define SNDCTL_MIDI_MPUCMD              _SIOWR('m', 2, mpu_command_rec)
+
+/********************************************
+ * IOCTL commands for /dev/dsp and /dev/audio
+ */
+
+#define SNDCTL_DSP_RESET                _SIO  ('P', 0)
+#define SNDCTL_DSP_SYNC                 _SIO  ('P', 1)
+#define SNDCTL_DSP_SPEED                _SIOWR('P', 2, int)
+#define SNDCTL_DSP_STEREO               _SIOWR('P', 3, int)
+#define SNDCTL_DSP_GETBLKSIZE           _SIOWR('P', 4, int)
+#define SNDCTL_DSP_SAMPLESIZE           SNDCTL_DSP_SETFMT
+#define SNDCTL_DSP_CHANNELS             _SIOWR('P', 6, int)
+#define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
+#define SOUND_PCM_WRITE_FILTER          _SIOWR('P', 7, int)
+#define SNDCTL_DSP_POST                 _SIO  ('P', 8)
+#define SNDCTL_DSP_SUBDIVIDE            _SIOWR('P', 9, int)
+#define SNDCTL_DSP_SETFRAGMENT          _SIOWR('P',10, int)
+
+/*      Audio data formats (Note! U8=8 and S16_LE=16 for compatibility) */
+#define SNDCTL_DSP_GETFMTS              _SIOR ('P',11, int) /* Returns a mask */
+#define SNDCTL_DSP_SETFMT               _SIOWR('P',5, int) /* Selects ONE fmt*/
+#       define AFMT_QUERY               0x00000000      /* Return current fmt */
+#       define AFMT_MU_LAW              0x00000001
+#       define AFMT_A_LAW               0x00000002
+#       define AFMT_IMA_ADPCM           0x00000004
+#       define AFMT_U8                  0x00000008
+#       define AFMT_S16_LE              0x00000010      /* Little endian signed 16*/
+#       define AFMT_S16_BE              0x00000020      /* Big endian signed 16 */
+#       define AFMT_S8                  0x00000040
+#       define AFMT_U16_LE              0x00000080      /* Little endian U16 */
+#       define AFMT_U16_BE              0x00000100      /* Big endian U16 */
+#       define AFMT_MPEG                0x00000200      /* MPEG (2) audio */
+#       define AFMT_AC3         0x00000400      /* Dolby Digital AC3 */
+
+/*
+ * Buffer status queries.
+ */
+typedef struct audio_buf_info {
+                        int fragments;  /* # of available fragments (partially usend ones not counted) */
+                        int fragstotal; /* Total # of fragments allocated */
+                        int fragsize;   /* Size of a fragment in bytes */
+
+                        int bytes;      /* Available space in bytes (includes partially used fragments) */
+                        /* Note! 'bytes' could be more than fragments*fragsize */
+                } audio_buf_info;
+
+#define SNDCTL_DSP_GETOSPACE            _SIOR ('P',12, audio_buf_info)
+#define SNDCTL_DSP_GETISPACE            _SIOR ('P',13, audio_buf_info)
+#define SNDCTL_DSP_NONBLOCK             _SIO  ('P',14)
+#define SNDCTL_DSP_GETCAPS              _SIOR ('P',15, int)
+#       define DSP_CAP_REVISION         0x000000ff      /* Bits for revision level (0 to 255) */
+#       define DSP_CAP_DUPLEX           0x00000100      /* Full duplex record/playback */
+#       define DSP_CAP_REALTIME         0x00000200      /* Real time capability */
+#       define DSP_CAP_BATCH            0x00000400      /* Device has some kind of */
+                                                        /* internal buffers which may */
+                                                        /* cause some delays and */
+                                                        /* decrease precision of timing */
+#       define DSP_CAP_COPROC           0x00000800      /* Has a coprocessor */
+                                                        /* Sometimes it's a DSP */
+                                                        /* but usually not */
+#       define DSP_CAP_TRIGGER          0x00001000      /* Supports SETTRIGGER */
+#       define DSP_CAP_MMAP             0x00002000      /* Supports mmap() */
+#       define DSP_CAP_MULTI            0x00004000      /* support multiple open */
+#       define DSP_CAP_BIND             0x00008000      /* channel binding to front/rear/cneter/lfe */
+
+
+#define SNDCTL_DSP_GETTRIGGER           _SIOR ('P',16, int)
+#define SNDCTL_DSP_SETTRIGGER           _SIOW ('P',16, int)
+#       define PCM_ENABLE_INPUT         0x00000001
+#       define PCM_ENABLE_OUTPUT                0x00000002
+
+typedef struct count_info {
+                int bytes;      /* Total # of bytes processed */
+                int blocks;     /* # of fragment transitions since last time */
+                int ptr;        /* Current DMA pointer value */
+        } count_info;
+
+#define SNDCTL_DSP_GETIPTR              _SIOR ('P',17, count_info)
+#define SNDCTL_DSP_GETOPTR              _SIOR ('P',18, count_info)
+
+typedef struct buffmem_desc {
+                unsigned *buffer;
+                int size;
+        } buffmem_desc;
+#define SNDCTL_DSP_MAPINBUF             _SIOR ('P', 19, buffmem_desc)
+#define SNDCTL_DSP_MAPOUTBUF            _SIOR ('P', 20, buffmem_desc)
+#define SNDCTL_DSP_SETSYNCRO            _SIO  ('P', 21)
+#define SNDCTL_DSP_SETDUPLEX            _SIO  ('P', 22)
+#define SNDCTL_DSP_GETODELAY            _SIOR ('P', 23, int)
+
+#define SNDCTL_DSP_GETCHANNELMASK               _SIOWR('P', 64, int)
+#define SNDCTL_DSP_BIND_CHANNEL         _SIOWR('P', 65, int)
+#       define DSP_BIND_QUERY           0x00000000
+#       define DSP_BIND_FRONT           0x00000001
+#       define DSP_BIND_SURR            0x00000002
+#       define DSP_BIND_CENTER_LFE      0x00000004
+#       define DSP_BIND_HANDSET         0x00000008
+#       define DSP_BIND_MIC             0x00000010
+#       define DSP_BIND_MODEM1          0x00000020
+#       define DSP_BIND_MODEM2          0x00000040
+#       define DSP_BIND_I2S             0x00000080
+#       define DSP_BIND_SPDIF           0x00000100
+
+#define SNDCTL_DSP_SETSPDIF             _SIOW ('P', 66, int)
+#define SNDCTL_DSP_GETSPDIF             _SIOR ('P', 67, int)
+#       define SPDIF_PRO        0x0001
+#       define SPDIF_N_AUD      0x0002
+#       define SPDIF_COPY       0x0004
+#       define SPDIF_PRE        0x0008
+#       define SPDIF_CC         0x07f0
+#       define SPDIF_L          0x0800
+#       define SPDIF_DRS        0x4000
+#       define SPDIF_V          0x8000
+
+/*
+ * Application's profile defines the way how playback underrun situations should be handled.
+ * 
+ *      APF_NORMAL (the default) and APF_NETWORK make the driver to cleanup the
+ *      playback buffer whenever an underrun occurs. This consumes some time
+ *      prevents looping the existing buffer.
+ *      APF_CPUINTENS is intended to be set by CPU intensive applications which
+ *      are likely to run out of time occasionally. In this mode the buffer cleanup is
+ *      disabled which saves CPU time but also let's the previous buffer content to
+ *      be played during the "pause" after the underrun.
+ */
+#define SNDCTL_DSP_PROFILE              _SIOW ('P', 23, int)
+#define   APF_NORMAL    0       /* Normal applications */
+#define   APF_NETWORK   1       /* Underruns probably caused by an "external" delay */
+#define   APF_CPUINTENS 2       /* Underruns probably caused by "overheating" the CPU */
+
+#define SOUND_PCM_READ_RATE             _SIOR ('P', 2, int)
+#define SOUND_PCM_READ_CHANNELS         _SIOR ('P', 6, int)
+#define SOUND_PCM_READ_BITS             _SIOR ('P', 5, int)
+#define SOUND_PCM_READ_FILTER           _SIOR ('P', 7, int)
+
+/* Some alias names */
+#define SOUND_PCM_WRITE_BITS            SNDCTL_DSP_SETFMT
+#define SOUND_PCM_WRITE_RATE            SNDCTL_DSP_SPEED
+#define SOUND_PCM_POST                  SNDCTL_DSP_POST
+#define SOUND_PCM_RESET                 SNDCTL_DSP_RESET
+#define SOUND_PCM_SYNC                  SNDCTL_DSP_SYNC
+#define SOUND_PCM_SUBDIVIDE             SNDCTL_DSP_SUBDIVIDE
+#define SOUND_PCM_SETFRAGMENT           SNDCTL_DSP_SETFRAGMENT
+#define SOUND_PCM_GETFMTS               SNDCTL_DSP_GETFMTS
+#define SOUND_PCM_SETFMT                SNDCTL_DSP_SETFMT
+#define SOUND_PCM_GETOSPACE             SNDCTL_DSP_GETOSPACE
+#define SOUND_PCM_GETISPACE             SNDCTL_DSP_GETISPACE
+#define SOUND_PCM_NONBLOCK              SNDCTL_DSP_NONBLOCK
+#define SOUND_PCM_GETCAPS               SNDCTL_DSP_GETCAPS
+#define SOUND_PCM_GETTRIGGER            SNDCTL_DSP_GETTRIGGER
+#define SOUND_PCM_SETTRIGGER            SNDCTL_DSP_SETTRIGGER
+#define SOUND_PCM_SETSYNCRO             SNDCTL_DSP_SETSYNCRO
+#define SOUND_PCM_GETIPTR               SNDCTL_DSP_GETIPTR
+#define SOUND_PCM_GETOPTR               SNDCTL_DSP_GETOPTR
+#define SOUND_PCM_MAPINBUF              SNDCTL_DSP_MAPINBUF
+#define SOUND_PCM_MAPOUTBUF             SNDCTL_DSP_MAPOUTBUF
+
+/*
+ * ioctl calls to be used in communication with coprocessors and
+ * DSP chips.
+ */
+
+typedef struct copr_buffer {
+                int command;    /* Set to 0 if not used */
+                int flags;
+#define CPF_NONE                0x0000
+#define CPF_FIRST               0x0001  /* First block */
+#define CPF_LAST                0x0002  /* Last block */
+                int len;
+                int offs;       /* If required by the device (0 if not used) */
+
+                unsigned char data[4000]; /* NOTE! 4000 is not 4k */
+        } copr_buffer;
+
+typedef struct copr_debug_buf {
+                int command;    /* Used internally. Set to 0 */
+                int parm1;
+                int parm2;
+                int flags;      
+                int len;        /* Length of data in bytes */
+        } copr_debug_buf;
+
+typedef struct copr_msg {
+                int len;
+                unsigned char data[4000];
+        } copr_msg;
+
+#define SNDCTL_COPR_RESET             _SIO  ('C',  0)
+#define SNDCTL_COPR_LOAD              _SIOWR('C',  1, copr_buffer)
+#define SNDCTL_COPR_RDATA             _SIOWR('C',  2, copr_debug_buf)
+#define SNDCTL_COPR_RCODE             _SIOWR('C',  3, copr_debug_buf)
+#define SNDCTL_COPR_WDATA             _SIOW ('C',  4, copr_debug_buf)
+#define SNDCTL_COPR_WCODE             _SIOW ('C',  5, copr_debug_buf)
+#define SNDCTL_COPR_RUN               _SIOWR('C',  6, copr_debug_buf)
+#define SNDCTL_COPR_HALT              _SIOWR('C',  7, copr_debug_buf)
+#define SNDCTL_COPR_SENDMSG           _SIOWR('C',  8, copr_msg)
+#define SNDCTL_COPR_RCVMSG            _SIOR ('C',  9, copr_msg)
+
+/*********************************************
+ * IOCTL commands for /dev/mixer
+ */
+        
+/* 
+ * Mixer devices
+ *
+ * There can be up to 20 different analog mixer channels. The
+ * SOUND_MIXER_NRDEVICES gives the currently supported maximum. 
+ * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
+ * the devices supported by the particular mixer.
+ */
+
+#define SOUND_MIXER_NRDEVICES   25
+#define SOUND_MIXER_VOLUME      0
+#define SOUND_MIXER_BASS        1
+#define SOUND_MIXER_TREBLE      2
+#define SOUND_MIXER_SYNTH       3
+#define SOUND_MIXER_PCM         4
+#define SOUND_MIXER_SPEAKER     5
+#define SOUND_MIXER_LINE        6
+#define SOUND_MIXER_MIC         7
+#define SOUND_MIXER_CD          8
+#define SOUND_MIXER_IMIX        9       /*  Recording monitor  */
+#define SOUND_MIXER_ALTPCM      10
+#define SOUND_MIXER_RECLEV      11      /* Recording level */
+#define SOUND_MIXER_IGAIN       12      /* Input gain */
+#define SOUND_MIXER_OGAIN       13      /* Output gain */
+/* 
+ * The AD1848 codec and compatibles have three line level inputs
+ * (line, aux1 and aux2). Since each card manufacturer have assigned
+ * different meanings to these inputs, it's inpractical to assign
+ * specific meanings (line, cd, synth etc.) to them.
+ */
+#define SOUND_MIXER_LINE1       14      /* Input source 1  (aux1) */
+#define SOUND_MIXER_LINE2       15      /* Input source 2  (aux2) */
+#define SOUND_MIXER_LINE3       16      /* Input source 3  (line) */
+#define SOUND_MIXER_DIGITAL1    17      /* Digital (input) 1 */
+#define SOUND_MIXER_DIGITAL2    18      /* Digital (input) 2 */
+#define SOUND_MIXER_DIGITAL3    19      /* Digital (input) 3 */
+#define SOUND_MIXER_PHONEIN     20      /* Phone input */
+#define SOUND_MIXER_PHONEOUT    21      /* Phone output */
+#define SOUND_MIXER_VIDEO       22      /* Video/TV (audio) in */
+#define SOUND_MIXER_RADIO       23      /* Radio in */
+#define SOUND_MIXER_MONITOR     24      /* Monitor (usually mic) volume */
+
+/* Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX) */
+/* Not counted to SOUND_MIXER_NRDEVICES, but use the same number space */
+#define SOUND_ONOFF_MIN         28
+#define SOUND_ONOFF_MAX         30
+
+/* Note!        Number 31 cannot be used since the sign bit is reserved */
+#define SOUND_MIXER_NONE        31
+
+/*
+ * The following unsupported macros are no longer functional.
+ * Use SOUND_MIXER_PRIVATE# macros in future.
+ */
+#define SOUND_MIXER_ENHANCE     SOUND_MIXER_NONE
+#define SOUND_MIXER_MUTE        SOUND_MIXER_NONE
+#define SOUND_MIXER_LOUD        SOUND_MIXER_NONE
+
+
+#define SOUND_DEVICE_LABELS     {"Vol  ", "Bass ", "Trebl", "Synth", "Pcm  ", "Spkr ", "Line ", \
+                                 "Mic  ", "CD   ", "Mix  ", "Pcm2 ", "Rec  ", "IGain", "OGain", \
+                                 "Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", \
+                                 "PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"}
+
+#define SOUND_DEVICE_NAMES      {"vol", "bass", "treble", "synth", "pcm", "speaker", "line", \
+                                 "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", \
+                                 "line1", "line2", "line3", "dig1", "dig2", "dig3", \
+                                 "phin", "phout", "video", "radio", "monitor"}
+
+/*      Device bitmask identifiers      */
+
+#define SOUND_MIXER_RECSRC      0xff    /* Arg contains a bit for each recording source */
+#define SOUND_MIXER_DEVMASK     0xfe    /* Arg contains a bit for each supported device */
+#define SOUND_MIXER_RECMASK     0xfd    /* Arg contains a bit for each supported recording source */
+#define SOUND_MIXER_CAPS        0xfc
+#       define SOUND_CAP_EXCL_INPUT     0x00000001      /* Only one recording source at a time */
+#define SOUND_MIXER_STEREODEVS  0xfb    /* Mixer channels supporting stereo */
+#define SOUND_MIXER_OUTSRC      0xfa    /* Arg contains a bit for each input source to output */
+#define SOUND_MIXER_OUTMASK     0xf9    /* Arg contains a bit for each supported input source to output */
+
+/*      Device mask bits        */
+
+#define SOUND_MASK_VOLUME       (1 << SOUND_MIXER_VOLUME)
+#define SOUND_MASK_BASS         (1 << SOUND_MIXER_BASS)
+#define SOUND_MASK_TREBLE       (1 << SOUND_MIXER_TREBLE)
+#define SOUND_MASK_SYNTH        (1 << SOUND_MIXER_SYNTH)
+#define SOUND_MASK_PCM          (1 << SOUND_MIXER_PCM)
+#define SOUND_MASK_SPEAKER      (1 << SOUND_MIXER_SPEAKER)
+#define SOUND_MASK_LINE         (1 << SOUND_MIXER_LINE)
+#define SOUND_MASK_MIC          (1 << SOUND_MIXER_MIC)
+#define SOUND_MASK_CD           (1 << SOUND_MIXER_CD)
+#define SOUND_MASK_IMIX         (1 << SOUND_MIXER_IMIX)
+#define SOUND_MASK_ALTPCM       (1 << SOUND_MIXER_ALTPCM)
+#define SOUND_MASK_RECLEV       (1 << SOUND_MIXER_RECLEV)
+#define SOUND_MASK_IGAIN        (1 << SOUND_MIXER_IGAIN)
+#define SOUND_MASK_OGAIN        (1 << SOUND_MIXER_OGAIN)
+#define SOUND_MASK_LINE1        (1 << SOUND_MIXER_LINE1)
+#define SOUND_MASK_LINE2        (1 << SOUND_MIXER_LINE2)
+#define SOUND_MASK_LINE3        (1 << SOUND_MIXER_LINE3)
+#define SOUND_MASK_DIGITAL1     (1 << SOUND_MIXER_DIGITAL1)
+#define SOUND_MASK_DIGITAL2     (1 << SOUND_MIXER_DIGITAL2)
+#define SOUND_MASK_DIGITAL3     (1 << SOUND_MIXER_DIGITAL3)
+#define SOUND_MASK_PHONEIN      (1 << SOUND_MIXER_PHONEIN)
+#define SOUND_MASK_PHONEOUT     (1 << SOUND_MIXER_PHONEOUT)
+#define SOUND_MASK_RADIO        (1 << SOUND_MIXER_RADIO)
+#define SOUND_MASK_VIDEO        (1 << SOUND_MIXER_VIDEO)
+#define SOUND_MASK_MONITOR      (1 << SOUND_MIXER_MONITOR)
+
+/* Obsolete macros */
+#define SOUND_MASK_MUTE         (1 << SOUND_MIXER_MUTE)
+#define SOUND_MASK_ENHANCE      (1 << SOUND_MIXER_ENHANCE)
+#define SOUND_MASK_LOUD         (1 << SOUND_MIXER_LOUD)
+
+#define MIXER_READ(dev)         _SIOR('M', dev, int)
+#define SOUND_MIXER_READ_VOLUME         MIXER_READ(SOUND_MIXER_VOLUME)
+#define SOUND_MIXER_READ_BASS           MIXER_READ(SOUND_MIXER_BASS)
+#define SOUND_MIXER_READ_TREBLE         MIXER_READ(SOUND_MIXER_TREBLE)
+#define SOUND_MIXER_READ_SYNTH          MIXER_READ(SOUND_MIXER_SYNTH)
+#define SOUND_MIXER_READ_PCM            MIXER_READ(SOUND_MIXER_PCM)
+#define SOUND_MIXER_READ_SPEAKER        MIXER_READ(SOUND_MIXER_SPEAKER)
+#define SOUND_MIXER_READ_LINE           MIXER_READ(SOUND_MIXER_LINE)
+#define SOUND_MIXER_READ_MIC            MIXER_READ(SOUND_MIXER_MIC)
+#define SOUND_MIXER_READ_CD             MIXER_READ(SOUND_MIXER_CD)
+#define SOUND_MIXER_READ_IMIX           MIXER_READ(SOUND_MIXER_IMIX)
+#define SOUND_MIXER_READ_ALTPCM         MIXER_READ(SOUND_MIXER_ALTPCM)
+#define SOUND_MIXER_READ_RECLEV         MIXER_READ(SOUND_MIXER_RECLEV)
+#define SOUND_MIXER_READ_IGAIN          MIXER_READ(SOUND_MIXER_IGAIN)
+#define SOUND_MIXER_READ_OGAIN          MIXER_READ(SOUND_MIXER_OGAIN)
+#define SOUND_MIXER_READ_LINE1          MIXER_READ(SOUND_MIXER_LINE1)
+#define SOUND_MIXER_READ_LINE2          MIXER_READ(SOUND_MIXER_LINE2)
+#define SOUND_MIXER_READ_LINE3          MIXER_READ(SOUND_MIXER_LINE3)
+
+/* Obsolete macros */
+#define SOUND_MIXER_READ_MUTE           MIXER_READ(SOUND_MIXER_MUTE)
+#define SOUND_MIXER_READ_ENHANCE        MIXER_READ(SOUND_MIXER_ENHANCE)
+#define SOUND_MIXER_READ_LOUD           MIXER_READ(SOUND_MIXER_LOUD)
+
+#define SOUND_MIXER_READ_RECSRC         MIXER_READ(SOUND_MIXER_RECSRC)
+#define SOUND_MIXER_READ_DEVMASK        MIXER_READ(SOUND_MIXER_DEVMASK)
+#define SOUND_MIXER_READ_RECMASK        MIXER_READ(SOUND_MIXER_RECMASK)
+#define SOUND_MIXER_READ_STEREODEVS     MIXER_READ(SOUND_MIXER_STEREODEVS)
+#define SOUND_MIXER_READ_CAPS           MIXER_READ(SOUND_MIXER_CAPS)
+
+#define MIXER_WRITE(dev)                _SIOWR('M', dev, int)
+#define SOUND_MIXER_WRITE_VOLUME        MIXER_WRITE(SOUND_MIXER_VOLUME)
+#define SOUND_MIXER_WRITE_BASS          MIXER_WRITE(SOUND_MIXER_BASS)
+#define SOUND_MIXER_WRITE_TREBLE        MIXER_WRITE(SOUND_MIXER_TREBLE)
+#define SOUND_MIXER_WRITE_SYNTH         MIXER_WRITE(SOUND_MIXER_SYNTH)
+#define SOUND_MIXER_WRITE_PCM           MIXER_WRITE(SOUND_MIXER_PCM)
+#define SOUND_MIXER_WRITE_SPEAKER       MIXER_WRITE(SOUND_MIXER_SPEAKER)
+#define SOUND_MIXER_WRITE_LINE          MIXER_WRITE(SOUND_MIXER_LINE)
+#define SOUND_MIXER_WRITE_MIC           MIXER_WRITE(SOUND_MIXER_MIC)
+#define SOUND_MIXER_WRITE_CD            MIXER_WRITE(SOUND_MIXER_CD)
+#define SOUND_MIXER_WRITE_IMIX          MIXER_WRITE(SOUND_MIXER_IMIX)
+#define SOUND_MIXER_WRITE_ALTPCM        MIXER_WRITE(SOUND_MIXER_ALTPCM)
+#define SOUND_MIXER_WRITE_RECLEV        MIXER_WRITE(SOUND_MIXER_RECLEV)
+#define SOUND_MIXER_WRITE_IGAIN         MIXER_WRITE(SOUND_MIXER_IGAIN)
+#define SOUND_MIXER_WRITE_OGAIN         MIXER_WRITE(SOUND_MIXER_OGAIN)
+#define SOUND_MIXER_WRITE_LINE1         MIXER_WRITE(SOUND_MIXER_LINE1)
+#define SOUND_MIXER_WRITE_LINE2         MIXER_WRITE(SOUND_MIXER_LINE2)
+#define SOUND_MIXER_WRITE_LINE3         MIXER_WRITE(SOUND_MIXER_LINE3)
+
+/* Obsolete macros */
+#define SOUND_MIXER_WRITE_MUTE          MIXER_WRITE(SOUND_MIXER_MUTE)
+#define SOUND_MIXER_WRITE_ENHANCE       MIXER_WRITE(SOUND_MIXER_ENHANCE)
+#define SOUND_MIXER_WRITE_LOUD          MIXER_WRITE(SOUND_MIXER_LOUD)
+
+#define SOUND_MIXER_WRITE_RECSRC        MIXER_WRITE(SOUND_MIXER_RECSRC)
+
+typedef struct mixer_info
+{
+  char id[16];
+  char name[32];
+  int  modify_counter;
+  int fillers[10];
+} mixer_info;
+
+typedef struct _old_mixer_info /* Obsolete */
+{
+  char id[16];
+  char name[32];
+} _old_mixer_info;
+
+#define SOUND_MIXER_INFO                _SIOR ('M', 101, mixer_info)
+#define SOUND_OLD_MIXER_INFO            _SIOR ('M', 101, _old_mixer_info)
+
+/*
+ * A mechanism for accessing "proprietary" mixer features. This method
+ * permits passing 128 bytes of arbitrary data between a mixer application
+ * and the mixer driver. Interpretation of the record is defined by
+ * the particular mixer driver.
+ */
+typedef unsigned char mixer_record[128];
+
+#define SOUND_MIXER_ACCESS              _SIOWR('M', 102, mixer_record)
+
+/*
+ * Two ioctls for special souncard function
+ */
+#define SOUND_MIXER_AGC  _SIOWR('M', 103, int)
+#define SOUND_MIXER_3DSE  _SIOWR('M', 104, int)
+
+/*
+ * The SOUND_MIXER_PRIVATE# commands can be redefined by low level drivers.
+ * These features can be used when accessing device specific features.
+ */
+#define SOUND_MIXER_PRIVATE1            _SIOWR('M', 111, int)
+#define SOUND_MIXER_PRIVATE2            _SIOWR('M', 112, int)
+#define SOUND_MIXER_PRIVATE3            _SIOWR('M', 113, int)
+#define SOUND_MIXER_PRIVATE4            _SIOWR('M', 114, int)
+#define SOUND_MIXER_PRIVATE5            _SIOWR('M', 115, int)
+
+/*
+ * SOUND_MIXER_GETLEVELS and SOUND_MIXER_SETLEVELS calls can be used
+ * for querying current mixer settings from the driver and for loading
+ * default volume settings _prior_ activating the mixer (loading
+ * doesn't affect current state of the mixer hardware). These calls
+ * are for internal use only.
+ */
+
+typedef struct mixer_vol_table {
+  int num;      /* Index to volume table */
+  char name[32];
+  int levels[32];
+} mixer_vol_table;
+
+#define SOUND_MIXER_GETLEVELS           _SIOWR('M', 116, mixer_vol_table)
+#define SOUND_MIXER_SETLEVELS           _SIOWR('M', 117, mixer_vol_table)
+
+/* 
+ * An ioctl for identifying the driver version. It will return value
+ * of the SOUND_VERSION macro used when compiling the driver.
+ * This call was introduced in OSS version 3.6 and it will not work
+ * with earlier versions (returns EINVAL).
+ */
+#define OSS_GETVERSION                  _SIOR ('M', 118, int)
+
+/*
+ * Level 2 event types for /dev/sequencer
+ */
+
+/*
+ * The 4 most significant bits of byte 0 specify the class of
+ * the event: 
+ *
+ *      0x8X = system level events,
+ *      0x9X = device/port specific events, event[1] = device/port,
+ *              The last 4 bits give the subtype:
+ *                      0x02    = Channel event (event[3] = chn).
+ *                      0x01    = note event (event[4] = note).
+ *                      (0x01 is not used alone but always with bit 0x02).
+ *             event[2] = MIDI message code (0x80=note off etc.)
+ *
+ */
+
+#define EV_SEQ_LOCAL            0x80
+#define EV_TIMING               0x81
+#define EV_CHN_COMMON           0x92
+#define EV_CHN_VOICE            0x93
+#define EV_SYSEX                0x94
+/*
+ * Event types 200 to 220 are reserved for application use.
+ * These numbers will not be used by the driver.
+ */
+
+/*
+ * Events for event type EV_CHN_VOICE
+ */
+
+#define MIDI_NOTEOFF            0x80
+#define MIDI_NOTEON             0x90
+#define MIDI_KEY_PRESSURE       0xA0
+
+/*
+ * Events for event type EV_CHN_COMMON
+ */
+
+#define MIDI_CTL_CHANGE         0xB0
+#define MIDI_PGM_CHANGE         0xC0
+#define MIDI_CHN_PRESSURE       0xD0
+#define MIDI_PITCH_BEND         0xE0
+
+#define MIDI_SYSTEM_PREFIX      0xF0
+
+/*
+ * Timer event types
+ */
+#define TMR_WAIT_REL            1       /* Time relative to the prev time */
+#define TMR_WAIT_ABS            2       /* Absolute time since TMR_START */
+#define TMR_STOP                3
+#define TMR_START               4
+#define TMR_CONTINUE            5
+#define TMR_TEMPO               6
+#define TMR_ECHO                8
+#define TMR_CLOCK               9       /* MIDI clock */
+#define TMR_SPP                 10      /* Song position pointer */
+#define TMR_TIMESIG             11      /* Time signature */
+
+/*
+ *      Local event types
+ */
+#define LOCL_STARTAUDIO         1
+
+#if !defined(__KERNEL__) || defined(USE_SEQ_MACROS)
+/*
+ *      Some convenience macros to simplify programming of the
+ *      /dev/sequencer interface
+ *
+ *      This is a legacy interface for applications written against
+ *      the OSSlib-3.8 style interface. It is no longer possible
+ *      to actually link against OSSlib with this header, but we
+ *      still provide these macros for programs using them.
+ *
+ *      If you want to use OSSlib, it is recommended that you get
+ *      the GPL version of OSS-4.x and build against that version
+ *      of the header.
+ *
+ *      We redefine the extern keyword so that make headers_check
+ *      does not complain about SEQ_USE_EXTBUF.
+ */
+#define SEQ_DECLAREBUF()                SEQ_USE_EXTBUF()
+
+void seqbuf_dump(void); /* This function must be provided by programs */
+
+#define SEQ_PM_DEFINES int __foo_bar___
+
+#define SEQ_LOAD_GMINSTR(dev, instr)
+#define SEQ_LOAD_GMDRUM(dev, drum)
+
+#define _SEQ_EXTERN extern
+#define SEQ_USE_EXTBUF() \
+                _SEQ_EXTERN unsigned char _seqbuf[]; \
+                _SEQ_EXTERN int _seqbuflen; _SEQ_EXTERN int _seqbufptr
+
+#ifndef USE_SIMPLE_MACROS
+/* Sample seqbuf_dump() implementation:
+ *
+ *      SEQ_DEFINEBUF (2048);   -- Defines a buffer for 2048 bytes
+ *
+ *      int seqfd;              -- The file descriptor for /dev/sequencer.
+ *
+ *      void
+ *      seqbuf_dump ()
+ *      {
+ *        if (_seqbufptr)
+ *          if (write (seqfd, _seqbuf, _seqbufptr) == -1)
+ *            {
+ *              perror ("write /dev/sequencer");
+ *              exit (-1);
+ *            }
+ *        _seqbufptr = 0;
+ *      }
+ */
+
+#define SEQ_DEFINEBUF(len)              unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
+#define _SEQ_NEEDBUF(len)               if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump()
+#define _SEQ_ADVBUF(len)                _seqbufptr += len
+#define SEQ_DUMPBUF                     seqbuf_dump
+#else
+/*
+ * This variation of the sequencer macros is used just to format one event
+ * using fixed buffer.
+ * 
+ * The program using the macro library must define the following macros before
+ * using this library.
+ *
+ * #define _seqbuf               name of the buffer (unsigned char[]) 
+ * #define _SEQ_ADVBUF(len)      If the applic needs to know the exact
+ *                               size of the event, this macro can be used.
+ *                               Otherwise this must be defined as empty.
+ * #define _seqbufptr            Define the name of index variable or 0 if
+ *                               not required. 
+ */
+#define _SEQ_NEEDBUF(len)       /* empty */
+#endif
+
+#define SEQ_VOLUME_MODE(dev, mode)      {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr] = SEQ_EXTENDED;\
+                                        _seqbuf[_seqbufptr+1] = SEQ_VOLMODE;\
+                                        _seqbuf[_seqbufptr+2] = (dev);\
+                                        _seqbuf[_seqbufptr+3] = (mode);\
+                                        _seqbuf[_seqbufptr+4] = 0;\
+                                        _seqbuf[_seqbufptr+5] = 0;\
+                                        _seqbuf[_seqbufptr+6] = 0;\
+                                        _seqbuf[_seqbufptr+7] = 0;\
+                                        _SEQ_ADVBUF(8);}
+
+/*
+ * Midi voice messages
+ */
+
+#define _CHN_VOICE(dev, event, chn, note, parm) \
+                                        {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr] = EV_CHN_VOICE;\
+                                        _seqbuf[_seqbufptr+1] = (dev);\
+                                        _seqbuf[_seqbufptr+2] = (event);\
+                                        _seqbuf[_seqbufptr+3] = (chn);\
+                                        _seqbuf[_seqbufptr+4] = (note);\
+                                        _seqbuf[_seqbufptr+5] = (parm);\
+                                        _seqbuf[_seqbufptr+6] = (0);\
+                                        _seqbuf[_seqbufptr+7] = 0;\
+                                        _SEQ_ADVBUF(8);}
+
+#define SEQ_START_NOTE(dev, chn, note, vol) \
+                _CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol)
+
+#define SEQ_STOP_NOTE(dev, chn, note, vol) \
+                _CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol)
+
+#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) \
+                _CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure)
+
+/*
+ * Midi channel messages
+ */
+
+#define _CHN_COMMON(dev, event, chn, p1, p2, w14) \
+                                        {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr] = EV_CHN_COMMON;\
+                                        _seqbuf[_seqbufptr+1] = (dev);\
+                                        _seqbuf[_seqbufptr+2] = (event);\
+                                        _seqbuf[_seqbufptr+3] = (chn);\
+                                        _seqbuf[_seqbufptr+4] = (p1);\
+                                        _seqbuf[_seqbufptr+5] = (p2);\
+                                        *(short *)&_seqbuf[_seqbufptr+6] = (w14);\
+                                        _SEQ_ADVBUF(8);}
+/*
+ * SEQ_SYSEX permits sending of sysex messages. (It may look that it permits
+ * sending any MIDI bytes but it's absolutely not possible. Trying to do
+ * so _will_ cause problems with MPU401 intelligent mode).
+ *
+ * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be 
+ * sent by calling SEQ_SYSEX() several times (there must be no other events
+ * between them). First sysex fragment must have 0xf0 in the first byte
+ * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
+ * between these sysex start and end markers cannot be larger than 0x7f. Also
+ * lengths of each fragments (except the last one) must be 6.
+ *
+ * Breaking the above rules may work with some MIDI ports but is likely to
+ * cause fatal problems with some other devices (such as MPU401).
+ */
+#define SEQ_SYSEX(dev, buf, len) \
+                                        {int ii, ll=(len); \
+                                         unsigned char *bufp=buf;\
+                                         if (ll>6)ll=6;\
+                                        _SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr] = EV_SYSEX;\
+                                        _seqbuf[_seqbufptr+1] = (dev);\
+                                        for(ii=0;ii<ll;ii++)\
+                                           _seqbuf[_seqbufptr+ii+2] = bufp[ii];\
+                                        for(ii=ll;ii<6;ii++)\
+                                           _seqbuf[_seqbufptr+ii+2] = 0xff;\
+                                        _SEQ_ADVBUF(8);}
+
+#define SEQ_CHN_PRESSURE(dev, chn, pressure) \
+                _CHN_COMMON(dev, MIDI_CHN_PRESSURE, chn, pressure, 0, 0)
+
+#define SEQ_SET_PATCH SEQ_PGM_CHANGE
+#define SEQ_PGM_CHANGE(dev, chn, patch) \
+                _CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0)
+
+#define SEQ_CONTROL(dev, chn, controller, value) \
+                _CHN_COMMON(dev, MIDI_CTL_CHANGE, chn, controller, 0, value)
+
+#define SEQ_BENDER(dev, chn, value) \
+                _CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
+
+
+#define SEQ_V2_X_CONTROL(dev, voice, controller, value) {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr] = SEQ_EXTENDED;\
+                                        _seqbuf[_seqbufptr+1] = SEQ_CONTROLLER;\
+                                        _seqbuf[_seqbufptr+2] = (dev);\
+                                        _seqbuf[_seqbufptr+3] = (voice);\
+                                        _seqbuf[_seqbufptr+4] = (controller);\
+                                        _seqbuf[_seqbufptr+5] = ((value)&0xff);\
+                                        _seqbuf[_seqbufptr+6] = ((value>>8)&0xff);\
+                                        _seqbuf[_seqbufptr+7] = 0;\
+                                        _SEQ_ADVBUF(8);}
+/*
+ * The following 5 macros are incorrectly implemented and obsolete.
+ * Use SEQ_BENDER and SEQ_CONTROL (with proper controller) instead.
+ */
+#define SEQ_PITCHBEND(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value)
+#define SEQ_BENDER_RANGE(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value)
+#define SEQ_EXPRESSION(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128)
+#define SEQ_MAIN_VOLUME(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100)
+#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
+
+/*
+ * Timing and synchronization macros
+ */
+
+#define _TIMER_EVENT(ev, parm)          {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr+0] = EV_TIMING; \
+                                        _seqbuf[_seqbufptr+1] = (ev); \
+                                        _seqbuf[_seqbufptr+2] = 0;\
+                                        _seqbuf[_seqbufptr+3] = 0;\
+                                        *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
+                                        _SEQ_ADVBUF(8);}
+
+#define SEQ_START_TIMER()               _TIMER_EVENT(TMR_START, 0)
+#define SEQ_STOP_TIMER()                _TIMER_EVENT(TMR_STOP, 0)
+#define SEQ_CONTINUE_TIMER()            _TIMER_EVENT(TMR_CONTINUE, 0)
+#define SEQ_WAIT_TIME(ticks)            _TIMER_EVENT(TMR_WAIT_ABS, ticks)
+#define SEQ_DELTA_TIME(ticks)           _TIMER_EVENT(TMR_WAIT_REL, ticks)
+#define SEQ_ECHO_BACK(key)              _TIMER_EVENT(TMR_ECHO, key)
+#define SEQ_SET_TEMPO(value)            _TIMER_EVENT(TMR_TEMPO, value)
+#define SEQ_SONGPOS(pos)                _TIMER_EVENT(TMR_SPP, pos)
+#define SEQ_TIME_SIGNATURE(sig)         _TIMER_EVENT(TMR_TIMESIG, sig)
+
+/*
+ * Local control events
+ */
+
+#define _LOCAL_EVENT(ev, parm)          {_SEQ_NEEDBUF(8);\
+                                        _seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
+                                        _seqbuf[_seqbufptr+1] = (ev); \
+                                        _seqbuf[_seqbufptr+2] = 0;\
+                                        _seqbuf[_seqbufptr+3] = 0;\
+                                        *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
+                                        _SEQ_ADVBUF(8);}
+
+#define SEQ_PLAYAUDIO(devmask)          _LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
+/*
+ * Events for the level 1 interface only 
+ */
+
+#define SEQ_MIDIOUT(device, byte)       {_SEQ_NEEDBUF(4);\
+                                        _seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
+                                        _seqbuf[_seqbufptr+1] = (byte);\
+                                        _seqbuf[_seqbufptr+2] = (device);\
+                                        _seqbuf[_seqbufptr+3] = 0;\
+                                        _SEQ_ADVBUF(4);}
+
+/*
+ * Patch loading.
+ */
+#define SEQ_WRPATCH(patchx, len) \
+                {if (_seqbufptr) SEQ_DUMPBUF();\
+                 if (write(seqfd, (char*)(patchx), len)==-1) \
+                    perror("Write patch: /dev/sequencer");}
+#define SEQ_WRPATCH2(patchx, len) \
+                (SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len))
+
+#endif
+#endif /* _UAPISOUNDCARD_H */
diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild
index aafaa5aa54d4..0cc747eff165 100644
--- a/include/uapi/linux/spi/Kbuild
+++ b/include/uapi/linux/spi/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += spidev.h
diff --git a/include/linux/spi/spidev.h b/include/uapi/linux/spi/spidev.h
index 52d9ed01855f..52d9ed01855f 100644
--- a/include/linux/spi/spidev.h
+++ b/include/uapi/linux/spi/spidev.h
diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h
new file mode 100644
index 000000000000..7fec7e36d921
--- /dev/null
+++ b/include/uapi/linux/stat.h
@@ -0,0 +1,45 @@
+#ifndef _UAPI_LINUX_STAT_H
+#define _UAPI_LINUX_STAT_H
+
+
+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+
+#define S_IFMT  00170000
+#define S_IFSOCK 0140000
+#define S_IFLNK  0120000
+#define S_IFREG  0100000
+#define S_IFBLK  0060000
+#define S_IFDIR  0040000
+#define S_IFCHR  0020000
+#define S_IFIFO  0010000
+#define S_ISUID  0004000
+#define S_ISGID  0002000
+#define S_ISVTX  0001000
+
+#define S_ISLNK(m)      (((m) & S_IFMT) == S_IFLNK)
+#define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
+#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)
+#define S_ISCHR(m)      (((m) & S_IFMT) == S_IFCHR)
+#define S_ISBLK(m)      (((m) & S_IFMT) == S_IFBLK)
+#define S_ISFIFO(m)     (((m) & S_IFMT) == S_IFIFO)
+#define S_ISSOCK(m)     (((m) & S_IFMT) == S_IFSOCK)
+
+#define S_IRWXU 00700
+#define S_IRUSR 00400
+#define S_IWUSR 00200
+#define S_IXUSR 00100
+
+#define S_IRWXG 00070
+#define S_IRGRP 00040
+#define S_IWGRP 00020
+#define S_IXGRP 00010
+
+#define S_IRWXO 00007
+#define S_IROTH 00004
+#define S_IWOTH 00002
+#define S_IXOTH 00001
+
+#endif
+
+
+#endif /* _UAPI_LINUX_STAT_H */
diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
new file mode 100644
index 000000000000..aa9f10428743
--- /dev/null
+++ b/include/uapi/linux/stddef.h
@@ -0,0 +1 @@
+#include <linux/compiler.h>
diff --git a/include/uapi/linux/string.h b/include/uapi/linux/string.h
new file mode 100644
index 000000000000..e32e545cff5a
--- /dev/null
+++ b/include/uapi/linux/string.h
@@ -0,0 +1,9 @@
+#ifndef _UAPI_LINUX_STRING_H_
+#define _UAPI_LINUX_STRING_H_
+
+/* We don't want strings.h stuff being used by user stuff by accident */
+
+#ifndef __KERNEL__
+#include <string.h>
+#endif /* __KERNEL__ */
+#endif /* _UAPI_LINUX_STRING_H_ */
diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild
index aafaa5aa54d4..8e02e47c20fb 100644
--- a/include/uapi/linux/sunrpc/Kbuild
+++ b/include/uapi/linux/sunrpc/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += debug.h
diff --git a/include/uapi/linux/sunrpc/debug.h b/include/uapi/linux/sunrpc/debug.h
new file mode 100644
index 000000000000..830e34493a8c
--- /dev/null
+++ b/include/uapi/linux/sunrpc/debug.h
@@ -0,0 +1,48 @@
+/*
+ * linux/include/linux/sunrpc/debug.h
+ *
+ * Debugging support for sunrpc module
+ *
+ * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPI_LINUX_SUNRPC_DEBUG_H_
+#define _UAPI_LINUX_SUNRPC_DEBUG_H_
+
+/*
+ * RPC debug facilities
+ */
+#define RPCDBG_XPRT             0x0001
+#define RPCDBG_CALL             0x0002
+#define RPCDBG_DEBUG            0x0004
+#define RPCDBG_NFS              0x0008
+#define RPCDBG_AUTH             0x0010
+#define RPCDBG_BIND             0x0020
+#define RPCDBG_SCHED            0x0040
+#define RPCDBG_TRANS            0x0080
+#define RPCDBG_SVCXPRT          0x0100
+#define RPCDBG_SVCDSP           0x0200
+#define RPCDBG_MISC             0x0400
+#define RPCDBG_CACHE            0x0800
+#define RPCDBG_ALL              0x7fff
+
+
+/*
+ * Declarations for the sysctl debug interface, which allows to read or
+ * change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
+ * module currently registers its sysctl table dynamically, the sysctl path
+ * for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
+ */
+
+enum {
+        CTL_RPCDEBUG = 1,
+        CTL_NFSDEBUG,
+        CTL_NFSDDEBUG,
+        CTL_NLMDEBUG,
+        CTL_SLOTTABLE_UDP,
+        CTL_SLOTTABLE_TCP,
+        CTL_MIN_RESVPORT,
+        CTL_MAX_RESVPORT,
+};
+
+#endif /* _UAPI_LINUX_SUNRPC_DEBUG_H_ */
diff --git a/include/linux/suspend_ioctls.h b/include/uapi/linux/suspend_ioctls.h
index 0b30382984fe..0b30382984fe 100644
--- a/include/linux/suspend_ioctls.h
+++ b/include/uapi/linux/suspend_ioctls.h
diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
new file mode 100644
index 000000000000..e811474724c2
--- /dev/null
+++ b/include/uapi/linux/swab.h
@@ -0,0 +1,282 @@
+#ifndef _UAPI_LINUX_SWAB_H
+#define _UAPI_LINUX_SWAB_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <asm/swab.h>
+
+/*
+ * casts are necessary for constants, because we never know how for sure
+ * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
+ */
+#define ___constant_swab16(x) ((__u16)(                         \
+        (((__u16)(x) & (__u16)0x00ffU) << 8) |                  \
+        (((__u16)(x) & (__u16)0xff00U) >> 8)))
+
+#define ___constant_swab32(x) ((__u32)(                         \
+        (((__u32)(x) & (__u32)0x000000ffUL) << 24) |            \
+        (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) |            \
+        (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) |            \
+        (((__u32)(x) & (__u32)0xff000000UL) >> 24)))
+
+#define ___constant_swab64(x) ((__u64)(                         \
+        (((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) |   \
+        (((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) |   \
+        (((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) |   \
+        (((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) |   \
+        (((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) |   \
+        (((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) |   \
+        (((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) |   \
+        (((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56)))
+
+#define ___constant_swahw32(x) ((__u32)(                        \
+        (((__u32)(x) & (__u32)0x0000ffffUL) << 16) |            \
+        (((__u32)(x) & (__u32)0xffff0000UL) >> 16)))
+
+#define ___constant_swahb32(x) ((__u32)(                        \
+        (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) |             \
+        (((__u32)(x) & (__u32)0xff00ff00UL) >> 8)))
+
+/*
+ * Implement the following as inlines, but define the interface using
+ * macros to allow constant folding when possible:
+ * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
+ */
+
+static inline __attribute_const__ __u16 __fswab16(__u16 val)
+{
+#ifdef __arch_swab16
+        return __arch_swab16(val);
+#else
+        return ___constant_swab16(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 __fswab32(__u32 val)
+{
+#ifdef __arch_swab32
+        return __arch_swab32(val);
+#else
+        return ___constant_swab32(val);
+#endif
+}
+
+static inline __attribute_const__ __u64 __fswab64(__u64 val)
+{
+#ifdef __arch_swab64
+        return __arch_swab64(val);
+#elif defined(__SWAB_64_THRU_32__)
+        __u32 h = val >> 32;
+        __u32 l = val & ((1ULL << 32) - 1);
+        return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
+#else
+        return ___constant_swab64(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 __fswahw32(__u32 val)
+{
+#ifdef __arch_swahw32
+        return __arch_swahw32(val);
+#else
+        return ___constant_swahw32(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 __fswahb32(__u32 val)
+{
+#ifdef __arch_swahb32
+        return __arch_swahb32(val);
+#else
+        return ___constant_swahb32(val);
+#endif
+}
+
+/**
+ * __swab16 - return a byteswapped 16-bit value
+ * @x: value to byteswap
+ */
+#define __swab16(x)                             \
+        (__builtin_constant_p((__u16)(x)) ?     \
+        ___constant_swab16(x) :                 \
+        __fswab16(x))
+
+/**
+ * __swab32 - return a byteswapped 32-bit value
+ * @x: value to byteswap
+ */
+#define __swab32(x)                             \
+        (__builtin_constant_p((__u32)(x)) ?     \
+        ___constant_swab32(x) :                 \
+        __fswab32(x))
+
+/**
+ * __swab64 - return a byteswapped 64-bit value
+ * @x: value to byteswap
+ */
+#define __swab64(x)                             \
+        (__builtin_constant_p((__u64)(x)) ?     \
+        ___constant_swab64(x) :                 \
+        __fswab64(x))
+
+/**
+ * __swahw32 - return a word-swapped 32-bit value
+ * @x: value to wordswap
+ *
+ * __swahw32(0x12340000) is 0x00001234
+ */
+#define __swahw32(x)                            \
+        (__builtin_constant_p((__u32)(x)) ?     \
+        ___constant_swahw32(x) :                \
+        __fswahw32(x))
+
+/**
+ * __swahb32 - return a high and low byte-swapped 32-bit value
+ * @x: value to byteswap
+ *
+ * __swahb32(0x12345678) is 0x34127856
+ */
+#define __swahb32(x)                            \
+        (__builtin_constant_p((__u32)(x)) ?     \
+        ___constant_swahb32(x) :                \
+        __fswahb32(x))
+
+/**
+ * __swab16p - return a byteswapped 16-bit value from a pointer
+ * @p: pointer to a naturally-aligned 16-bit value
+ */
+static inline __u16 __swab16p(const __u16 *p)
+{
+#ifdef __arch_swab16p
+        return __arch_swab16p(p);
+#else
+        return __swab16(*p);
+#endif
+}
+
+/**
+ * __swab32p - return a byteswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ */
+static inline __u32 __swab32p(const __u32 *p)
+{
+#ifdef __arch_swab32p
+        return __arch_swab32p(p);
+#else
+        return __swab32(*p);
+#endif
+}
+
+/**
+ * __swab64p - return a byteswapped 64-bit value from a pointer
+ * @p: pointer to a naturally-aligned 64-bit value
+ */
+static inline __u64 __swab64p(const __u64 *p)
+{
+#ifdef __arch_swab64p
+        return __arch_swab64p(p);
+#else
+        return __swab64(*p);
+#endif
+}
+
+/**
+ * __swahw32p - return a wordswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahw32() for details of wordswapping.
+ */
+static inline __u32 __swahw32p(const __u32 *p)
+{
+#ifdef __arch_swahw32p
+        return __arch_swahw32p(p);
+#else
+        return __swahw32(*p);
+#endif
+}
+
+/**
+ * __swahb32p - return a high and low byteswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahb32() for details of high/low byteswapping.
+ */
+static inline __u32 __swahb32p(const __u32 *p)
+{
+#ifdef __arch_swahb32p
+        return __arch_swahb32p(p);
+#else
+        return __swahb32(*p);
+#endif
+}
+
+/**
+ * __swab16s - byteswap a 16-bit value in-place
+ * @p: pointer to a naturally-aligned 16-bit value
+ */
+static inline void __swab16s(__u16 *p)
+{
+#ifdef __arch_swab16s
+        __arch_swab16s(p);
+#else
+        *p = __swab16p(p);
+#endif
+}
+/**
+ * __swab32s - byteswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ */
+static inline void __swab32s(__u32 *p)
+{
+#ifdef __arch_swab32s
+        __arch_swab32s(p);
+#else
+        *p = __swab32p(p);
+#endif
+}
+
+/**
+ * __swab64s - byteswap a 64-bit value in-place
+ * @p: pointer to a naturally-aligned 64-bit value
+ */
+static inline void __swab64s(__u64 *p)
+{
+#ifdef __arch_swab64s
+        __arch_swab64s(p);
+#else
+        *p = __swab64p(p);
+#endif
+}
+
+/**
+ * __swahw32s - wordswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahw32() for details of wordswapping
+ */
+static inline void __swahw32s(__u32 *p)
+{
+#ifdef __arch_swahw32s
+        __arch_swahw32s(p);
+#else
+        *p = __swahw32p(p);
+#endif
+}
+
+/**
+ * __swahb32s - high and low byteswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahb32() for details of high and low byte swapping
+ */
+static inline void __swahb32s(__u32 *p)
+{
+#ifdef __arch_swahb32s
+        __arch_swahb32s(p);
+#else
+        *p = __swahb32p(p);
+#endif
+}
+
+
+#endif /* _UAPI_LINUX_SWAB_H */
diff --git a/include/uapi/linux/synclink.h b/include/uapi/linux/synclink.h
new file mode 100644
index 000000000000..7dcb065a5f76
--- /dev/null
+++ b/include/uapi/linux/synclink.h
@@ -0,0 +1,300 @@
+/*
+ * SyncLink Multiprotocol Serial Adapter Driver
+ *
+ * $Id: synclink.h,v 3.14 2006/07/17 20:15:43 paulkf Exp $
+ *
+ * Copyright (C) 1998-2000 by Microgate Corporation
+ *
+ * Redistribution of this file is permitted under
+ * the terms of the GNU Public License (GPL)
+ */
+
+#ifndef _UAPI_SYNCLINK_H_
+#define _UAPI_SYNCLINK_H_
+#define SYNCLINK_H_VERSION 3.6
+
+#include <linux/types.h>
+
+#define BIT0    0x0001
+#define BIT1    0x0002
+#define BIT2    0x0004
+#define BIT3    0x0008
+#define BIT4    0x0010
+#define BIT5    0x0020
+#define BIT6    0x0040
+#define BIT7    0x0080
+#define BIT8    0x0100
+#define BIT9    0x0200
+#define BIT10   0x0400
+#define BIT11   0x0800
+#define BIT12   0x1000
+#define BIT13   0x2000
+#define BIT14   0x4000
+#define BIT15   0x8000
+#define BIT16   0x00010000
+#define BIT17   0x00020000
+#define BIT18   0x00040000
+#define BIT19   0x00080000
+#define BIT20   0x00100000
+#define BIT21   0x00200000
+#define BIT22   0x00400000
+#define BIT23   0x00800000
+#define BIT24   0x01000000
+#define BIT25   0x02000000
+#define BIT26   0x04000000
+#define BIT27   0x08000000
+#define BIT28   0x10000000
+#define BIT29   0x20000000
+#define BIT30   0x40000000
+#define BIT31   0x80000000
+
+
+#define HDLC_MAX_FRAME_SIZE     65535
+#define MAX_ASYNC_TRANSMIT      4096
+#define MAX_ASYNC_BUFFER_SIZE   4096
+
+#define ASYNC_PARITY_NONE               0
+#define ASYNC_PARITY_EVEN               1
+#define ASYNC_PARITY_ODD                2
+#define ASYNC_PARITY_SPACE              3
+
+#define HDLC_FLAG_UNDERRUN_ABORT7       0x0000
+#define HDLC_FLAG_UNDERRUN_ABORT15      0x0001
+#define HDLC_FLAG_UNDERRUN_FLAG         0x0002
+#define HDLC_FLAG_UNDERRUN_CRC          0x0004
+#define HDLC_FLAG_SHARE_ZERO            0x0010
+#define HDLC_FLAG_AUTO_CTS              0x0020
+#define HDLC_FLAG_AUTO_DCD              0x0040
+#define HDLC_FLAG_AUTO_RTS              0x0080
+#define HDLC_FLAG_RXC_DPLL              0x0100
+#define HDLC_FLAG_RXC_BRG               0x0200
+#define HDLC_FLAG_RXC_TXCPIN            0x8000
+#define HDLC_FLAG_RXC_RXCPIN            0x0000
+#define HDLC_FLAG_TXC_DPLL              0x0400
+#define HDLC_FLAG_TXC_BRG               0x0800
+#define HDLC_FLAG_TXC_TXCPIN            0x0000
+#define HDLC_FLAG_TXC_RXCPIN            0x0008
+#define HDLC_FLAG_DPLL_DIV8             0x1000
+#define HDLC_FLAG_DPLL_DIV16            0x2000
+#define HDLC_FLAG_DPLL_DIV32            0x0000
+#define HDLC_FLAG_HDLC_LOOPMODE         0x4000
+
+#define HDLC_CRC_NONE                   0
+#define HDLC_CRC_16_CCITT               1
+#define HDLC_CRC_32_CCITT               2
+#define HDLC_CRC_MASK                   0x00ff
+#define HDLC_CRC_RETURN_EX              0x8000
+
+#define RX_OK                           0
+#define RX_CRC_ERROR                    1
+
+#define HDLC_TXIDLE_FLAGS               0
+#define HDLC_TXIDLE_ALT_ZEROS_ONES      1
+#define HDLC_TXIDLE_ZEROS               2
+#define HDLC_TXIDLE_ONES                3
+#define HDLC_TXIDLE_ALT_MARK_SPACE      4
+#define HDLC_TXIDLE_SPACE               5
+#define HDLC_TXIDLE_MARK                6
+#define HDLC_TXIDLE_CUSTOM_8            0x10000000
+#define HDLC_TXIDLE_CUSTOM_16           0x20000000
+
+#define HDLC_ENCODING_NRZ                       0
+#define HDLC_ENCODING_NRZB                      1
+#define HDLC_ENCODING_NRZI_MARK                 2
+#define HDLC_ENCODING_NRZI_SPACE                3
+#define HDLC_ENCODING_NRZI                      HDLC_ENCODING_NRZI_SPACE
+#define HDLC_ENCODING_BIPHASE_MARK              4
+#define HDLC_ENCODING_BIPHASE_SPACE             5
+#define HDLC_ENCODING_BIPHASE_LEVEL             6
+#define HDLC_ENCODING_DIFF_BIPHASE_LEVEL        7
+
+#define HDLC_PREAMBLE_LENGTH_8BITS      0
+#define HDLC_PREAMBLE_LENGTH_16BITS     1
+#define HDLC_PREAMBLE_LENGTH_32BITS     2
+#define HDLC_PREAMBLE_LENGTH_64BITS     3
+
+#define HDLC_PREAMBLE_PATTERN_NONE      0
+#define HDLC_PREAMBLE_PATTERN_ZEROS     1
+#define HDLC_PREAMBLE_PATTERN_FLAGS     2
+#define HDLC_PREAMBLE_PATTERN_10        3
+#define HDLC_PREAMBLE_PATTERN_01        4
+#define HDLC_PREAMBLE_PATTERN_ONES      5
+
+#define MGSL_MODE_ASYNC         1
+#define MGSL_MODE_HDLC          2
+#define MGSL_MODE_MONOSYNC      3
+#define MGSL_MODE_BISYNC        4
+#define MGSL_MODE_RAW           6
+#define MGSL_MODE_BASE_CLOCK    7
+#define MGSL_MODE_XSYNC         8
+
+#define MGSL_BUS_TYPE_ISA       1
+#define MGSL_BUS_TYPE_EISA      2
+#define MGSL_BUS_TYPE_PCI       5
+
+#define MGSL_INTERFACE_MASK     0xf
+#define MGSL_INTERFACE_DISABLE  0
+#define MGSL_INTERFACE_RS232    1
+#define MGSL_INTERFACE_V35      2
+#define MGSL_INTERFACE_RS422    3
+#define MGSL_INTERFACE_RTS_EN   0x10
+#define MGSL_INTERFACE_LL       0x20
+#define MGSL_INTERFACE_RL       0x40
+#define MGSL_INTERFACE_MSB_FIRST 0x80
+
+typedef struct _MGSL_PARAMS
+{
+        /* Common */
+
+        unsigned long   mode;           /* Asynchronous or HDLC */
+        unsigned char   loopback;       /* internal loopback mode */
+
+        /* HDLC Only */
+
+        unsigned short  flags;
+        unsigned char   encoding;       /* NRZ, NRZI, etc. */
+        unsigned long   clock_speed;    /* external clock speed in bits per second */
+        unsigned char   addr_filter;    /* receive HDLC address filter, 0xFF = disable */
+        unsigned short  crc_type;       /* None, CRC16-CCITT, or CRC32-CCITT */
+        unsigned char   preamble_length;
+        unsigned char   preamble;
+
+        /* Async Only */
+
+        unsigned long   data_rate;      /* bits per second */
+        unsigned char   data_bits;      /* 7 or 8 data bits */
+        unsigned char   stop_bits;      /* 1 or 2 stop bits */
+        unsigned char   parity;         /* none, even, or odd */
+
+} MGSL_PARAMS, *PMGSL_PARAMS;
+
+#define MICROGATE_VENDOR_ID 0x13c0
+#define SYNCLINK_DEVICE_ID 0x0010
+#define MGSCC_DEVICE_ID 0x0020
+#define SYNCLINK_SCA_DEVICE_ID 0x0030
+#define SYNCLINK_GT_DEVICE_ID 0x0070
+#define SYNCLINK_GT4_DEVICE_ID 0x0080
+#define SYNCLINK_AC_DEVICE_ID  0x0090
+#define SYNCLINK_GT2_DEVICE_ID 0x00A0
+#define MGSL_MAX_SERIAL_NUMBER 30
+
+/*
+** device diagnostics status
+*/
+
+#define DiagStatus_OK                           0
+#define DiagStatus_AddressFailure               1
+#define DiagStatus_AddressConflict              2
+#define DiagStatus_IrqFailure                   3
+#define DiagStatus_IrqConflict                  4
+#define DiagStatus_DmaFailure                   5
+#define DiagStatus_DmaConflict                  6
+#define DiagStatus_PciAdapterNotFound           7
+#define DiagStatus_CantAssignPciResources       8
+#define DiagStatus_CantAssignPciMemAddr         9
+#define DiagStatus_CantAssignPciIoAddr          10
+#define DiagStatus_CantAssignPciIrq             11
+#define DiagStatus_MemoryError                  12
+
+#define SerialSignal_DCD            0x01     /* Data Carrier Detect */
+#define SerialSignal_TXD            0x02     /* Transmit Data */
+#define SerialSignal_RI             0x04     /* Ring Indicator */
+#define SerialSignal_RXD            0x08     /* Receive Data */
+#define SerialSignal_CTS            0x10     /* Clear to Send */
+#define SerialSignal_RTS            0x20     /* Request to Send */
+#define SerialSignal_DSR            0x40     /* Data Set Ready */
+#define SerialSignal_DTR            0x80     /* Data Terminal Ready */
+
+
+/*
+ * Counters of the input lines (CTS, DSR, RI, CD) interrupts
+ */
+struct mgsl_icount {
+        __u32   cts, dsr, rng, dcd, tx, rx;
+        __u32   frame, parity, overrun, brk;
+        __u32   buf_overrun;
+        __u32   txok;
+        __u32   txunder;
+        __u32   txabort;
+        __u32   txtimeout;
+        __u32   rxshort;
+        __u32   rxlong;
+        __u32   rxabort;
+        __u32   rxover;
+        __u32   rxcrc;
+        __u32   rxok;
+        __u32   exithunt;
+        __u32   rxidle;
+};
+
+struct gpio_desc {
+        __u32 state;
+        __u32 smask;
+        __u32 dir;
+        __u32 dmask;
+};
+
+#define DEBUG_LEVEL_DATA        1
+#define DEBUG_LEVEL_ERROR       2
+#define DEBUG_LEVEL_INFO        3
+#define DEBUG_LEVEL_BH          4
+#define DEBUG_LEVEL_ISR         5
+
+/*
+** Event bit flags for use with MgslWaitEvent
+*/
+
+#define MgslEvent_DsrActive     0x0001
+#define MgslEvent_DsrInactive   0x0002
+#define MgslEvent_Dsr           0x0003
+#define MgslEvent_CtsActive     0x0004
+#define MgslEvent_CtsInactive   0x0008
+#define MgslEvent_Cts           0x000c
+#define MgslEvent_DcdActive     0x0010
+#define MgslEvent_DcdInactive   0x0020
+#define MgslEvent_Dcd           0x0030
+#define MgslEvent_RiActive      0x0040
+#define MgslEvent_RiInactive    0x0080
+#define MgslEvent_Ri            0x00c0
+#define MgslEvent_ExitHuntMode  0x0100
+#define MgslEvent_IdleReceived  0x0200
+
+/* Private IOCTL codes:
+ *
+ * MGSL_IOCSPARAMS      set MGSL_PARAMS structure values
+ * MGSL_IOCGPARAMS      get current MGSL_PARAMS structure values
+ * MGSL_IOCSTXIDLE      set current transmit idle mode
+ * MGSL_IOCGTXIDLE      get current transmit idle mode
+ * MGSL_IOCTXENABLE     enable or disable transmitter
+ * MGSL_IOCRXENABLE     enable or disable receiver
+ * MGSL_IOCTXABORT      abort transmitting frame (HDLC)
+ * MGSL_IOCGSTATS       return current statistics
+ * MGSL_IOCWAITEVENT    wait for specified event to occur
+ * MGSL_LOOPTXDONE      transmit in HDLC LoopMode done
+ * MGSL_IOCSIF          set the serial interface type
+ * MGSL_IOCGIF          get the serial interface type
+ */
+#define MGSL_MAGIC_IOC  'm'
+#define MGSL_IOCSPARAMS         _IOW(MGSL_MAGIC_IOC,0,struct _MGSL_PARAMS)
+#define MGSL_IOCGPARAMS         _IOR(MGSL_MAGIC_IOC,1,struct _MGSL_PARAMS)
+#define MGSL_IOCSTXIDLE         _IO(MGSL_MAGIC_IOC,2)
+#define MGSL_IOCGTXIDLE         _IO(MGSL_MAGIC_IOC,3)
+#define MGSL_IOCTXENABLE        _IO(MGSL_MAGIC_IOC,4)
+#define MGSL_IOCRXENABLE        _IO(MGSL_MAGIC_IOC,5)
+#define MGSL_IOCTXABORT         _IO(MGSL_MAGIC_IOC,6)
+#define MGSL_IOCGSTATS          _IO(MGSL_MAGIC_IOC,7)
+#define MGSL_IOCWAITEVENT       _IOWR(MGSL_MAGIC_IOC,8,int)
+#define MGSL_IOCCLRMODCOUNT     _IO(MGSL_MAGIC_IOC,15)
+#define MGSL_IOCLOOPTXDONE      _IO(MGSL_MAGIC_IOC,9)
+#define MGSL_IOCSIF             _IO(MGSL_MAGIC_IOC,10)
+#define MGSL_IOCGIF             _IO(MGSL_MAGIC_IOC,11)
+#define MGSL_IOCSGPIO           _IOW(MGSL_MAGIC_IOC,16,struct gpio_desc)
+#define MGSL_IOCGGPIO           _IOR(MGSL_MAGIC_IOC,17,struct gpio_desc)
+#define MGSL_IOCWAITGPIO        _IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc)
+#define MGSL_IOCSXSYNC          _IO(MGSL_MAGIC_IOC, 19)
+#define MGSL_IOCGXSYNC          _IO(MGSL_MAGIC_IOC, 20)
+#define MGSL_IOCSXCTRL          _IO(MGSL_MAGIC_IOC, 21)
+#define MGSL_IOCGXCTRL          _IO(MGSL_MAGIC_IOC, 22)
+
+
+#endif /* _UAPI_SYNCLINK_H_ */
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
new file mode 100644
index 000000000000..6d6721341f49
--- /dev/null
+++ b/include/uapi/linux/sysctl.h
@@ -0,0 +1,932 @@
+/*
+ * sysctl.h: General linux system control interface
+ *
+ * Begun 24 March 1995, Stephen Tweedie
+ *
+ ****************************************************************
+ ****************************************************************
+ **
+ **  WARNING:
+ **  The values in this file are exported to user space via 
+ **  the sysctl() binary interface.  Do *NOT* change the
+ **  numbering of any existing values here, and do not change
+ **  any numbers within any one set of values.  If you have to
+ **  redefine an existing interface, use a new number for it.
+ **  The kernel will then return -ENOTDIR to any application using
+ **  the old binary interface.
+ **
+ ****************************************************************
+ ****************************************************************
+ */
+
+#ifndef _UAPI_LINUX_SYSCTL_H
+#define _UAPI_LINUX_SYSCTL_H
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/compiler.h>
+
+struct completion;
+
+#define CTL_MAXNAME 10          /* how many path components do we allow in a
+                                   call to sysctl?   In other words, what is
+                                   the largest acceptable value for the nlen
+                                   member of a struct __sysctl_args to have? */
+
+struct __sysctl_args {
+        int __user *name;
+        int nlen;
+        void __user *oldval;
+        size_t __user *oldlenp;
+        void __user *newval;
+        size_t newlen;
+        unsigned long __unused[4];
+};
+
+/* Define sysctl names first */
+
+/* Top-level names: */
+
+enum
+{
+        CTL_KERN=1,             /* General kernel info and control */
+        CTL_VM=2,               /* VM management */
+        CTL_NET=3,              /* Networking */
+        CTL_PROC=4,             /* removal breaks strace(1) compilation */
+        CTL_FS=5,               /* Filesystems */
+        CTL_DEBUG=6,            /* Debugging */
+        CTL_DEV=7,              /* Devices */
+        CTL_BUS=8,              /* Busses */
+        CTL_ABI=9,              /* Binary emulation */
+        CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
+        CTL_ARLAN=254,          /* arlan wireless driver */
+        CTL_S390DBF=5677,       /* s390 debug */
+        CTL_SUNRPC=7249,        /* sunrpc debug */
+        CTL_PM=9899,            /* frv power management */
+        CTL_FRV=9898,           /* frv specific sysctls */
+};
+
+/* CTL_BUS names: */
+enum
+{
+        CTL_BUS_ISA=1           /* ISA */
+};
+
+/* /proc/sys/fs/inotify/ */
+enum
+{
+        INOTIFY_MAX_USER_INSTANCES=1,   /* max instances per user */
+        INOTIFY_MAX_USER_WATCHES=2,     /* max watches per user */
+        INOTIFY_MAX_QUEUED_EVENTS=3     /* max queued events per instance */
+};
+
+/* CTL_KERN names: */
+enum
+{
+        KERN_OSTYPE=1,          /* string: system version */
+        KERN_OSRELEASE=2,       /* string: system release */
+        KERN_OSREV=3,           /* int: system revision */
+        KERN_VERSION=4,         /* string: compile time info */
+        KERN_SECUREMASK=5,      /* struct: maximum rights mask */
+        KERN_PROF=6,            /* table: profiling information */
+        KERN_NODENAME=7,        /* string: hostname */
+        KERN_DOMAINNAME=8,      /* string: domainname */
+
+        KERN_PANIC=15,          /* int: panic timeout */
+        KERN_REALROOTDEV=16,    /* real root device to mount after initrd */
+
+        KERN_SPARC_REBOOT=21,   /* reboot command on Sparc */
+        KERN_CTLALTDEL=22,      /* int: allow ctl-alt-del to reboot */
+        KERN_PRINTK=23,         /* struct: control printk logging parameters */
+        KERN_NAMETRANS=24,      /* Name translation */
+        KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */
+        KERN_PPC_ZEROPAGED=26,  /* turn idle page zeroing on/off on PPC */
+        KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */
+        KERN_MODPROBE=28,       /* string: modprobe path */
+        KERN_SG_BIG_BUFF=29,    /* int: sg driver reserved buffer size */
+        KERN_ACCT=30,           /* BSD process accounting parameters */
+        KERN_PPC_L2CR=31,       /* l2cr register on PPC */
+
+        KERN_RTSIGNR=32,        /* Number of rt sigs queued */
+        KERN_RTSIGMAX=33,       /* Max queuable */
+        
+        KERN_SHMMAX=34,         /* long: Maximum shared memory segment */
+        KERN_MSGMAX=35,         /* int: Maximum size of a messege */
+        KERN_MSGMNB=36,         /* int: Maximum message queue size */
+        KERN_MSGPOOL=37,        /* int: Maximum system message pool size */
+        KERN_SYSRQ=38,          /* int: Sysreq enable */
+        KERN_MAX_THREADS=39,    /* int: Maximum nr of threads in the system */
+        KERN_RANDOM=40,         /* Random driver */
+        KERN_SHMALL=41,         /* int: Maximum size of shared memory */
+        KERN_MSGMNI=42,         /* int: msg queue identifiers */
+        KERN_SEM=43,            /* struct: sysv semaphore limits */
+        KERN_SPARC_STOP_A=44,   /* int: Sparc Stop-A enable */
+        KERN_SHMMNI=45,         /* int: shm array identifiers */
+        KERN_OVERFLOWUID=46,    /* int: overflow UID */
+        KERN_OVERFLOWGID=47,    /* int: overflow GID */
+        KERN_SHMPATH=48,        /* string: path to shm fs */
+        KERN_HOTPLUG=49,        /* string: path to uevent helper (deprecated) */
+        KERN_IEEE_EMULATION_WARNINGS=50, /* int: unimplemented ieee instructions */
+        KERN_S390_USER_DEBUG_LOGGING=51,  /* int: dumps of user faults */
+        KERN_CORE_USES_PID=52,          /* int: use core or core.%pid */
+        KERN_TAINTED=53,        /* int: various kernel tainted flags */
+        KERN_CADPID=54,         /* int: PID of the process to notify on CAD */
+        KERN_PIDMAX=55,         /* int: PID # limit */
+        KERN_CORE_PATTERN=56,   /* string: pattern for core-file names */
+        KERN_PANIC_ON_OOPS=57,  /* int: whether we will panic on an oops */
+        KERN_HPPA_PWRSW=58,     /* int: hppa soft-power enable */
+        KERN_HPPA_UNALIGNED=59, /* int: hppa unaligned-trap enable */
+        KERN_PRINTK_RATELIMIT=60, /* int: tune printk ratelimiting */
+        KERN_PRINTK_RATELIMIT_BURST=61, /* int: tune printk ratelimiting */
+        KERN_PTY=62,            /* dir: pty driver */
+        KERN_NGROUPS_MAX=63,    /* int: NGROUPS_MAX */
+        KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
+        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
+        KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
+        KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
+        KERN_RANDOMIZE=68, /* int: randomize virtual address space */
+        KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
+        KERN_SPIN_RETRY=70,     /* int: number of spinlock retries */
+        KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
+        KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
+        KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
+        KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */
+        KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
+        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
+};
+
+
+
+/* CTL_VM names: */
+enum
+{
+        VM_UNUSED1=1,           /* was: struct: Set vm swapping control */
+        VM_UNUSED2=2,           /* was; int: Linear or sqrt() swapout for hogs */
+        VM_UNUSED3=3,           /* was: struct: Set free page thresholds */
+        VM_UNUSED4=4,           /* Spare */
+        VM_OVERCOMMIT_MEMORY=5, /* Turn off the virtual memory safety limit */
+        VM_UNUSED5=6,           /* was: struct: Set buffer memory thresholds */
+        VM_UNUSED7=7,           /* was: struct: Set cache memory thresholds */
+        VM_UNUSED8=8,           /* was: struct: Control kswapd behaviour */
+        VM_UNUSED9=9,           /* was: struct: Set page table cache parameters */
+        VM_PAGE_CLUSTER=10,     /* int: set number of pages to swap together */
+        VM_DIRTY_BACKGROUND=11, /* dirty_background_ratio */
+        VM_DIRTY_RATIO=12,      /* dirty_ratio */
+        VM_DIRTY_WB_CS=13,      /* dirty_writeback_centisecs */
+        VM_DIRTY_EXPIRE_CS=14,  /* dirty_expire_centisecs */
+        VM_NR_PDFLUSH_THREADS=15, /* nr_pdflush_threads */
+        VM_OVERCOMMIT_RATIO=16, /* percent of RAM to allow overcommit in */
+        VM_PAGEBUF=17,          /* struct: Control pagebuf parameters */
+        VM_HUGETLB_PAGES=18,    /* int: Number of available Huge Pages */
+        VM_SWAPPINESS=19,       /* Tendency to steal mapped memory */
+        VM_LOWMEM_RESERVE_RATIO=20,/* reservation ratio for lower memory zones */
+        VM_MIN_FREE_KBYTES=21,  /* Minimum free kilobytes to maintain */
+        VM_MAX_MAP_COUNT=22,    /* int: Maximum number of mmaps/address-space */
+        VM_LAPTOP_MODE=23,      /* vm laptop mode */
+        VM_BLOCK_DUMP=24,       /* block dump mode */
+        VM_HUGETLB_GROUP=25,    /* permitted hugetlb group */
+        VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
+        VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
+        VM_SWAP_TOKEN_TIMEOUT=28, /* default time for token time out */
+        VM_DROP_PAGECACHE=29,   /* int: nuke lots of pagecache */
+        VM_PERCPU_PAGELIST_FRACTION=30,/* int: fraction of pages in each percpu_pagelist */
+        VM_ZONE_RECLAIM_MODE=31, /* reclaim local zone memory before going off node */
+        VM_MIN_UNMAPPED=32,     /* Set min percent of unmapped pages */
+        VM_PANIC_ON_OOM=33,     /* panic at out-of-memory */
+        VM_VDSO_ENABLED=34,     /* map VDSO into new processes? */
+        VM_MIN_SLAB=35,          /* Percent pages ignored by zone reclaim */
+};
+
+
+/* CTL_NET names: */
+enum
+{
+        NET_CORE=1,
+        NET_ETHER=2,
+        NET_802=3,
+        NET_UNIX=4,
+        NET_IPV4=5,
+        NET_IPX=6,
+        NET_ATALK=7,
+        NET_NETROM=8,
+        NET_AX25=9,
+        NET_BRIDGE=10,
+        NET_ROSE=11,
+        NET_IPV6=12,
+        NET_X25=13,
+        NET_TR=14,
+        NET_DECNET=15,
+        NET_ECONET=16,
+        NET_SCTP=17,
+        NET_LLC=18,
+        NET_NETFILTER=19,
+        NET_DCCP=20,
+        NET_IRDA=412,
+};
+
+/* /proc/sys/kernel/random */
+enum
+{
+        RANDOM_POOLSIZE=1,
+        RANDOM_ENTROPY_COUNT=2,
+        RANDOM_READ_THRESH=3,
+        RANDOM_WRITE_THRESH=4,
+        RANDOM_BOOT_ID=5,
+        RANDOM_UUID=6
+};
+
+/* /proc/sys/kernel/pty */
+enum
+{
+        PTY_MAX=1,
+        PTY_NR=2
+};
+
+/* /proc/sys/bus/isa */
+enum
+{
+        BUS_ISA_MEM_BASE=1,
+        BUS_ISA_PORT_BASE=2,
+        BUS_ISA_PORT_SHIFT=3
+};
+
+/* /proc/sys/net/core */
+enum
+{
+        NET_CORE_WMEM_MAX=1,
+        NET_CORE_RMEM_MAX=2,
+        NET_CORE_WMEM_DEFAULT=3,
+        NET_CORE_RMEM_DEFAULT=4,
+/* was  NET_CORE_DESTROY_DELAY */
+        NET_CORE_MAX_BACKLOG=6,
+        NET_CORE_FASTROUTE=7,
+        NET_CORE_MSG_COST=8,
+        NET_CORE_MSG_BURST=9,
+        NET_CORE_OPTMEM_MAX=10,
+        NET_CORE_HOT_LIST_LENGTH=11,
+        NET_CORE_DIVERT_VERSION=12,
+        NET_CORE_NO_CONG_THRESH=13,
+        NET_CORE_NO_CONG=14,
+        NET_CORE_LO_CONG=15,
+        NET_CORE_MOD_CONG=16,
+        NET_CORE_DEV_WEIGHT=17,
+        NET_CORE_SOMAXCONN=18,
+        NET_CORE_BUDGET=19,
+        NET_CORE_AEVENT_ETIME=20,
+        NET_CORE_AEVENT_RSEQTH=21,
+        NET_CORE_WARNINGS=22,
+};
+
+/* /proc/sys/net/ethernet */
+
+/* /proc/sys/net/802 */
+
+/* /proc/sys/net/unix */
+
+enum
+{
+        NET_UNIX_DESTROY_DELAY=1,
+        NET_UNIX_DELETE_DELAY=2,
+        NET_UNIX_MAX_DGRAM_QLEN=3,
+};
+
+/* /proc/sys/net/netfilter */
+enum
+{
+        NET_NF_CONNTRACK_MAX=1,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
+        NET_NF_CONNTRACK_UDP_TIMEOUT=10,
+        NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
+        NET_NF_CONNTRACK_ICMP_TIMEOUT=12,
+        NET_NF_CONNTRACK_GENERIC_TIMEOUT=13,
+        NET_NF_CONNTRACK_BUCKETS=14,
+        NET_NF_CONNTRACK_LOG_INVALID=15,
+        NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
+        NET_NF_CONNTRACK_TCP_LOOSE=17,
+        NET_NF_CONNTRACK_TCP_BE_LIBERAL=18,
+        NET_NF_CONNTRACK_TCP_MAX_RETRANS=19,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
+        NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
+        NET_NF_CONNTRACK_COUNT=27,
+        NET_NF_CONNTRACK_ICMPV6_TIMEOUT=28,
+        NET_NF_CONNTRACK_FRAG6_TIMEOUT=29,
+        NET_NF_CONNTRACK_FRAG6_LOW_THRESH=30,
+        NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31,
+        NET_NF_CONNTRACK_CHECKSUM=32,
+};
+
+/* /proc/sys/net/ipv4 */
+enum
+{
+        /* v2.0 compatibile variables */
+        NET_IPV4_FORWARD=8,
+        NET_IPV4_DYNADDR=9,
+
+        NET_IPV4_CONF=16,
+        NET_IPV4_NEIGH=17,
+        NET_IPV4_ROUTE=18,
+        NET_IPV4_FIB_HASH=19,
+        NET_IPV4_NETFILTER=20,
+
+        NET_IPV4_TCP_TIMESTAMPS=33,
+        NET_IPV4_TCP_WINDOW_SCALING=34,
+        NET_IPV4_TCP_SACK=35,
+        NET_IPV4_TCP_RETRANS_COLLAPSE=36,
+        NET_IPV4_DEFAULT_TTL=37,
+        NET_IPV4_AUTOCONFIG=38,
+        NET_IPV4_NO_PMTU_DISC=39,
+        NET_IPV4_TCP_SYN_RETRIES=40,
+        NET_IPV4_IPFRAG_HIGH_THRESH=41,
+        NET_IPV4_IPFRAG_LOW_THRESH=42,
+        NET_IPV4_IPFRAG_TIME=43,
+        NET_IPV4_TCP_MAX_KA_PROBES=44,
+        NET_IPV4_TCP_KEEPALIVE_TIME=45,
+        NET_IPV4_TCP_KEEPALIVE_PROBES=46,
+        NET_IPV4_TCP_RETRIES1=47,
+        NET_IPV4_TCP_RETRIES2=48,
+        NET_IPV4_TCP_FIN_TIMEOUT=49,
+        NET_IPV4_IP_MASQ_DEBUG=50,
+        NET_TCP_SYNCOOKIES=51,
+        NET_TCP_STDURG=52,
+        NET_TCP_RFC1337=53,
+        NET_TCP_SYN_TAILDROP=54,
+        NET_TCP_MAX_SYN_BACKLOG=55,
+        NET_IPV4_LOCAL_PORT_RANGE=56,
+        NET_IPV4_ICMP_ECHO_IGNORE_ALL=57,
+        NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS=58,
+        NET_IPV4_ICMP_SOURCEQUENCH_RATE=59,
+        NET_IPV4_ICMP_DESTUNREACH_RATE=60,
+        NET_IPV4_ICMP_TIMEEXCEED_RATE=61,
+        NET_IPV4_ICMP_PARAMPROB_RATE=62,
+        NET_IPV4_ICMP_ECHOREPLY_RATE=63,
+        NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES=64,
+        NET_IPV4_IGMP_MAX_MEMBERSHIPS=65,
+        NET_TCP_TW_RECYCLE=66,
+        NET_IPV4_ALWAYS_DEFRAG=67,
+        NET_IPV4_TCP_KEEPALIVE_INTVL=68,
+        NET_IPV4_INET_PEER_THRESHOLD=69,
+        NET_IPV4_INET_PEER_MINTTL=70,
+        NET_IPV4_INET_PEER_MAXTTL=71,
+        NET_IPV4_INET_PEER_GC_MINTIME=72,
+        NET_IPV4_INET_PEER_GC_MAXTIME=73,
+        NET_TCP_ORPHAN_RETRIES=74,
+        NET_TCP_ABORT_ON_OVERFLOW=75,
+        NET_TCP_SYNACK_RETRIES=76,
+        NET_TCP_MAX_ORPHANS=77,
+        NET_TCP_MAX_TW_BUCKETS=78,
+        NET_TCP_FACK=79,
+        NET_TCP_REORDERING=80,
+        NET_TCP_ECN=81,
+        NET_TCP_DSACK=82,
+        NET_TCP_MEM=83,
+        NET_TCP_WMEM=84,
+        NET_TCP_RMEM=85,
+        NET_TCP_APP_WIN=86,
+        NET_TCP_ADV_WIN_SCALE=87,
+        NET_IPV4_NONLOCAL_BIND=88,
+        NET_IPV4_ICMP_RATELIMIT=89,
+        NET_IPV4_ICMP_RATEMASK=90,
+        NET_TCP_TW_REUSE=91,
+        NET_TCP_FRTO=92,
+        NET_TCP_LOW_LATENCY=93,
+        NET_IPV4_IPFRAG_SECRET_INTERVAL=94,
+        NET_IPV4_IGMP_MAX_MSF=96,
+        NET_TCP_NO_METRICS_SAVE=97,
+        NET_TCP_DEFAULT_WIN_SCALE=105,
+        NET_TCP_MODERATE_RCVBUF=106,
+        NET_TCP_TSO_WIN_DIVISOR=107,
+        NET_TCP_BIC_BETA=108,
+        NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109,
+        NET_TCP_CONG_CONTROL=110,
+        NET_TCP_ABC=111,
+        NET_IPV4_IPFRAG_MAX_DIST=112,
+        NET_TCP_MTU_PROBING=113,
+        NET_TCP_BASE_MSS=114,
+        NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
+        NET_TCP_DMA_COPYBREAK=116,
+        NET_TCP_SLOW_START_AFTER_IDLE=117,
+        NET_CIPSOV4_CACHE_ENABLE=118,
+        NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
+        NET_CIPSOV4_RBM_OPTFMT=120,
+        NET_CIPSOV4_RBM_STRICTVALID=121,
+        NET_TCP_AVAIL_CONG_CONTROL=122,
+        NET_TCP_ALLOWED_CONG_CONTROL=123,
+        NET_TCP_MAX_SSTHRESH=124,
+        NET_TCP_FRTO_RESPONSE=125,
+};
+
+enum {
+        NET_IPV4_ROUTE_FLUSH=1,
+        NET_IPV4_ROUTE_MIN_DELAY=2, /* obsolete since 2.6.25 */
+        NET_IPV4_ROUTE_MAX_DELAY=3, /* obsolete since 2.6.25 */
+        NET_IPV4_ROUTE_GC_THRESH=4,
+        NET_IPV4_ROUTE_MAX_SIZE=5,
+        NET_IPV4_ROUTE_GC_MIN_INTERVAL=6,
+        NET_IPV4_ROUTE_GC_TIMEOUT=7,
+        NET_IPV4_ROUTE_GC_INTERVAL=8, /* obsolete since 2.6.38 */
+        NET_IPV4_ROUTE_REDIRECT_LOAD=9,
+        NET_IPV4_ROUTE_REDIRECT_NUMBER=10,
+        NET_IPV4_ROUTE_REDIRECT_SILENCE=11,
+        NET_IPV4_ROUTE_ERROR_COST=12,
+        NET_IPV4_ROUTE_ERROR_BURST=13,
+        NET_IPV4_ROUTE_GC_ELASTICITY=14,
+        NET_IPV4_ROUTE_MTU_EXPIRES=15,
+        NET_IPV4_ROUTE_MIN_PMTU=16,
+        NET_IPV4_ROUTE_MIN_ADVMSS=17,
+        NET_IPV4_ROUTE_SECRET_INTERVAL=18,
+        NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS=19,
+};
+
+enum
+{
+        NET_PROTO_CONF_ALL=-2,
+        NET_PROTO_CONF_DEFAULT=-3
+
+        /* And device ifindices ... */
+};
+
+enum
+{
+        NET_IPV4_CONF_FORWARDING=1,
+        NET_IPV4_CONF_MC_FORWARDING=2,
+        NET_IPV4_CONF_PROXY_ARP=3,
+        NET_IPV4_CONF_ACCEPT_REDIRECTS=4,
+        NET_IPV4_CONF_SECURE_REDIRECTS=5,
+        NET_IPV4_CONF_SEND_REDIRECTS=6,
+        NET_IPV4_CONF_SHARED_MEDIA=7,
+        NET_IPV4_CONF_RP_FILTER=8,
+        NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE=9,
+        NET_IPV4_CONF_BOOTP_RELAY=10,
+        NET_IPV4_CONF_LOG_MARTIANS=11,
+        NET_IPV4_CONF_TAG=12,
+        NET_IPV4_CONF_ARPFILTER=13,
+        NET_IPV4_CONF_MEDIUM_ID=14,
+        NET_IPV4_CONF_NOXFRM=15,
+        NET_IPV4_CONF_NOPOLICY=16,
+        NET_IPV4_CONF_FORCE_IGMP_VERSION=17,
+        NET_IPV4_CONF_ARP_ANNOUNCE=18,
+        NET_IPV4_CONF_ARP_IGNORE=19,
+        NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
+        NET_IPV4_CONF_ARP_ACCEPT=21,
+        NET_IPV4_CONF_ARP_NOTIFY=22,
+};
+
+/* /proc/sys/net/ipv4/netfilter */
+enum
+{
+        NET_IPV4_NF_CONNTRACK_MAX=1,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
+        NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT=10,
+        NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
+        NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12,
+        NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13,
+        NET_IPV4_NF_CONNTRACK_BUCKETS=14,
+        NET_IPV4_NF_CONNTRACK_LOG_INVALID=15,
+        NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
+        NET_IPV4_NF_CONNTRACK_TCP_LOOSE=17,
+        NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL=18,
+        NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS=19,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
+        NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
+        NET_IPV4_NF_CONNTRACK_COUNT=27,
+        NET_IPV4_NF_CONNTRACK_CHECKSUM=28,
+};
+ 
+/* /proc/sys/net/ipv6 */
+enum {
+        NET_IPV6_CONF=16,
+        NET_IPV6_NEIGH=17,
+        NET_IPV6_ROUTE=18,
+        NET_IPV6_ICMP=19,
+        NET_IPV6_BINDV6ONLY=20,
+        NET_IPV6_IP6FRAG_HIGH_THRESH=21,
+        NET_IPV6_IP6FRAG_LOW_THRESH=22,
+        NET_IPV6_IP6FRAG_TIME=23,
+        NET_IPV6_IP6FRAG_SECRET_INTERVAL=24,
+        NET_IPV6_MLD_MAX_MSF=25,
+};
+
+enum {
+        NET_IPV6_ROUTE_FLUSH=1,
+        NET_IPV6_ROUTE_GC_THRESH=2,
+        NET_IPV6_ROUTE_MAX_SIZE=3,
+        NET_IPV6_ROUTE_GC_MIN_INTERVAL=4,
+        NET_IPV6_ROUTE_GC_TIMEOUT=5,
+        NET_IPV6_ROUTE_GC_INTERVAL=6,
+        NET_IPV6_ROUTE_GC_ELASTICITY=7,
+        NET_IPV6_ROUTE_MTU_EXPIRES=8,
+        NET_IPV6_ROUTE_MIN_ADVMSS=9,
+        NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10
+};
+
+enum {
+        NET_IPV6_FORWARDING=1,
+        NET_IPV6_HOP_LIMIT=2,
+        NET_IPV6_MTU=3,
+        NET_IPV6_ACCEPT_RA=4,
+        NET_IPV6_ACCEPT_REDIRECTS=5,
+        NET_IPV6_AUTOCONF=6,
+        NET_IPV6_DAD_TRANSMITS=7,
+        NET_IPV6_RTR_SOLICITS=8,
+        NET_IPV6_RTR_SOLICIT_INTERVAL=9,
+        NET_IPV6_RTR_SOLICIT_DELAY=10,
+        NET_IPV6_USE_TEMPADDR=11,
+        NET_IPV6_TEMP_VALID_LFT=12,
+        NET_IPV6_TEMP_PREFERED_LFT=13,
+        NET_IPV6_REGEN_MAX_RETRY=14,
+        NET_IPV6_MAX_DESYNC_FACTOR=15,
+        NET_IPV6_MAX_ADDRESSES=16,
+        NET_IPV6_FORCE_MLD_VERSION=17,
+        NET_IPV6_ACCEPT_RA_DEFRTR=18,
+        NET_IPV6_ACCEPT_RA_PINFO=19,
+        NET_IPV6_ACCEPT_RA_RTR_PREF=20,
+        NET_IPV6_RTR_PROBE_INTERVAL=21,
+        NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
+        NET_IPV6_PROXY_NDP=23,
+        NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
+        __NET_IPV6_MAX
+};
+
+/* /proc/sys/net/ipv6/icmp */
+enum {
+        NET_IPV6_ICMP_RATELIMIT=1
+};
+
+/* /proc/sys/net/<protocol>/neigh/<dev> */
+enum {
+        NET_NEIGH_MCAST_SOLICIT=1,
+        NET_NEIGH_UCAST_SOLICIT=2,
+        NET_NEIGH_APP_SOLICIT=3,
+        NET_NEIGH_RETRANS_TIME=4,
+        NET_NEIGH_REACHABLE_TIME=5,
+        NET_NEIGH_DELAY_PROBE_TIME=6,
+        NET_NEIGH_GC_STALE_TIME=7,
+        NET_NEIGH_UNRES_QLEN=8,
+        NET_NEIGH_PROXY_QLEN=9,
+        NET_NEIGH_ANYCAST_DELAY=10,
+        NET_NEIGH_PROXY_DELAY=11,
+        NET_NEIGH_LOCKTIME=12,
+        NET_NEIGH_GC_INTERVAL=13,
+        NET_NEIGH_GC_THRESH1=14,
+        NET_NEIGH_GC_THRESH2=15,
+        NET_NEIGH_GC_THRESH3=16,
+        NET_NEIGH_RETRANS_TIME_MS=17,
+        NET_NEIGH_REACHABLE_TIME_MS=18,
+};
+
+/* /proc/sys/net/dccp */
+enum {
+        NET_DCCP_DEFAULT=1,
+};
+
+/* /proc/sys/net/ipx */
+enum {
+        NET_IPX_PPROP_BROADCASTING=1,
+        NET_IPX_FORWARDING=2
+};
+
+/* /proc/sys/net/llc */
+enum {
+        NET_LLC2=1,
+        NET_LLC_STATION=2,
+};
+
+/* /proc/sys/net/llc/llc2 */
+enum {
+        NET_LLC2_TIMEOUT=1,
+};
+
+/* /proc/sys/net/llc/station */
+enum {
+        NET_LLC_STATION_ACK_TIMEOUT=1,
+};
+
+/* /proc/sys/net/llc/llc2/timeout */
+enum {
+        NET_LLC2_ACK_TIMEOUT=1,
+        NET_LLC2_P_TIMEOUT=2,
+        NET_LLC2_REJ_TIMEOUT=3,
+        NET_LLC2_BUSY_TIMEOUT=4,
+};
+
+/* /proc/sys/net/appletalk */
+enum {
+        NET_ATALK_AARP_EXPIRY_TIME=1,
+        NET_ATALK_AARP_TICK_TIME=2,
+        NET_ATALK_AARP_RETRANSMIT_LIMIT=3,
+        NET_ATALK_AARP_RESOLVE_TIME=4
+};
+
+
+/* /proc/sys/net/netrom */
+enum {
+        NET_NETROM_DEFAULT_PATH_QUALITY=1,
+        NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER=2,
+        NET_NETROM_NETWORK_TTL_INITIALISER=3,
+        NET_NETROM_TRANSPORT_TIMEOUT=4,
+        NET_NETROM_TRANSPORT_MAXIMUM_TRIES=5,
+        NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY=6,
+        NET_NETROM_TRANSPORT_BUSY_DELAY=7,
+        NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8,
+        NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9,
+        NET_NETROM_ROUTING_CONTROL=10,
+        NET_NETROM_LINK_FAILS_COUNT=11,
+        NET_NETROM_RESET=12
+};
+
+/* /proc/sys/net/ax25 */
+enum {
+        NET_AX25_IP_DEFAULT_MODE=1,
+        NET_AX25_DEFAULT_MODE=2,
+        NET_AX25_BACKOFF_TYPE=3,
+        NET_AX25_CONNECT_MODE=4,
+        NET_AX25_STANDARD_WINDOW=5,
+        NET_AX25_EXTENDED_WINDOW=6,
+        NET_AX25_T1_TIMEOUT=7,
+        NET_AX25_T2_TIMEOUT=8,
+        NET_AX25_T3_TIMEOUT=9,
+        NET_AX25_IDLE_TIMEOUT=10,
+        NET_AX25_N2=11,
+        NET_AX25_PACLEN=12,
+        NET_AX25_PROTOCOL=13,
+        NET_AX25_DAMA_SLAVE_TIMEOUT=14
+};
+
+/* /proc/sys/net/rose */
+enum {
+        NET_ROSE_RESTART_REQUEST_TIMEOUT=1,
+        NET_ROSE_CALL_REQUEST_TIMEOUT=2,
+        NET_ROSE_RESET_REQUEST_TIMEOUT=3,
+        NET_ROSE_CLEAR_REQUEST_TIMEOUT=4,
+        NET_ROSE_ACK_HOLD_BACK_TIMEOUT=5,
+        NET_ROSE_ROUTING_CONTROL=6,
+        NET_ROSE_LINK_FAIL_TIMEOUT=7,
+        NET_ROSE_MAX_VCS=8,
+        NET_ROSE_WINDOW_SIZE=9,
+        NET_ROSE_NO_ACTIVITY_TIMEOUT=10
+};
+
+/* /proc/sys/net/x25 */
+enum {
+        NET_X25_RESTART_REQUEST_TIMEOUT=1,
+        NET_X25_CALL_REQUEST_TIMEOUT=2,
+        NET_X25_RESET_REQUEST_TIMEOUT=3,
+        NET_X25_CLEAR_REQUEST_TIMEOUT=4,
+        NET_X25_ACK_HOLD_BACK_TIMEOUT=5,
+        NET_X25_FORWARD=6
+};
+
+/* /proc/sys/net/token-ring */
+enum
+{
+        NET_TR_RIF_TIMEOUT=1
+};
+
+/* /proc/sys/net/decnet/ */
+enum {
+        NET_DECNET_NODE_TYPE = 1,
+        NET_DECNET_NODE_ADDRESS = 2,
+        NET_DECNET_NODE_NAME = 3,
+        NET_DECNET_DEFAULT_DEVICE = 4,
+        NET_DECNET_TIME_WAIT = 5,
+        NET_DECNET_DN_COUNT = 6,
+        NET_DECNET_DI_COUNT = 7,
+        NET_DECNET_DR_COUNT = 8,
+        NET_DECNET_DST_GC_INTERVAL = 9,
+        NET_DECNET_CONF = 10,
+        NET_DECNET_NO_FC_MAX_CWND = 11,
+        NET_DECNET_MEM = 12,
+        NET_DECNET_RMEM = 13,
+        NET_DECNET_WMEM = 14,
+        NET_DECNET_DEBUG_LEVEL = 255
+};
+
+/* /proc/sys/net/decnet/conf/<dev> */
+enum {
+        NET_DECNET_CONF_LOOPBACK = -2,
+        NET_DECNET_CONF_DDCMP = -3,
+        NET_DECNET_CONF_PPP = -4,
+        NET_DECNET_CONF_X25 = -5,
+        NET_DECNET_CONF_GRE = -6,
+        NET_DECNET_CONF_ETHER = -7
+
+        /* ... and ifindex of devices */
+};
+
+/* /proc/sys/net/decnet/conf/<dev>/ */
+enum {
+        NET_DECNET_CONF_DEV_PRIORITY = 1,
+        NET_DECNET_CONF_DEV_T1 = 2,
+        NET_DECNET_CONF_DEV_T2 = 3,
+        NET_DECNET_CONF_DEV_T3 = 4,
+        NET_DECNET_CONF_DEV_FORWARDING = 5,
+        NET_DECNET_CONF_DEV_BLKSIZE = 6,
+        NET_DECNET_CONF_DEV_STATE = 7
+};
+
+/* /proc/sys/net/sctp */
+enum {
+        NET_SCTP_RTO_INITIAL = 1,
+        NET_SCTP_RTO_MIN     = 2,
+        NET_SCTP_RTO_MAX     = 3,
+        NET_SCTP_RTO_ALPHA   = 4,
+        NET_SCTP_RTO_BETA    = 5,
+        NET_SCTP_VALID_COOKIE_LIFE       =  6,
+        NET_SCTP_ASSOCIATION_MAX_RETRANS =  7,
+        NET_SCTP_PATH_MAX_RETRANS        =  8,
+        NET_SCTP_MAX_INIT_RETRANSMITS    =  9,
+        NET_SCTP_HB_INTERVAL             = 10,
+        NET_SCTP_PRESERVE_ENABLE         = 11,
+        NET_SCTP_MAX_BURST               = 12,
+        NET_SCTP_ADDIP_ENABLE            = 13,
+        NET_SCTP_PRSCTP_ENABLE           = 14,
+        NET_SCTP_SNDBUF_POLICY           = 15,
+        NET_SCTP_SACK_TIMEOUT            = 16,
+        NET_SCTP_RCVBUF_POLICY           = 17,
+};
+
+/* /proc/sys/net/bridge */
+enum {
+        NET_BRIDGE_NF_CALL_ARPTABLES = 1,
+        NET_BRIDGE_NF_CALL_IPTABLES = 2,
+        NET_BRIDGE_NF_CALL_IP6TABLES = 3,
+        NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
+        NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
+};
+
+/* proc/sys/net/irda */
+enum {
+        NET_IRDA_DISCOVERY=1,
+        NET_IRDA_DEVNAME=2,
+        NET_IRDA_DEBUG=3,
+        NET_IRDA_FAST_POLL=4,
+        NET_IRDA_DISCOVERY_SLOTS=5,
+        NET_IRDA_DISCOVERY_TIMEOUT=6,
+        NET_IRDA_SLOT_TIMEOUT=7,
+        NET_IRDA_MAX_BAUD_RATE=8,
+        NET_IRDA_MIN_TX_TURN_TIME=9,
+        NET_IRDA_MAX_TX_DATA_SIZE=10,
+        NET_IRDA_MAX_TX_WINDOW=11,
+        NET_IRDA_MAX_NOREPLY_TIME=12,
+        NET_IRDA_WARN_NOREPLY_TIME=13,
+        NET_IRDA_LAP_KEEPALIVE_TIME=14,
+};
+
+
+/* CTL_FS names: */
+enum
+{
+        FS_NRINODE=1,   /* int:current number of allocated inodes */
+        FS_STATINODE=2,
+        FS_MAXINODE=3,  /* int:maximum number of inodes that can be allocated */
+        FS_NRDQUOT=4,   /* int:current number of allocated dquots */
+        FS_MAXDQUOT=5,  /* int:maximum number of dquots that can be allocated */
+        FS_NRFILE=6,    /* int:current number of allocated filedescriptors */
+        FS_MAXFILE=7,   /* int:maximum number of filedescriptors that can be allocated */
+        FS_DENTRY=8,
+        FS_NRSUPER=9,   /* int:current number of allocated super_blocks */
+        FS_MAXSUPER=10, /* int:maximum number of super_blocks that can be allocated */
+        FS_OVERFLOWUID=11,      /* int: overflow UID */
+        FS_OVERFLOWGID=12,      /* int: overflow GID */
+        FS_LEASES=13,   /* int: leases enabled */
+        FS_DIR_NOTIFY=14,       /* int: directory notification enabled */
+        FS_LEASE_TIME=15,       /* int: maximum time to wait for a lease break */
+        FS_DQSTATS=16,  /* disc quota usage statistics and control */
+        FS_XFS=17,      /* struct: control xfs parameters */
+        FS_AIO_NR=18,   /* current system-wide number of aio requests */
+        FS_AIO_MAX_NR=19,       /* system-wide maximum number of aio requests */
+        FS_INOTIFY=20,  /* inotify submenu */
+        FS_OCFS2=988,   /* ocfs2 */
+};
+
+/* /proc/sys/fs/quota/ */
+enum {
+        FS_DQ_LOOKUPS = 1,
+        FS_DQ_DROPS = 2,
+        FS_DQ_READS = 3,
+        FS_DQ_WRITES = 4,
+        FS_DQ_CACHE_HITS = 5,
+        FS_DQ_ALLOCATED = 6,
+        FS_DQ_FREE = 7,
+        FS_DQ_SYNCS = 8,
+        FS_DQ_WARNINGS = 9,
+};
+
+/* CTL_DEBUG names: */
+
+/* CTL_DEV names: */
+enum {
+        DEV_CDROM=1,
+        DEV_HWMON=2,
+        DEV_PARPORT=3,
+        DEV_RAID=4,
+        DEV_MAC_HID=5,
+        DEV_SCSI=6,
+        DEV_IPMI=7,
+};
+
+/* /proc/sys/dev/cdrom */
+enum {
+        DEV_CDROM_INFO=1,
+        DEV_CDROM_AUTOCLOSE=2,
+        DEV_CDROM_AUTOEJECT=3,
+        DEV_CDROM_DEBUG=4,
+        DEV_CDROM_LOCK=5,
+        DEV_CDROM_CHECK_MEDIA=6
+};
+
+/* /proc/sys/dev/parport */
+enum {
+        DEV_PARPORT_DEFAULT=-3
+};
+
+/* /proc/sys/dev/raid */
+enum {
+        DEV_RAID_SPEED_LIMIT_MIN=1,
+        DEV_RAID_SPEED_LIMIT_MAX=2
+};
+
+/* /proc/sys/dev/parport/default */
+enum {
+        DEV_PARPORT_DEFAULT_TIMESLICE=1,
+        DEV_PARPORT_DEFAULT_SPINTIME=2
+};
+
+/* /proc/sys/dev/parport/parport n */
+enum {
+        DEV_PARPORT_SPINTIME=1,
+        DEV_PARPORT_BASE_ADDR=2,
+        DEV_PARPORT_IRQ=3,
+        DEV_PARPORT_DMA=4,
+        DEV_PARPORT_MODES=5,
+        DEV_PARPORT_DEVICES=6,
+        DEV_PARPORT_AUTOPROBE=16
+};
+
+/* /proc/sys/dev/parport/parport n/devices/ */
+enum {
+        DEV_PARPORT_DEVICES_ACTIVE=-3,
+};
+
+/* /proc/sys/dev/parport/parport n/devices/device n */
+enum {
+        DEV_PARPORT_DEVICE_TIMESLICE=1,
+};
+
+/* /proc/sys/dev/mac_hid */
+enum {
+        DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES=1,
+        DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES=2,
+        DEV_MAC_HID_MOUSE_BUTTON_EMULATION=3,
+        DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE=4,
+        DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE=5,
+        DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6
+};
+
+/* /proc/sys/dev/scsi */
+enum {
+        DEV_SCSI_LOGGING_LEVEL=1,
+};
+
+/* /proc/sys/dev/ipmi */
+enum {
+        DEV_IPMI_POWEROFF_POWERCYCLE=1,
+};
+
+/* /proc/sys/abi */
+enum
+{
+        ABI_DEFHANDLER_COFF=1,  /* default handler for coff binaries */
+        ABI_DEFHANDLER_ELF=2,   /* default handler for ELF binaries */
+        ABI_DEFHANDLER_LCALL7=3,/* default handler for procs using lcall7 */
+        ABI_DEFHANDLER_LIBCSO=4,/* default handler for an libc.so ELF interp */
+        ABI_TRACE=5,            /* tracing flags */
+        ABI_FAKE_UTSNAME=6,     /* fake target utsname information */
+};
+
+
+#endif /* _UAPI_LINUX_SYSCTL_H */
diff --git a/include/linux/sysinfo.h b/include/uapi/linux/sysinfo.h
index 934335a22522..934335a22522 100644
--- a/include/linux/sysinfo.h
+++ b/include/uapi/linux/sysinfo.h
diff --git a/include/linux/taskstats.h b/include/uapi/linux/taskstats.h
index 2466e550a41d..2466e550a41d 100644
--- a/include/linux/taskstats.h
+++ b/include/uapi/linux/taskstats.h
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild
index aafaa5aa54d4..0623ec4e728f 100644
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
@@ -1 +1,8 @@
 # UAPI Header export list
+header-y += tc_csum.h
+header-y += tc_gact.h
+header-y += tc_ipt.h
+header-y += tc_mirred.h
+header-y += tc_nat.h
+header-y += tc_pedit.h
+header-y += tc_skbedit.h
diff --git a/include/linux/tc_act/tc_csum.h b/include/uapi/linux/tc_act/tc_csum.h
index a047c49a3153..a047c49a3153 100644
--- a/include/linux/tc_act/tc_csum.h
+++ b/include/uapi/linux/tc_act/tc_csum.h
diff --git a/include/linux/tc_act/tc_gact.h b/include/uapi/linux/tc_act/tc_gact.h
index f7bf94eed510..f7bf94eed510 100644
--- a/include/linux/tc_act/tc_gact.h
+++ b/include/uapi/linux/tc_act/tc_gact.h
diff --git a/include/linux/tc_act/tc_ipt.h b/include/uapi/linux/tc_act/tc_ipt.h
index a2335563d21f..a2335563d21f 100644
--- a/include/linux/tc_act/tc_ipt.h
+++ b/include/uapi/linux/tc_act/tc_ipt.h
diff --git a/include/linux/tc_act/tc_mirred.h b/include/uapi/linux/tc_act/tc_mirred.h
index 7561750e8fd6..7561750e8fd6 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/uapi/linux/tc_act/tc_mirred.h
diff --git a/include/linux/tc_act/tc_nat.h b/include/uapi/linux/tc_act/tc_nat.h
index 6663aeba0b9a..6663aeba0b9a 100644
--- a/include/linux/tc_act/tc_nat.h
+++ b/include/uapi/linux/tc_act/tc_nat.h
diff --git a/include/linux/tc_act/tc_pedit.h b/include/uapi/linux/tc_act/tc_pedit.h
index 716cfabcd5b2..716cfabcd5b2 100644
--- a/include/linux/tc_act/tc_pedit.h
+++ b/include/uapi/linux/tc_act/tc_pedit.h
diff --git a/include/linux/tc_act/tc_skbedit.h b/include/uapi/linux/tc_act/tc_skbedit.h
index 7a2e910a5f08..7a2e910a5f08 100644
--- a/include/linux/tc_act/tc_skbedit.h
+++ b/include/uapi/linux/tc_act/tc_skbedit.h
diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild
index aafaa5aa54d4..53fca3925535 100644
--- a/include/uapi/linux/tc_ematch/Kbuild
+++ b/include/uapi/linux/tc_ematch/Kbuild
@@ -1 +1,5 @@
 # UAPI Header export list
+header-y += tc_em_cmp.h
+header-y += tc_em_meta.h
+header-y += tc_em_nbyte.h
+header-y += tc_em_text.h
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/uapi/linux/tc_ematch/tc_em_cmp.h
index f34bb1bae083..f34bb1bae083 100644
--- a/include/linux/tc_ematch/tc_em_cmp.h
+++ b/include/uapi/linux/tc_ematch/tc_em_cmp.h
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/uapi/linux/tc_ematch/tc_em_meta.h
index b11f8ce2d3c0..b11f8ce2d3c0 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/uapi/linux/tc_ematch/tc_em_meta.h
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/uapi/linux/tc_ematch/tc_em_nbyte.h
index 7172cfb999c1..7172cfb999c1 100644
--- a/include/linux/tc_ematch/tc_em_nbyte.h
+++ b/include/uapi/linux/tc_ematch/tc_em_nbyte.h
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/uapi/linux/tc_ematch/tc_em_text.h
index 5aac4045ba88..5aac4045ba88 100644
--- a/include/linux/tc_ematch/tc_em_text.h
+++ b/include/uapi/linux/tc_ematch/tc_em_text.h
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
new file mode 100644
index 000000000000..e962faa5ab0d
--- /dev/null
+++ b/include/uapi/linux/tcp.h
@@ -0,0 +1,226 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions for the TCP protocol.
+ *
+ * Version:     @(#)tcp.h       1.0.2   04/28/93
+ *
+ * Author:      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_TCP_H
+#define _UAPI_LINUX_TCP_H
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#include <linux/socket.h>
+
+struct tcphdr {
+        __be16  source;
+        __be16  dest;
+        __be32  seq;
+        __be32  ack_seq;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u16   res1:4,
+                doff:4,
+                fin:1,
+                syn:1,
+                rst:1,
+                psh:1,
+                ack:1,
+                urg:1,
+                ece:1,
+                cwr:1;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u16   doff:4,
+                res1:4,
+                cwr:1,
+                ece:1,
+                urg:1,
+                ack:1,
+                psh:1,
+                rst:1,
+                syn:1,
+                fin:1;
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif  
+        __be16  window;
+        __sum16 check;
+        __be16  urg_ptr;
+};
+
+/*
+ *      The union cast uses a gcc extension to avoid aliasing problems
+ *  (union is compatible to any of its members)
+ *  This means this part of the code is -fstrict-aliasing safe now.
+ */
+union tcp_word_hdr { 
+        struct tcphdr hdr;
+        __be32            words[5];
+}; 
+
+#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
+
+enum { 
+        TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000),
+        TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000),
+        TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000),
+        TCP_FLAG_ACK = __constant_cpu_to_be32(0x00100000),
+        TCP_FLAG_PSH = __constant_cpu_to_be32(0x00080000),
+        TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000),
+        TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000),
+        TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000),
+        TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000),
+        TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000)
+}; 
+
+/*
+ * TCP general constants
+ */
+#define TCP_MSS_DEFAULT          536U   /* IPv4 (RFC1122, RFC2581) */
+#define TCP_MSS_DESIRED         1220U   /* IPv6 (tunneled), EDNS0 (RFC3226) */
+
+/* TCP socket options */
+#define TCP_NODELAY             1       /* Turn off Nagle's algorithm. */
+#define TCP_MAXSEG              2       /* Limit MSS */
+#define TCP_CORK                3       /* Never send partially complete segments */
+#define TCP_KEEPIDLE            4       /* Start keeplives after this period */
+#define TCP_KEEPINTVL           5       /* Interval between keepalives */
+#define TCP_KEEPCNT             6       /* Number of keepalives before death */
+#define TCP_SYNCNT              7       /* Number of SYN retransmits */
+#define TCP_LINGER2             8       /* Life time of orphaned FIN-WAIT-2 state */
+#define TCP_DEFER_ACCEPT        9       /* Wake up listener only when data arrive */
+#define TCP_WINDOW_CLAMP        10      /* Bound advertised window */
+#define TCP_INFO                11      /* Information about this connection. */
+#define TCP_QUICKACK            12      /* Block/reenable quick acks */
+#define TCP_CONGESTION          13      /* Congestion control algorithm */
+#define TCP_MD5SIG              14      /* TCP MD5 Signature (RFC2385) */
+#define TCP_COOKIE_TRANSACTIONS 15      /* TCP Cookie Transactions */
+#define TCP_THIN_LINEAR_TIMEOUTS 16      /* Use linear timeouts for thin streams*/
+#define TCP_THIN_DUPACK         17      /* Fast retrans. after 1 dupack */
+#define TCP_USER_TIMEOUT        18      /* How long for loss retry before timeout */
+#define TCP_REPAIR              19      /* TCP sock is under repair right now */
+#define TCP_REPAIR_QUEUE        20
+#define TCP_QUEUE_SEQ           21
+#define TCP_REPAIR_OPTIONS      22
+#define TCP_FASTOPEN            23      /* Enable FastOpen on listeners */
+
+struct tcp_repair_opt {
+        __u32   opt_code;
+        __u32   opt_val;
+};
+
+enum {
+        TCP_NO_QUEUE,
+        TCP_RECV_QUEUE,
+        TCP_SEND_QUEUE,
+        TCP_QUEUES_NR,
+};
+
+/* for TCP_INFO socket option */
+#define TCPI_OPT_TIMESTAMPS     1
+#define TCPI_OPT_SACK           2
+#define TCPI_OPT_WSCALE         4
+#define TCPI_OPT_ECN            8 /* ECN was negociated at TCP session init */
+#define TCPI_OPT_ECN_SEEN       16 /* we received at least one packet with ECT */
+#define TCPI_OPT_SYN_DATA       32 /* SYN-ACK acked data in SYN sent or rcvd */
+
+enum tcp_ca_state {
+        TCP_CA_Open = 0,
+#define TCPF_CA_Open    (1<<TCP_CA_Open)
+        TCP_CA_Disorder = 1,
+#define TCPF_CA_Disorder (1<<TCP_CA_Disorder)
+        TCP_CA_CWR = 2,
+#define TCPF_CA_CWR     (1<<TCP_CA_CWR)
+        TCP_CA_Recovery = 3,
+#define TCPF_CA_Recovery (1<<TCP_CA_Recovery)
+        TCP_CA_Loss = 4
+#define TCPF_CA_Loss    (1<<TCP_CA_Loss)
+};
+
+struct tcp_info {
+        __u8    tcpi_state;
+        __u8    tcpi_ca_state;
+        __u8    tcpi_retransmits;
+        __u8    tcpi_probes;
+        __u8    tcpi_backoff;
+        __u8    tcpi_options;
+        __u8    tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+
+        __u32   tcpi_rto;
+        __u32   tcpi_ato;
+        __u32   tcpi_snd_mss;
+        __u32   tcpi_rcv_mss;
+
+        __u32   tcpi_unacked;
+        __u32   tcpi_sacked;
+        __u32   tcpi_lost;
+        __u32   tcpi_retrans;
+        __u32   tcpi_fackets;
+
+        /* Times. */
+        __u32   tcpi_last_data_sent;
+        __u32   tcpi_last_ack_sent;     /* Not remembered, sorry. */
+        __u32   tcpi_last_data_recv;
+        __u32   tcpi_last_ack_recv;
+
+        /* Metrics. */
+        __u32   tcpi_pmtu;
+        __u32   tcpi_rcv_ssthresh;
+        __u32   tcpi_rtt;
+        __u32   tcpi_rttvar;
+        __u32   tcpi_snd_ssthresh;
+        __u32   tcpi_snd_cwnd;
+        __u32   tcpi_advmss;
+        __u32   tcpi_reordering;
+
+        __u32   tcpi_rcv_rtt;
+        __u32   tcpi_rcv_space;
+
+        __u32   tcpi_total_retrans;
+};
+
+/* for TCP_MD5SIG socket option */
+#define TCP_MD5SIG_MAXKEYLEN    80
+
+struct tcp_md5sig {
+        struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
+        __u16   __tcpm_pad1;                            /* zero */
+        __u16   tcpm_keylen;                            /* key length */
+        __u32   __tcpm_pad2;                            /* zero */
+        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
+};
+
+/* for TCP_COOKIE_TRANSACTIONS (TCPCT) socket option */
+#define TCP_COOKIE_MIN           8              /*  64-bits */
+#define TCP_COOKIE_MAX          16              /* 128-bits */
+#define TCP_COOKIE_PAIR_SIZE    (2*TCP_COOKIE_MAX)
+
+/* Flags for both getsockopt and setsockopt */
+#define TCP_COOKIE_IN_ALWAYS    (1 << 0)        /* Discard SYN without cookie */
+#define TCP_COOKIE_OUT_NEVER    (1 << 1)        /* Prohibit outgoing cookies,
+                                                 * supercedes everything. */
+
+/* Flags for getsockopt */
+#define TCP_S_DATA_IN           (1 << 2)        /* Was data received? */
+#define TCP_S_DATA_OUT          (1 << 3)        /* Was data sent? */
+
+/* TCP_COOKIE_TRANSACTIONS data */
+struct tcp_cookie_transactions {
+        __u16   tcpct_flags;                    /* see above */
+        __u8    __tcpct_pad1;                   /* zero */
+        __u8    tcpct_cookie_desired;           /* bytes */
+        __u16   tcpct_s_data_desired;           /* bytes of variable data */
+        __u16   tcpct_used;                     /* bytes in value */
+        __u8    tcpct_value[TCP_MSS_DEFAULT];
+};
+
+
+#endif /* _UAPI_LINUX_TCP_H */
diff --git a/include/linux/tcp_metrics.h b/include/uapi/linux/tcp_metrics.h
index cb5157b55f32..cb5157b55f32 100644
--- a/include/linux/tcp_metrics.h
+++ b/include/uapi/linux/tcp_metrics.h
diff --git a/include/linux/telephony.h b/include/uapi/linux/telephony.h
index f63afe330add..f63afe330add 100644
--- a/include/linux/telephony.h
+++ b/include/uapi/linux/telephony.h
diff --git a/include/linux/termios.h b/include/uapi/linux/termios.h
index 2acd0c1f8a2a..2acd0c1f8a2a 100644
--- a/include/linux/termios.h
+++ b/include/uapi/linux/termios.h
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
new file mode 100644
index 000000000000..0d3c0edc3eda
--- /dev/null
+++ b/include/uapi/linux/time.h
@@ -0,0 +1,71 @@
+#ifndef _UAPI_LINUX_TIME_H
+#define _UAPI_LINUX_TIME_H
+
+#include <linux/types.h>
+
+
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+        __kernel_time_t tv_sec;                 /* seconds */
+        long            tv_nsec;                /* nanoseconds */
+};
+#endif
+
+struct timeval {
+        __kernel_time_t         tv_sec;         /* seconds */
+        __kernel_suseconds_t    tv_usec;        /* microseconds */
+};
+
+struct timezone {
+        int     tz_minuteswest; /* minutes west of Greenwich */
+        int     tz_dsttime;     /* type of dst correction */
+};
+
+
+/*
+ * Names of the interval timers, and structure
+ * defining a timer setting:
+ */
+#define ITIMER_REAL             0
+#define ITIMER_VIRTUAL          1
+#define ITIMER_PROF             2
+
+struct itimerspec {
+        struct timespec it_interval;    /* timer period */
+        struct timespec it_value;       /* timer expiration */
+};
+
+struct itimerval {
+        struct timeval it_interval;     /* timer interval */
+        struct timeval it_value;        /* current value */
+};
+
+/*
+ * The IDs of the various system clocks (for POSIX.1b interval timers):
+ */
+#define CLOCK_REALTIME                  0
+#define CLOCK_MONOTONIC                 1
+#define CLOCK_PROCESS_CPUTIME_ID        2
+#define CLOCK_THREAD_CPUTIME_ID         3
+#define CLOCK_MONOTONIC_RAW             4
+#define CLOCK_REALTIME_COARSE           5
+#define CLOCK_MONOTONIC_COARSE          6
+#define CLOCK_BOOTTIME                  7
+#define CLOCK_REALTIME_ALARM            8
+#define CLOCK_BOOTTIME_ALARM            9
+
+/*
+ * The IDs of various hardware clocks:
+ */
+#define CLOCK_SGI_CYCLE                 10
+#define MAX_CLOCKS                      16
+#define CLOCKS_MASK                     (CLOCK_REALTIME | CLOCK_MONOTONIC)
+#define CLOCKS_MONO                     CLOCK_MONOTONIC
+
+/*
+ * The various flags for setting POSIX.1b interval timers:
+ */
+#define TIMER_ABSTIME                   0x01
+
+#endif /* _UAPI_LINUX_TIME_H */
diff --git a/include/linux/times.h b/include/uapi/linux/times.h
index 87b62615cedd..87b62615cedd 100644
--- a/include/linux/times.h
+++ b/include/uapi/linux/times.h
diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h
new file mode 100644
index 000000000000..a7ea81f13711
--- /dev/null
+++ b/include/uapi/linux/timex.h
@@ -0,0 +1,166 @@
+/*****************************************************************************
+ *                                                                           *
+ * Copyright (c) David L. Mills 1993                                         *
+ *                                                                           *
+ * Permission to use, copy, modify, and distribute this software and its     *
+ * documentation for any purpose and without fee is hereby granted, provided *
+ * that the above copyright notice appears in all copies and that both the   *
+ * copyright notice and this permission notice appear in supporting          *
+ * documentation, and that the name University of Delaware not be used in    *
+ * advertising or publicity pertaining to distribution of the software       *
+ * without specific, written prior permission.  The University of Delaware   *
+ * makes no representations about the suitability this software for any      *
+ * purpose.  It is provided "as is" without express or implied warranty.     *
+ *                                                                           *
+ *****************************************************************************/
+
+/*
+ * Modification history timex.h
+ *
+ * 29 Dec 97    Russell King
+ *      Moved CLOCK_TICK_RATE, CLOCK_TICK_FACTOR and FINETUNE to asm/timex.h
+ *      for ARM machines
+ *
+ *  9 Jan 97    Adrian Sun
+ *      Shifted LATCH define to allow access to alpha machines.
+ *
+ * 26 Sep 94    David L. Mills
+ *      Added defines for hybrid phase/frequency-lock loop.
+ *
+ * 19 Mar 94    David L. Mills
+ *      Moved defines from kernel routines to header file and added new
+ *      defines for PPS phase-lock loop.
+ *
+ * 20 Feb 94    David L. Mills
+ *      Revised status codes and structures for external clock and PPS
+ *      signal discipline.
+ *
+ * 28 Nov 93    David L. Mills
+ *      Adjusted parameters to improve stability and increase poll
+ *      interval.
+ *
+ * 17 Sep 93    David L. Mills
+ *      Created file $NTP/include/sys/timex.h
+ * 07 Oct 93    Torsten Duwe
+ *      Derived linux/timex.h
+ * 1995-08-13    Torsten Duwe
+ *      kernel PLL updated to 1994-12-13 specs (rfc-1589)
+ * 1997-08-30    Ulrich Windl
+ *      Added new constant NTP_PHASE_LIMIT
+ * 2004-08-12    Christoph Lameter
+ *      Reworked time interpolation logic
+ */
+#ifndef _UAPI_LINUX_TIMEX_H
+#define _UAPI_LINUX_TIMEX_H
+
+#include <linux/time.h>
+
+#define NTP_API         4       /* NTP API version */
+
+/*
+ * syscall interface - used (mainly by NTP daemon)
+ * to discipline kernel clock oscillator
+ */
+struct timex {
+        unsigned int modes;     /* mode selector */
+        long offset;            /* time offset (usec) */
+        long freq;              /* frequency offset (scaled ppm) */
+        long maxerror;          /* maximum error (usec) */
+        long esterror;          /* estimated error (usec) */
+        int status;             /* clock command/status */
+        long constant;          /* pll time constant */
+        long precision;         /* clock precision (usec) (read only) */
+        long tolerance;         /* clock frequency tolerance (ppm)
+                                 * (read only)
+                                 */
+        struct timeval time;    /* (read only, except for ADJ_SETOFFSET) */
+        long tick;              /* (modified) usecs between clock ticks */
+
+        long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
+        long jitter;            /* pps jitter (us) (ro) */
+        int shift;              /* interval duration (s) (shift) (ro) */
+        long stabil;            /* pps stability (scaled ppm) (ro) */
+        long jitcnt;            /* jitter limit exceeded (ro) */
+        long calcnt;            /* calibration intervals (ro) */
+        long errcnt;            /* calibration errors (ro) */
+        long stbcnt;            /* stability limit exceeded (ro) */
+
+        int tai;                /* TAI offset (ro) */
+
+        int  :32; int  :32; int  :32; int  :32;
+        int  :32; int  :32; int  :32; int  :32;
+        int  :32; int  :32; int  :32;
+};
+
+/*
+ * Mode codes (timex.mode)
+ */
+#define ADJ_OFFSET              0x0001  /* time offset */
+#define ADJ_FREQUENCY           0x0002  /* frequency offset */
+#define ADJ_MAXERROR            0x0004  /* maximum time error */
+#define ADJ_ESTERROR            0x0008  /* estimated time error */
+#define ADJ_STATUS              0x0010  /* clock status */
+#define ADJ_TIMECONST           0x0020  /* pll time constant */
+#define ADJ_TAI                 0x0080  /* set TAI offset */
+#define ADJ_SETOFFSET           0x0100  /* add 'time' to current time */
+#define ADJ_MICRO               0x1000  /* select microsecond resolution */
+#define ADJ_NANO                0x2000  /* select nanosecond resolution */
+#define ADJ_TICK                0x4000  /* tick value */
+
+#ifndef __KERNEL__
+#define ADJ_OFFSET_SINGLESHOT   0x8001  /* old-fashioned adjtime */
+#define ADJ_OFFSET_SS_READ      0xa001  /* read-only adjtime */
+#endif
+
+/* NTP userland likes the MOD_ prefix better */
+#define MOD_OFFSET      ADJ_OFFSET
+#define MOD_FREQUENCY   ADJ_FREQUENCY
+#define MOD_MAXERROR    ADJ_MAXERROR
+#define MOD_ESTERROR    ADJ_ESTERROR
+#define MOD_STATUS      ADJ_STATUS
+#define MOD_TIMECONST   ADJ_TIMECONST
+#define MOD_TAI ADJ_TAI
+#define MOD_MICRO       ADJ_MICRO
+#define MOD_NANO        ADJ_NANO
+
+
+/*
+ * Status codes (timex.status)
+ */
+#define STA_PLL         0x0001  /* enable PLL updates (rw) */
+#define STA_PPSFREQ     0x0002  /* enable PPS freq discipline (rw) */
+#define STA_PPSTIME     0x0004  /* enable PPS time discipline (rw) */
+#define STA_FLL         0x0008  /* select frequency-lock mode (rw) */
+
+#define STA_INS         0x0010  /* insert leap (rw) */
+#define STA_DEL         0x0020  /* delete leap (rw) */
+#define STA_UNSYNC      0x0040  /* clock unsynchronized (rw) */
+#define STA_FREQHOLD    0x0080  /* hold frequency (rw) */
+
+#define STA_PPSSIGNAL   0x0100  /* PPS signal present (ro) */
+#define STA_PPSJITTER   0x0200  /* PPS signal jitter exceeded (ro) */
+#define STA_PPSWANDER   0x0400  /* PPS signal wander exceeded (ro) */
+#define STA_PPSERROR    0x0800  /* PPS signal calibration error (ro) */
+
+#define STA_CLOCKERR    0x1000  /* clock hardware fault (ro) */
+#define STA_NANO        0x2000  /* resolution (0 = us, 1 = ns) (ro) */
+#define STA_MODE        0x4000  /* mode (0 = PLL, 1 = FLL) (ro) */
+#define STA_CLK         0x8000  /* clock source (0 = A, 1 = B) (ro) */
+
+/* read-only bits */
+#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
+        STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
+
+/*
+ * Clock states (time_state)
+ */
+#define TIME_OK         0       /* clock synchronized, no leap second */
+#define TIME_INS        1       /* insert leap second */
+#define TIME_DEL        2       /* delete leap second */
+#define TIME_OOP        3       /* leap second in progress */
+#define TIME_WAIT       4       /* leap second has occurred */
+#define TIME_ERROR      5       /* clock not synchronized */
+#define TIME_BAD        TIME_ERROR /* bw compat */
+
+
+#endif /* _UAPI_LINUX_TIMEX_H */
diff --git a/include/linux/tiocl.h b/include/uapi/linux/tiocl.h
index 4756862c4ed4..4756862c4ed4 100644
--- a/include/linux/tiocl.h
+++ b/include/uapi/linux/tiocl.h
diff --git a/include/linux/tipc.h b/include/uapi/linux/tipc.h
index f2d90091cc20..f2d90091cc20 100644
--- a/include/linux/tipc.h
+++ b/include/uapi/linux/tipc.h
diff --git a/include/linux/tipc_config.h b/include/uapi/linux/tipc_config.h
index 0b1e3f218a36..0b1e3f218a36 100644
--- a/include/linux/tipc_config.h
+++ b/include/uapi/linux/tipc_config.h
diff --git a/include/uapi/linux/toshiba.h b/include/uapi/linux/toshiba.h
new file mode 100644
index 000000000000..e9bef5b2f91e
--- /dev/null
+++ b/include/uapi/linux/toshiba.h
@@ -0,0 +1,37 @@
+/* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops 
+ *
+ * Copyright (c) 1996-2000  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
+ *
+ * Thanks to Juergen Heinzl <juergen@monocerus.demon.co.uk> for the pointers
+ * on making sure the structure is aligned and packed.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#ifndef _UAPI_LINUX_TOSHIBA_H
+#define _UAPI_LINUX_TOSHIBA_H
+
+#define TOSH_PROC "/proc/toshiba"
+#define TOSH_DEVICE "/dev/toshiba"
+#define TOSH_SMM _IOWR('t', 0x90, int)  /* broken: meant 24 bytes */
+
+typedef struct {
+        unsigned int eax;
+        unsigned int ebx __attribute__ ((packed));
+        unsigned int ecx __attribute__ ((packed));
+        unsigned int edx __attribute__ ((packed));
+        unsigned int esi __attribute__ ((packed));
+        unsigned int edi __attribute__ ((packed));
+} SMMRegisters;
+
+
+#endif /* _UAPI_LINUX_TOSHIBA_H */
diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h
new file mode 100644
index 000000000000..dac199a2dba5
--- /dev/null
+++ b/include/uapi/linux/tty.h
@@ -0,0 +1,38 @@
+#ifndef _UAPI_LINUX_TTY_H
+#define _UAPI_LINUX_TTY_H
+
+/*
+ * 'tty.h' defines some structures used by tty_io.c and some defines.
+ */
+
+#define NR_LDISCS               30
+
+/* line disciplines */
+#define N_TTY           0
+#define N_SLIP          1
+#define N_MOUSE         2
+#define N_PPP           3
+#define N_STRIP         4
+#define N_AX25          5
+#define N_X25           6       /* X.25 async */
+#define N_6PACK         7
+#define N_MASC          8       /* Reserved for Mobitex module <kaz@cafe.net> */
+#define N_R3964         9       /* Reserved for Simatic R3964 module */
+#define N_PROFIBUS_FDL  10      /* Reserved for Profibus */
+#define N_IRDA          11      /* Linux IrDa - http://irda.sourceforge.net/ */
+#define N_SMSBLOCK      12      /* SMS block mode - for talking to GSM data */
+                                /* cards about SMS messages */
+#define N_HDLC          13      /* synchronous HDLC */
+#define N_SYNC_PPP      14      /* synchronous PPP */
+#define N_HCI           15      /* Bluetooth HCI UART */
+#define N_GIGASET_M101  16      /* Siemens Gigaset M101 serial DECT adapter */
+#define N_SLCAN         17      /* Serial / USB serial CAN Adaptors */
+#define N_PPS           18      /* Pulse per Second */
+#define N_V253          19      /* Codec control over voice modem */
+#define N_CAIF          20      /* CAIF protocol for talking to modems */
+#define N_GSM0710       21      /* GSM 0710 Mux */
+#define N_TI_WL         22      /* for TI's WL BT, FM, GPS combo chips */
+#define N_TRACESINK     23      /* Trace data routing for MIPI P1149.7 */
+#define N_TRACEROUTER   24      /* Trace data routing for MIPI P1149.7 */
+
+#endif /* _UAPI_LINUX_TTY_H */
diff --git a/include/linux/tty_flags.h b/include/uapi/linux/tty_flags.h
index eefcb483a2c0..eefcb483a2c0 100644
--- a/include/linux/tty_flags.h
+++ b/include/uapi/linux/tty_flags.h
diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h
new file mode 100644
index 000000000000..acf0979b790a
--- /dev/null
+++ b/include/uapi/linux/types.h
@@ -0,0 +1,56 @@
+#ifndef _UAPI_LINUX_TYPES_H
+#define _UAPI_LINUX_TYPES_H
+
+#include <asm/types.h>
+
+#ifndef __ASSEMBLY__
+#ifndef __KERNEL__
+#ifndef __EXPORTED_HEADERS__
+#warning "Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders"
+#endif /* __EXPORTED_HEADERS__ */
+#endif
+
+#include <linux/posix_types.h>
+
+
+/*
+ * Below are truly Linux-specific types that should never collide with
+ * any application/library that wants linux/types.h.
+ */
+
+#ifdef __CHECKER__
+#define __bitwise__ __attribute__((bitwise))
+#else
+#define __bitwise__
+#endif
+#ifdef __CHECK_ENDIAN__
+#define __bitwise __bitwise__
+#else
+#define __bitwise
+#endif
+
+typedef __u16 __bitwise __le16;
+typedef __u16 __bitwise __be16;
+typedef __u32 __bitwise __le32;
+typedef __u32 __bitwise __be32;
+typedef __u64 __bitwise __le64;
+typedef __u64 __bitwise __be64;
+
+typedef __u16 __bitwise __sum16;
+typedef __u32 __bitwise __wsum;
+
+/*
+ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
+ * common 32/64-bit compat problems.
+ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
+ * architectures) and to 8-byte boundaries on 64-bit architectures.  The new
+ * aligned_64 type enforces 8-byte alignment so that structs containing
+ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
+ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
+ */
+#define __aligned_u64 __u64 __attribute__((aligned(8)))
+#define __aligned_be64 __be64 __attribute__((aligned(8)))
+#define __aligned_le64 __le64 __attribute__((aligned(8)))
+
+#endif /*  __ASSEMBLY__ */
+#endif /* _UAPI_LINUX_TYPES_H */
diff --git a/include/linux/udf_fs_i.h b/include/uapi/linux/udf_fs_i.h
index 3536965913b0..3536965913b0 100644
--- a/include/linux/udf_fs_i.h
+++ b/include/uapi/linux/udf_fs_i.h
diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
new file mode 100644
index 000000000000..e2bcfd75a30d
--- /dev/null
+++ b/include/uapi/linux/udp.h
@@ -0,0 +1,39 @@
+/*
+ * INET         An implementation of the TCP/IP protocol suite for the LINUX
+ *              operating system.  INET is implemented using the  BSD Socket
+ *              interface as the means of communication with the user level.
+ *
+ *              Definitions for the UDP protocol.
+ *
+ * Version:     @(#)udp.h       1.0.2   04/28/93
+ *
+ * Author:      Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_LINUX_UDP_H
+#define _UAPI_LINUX_UDP_H
+
+#include <linux/types.h>
+
+struct udphdr {
+        __be16  source;
+        __be16  dest;
+        __be16  len;
+        __sum16 check;
+};
+
+/* UDP socket options */
+#define UDP_CORK        1       /* Never send partially complete segments */
+#define UDP_ENCAP       100     /* Set the socket to accept encapsulated packets */
+
+/* UDP encapsulation types */
+#define UDP_ENCAP_ESPINUDP_NON_IKE      1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
+#define UDP_ENCAP_ESPINUDP      2 /* draft-ietf-ipsec-udp-encaps-06 */
+#define UDP_ENCAP_L2TPINUDP     3 /* rfc2661 */
+
+
+#endif /* _UAPI_LINUX_UDP_H */
diff --git a/include/linux/uhid.h b/include/uapi/linux/uhid.h
index 9c6974f16966..9c6974f16966 100644
--- a/include/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h
new file mode 100644
index 000000000000..fe46431593f9
--- /dev/null
+++ b/include/uapi/linux/uinput.h
@@ -0,0 +1,137 @@
+/*
+ *  User level driver support for input subsystem
+ *
+ * Heavily based on evdev.c by Vojtech Pavlik
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
+ *
+ * Changes/Revisions:
+ *      0.3     24/05/2006 (Anssi Hannula <anssi.hannulagmail.com>)
+ *              - update ff support for the changes in kernel interface
+ *              - add UINPUT_VERSION
+ *      0.2     16/10/2004 (Micah Dowty <micah@navi.cx>)
+ *              - added force feedback support
+ *             - added UI_SET_PHYS
+ *      0.1     20/06/2002
+ *              - first public version
+ */
+#ifndef _UAPI__UINPUT_H_
+#define _UAPI__UINPUT_H_
+
+#include <linux/types.h>
+#include <linux/input.h>
+
+#define UINPUT_VERSION          3
+
+
+struct uinput_ff_upload {
+        __u32                   request_id;
+        __s32                   retval;
+        struct ff_effect        effect;
+        struct ff_effect        old;
+};
+
+struct uinput_ff_erase {
+        __u32                   request_id;
+        __s32                   retval;
+        __u32                   effect_id;
+};
+
+/* ioctl */
+#define UINPUT_IOCTL_BASE       'U'
+#define UI_DEV_CREATE           _IO(UINPUT_IOCTL_BASE, 1)
+#define UI_DEV_DESTROY          _IO(UINPUT_IOCTL_BASE, 2)
+
+#define UI_SET_EVBIT            _IOW(UINPUT_IOCTL_BASE, 100, int)
+#define UI_SET_KEYBIT           _IOW(UINPUT_IOCTL_BASE, 101, int)
+#define UI_SET_RELBIT           _IOW(UINPUT_IOCTL_BASE, 102, int)
+#define UI_SET_ABSBIT           _IOW(UINPUT_IOCTL_BASE, 103, int)
+#define UI_SET_MSCBIT           _IOW(UINPUT_IOCTL_BASE, 104, int)
+#define UI_SET_LEDBIT           _IOW(UINPUT_IOCTL_BASE, 105, int)
+#define UI_SET_SNDBIT           _IOW(UINPUT_IOCTL_BASE, 106, int)
+#define UI_SET_FFBIT            _IOW(UINPUT_IOCTL_BASE, 107, int)
+#define UI_SET_PHYS             _IOW(UINPUT_IOCTL_BASE, 108, char*)
+#define UI_SET_SWBIT            _IOW(UINPUT_IOCTL_BASE, 109, int)
+#define UI_SET_PROPBIT          _IOW(UINPUT_IOCTL_BASE, 110, int)
+
+#define UI_BEGIN_FF_UPLOAD      _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
+#define UI_END_FF_UPLOAD        _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
+#define UI_BEGIN_FF_ERASE       _IOWR(UINPUT_IOCTL_BASE, 202, struct uinput_ff_erase)
+#define UI_END_FF_ERASE         _IOW(UINPUT_IOCTL_BASE, 203, struct uinput_ff_erase)
+
+/*
+ * To write a force-feedback-capable driver, the upload_effect
+ * and erase_effect callbacks in input_dev must be implemented.
+ * The uinput driver will generate a fake input event when one of
+ * these callbacks are invoked. The userspace code then uses
+ * ioctls to retrieve additional parameters and send the return code.
+ * The callback blocks until this return code is sent.
+ *
+ * The described callback mechanism is only used if ff_effects_max
+ * is set.
+ *
+ * To implement upload_effect():
+ *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_UPLOAD.
+ *      A request ID will be given in 'value'.
+ *   2. Allocate a uinput_ff_upload struct, fill in request_id with
+ *      the 'value' from the EV_UINPUT event.
+ *   3. Issue a UI_BEGIN_FF_UPLOAD ioctl, giving it the
+ *      uinput_ff_upload struct. It will be filled in with the
+ *      ff_effects passed to upload_effect().
+ *   4. Perform the effect upload, and place a return code back into
+        the uinput_ff_upload struct.
+ *   5. Issue a UI_END_FF_UPLOAD ioctl, also giving it the
+ *      uinput_ff_upload_effect struct. This will complete execution
+ *      of our upload_effect() handler.
+ *
+ * To implement erase_effect():
+ *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_ERASE.
+ *      A request ID will be given in 'value'.
+ *   2. Allocate a uinput_ff_erase struct, fill in request_id with
+ *      the 'value' from the EV_UINPUT event.
+ *   3. Issue a UI_BEGIN_FF_ERASE ioctl, giving it the
+ *      uinput_ff_erase struct. It will be filled in with the
+ *      effect ID passed to erase_effect().
+ *   4. Perform the effect erasure, and place a return code back
+ *      into the uinput_ff_erase struct.
+ *   5. Issue a UI_END_FF_ERASE ioctl, also giving it the
+ *      uinput_ff_erase_effect struct. This will complete execution
+ *      of our erase_effect() handler.
+ */
+
+/*
+ * This is the new event type, used only by uinput.
+ * 'code' is UI_FF_UPLOAD or UI_FF_ERASE, and 'value'
+ * is the unique request ID. This number was picked
+ * arbitrarily, above EV_MAX (since the input system
+ * never sees it) but in the range of a 16-bit int.
+ */
+#define EV_UINPUT               0x0101
+#define UI_FF_UPLOAD            1
+#define UI_FF_ERASE             2
+
+#define UINPUT_MAX_NAME_SIZE    80
+struct uinput_user_dev {
+        char name[UINPUT_MAX_NAME_SIZE];
+        struct input_id id;
+        __u32 ff_effects_max;
+        __s32 absmax[ABS_CNT];
+        __s32 absmin[ABS_CNT];
+        __s32 absfuzz[ABS_CNT];
+        __s32 absflat[ABS_CNT];
+};
+#endif /* _UAPI__UINPUT_H_ */
diff --git a/include/uapi/linux/uio.h b/include/uapi/linux/uio.h
new file mode 100644
index 000000000000..2731d56a5484
--- /dev/null
+++ b/include/uapi/linux/uio.h
@@ -0,0 +1,30 @@
+/*
+ *      Berkeley style UIO structures   -       Alan Cox 1994.
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI__LINUX_UIO_H
+#define _UAPI__LINUX_UIO_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+
+struct iovec
+{
+        void __user *iov_base;  /* BSD uses caddr_t (1003.1g requires void *) */
+        __kernel_size_t iov_len; /* Must be size_t (1003.1g) */
+};
+
+/*
+ *      UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
+ */
+ 
+#define UIO_FASTIOV     8
+#define UIO_MAXIOV      1024
+
+
+#endif /* _UAPI__LINUX_UIO_H */
diff --git a/include/linux/ultrasound.h b/include/uapi/linux/ultrasound.h
index 71339dc531c5..71339dc531c5 100644
--- a/include/linux/ultrasound.h
+++ b/include/uapi/linux/ultrasound.h
diff --git a/include/linux/un.h b/include/uapi/linux/un.h
index 3ed3e46c1b1f..3ed3e46c1b1f 100644
--- a/include/linux/un.h
+++ b/include/uapi/linux/un.h
diff --git a/include/linux/unistd.h b/include/uapi/linux/unistd.h
index aa8d5b5e2e3e..aa8d5b5e2e3e 100644
--- a/include/linux/unistd.h
+++ b/include/uapi/linux/unistd.h
diff --git a/include/linux/unix_diag.h b/include/uapi/linux/unix_diag.h
index b1d2bf16b33c..b1d2bf16b33c 100644
--- a/include/linux/unix_diag.h
+++ b/include/uapi/linux/unix_diag.h
diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild
index aafaa5aa54d4..6cb4ea826834 100644
--- a/include/uapi/linux/usb/Kbuild
+++ b/include/uapi/linux/usb/Kbuild
@@ -1 +1,11 @@
 # UAPI Header export list
+header-y += audio.h
+header-y += cdc.h
+header-y += ch11.h
+header-y += ch9.h
+header-y += functionfs.h
+header-y += g_printer.h
+header-y += gadgetfs.h
+header-y += midi.h
+header-y += tmc.h
+header-y += video.h
diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h
new file mode 100644
index 000000000000..ac90037894d9
--- /dev/null
+++ b/include/uapi/linux/usb/audio.h
@@ -0,0 +1,545 @@
+/*
+ * <linux/usb/audio.h> -- USB Audio definitions.
+ *
+ * Copyright (C) 2006 Thumtronics Pty Ltd.
+ * Developed for Thumtronics by Grey Innovation
+ * Ben Williamson <ben.williamson@greyinnovation.com>
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * License ("GPL") version 2, as published by the Free Software Foundation.
+ *
+ * This file holds USB constants and structures defined
+ * by the USB Device Class Definition for Audio Devices.
+ * Comments below reference relevant sections of that document:
+ *
+ * http://www.usb.org/developers/devclass_docs/audio10.pdf
+ *
+ * Types and defines in this file are either specific to version 1.0 of
+ * this standard or common for newer versions.
+ */
+
+#ifndef _UAPI__LINUX_USB_AUDIO_H
+#define _UAPI__LINUX_USB_AUDIO_H
+
+#include <linux/types.h>
+
+/* bInterfaceProtocol values to denote the version of the standard used */
+#define UAC_VERSION_1                   0x00
+#define UAC_VERSION_2                   0x20
+
+/* A.2 Audio Interface Subclass Codes */
+#define USB_SUBCLASS_AUDIOCONTROL       0x01
+#define USB_SUBCLASS_AUDIOSTREAMING     0x02
+#define USB_SUBCLASS_MIDISTREAMING      0x03
+
+/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
+#define UAC_HEADER                      0x01
+#define UAC_INPUT_TERMINAL              0x02
+#define UAC_OUTPUT_TERMINAL             0x03
+#define UAC_MIXER_UNIT                  0x04
+#define UAC_SELECTOR_UNIT               0x05
+#define UAC_FEATURE_UNIT                0x06
+#define UAC1_PROCESSING_UNIT            0x07
+#define UAC1_EXTENSION_UNIT             0x08
+
+/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
+#define UAC_AS_GENERAL                  0x01
+#define UAC_FORMAT_TYPE                 0x02
+#define UAC_FORMAT_SPECIFIC             0x03
+
+/* A.7 Processing Unit Process Types */
+#define UAC_PROCESS_UNDEFINED           0x00
+#define UAC_PROCESS_UP_DOWNMIX          0x01
+#define UAC_PROCESS_DOLBY_PROLOGIC      0x02
+#define UAC_PROCESS_STEREO_EXTENDER     0x03
+#define UAC_PROCESS_REVERB              0x04
+#define UAC_PROCESS_CHORUS              0x05
+#define UAC_PROCESS_DYN_RANGE_COMP      0x06
+
+/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
+#define UAC_EP_GENERAL                  0x01
+
+/* A.9 Audio Class-Specific Request Codes */
+#define UAC_SET_                        0x00
+#define UAC_GET_                        0x80
+
+#define UAC__CUR                        0x1
+#define UAC__MIN                        0x2
+#define UAC__MAX                        0x3
+#define UAC__RES                        0x4
+#define UAC__MEM                        0x5
+
+#define UAC_SET_CUR                     (UAC_SET_ | UAC__CUR)
+#define UAC_GET_CUR                     (UAC_GET_ | UAC__CUR)
+#define UAC_SET_MIN                     (UAC_SET_ | UAC__MIN)
+#define UAC_GET_MIN                     (UAC_GET_ | UAC__MIN)
+#define UAC_SET_MAX                     (UAC_SET_ | UAC__MAX)
+#define UAC_GET_MAX                     (UAC_GET_ | UAC__MAX)
+#define UAC_SET_RES                     (UAC_SET_ | UAC__RES)
+#define UAC_GET_RES                     (UAC_GET_ | UAC__RES)
+#define UAC_SET_MEM                     (UAC_SET_ | UAC__MEM)
+#define UAC_GET_MEM                     (UAC_GET_ | UAC__MEM)
+
+#define UAC_GET_STAT                    0xff
+
+/* A.10 Control Selector Codes */
+
+/* A.10.1 Terminal Control Selectors */
+#define UAC_TERM_COPY_PROTECT           0x01
+
+/* A.10.2 Feature Unit Control Selectors */
+#define UAC_FU_MUTE                     0x01
+#define UAC_FU_VOLUME                   0x02
+#define UAC_FU_BASS                     0x03
+#define UAC_FU_MID                      0x04
+#define UAC_FU_TREBLE                   0x05
+#define UAC_FU_GRAPHIC_EQUALIZER        0x06
+#define UAC_FU_AUTOMATIC_GAIN           0x07
+#define UAC_FU_DELAY                    0x08
+#define UAC_FU_BASS_BOOST               0x09
+#define UAC_FU_LOUDNESS                 0x0a
+
+#define UAC_CONTROL_BIT(CS)     (1 << ((CS) - 1))
+
+/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
+#define UAC_UD_ENABLE                   0x01
+#define UAC_UD_MODE_SELECT              0x02
+
+/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
+#define UAC_DP_ENABLE                   0x01
+#define UAC_DP_MODE_SELECT              0x02
+
+/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
+#define UAC_3D_ENABLE                   0x01
+#define UAC_3D_SPACE                    0x02
+
+/* A.10.3.4 Reverberation Processing Unit Control Selectors */
+#define UAC_REVERB_ENABLE               0x01
+#define UAC_REVERB_LEVEL                0x02
+#define UAC_REVERB_TIME                 0x03
+#define UAC_REVERB_FEEDBACK             0x04
+
+/* A.10.3.5 Chorus Processing Unit Control Selectors */
+#define UAC_CHORUS_ENABLE               0x01
+#define UAC_CHORUS_LEVEL                0x02
+#define UAC_CHORUS_RATE                 0x03
+#define UAC_CHORUS_DEPTH                0x04
+
+/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
+#define UAC_DCR_ENABLE                  0x01
+#define UAC_DCR_RATE                    0x02
+#define UAC_DCR_MAXAMPL                 0x03
+#define UAC_DCR_THRESHOLD               0x04
+#define UAC_DCR_ATTACK_TIME             0x05
+#define UAC_DCR_RELEASE_TIME            0x06
+
+/* A.10.4 Extension Unit Control Selectors */
+#define UAC_XU_ENABLE                   0x01
+
+/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
+#define UAC_MS_HEADER                   0x01
+#define UAC_MIDI_IN_JACK                0x02
+#define UAC_MIDI_OUT_JACK               0x03
+
+/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
+#define UAC_MS_GENERAL                  0x01
+
+/* Terminals - 2.1 USB Terminal Types */
+#define UAC_TERMINAL_UNDEFINED          0x100
+#define UAC_TERMINAL_STREAMING          0x101
+#define UAC_TERMINAL_VENDOR_SPEC        0x1FF
+
+/* Terminal Control Selectors */
+/* 4.3.2  Class-Specific AC Interface Descriptor */
+struct uac1_ac_header_descriptor {
+        __u8  bLength;                  /* 8 + n */
+        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
+        __u8  bDescriptorSubtype;       /* UAC_MS_HEADER */
+        __le16 bcdADC;                  /* 0x0100 */
+        __le16 wTotalLength;            /* includes Unit and Terminal desc. */
+        __u8  bInCollection;            /* n */
+        __u8  baInterfaceNr[];          /* [n] */
+} __attribute__ ((packed));
+
+#define UAC_DT_AC_HEADER_SIZE(n)        (8 + (n))
+
+/* As above, but more useful for defining your own descriptors: */
+#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                     \
+struct uac1_ac_header_descriptor_##n {                  \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __le16 bcdADC;                                          \
+        __le16 wTotalLength;                                    \
+        __u8  bInCollection;                                    \
+        __u8  baInterfaceNr[n];                                 \
+} __attribute__ ((packed))
+
+/* 4.3.2.1 Input Terminal Descriptor */
+struct uac_input_terminal_descriptor {
+        __u8  bLength;                  /* in bytes: 12 */
+        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
+        __u8  bDescriptorSubtype;       /* INPUT_TERMINAL descriptor subtype */
+        __u8  bTerminalID;              /* Constant uniquely terminal ID */
+        __le16 wTerminalType;           /* USB Audio Terminal Types */
+        __u8  bAssocTerminal;           /* ID of the Output Terminal associated */
+        __u8  bNrChannels;              /* Number of logical output channels */
+        __le16 wChannelConfig;
+        __u8  iChannelNames;
+        __u8  iTerminal;
+} __attribute__ ((packed));
+
+#define UAC_DT_INPUT_TERMINAL_SIZE                      12
+
+/* Terminals - 2.2 Input Terminal Types */
+#define UAC_INPUT_TERMINAL_UNDEFINED                    0x200
+#define UAC_INPUT_TERMINAL_MICROPHONE                   0x201
+#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE           0x202
+#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE          0x203
+#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE          0x204
+#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY             0x205
+#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY        0x206
+
+/* Terminals - control selectors */
+
+#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL            0x01
+
+/* 4.3.2.2 Output Terminal Descriptor */
+struct uac1_output_terminal_descriptor {
+        __u8  bLength;                  /* in bytes: 9 */
+        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
+        __u8  bDescriptorSubtype;       /* OUTPUT_TERMINAL descriptor subtype */
+        __u8  bTerminalID;              /* Constant uniquely terminal ID */
+        __le16 wTerminalType;           /* USB Audio Terminal Types */
+        __u8  bAssocTerminal;           /* ID of the Input Terminal associated */
+        __u8  bSourceID;                /* ID of the connected Unit or Terminal*/
+        __u8  iTerminal;
+} __attribute__ ((packed));
+
+#define UAC_DT_OUTPUT_TERMINAL_SIZE                     9
+
+/* Terminals - 2.3 Output Terminal Types */
+#define UAC_OUTPUT_TERMINAL_UNDEFINED                   0x300
+#define UAC_OUTPUT_TERMINAL_SPEAKER                     0x301
+#define UAC_OUTPUT_TERMINAL_HEADPHONES                  0x302
+#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO  0x303
+#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER             0x304
+#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER                0x305
+#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER       0x306
+#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER    0x307
+
+/* Set bControlSize = 2 as default setting */
+#define UAC_DT_FEATURE_UNIT_SIZE(ch)            (7 + ((ch) + 1) * 2)
+
+/* As above, but more useful for defining your own descriptors: */
+#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                 \
+struct uac_feature_unit_descriptor_##ch {                       \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __u8  bUnitID;                                          \
+        __u8  bSourceID;                                        \
+        __u8  bControlSize;                                     \
+        __le16 bmaControls[ch + 1];                             \
+        __u8  iFeature;                                         \
+} __attribute__ ((packed))
+
+/* 4.3.2.3 Mixer Unit Descriptor */
+struct uac_mixer_unit_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bUnitID;
+        __u8 bNrInPins;
+        __u8 baSourceID[];
+} __attribute__ ((packed));
+
+static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
+{
+        return desc->baSourceID[desc->bNrInPins];
+}
+
+static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
+                                                  int protocol)
+{
+        if (protocol == UAC_VERSION_1)
+                return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
+                        desc->baSourceID[desc->bNrInPins + 1];
+        else
+                return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
+                        (desc->baSourceID[desc->bNrInPins + 3] << 16) |
+                        (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
+                        (desc->baSourceID[desc->bNrInPins + 1]);
+}
+
+static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
+                                                int protocol)
+{
+        return (protocol == UAC_VERSION_1) ?
+                desc->baSourceID[desc->bNrInPins + 3] :
+                desc->baSourceID[desc->bNrInPins + 5];
+}
+
+static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
+                                              int protocol)
+{
+        return (protocol == UAC_VERSION_1) ?
+                &desc->baSourceID[desc->bNrInPins + 4] :
+                &desc->baSourceID[desc->bNrInPins + 6];
+}
+
+static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
+{
+        __u8 *raw = (__u8 *) desc;
+        return raw[desc->bLength - 1];
+}
+
+/* 4.3.2.4 Selector Unit Descriptor */
+struct uac_selector_unit_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bUintID;
+        __u8 bNrInPins;
+        __u8 baSourceID[];
+} __attribute__ ((packed));
+
+static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
+{
+        __u8 *raw = (__u8 *) desc;
+        return raw[desc->bLength - 1];
+}
+
+/* 4.3.2.5 Feature Unit Descriptor */
+struct uac_feature_unit_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bUnitID;
+        __u8 bSourceID;
+        __u8 bControlSize;
+        __u8 bmaControls[0]; /* variable length */
+} __attribute__((packed));
+
+static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
+{
+        __u8 *raw = (__u8 *) desc;
+        return raw[desc->bLength - 1];
+}
+
+/* 4.3.2.6 Processing Unit Descriptors */
+struct uac_processing_unit_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bUnitID;
+        __u16 wProcessType;
+        __u8 bNrInPins;
+        __u8 baSourceID[];
+} __attribute__ ((packed));
+
+static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
+{
+        return desc->baSourceID[desc->bNrInPins];
+}
+
+static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
+                                                       int protocol)
+{
+        if (protocol == UAC_VERSION_1)
+                return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
+                        desc->baSourceID[desc->bNrInPins + 1];
+        else
+                return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
+                        (desc->baSourceID[desc->bNrInPins + 3] << 16) |
+                        (desc->baSourceID[desc->bNrInPins + 2] << 8)  |
+                        (desc->baSourceID[desc->bNrInPins + 1]);
+}
+
+static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
+                                                     int protocol)
+{
+        return (protocol == UAC_VERSION_1) ?
+                desc->baSourceID[desc->bNrInPins + 3] :
+                desc->baSourceID[desc->bNrInPins + 5];
+}
+
+static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
+                                                    int protocol)
+{
+        return (protocol == UAC_VERSION_1) ?
+                desc->baSourceID[desc->bNrInPins + 4] :
+                desc->baSourceID[desc->bNrInPins + 6];
+}
+
+static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
+                                                   int protocol)
+{
+        return (protocol == UAC_VERSION_1) ?
+                &desc->baSourceID[desc->bNrInPins + 5] :
+                &desc->baSourceID[desc->bNrInPins + 7];
+}
+
+static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
+                                                   int protocol)
+{
+        __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
+        return desc->baSourceID[desc->bNrInPins + control_size];
+}
+
+static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
+                                                 int protocol)
+{
+        __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
+        return &desc->baSourceID[desc->bNrInPins + control_size + 1];
+}
+
+/* 4.5.2 Class-Specific AS Interface Descriptor */
+struct uac1_as_header_descriptor {
+        __u8  bLength;                  /* in bytes: 7 */
+        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
+        __u8  bDescriptorSubtype;       /* AS_GENERAL */
+        __u8  bTerminalLink;            /* Terminal ID of connected Terminal */
+        __u8  bDelay;                   /* Delay introduced by the data path */
+        __le16 wFormatTag;              /* The Audio Data Format */
+} __attribute__ ((packed));
+
+#define UAC_DT_AS_HEADER_SIZE           7
+
+/* Formats - A.1.1 Audio Data Format Type I Codes */
+#define UAC_FORMAT_TYPE_I_UNDEFINED     0x0
+#define UAC_FORMAT_TYPE_I_PCM           0x1
+#define UAC_FORMAT_TYPE_I_PCM8          0x2
+#define UAC_FORMAT_TYPE_I_IEEE_FLOAT    0x3
+#define UAC_FORMAT_TYPE_I_ALAW          0x4
+#define UAC_FORMAT_TYPE_I_MULAW         0x5
+
+struct uac_format_type_i_continuous_descriptor {
+        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
+        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
+        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
+        __u8  bFormatType;              /* FORMAT_TYPE_1 */
+        __u8  bNrChannels;              /* physical channels in the stream */
+        __u8  bSubframeSize;            /* */
+        __u8  bBitResolution;
+        __u8  bSamFreqType;
+        __u8  tLowerSamFreq[3];
+        __u8  tUpperSamFreq[3];
+} __attribute__ ((packed));
+
+#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE  14
+
+struct uac_format_type_i_discrete_descriptor {
+        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
+        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
+        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
+        __u8  bFormatType;              /* FORMAT_TYPE_1 */
+        __u8  bNrChannels;              /* physical channels in the stream */
+        __u8  bSubframeSize;            /* */
+        __u8  bBitResolution;
+        __u8  bSamFreqType;
+        __u8  tSamFreq[][3];
+} __attribute__ ((packed));
+
+#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)              \
+struct uac_format_type_i_discrete_descriptor_##n {              \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __u8  bFormatType;                                      \
+        __u8  bNrChannels;                                      \
+        __u8  bSubframeSize;                                    \
+        __u8  bBitResolution;                                   \
+        __u8  bSamFreqType;                                     \
+        __u8  tSamFreq[n][3];                                   \
+} __attribute__ ((packed))
+
+#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
+
+struct uac_format_type_i_ext_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bFormatType;
+        __u8 bSubslotSize;
+        __u8 bBitResolution;
+        __u8 bHeaderLength;
+        __u8 bControlSize;
+        __u8 bSideBandProtocol;
+} __attribute__((packed));
+
+/* Formats - Audio Data Format Type I Codes */
+
+#define UAC_FORMAT_TYPE_II_MPEG 0x1001
+#define UAC_FORMAT_TYPE_II_AC3  0x1002
+
+struct uac_format_type_ii_discrete_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bFormatType;
+        __le16 wMaxBitRate;
+        __le16 wSamplesPerFrame;
+        __u8 bSamFreqType;
+        __u8 tSamFreq[][3];
+} __attribute__((packed));
+
+struct uac_format_type_ii_ext_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bFormatType;
+        __u16 wMaxBitRate;
+        __u16 wSamplesPerFrame;
+        __u8 bHeaderLength;
+        __u8 bSideBandProtocol;
+} __attribute__((packed));
+
+/* type III */
+#define UAC_FORMAT_TYPE_III_IEC1937_AC3 0x2001
+#define UAC_FORMAT_TYPE_III_IEC1937_MPEG1_LAYER1        0x2002
+#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_NOEXT 0x2003
+#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_EXT   0x2004
+#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER1_LS     0x2005
+#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER23_LS    0x2006
+
+/* Formats - A.2 Format Type Codes */
+#define UAC_FORMAT_TYPE_UNDEFINED       0x0
+#define UAC_FORMAT_TYPE_I               0x1
+#define UAC_FORMAT_TYPE_II              0x2
+#define UAC_FORMAT_TYPE_III             0x3
+#define UAC_EXT_FORMAT_TYPE_I           0x81
+#define UAC_EXT_FORMAT_TYPE_II          0x82
+#define UAC_EXT_FORMAT_TYPE_III         0x83
+
+struct uac_iso_endpoint_descriptor {
+        __u8  bLength;                  /* in bytes: 7 */
+        __u8  bDescriptorType;          /* USB_DT_CS_ENDPOINT */
+        __u8  bDescriptorSubtype;       /* EP_GENERAL */
+        __u8  bmAttributes;
+        __u8  bLockDelayUnits;
+        __le16 wLockDelay;
+} __attribute__((packed));
+#define UAC_ISO_ENDPOINT_DESC_SIZE      7
+
+#define UAC_EP_CS_ATTR_SAMPLE_RATE      0x01
+#define UAC_EP_CS_ATTR_PITCH_CONTROL    0x02
+#define UAC_EP_CS_ATTR_FILL_MAX         0x80
+
+/* status word format (3.7.1.1) */
+
+#define UAC1_STATUS_TYPE_ORIG_MASK              0x0f
+#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF  0x0
+#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF   0x1
+#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP   0x2
+
+#define UAC1_STATUS_TYPE_IRQ_PENDING            (1 << 7)
+#define UAC1_STATUS_TYPE_MEM_CHANGED            (1 << 6)
+
+struct uac1_status_word {
+        __u8 bStatusType;
+        __u8 bOriginator;
+} __attribute__((packed));
+
+
+#endif /* _UAPI__LINUX_USB_AUDIO_H */
diff --git a/include/linux/usb/cdc.h b/include/uapi/linux/usb/cdc.h
index 81a927930bfd..81a927930bfd 100644
--- a/include/linux/usb/cdc.h
+++ b/include/uapi/linux/usb/cdc.h
diff --git a/include/linux/usb/ch11.h b/include/uapi/linux/usb/ch11.h
index 7692dc69ccf7..7692dc69ccf7 100644
--- a/include/linux/usb/ch11.h
+++ b/include/uapi/linux/usb/ch11.h
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
new file mode 100644
index 000000000000..50598472dc41
--- /dev/null
+++ b/include/uapi/linux/usb/ch9.h
@@ -0,0 +1,993 @@
+/*
+ * This file holds USB constants and structures that are needed for
+ * USB device APIs.  These are used by the USB device model, which is
+ * defined in chapter 9 of the USB 2.0 specification and in the
+ * Wireless USB 1.0 (spread around).  Linux has several APIs in C that
+ * need these:
+ *
+ * - the master/host side Linux-USB kernel driver API;
+ * - the "usbfs" user space API; and
+ * - the Linux "gadget" slave/device/peripheral side driver API.
+ *
+ * USB 2.0 adds an additional "On The Go" (OTG) mode, which lets systems
+ * act either as a USB master/host or as a USB slave/device.  That means
+ * the master and slave side APIs benefit from working well together.
+ *
+ * There's also "Wireless USB", using low power short range radios for
+ * peripheral interconnection but otherwise building on the USB framework.
+ *
+ * Note all descriptors are declared '__attribute__((packed))' so that:
+ *
+ * [a] they never get padded, either internally (USB spec writers
+ *     probably handled that) or externally;
+ *
+ * [b] so that accessing bigger-than-a-bytes fields will never
+ *     generate bus errors on any platform, even when the location of
+ *     its descriptor inside a bundle isn't "naturally aligned", and
+ *
+ * [c] for consistency, removing all doubt even when it appears to
+ *     someone that the two other points are non-issues for that
+ *     particular descriptor type.
+ */
+
+#ifndef _UAPI__LINUX_USB_CH9_H
+#define _UAPI__LINUX_USB_CH9_H
+
+#include <linux/types.h>        /* __u8 etc */
+#include <asm/byteorder.h>      /* le16_to_cpu */
+
+/*-------------------------------------------------------------------------*/
+
+/* CONTROL REQUEST SUPPORT */
+
+/*
+ * USB directions
+ *
+ * This bit flag is used in endpoint descriptors' bEndpointAddress field.
+ * It's also one of three fields in control requests bRequestType.
+ */
+#define USB_DIR_OUT                     0               /* to device */
+#define USB_DIR_IN                      0x80            /* to host */
+
+/*
+ * USB types, the second of three bRequestType fields
+ */
+#define USB_TYPE_MASK                   (0x03 << 5)
+#define USB_TYPE_STANDARD               (0x00 << 5)
+#define USB_TYPE_CLASS                  (0x01 << 5)
+#define USB_TYPE_VENDOR                 (0x02 << 5)
+#define USB_TYPE_RESERVED               (0x03 << 5)
+
+/*
+ * USB recipients, the third of three bRequestType fields
+ */
+#define USB_RECIP_MASK                  0x1f
+#define USB_RECIP_DEVICE                0x00
+#define USB_RECIP_INTERFACE             0x01
+#define USB_RECIP_ENDPOINT              0x02
+#define USB_RECIP_OTHER                 0x03
+/* From Wireless USB 1.0 */
+#define USB_RECIP_PORT                  0x04
+#define USB_RECIP_RPIPE         0x05
+
+/*
+ * Standard requests, for the bRequest field of a SETUP packet.
+ *
+ * These are qualified by the bRequestType field, so that for example
+ * TYPE_CLASS or TYPE_VENDOR specific feature flags could be retrieved
+ * by a GET_STATUS request.
+ */
+#define USB_REQ_GET_STATUS              0x00
+#define USB_REQ_CLEAR_FEATURE           0x01
+#define USB_REQ_SET_FEATURE             0x03
+#define USB_REQ_SET_ADDRESS             0x05
+#define USB_REQ_GET_DESCRIPTOR          0x06
+#define USB_REQ_SET_DESCRIPTOR          0x07
+#define USB_REQ_GET_CONFIGURATION       0x08
+#define USB_REQ_SET_CONFIGURATION       0x09
+#define USB_REQ_GET_INTERFACE           0x0A
+#define USB_REQ_SET_INTERFACE           0x0B
+#define USB_REQ_SYNCH_FRAME             0x0C
+#define USB_REQ_SET_SEL                 0x30
+#define USB_REQ_SET_ISOCH_DELAY         0x31
+
+#define USB_REQ_SET_ENCRYPTION          0x0D    /* Wireless USB */
+#define USB_REQ_GET_ENCRYPTION          0x0E
+#define USB_REQ_RPIPE_ABORT             0x0E
+#define USB_REQ_SET_HANDSHAKE           0x0F
+#define USB_REQ_RPIPE_RESET             0x0F
+#define USB_REQ_GET_HANDSHAKE           0x10
+#define USB_REQ_SET_CONNECTION          0x11
+#define USB_REQ_SET_SECURITY_DATA       0x12
+#define USB_REQ_GET_SECURITY_DATA       0x13
+#define USB_REQ_SET_WUSB_DATA           0x14
+#define USB_REQ_LOOPBACK_DATA_WRITE     0x15
+#define USB_REQ_LOOPBACK_DATA_READ      0x16
+#define USB_REQ_SET_INTERFACE_DS        0x17
+
+/* The Link Power Management (LPM) ECN defines USB_REQ_TEST_AND_SET command,
+ * used by hubs to put ports into a new L1 suspend state, except that it
+ * forgot to define its number ...
+ */
+
+/*
+ * USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and
+ * are read as a bit array returned by USB_REQ_GET_STATUS.  (So there
+ * are at most sixteen features of each type.)  Hubs may also support a
+ * new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend.
+ */
+#define USB_DEVICE_SELF_POWERED         0       /* (read only) */
+#define USB_DEVICE_REMOTE_WAKEUP        1       /* dev may initiate wakeup */
+#define USB_DEVICE_TEST_MODE            2       /* (wired high speed only) */
+#define USB_DEVICE_BATTERY              2       /* (wireless) */
+#define USB_DEVICE_B_HNP_ENABLE         3       /* (otg) dev may initiate HNP */
+#define USB_DEVICE_WUSB_DEVICE          3       /* (wireless)*/
+#define USB_DEVICE_A_HNP_SUPPORT        4       /* (otg) RH port supports HNP */
+#define USB_DEVICE_A_ALT_HNP_SUPPORT    5       /* (otg) other RH port does */
+#define USB_DEVICE_DEBUG_MODE           6       /* (special devices only) */
+
+/*
+ * Test Mode Selectors
+ * See USB 2.0 spec Table 9-7
+ */
+#define TEST_J          1
+#define TEST_K          2
+#define TEST_SE0_NAK    3
+#define TEST_PACKET     4
+#define TEST_FORCE_EN   5
+
+/*
+ * New Feature Selectors as added by USB 3.0
+ * See USB 3.0 spec Table 9-6
+ */
+#define USB_DEVICE_U1_ENABLE    48      /* dev may initiate U1 transition */
+#define USB_DEVICE_U2_ENABLE    49      /* dev may initiate U2 transition */
+#define USB_DEVICE_LTM_ENABLE   50      /* dev may send LTM */
+#define USB_INTRF_FUNC_SUSPEND  0       /* function suspend */
+
+#define USB_INTR_FUNC_SUSPEND_OPT_MASK  0xFF00
+/*
+ * Suspend Options, Table 9-7 USB 3.0 spec
+ */
+#define USB_INTRF_FUNC_SUSPEND_LP       (1 << (8 + 0))
+#define USB_INTRF_FUNC_SUSPEND_RW       (1 << (8 + 1))
+
+#define USB_ENDPOINT_HALT               0       /* IN/OUT will STALL */
+
+/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
+#define USB_DEV_STAT_U1_ENABLED         2       /* transition into U1 state */
+#define USB_DEV_STAT_U2_ENABLED         3       /* transition into U2 state */
+#define USB_DEV_STAT_LTM_ENABLED        4       /* Latency tolerance messages */
+
+/**
+ * struct usb_ctrlrequest - SETUP data for a USB device control request
+ * @bRequestType: matches the USB bmRequestType field
+ * @bRequest: matches the USB bRequest field
+ * @wValue: matches the USB wValue field (le16 byte order)
+ * @wIndex: matches the USB wIndex field (le16 byte order)
+ * @wLength: matches the USB wLength field (le16 byte order)
+ *
+ * This structure is used to send control requests to a USB device.  It matches
+ * the different fields of the USB 2.0 Spec section 9.3, table 9-2.  See the
+ * USB spec for a fuller description of the different fields, and what they are
+ * used for.
+ *
+ * Note that the driver for any interface can issue control requests.
+ * For most devices, interfaces don't coordinate with each other, so
+ * such requests may be made at any time.
+ */
+struct usb_ctrlrequest {
+        __u8 bRequestType;
+        __u8 bRequest;
+        __le16 wValue;
+        __le16 wIndex;
+        __le16 wLength;
+} __attribute__ ((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * STANDARD DESCRIPTORS ... as returned by GET_DESCRIPTOR, or
+ * (rarely) accepted by SET_DESCRIPTOR.
+ *
+ * Note that all multi-byte values here are encoded in little endian
+ * byte order "on the wire".  Within the kernel and when exposed
+ * through the Linux-USB APIs, they are not converted to cpu byte
+ * order; it is the responsibility of the client code to do this.
+ * The single exception is when device and configuration descriptors (but
+ * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
+ * in this case the fields are converted to host endianness by the kernel.
+ */
+
+/*
+ * Descriptor types ... USB 2.0 spec table 9.5
+ */
+#define USB_DT_DEVICE                   0x01
+#define USB_DT_CONFIG                   0x02
+#define USB_DT_STRING                   0x03
+#define USB_DT_INTERFACE                0x04
+#define USB_DT_ENDPOINT                 0x05
+#define USB_DT_DEVICE_QUALIFIER         0x06
+#define USB_DT_OTHER_SPEED_CONFIG       0x07
+#define USB_DT_INTERFACE_POWER          0x08
+/* these are from a minor usb 2.0 revision (ECN) */
+#define USB_DT_OTG                      0x09
+#define USB_DT_DEBUG                    0x0a
+#define USB_DT_INTERFACE_ASSOCIATION    0x0b
+/* these are from the Wireless USB spec */
+#define USB_DT_SECURITY                 0x0c
+#define USB_DT_KEY                      0x0d
+#define USB_DT_ENCRYPTION_TYPE          0x0e
+#define USB_DT_BOS                      0x0f
+#define USB_DT_DEVICE_CAPABILITY        0x10
+#define USB_DT_WIRELESS_ENDPOINT_COMP   0x11
+#define USB_DT_WIRE_ADAPTER             0x21
+#define USB_DT_RPIPE                    0x22
+#define USB_DT_CS_RADIO_CONTROL         0x23
+/* From the T10 UAS specification */
+#define USB_DT_PIPE_USAGE               0x24
+/* From the USB 3.0 spec */
+#define USB_DT_SS_ENDPOINT_COMP         0x30
+
+/* Conventional codes for class-specific descriptors.  The convention is
+ * defined in the USB "Common Class" Spec (3.11).  Individual class specs
+ * are authoritative for their usage, not the "common class" writeup.
+ */
+#define USB_DT_CS_DEVICE                (USB_TYPE_CLASS | USB_DT_DEVICE)
+#define USB_DT_CS_CONFIG                (USB_TYPE_CLASS | USB_DT_CONFIG)
+#define USB_DT_CS_STRING                (USB_TYPE_CLASS | USB_DT_STRING)
+#define USB_DT_CS_INTERFACE             (USB_TYPE_CLASS | USB_DT_INTERFACE)
+#define USB_DT_CS_ENDPOINT              (USB_TYPE_CLASS | USB_DT_ENDPOINT)
+
+/* All standard descriptors have these 2 fields at the beginning */
+struct usb_descriptor_header {
+        __u8  bLength;
+        __u8  bDescriptorType;
+} __attribute__ ((packed));
+
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_DEVICE: Device descriptor */
+struct usb_device_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 bcdUSB;
+        __u8  bDeviceClass;
+        __u8  bDeviceSubClass;
+        __u8  bDeviceProtocol;
+        __u8  bMaxPacketSize0;
+        __le16 idVendor;
+        __le16 idProduct;
+        __le16 bcdDevice;
+        __u8  iManufacturer;
+        __u8  iProduct;
+        __u8  iSerialNumber;
+        __u8  bNumConfigurations;
+} __attribute__ ((packed));
+
+#define USB_DT_DEVICE_SIZE              18
+
+
+/*
+ * Device and/or Interface Class codes
+ * as found in bDeviceClass or bInterfaceClass
+ * and defined by www.usb.org documents
+ */
+#define USB_CLASS_PER_INTERFACE         0       /* for DeviceClass */
+#define USB_CLASS_AUDIO                 1
+#define USB_CLASS_COMM                  2
+#define USB_CLASS_HID                   3
+#define USB_CLASS_PHYSICAL              5
+#define USB_CLASS_STILL_IMAGE           6
+#define USB_CLASS_PRINTER               7
+#define USB_CLASS_MASS_STORAGE          8
+#define USB_CLASS_HUB                   9
+#define USB_CLASS_CDC_DATA              0x0a
+#define USB_CLASS_CSCID                 0x0b    /* chip+ smart card */
+#define USB_CLASS_CONTENT_SEC           0x0d    /* content security */
+#define USB_CLASS_VIDEO                 0x0e
+#define USB_CLASS_WIRELESS_CONTROLLER   0xe0
+#define USB_CLASS_MISC                  0xef
+#define USB_CLASS_APP_SPEC              0xfe
+#define USB_CLASS_VENDOR_SPEC           0xff
+
+#define USB_SUBCLASS_VENDOR_SPEC        0xff
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_CONFIG: Configuration descriptor information.
+ *
+ * USB_DT_OTHER_SPEED_CONFIG is the same descriptor, except that the
+ * descriptor type is different.  Highspeed-capable devices can look
+ * different depending on what speed they're currently running.  Only
+ * devices with a USB_DT_DEVICE_QUALIFIER have any OTHER_SPEED_CONFIG
+ * descriptors.
+ */
+struct usb_config_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 wTotalLength;
+        __u8  bNumInterfaces;
+        __u8  bConfigurationValue;
+        __u8  iConfiguration;
+        __u8  bmAttributes;
+        __u8  bMaxPower;
+} __attribute__ ((packed));
+
+#define USB_DT_CONFIG_SIZE              9
+
+/* from config descriptor bmAttributes */
+#define USB_CONFIG_ATT_ONE              (1 << 7)        /* must be set */
+#define USB_CONFIG_ATT_SELFPOWER        (1 << 6)        /* self powered */
+#define USB_CONFIG_ATT_WAKEUP           (1 << 5)        /* can wakeup */
+#define USB_CONFIG_ATT_BATTERY          (1 << 4)        /* battery powered */
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_STRING: String descriptor */
+struct usb_string_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 wData[1];                /* UTF-16LE encoded */
+} __attribute__ ((packed));
+
+/* note that "string" zero is special, it holds language codes that
+ * the device supports, not Unicode characters.
+ */
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_INTERFACE: Interface descriptor */
+struct usb_interface_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bInterfaceNumber;
+        __u8  bAlternateSetting;
+        __u8  bNumEndpoints;
+        __u8  bInterfaceClass;
+        __u8  bInterfaceSubClass;
+        __u8  bInterfaceProtocol;
+        __u8  iInterface;
+} __attribute__ ((packed));
+
+#define USB_DT_INTERFACE_SIZE           9
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_ENDPOINT: Endpoint descriptor */
+struct usb_endpoint_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bEndpointAddress;
+        __u8  bmAttributes;
+        __le16 wMaxPacketSize;
+        __u8  bInterval;
+
+        /* NOTE:  these two are _only_ in audio endpoints. */
+        /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
+        __u8  bRefresh;
+        __u8  bSynchAddress;
+} __attribute__ ((packed));
+
+#define USB_DT_ENDPOINT_SIZE            7
+#define USB_DT_ENDPOINT_AUDIO_SIZE      9       /* Audio extension */
+
+
+/*
+ * Endpoints
+ */
+#define USB_ENDPOINT_NUMBER_MASK        0x0f    /* in bEndpointAddress */
+#define USB_ENDPOINT_DIR_MASK           0x80
+
+#define USB_ENDPOINT_XFERTYPE_MASK      0x03    /* in bmAttributes */
+#define USB_ENDPOINT_XFER_CONTROL       0
+#define USB_ENDPOINT_XFER_ISOC          1
+#define USB_ENDPOINT_XFER_BULK          2
+#define USB_ENDPOINT_XFER_INT           3
+#define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
+
+/* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
+#define USB_ENDPOINT_INTRTYPE           0x30
+#define USB_ENDPOINT_INTR_PERIODIC      (0 << 4)
+#define USB_ENDPOINT_INTR_NOTIFICATION  (1 << 4)
+
+#define USB_ENDPOINT_SYNCTYPE           0x0c
+#define USB_ENDPOINT_SYNC_NONE          (0 << 2)
+#define USB_ENDPOINT_SYNC_ASYNC         (1 << 2)
+#define USB_ENDPOINT_SYNC_ADAPTIVE      (2 << 2)
+#define USB_ENDPOINT_SYNC_SYNC          (3 << 2)
+
+#define USB_ENDPOINT_USAGE_MASK         0x30
+#define USB_ENDPOINT_USAGE_DATA         0x00
+#define USB_ENDPOINT_USAGE_FEEDBACK     0x10
+#define USB_ENDPOINT_USAGE_IMPLICIT_FB  0x20    /* Implicit feedback Data endpoint */
+
+/*-------------------------------------------------------------------------*/
+
+/**
+ * usb_endpoint_num - get the endpoint's number
+ * @epd: endpoint to be checked
+ *
+ * Returns @epd's number: 0 to 15.
+ */
+static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+}
+
+/**
+ * usb_endpoint_type - get the endpoint's transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
+ * to @epd's transfer type.
+ */
+static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
+}
+
+/**
+ * usb_endpoint_dir_in - check if the endpoint has IN direction
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type IN, otherwise it returns false.
+ */
+static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
+}
+
+/**
+ * usb_endpoint_dir_out - check if the endpoint has OUT direction
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type OUT, otherwise it returns false.
+ */
+static inline int usb_endpoint_dir_out(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
+}
+
+/**
+ * usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type bulk, otherwise it returns false.
+ */
+static inline int usb_endpoint_xfer_bulk(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_BULK);
+}
+
+/**
+ * usb_endpoint_xfer_control - check if the endpoint has control transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type control, otherwise it returns false.
+ */
+static inline int usb_endpoint_xfer_control(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_CONTROL);
+}
+
+/**
+ * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type interrupt, otherwise it returns
+ * false.
+ */
+static inline int usb_endpoint_xfer_int(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_INT);
+}
+
+/**
+ * usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type isochronous, otherwise it returns
+ * false.
+ */
+static inline int usb_endpoint_xfer_isoc(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_ISOC);
+}
+
+/**
+ * usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has bulk transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_bulk_in(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
+}
+
+/**
+ * usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has bulk transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_bulk_out(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
+}
+
+/**
+ * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_int_in(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
+}
+
+/**
+ * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_int_out(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
+}
+
+/**
+ * usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has isochronous transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_isoc_in(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
+}
+
+/**
+ * usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has isochronous transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_isoc_out(
+                                const struct usb_endpoint_descriptor *epd)
+{
+        return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
+}
+
+/**
+ * usb_endpoint_maxp - get endpoint's max packet size
+ * @epd: endpoint to be checked
+ *
+ * Returns @epd's max packet
+ */
+static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
+{
+        return __le16_to_cpu(epd->wMaxPacketSize);
+}
+
+static inline int usb_endpoint_interrupt_type(
+                const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bmAttributes & USB_ENDPOINT_INTRTYPE;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
+struct usb_ss_ep_comp_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bMaxBurst;
+        __u8  bmAttributes;
+        __le16 wBytesPerInterval;
+} __attribute__ ((packed));
+
+#define USB_DT_SS_EP_COMP_SIZE          6
+
+/* Bits 4:0 of bmAttributes if this is a bulk endpoint */
+static inline int
+usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
+{
+        int             max_streams;
+
+        if (!comp)
+                return 0;
+
+        max_streams = comp->bmAttributes & 0x1f;
+
+        if (!max_streams)
+                return 0;
+
+        max_streams = 1 << max_streams;
+
+        return max_streams;
+}
+
+/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
+#define USB_SS_MULT(p)                  (1 + ((p) & 0x3))
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_DEVICE_QUALIFIER: Device Qualifier descriptor */
+struct usb_qualifier_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 bcdUSB;
+        __u8  bDeviceClass;
+        __u8  bDeviceSubClass;
+        __u8  bDeviceProtocol;
+        __u8  bMaxPacketSize0;
+        __u8  bNumConfigurations;
+        __u8  bRESERVED;
+} __attribute__ ((packed));
+
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_OTG (from OTG 1.0a supplement) */
+struct usb_otg_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bmAttributes;     /* support for HNP, SRP, etc */
+} __attribute__ ((packed));
+
+/* from usb_otg_descriptor.bmAttributes */
+#define USB_OTG_SRP             (1 << 0)
+#define USB_OTG_HNP             (1 << 1)        /* swap host/device roles */
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_DEBUG:  for special highspeed devices, replacing serial console */
+struct usb_debug_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        /* bulk endpoints with 8 byte maxpacket */
+        __u8  bDebugInEndpoint;
+        __u8  bDebugOutEndpoint;
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_INTERFACE_ASSOCIATION: groups interfaces */
+struct usb_interface_assoc_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bFirstInterface;
+        __u8  bInterfaceCount;
+        __u8  bFunctionClass;
+        __u8  bFunctionSubClass;
+        __u8  bFunctionProtocol;
+        __u8  iFunction;
+} __attribute__ ((packed));
+
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_SECURITY:  group of wireless security descriptors, including
+ * encryption types available for setting up a CC/association.
+ */
+struct usb_security_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 wTotalLength;
+        __u8  bNumEncryptionTypes;
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_KEY:  used with {GET,SET}_SECURITY_DATA; only public keys
+ * may be retrieved.
+ */
+struct usb_key_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  tTKID[3];
+        __u8  bReserved;
+        __u8  bKeyData[0];
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_ENCRYPTION_TYPE:  bundled in DT_SECURITY groups */
+struct usb_encryption_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bEncryptionType;
+#define USB_ENC_TYPE_UNSECURE           0
+#define USB_ENC_TYPE_WIRED              1       /* non-wireless mode */
+#define USB_ENC_TYPE_CCM_1              2       /* aes128/cbc session */
+#define USB_ENC_TYPE_RSA_1              3       /* rsa3072/sha1 auth */
+        __u8  bEncryptionValue;         /* use in SET_ENCRYPTION */
+        __u8  bAuthKeyIndex;
+} __attribute__((packed));
+
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_BOS:  group of device-level capabilities */
+struct usb_bos_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __le16 wTotalLength;
+        __u8  bNumDeviceCaps;
+} __attribute__((packed));
+
+#define USB_DT_BOS_SIZE         5
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_DEVICE_CAPABILITY:  grouped with BOS */
+struct usb_dev_cap_header {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+} __attribute__((packed));
+
+#define USB_CAP_TYPE_WIRELESS_USB       1
+
+struct usb_wireless_cap_descriptor {    /* Ultra Wide Band */
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+
+        __u8  bmAttributes;
+#define USB_WIRELESS_P2P_DRD            (1 << 1)
+#define USB_WIRELESS_BEACON_MASK        (3 << 2)
+#define USB_WIRELESS_BEACON_SELF        (1 << 2)
+#define USB_WIRELESS_BEACON_DIRECTED    (2 << 2)
+#define USB_WIRELESS_BEACON_NONE        (3 << 2)
+        __le16 wPHYRates;       /* bit rates, Mbps */
+#define USB_WIRELESS_PHY_53             (1 << 0)        /* always set */
+#define USB_WIRELESS_PHY_80             (1 << 1)
+#define USB_WIRELESS_PHY_107            (1 << 2)        /* always set */
+#define USB_WIRELESS_PHY_160            (1 << 3)
+#define USB_WIRELESS_PHY_200            (1 << 4)        /* always set */
+#define USB_WIRELESS_PHY_320            (1 << 5)
+#define USB_WIRELESS_PHY_400            (1 << 6)
+#define USB_WIRELESS_PHY_480            (1 << 7)
+        __u8  bmTFITXPowerInfo; /* TFI power levels */
+        __u8  bmFFITXPowerInfo; /* FFI power levels */
+        __le16 bmBandGroup;
+        __u8  bReserved;
+} __attribute__((packed));
+
+/* USB 2.0 Extension descriptor */
+#define USB_CAP_TYPE_EXT                2
+
+struct usb_ext_cap_descriptor {         /* Link Power Management */
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+        __le32 bmAttributes;
+#define USB_LPM_SUPPORT                 (1 << 1)        /* supports LPM */
+#define USB_BESL_SUPPORT                (1 << 2)        /* supports BESL */
+#define USB_BESL_BASELINE_VALID         (1 << 3)        /* Baseline BESL valid*/
+#define USB_BESL_DEEP_VALID             (1 << 4)        /* Deep BESL valid */
+#define USB_GET_BESL_BASELINE(p)        (((p) & (0xf << 8)) >> 8)
+#define USB_GET_BESL_DEEP(p)            (((p) & (0xf << 12)) >> 12)
+} __attribute__((packed));
+
+#define USB_DT_USB_EXT_CAP_SIZE 7
+
+/*
+ * SuperSpeed USB Capability descriptor: Defines the set of SuperSpeed USB
+ * specific device level capabilities
+ */
+#define         USB_SS_CAP_TYPE         3
+struct usb_ss_cap_descriptor {          /* Link Power Management */
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+        __u8  bmAttributes;
+#define USB_LTM_SUPPORT                 (1 << 1) /* supports LTM */
+        __le16 wSpeedSupported;
+#define USB_LOW_SPEED_OPERATION         (1)      /* Low speed operation */
+#define USB_FULL_SPEED_OPERATION        (1 << 1) /* Full speed operation */
+#define USB_HIGH_SPEED_OPERATION        (1 << 2) /* High speed operation */
+#define USB_5GBPS_OPERATION             (1 << 3) /* Operation at 5Gbps */
+        __u8  bFunctionalitySupport;
+        __u8  bU1devExitLat;
+        __le16 bU2DevExitLat;
+} __attribute__((packed));
+
+#define USB_DT_USB_SS_CAP_SIZE  10
+
+/*
+ * Container ID Capability descriptor: Defines the instance unique ID used to
+ * identify the instance across all operating modes
+ */
+#define CONTAINER_ID_TYPE       4
+struct usb_ss_container_id_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDevCapabilityType;
+        __u8  bReserved;
+        __u8  ContainerID[16]; /* 128-bit number */
+} __attribute__((packed));
+
+#define USB_DT_USB_SS_CONTN_ID_SIZE     20
+/*-------------------------------------------------------------------------*/
+
+/* USB_DT_WIRELESS_ENDPOINT_COMP:  companion descriptor associated with
+ * each endpoint descriptor for a wireless device
+ */
+struct usb_wireless_ep_comp_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bMaxBurst;
+        __u8  bMaxSequence;
+        __le16 wMaxStreamDelay;
+        __le16 wOverTheAirPacketSize;
+        __u8  bOverTheAirInterval;
+        __u8  bmCompAttributes;
+#define USB_ENDPOINT_SWITCH_MASK        0x03    /* in bmCompAttributes */
+#define USB_ENDPOINT_SWITCH_NO          0
+#define USB_ENDPOINT_SWITCH_SWITCH      1
+#define USB_ENDPOINT_SWITCH_SCALE       2
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_REQ_SET_HANDSHAKE is a four-way handshake used between a wireless
+ * host and a device for connection set up, mutual authentication, and
+ * exchanging short lived session keys.  The handshake depends on a CC.
+ */
+struct usb_handshake {
+        __u8 bMessageNumber;
+        __u8 bStatus;
+        __u8 tTKID[3];
+        __u8 bReserved;
+        __u8 CDID[16];
+        __u8 nonce[16];
+        __u8 MIC[8];
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB_REQ_SET_CONNECTION modifies or revokes a connection context (CC).
+ * A CC may also be set up using non-wireless secure channels (including
+ * wired USB!), and some devices may support CCs with multiple hosts.
+ */
+struct usb_connection_context {
+        __u8 CHID[16];          /* persistent host id */
+        __u8 CDID[16];          /* device id (unique w/in host context) */
+        __u8 CK[16];            /* connection key */
+} __attribute__((packed));
+
+/*-------------------------------------------------------------------------*/
+
+/* USB 2.0 defines three speeds, here's how Linux identifies them */
+
+enum usb_device_speed {
+        USB_SPEED_UNKNOWN = 0,                  /* enumerating */
+        USB_SPEED_LOW, USB_SPEED_FULL,          /* usb 1.1 */
+        USB_SPEED_HIGH,                         /* usb 2.0 */
+        USB_SPEED_WIRELESS,                     /* wireless (usb 2.5) */
+        USB_SPEED_SUPER,                        /* usb 3.0 */
+};
+
+
+enum usb_device_state {
+        /* NOTATTACHED isn't in the USB spec, and this state acts
+         * the same as ATTACHED ... but it's clearer this way.
+         */
+        USB_STATE_NOTATTACHED = 0,
+
+        /* chapter 9 and authentication (wireless) device states */
+        USB_STATE_ATTACHED,
+        USB_STATE_POWERED,                      /* wired */
+        USB_STATE_RECONNECTING,                 /* auth */
+        USB_STATE_UNAUTHENTICATED,              /* auth */
+        USB_STATE_DEFAULT,                      /* limited function */
+        USB_STATE_ADDRESS,
+        USB_STATE_CONFIGURED,                   /* most functions */
+
+        USB_STATE_SUSPENDED
+
+        /* NOTE:  there are actually four different SUSPENDED
+         * states, returning to POWERED, DEFAULT, ADDRESS, or
+         * CONFIGURED respectively when SOF tokens flow again.
+         * At this level there's no difference between L1 and L2
+         * suspend states.  (L2 being original USB 1.1 suspend.)
+         */
+};
+
+enum usb3_link_state {
+        USB3_LPM_U0 = 0,
+        USB3_LPM_U1,
+        USB3_LPM_U2,
+        USB3_LPM_U3
+};
+
+/*
+ * A U1 timeout of 0x0 means the parent hub will reject any transitions to U1.
+ * 0xff means the parent hub will accept transitions to U1, but will not
+ * initiate a transition.
+ *
+ * A U1 timeout of 0x1 to 0x7F also causes the hub to initiate a transition to
+ * U1 after that many microseconds.  Timeouts of 0x80 to 0xFE are reserved
+ * values.
+ *
+ * A U2 timeout of 0x0 means the parent hub will reject any transitions to U2.
+ * 0xff means the parent hub will accept transitions to U2, but will not
+ * initiate a transition.
+ *
+ * A U2 timeout of 0x1 to 0xFE also causes the hub to initiate a transition to
+ * U2 after N*256 microseconds.  Therefore a U2 timeout value of 0x1 means a U2
+ * idle timer of 256 microseconds, 0x2 means 512 microseconds, 0xFE means
+ * 65.024ms.
+ */
+#define USB3_LPM_DISABLED               0x0
+#define USB3_LPM_U1_MAX_TIMEOUT         0x7F
+#define USB3_LPM_U2_MAX_TIMEOUT         0xFE
+#define USB3_LPM_DEVICE_INITIATED       0xFF
+
+struct usb_set_sel_req {
+        __u8    u1_sel;
+        __u8    u1_pel;
+        __le16  u2_sel;
+        __le16  u2_pel;
+} __attribute__ ((packed));
+
+/*
+ * The Set System Exit Latency control transfer provides one byte each for
+ * U1 SEL and U1 PEL, so the max exit latency is 0xFF.  U2 SEL and U2 PEL each
+ * are two bytes long.
+ */
+#define USB3_LPM_MAX_U1_SEL_PEL         0xFF
+#define USB3_LPM_MAX_U2_SEL_PEL         0xFFFF
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * As per USB compliance update, a device that is actively drawing
+ * more than 100mA from USB must report itself as bus-powered in
+ * the GetStatus(DEVICE) call.
+ * http://compliance.usb.org/index.asp?UpdateFile=Electrical&Format=Standard#34
+ */
+#define USB_SELF_POWER_VBUS_MAX_DRAW            100
+
+#endif /* _UAPI__LINUX_USB_CH9_H */
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
new file mode 100644
index 000000000000..d6b01283f85c
--- /dev/null
+++ b/include/uapi/linux/usb/functionfs.h
@@ -0,0 +1,169 @@
+#ifndef _UAPI__LINUX_FUNCTIONFS_H__
+#define _UAPI__LINUX_FUNCTIONFS_H__
+
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#include <linux/usb/ch9.h>
+
+
+enum {
+        FUNCTIONFS_DESCRIPTORS_MAGIC = 1,
+        FUNCTIONFS_STRINGS_MAGIC     = 2
+};
+
+
+#ifndef __KERNEL__
+
+/* Descriptor of an non-audio endpoint */
+struct usb_endpoint_descriptor_no_audio {
+        __u8  bLength;
+        __u8  bDescriptorType;
+
+        __u8  bEndpointAddress;
+        __u8  bmAttributes;
+        __le16 wMaxPacketSize;
+        __u8  bInterval;
+} __attribute__((packed));
+
+
+/*
+ * All numbers must be in little endian order.
+ */
+
+struct usb_functionfs_descs_head {
+        __le32 magic;
+        __le32 length;
+        __le32 fs_count;
+        __le32 hs_count;
+} __attribute__((packed));
+
+/*
+ * Descriptors format:
+ *
+ * | off | name      | type         | description                          |
+ * |-----+-----------+--------------+--------------------------------------|
+ * |   0 | magic     | LE32         | FUNCTIONFS_{FS,HS}_DESCRIPTORS_MAGIC |
+ * |   4 | length    | LE32         | length of the whole data chunk       |
+ * |   8 | fs_count  | LE32         | number of full-speed descriptors     |
+ * |  12 | hs_count  | LE32         | number of high-speed descriptors     |
+ * |  16 | fs_descrs | Descriptor[] | list of full-speed descriptors       |
+ * |     | hs_descrs | Descriptor[] | list of high-speed descriptors       |
+ *
+ * descs are just valid USB descriptors and have the following format:
+ *
+ * | off | name            | type | description              |
+ * |-----+-----------------+------+--------------------------|
+ * |   0 | bLength         | U8   | length of the descriptor |
+ * |   1 | bDescriptorType | U8   | descriptor type          |
+ * |   2 | payload         |      | descriptor's payload     |
+ */
+
+struct usb_functionfs_strings_head {
+        __le32 magic;
+        __le32 length;
+        __le32 str_count;
+        __le32 lang_count;
+} __attribute__((packed));
+
+/*
+ * Strings format:
+ *
+ * | off | name       | type                  | description                |
+ * |-----+------------+-----------------------+----------------------------|
+ * |   0 | magic      | LE32                  | FUNCTIONFS_STRINGS_MAGIC   |
+ * |   4 | length     | LE32                  | length of the data chunk   |
+ * |   8 | str_count  | LE32                  | number of strings          |
+ * |  12 | lang_count | LE32                  | number of languages        |
+ * |  16 | stringtab  | StringTab[lang_count] | table of strings per lang  |
+ *
+ * For each language there is one stringtab entry (ie. there are lang_count
+ * stringtab entires).  Each StringTab has following format:
+ *
+ * | off | name    | type              | description                        |
+ * |-----+---------+-------------------+------------------------------------|
+ * |   0 | lang    | LE16              | language code                      |
+ * |   2 | strings | String[str_count] | array of strings in given language |
+ *
+ * For each string there is one strings entry (ie. there are str_count
+ * string entries).  Each String is a NUL terminated string encoded in
+ * UTF-8.
+ */
+
+#endif
+
+
+/*
+ * Events are delivered on the ep0 file descriptor, when the user mode driver
+ * reads from this file descriptor after writing the descriptors.  Don't
+ * stop polling this descriptor.
+ */
+
+enum usb_functionfs_event_type {
+        FUNCTIONFS_BIND,
+        FUNCTIONFS_UNBIND,
+
+        FUNCTIONFS_ENABLE,
+        FUNCTIONFS_DISABLE,
+
+        FUNCTIONFS_SETUP,
+
+        FUNCTIONFS_SUSPEND,
+        FUNCTIONFS_RESUME
+};
+
+/* NOTE:  this structure must stay the same size and layout on
+ * both 32-bit and 64-bit kernels.
+ */
+struct usb_functionfs_event {
+        union {
+                /* SETUP: packet; DATA phase i/o precedes next event
+                 *(setup.bmRequestType & USB_DIR_IN) flags direction */
+                struct usb_ctrlrequest  setup;
+        } __attribute__((packed)) u;
+
+        /* enum usb_functionfs_event_type */
+        __u8                            type;
+        __u8                            _pad[3];
+} __attribute__((packed));
+
+
+/* Endpoint ioctls */
+/* The same as in gadgetfs */
+
+/* IN transfers may be reported to the gadget driver as complete
+ *      when the fifo is loaded, before the host reads the data;
+ * OUT transfers may be reported to the host's "client" driver as
+ *      complete when they're sitting in the FIFO unread.
+ * THIS returns how many bytes are "unclaimed" in the endpoint fifo
+ * (needed for precise fault handling, when the hardware allows it)
+ */
+#define FUNCTIONFS_FIFO_STATUS  _IO('g', 1)
+
+/* discards any unclaimed data in the fifo. */
+#define FUNCTIONFS_FIFO_FLUSH   _IO('g', 2)
+
+/* resets endpoint halt+toggle; used to implement set_interface.
+ * some hardware (like pxa2xx) can't support this.
+ */
+#define FUNCTIONFS_CLEAR_HALT   _IO('g', 3)
+
+/* Specific for functionfs */
+
+/*
+ * Returns reverse mapping of an interface.  Called on EP0.  If there
+ * is no such interface returns -EDOM.  If function is not active
+ * returns -ENODEV.
+ */
+#define FUNCTIONFS_INTERFACE_REVMAP     _IO('g', 128)
+
+/*
+ * Returns real bEndpointAddress of an endpoint.  If function is not
+ * active returns -ENODEV.
+ */
+#define FUNCTIONFS_ENDPOINT_REVMAP      _IO('g', 129)
+
+
+
+#endif /* _UAPI__LINUX_FUNCTIONFS_H__ */
diff --git a/include/linux/usb/g_printer.h b/include/uapi/linux/usb/g_printer.h
index 6178fde50f74..6178fde50f74 100644
--- a/include/linux/usb/g_printer.h
+++ b/include/uapi/linux/usb/g_printer.h
diff --git a/include/linux/usb/gadgetfs.h b/include/uapi/linux/usb/gadgetfs.h
index 0bb12e0d4f8f..0bb12e0d4f8f 100644
--- a/include/linux/usb/gadgetfs.h
+++ b/include/uapi/linux/usb/gadgetfs.h
diff --git a/include/linux/usb/midi.h b/include/uapi/linux/usb/midi.h
index c8c52e3c91de..c8c52e3c91de 100644
--- a/include/linux/usb/midi.h
+++ b/include/uapi/linux/usb/midi.h
diff --git a/include/linux/usb/tmc.h b/include/uapi/linux/usb/tmc.h
index c045ae12556c..c045ae12556c 100644
--- a/include/linux/usb/tmc.h
+++ b/include/uapi/linux/usb/tmc.h
diff --git a/include/linux/usb/video.h b/include/uapi/linux/usb/video.h
index 3b3b95e01f71..3b3b95e01f71 100644
--- a/include/linux/usb/video.h
+++ b/include/uapi/linux/usb/video.h
diff --git a/include/uapi/linux/usbdevice_fs.h b/include/uapi/linux/usbdevice_fs.h
new file mode 100644
index 000000000000..0c65e4b12617
--- /dev/null
+++ b/include/uapi/linux/usbdevice_fs.h
@@ -0,0 +1,180 @@
+/*****************************************************************************/
+
+/*
+ *      usbdevice_fs.h  --  USB device file system.
+ *
+ *      Copyright (C) 2000
+ *          Thomas Sailer (sailer@ife.ee.ethz.ch)
+ *
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      This program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with this program; if not, write to the Free Software
+ *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  History:
+ *   0.1  04.01.2000  Created
+ */
+
+/*****************************************************************************/
+
+#ifndef _UAPI_LINUX_USBDEVICE_FS_H
+#define _UAPI_LINUX_USBDEVICE_FS_H
+
+#include <linux/types.h>
+#include <linux/magic.h>
+
+/* --------------------------------------------------------------------- */
+
+/* usbdevfs ioctl codes */
+
+struct usbdevfs_ctrltransfer {
+        __u8 bRequestType;
+        __u8 bRequest;
+        __u16 wValue;
+        __u16 wIndex;
+        __u16 wLength;
+        __u32 timeout;  /* in milliseconds */
+        void __user *data;
+};
+
+struct usbdevfs_bulktransfer {
+        unsigned int ep;
+        unsigned int len;
+        unsigned int timeout; /* in milliseconds */
+        void __user *data;
+};
+
+struct usbdevfs_setinterface {
+        unsigned int interface;
+        unsigned int altsetting;
+};
+
+struct usbdevfs_disconnectsignal {
+        unsigned int signr;
+        void __user *context;
+};
+
+#define USBDEVFS_MAXDRIVERNAME 255
+
+struct usbdevfs_getdriver {
+        unsigned int interface;
+        char driver[USBDEVFS_MAXDRIVERNAME + 1];
+};
+
+struct usbdevfs_connectinfo {
+        unsigned int devnum;
+        unsigned char slow;
+};
+
+#define USBDEVFS_URB_SHORT_NOT_OK       0x01
+#define USBDEVFS_URB_ISO_ASAP           0x02
+#define USBDEVFS_URB_BULK_CONTINUATION  0x04
+#define USBDEVFS_URB_NO_FSBR            0x20
+#define USBDEVFS_URB_ZERO_PACKET        0x40
+#define USBDEVFS_URB_NO_INTERRUPT       0x80
+
+#define USBDEVFS_URB_TYPE_ISO              0
+#define USBDEVFS_URB_TYPE_INTERRUPT        1
+#define USBDEVFS_URB_TYPE_CONTROL          2
+#define USBDEVFS_URB_TYPE_BULK             3
+
+struct usbdevfs_iso_packet_desc {
+        unsigned int length;
+        unsigned int actual_length;
+        unsigned int status;
+};
+
+struct usbdevfs_urb {
+        unsigned char type;
+        unsigned char endpoint;
+        int status;
+        unsigned int flags;
+        void __user *buffer;
+        int buffer_length;
+        int actual_length;
+        int start_frame;
+        int number_of_packets;
+        int error_count;
+        unsigned int signr;     /* signal to be sent on completion,
+                                  or 0 if none should be sent. */
+        void __user *usercontext;
+        struct usbdevfs_iso_packet_desc iso_frame_desc[0];
+};
+
+/* ioctls for talking directly to drivers */
+struct usbdevfs_ioctl {
+        int     ifno;           /* interface 0..N ; negative numbers reserved */
+        int     ioctl_code;     /* MUST encode size + direction of data so the
+                                 * macros in <asm/ioctl.h> give correct values */
+        void __user *data;      /* param buffer (in, or out) */
+};
+
+/* You can do most things with hubs just through control messages,
+ * except find out what device connects to what port. */
+struct usbdevfs_hub_portinfo {
+        char nports;            /* number of downstream ports in this hub */
+        char port [127];        /* e.g. port 3 connects to device 27 */
+};
+
+/* Device capability flags */
+#define USBDEVFS_CAP_ZERO_PACKET                0x01
+#define USBDEVFS_CAP_BULK_CONTINUATION          0x02
+#define USBDEVFS_CAP_NO_PACKET_SIZE_LIM         0x04
+#define USBDEVFS_CAP_BULK_SCATTER_GATHER        0x08
+
+/* USBDEVFS_DISCONNECT_CLAIM flags & struct */
+
+/* disconnect-and-claim if the driver matches the driver field */
+#define USBDEVFS_DISCONNECT_CLAIM_IF_DRIVER     0x01
+/* disconnect-and-claim except when the driver matches the driver field */
+#define USBDEVFS_DISCONNECT_CLAIM_EXCEPT_DRIVER 0x02
+
+struct usbdevfs_disconnect_claim {
+        unsigned int interface;
+        unsigned int flags;
+        char driver[USBDEVFS_MAXDRIVERNAME + 1];
+};
+
+
+#define USBDEVFS_CONTROL           _IOWR('U', 0, struct usbdevfs_ctrltransfer)
+#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
+#define USBDEVFS_BULK              _IOWR('U', 2, struct usbdevfs_bulktransfer)
+#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
+#define USBDEVFS_RESETEP           _IOR('U', 3, unsigned int)
+#define USBDEVFS_SETINTERFACE      _IOR('U', 4, struct usbdevfs_setinterface)
+#define USBDEVFS_SETCONFIGURATION  _IOR('U', 5, unsigned int)
+#define USBDEVFS_GETDRIVER         _IOW('U', 8, struct usbdevfs_getdriver)
+#define USBDEVFS_SUBMITURB         _IOR('U', 10, struct usbdevfs_urb)
+#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
+#define USBDEVFS_DISCARDURB        _IO('U', 11)
+#define USBDEVFS_REAPURB           _IOW('U', 12, void *)
+#define USBDEVFS_REAPURB32         _IOW('U', 12, __u32)
+#define USBDEVFS_REAPURBNDELAY     _IOW('U', 13, void *)
+#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, __u32)
+#define USBDEVFS_DISCSIGNAL        _IOR('U', 14, struct usbdevfs_disconnectsignal)
+#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
+#define USBDEVFS_CLAIMINTERFACE    _IOR('U', 15, unsigned int)
+#define USBDEVFS_RELEASEINTERFACE  _IOR('U', 16, unsigned int)
+#define USBDEVFS_CONNECTINFO       _IOW('U', 17, struct usbdevfs_connectinfo)
+#define USBDEVFS_IOCTL             _IOWR('U', 18, struct usbdevfs_ioctl)
+#define USBDEVFS_IOCTL32           _IOWR('U', 18, struct usbdevfs_ioctl32)
+#define USBDEVFS_HUB_PORTINFO      _IOR('U', 19, struct usbdevfs_hub_portinfo)
+#define USBDEVFS_RESET             _IO('U', 20)
+#define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)
+#define USBDEVFS_DISCONNECT        _IO('U', 22)
+#define USBDEVFS_CONNECT           _IO('U', 23)
+#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)
+#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)
+#define USBDEVFS_GET_CAPABILITIES  _IOR('U', 26, __u32)
+#define USBDEVFS_DISCONNECT_CLAIM  _IOR('U', 27, struct usbdevfs_disconnect_claim)
+
+#endif /* _UAPI_LINUX_USBDEVICE_FS_H */
diff --git a/include/linux/utime.h b/include/uapi/linux/utime.h
index 5cdf673afbdb..5cdf673afbdb 100644
--- a/include/linux/utime.h
+++ b/include/uapi/linux/utime.h
diff --git a/include/uapi/linux/utsname.h b/include/uapi/linux/utsname.h
new file mode 100644
index 000000000000..872c2df10de7
--- /dev/null
+++ b/include/uapi/linux/utsname.h
@@ -0,0 +1,34 @@
+#ifndef _UAPI_LINUX_UTSNAME_H
+#define _UAPI_LINUX_UTSNAME_H
+
+#define __OLD_UTS_LEN 8
+
+struct oldold_utsname {
+        char sysname[9];
+        char nodename[9];
+        char release[9];
+        char version[9];
+        char machine[9];
+};
+
+#define __NEW_UTS_LEN 64
+
+struct old_utsname {
+        char sysname[65];
+        char nodename[65];
+        char release[65];
+        char version[65];
+        char machine[65];
+};
+
+struct new_utsname {
+        char sysname[__NEW_UTS_LEN + 1];
+        char nodename[__NEW_UTS_LEN + 1];
+        char release[__NEW_UTS_LEN + 1];
+        char version[__NEW_UTS_LEN + 1];
+        char machine[__NEW_UTS_LEN + 1];
+        char domainname[__NEW_UTS_LEN + 1];
+};
+
+
+#endif /* _UAPI_LINUX_UTSNAME_H */
diff --git a/include/uapi/linux/uuid.h b/include/uapi/linux/uuid.h
new file mode 100644
index 000000000000..786f0773cc33
--- /dev/null
+++ b/include/uapi/linux/uuid.h
@@ -0,0 +1,58 @@
+/*
+ * UUID/GUID definition
+ *
+ * Copyright (C) 2010, Intel Corp.
+ *      Huang Ying <ying.huang@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _UAPI_LINUX_UUID_H_
+#define _UAPI_LINUX_UUID_H_
+
+#include <linux/types.h>
+#include <linux/string.h>
+
+typedef struct {
+        __u8 b[16];
+} uuid_le;
+
+typedef struct {
+        __u8 b[16];
+} uuid_be;
+
+#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)                \
+((uuid_le)                                                              \
+{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
+   (b) & 0xff, ((b) >> 8) & 0xff,                                       \
+   (c) & 0xff, ((c) >> 8) & 0xff,                                       \
+   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+
+#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)                \
+((uuid_be)                                                              \
+{{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \
+   ((b) >> 8) & 0xff, (b) & 0xff,                                       \
+   ((c) >> 8) & 0xff, (c) & 0xff,                                       \
+   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+
+#define NULL_UUID_LE                                                    \
+        UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,     \
+                0x00, 0x00, 0x00, 0x00)
+
+#define NULL_UUID_BE                                                    \
+        UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,     \
+                0x00, 0x00, 0x00, 0x00)
+
+
+#endif /* _UAPI_LINUX_UUID_H_ */
diff --git a/include/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h
index 3b081862b9e8..3b081862b9e8 100644
--- a/include/linux/uvcvideo.h
+++ b/include/uapi/linux/uvcvideo.h
diff --git a/include/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h
index 0fa8b64c3cdb..4f0667e010dd 100644
--- a/include/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
@@ -53,10 +53,10 @@
 /* Backward compatibility target definitions --- to be removed. */
 #define V4L2_SEL_TGT_CROP_ACTIVE        V4L2_SEL_TGT_CROP
 #define V4L2_SEL_TGT_COMPOSE_ACTIVE     V4L2_SEL_TGT_COMPOSE
-#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL \
-        V4L2_SEL_TGT_CROP
-#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL \
-        V4L2_SEL_TGT_COMPOSE
+#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
+#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
 
 /* Selection flags */
 #define V4L2_SEL_FLAG_GE                (1 << 0)
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
new file mode 100644
index 000000000000..f56c945cecd4
--- /dev/null
+++ b/include/uapi/linux/v4l2-controls.h
@@ -0,0 +1,803 @@
+/*
+ *  Video for Linux Two controls header file
+ *
+ *  Copyright (C) 1999-2012 the contributors
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *  3. The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The contents of this header was split off from videodev2.h. All control
+ *  definitions should be added to this header, which is included by
+ *  videodev2.h.
+ */
+
+#ifndef __LINUX_V4L2_CONTROLS_H
+#define __LINUX_V4L2_CONTROLS_H
+
+/* Control classes */
+#define V4L2_CTRL_CLASS_USER            0x00980000      /* Old-style 'user' controls */
+#define V4L2_CTRL_CLASS_MPEG            0x00990000      /* MPEG-compression controls */
+#define V4L2_CTRL_CLASS_CAMERA          0x009a0000      /* Camera class controls */
+#define V4L2_CTRL_CLASS_FM_TX           0x009b0000      /* FM Modulator control class */
+#define V4L2_CTRL_CLASS_FLASH           0x009c0000      /* Camera flash controls */
+#define V4L2_CTRL_CLASS_JPEG            0x009d0000      /* JPEG-compression controls */
+#define V4L2_CTRL_CLASS_IMAGE_SOURCE    0x009e0000      /* Image source controls */
+#define V4L2_CTRL_CLASS_IMAGE_PROC      0x009f0000      /* Image processing controls */
+#define V4L2_CTRL_CLASS_DV              0x00a00000      /* Digital Video controls */
+
+/* User-class control IDs */
+
+#define V4L2_CID_BASE                   (V4L2_CTRL_CLASS_USER | 0x900)
+#define V4L2_CID_USER_BASE              V4L2_CID_BASE
+#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_BRIGHTNESS             (V4L2_CID_BASE+0)
+#define V4L2_CID_CONTRAST               (V4L2_CID_BASE+1)
+#define V4L2_CID_SATURATION             (V4L2_CID_BASE+2)
+#define V4L2_CID_HUE                    (V4L2_CID_BASE+3)
+#define V4L2_CID_AUDIO_VOLUME           (V4L2_CID_BASE+5)
+#define V4L2_CID_AUDIO_BALANCE          (V4L2_CID_BASE+6)
+#define V4L2_CID_AUDIO_BASS             (V4L2_CID_BASE+7)
+#define V4L2_CID_AUDIO_TREBLE           (V4L2_CID_BASE+8)
+#define V4L2_CID_AUDIO_MUTE             (V4L2_CID_BASE+9)
+#define V4L2_CID_AUDIO_LOUDNESS         (V4L2_CID_BASE+10)
+#define V4L2_CID_BLACK_LEVEL            (V4L2_CID_BASE+11) /* Deprecated */
+#define V4L2_CID_AUTO_WHITE_BALANCE     (V4L2_CID_BASE+12)
+#define V4L2_CID_DO_WHITE_BALANCE       (V4L2_CID_BASE+13)
+#define V4L2_CID_RED_BALANCE            (V4L2_CID_BASE+14)
+#define V4L2_CID_BLUE_BALANCE           (V4L2_CID_BASE+15)
+#define V4L2_CID_GAMMA                  (V4L2_CID_BASE+16)
+#define V4L2_CID_WHITENESS              (V4L2_CID_GAMMA) /* Deprecated */
+#define V4L2_CID_EXPOSURE               (V4L2_CID_BASE+17)
+#define V4L2_CID_AUTOGAIN               (V4L2_CID_BASE+18)
+#define V4L2_CID_GAIN                   (V4L2_CID_BASE+19)
+#define V4L2_CID_HFLIP                  (V4L2_CID_BASE+20)
+#define V4L2_CID_VFLIP                  (V4L2_CID_BASE+21)
+
+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
+#define V4L2_CID_HCENTER                (V4L2_CID_BASE+22)
+#define V4L2_CID_VCENTER                (V4L2_CID_BASE+23)
+
+#define V4L2_CID_POWER_LINE_FREQUENCY   (V4L2_CID_BASE+24)
+enum v4l2_power_line_frequency {
+        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED  = 0,
+        V4L2_CID_POWER_LINE_FREQUENCY_50HZ      = 1,
+        V4L2_CID_POWER_LINE_FREQUENCY_60HZ      = 2,
+        V4L2_CID_POWER_LINE_FREQUENCY_AUTO      = 3,
+};
+#define V4L2_CID_HUE_AUTO                       (V4L2_CID_BASE+25)
+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE      (V4L2_CID_BASE+26)
+#define V4L2_CID_SHARPNESS                      (V4L2_CID_BASE+27)
+#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
+#define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
+enum v4l2_colorfx {
+        V4L2_COLORFX_NONE                       = 0,
+        V4L2_COLORFX_BW                         = 1,
+        V4L2_COLORFX_SEPIA                      = 2,
+        V4L2_COLORFX_NEGATIVE                   = 3,
+        V4L2_COLORFX_EMBOSS                     = 4,
+        V4L2_COLORFX_SKETCH                     = 5,
+        V4L2_COLORFX_SKY_BLUE                   = 6,
+        V4L2_COLORFX_GRASS_GREEN                = 7,
+        V4L2_COLORFX_SKIN_WHITEN                = 8,
+        V4L2_COLORFX_VIVID                      = 9,
+        V4L2_COLORFX_AQUA                       = 10,
+        V4L2_COLORFX_ART_FREEZE                 = 11,
+        V4L2_COLORFX_SILHOUETTE                 = 12,
+        V4L2_COLORFX_SOLARIZATION               = 13,
+        V4L2_COLORFX_ANTIQUE                    = 14,
+        V4L2_COLORFX_SET_CBCR                   = 15,
+};
+#define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
+#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
+
+#define V4L2_CID_ROTATE                         (V4L2_CID_BASE+34)
+#define V4L2_CID_BG_COLOR                       (V4L2_CID_BASE+35)
+
+#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
+
+#define V4L2_CID_ILLUMINATORS_1                 (V4L2_CID_BASE+37)
+#define V4L2_CID_ILLUMINATORS_2                 (V4L2_CID_BASE+38)
+
+#define V4L2_CID_MIN_BUFFERS_FOR_CAPTURE        (V4L2_CID_BASE+39)
+#define V4L2_CID_MIN_BUFFERS_FOR_OUTPUT         (V4L2_CID_BASE+40)
+
+#define V4L2_CID_ALPHA_COMPONENT                (V4L2_CID_BASE+41)
+#define V4L2_CID_COLORFX_CBCR                   (V4L2_CID_BASE+42)
+
+/* last CID + 1 */
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+43)
+
+
+/* MPEG-class control IDs */
+
+#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
+
+/*  MPEG streams, specific to multiplexed streams */
+#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
+enum v4l2_mpeg_stream_type {
+        V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
+        V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
+};
+#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
+enum v4l2_mpeg_stream_vbi_fmt {
+        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
+        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
+};
+
+/*  MPEG audio controls specific to multiplexed streams  */
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
+enum v4l2_mpeg_audio_sampling_freq {
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
+        V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
+enum v4l2_mpeg_audio_encoding {
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
+        V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
+        V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
+        V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
+};
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
+enum v4l2_mpeg_audio_l1_bitrate {
+        V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
+        V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
+        V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
+        V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
+        V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
+        V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
+        V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
+        V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
+        V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
+        V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
+        V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
+        V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
+        V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
+enum v4l2_mpeg_audio_l2_bitrate {
+        V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
+        V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
+        V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
+        V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
+        V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
+        V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
+        V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
+        V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
+        V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
+        V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
+        V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
+        V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
+        V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
+enum v4l2_mpeg_audio_l3_bitrate {
+        V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
+        V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
+        V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
+        V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
+        V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
+        V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
+        V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
+        V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
+        V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
+        V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
+        V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
+        V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
+        V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
+enum v4l2_mpeg_audio_mode {
+        V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
+        V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
+        V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
+        V4L2_MPEG_AUDIO_MODE_MONO         = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
+enum v4l2_mpeg_audio_mode_extension {
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
+        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
+enum v4l2_mpeg_audio_emphasis {
+        V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
+        V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
+        V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
+enum v4l2_mpeg_audio_crc {
+        V4L2_MPEG_AUDIO_CRC_NONE  = 0,
+        V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
+};
+#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE         (V4L2_CID_MPEG_BASE+110)
+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE         (V4L2_CID_MPEG_BASE+111)
+enum v4l2_mpeg_audio_ac3_bitrate {
+        V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
+        V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
+};
+#define V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK        (V4L2_CID_MPEG_BASE+112)
+enum v4l2_mpeg_audio_dec_playback {
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO           = 0,
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO         = 1,
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT           = 2,
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_RIGHT          = 3,
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_MONO           = 4,
+        V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO = 5,
+};
+#define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
+
+/*  MPEG video controls specific to multiplexed streams */
+#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
+enum v4l2_mpeg_video_encoding {
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
+        V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
+enum v4l2_mpeg_video_aspect {
+        V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
+        V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
+        V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
+        V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
+};
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
+enum v4l2_mpeg_video_bitrate_mode {
+        V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
+        V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
+#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
+#define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE             (V4L2_CID_MPEG_BASE+212)
+#define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER        (V4L2_CID_MPEG_BASE+213)
+#define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB             (V4L2_CID_MPEG_BASE+214)
+#define V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE                     (V4L2_CID_MPEG_BASE+215)
+#define V4L2_CID_MPEG_VIDEO_HEADER_MODE                         (V4L2_CID_MPEG_BASE+216)
+enum v4l2_mpeg_video_header_mode {
+        V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE                    = 0,
+        V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME       = 1,
+
+};
+#define V4L2_CID_MPEG_VIDEO_MAX_REF_PIC                 (V4L2_CID_MPEG_BASE+217)
+#define V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE                (V4L2_CID_MPEG_BASE+218)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES       (V4L2_CID_MPEG_BASE+219)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB          (V4L2_CID_MPEG_BASE+220)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE            (V4L2_CID_MPEG_BASE+221)
+enum v4l2_mpeg_video_multi_slice_mode {
+        V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE         = 0,
+        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB          = 1,
+        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES       = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_VBV_SIZE                    (V4L2_CID_MPEG_BASE+222)
+#define V4L2_CID_MPEG_VIDEO_DEC_PTS                     (V4L2_CID_MPEG_BASE+223)
+#define V4L2_CID_MPEG_VIDEO_DEC_FRAME                   (V4L2_CID_MPEG_BASE+224)
+#define V4L2_CID_MPEG_VIDEO_VBV_DELAY                   (V4L2_CID_MPEG_BASE+225)
+
+#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP             (V4L2_CID_MPEG_BASE+300)
+#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP             (V4L2_CID_MPEG_BASE+301)
+#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP             (V4L2_CID_MPEG_BASE+302)
+#define V4L2_CID_MPEG_VIDEO_H263_MIN_QP                 (V4L2_CID_MPEG_BASE+303)
+#define V4L2_CID_MPEG_VIDEO_H263_MAX_QP                 (V4L2_CID_MPEG_BASE+304)
+#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP             (V4L2_CID_MPEG_BASE+350)
+#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP             (V4L2_CID_MPEG_BASE+351)
+#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP             (V4L2_CID_MPEG_BASE+352)
+#define V4L2_CID_MPEG_VIDEO_H264_MIN_QP                 (V4L2_CID_MPEG_BASE+353)
+#define V4L2_CID_MPEG_VIDEO_H264_MAX_QP                 (V4L2_CID_MPEG_BASE+354)
+#define V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM          (V4L2_CID_MPEG_BASE+355)
+#define V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE               (V4L2_CID_MPEG_BASE+356)
+#define V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE           (V4L2_CID_MPEG_BASE+357)
+enum v4l2_mpeg_video_h264_entropy_mode {
+        V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC = 0,
+        V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_I_PERIOD               (V4L2_CID_MPEG_BASE+358)
+#define V4L2_CID_MPEG_VIDEO_H264_LEVEL                  (V4L2_CID_MPEG_BASE+359)
+enum v4l2_mpeg_video_h264_level {
+        V4L2_MPEG_VIDEO_H264_LEVEL_1_0  = 0,
+        V4L2_MPEG_VIDEO_H264_LEVEL_1B   = 1,
+        V4L2_MPEG_VIDEO_H264_LEVEL_1_1  = 2,
+        V4L2_MPEG_VIDEO_H264_LEVEL_1_2  = 3,
+        V4L2_MPEG_VIDEO_H264_LEVEL_1_3  = 4,
+        V4L2_MPEG_VIDEO_H264_LEVEL_2_0  = 5,
+        V4L2_MPEG_VIDEO_H264_LEVEL_2_1  = 6,
+        V4L2_MPEG_VIDEO_H264_LEVEL_2_2  = 7,
+        V4L2_MPEG_VIDEO_H264_LEVEL_3_0  = 8,
+        V4L2_MPEG_VIDEO_H264_LEVEL_3_1  = 9,
+        V4L2_MPEG_VIDEO_H264_LEVEL_3_2  = 10,
+        V4L2_MPEG_VIDEO_H264_LEVEL_4_0  = 11,
+        V4L2_MPEG_VIDEO_H264_LEVEL_4_1  = 12,
+        V4L2_MPEG_VIDEO_H264_LEVEL_4_2  = 13,
+        V4L2_MPEG_VIDEO_H264_LEVEL_5_0  = 14,
+        V4L2_MPEG_VIDEO_H264_LEVEL_5_1  = 15,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA      (V4L2_CID_MPEG_BASE+360)
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA       (V4L2_CID_MPEG_BASE+361)
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE       (V4L2_CID_MPEG_BASE+362)
+enum v4l2_mpeg_video_h264_loop_filter_mode {
+        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED                           = 0,
+        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED                          = 1,
+        V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY        = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_PROFILE                (V4L2_CID_MPEG_BASE+363)
+enum v4l2_mpeg_video_h264_profile {
+        V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE                   = 0,
+        V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE       = 1,
+        V4L2_MPEG_VIDEO_H264_PROFILE_MAIN                       = 2,
+        V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED                   = 3,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH                       = 4,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10                    = 5,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422                   = 6,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE        = 7,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA              = 8,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA             = 9,
+        V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA             = 10,
+        V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA            = 11,
+        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE          = 12,
+        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH              = 13,
+        V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA        = 14,
+        V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH                = 15,
+        V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH             = 16,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT     (V4L2_CID_MPEG_BASE+364)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH      (V4L2_CID_MPEG_BASE+365)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE         (V4L2_CID_MPEG_BASE+366)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC            (V4L2_CID_MPEG_BASE+367)
+enum v4l2_mpeg_video_h264_vui_sar_idc {
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED    = 0,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_1x1            = 1,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_12x11          = 2,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_10x11          = 3,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_16x11          = 4,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_40x33          = 5,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_24x11          = 6,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_20x11          = 7,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_32x11          = 8,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_80x33          = 9,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_18x11          = 10,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_15x11          = 11,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_64x33          = 12,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_160x99         = 13,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_4x3            = 14,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_3x2            = 15,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1            = 16,
+        V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED       = 17,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING              (V4L2_CID_MPEG_BASE+368)
+#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0         (V4L2_CID_MPEG_BASE+369)
+#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE        (V4L2_CID_MPEG_BASE+370)
+enum v4l2_mpeg_video_h264_sei_fp_arrangement_type {
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_CHECKERBOARD       = 0,
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_COLUMN             = 1,
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_ROW                = 2,
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_SIDE_BY_SIDE       = 3,
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TOP_BOTTOM         = 4,
+        V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TEMPORAL           = 5,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_FMO                    (V4L2_CID_MPEG_BASE+371)
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE           (V4L2_CID_MPEG_BASE+372)
+enum v4l2_mpeg_video_h264_fmo_map_type {
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES            = 0,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES              = 1,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_FOREGROUND_WITH_LEFT_OVER     = 2,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_BOX_OUT                       = 3,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_RASTER_SCAN                   = 4,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_WIPE_SCAN                     = 5,
+        V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_EXPLICIT                      = 6,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP        (V4L2_CID_MPEG_BASE+373)
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION   (V4L2_CID_MPEG_BASE+374)
+enum v4l2_mpeg_video_h264_fmo_change_dir {
+        V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_RIGHT       = 0,
+        V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_LEFT        = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE        (V4L2_CID_MPEG_BASE+375)
+#define V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH         (V4L2_CID_MPEG_BASE+376)
+#define V4L2_CID_MPEG_VIDEO_H264_ASO                    (V4L2_CID_MPEG_BASE+377)
+#define V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER        (V4L2_CID_MPEG_BASE+378)
+#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING            (V4L2_CID_MPEG_BASE+379)
+#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE       (V4L2_CID_MPEG_BASE+380)
+enum v4l2_mpeg_video_h264_hierarchical_coding_type {
+        V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B      = 0,
+        V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P      = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER      (V4L2_CID_MPEG_BASE+381)
+#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP   (V4L2_CID_MPEG_BASE+382)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP    (V4L2_CID_MPEG_BASE+400)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP    (V4L2_CID_MPEG_BASE+401)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP    (V4L2_CID_MPEG_BASE+402)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP        (V4L2_CID_MPEG_BASE+403)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP        (V4L2_CID_MPEG_BASE+404)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL         (V4L2_CID_MPEG_BASE+405)
+enum v4l2_mpeg_video_mpeg4_level {
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_0   = 0,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B  = 1,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_1   = 2,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_2   = 3,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_3   = 4,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B  = 5,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_4   = 6,
+        V4L2_MPEG_VIDEO_MPEG4_LEVEL_5   = 7,
+};
+#define V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE       (V4L2_CID_MPEG_BASE+406)
+enum v4l2_mpeg_video_mpeg4_profile {
+        V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE                            = 0,
+        V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE                   = 1,
+        V4L2_MPEG_VIDEO_MPEG4_PROFILE_CORE                              = 2,
+        V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE_SCALABLE                   = 3,
+        V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY        = 4,
+};
+#define V4L2_CID_MPEG_VIDEO_MPEG4_QPEL          (V4L2_CID_MPEG_BASE+407)
+
+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
+#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
+        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
+        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
+        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
+        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
+        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
+        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
+        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
+enum v4l2_mpeg_cx2341x_video_median_filter_type {
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
+        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
+
+/*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
+#define V4L2_CID_MPEG_MFC51_BASE                                (V4L2_CTRL_CLASS_MPEG | 0x1100)
+
+#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY            (V4L2_CID_MPEG_MFC51_BASE+0)
+#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE     (V4L2_CID_MPEG_MFC51_BASE+1)
+#define V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE                       (V4L2_CID_MPEG_MFC51_BASE+2)
+enum v4l2_mpeg_mfc51_video_frame_skip_mode {
+        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED          = 0,
+        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT       = 1,
+        V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT         = 2,
+};
+#define V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE                      (V4L2_CID_MPEG_MFC51_BASE+3)
+enum v4l2_mpeg_mfc51_video_force_frame_type {
+        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED         = 0,
+        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME          = 1,
+        V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_NOT_CODED        = 2,
+};
+#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING                               (V4L2_CID_MPEG_MFC51_BASE+4)
+#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV                           (V4L2_CID_MPEG_MFC51_BASE+5)
+#define V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT                   (V4L2_CID_MPEG_MFC51_BASE+6)
+#define V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF                     (V4L2_CID_MPEG_MFC51_BASE+7)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY             (V4L2_CID_MPEG_MFC51_BASE+50)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK                 (V4L2_CID_MPEG_MFC51_BASE+51)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH               (V4L2_CID_MPEG_MFC51_BASE+52)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC               (V4L2_CID_MPEG_MFC51_BASE+53)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P                (V4L2_CID_MPEG_MFC51_BASE+54)
+
+
+/*  Camera class control IDs */
+
+#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
+
+#define V4L2_CID_EXPOSURE_AUTO                  (V4L2_CID_CAMERA_CLASS_BASE+1)
+enum  v4l2_exposure_auto_type {
+        V4L2_EXPOSURE_AUTO = 0,
+        V4L2_EXPOSURE_MANUAL = 1,
+        V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
+        V4L2_EXPOSURE_APERTURE_PRIORITY = 3
+};
+#define V4L2_CID_EXPOSURE_ABSOLUTE              (V4L2_CID_CAMERA_CLASS_BASE+2)
+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY         (V4L2_CID_CAMERA_CLASS_BASE+3)
+
+#define V4L2_CID_PAN_RELATIVE                   (V4L2_CID_CAMERA_CLASS_BASE+4)
+#define V4L2_CID_TILT_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+5)
+#define V4L2_CID_PAN_RESET                      (V4L2_CID_CAMERA_CLASS_BASE+6)
+#define V4L2_CID_TILT_RESET                     (V4L2_CID_CAMERA_CLASS_BASE+7)
+
+#define V4L2_CID_PAN_ABSOLUTE                   (V4L2_CID_CAMERA_CLASS_BASE+8)
+#define V4L2_CID_TILT_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+9)
+
+#define V4L2_CID_FOCUS_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+10)
+#define V4L2_CID_FOCUS_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+11)
+#define V4L2_CID_FOCUS_AUTO                     (V4L2_CID_CAMERA_CLASS_BASE+12)
+
+#define V4L2_CID_ZOOM_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS                (V4L2_CID_CAMERA_CLASS_BASE+15)
+
+#define V4L2_CID_PRIVACY                        (V4L2_CID_CAMERA_CLASS_BASE+16)
+
+#define V4L2_CID_IRIS_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+17)
+#define V4L2_CID_IRIS_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+18)
+
+#define V4L2_CID_AUTO_EXPOSURE_BIAS             (V4L2_CID_CAMERA_CLASS_BASE+19)
+
+#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE    (V4L2_CID_CAMERA_CLASS_BASE+20)
+enum v4l2_auto_n_preset_white_balance {
+        V4L2_WHITE_BALANCE_MANUAL               = 0,
+        V4L2_WHITE_BALANCE_AUTO                 = 1,
+        V4L2_WHITE_BALANCE_INCANDESCENT         = 2,
+        V4L2_WHITE_BALANCE_FLUORESCENT          = 3,
+        V4L2_WHITE_BALANCE_FLUORESCENT_H        = 4,
+        V4L2_WHITE_BALANCE_HORIZON              = 5,
+        V4L2_WHITE_BALANCE_DAYLIGHT             = 6,
+        V4L2_WHITE_BALANCE_FLASH                = 7,
+        V4L2_WHITE_BALANCE_CLOUDY               = 8,
+        V4L2_WHITE_BALANCE_SHADE                = 9,
+};
+
+#define V4L2_CID_WIDE_DYNAMIC_RANGE             (V4L2_CID_CAMERA_CLASS_BASE+21)
+#define V4L2_CID_IMAGE_STABILIZATION            (V4L2_CID_CAMERA_CLASS_BASE+22)
+
+#define V4L2_CID_ISO_SENSITIVITY                (V4L2_CID_CAMERA_CLASS_BASE+23)
+#define V4L2_CID_ISO_SENSITIVITY_AUTO           (V4L2_CID_CAMERA_CLASS_BASE+24)
+enum v4l2_iso_sensitivity_auto_type {
+        V4L2_ISO_SENSITIVITY_MANUAL             = 0,
+        V4L2_ISO_SENSITIVITY_AUTO               = 1,
+};
+
+#define V4L2_CID_EXPOSURE_METERING              (V4L2_CID_CAMERA_CLASS_BASE+25)
+enum v4l2_exposure_metering {
+        V4L2_EXPOSURE_METERING_AVERAGE          = 0,
+        V4L2_EXPOSURE_METERING_CENTER_WEIGHTED  = 1,
+        V4L2_EXPOSURE_METERING_SPOT             = 2,
+};
+
+#define V4L2_CID_SCENE_MODE                     (V4L2_CID_CAMERA_CLASS_BASE+26)
+enum v4l2_scene_mode {
+        V4L2_SCENE_MODE_NONE                    = 0,
+        V4L2_SCENE_MODE_BACKLIGHT               = 1,
+        V4L2_SCENE_MODE_BEACH_SNOW              = 2,
+        V4L2_SCENE_MODE_CANDLE_LIGHT            = 3,
+        V4L2_SCENE_MODE_DAWN_DUSK               = 4,
+        V4L2_SCENE_MODE_FALL_COLORS             = 5,
+        V4L2_SCENE_MODE_FIREWORKS               = 6,
+        V4L2_SCENE_MODE_LANDSCAPE               = 7,
+        V4L2_SCENE_MODE_NIGHT                   = 8,
+        V4L2_SCENE_MODE_PARTY_INDOOR            = 9,
+        V4L2_SCENE_MODE_PORTRAIT                = 10,
+        V4L2_SCENE_MODE_SPORTS                  = 11,
+        V4L2_SCENE_MODE_SUNSET                  = 12,
+        V4L2_SCENE_MODE_TEXT                    = 13,
+};
+
+#define V4L2_CID_3A_LOCK                        (V4L2_CID_CAMERA_CLASS_BASE+27)
+#define V4L2_LOCK_EXPOSURE                      (1 << 0)
+#define V4L2_LOCK_WHITE_BALANCE                 (1 << 1)
+#define V4L2_LOCK_FOCUS                         (1 << 2)
+
+#define V4L2_CID_AUTO_FOCUS_START               (V4L2_CID_CAMERA_CLASS_BASE+28)
+#define V4L2_CID_AUTO_FOCUS_STOP                (V4L2_CID_CAMERA_CLASS_BASE+29)
+#define V4L2_CID_AUTO_FOCUS_STATUS              (V4L2_CID_CAMERA_CLASS_BASE+30)
+#define V4L2_AUTO_FOCUS_STATUS_IDLE             (0 << 0)
+#define V4L2_AUTO_FOCUS_STATUS_BUSY             (1 << 0)
+#define V4L2_AUTO_FOCUS_STATUS_REACHED          (1 << 1)
+#define V4L2_AUTO_FOCUS_STATUS_FAILED           (1 << 2)
+
+#define V4L2_CID_AUTO_FOCUS_RANGE               (V4L2_CID_CAMERA_CLASS_BASE+31)
+enum v4l2_auto_focus_range {
+        V4L2_AUTO_FOCUS_RANGE_AUTO              = 0,
+        V4L2_AUTO_FOCUS_RANGE_NORMAL            = 1,
+        V4L2_AUTO_FOCUS_RANGE_MACRO             = 2,
+        V4L2_AUTO_FOCUS_RANGE_INFINITY          = 3,
+};
+
+
+/* FM Modulator class control IDs */
+
+#define V4L2_CID_FM_TX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_TX | 0x900)
+#define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
+
+#define V4L2_CID_RDS_TX_DEVIATION               (V4L2_CID_FM_TX_CLASS_BASE + 1)
+#define V4L2_CID_RDS_TX_PI                      (V4L2_CID_FM_TX_CLASS_BASE + 2)
+#define V4L2_CID_RDS_TX_PTY                     (V4L2_CID_FM_TX_CLASS_BASE + 3)
+#define V4L2_CID_RDS_TX_PS_NAME                 (V4L2_CID_FM_TX_CLASS_BASE + 5)
+#define V4L2_CID_RDS_TX_RADIO_TEXT              (V4L2_CID_FM_TX_CLASS_BASE + 6)
+
+#define V4L2_CID_AUDIO_LIMITER_ENABLED          (V4L2_CID_FM_TX_CLASS_BASE + 64)
+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME     (V4L2_CID_FM_TX_CLASS_BASE + 65)
+#define V4L2_CID_AUDIO_LIMITER_DEVIATION        (V4L2_CID_FM_TX_CLASS_BASE + 66)
+
+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED      (V4L2_CID_FM_TX_CLASS_BASE + 80)
+#define V4L2_CID_AUDIO_COMPRESSION_GAIN         (V4L2_CID_FM_TX_CLASS_BASE + 81)
+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD    (V4L2_CID_FM_TX_CLASS_BASE + 82)
+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME  (V4L2_CID_FM_TX_CLASS_BASE + 83)
+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 84)
+
+#define V4L2_CID_PILOT_TONE_ENABLED             (V4L2_CID_FM_TX_CLASS_BASE + 96)
+#define V4L2_CID_PILOT_TONE_DEVIATION           (V4L2_CID_FM_TX_CLASS_BASE + 97)
+#define V4L2_CID_PILOT_TONE_FREQUENCY           (V4L2_CID_FM_TX_CLASS_BASE + 98)
+
+#define V4L2_CID_TUNE_PREEMPHASIS               (V4L2_CID_FM_TX_CLASS_BASE + 112)
+enum v4l2_preemphasis {
+        V4L2_PREEMPHASIS_DISABLED       = 0,
+        V4L2_PREEMPHASIS_50_uS          = 1,
+        V4L2_PREEMPHASIS_75_uS          = 2,
+};
+#define V4L2_CID_TUNE_POWER_LEVEL               (V4L2_CID_FM_TX_CLASS_BASE + 113)
+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR         (V4L2_CID_FM_TX_CLASS_BASE + 114)
+
+
+/* Flash and privacy (indicator) light controls */
+
+#define V4L2_CID_FLASH_CLASS_BASE               (V4L2_CTRL_CLASS_FLASH | 0x900)
+#define V4L2_CID_FLASH_CLASS                    (V4L2_CTRL_CLASS_FLASH | 1)
+
+#define V4L2_CID_FLASH_LED_MODE                 (V4L2_CID_FLASH_CLASS_BASE + 1)
+enum v4l2_flash_led_mode {
+        V4L2_FLASH_LED_MODE_NONE,
+        V4L2_FLASH_LED_MODE_FLASH,
+        V4L2_FLASH_LED_MODE_TORCH,
+};
+
+#define V4L2_CID_FLASH_STROBE_SOURCE            (V4L2_CID_FLASH_CLASS_BASE + 2)
+enum v4l2_flash_strobe_source {
+        V4L2_FLASH_STROBE_SOURCE_SOFTWARE,
+        V4L2_FLASH_STROBE_SOURCE_EXTERNAL,
+};
+
+#define V4L2_CID_FLASH_STROBE                   (V4L2_CID_FLASH_CLASS_BASE + 3)
+#define V4L2_CID_FLASH_STROBE_STOP              (V4L2_CID_FLASH_CLASS_BASE + 4)
+#define V4L2_CID_FLASH_STROBE_STATUS            (V4L2_CID_FLASH_CLASS_BASE + 5)
+
+#define V4L2_CID_FLASH_TIMEOUT                  (V4L2_CID_FLASH_CLASS_BASE + 6)
+#define V4L2_CID_FLASH_INTENSITY                (V4L2_CID_FLASH_CLASS_BASE + 7)
+#define V4L2_CID_FLASH_TORCH_INTENSITY          (V4L2_CID_FLASH_CLASS_BASE + 8)
+#define V4L2_CID_FLASH_INDICATOR_INTENSITY      (V4L2_CID_FLASH_CLASS_BASE + 9)
+
+#define V4L2_CID_FLASH_FAULT                    (V4L2_CID_FLASH_CLASS_BASE + 10)
+#define V4L2_FLASH_FAULT_OVER_VOLTAGE           (1 << 0)
+#define V4L2_FLASH_FAULT_TIMEOUT                (1 << 1)
+#define V4L2_FLASH_FAULT_OVER_TEMPERATURE       (1 << 2)
+#define V4L2_FLASH_FAULT_SHORT_CIRCUIT          (1 << 3)
+#define V4L2_FLASH_FAULT_OVER_CURRENT           (1 << 4)
+#define V4L2_FLASH_FAULT_INDICATOR              (1 << 5)
+
+#define V4L2_CID_FLASH_CHARGE                   (V4L2_CID_FLASH_CLASS_BASE + 11)
+#define V4L2_CID_FLASH_READY                    (V4L2_CID_FLASH_CLASS_BASE + 12)
+
+
+/* JPEG-class control IDs */
+
+#define V4L2_CID_JPEG_CLASS_BASE                (V4L2_CTRL_CLASS_JPEG | 0x900)
+#define V4L2_CID_JPEG_CLASS                     (V4L2_CTRL_CLASS_JPEG | 1)
+
+#define V4L2_CID_JPEG_CHROMA_SUBSAMPLING        (V4L2_CID_JPEG_CLASS_BASE + 1)
+enum v4l2_jpeg_chroma_subsampling {
+        V4L2_JPEG_CHROMA_SUBSAMPLING_444        = 0,
+        V4L2_JPEG_CHROMA_SUBSAMPLING_422        = 1,
+        V4L2_JPEG_CHROMA_SUBSAMPLING_420        = 2,
+        V4L2_JPEG_CHROMA_SUBSAMPLING_411        = 3,
+        V4L2_JPEG_CHROMA_SUBSAMPLING_410        = 4,
+        V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY       = 5,
+};
+#define V4L2_CID_JPEG_RESTART_INTERVAL          (V4L2_CID_JPEG_CLASS_BASE + 2)
+#define V4L2_CID_JPEG_COMPRESSION_QUALITY       (V4L2_CID_JPEG_CLASS_BASE + 3)
+
+#define V4L2_CID_JPEG_ACTIVE_MARKER             (V4L2_CID_JPEG_CLASS_BASE + 4)
+#define V4L2_JPEG_ACTIVE_MARKER_APP0            (1 << 0)
+#define V4L2_JPEG_ACTIVE_MARKER_APP1            (1 << 1)
+#define V4L2_JPEG_ACTIVE_MARKER_COM             (1 << 16)
+#define V4L2_JPEG_ACTIVE_MARKER_DQT             (1 << 17)
+#define V4L2_JPEG_ACTIVE_MARKER_DHT             (1 << 18)
+
+/* Image source controls */
+#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE        (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
+#define V4L2_CID_IMAGE_SOURCE_CLASS             (V4L2_CTRL_CLASS_IMAGE_SOURCE | 1)
+
+#define V4L2_CID_VBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
+#define V4L2_CID_HBLANK                         (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
+#define V4L2_CID_ANALOGUE_GAIN                  (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
+
+
+/* Image processing controls */
+
+#define V4L2_CID_IMAGE_PROC_CLASS_BASE          (V4L2_CTRL_CLASS_IMAGE_PROC | 0x900)
+#define V4L2_CID_IMAGE_PROC_CLASS               (V4L2_CTRL_CLASS_IMAGE_PROC | 1)
+
+#define V4L2_CID_LINK_FREQ                      (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
+#define V4L2_CID_PIXEL_RATE                     (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
+#define V4L2_CID_TEST_PATTERN                   (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3)
+
+#endif
diff --git a/include/linux/v4l2-dv-timings.h b/include/uapi/linux/v4l2-dv-timings.h
index 9ef8172e5ed0..9ef8172e5ed0 100644
--- a/include/linux/v4l2-dv-timings.h
+++ b/include/uapi/linux/v4l2-dv-timings.h
diff --git a/include/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index 5ea7f753a348..7d64e0e1a18b 100644
--- a/include/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -92,6 +92,11 @@ enum v4l2_mbus_pixelcode {
 
         /* JPEG compressed formats - next is 0x4002 */
         V4L2_MBUS_FMT_JPEG_1X8 = 0x4001,
+
+        /* Vendor specific formats - next is 0x5002 */
+
+        /* S5C73M3 sensor specific interleaved UYVY and JPEG */
+        V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001,
 };
 
 /**
diff --git a/include/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h
index 8c57ee9872bb..a33c4daadce3 100644
--- a/include/linux/v4l2-subdev.h
+++ b/include/uapi/linux/v4l2-subdev.h
@@ -148,6 +148,14 @@ struct v4l2_subdev_selection {
         __u32 reserved[8];
 };
 
+struct v4l2_subdev_edid {
+        __u32 pad;
+        __u32 start_block;
+        __u32 blocks;
+        __u32 reserved[5];
+        __u8 __user *edid;
+};
+
 #define VIDIOC_SUBDEV_G_FMT     _IOWR('V',  4, struct v4l2_subdev_format)
 #define VIDIOC_SUBDEV_S_FMT     _IOWR('V',  5, struct v4l2_subdev_format)
 #define VIDIOC_SUBDEV_G_FRAME_INTERVAL \
@@ -166,5 +174,7 @@ struct v4l2_subdev_selection {
         _IOWR('V', 61, struct v4l2_subdev_selection)
 #define VIDIOC_SUBDEV_S_SELECTION \
         _IOWR('V', 62, struct v4l2_subdev_selection)
+#define VIDIOC_SUBDEV_G_EDID    _IOWR('V', 40, struct v4l2_subdev_edid)
+#define VIDIOC_SUBDEV_S_EDID    _IOWR('V', 41, struct v4l2_subdev_edid)
 
 #endif
diff --git a/include/linux/veth.h b/include/uapi/linux/veth.h
index 3354c1eb424e..3354c1eb424e 100644
--- a/include/linux/veth.h
+++ b/include/uapi/linux/veth.h
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
new file mode 100644
index 000000000000..4758d1bfcf41
--- /dev/null
+++ b/include/uapi/linux/vfio.h
@@ -0,0 +1,368 @@
+/*
+ * VFIO API definition
+ *
+ * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ *     Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPIVFIO_H
+#define _UAPIVFIO_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define VFIO_API_VERSION        0
+
+
+/* Kernel & User level defines for VFIO IOCTLs. */
+
+/* Extensions */
+
+#define VFIO_TYPE1_IOMMU                1
+
+/*
+ * The IOCTL interface is designed for extensibility by embedding the
+ * structure length (argsz) and flags into structures passed between
+ * kernel and userspace.  We therefore use the _IO() macro for these
+ * defines to avoid implicitly embedding a size into the ioctl request.
+ * As structure fields are added, argsz will increase to match and flag
+ * bits will be defined to indicate additional fields with valid data.
+ * It's *always* the caller's responsibility to indicate the size of
+ * the structure passed by setting argsz appropriately.
+ */
+
+#define VFIO_TYPE       (';')
+#define VFIO_BASE       100
+
+/* -------- IOCTLs for VFIO file descriptor (/dev/vfio/vfio) -------- */
+
+/**
+ * VFIO_GET_API_VERSION - _IO(VFIO_TYPE, VFIO_BASE + 0)
+ *
+ * Report the version of the VFIO API.  This allows us to bump the entire
+ * API version should we later need to add or change features in incompatible
+ * ways.
+ * Return: VFIO_API_VERSION
+ * Availability: Always
+ */
+#define VFIO_GET_API_VERSION            _IO(VFIO_TYPE, VFIO_BASE + 0)
+
+/**
+ * VFIO_CHECK_EXTENSION - _IOW(VFIO_TYPE, VFIO_BASE + 1, __u32)
+ *
+ * Check whether an extension is supported.
+ * Return: 0 if not supported, 1 (or some other positive integer) if supported.
+ * Availability: Always
+ */
+#define VFIO_CHECK_EXTENSION            _IO(VFIO_TYPE, VFIO_BASE + 1)
+
+/**
+ * VFIO_SET_IOMMU - _IOW(VFIO_TYPE, VFIO_BASE + 2, __s32)
+ *
+ * Set the iommu to the given type.  The type must be supported by an
+ * iommu driver as verified by calling CHECK_EXTENSION using the same
+ * type.  A group must be set to this file descriptor before this
+ * ioctl is available.  The IOMMU interfaces enabled by this call are
+ * specific to the value set.
+ * Return: 0 on success, -errno on failure
+ * Availability: When VFIO group attached
+ */
+#define VFIO_SET_IOMMU                  _IO(VFIO_TYPE, VFIO_BASE + 2)
+
+/* -------- IOCTLs for GROUP file descriptors (/dev/vfio/$GROUP) -------- */
+
+/**
+ * VFIO_GROUP_GET_STATUS - _IOR(VFIO_TYPE, VFIO_BASE + 3,
+ *                                              struct vfio_group_status)
+ *
+ * Retrieve information about the group.  Fills in provided
+ * struct vfio_group_info.  Caller sets argsz.
+ * Return: 0 on succes, -errno on failure.
+ * Availability: Always
+ */
+struct vfio_group_status {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_GROUP_FLAGS_VIABLE         (1 << 0)
+#define VFIO_GROUP_FLAGS_CONTAINER_SET  (1 << 1)
+};
+#define VFIO_GROUP_GET_STATUS           _IO(VFIO_TYPE, VFIO_BASE + 3)
+
+/**
+ * VFIO_GROUP_SET_CONTAINER - _IOW(VFIO_TYPE, VFIO_BASE + 4, __s32)
+ *
+ * Set the container for the VFIO group to the open VFIO file
+ * descriptor provided.  Groups may only belong to a single
+ * container.  Containers may, at their discretion, support multiple
+ * groups.  Only when a container is set are all of the interfaces
+ * of the VFIO file descriptor and the VFIO group file descriptor
+ * available to the user.
+ * Return: 0 on success, -errno on failure.
+ * Availability: Always
+ */
+#define VFIO_GROUP_SET_CONTAINER        _IO(VFIO_TYPE, VFIO_BASE + 4)
+
+/**
+ * VFIO_GROUP_UNSET_CONTAINER - _IO(VFIO_TYPE, VFIO_BASE + 5)
+ *
+ * Remove the group from the attached container.  This is the
+ * opposite of the SET_CONTAINER call and returns the group to
+ * an initial state.  All device file descriptors must be released
+ * prior to calling this interface.  When removing the last group
+ * from a container, the IOMMU will be disabled and all state lost,
+ * effectively also returning the VFIO file descriptor to an initial
+ * state.
+ * Return: 0 on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_UNSET_CONTAINER      _IO(VFIO_TYPE, VFIO_BASE + 5)
+
+/**
+ * VFIO_GROUP_GET_DEVICE_FD - _IOW(VFIO_TYPE, VFIO_BASE + 6, char)
+ *
+ * Return a new file descriptor for the device object described by
+ * the provided string.  The string should match a device listed in
+ * the devices subdirectory of the IOMMU group sysfs entry.  The
+ * group containing the device must already be added to this context.
+ * Return: new file descriptor on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_GET_DEVICE_FD        _IO(VFIO_TYPE, VFIO_BASE + 6)
+
+/* --------------- IOCTLs for DEVICE file descriptors --------------- */
+
+/**
+ * VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
+ *                                              struct vfio_device_info)
+ *
+ * Retrieve information about the device.  Fills in provided
+ * struct vfio_device_info.  Caller sets argsz.
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_info {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_DEVICE_FLAGS_RESET (1 << 0)        /* Device supports reset */
+#define VFIO_DEVICE_FLAGS_PCI   (1 << 1)        /* vfio-pci device */
+        __u32   num_regions;    /* Max region index + 1 */
+        __u32   num_irqs;       /* Max IRQ index + 1 */
+};
+#define VFIO_DEVICE_GET_INFO            _IO(VFIO_TYPE, VFIO_BASE + 7)
+
+/**
+ * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
+ *                                     struct vfio_region_info)
+ *
+ * Retrieve information about a device region.  Caller provides
+ * struct vfio_region_info with index value set.  Caller sets argsz.
+ * Implementation of region mapping is bus driver specific.  This is
+ * intended to describe MMIO, I/O port, as well as bus specific
+ * regions (ex. PCI config space).  Zero sized regions may be used
+ * to describe unimplemented regions (ex. unimplemented PCI BARs).
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_region_info {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_REGION_INFO_FLAG_READ      (1 << 0) /* Region supports read */
+#define VFIO_REGION_INFO_FLAG_WRITE     (1 << 1) /* Region supports write */
+#define VFIO_REGION_INFO_FLAG_MMAP      (1 << 2) /* Region supports mmap */
+        __u32   index;          /* Region index */
+        __u32   resv;           /* Reserved for alignment */
+        __u64   size;           /* Region size (bytes) */
+        __u64   offset;         /* Region offset from start of device fd */
+};
+#define VFIO_DEVICE_GET_REGION_INFO     _IO(VFIO_TYPE, VFIO_BASE + 8)
+
+/**
+ * VFIO_DEVICE_GET_IRQ_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 9,
+ *                                  struct vfio_irq_info)
+ *
+ * Retrieve information about a device IRQ.  Caller provides
+ * struct vfio_irq_info with index value set.  Caller sets argsz.
+ * Implementation of IRQ mapping is bus driver specific.  Indexes
+ * using multiple IRQs are primarily intended to support MSI-like
+ * interrupt blocks.  Zero count irq blocks may be used to describe
+ * unimplemented interrupt types.
+ *
+ * The EVENTFD flag indicates the interrupt index supports eventfd based
+ * signaling.
+ *
+ * The MASKABLE flags indicates the index supports MASK and UNMASK
+ * actions described below.
+ *
+ * AUTOMASKED indicates that after signaling, the interrupt line is
+ * automatically masked by VFIO and the user needs to unmask the line
+ * to receive new interrupts.  This is primarily intended to distinguish
+ * level triggered interrupts.
+ *
+ * The NORESIZE flag indicates that the interrupt lines within the index
+ * are setup as a set and new subindexes cannot be enabled without first
+ * disabling the entire index.  This is used for interrupts like PCI MSI
+ * and MSI-X where the driver may only use a subset of the available
+ * indexes, but VFIO needs to enable a specific number of vectors
+ * upfront.  In the case of MSI-X, where the user can enable MSI-X and
+ * then add and unmask vectors, it's up to userspace to make the decision
+ * whether to allocate the maximum supported number of vectors or tear
+ * down setup and incrementally increase the vectors as each is enabled.
+ */
+struct vfio_irq_info {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_IRQ_INFO_EVENTFD           (1 << 0)
+#define VFIO_IRQ_INFO_MASKABLE          (1 << 1)
+#define VFIO_IRQ_INFO_AUTOMASKED        (1 << 2)
+#define VFIO_IRQ_INFO_NORESIZE          (1 << 3)
+        __u32   index;          /* IRQ index */
+        __u32   count;          /* Number of IRQs within this index */
+};
+#define VFIO_DEVICE_GET_IRQ_INFO        _IO(VFIO_TYPE, VFIO_BASE + 9)
+
+/**
+ * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set)
+ *
+ * Set signaling, masking, and unmasking of interrupts.  Caller provides
+ * struct vfio_irq_set with all fields set.  'start' and 'count' indicate
+ * the range of subindexes being specified.
+ *
+ * The DATA flags specify the type of data provided.  If DATA_NONE, the
+ * operation performs the specified action immediately on the specified
+ * interrupt(s).  For example, to unmask AUTOMASKED interrupt [0,0]:
+ * flags = (DATA_NONE|ACTION_UNMASK), index = 0, start = 0, count = 1.
+ *
+ * DATA_BOOL allows sparse support for the same on arrays of interrupts.
+ * For example, to mask interrupts [0,1] and [0,3] (but not [0,2]):
+ * flags = (DATA_BOOL|ACTION_MASK), index = 0, start = 1, count = 3,
+ * data = {1,0,1}
+ *
+ * DATA_EVENTFD binds the specified ACTION to the provided __s32 eventfd.
+ * A value of -1 can be used to either de-assign interrupts if already
+ * assigned or skip un-assigned interrupts.  For example, to set an eventfd
+ * to be trigger for interrupts [0,0] and [0,2]:
+ * flags = (DATA_EVENTFD|ACTION_TRIGGER), index = 0, start = 0, count = 3,
+ * data = {fd1, -1, fd2}
+ * If index [0,1] is previously set, two count = 1 ioctls calls would be
+ * required to set [0,0] and [0,2] without changing [0,1].
+ *
+ * Once a signaling mechanism is set, DATA_BOOL or DATA_NONE can be used
+ * with ACTION_TRIGGER to perform kernel level interrupt loopback testing
+ * from userspace (ie. simulate hardware triggering).
+ *
+ * Setting of an event triggering mechanism to userspace for ACTION_TRIGGER
+ * enables the interrupt index for the device.  Individual subindex interrupts
+ * can be disabled using the -1 value for DATA_EVENTFD or the index can be
+ * disabled as a whole with: flags = (DATA_NONE|ACTION_TRIGGER), count = 0.
+ *
+ * Note that ACTION_[UN]MASK specify user->kernel signaling (irqfds) while
+ * ACTION_TRIGGER specifies kernel->user signaling.
+ */
+struct vfio_irq_set {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_IRQ_SET_DATA_NONE          (1 << 0) /* Data not present */
+#define VFIO_IRQ_SET_DATA_BOOL          (1 << 1) /* Data is bool (u8) */
+#define VFIO_IRQ_SET_DATA_EVENTFD       (1 << 2) /* Data is eventfd (s32) */
+#define VFIO_IRQ_SET_ACTION_MASK        (1 << 3) /* Mask interrupt */
+#define VFIO_IRQ_SET_ACTION_UNMASK      (1 << 4) /* Unmask interrupt */
+#define VFIO_IRQ_SET_ACTION_TRIGGER     (1 << 5) /* Trigger interrupt */
+        __u32   index;
+        __u32   start;
+        __u32   count;
+        __u8    data[];
+};
+#define VFIO_DEVICE_SET_IRQS            _IO(VFIO_TYPE, VFIO_BASE + 10)
+
+#define VFIO_IRQ_SET_DATA_TYPE_MASK     (VFIO_IRQ_SET_DATA_NONE | \
+                                         VFIO_IRQ_SET_DATA_BOOL | \
+                                         VFIO_IRQ_SET_DATA_EVENTFD)
+#define VFIO_IRQ_SET_ACTION_TYPE_MASK   (VFIO_IRQ_SET_ACTION_MASK | \
+                                         VFIO_IRQ_SET_ACTION_UNMASK | \
+                                         VFIO_IRQ_SET_ACTION_TRIGGER)
+/**
+ * VFIO_DEVICE_RESET - _IO(VFIO_TYPE, VFIO_BASE + 11)
+ *
+ * Reset a device.
+ */
+#define VFIO_DEVICE_RESET               _IO(VFIO_TYPE, VFIO_BASE + 11)
+
+/*
+ * The VFIO-PCI bus driver makes use of the following fixed region and
+ * IRQ index mapping.  Unimplemented regions return a size of zero.
+ * Unimplemented IRQ types return a count of zero.
+ */
+
+enum {
+        VFIO_PCI_BAR0_REGION_INDEX,
+        VFIO_PCI_BAR1_REGION_INDEX,
+        VFIO_PCI_BAR2_REGION_INDEX,
+        VFIO_PCI_BAR3_REGION_INDEX,
+        VFIO_PCI_BAR4_REGION_INDEX,
+        VFIO_PCI_BAR5_REGION_INDEX,
+        VFIO_PCI_ROM_REGION_INDEX,
+        VFIO_PCI_CONFIG_REGION_INDEX,
+        VFIO_PCI_NUM_REGIONS
+};
+
+enum {
+        VFIO_PCI_INTX_IRQ_INDEX,
+        VFIO_PCI_MSI_IRQ_INDEX,
+        VFIO_PCI_MSIX_IRQ_INDEX,
+        VFIO_PCI_NUM_IRQS
+};
+
+/* -------- API for Type1 VFIO IOMMU -------- */
+
+/**
+ * VFIO_IOMMU_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 12, struct vfio_iommu_info)
+ *
+ * Retrieve information about the IOMMU object. Fills in provided
+ * struct vfio_iommu_info. Caller sets argsz.
+ *
+ * XXX Should we do these by CHECK_EXTENSION too?
+ */
+struct vfio_iommu_type1_info {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_IOMMU_INFO_PGSIZES (1 << 0)        /* supported page sizes info */
+        __u64   iova_pgsizes;           /* Bitmap of supported page sizes */
+};
+
+#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/**
+ * VFIO_IOMMU_MAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 13, struct vfio_dma_map)
+ *
+ * Map process virtual addresses to IO virtual addresses using the
+ * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required.
+ */
+struct vfio_iommu_type1_dma_map {
+        __u32   argsz;
+        __u32   flags;
+#define VFIO_DMA_MAP_FLAG_READ (1 << 0)         /* readable from device */
+#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1)        /* writable from device */
+        __u64   vaddr;                          /* Process virtual address */
+        __u64   iova;                           /* IO virtual address */
+        __u64   size;                           /* Size of mapping (bytes) */
+};
+
+#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
+
+/**
+ * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)
+ *
+ * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
+ * Caller sets argsz.
+ */
+struct vfio_iommu_type1_dma_unmap {
+        __u32   argsz;
+        __u32   flags;
+        __u64   iova;                           /* IO virtual address */
+        __u64   size;                           /* Size of mapping (bytes) */
+};
+
+#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
+
+#endif /* _UAPIVFIO_H */
diff --git a/include/linux/vhost.h b/include/uapi/linux/vhost.h
index e847f1e30756..e847f1e30756 100644
--- a/include/linux/vhost.h
+++ b/include/uapi/linux/vhost.h
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
new file mode 100644
index 000000000000..57bfa59cda74
--- /dev/null
+++ b/include/uapi/linux/videodev2.h
@@ -0,0 +1,1998 @@
+/*
+ *  Video for Linux Two header file
+ *
+ *  Copyright (C) 1999-2012 the contributors
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *  3. The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ *      See http://linuxtv.org for more info
+ *
+ *      Author: Bill Dirks <bill@thedirks.org>
+ *              Justin Schoeman
+ *              Hans Verkuil <hverkuil@xs4all.nl>
+ *              et al.
+ */
+#ifndef _UAPI__LINUX_VIDEODEV2_H
+#define _UAPI__LINUX_VIDEODEV2_H
+
+#ifndef __KERNEL__
+#include <sys/time.h>
+#endif
+#include <linux/compiler.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/v4l2-common.h>
+#include <linux/v4l2-controls.h>
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+#define VIDEO_MAX_FRAME               32
+#define VIDEO_MAX_PLANES               8
+
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
+#define VID_TYPE_CAPTURE        1       /* Can capture */
+#define VID_TYPE_TUNER          2       /* Can tune */
+#define VID_TYPE_TELETEXT       4       /* Does teletext */
+#define VID_TYPE_OVERLAY        8       /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY      16      /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING       32      /* Can clip */
+#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES         128     /* Scalable */
+#define VID_TYPE_MONOCHROME     256     /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER   1024    /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
+#endif
+
+/*
+ *      M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a, b, c, d)\
+        ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
+
+/*
+ *      E N U M S
+ */
+enum v4l2_field {
+        V4L2_FIELD_ANY           = 0, /* driver can choose from none,
+                                         top, bottom, interlaced
+                                         depending on whatever it thinks
+                                         is approximate ... */
+        V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
+        V4L2_FIELD_TOP           = 2, /* top field only */
+        V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
+        V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
+        V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
+                                         buffer, top-bottom order */
+        V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
+        V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
+                                         separate buffers */
+        V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
+                                         first and the top field is
+                                         transmitted first */
+        V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
+                                         first and the bottom field is
+                                         transmitted first */
+};
+#define V4L2_FIELD_HAS_TOP(field)       \
+        ((field) == V4L2_FIELD_TOP      ||\
+         (field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB   ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTTOM(field)    \
+        ((field) == V4L2_FIELD_BOTTOM   ||\
+         (field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB   ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTH(field)      \
+        ((field) == V4L2_FIELD_INTERLACED ||\
+         (field) == V4L2_FIELD_INTERLACED_TB ||\
+         (field) == V4L2_FIELD_INTERLACED_BT ||\
+         (field) == V4L2_FIELD_SEQ_TB ||\
+         (field) == V4L2_FIELD_SEQ_BT)
+
+enum v4l2_buf_type {
+        V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
+        V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
+        V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
+        V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
+        V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
+        V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
+        V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
+#if 1
+        /* Experimental */
+        V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
+#endif
+        V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
+        V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
+        /* Deprecated, do not use */
+        V4L2_BUF_TYPE_PRIVATE              = 0x80,
+};
+
+#define V4L2_TYPE_IS_MULTIPLANAR(type)                  \
+        ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE   \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
+
+#define V4L2_TYPE_IS_OUTPUT(type)                               \
+        ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT                   \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE         \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY               \
+         || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY        \
+         || (type) == V4L2_BUF_TYPE_VBI_OUTPUT                  \
+         || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
+
+enum v4l2_tuner_type {
+        V4L2_TUNER_RADIO             = 1,
+        V4L2_TUNER_ANALOG_TV         = 2,
+        V4L2_TUNER_DIGITAL_TV        = 3,
+};
+
+enum v4l2_memory {
+        V4L2_MEMORY_MMAP             = 1,
+        V4L2_MEMORY_USERPTR          = 2,
+        V4L2_MEMORY_OVERLAY          = 3,
+};
+
+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
+enum v4l2_colorspace {
+        /* ITU-R 601 -- broadcast NTSC/PAL */
+        V4L2_COLORSPACE_SMPTE170M     = 1,
+
+        /* 1125-Line (US) HDTV */
+        V4L2_COLORSPACE_SMPTE240M     = 2,
+
+        /* HD and modern captures. */
+        V4L2_COLORSPACE_REC709        = 3,
+
+        /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
+        V4L2_COLORSPACE_BT878         = 4,
+
+        /* These should be useful.  Assume 601 extents. */
+        V4L2_COLORSPACE_470_SYSTEM_M  = 5,
+        V4L2_COLORSPACE_470_SYSTEM_BG = 6,
+
+        /* I know there will be cameras that send this.  So, this is
+         * unspecified chromaticities and full 0-255 on each of the
+         * Y'CbCr components
+         */
+        V4L2_COLORSPACE_JPEG          = 7,
+
+        /* For RGB colourspaces, this is probably a good start. */
+        V4L2_COLORSPACE_SRGB          = 8,
+};
+
+enum v4l2_priority {
+        V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
+        V4L2_PRIORITY_BACKGROUND  = 1,
+        V4L2_PRIORITY_INTERACTIVE = 2,
+        V4L2_PRIORITY_RECORD      = 3,
+        V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
+};
+
+struct v4l2_rect {
+        __s32   left;
+        __s32   top;
+        __s32   width;
+        __s32   height;
+};
+
+struct v4l2_fract {
+        __u32   numerator;
+        __u32   denominator;
+};
+
+/**
+  * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP
+  *
+  * @driver:       name of the driver module (e.g. "bttv")
+  * @card:         name of the card (e.g. "Hauppauge WinTV")
+  * @bus_info:     name of the bus (e.g. "PCI:" + pci_name(pci_dev) )
+  * @version:      KERNEL_VERSION
+  * @capabilities: capabilities of the physical device as a whole
+  * @device_caps:  capabilities accessed via this particular device (node)
+  * @reserved:     reserved fields for future extensions
+  */
+struct v4l2_capability {
+        __u8    driver[16];
+        __u8    card[32];
+        __u8    bus_info[32];
+        __u32   version;
+        __u32   capabilities;
+        __u32   device_caps;
+        __u32   reserved[3];
+};
+
+/* Values for 'capabilities' field */
+#define V4L2_CAP_VIDEO_CAPTURE          0x00000001  /* Is a video capture device */
+#define V4L2_CAP_VIDEO_OUTPUT           0x00000002  /* Is a video output device */
+#define V4L2_CAP_VIDEO_OVERLAY          0x00000004  /* Can do video overlay */
+#define V4L2_CAP_VBI_CAPTURE            0x00000010  /* Is a raw VBI capture device */
+#define V4L2_CAP_VBI_OUTPUT             0x00000020  /* Is a raw VBI output device */
+#define V4L2_CAP_SLICED_VBI_CAPTURE     0x00000040  /* Is a sliced VBI capture device */
+#define V4L2_CAP_SLICED_VBI_OUTPUT      0x00000080  /* Is a sliced VBI output device */
+#define V4L2_CAP_RDS_CAPTURE            0x00000100  /* RDS data capture */
+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY   0x00000200  /* Can do video output overlay */
+#define V4L2_CAP_HW_FREQ_SEEK           0x00000400  /* Can do hardware frequency seek  */
+#define V4L2_CAP_RDS_OUTPUT             0x00000800  /* Is an RDS encoder */
+
+/* Is a video capture device that supports multiplanar formats */
+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE   0x00001000
+/* Is a video output device that supports multiplanar formats */
+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE    0x00002000
+/* Is a video mem-to-mem device that supports multiplanar formats */
+#define V4L2_CAP_VIDEO_M2M_MPLANE       0x00004000
+/* Is a video mem-to-mem device */
+#define V4L2_CAP_VIDEO_M2M              0x00008000
+
+#define V4L2_CAP_TUNER                  0x00010000  /* has a tuner */
+#define V4L2_CAP_AUDIO                  0x00020000  /* has audio support */
+#define V4L2_CAP_RADIO                  0x00040000  /* is a radio device */
+#define V4L2_CAP_MODULATOR              0x00080000  /* has a modulator */
+
+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
+
+#define V4L2_CAP_DEVICE_CAPS            0x80000000  /* sets device capabilities field */
+
+/*
+ *      V I D E O   I M A G E   F O R M A T
+ */
+struct v4l2_pix_format {
+        __u32                   width;
+        __u32                   height;
+        __u32                   pixelformat;
+        __u32                   field;          /* enum v4l2_field */
+        __u32                   bytesperline;   /* for padding, zero if unused */
+        __u32                   sizeimage;
+        __u32                   colorspace;     /* enum v4l2_colorspace */
+        __u32                   priv;           /* private data, depends on pixelformat */
+};
+
+/*      Pixel format         FOURCC                          depth  Description  */
+
+/* RGB formats */
+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6     */
+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+
+/* Grey formats */
+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
+#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
+#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
+#define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
+
+/* Grey bit-packed formats */
+#define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
+
+/* Palette formats */
+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
+
+/* Luminance+Chrominance formats */
+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
+#define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
+
+/* two planes -- one Y, one Cr + Cb interleaved  */
+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
+#define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
+#define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
+
+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV21M   v4l2_fourcc('N', 'M', '2', '1') /* 21  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
+#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 16x16 macroblocks */
+
+/* three non contiguous planes - Y, Cb, Cr */
+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
+#define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12  YVU420 planar */
+
+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
+        /* 10bit raw bayer DPCM compressed to 8 bits */
+#define V4L2_PIX_FMT_SBGGR10DPCM8 v4l2_fourcc('b', 'B', 'A', '8')
+#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
+#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
+        /*
+         * 10bit raw bayer, expanded to 16 bits
+         * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
+         */
+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
+
+/* compressed formats */
+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */
+#define V4L2_PIX_FMT_H264     v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */
+#define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
+#define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */
+#define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
+#define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
+#define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
+#define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES     */
+#define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
+#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
+#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
+#define V4L2_PIX_FMT_VP8      v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
+
+/*  Vendor-specific formats   */
+#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_JL2005BCD v4l2_fourcc('J', 'L', '2', '0') /* compressed RGGB bayer */
+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
+#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
+#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
+#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
+#define V4L2_PIX_FMT_JPGL       v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
+#define V4L2_PIX_FMT_SE401      v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */
+#define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */
+
+/*
+ *      F O R M A T   E N U M E R A T I O N
+ */
+struct v4l2_fmtdesc {
+        __u32               index;             /* Format number      */
+        __u32               type;              /* enum v4l2_buf_type */
+        __u32               flags;
+        __u8                description[32];   /* Description string */
+        __u32               pixelformat;       /* Format fourcc      */
+        __u32               reserved[4];
+};
+
+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+#define V4L2_FMT_FLAG_EMULATED   0x0002
+
+#if 1
+        /* Experimental Frame Size and frame rate enumeration */
+/*
+ *      F R A M E   S I Z E   E N U M E R A T I O N
+ */
+enum v4l2_frmsizetypes {
+        V4L2_FRMSIZE_TYPE_DISCRETE      = 1,
+        V4L2_FRMSIZE_TYPE_CONTINUOUS    = 2,
+        V4L2_FRMSIZE_TYPE_STEPWISE      = 3,
+};
+
+struct v4l2_frmsize_discrete {
+        __u32                   width;          /* Frame width [pixel] */
+        __u32                   height;         /* Frame height [pixel] */
+};
+
+struct v4l2_frmsize_stepwise {
+        __u32                   min_width;      /* Minimum frame width [pixel] */
+        __u32                   max_width;      /* Maximum frame width [pixel] */
+        __u32                   step_width;     /* Frame width step size [pixel] */
+        __u32                   min_height;     /* Minimum frame height [pixel] */
+        __u32                   max_height;     /* Maximum frame height [pixel] */
+        __u32                   step_height;    /* Frame height step size [pixel] */
+};
+
+struct v4l2_frmsizeenum {
+        __u32                   index;          /* Frame size number */
+        __u32                   pixel_format;   /* Pixel format */
+        __u32                   type;           /* Frame size type the device supports. */
+
+        union {                                 /* Frame size */
+                struct v4l2_frmsize_discrete    discrete;
+                struct v4l2_frmsize_stepwise    stepwise;
+        };
+
+        __u32   reserved[2];                    /* Reserved space for future use */
+};
+
+/*
+ *      F R A M E   R A T E   E N U M E R A T I O N
+ */
+enum v4l2_frmivaltypes {
+        V4L2_FRMIVAL_TYPE_DISCRETE      = 1,
+        V4L2_FRMIVAL_TYPE_CONTINUOUS    = 2,
+        V4L2_FRMIVAL_TYPE_STEPWISE      = 3,
+};
+
+struct v4l2_frmival_stepwise {
+        struct v4l2_fract       min;            /* Minimum frame interval [s] */
+        struct v4l2_fract       max;            /* Maximum frame interval [s] */
+        struct v4l2_fract       step;           /* Frame interval step size [s] */
+};
+
+struct v4l2_frmivalenum {
+        __u32                   index;          /* Frame format index */
+        __u32                   pixel_format;   /* Pixel format */
+        __u32                   width;          /* Frame width */
+        __u32                   height;         /* Frame height */
+        __u32                   type;           /* Frame interval type the device supports. */
+
+        union {                                 /* Frame interval */
+                struct v4l2_fract               discrete;
+                struct v4l2_frmival_stepwise    stepwise;
+        };
+
+        __u32   reserved[2];                    /* Reserved space for future use */
+};
+#endif
+
+/*
+ *      T I M E C O D E
+ */
+struct v4l2_timecode {
+        __u32   type;
+        __u32   flags;
+        __u8    frames;
+        __u8    seconds;
+        __u8    minutes;
+        __u8    hours;
+        __u8    userbits[4];
+};
+
+/*  Type  */
+#define V4L2_TC_TYPE_24FPS              1
+#define V4L2_TC_TYPE_25FPS              2
+#define V4L2_TC_TYPE_30FPS              3
+#define V4L2_TC_TYPE_50FPS              4
+#define V4L2_TC_TYPE_60FPS              5
+
+/*  Flags  */
+#define V4L2_TC_FLAG_DROPFRAME          0x0001 /* "drop-frame" mode */
+#define V4L2_TC_FLAG_COLORFRAME         0x0002
+#define V4L2_TC_USERBITS_field          0x000C
+#define V4L2_TC_USERBITS_USERDEFINED    0x0000
+#define V4L2_TC_USERBITS_8BITCHARS      0x0008
+/* The above is based on SMPTE timecodes */
+
+struct v4l2_jpegcompression {
+        int quality;
+
+        int  APPn;              /* Number of APP segment to be written,
+                                 * must be 0..15 */
+        int  APP_len;           /* Length of data in JPEG APPn segment */
+        char APP_data[60];      /* Data in the JPEG APPn segment. */
+
+        int  COM_len;           /* Length of data in JPEG COM segment */
+        char COM_data[60];      /* Data in JPEG COM segment */
+
+        __u32 jpeg_markers;     /* Which markers should go into the JPEG
+                                 * output. Unless you exactly know what
+                                 * you do, leave them untouched.
+                                 * Inluding less markers will make the
+                                 * resulting code smaller, but there will
+                                 * be fewer applications which can read it.
+                                 * The presence of the APP and COM marker
+                                 * is influenced by APP_len and COM_len
+                                 * ONLY, not by this property! */
+
+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
+                                        * allways use APP0 */
+};
+
+/*
+ *      M E M O R Y - M A P P I N G   B U F F E R S
+ */
+struct v4l2_requestbuffers {
+        __u32                   count;
+        __u32                   type;           /* enum v4l2_buf_type */
+        __u32                   memory;         /* enum v4l2_memory */
+        __u32                   reserved[2];
+};
+
+/**
+ * struct v4l2_plane - plane info for multi-planar buffers
+ * @bytesused:          number of bytes occupied by data in the plane (payload)
+ * @length:             size of this plane (NOT the payload) in bytes
+ * @mem_offset:         when memory in the associated struct v4l2_buffer is
+ *                      V4L2_MEMORY_MMAP, equals the offset from the start of
+ *                      the device memory for this plane (or is a "cookie" that
+ *                      should be passed to mmap() called on the video node)
+ * @userptr:            when memory is V4L2_MEMORY_USERPTR, a userspace pointer
+ *                      pointing to this plane
+ * @data_offset:        offset in the plane to the start of data; usually 0,
+ *                      unless there is a header in front of the data
+ *
+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
+ * with two planes can have one plane for Y, and another for interleaved CbCr
+ * components. Each plane can reside in a separate memory buffer, or even in
+ * a completely separate memory node (e.g. in embedded devices).
+ */
+struct v4l2_plane {
+        __u32                   bytesused;
+        __u32                   length;
+        union {
+                __u32           mem_offset;
+                unsigned long   userptr;
+        } m;
+        __u32                   data_offset;
+        __u32                   reserved[11];
+};
+
+/**
+ * struct v4l2_buffer - video buffer info
+ * @index:      id number of the buffer
+ * @type:       enum v4l2_buf_type; buffer type (type == *_MPLANE for
+ *              multiplanar buffers);
+ * @bytesused:  number of bytes occupied by data in the buffer (payload);
+ *              unused (set to 0) for multiplanar buffers
+ * @flags:      buffer informational flags
+ * @field:      enum v4l2_field; field order of the image in the buffer
+ * @timestamp:  frame timestamp
+ * @timecode:   frame timecode
+ * @sequence:   sequence count of this frame
+ * @memory:     enum v4l2_memory; the method, in which the actual video data is
+ *              passed
+ * @offset:     for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
+ *              offset from the start of the device memory for this plane,
+ *              (or a "cookie" that should be passed to mmap() as offset)
+ * @userptr:    for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
+ *              a userspace pointer pointing to this buffer
+ * @planes:     for multiplanar buffers; userspace pointer to the array of plane
+ *              info structs for this buffer
+ * @length:     size in bytes of the buffer (NOT its payload) for single-plane
+ *              buffers (when type != *_MPLANE); number of elements in the
+ *              planes array for multi-plane buffers
+ * @input:      input number from which the video data has has been captured
+ *
+ * Contains data exchanged by application and driver using one of the Streaming
+ * I/O methods.
+ */
+struct v4l2_buffer {
+        __u32                   index;
+        __u32                   type;
+        __u32                   bytesused;
+        __u32                   flags;
+        __u32                   field;
+        struct timeval          timestamp;
+        struct v4l2_timecode    timecode;
+        __u32                   sequence;
+
+        /* memory location */
+        __u32                   memory;
+        union {
+                __u32           offset;
+                unsigned long   userptr;
+                struct v4l2_plane *planes;
+        } m;
+        __u32                   length;
+        __u32                   reserved2;
+        __u32                   reserved;
+};
+
+/*  Flags for 'flags' field */
+#define V4L2_BUF_FLAG_MAPPED    0x0001  /* Buffer is mapped (flag) */
+#define V4L2_BUF_FLAG_QUEUED    0x0002  /* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_DONE      0x0004  /* Buffer is ready */
+#define V4L2_BUF_FLAG_KEYFRAME  0x0008  /* Image is a keyframe (I-frame) */
+#define V4L2_BUF_FLAG_PFRAME    0x0010  /* Image is a P-frame */
+#define V4L2_BUF_FLAG_BFRAME    0x0020  /* Image is a B-frame */
+/* Buffer is ready, but the data contained within is corrupted. */
+#define V4L2_BUF_FLAG_ERROR     0x0040
+#define V4L2_BUF_FLAG_TIMECODE  0x0100  /* timecode field is valid */
+#define V4L2_BUF_FLAG_PREPARED  0x0400  /* Buffer is prepared for queuing */
+/* Cache handling flags */
+#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE       0x0800
+#define V4L2_BUF_FLAG_NO_CACHE_CLEAN            0x1000
+
+/*
+ *      O V E R L A Y   P R E V I E W
+ */
+struct v4l2_framebuffer {
+        __u32                   capability;
+        __u32                   flags;
+/* FIXME: in theory we should pass something like PCI device + memory
+ * region + offset instead of some physical address */
+        void                    *base;
+        struct v4l2_pix_format  fmt;
+};
+/*  Flags for the 'capability' field. Read only */
+#define V4L2_FBUF_CAP_EXTERNOVERLAY     0x0001
+#define V4L2_FBUF_CAP_CHROMAKEY         0x0002
+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
+#define V4L2_FBUF_CAP_BITMAP_CLIPPING   0x0008
+#define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
+#define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
+#define V4L2_FBUF_CAP_SRC_CHROMAKEY     0x0080
+/*  Flags for the 'flags' field. */
+#define V4L2_FBUF_FLAG_PRIMARY          0x0001
+#define V4L2_FBUF_FLAG_OVERLAY          0x0002
+#define V4L2_FBUF_FLAG_CHROMAKEY        0x0004
+#define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY    0x0040
+
+struct v4l2_clip {
+        struct v4l2_rect        c;
+        struct v4l2_clip        __user *next;
+};
+
+struct v4l2_window {
+        struct v4l2_rect        w;
+        __u32                   field;   /* enum v4l2_field */
+        __u32                   chromakey;
+        struct v4l2_clip        __user *clips;
+        __u32                   clipcount;
+        void                    __user *bitmap;
+        __u8                    global_alpha;
+};
+
+/*
+ *      C A P T U R E   P A R A M E T E R S
+ */
+struct v4l2_captureparm {
+        __u32              capability;    /*  Supported modes */
+        __u32              capturemode;   /*  Current mode */
+        struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
+        __u32              extendedmode;  /*  Driver-specific extensions */
+        __u32              readbuffers;   /*  # of buffers for read */
+        __u32              reserved[4];
+};
+
+/*  Flags for 'capability' and 'capturemode' fields */
+#define V4L2_MODE_HIGHQUALITY   0x0001  /*  High quality imaging mode */
+#define V4L2_CAP_TIMEPERFRAME   0x1000  /*  timeperframe field is supported */
+
+struct v4l2_outputparm {
+        __u32              capability;   /*  Supported modes */
+        __u32              outputmode;   /*  Current mode */
+        struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
+        __u32              extendedmode; /*  Driver-specific extensions */
+        __u32              writebuffers; /*  # of buffers for write */
+        __u32              reserved[4];
+};
+
+/*
+ *      I N P U T   I M A G E   C R O P P I N G
+ */
+struct v4l2_cropcap {
+        __u32                   type;   /* enum v4l2_buf_type */
+        struct v4l2_rect        bounds;
+        struct v4l2_rect        defrect;
+        struct v4l2_fract       pixelaspect;
+};
+
+struct v4l2_crop {
+        __u32                   type;   /* enum v4l2_buf_type */
+        struct v4l2_rect        c;
+};
+
+/**
+ * struct v4l2_selection - selection info
+ * @type:       buffer type (do not use *_MPLANE types)
+ * @target:     Selection target, used to choose one of possible rectangles;
+ *              defined in v4l2-common.h; V4L2_SEL_TGT_* .
+ * @flags:      constraints flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.
+ * @r:          coordinates of selection window
+ * @reserved:   for future use, rounds structure size to 64 bytes, set to zero
+ *
+ * Hardware may use multiple helper windows to process a video stream.
+ * The structure is used to exchange this selection areas between
+ * an application and a driver.
+ */
+struct v4l2_selection {
+        __u32                   type;
+        __u32                   target;
+        __u32                   flags;
+        struct v4l2_rect        r;
+        __u32                   reserved[9];
+};
+
+
+/*
+ *      A N A L O G   V I D E O   S T A N D A R D
+ */
+
+typedef __u64 v4l2_std_id;
+
+/* one bit for each */
+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
+
+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
+
+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)       /* BTSC */
+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)       /* EIA-J */
+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)       /* FM A2 */
+
+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
+
+/* ATSC/HDTV */
+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
+
+/* FIXME:
+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
+   this value to 32 bits.
+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
+   it should work fine. However, if needed to add more than two standards,
+   v4l2-common.c should be fixed.
+ */
+
+/*
+ * Some macros to merge video standards in order to make live easier for the
+ * drivers and V4L2 applications
+ */
+
+/*
+ * "Common" NTSC/M - It should be noticed that V4L2_STD_NTSC_443 is
+ * Missing here.
+ */
+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M        |\
+                                 V4L2_STD_NTSC_M_JP     |\
+                                 V4L2_STD_NTSC_M_KR)
+/* Secam macros */
+#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
+                                 V4L2_STD_SECAM_K       |\
+                                 V4L2_STD_SECAM_K1)
+/* All Secam Standards */
+#define V4L2_STD_SECAM          (V4L2_STD_SECAM_B       |\
+                                 V4L2_STD_SECAM_G       |\
+                                 V4L2_STD_SECAM_H       |\
+                                 V4L2_STD_SECAM_DK      |\
+                                 V4L2_STD_SECAM_L       |\
+                                 V4L2_STD_SECAM_LC)
+/* PAL macros */
+#define V4L2_STD_PAL_BG         (V4L2_STD_PAL_B         |\
+                                 V4L2_STD_PAL_B1        |\
+                                 V4L2_STD_PAL_G)
+#define V4L2_STD_PAL_DK         (V4L2_STD_PAL_D         |\
+                                 V4L2_STD_PAL_D1        |\
+                                 V4L2_STD_PAL_K)
+/*
+ * "Common" PAL - This macro is there to be compatible with the old
+ * V4L1 concept of "PAL": /BGDKHI.
+ * Several PAL standards are mising here: /M, /N and /Nc
+ */
+#define V4L2_STD_PAL            (V4L2_STD_PAL_BG        |\
+                                 V4L2_STD_PAL_DK        |\
+                                 V4L2_STD_PAL_H         |\
+                                 V4L2_STD_PAL_I)
+/* Chroma "agnostic" standards */
+#define V4L2_STD_B              (V4L2_STD_PAL_B         |\
+                                 V4L2_STD_PAL_B1        |\
+                                 V4L2_STD_SECAM_B)
+#define V4L2_STD_G              (V4L2_STD_PAL_G         |\
+                                 V4L2_STD_SECAM_G)
+#define V4L2_STD_H              (V4L2_STD_PAL_H         |\
+                                 V4L2_STD_SECAM_H)
+#define V4L2_STD_L              (V4L2_STD_SECAM_L       |\
+                                 V4L2_STD_SECAM_LC)
+#define V4L2_STD_GH             (V4L2_STD_G             |\
+                                 V4L2_STD_H)
+#define V4L2_STD_DK             (V4L2_STD_PAL_DK        |\
+                                 V4L2_STD_SECAM_DK)
+#define V4L2_STD_BG             (V4L2_STD_B             |\
+                                 V4L2_STD_G)
+#define V4L2_STD_MN             (V4L2_STD_PAL_M         |\
+                                 V4L2_STD_PAL_N         |\
+                                 V4L2_STD_PAL_Nc        |\
+                                 V4L2_STD_NTSC)
+
+/* Standards where MTS/BTSC stereo could be found */
+#define V4L2_STD_MTS            (V4L2_STD_NTSC_M        |\
+                                 V4L2_STD_PAL_M         |\
+                                 V4L2_STD_PAL_N         |\
+                                 V4L2_STD_PAL_Nc)
+
+/* Standards for Countries with 60Hz Line frequency */
+#define V4L2_STD_525_60         (V4L2_STD_PAL_M         |\
+                                 V4L2_STD_PAL_60        |\
+                                 V4L2_STD_NTSC          |\
+                                 V4L2_STD_NTSC_443)
+/* Standards for Countries with 50Hz Line frequency */
+#define V4L2_STD_625_50         (V4L2_STD_PAL           |\
+                                 V4L2_STD_PAL_N         |\
+                                 V4L2_STD_PAL_Nc        |\
+                                 V4L2_STD_SECAM)
+
+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
+                                 V4L2_STD_ATSC_16_VSB)
+/* Macros with none and all analog standards */
+#define V4L2_STD_UNKNOWN        0
+#define V4L2_STD_ALL            (V4L2_STD_525_60        |\
+                                 V4L2_STD_625_50)
+
+struct v4l2_standard {
+        __u32                index;
+        v4l2_std_id          id;
+        __u8                 name[24];
+        struct v4l2_fract    frameperiod; /* Frames, not fields */
+        __u32                framelines;
+        __u32                reserved[4];
+};
+
+/* The DV Preset API is deprecated in favor of the DV Timings API.
+   New drivers shouldn't use this anymore! */
+
+/*
+ *      V I D E O       T I M I N G S   D V     P R E S E T
+ */
+struct v4l2_dv_preset {
+        __u32   preset;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T S   E N U M E R A T I O N
+ */
+struct v4l2_dv_enum_preset {
+        __u32   index;
+        __u32   preset;
+        __u8    name[32]; /* Name of the preset timing */
+        __u32   width;
+        __u32   height;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T     V A L U E S
+ */
+#define         V4L2_DV_INVALID         0
+#define         V4L2_DV_480P59_94       1 /* BT.1362 */
+#define         V4L2_DV_576P50          2 /* BT.1362 */
+#define         V4L2_DV_720P24          3 /* SMPTE 296M */
+#define         V4L2_DV_720P25          4 /* SMPTE 296M */
+#define         V4L2_DV_720P30          5 /* SMPTE 296M */
+#define         V4L2_DV_720P50          6 /* SMPTE 296M */
+#define         V4L2_DV_720P59_94       7 /* SMPTE 274M */
+#define         V4L2_DV_720P60          8 /* SMPTE 274M/296M */
+#define         V4L2_DV_1080I29_97      9 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I30         10 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I25         11 /* BT.1120 */
+#define         V4L2_DV_1080I50         12 /* SMPTE 296M */
+#define         V4L2_DV_1080I60         13 /* SMPTE 296M */
+#define         V4L2_DV_1080P24         14 /* SMPTE 296M */
+#define         V4L2_DV_1080P25         15 /* SMPTE 296M */
+#define         V4L2_DV_1080P30         16 /* SMPTE 296M */
+#define         V4L2_DV_1080P50         17 /* BT.1120 */
+#define         V4L2_DV_1080P60         18 /* BT.1120 */
+
+/*
+ *      D V     B T     T I M I N G S
+ */
+
+/** struct v4l2_bt_timings - BT.656/BT.1120 timing data
+ * @width:      total width of the active video in pixels
+ * @height:     total height of the active video in lines
+ * @interlaced: Interlaced or progressive
+ * @polarities: Positive or negative polarities
+ * @pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @hfrontporch:Horizontal front porch in pixels
+ * @hsync:      Horizontal Sync length in pixels
+ * @hbackporch: Horizontal back porch in pixels
+ * @vfrontporch:Vertical front porch in lines
+ * @vsync:      Vertical Sync length in lines
+ * @vbackporch: Vertical back porch in lines
+ * @il_vfrontporch:Vertical front porch for the even field
+ *              (aka field 2) of interlaced field formats
+ * @il_vsync:   Vertical Sync length for the even field
+ *              (aka field 2) of interlaced field formats
+ * @il_vbackporch:Vertical back porch for the even field
+ *              (aka field 2) of interlaced field formats
+ * @standards:  Standards the timing belongs to
+ * @flags:      Flags
+ * @reserved:   Reserved fields, must be zeroed.
+ *
+ * A note regarding vertical interlaced timings: height refers to the total
+ * height of the active video frame (= two fields). The blanking timings refer
+ * to the blanking of each field. So the height of the total frame is
+ * calculated as follows:
+ *
+ * tot_height = height + vfrontporch + vsync + vbackporch +
+ *                       il_vfrontporch + il_vsync + il_vbackporch
+ *
+ * The active height of each field is height / 2.
+ */
+struct v4l2_bt_timings {
+        __u32   width;
+        __u32   height;
+        __u32   interlaced;
+        __u32   polarities;
+        __u64   pixelclock;
+        __u32   hfrontporch;
+        __u32   hsync;
+        __u32   hbackporch;
+        __u32   vfrontporch;
+        __u32   vsync;
+        __u32   vbackporch;
+        __u32   il_vfrontporch;
+        __u32   il_vsync;
+        __u32   il_vbackporch;
+        __u32   standards;
+        __u32   flags;
+        __u32   reserved[14];
+} __attribute__ ((packed));
+
+/* Interlaced or progressive format */
+#define V4L2_DV_PROGRESSIVE     0
+#define V4L2_DV_INTERLACED      1
+
+/* Polarities. If bit is not set, it is assumed to be negative polarity */
+#define V4L2_DV_VSYNC_POS_POL   0x00000001
+#define V4L2_DV_HSYNC_POS_POL   0x00000002
+
+/* Timings standards */
+#define V4L2_DV_BT_STD_CEA861   (1 << 0)  /* CEA-861 Digital TV Profile */
+#define V4L2_DV_BT_STD_DMT      (1 << 1)  /* VESA Discrete Monitor Timings */
+#define V4L2_DV_BT_STD_CVT      (1 << 2)  /* VESA Coordinated Video Timings */
+#define V4L2_DV_BT_STD_GTF      (1 << 3)  /* VESA Generalized Timings Formula */
+
+/* Flags */
+
+/* CVT/GTF specific: timing uses reduced blanking (CVT) or the 'Secondary
+   GTF' curve (GTF). In both cases the horizontal and/or vertical blanking
+   intervals are reduced, allowing a higher resolution over the same
+   bandwidth. This is a read-only flag. */
+#define V4L2_DV_FL_REDUCED_BLANKING             (1 << 0)
+/* CEA-861 specific: set for CEA-861 formats with a framerate of a multiple
+   of six. These formats can be optionally played at 1 / 1.001 speed.
+   This is a read-only flag. */
+#define V4L2_DV_FL_CAN_REDUCE_FPS               (1 << 1)
+/* CEA-861 specific: only valid for video transmitters, the flag is cleared
+   by receivers.
+   If the framerate of the format is a multiple of six, then the pixelclock
+   used to set up the transmitter is divided by 1.001 to make it compatible
+   with 60 Hz based standards such as NTSC and PAL-M that use a framerate of
+   29.97 Hz. Otherwise this flag is cleared. If the transmitter can't generate
+   such frequencies, then the flag will also be cleared. */
+#define V4L2_DV_FL_REDUCED_FPS                  (1 << 2)
+/* Specific to interlaced formats: if set, then field 1 is really one half-line
+   longer and field 2 is really one half-line shorter, so each field has
+   exactly the same number of half-lines. Whether half-lines can be detected
+   or used depends on the hardware. */
+#define V4L2_DV_FL_HALF_LINE                    (1 << 0)
+
+
+/** struct v4l2_dv_timings - DV timings
+ * @type:       the type of the timings
+ * @bt: BT656/1120 timings
+ */
+struct v4l2_dv_timings {
+        __u32 type;
+        union {
+                struct v4l2_bt_timings  bt;
+                __u32   reserved[32];
+        };
+} __attribute__ ((packed));
+
+/* Values for the type field */
+#define V4L2_DV_BT_656_1120     0       /* BT.656/1120 timing type */
+
+
+/** struct v4l2_enum_dv_timings - DV timings enumeration
+ * @index:      enumeration index
+ * @reserved:   must be zeroed
+ * @timings:    the timings for the given index
+ */
+struct v4l2_enum_dv_timings {
+        __u32 index;
+        __u32 reserved[3];
+        struct v4l2_dv_timings timings;
+};
+
+/** struct v4l2_bt_timings_cap - BT.656/BT.1120 timing capabilities
+ * @min_width:          width in pixels
+ * @max_width:          width in pixels
+ * @min_height:         height in lines
+ * @max_height:         height in lines
+ * @min_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @max_pixelclock:     Pixel clock in HZ. Ex. 74.25MHz->74250000
+ * @standards:          Supported standards
+ * @capabilities:       Supported capabilities
+ * @reserved:           Must be zeroed
+ */
+struct v4l2_bt_timings_cap {
+        __u32   min_width;
+        __u32   max_width;
+        __u32   min_height;
+        __u32   max_height;
+        __u64   min_pixelclock;
+        __u64   max_pixelclock;
+        __u32   standards;
+        __u32   capabilities;
+        __u32   reserved[16];
+} __attribute__ ((packed));
+
+/* Supports interlaced formats */
+#define V4L2_DV_BT_CAP_INTERLACED       (1 << 0)
+/* Supports progressive formats */
+#define V4L2_DV_BT_CAP_PROGRESSIVE      (1 << 1)
+/* Supports CVT/GTF reduced blanking */
+#define V4L2_DV_BT_CAP_REDUCED_BLANKING (1 << 2)
+/* Supports custom formats */
+#define V4L2_DV_BT_CAP_CUSTOM           (1 << 3)
+
+/** struct v4l2_dv_timings_cap - DV timings capabilities
+ * @type:       the type of the timings (same as in struct v4l2_dv_timings)
+ * @bt:         the BT656/1120 timings capabilities
+ */
+struct v4l2_dv_timings_cap {
+        __u32 type;
+        __u32 reserved[3];
+        union {
+                struct v4l2_bt_timings_cap bt;
+                __u32 raw_data[32];
+        };
+};
+
+
+/*
+ *      V I D E O   I N P U T S
+ */
+struct v4l2_input {
+        __u32        index;             /*  Which input */
+        __u8         name[32];          /*  Label */
+        __u32        type;              /*  Type of input */
+        __u32        audioset;          /*  Associated audios (bitfield) */
+        __u32        tuner;             /*  enum v4l2_tuner_type */
+        v4l2_std_id  std;
+        __u32        status;
+        __u32        capabilities;
+        __u32        reserved[3];
+};
+
+/*  Values for the 'type' field */
+#define V4L2_INPUT_TYPE_TUNER           1
+#define V4L2_INPUT_TYPE_CAMERA          2
+
+/* field 'status' - general */
+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
+#define V4L2_IN_ST_NO_COLOR    0x00000004
+
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
+
+/* field 'status' - analog */
+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
+
+/* field 'status' - digital */
+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
+
+/* field 'status' - VCR and set-top box */
+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
+
+/* capabilities flags */
+#define V4L2_IN_CAP_PRESETS             0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_IN_CAP_DV_TIMINGS          0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_IN_CAP_CUSTOM_TIMINGS      V4L2_IN_CAP_DV_TIMINGS /* For compatibility */
+#define V4L2_IN_CAP_STD                 0x00000004 /* Supports S_STD */
+
+/*
+ *      V I D E O   O U T P U T S
+ */
+struct v4l2_output {
+        __u32        index;             /*  Which output */
+        __u8         name[32];          /*  Label */
+        __u32        type;              /*  Type of output */
+        __u32        audioset;          /*  Associated audios (bitfield) */
+        __u32        modulator;         /*  Associated modulator */
+        v4l2_std_id  std;
+        __u32        capabilities;
+        __u32        reserved[3];
+};
+/*  Values for the 'type' field */
+#define V4L2_OUTPUT_TYPE_MODULATOR              1
+#define V4L2_OUTPUT_TYPE_ANALOG                 2
+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
+
+/* capabilities flags */
+#define V4L2_OUT_CAP_PRESETS            0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_OUT_CAP_DV_TIMINGS         0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_OUT_CAP_CUSTOM_TIMINGS     V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */
+#define V4L2_OUT_CAP_STD                0x00000004 /* Supports S_STD */
+
+/*
+ *      C O N T R O L S
+ */
+struct v4l2_control {
+        __u32                id;
+        __s32                value;
+};
+
+struct v4l2_ext_control {
+        __u32 id;
+        __u32 size;
+        __u32 reserved2[1];
+        union {
+                __s32 value;
+                __s64 value64;
+                char *string;
+        };
+} __attribute__ ((packed));
+
+struct v4l2_ext_controls {
+        __u32 ctrl_class;
+        __u32 count;
+        __u32 error_idx;
+        __u32 reserved[2];
+        struct v4l2_ext_control *controls;
+};
+
+#define V4L2_CTRL_ID_MASK         (0x0fffffff)
+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
+
+enum v4l2_ctrl_type {
+        V4L2_CTRL_TYPE_INTEGER       = 1,
+        V4L2_CTRL_TYPE_BOOLEAN       = 2,
+        V4L2_CTRL_TYPE_MENU          = 3,
+        V4L2_CTRL_TYPE_BUTTON        = 4,
+        V4L2_CTRL_TYPE_INTEGER64     = 5,
+        V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
+        V4L2_CTRL_TYPE_STRING        = 7,
+        V4L2_CTRL_TYPE_BITMASK       = 8,
+        V4L2_CTRL_TYPE_INTEGER_MENU = 9,
+};
+
+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
+struct v4l2_queryctrl {
+        __u32                id;
+        __u32                type;      /* enum v4l2_ctrl_type */
+        __u8                 name[32];  /* Whatever */
+        __s32                minimum;   /* Note signedness */
+        __s32                maximum;
+        __s32                step;
+        __s32                default_value;
+        __u32                flags;
+        __u32                reserved[2];
+};
+
+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
+struct v4l2_querymenu {
+        __u32           id;
+        __u32           index;
+        union {
+                __u8    name[32];       /* Whatever */
+                __s64   value;
+        };
+        __u32           reserved;
+} __attribute__ ((packed));
+
+/*  Control flags  */
+#define V4L2_CTRL_FLAG_DISABLED         0x0001
+#define V4L2_CTRL_FLAG_GRABBED          0x0002
+#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
+#define V4L2_CTRL_FLAG_UPDATE           0x0008
+#define V4L2_CTRL_FLAG_INACTIVE         0x0010
+#define V4L2_CTRL_FLAG_SLIDER           0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
+#define V4L2_CTRL_FLAG_VOLATILE         0x0080
+
+/*  Query flag, to be ORed with the control ID */
+#define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
+
+/*  User-class control IDs defined by V4L2 */
+#define V4L2_CID_MAX_CTRLS              1024
+/*  IDs reserved for driver specific controls */
+#define V4L2_CID_PRIVATE_BASE           0x08000000
+
+
+/*  DV-class control IDs defined by V4L2 */
+#define V4L2_CID_DV_CLASS_BASE                  (V4L2_CTRL_CLASS_DV | 0x900)
+#define V4L2_CID_DV_CLASS                       (V4L2_CTRL_CLASS_DV | 1)
+
+#define V4L2_CID_DV_TX_HOTPLUG                  (V4L2_CID_DV_CLASS_BASE + 1)
+#define V4L2_CID_DV_TX_RXSENSE                  (V4L2_CID_DV_CLASS_BASE + 2)
+#define V4L2_CID_DV_TX_EDID_PRESENT             (V4L2_CID_DV_CLASS_BASE + 3)
+#define V4L2_CID_DV_TX_MODE                     (V4L2_CID_DV_CLASS_BASE + 4)
+enum v4l2_dv_tx_mode {
+        V4L2_DV_TX_MODE_DVI_D   = 0,
+        V4L2_DV_TX_MODE_HDMI    = 1,
+};
+#define V4L2_CID_DV_TX_RGB_RANGE                (V4L2_CID_DV_CLASS_BASE + 5)
+enum v4l2_dv_rgb_range {
+        V4L2_DV_RGB_RANGE_AUTO    = 0,
+        V4L2_DV_RGB_RANGE_LIMITED = 1,
+        V4L2_DV_RGB_RANGE_FULL    = 2,
+};
+
+#define V4L2_CID_DV_RX_POWER_PRESENT            (V4L2_CID_DV_CLASS_BASE + 100)
+#define V4L2_CID_DV_RX_RGB_RANGE                (V4L2_CID_DV_CLASS_BASE + 101)
+
+/*
+ *      T U N I N G
+ */
+struct v4l2_tuner {
+        __u32                   index;
+        __u8                    name[32];
+        __u32                   type;   /* enum v4l2_tuner_type */
+        __u32                   capability;
+        __u32                   rangelow;
+        __u32                   rangehigh;
+        __u32                   rxsubchans;
+        __u32                   audmode;
+        __s32                   signal;
+        __s32                   afc;
+        __u32                   reserved[4];
+};
+
+struct v4l2_modulator {
+        __u32                   index;
+        __u8                    name[32];
+        __u32                   capability;
+        __u32                   rangelow;
+        __u32                   rangehigh;
+        __u32                   txsubchans;
+        __u32                   reserved[4];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_TUNER_CAP_LOW              0x0001
+#define V4L2_TUNER_CAP_NORM             0x0002
+#define V4L2_TUNER_CAP_HWSEEK_BOUNDED   0x0004
+#define V4L2_TUNER_CAP_HWSEEK_WRAP      0x0008
+#define V4L2_TUNER_CAP_STEREO           0x0010
+#define V4L2_TUNER_CAP_LANG2            0x0020
+#define V4L2_TUNER_CAP_SAP              0x0020
+#define V4L2_TUNER_CAP_LANG1            0x0040
+#define V4L2_TUNER_CAP_RDS              0x0080
+#define V4L2_TUNER_CAP_RDS_BLOCK_IO     0x0100
+#define V4L2_TUNER_CAP_RDS_CONTROLS     0x0200
+#define V4L2_TUNER_CAP_FREQ_BANDS       0x0400
+#define V4L2_TUNER_CAP_HWSEEK_PROG_LIM  0x0800
+
+/*  Flags for the 'rxsubchans' field */
+#define V4L2_TUNER_SUB_MONO             0x0001
+#define V4L2_TUNER_SUB_STEREO           0x0002
+#define V4L2_TUNER_SUB_LANG2            0x0004
+#define V4L2_TUNER_SUB_SAP              0x0004
+#define V4L2_TUNER_SUB_LANG1            0x0008
+#define V4L2_TUNER_SUB_RDS              0x0010
+
+/*  Values for the 'audmode' field */
+#define V4L2_TUNER_MODE_MONO            0x0000
+#define V4L2_TUNER_MODE_STEREO          0x0001
+#define V4L2_TUNER_MODE_LANG2           0x0002
+#define V4L2_TUNER_MODE_SAP             0x0002
+#define V4L2_TUNER_MODE_LANG1           0x0003
+#define V4L2_TUNER_MODE_LANG1_LANG2     0x0004
+
+struct v4l2_frequency {
+        __u32   tuner;
+        __u32   type;   /* enum v4l2_tuner_type */
+        __u32   frequency;
+        __u32   reserved[8];
+};
+
+#define V4L2_BAND_MODULATION_VSB        (1 << 1)
+#define V4L2_BAND_MODULATION_FM         (1 << 2)
+#define V4L2_BAND_MODULATION_AM         (1 << 3)
+
+struct v4l2_frequency_band {
+        __u32   tuner;
+        __u32   type;   /* enum v4l2_tuner_type */
+        __u32   index;
+        __u32   capability;
+        __u32   rangelow;
+        __u32   rangehigh;
+        __u32   modulation;
+        __u32   reserved[9];
+};
+
+struct v4l2_hw_freq_seek {
+        __u32   tuner;
+        __u32   type;   /* enum v4l2_tuner_type */
+        __u32   seek_upward;
+        __u32   wrap_around;
+        __u32   spacing;
+        __u32   rangelow;
+        __u32   rangehigh;
+        __u32   reserved[5];
+};
+
+/*
+ *      R D S
+ */
+
+struct v4l2_rds_data {
+        __u8    lsb;
+        __u8    msb;
+        __u8    block;
+} __attribute__ ((packed));
+
+#define V4L2_RDS_BLOCK_MSK       0x7
+#define V4L2_RDS_BLOCK_A         0
+#define V4L2_RDS_BLOCK_B         1
+#define V4L2_RDS_BLOCK_C         2
+#define V4L2_RDS_BLOCK_D         3
+#define V4L2_RDS_BLOCK_C_ALT     4
+#define V4L2_RDS_BLOCK_INVALID   7
+
+#define V4L2_RDS_BLOCK_CORRECTED 0x40
+#define V4L2_RDS_BLOCK_ERROR     0x80
+
+/*
+ *      A U D I O
+ */
+struct v4l2_audio {
+        __u32   index;
+        __u8    name[32];
+        __u32   capability;
+        __u32   mode;
+        __u32   reserved[2];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_AUDCAP_STEREO              0x00001
+#define V4L2_AUDCAP_AVL                 0x00002
+
+/*  Flags for the 'mode' field */
+#define V4L2_AUDMODE_AVL                0x00001
+
+struct v4l2_audioout {
+        __u32   index;
+        __u8    name[32];
+        __u32   capability;
+        __u32   mode;
+        __u32   reserved[2];
+};
+
+/*
+ *      M P E G   S E R V I C E S
+ *
+ *      NOTE: EXPERIMENTAL API
+ */
+#if 1
+#define V4L2_ENC_IDX_FRAME_I    (0)
+#define V4L2_ENC_IDX_FRAME_P    (1)
+#define V4L2_ENC_IDX_FRAME_B    (2)
+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
+
+struct v4l2_enc_idx_entry {
+        __u64 offset;
+        __u64 pts;
+        __u32 length;
+        __u32 flags;
+        __u32 reserved[2];
+};
+
+#define V4L2_ENC_IDX_ENTRIES (64)
+struct v4l2_enc_idx {
+        __u32 entries;
+        __u32 entries_cap;
+        __u32 reserved[4];
+        struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
+};
+
+
+#define V4L2_ENC_CMD_START      (0)
+#define V4L2_ENC_CMD_STOP       (1)
+#define V4L2_ENC_CMD_PAUSE      (2)
+#define V4L2_ENC_CMD_RESUME     (3)
+
+/* Flags for V4L2_ENC_CMD_STOP */
+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
+
+struct v4l2_encoder_cmd {
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u32 data[8];
+                } raw;
+        };
+};
+
+/* Decoder commands */
+#define V4L2_DEC_CMD_START       (0)
+#define V4L2_DEC_CMD_STOP        (1)
+#define V4L2_DEC_CMD_PAUSE       (2)
+#define V4L2_DEC_CMD_RESUME      (3)
+
+/* Flags for V4L2_DEC_CMD_START */
+#define V4L2_DEC_CMD_START_MUTE_AUDIO   (1 << 0)
+
+/* Flags for V4L2_DEC_CMD_PAUSE */
+#define V4L2_DEC_CMD_PAUSE_TO_BLACK     (1 << 0)
+
+/* Flags for V4L2_DEC_CMD_STOP */
+#define V4L2_DEC_CMD_STOP_TO_BLACK      (1 << 0)
+#define V4L2_DEC_CMD_STOP_IMMEDIATELY   (1 << 1)
+
+/* Play format requirements (returned by the driver): */
+
+/* The decoder has no special format requirements */
+#define V4L2_DEC_START_FMT_NONE         (0)
+/* The decoder requires full GOPs */
+#define V4L2_DEC_START_FMT_GOP          (1)
+
+/* The structure must be zeroed before use by the application
+   This ensures it can be extended safely in the future. */
+struct v4l2_decoder_cmd {
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u64 pts;
+                } stop;
+
+                struct {
+                        /* 0 or 1000 specifies normal speed,
+                           1 specifies forward single stepping,
+                           -1 specifies backward single stepping,
+                           >1: playback at speed/1000 of the normal speed,
+                           <-1: reverse playback at (-speed/1000) of the normal speed. */
+                        __s32 speed;
+                        __u32 format;
+                } start;
+
+                struct {
+                        __u32 data[16];
+                } raw;
+        };
+};
+#endif
+
+
+/*
+ *      D A T A   S E R V I C E S   ( V B I )
+ *
+ *      Data services API by Michael Schimek
+ */
+
+/* Raw VBI */
+struct v4l2_vbi_format {
+        __u32   sampling_rate;          /* in 1 Hz */
+        __u32   offset;
+        __u32   samples_per_line;
+        __u32   sample_format;          /* V4L2_PIX_FMT_* */
+        __s32   start[2];
+        __u32   count[2];
+        __u32   flags;                  /* V4L2_VBI_* */
+        __u32   reserved[2];            /* must be zero */
+};
+
+/*  VBI flags  */
+#define V4L2_VBI_UNSYNC         (1 << 0)
+#define V4L2_VBI_INTERLACED     (1 << 1)
+
+/* Sliced VBI
+ *
+ *    This implements is a proposal V4L2 API to allow SLICED VBI
+ * required for some hardware encoders. It should change without
+ * notice in the definitive implementation.
+ */
+
+struct v4l2_sliced_vbi_format {
+        __u16   service_set;
+        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+                                 (equals frame lines 313-336 for 625 line video
+                                  standards, 263-286 for 525 line standards) */
+        __u16   service_lines[2][24];
+        __u32   io_size;
+        __u32   reserved[2];            /* must be zero */
+};
+
+/* Teletext World System Teletext
+   (WST), defined on ITU-R BT.653-2 */
+#define V4L2_SLICED_TELETEXT_B          (0x0001)
+/* Video Program System, defined on ETS 300 231*/
+#define V4L2_SLICED_VPS                 (0x0400)
+/* Closed Caption, defined on EIA-608 */
+#define V4L2_SLICED_CAPTION_525         (0x1000)
+/* Wide Screen System, defined on ITU-R BT1119.1 */
+#define V4L2_SLICED_WSS_625             (0x4000)
+
+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
+
+struct v4l2_sliced_vbi_cap {
+        __u16   service_set;
+        /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+           service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+                                 (equals frame lines 313-336 for 625 line video
+                                  standards, 263-286 for 525 line standards) */
+        __u16   service_lines[2][24];
+        __u32   type;           /* enum v4l2_buf_type */
+        __u32   reserved[3];    /* must be 0 */
+};
+
+struct v4l2_sliced_vbi_data {
+        __u32   id;
+        __u32   field;          /* 0: first field, 1: second field */
+        __u32   line;           /* 1-23 */
+        __u32   reserved;       /* must be 0 */
+        __u8    data[48];
+};
+
+/*
+ * Sliced VBI data inserted into MPEG Streams
+ */
+
+/*
+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
+ *
+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
+ * data
+ *
+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
+ * definitions are not included here.  See the MPEG-2 specifications for details
+ * on these headers.
+ */
+
+/* Line type IDs */
+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
+
+struct v4l2_mpeg_vbi_itv0_line {
+        __u8 id;        /* One of V4L2_MPEG_VBI_IVTV_* above */
+        __u8 data[42];  /* Sliced VBI data for the line */
+} __attribute__ ((packed));
+
+struct v4l2_mpeg_vbi_itv0 {
+        __le32 linemask[2]; /* Bitmasks of VBI service lines present */
+        struct v4l2_mpeg_vbi_itv0_line line[35];
+} __attribute__ ((packed));
+
+struct v4l2_mpeg_vbi_ITV0 {
+        struct v4l2_mpeg_vbi_itv0_line line[36];
+} __attribute__ ((packed));
+
+#define V4L2_MPEG_VBI_IVTV_MAGIC0       "itv0"
+#define V4L2_MPEG_VBI_IVTV_MAGIC1       "ITV0"
+
+struct v4l2_mpeg_vbi_fmt_ivtv {
+        __u8 magic[4];
+        union {
+                struct v4l2_mpeg_vbi_itv0 itv0;
+                struct v4l2_mpeg_vbi_ITV0 ITV0;
+        };
+} __attribute__ ((packed));
+
+/*
+ *      A G G R E G A T E   S T R U C T U R E S
+ */
+
+/**
+ * struct v4l2_plane_pix_format - additional, per-plane format definition
+ * @sizeimage:          maximum size in bytes required for data, for which
+ *                      this plane will be used
+ * @bytesperline:       distance in bytes between the leftmost pixels in two
+ *                      adjacent lines
+ */
+struct v4l2_plane_pix_format {
+        __u32           sizeimage;
+        __u16           bytesperline;
+        __u16           reserved[7];
+} __attribute__ ((packed));
+
+/**
+ * struct v4l2_pix_format_mplane - multiplanar format definition
+ * @width:              image width in pixels
+ * @height:             image height in pixels
+ * @pixelformat:        little endian four character code (fourcc)
+ * @field:              enum v4l2_field; field order (for interlaced video)
+ * @colorspace:         enum v4l2_colorspace; supplemental to pixelformat
+ * @plane_fmt:          per-plane information
+ * @num_planes:         number of planes for this format
+ */
+struct v4l2_pix_format_mplane {
+        __u32                           width;
+        __u32                           height;
+        __u32                           pixelformat;
+        __u32                           field;
+        __u32                           colorspace;
+
+        struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
+        __u8                            num_planes;
+        __u8                            reserved[11];
+} __attribute__ ((packed));
+
+/**
+ * struct v4l2_format - stream data format
+ * @type:       enum v4l2_buf_type; type of the data stream
+ * @pix:        definition of an image format
+ * @pix_mp:     definition of a multiplanar image format
+ * @win:        definition of an overlaid image
+ * @vbi:        raw VBI capture or output parameters
+ * @sliced:     sliced VBI capture or output parameters
+ * @raw_data:   placeholder for future extensions and custom formats
+ */
+struct v4l2_format {
+        __u32    type;
+        union {
+                struct v4l2_pix_format          pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
+                struct v4l2_pix_format_mplane   pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
+                struct v4l2_window              win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
+                struct v4l2_vbi_format          vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
+                struct v4l2_sliced_vbi_format   sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
+                __u8    raw_data[200];                   /* user-defined */
+        } fmt;
+};
+
+/*      Stream type-dependent parameters
+ */
+struct v4l2_streamparm {
+        __u32    type;                  /* enum v4l2_buf_type */
+        union {
+                struct v4l2_captureparm capture;
+                struct v4l2_outputparm  output;
+                __u8    raw_data[200];  /* user-defined */
+        } parm;
+};
+
+/*
+ *      E V E N T S
+ */
+
+#define V4L2_EVENT_ALL                          0
+#define V4L2_EVENT_VSYNC                        1
+#define V4L2_EVENT_EOS                          2
+#define V4L2_EVENT_CTRL                         3
+#define V4L2_EVENT_FRAME_SYNC                   4
+#define V4L2_EVENT_PRIVATE_START                0x08000000
+
+/* Payload for V4L2_EVENT_VSYNC */
+struct v4l2_event_vsync {
+        /* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
+        __u8 field;
+} __attribute__ ((packed));
+
+/* Payload for V4L2_EVENT_CTRL */
+#define V4L2_EVENT_CTRL_CH_VALUE                (1 << 0)
+#define V4L2_EVENT_CTRL_CH_FLAGS                (1 << 1)
+
+struct v4l2_event_ctrl {
+        __u32 changes;
+        __u32 type;
+        union {
+                __s32 value;
+                __s64 value64;
+        };
+        __u32 flags;
+        __s32 minimum;
+        __s32 maximum;
+        __s32 step;
+        __s32 default_value;
+};
+
+struct v4l2_event_frame_sync {
+        __u32 frame_sequence;
+};
+
+struct v4l2_event {
+        __u32                           type;
+        union {
+                struct v4l2_event_vsync         vsync;
+                struct v4l2_event_ctrl          ctrl;
+                struct v4l2_event_frame_sync    frame_sync;
+                __u8                            data[64];
+        } u;
+        __u32                           pending;
+        __u32                           sequence;
+        struct timespec                 timestamp;
+        __u32                           id;
+        __u32                           reserved[8];
+};
+
+#define V4L2_EVENT_SUB_FL_SEND_INITIAL          (1 << 0)
+#define V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK        (1 << 1)
+
+struct v4l2_event_subscription {
+        __u32                           type;
+        __u32                           id;
+        __u32                           flags;
+        __u32                           reserved[5];
+};
+
+/*
+ *      A D V A N C E D   D E B U G G I N G
+ *
+ *      NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
+ *      FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
+ */
+
+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
+
+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
+
+struct v4l2_dbg_match {
+        __u32 type; /* Match type */
+        union {     /* Match this chip, meaning determined by type */
+                __u32 addr;
+                char name[32];
+        };
+} __attribute__ ((packed));
+
+struct v4l2_dbg_register {
+        struct v4l2_dbg_match match;
+        __u32 size;     /* register size in bytes */
+        __u64 reg;
+        __u64 val;
+} __attribute__ ((packed));
+
+/* VIDIOC_DBG_G_CHIP_IDENT */
+struct v4l2_dbg_chip_ident {
+        struct v4l2_dbg_match match;
+        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
+        __u32 revision;    /* chip revision, chip specific */
+} __attribute__ ((packed));
+
+/**
+ * struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
+ * @index:      on return, index of the first created buffer
+ * @count:      entry: number of requested buffers,
+ *              return: number of created buffers
+ * @memory:     enum v4l2_memory; buffer memory type
+ * @format:     frame format, for which buffers are requested
+ * @reserved:   future extensions
+ */
+struct v4l2_create_buffers {
+        __u32                   index;
+        __u32                   count;
+        __u32                   memory;
+        struct v4l2_format      format;
+        __u32                   reserved[8];
+};
+
+/*
+ *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
+ *
+ */
+#define VIDIOC_QUERYCAP          _IOR('V',  0, struct v4l2_capability)
+#define VIDIOC_RESERVED           _IO('V',  1)
+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
+#define VIDIOC_G_FMT            _IOWR('V',  4, struct v4l2_format)
+#define VIDIOC_S_FMT            _IOWR('V',  5, struct v4l2_format)
+#define VIDIOC_REQBUFS          _IOWR('V',  8, struct v4l2_requestbuffers)
+#define VIDIOC_QUERYBUF         _IOWR('V',  9, struct v4l2_buffer)
+#define VIDIOC_G_FBUF            _IOR('V', 10, struct v4l2_framebuffer)
+#define VIDIOC_S_FBUF            _IOW('V', 11, struct v4l2_framebuffer)
+#define VIDIOC_OVERLAY           _IOW('V', 14, int)
+#define VIDIOC_QBUF             _IOWR('V', 15, struct v4l2_buffer)
+#define VIDIOC_DQBUF            _IOWR('V', 17, struct v4l2_buffer)
+#define VIDIOC_STREAMON          _IOW('V', 18, int)
+#define VIDIOC_STREAMOFF         _IOW('V', 19, int)
+#define VIDIOC_G_PARM           _IOWR('V', 21, struct v4l2_streamparm)
+#define VIDIOC_S_PARM           _IOWR('V', 22, struct v4l2_streamparm)
+#define VIDIOC_G_STD             _IOR('V', 23, v4l2_std_id)
+#define VIDIOC_S_STD             _IOW('V', 24, v4l2_std_id)
+#define VIDIOC_ENUMSTD          _IOWR('V', 25, struct v4l2_standard)
+#define VIDIOC_ENUMINPUT        _IOWR('V', 26, struct v4l2_input)
+#define VIDIOC_G_CTRL           _IOWR('V', 27, struct v4l2_control)
+#define VIDIOC_S_CTRL           _IOWR('V', 28, struct v4l2_control)
+#define VIDIOC_G_TUNER          _IOWR('V', 29, struct v4l2_tuner)
+#define VIDIOC_S_TUNER           _IOW('V', 30, struct v4l2_tuner)
+#define VIDIOC_G_AUDIO           _IOR('V', 33, struct v4l2_audio)
+#define VIDIOC_S_AUDIO           _IOW('V', 34, struct v4l2_audio)
+#define VIDIOC_QUERYCTRL        _IOWR('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU        _IOWR('V', 37, struct v4l2_querymenu)
+#define VIDIOC_G_INPUT           _IOR('V', 38, int)
+#define VIDIOC_S_INPUT          _IOWR('V', 39, int)
+#define VIDIOC_G_OUTPUT          _IOR('V', 46, int)
+#define VIDIOC_S_OUTPUT         _IOWR('V', 47, int)
+#define VIDIOC_ENUMOUTPUT       _IOWR('V', 48, struct v4l2_output)
+#define VIDIOC_G_AUDOUT          _IOR('V', 49, struct v4l2_audioout)
+#define VIDIOC_S_AUDOUT          _IOW('V', 50, struct v4l2_audioout)
+#define VIDIOC_G_MODULATOR      _IOWR('V', 54, struct v4l2_modulator)
+#define VIDIOC_S_MODULATOR       _IOW('V', 55, struct v4l2_modulator)
+#define VIDIOC_G_FREQUENCY      _IOWR('V', 56, struct v4l2_frequency)
+#define VIDIOC_S_FREQUENCY       _IOW('V', 57, struct v4l2_frequency)
+#define VIDIOC_CROPCAP          _IOWR('V', 58, struct v4l2_cropcap)
+#define VIDIOC_G_CROP           _IOWR('V', 59, struct v4l2_crop)
+#define VIDIOC_S_CROP            _IOW('V', 60, struct v4l2_crop)
+#define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct v4l2_jpegcompression)
+#define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct v4l2_jpegcompression)
+#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
+#define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
+#define VIDIOC_G_PRIORITY        _IOR('V', 67, __u32) /* enum v4l2_priority */
+#define VIDIOC_S_PRIORITY        _IOW('V', 68, __u32) /* enum v4l2_priority */
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
+#define VIDIOC_LOG_STATUS         _IO('V', 70)
+#define VIDIOC_G_EXT_CTRLS      _IOWR('V', 71, struct v4l2_ext_controls)
+#define VIDIOC_S_EXT_CTRLS      _IOWR('V', 72, struct v4l2_ext_controls)
+#define VIDIOC_TRY_EXT_CTRLS    _IOWR('V', 73, struct v4l2_ext_controls)
+#if 1
+#define VIDIOC_ENUM_FRAMESIZES  _IOWR('V', 74, struct v4l2_frmsizeenum)
+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
+#endif
+
+#if 1
+/* Experimental, meant for debugging, testing and internal use.
+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
+   You must be root to use these ioctls. Never use these in applications! */
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
+
+/* Experimental, meant for debugging, testing and internal use.
+   Never use this ioctl in applications! */
+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
+#endif
+
+#define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
+
+/* These four DV Preset ioctls are deprecated in favor of the DV Timings
+   ioctls. */
+#define VIDIOC_ENUM_DV_PRESETS  _IOWR('V', 83, struct v4l2_dv_enum_preset)
+#define VIDIOC_S_DV_PRESET      _IOWR('V', 84, struct v4l2_dv_preset)
+#define VIDIOC_G_DV_PRESET      _IOWR('V', 85, struct v4l2_dv_preset)
+#define VIDIOC_QUERY_DV_PRESET  _IOR('V',  86, struct v4l2_dv_preset)
+#define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)
+#define VIDIOC_G_DV_TIMINGS     _IOWR('V', 88, struct v4l2_dv_timings)
+#define VIDIOC_DQEVENT           _IOR('V', 89, struct v4l2_event)
+#define VIDIOC_SUBSCRIBE_EVENT   _IOW('V', 90, struct v4l2_event_subscription)
+#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
+
+/* Experimental, the below two ioctls may change over the next couple of kernel
+   versions */
+#define VIDIOC_CREATE_BUFS      _IOWR('V', 92, struct v4l2_create_buffers)
+#define VIDIOC_PREPARE_BUF      _IOWR('V', 93, struct v4l2_buffer)
+
+/* Experimental selection API */
+#define VIDIOC_G_SELECTION      _IOWR('V', 94, struct v4l2_selection)
+#define VIDIOC_S_SELECTION      _IOWR('V', 95, struct v4l2_selection)
+
+/* Experimental, these two ioctls may change over the next couple of kernel
+   versions. */
+#define VIDIOC_DECODER_CMD      _IOWR('V', 96, struct v4l2_decoder_cmd)
+#define VIDIOC_TRY_DECODER_CMD  _IOWR('V', 97, struct v4l2_decoder_cmd)
+
+/* Experimental, these three ioctls may change over the next couple of kernel
+   versions. */
+#define VIDIOC_ENUM_DV_TIMINGS  _IOWR('V', 98, struct v4l2_enum_dv_timings)
+#define VIDIOC_QUERY_DV_TIMINGS  _IOR('V', 99, struct v4l2_dv_timings)
+#define VIDIOC_DV_TIMINGS_CAP   _IOWR('V', 100, struct v4l2_dv_timings_cap)
+
+/* Experimental, this ioctl may change over the next couple of kernel
+   versions. */
+#define VIDIOC_ENUM_FREQ_BANDS  _IOWR('V', 101, struct v4l2_frequency_band)
+
+/* Reminder: when adding new ioctls please add support for them to
+   drivers/media/video/v4l2-compat-ioctl32.c as well! */
+
+#define BASE_VIDIOC_PRIVATE     192             /* 192-255 are private */
+
+#endif /* _UAPI__LINUX_VIDEODEV2_H */
diff --git a/include/linux/virtio_9p.h b/include/uapi/linux/virtio_9p.h
index 277c4ad44e84..277c4ad44e84 100644
--- a/include/linux/virtio_9p.h
+++ b/include/uapi/linux/virtio_9p.h
diff --git a/include/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h
index 652dc8bea921..652dc8bea921 100644
--- a/include/linux/virtio_balloon.h
+++ b/include/uapi/linux/virtio_balloon.h
diff --git a/include/linux/virtio_blk.h b/include/uapi/linux/virtio_blk.h
index 6d8e61c48563..6d8e61c48563 100644
--- a/include/linux/virtio_blk.h
+++ b/include/uapi/linux/virtio_blk.h
diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h
new file mode 100644
index 000000000000..b7cda390fd00
--- /dev/null
+++ b/include/uapi/linux/virtio_config.h
@@ -0,0 +1,54 @@
+#ifndef _UAPI_LINUX_VIRTIO_CONFIG_H
+#define _UAPI_LINUX_VIRTIO_CONFIG_H
+/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
+ * anyone can use the definitions to implement compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
+
+/* Virtio devices use a standardized configuration space to define their
+ * features and pass configuration information, but each implementation can
+ * store and access that space differently. */
+#include <linux/types.h>
+
+/* Status byte for guest to report progress, and synchronize features. */
+/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
+#define VIRTIO_CONFIG_S_ACKNOWLEDGE     1
+/* We have found a driver for the device. */
+#define VIRTIO_CONFIG_S_DRIVER          2
+/* Driver has used its parts of the config, and is happy */
+#define VIRTIO_CONFIG_S_DRIVER_OK       4
+/* We've given up on this device. */
+#define VIRTIO_CONFIG_S_FAILED          0x80
+
+/* Some virtio feature bits (currently bits 28 through 31) are reserved for the
+ * transport being used (eg. virtio_ring), the rest are per-device feature
+ * bits. */
+#define VIRTIO_TRANSPORT_F_START        28
+#define VIRTIO_TRANSPORT_F_END          32
+
+/* Do we get callbacks when the ring is completely used, even if we've
+ * suppressed them? */
+#define VIRTIO_F_NOTIFY_ON_EMPTY        24
+
+#endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */
diff --git a/include/uapi/linux/virtio_console.h b/include/uapi/linux/virtio_console.h
new file mode 100644
index 000000000000..ee13ab6c3614
--- /dev/null
+++ b/include/uapi/linux/virtio_console.h
@@ -0,0 +1,74 @@
+/*
+ * This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
+ * anyone can use the definitions to implement compatible drivers/servers:
+ *
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Copyright (C) Red Hat, Inc., 2009, 2010, 2011
+ * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011
+ */
+#ifndef _UAPI_LINUX_VIRTIO_CONSOLE_H
+#define _UAPI_LINUX_VIRTIO_CONSOLE_H
+#include <linux/types.h>
+#include <linux/virtio_ids.h>
+#include <linux/virtio_config.h>
+
+/* Feature bits */
+#define VIRTIO_CONSOLE_F_SIZE   0       /* Does host provide console size? */
+#define VIRTIO_CONSOLE_F_MULTIPORT 1    /* Does host provide multiple ports? */
+
+#define VIRTIO_CONSOLE_BAD_ID           (~(u32)0)
+
+struct virtio_console_config {
+        /* colums of the screens */
+        __u16 cols;
+        /* rows of the screens */
+        __u16 rows;
+        /* max. number of ports this device can hold */
+        __u32 max_nr_ports;
+} __attribute__((packed));
+
+/*
+ * A message that's passed between the Host and the Guest for a
+ * particular port.
+ */
+struct virtio_console_control {
+        __u32 id;               /* Port number */
+        __u16 event;            /* The kind of control event (see below) */
+        __u16 value;            /* Extra information for the key */
+};
+
+/* Some events for control messages */
+#define VIRTIO_CONSOLE_DEVICE_READY     0
+#define VIRTIO_CONSOLE_PORT_ADD         1
+#define VIRTIO_CONSOLE_PORT_REMOVE      2
+#define VIRTIO_CONSOLE_PORT_READY       3
+#define VIRTIO_CONSOLE_CONSOLE_PORT     4
+#define VIRTIO_CONSOLE_RESIZE           5
+#define VIRTIO_CONSOLE_PORT_OPEN        6
+#define VIRTIO_CONSOLE_PORT_NAME        7
+
+
+#endif /* _UAPI_LINUX_VIRTIO_CONSOLE_H */
diff --git a/include/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 270fb22c5811..270fb22c5811 100644
--- a/include/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
diff --git a/include/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index 2470f541af50..2470f541af50 100644
--- a/include/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
diff --git a/include/linux/virtio_pci.h b/include/uapi/linux/virtio_pci.h
index ea66f3f60d63..ea66f3f60d63 100644
--- a/include/linux/virtio_pci.h
+++ b/include/uapi/linux/virtio_pci.h
diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h
new file mode 100644
index 000000000000..a99f9b7caa67
--- /dev/null
+++ b/include/uapi/linux/virtio_ring.h
@@ -0,0 +1,163 @@
+#ifndef _UAPI_LINUX_VIRTIO_RING_H
+#define _UAPI_LINUX_VIRTIO_RING_H
+/* An interface for efficient virtio implementation, currently for use by KVM
+ * and lguest, but hopefully others soon.  Do NOT change this since it will
+ * break existing servers and clients.
+ *
+ * This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Copyright Rusty Russell IBM Corporation 2007. */
+#include <linux/types.h>
+
+/* This marks a buffer as continuing via the next field. */
+#define VRING_DESC_F_NEXT       1
+/* This marks a buffer as write-only (otherwise read-only). */
+#define VRING_DESC_F_WRITE      2
+/* This means the buffer contains a list of buffer descriptors. */
+#define VRING_DESC_F_INDIRECT   4
+
+/* The Host uses this in used->flags to advise the Guest: don't kick me when
+ * you add a buffer.  It's unreliable, so it's simply an optimization.  Guest
+ * will still kick if it's out of buffers. */
+#define VRING_USED_F_NO_NOTIFY  1
+/* The Guest uses this in avail->flags to advise the Host: don't interrupt me
+ * when you consume a buffer.  It's unreliable, so it's simply an
+ * optimization.  */
+#define VRING_AVAIL_F_NO_INTERRUPT      1
+
+/* We support indirect buffer descriptors */
+#define VIRTIO_RING_F_INDIRECT_DESC     28
+
+/* The Guest publishes the used index for which it expects an interrupt
+ * at the end of the avail ring. Host should ignore the avail->flags field. */
+/* The Host publishes the avail index for which it expects a kick
+ * at the end of the used ring. Guest should ignore the used->flags field. */
+#define VIRTIO_RING_F_EVENT_IDX         29
+
+/* Virtio ring descriptors: 16 bytes.  These can chain together via "next". */
+struct vring_desc {
+        /* Address (guest-physical). */
+        __u64 addr;
+        /* Length. */
+        __u32 len;
+        /* The flags as indicated above. */
+        __u16 flags;
+        /* We chain unused descriptors via this, too */
+        __u16 next;
+};
+
+struct vring_avail {
+        __u16 flags;
+        __u16 idx;
+        __u16 ring[];
+};
+
+/* u32 is used here for ids for padding reasons. */
+struct vring_used_elem {
+        /* Index of start of used descriptor chain. */
+        __u32 id;
+        /* Total length of the descriptor chain which was used (written to) */
+        __u32 len;
+};
+
+struct vring_used {
+        __u16 flags;
+        __u16 idx;
+        struct vring_used_elem ring[];
+};
+
+struct vring {
+        unsigned int num;
+
+        struct vring_desc *desc;
+
+        struct vring_avail *avail;
+
+        struct vring_used *used;
+};
+
+/* The standard layout for the ring is a continuous chunk of memory which looks
+ * like this.  We assume num is a power of 2.
+ *
+ * struct vring
+ * {
+ *      // The actual descriptors (16 bytes each)
+ *      struct vring_desc desc[num];
+ *
+ *      // A ring of available descriptor heads with free-running index.
+ *      __u16 avail_flags;
+ *      __u16 avail_idx;
+ *      __u16 available[num];
+ *      __u16 used_event_idx;
+ *
+ *      // Padding to the next align boundary.
+ *      char pad[];
+ *
+ *      // A ring of used descriptor heads with free-running index.
+ *      __u16 used_flags;
+ *      __u16 used_idx;
+ *      struct vring_used_elem used[num];
+ *      __u16 avail_event_idx;
+ * };
+ */
+/* We publish the used event index at the end of the available ring, and vice
+ * versa. They are at the end for backwards compatibility. */
+#define vring_used_event(vr) ((vr)->avail->ring[(vr)->num])
+#define vring_avail_event(vr) (*(__u16 *)&(vr)->used->ring[(vr)->num])
+
+static inline void vring_init(struct vring *vr, unsigned int num, void *p,
+                              unsigned long align)
+{
+        vr->num = num;
+        vr->desc = p;
+        vr->avail = p + num*sizeof(struct vring_desc);
+        vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__u16)
+                + align-1) & ~(align - 1));
+}
+
+static inline unsigned vring_size(unsigned int num, unsigned long align)
+{
+        return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (3 + num)
+                 + align - 1) & ~(align - 1))
+                + sizeof(__u16) * 3 + sizeof(struct vring_used_elem) * num;
+}
+
+/* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */
+/* Assuming a given event_idx value from the other size, if
+ * we have just incremented index from old to new_idx,
+ * should we trigger an event? */
+static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old)
+{
+        /* Note: Xen has similar logic for notification hold-off
+         * in include/xen/interface/io/ring.h with req_event and req_prod
+         * corresponding to event_idx + 1 and new_idx respectively.
+         * Note also that req_event and req_prod in Xen start at 1,
+         * event indexes in virtio start at 0. */
+        return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old);
+}
+
+#endif /* _UAPI_LINUX_VIRTIO_RING_H */
diff --git a/include/linux/virtio_rng.h b/include/uapi/linux/virtio_rng.h
index c4d5de896f0c..c4d5de896f0c 100644
--- a/include/linux/virtio_rng.h
+++ b/include/uapi/linux/virtio_rng.h
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
new file mode 100644
index 000000000000..4b59a26799a3
--- /dev/null
+++ b/include/uapi/linux/vt.h
@@ -0,0 +1,90 @@
+#ifndef _UAPI_LINUX_VT_H
+#define _UAPI_LINUX_VT_H
+
+
+/*
+ * These constants are also useful for user-level apps (e.g., VC
+ * resizing).
+ */
+#define MIN_NR_CONSOLES 1       /* must be at least 1 */
+#define MAX_NR_CONSOLES 63      /* serial lines start at 64 */
+#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */
+                /* Note: the ioctl VT_GETSTATE does not work for
+                   consoles 16 and higher (since it returns a short) */
+
+/* 0x56 is 'V', to avoid collision with termios and kd */
+
+#define VT_OPENQRY      0x5600  /* find available vt */
+
+struct vt_mode {
+        char mode;              /* vt mode */
+        char waitv;             /* if set, hang on writes if not active */
+        short relsig;           /* signal to raise on release req */
+        short acqsig;           /* signal to raise on acquisition */
+        short frsig;            /* unused (set to 0) */
+};
+#define VT_GETMODE      0x5601  /* get mode of active vt */
+#define VT_SETMODE      0x5602  /* set mode of active vt */
+#define         VT_AUTO         0x00    /* auto vt switching */
+#define         VT_PROCESS      0x01    /* process controls switching */
+#define         VT_ACKACQ       0x02    /* acknowledge switch */
+
+struct vt_stat {
+        unsigned short v_active;        /* active vt */
+        unsigned short v_signal;        /* signal to send */
+        unsigned short v_state;         /* vt bitmask */
+};
+#define VT_GETSTATE     0x5603  /* get global vt state info */
+#define VT_SENDSIG      0x5604  /* signal to send to bitmask of vts */
+
+#define VT_RELDISP      0x5605  /* release display */
+
+#define VT_ACTIVATE     0x5606  /* make vt active */
+#define VT_WAITACTIVE   0x5607  /* wait for vt active */
+#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
+
+struct vt_sizes {
+        unsigned short v_rows;          /* number of rows */
+        unsigned short v_cols;          /* number of columns */
+        unsigned short v_scrollsize;    /* number of lines of scrollback */
+};
+#define VT_RESIZE       0x5609  /* set kernel's idea of screensize */
+
+struct vt_consize {
+        unsigned short v_rows;  /* number of rows */
+        unsigned short v_cols;  /* number of columns */
+        unsigned short v_vlin;  /* number of pixel rows on screen */
+        unsigned short v_clin;  /* number of pixel rows per character */
+        unsigned short v_vcol;  /* number of pixel columns on screen */
+        unsigned short v_ccol;  /* number of pixel columns per character */
+};
+#define VT_RESIZEX      0x560A  /* set kernel's idea of screensize + more */
+#define VT_LOCKSWITCH   0x560B  /* disallow vt switching */
+#define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
+#define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
+
+struct vt_event {
+        unsigned int event;
+#define VT_EVENT_SWITCH         0x0001  /* Console switch */
+#define VT_EVENT_BLANK          0x0002  /* Screen blank */
+#define VT_EVENT_UNBLANK        0x0004  /* Screen unblank */
+#define VT_EVENT_RESIZE         0x0008  /* Resize display */
+#define VT_MAX_EVENT            0x000F
+        unsigned int oldev;             /* Old console */
+        unsigned int newev;             /* New console (if changing) */
+        unsigned int pad[4];            /* Padding for expansion */
+};
+
+#define VT_WAITEVENT    0x560E  /* Wait for an event */
+
+struct vt_setactivate {
+        unsigned int console;
+        struct vt_mode mode;
+};
+
+#define VT_SETACTIVATE  0x560F  /* Activate and set the mode of a console */
+
+
+#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
+
+#endif /* _UAPI_LINUX_VT_H */
diff --git a/include/uapi/linux/wait.h b/include/uapi/linux/wait.h
new file mode 100644
index 000000000000..9393eead23e2
--- /dev/null
+++ b/include/uapi/linux/wait.h
@@ -0,0 +1,21 @@
+#ifndef _UAPI_LINUX_WAIT_H
+#define _UAPI_LINUX_WAIT_H
+
+#define WNOHANG         0x00000001
+#define WUNTRACED       0x00000002
+#define WSTOPPED        WUNTRACED
+#define WEXITED         0x00000004
+#define WCONTINUED      0x00000008
+#define WNOWAIT         0x01000000      /* Don't reap, just poll status.  */
+
+#define __WNOTHREAD     0x20000000      /* Don't wait on children of other threads in this group */
+#define __WALL          0x40000000      /* Wait on all children, regardless of type */
+#define __WCLONE        0x80000000      /* Wait only on non-SIGCHLD children */
+
+/* First argument to waitid: */
+#define P_ALL           0
+#define P_PID           1
+#define P_PGID          2
+
+
+#endif /* _UAPI_LINUX_WAIT_H */
diff --git a/include/uapi/linux/wanrouter.h b/include/uapi/linux/wanrouter.h
new file mode 100644
index 000000000000..7617df2833d5
--- /dev/null
+++ b/include/uapi/linux/wanrouter.h
@@ -0,0 +1,452 @@
+/*****************************************************************************
+* wanrouter.h   Definitions for the WAN Multiprotocol Router Module.
+*               This module provides API and common services for WAN Link
+*               Drivers and is completely hardware-independent.
+*
+* Author:       Nenad Corbic <ncorbic@sangoma.com>
+*               Gideon Hack     
+* Additions:    Arnaldo Melo
+*
+* Copyright:    (c) 1995-2000 Sangoma Technologies Inc.
+*
+*               This program is free software; you can redistribute it and/or
+*               modify it under the terms of the GNU General Public License
+*               as published by the Free Software Foundation; either version
+*               2 of the License, or (at your option) any later version.
+* ============================================================================
+* Jul 21, 2000  Nenad Corbic    Added WAN_FT1_READY State
+* Feb 24, 2000  Nenad Corbic    Added support for socket based x25api
+* Jan 28, 2000  Nenad Corbic    Added support for the ASYNC protocol.
+* Oct 04, 1999  Nenad Corbic    Updated for 2.1.0 release
+* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
+* May 23, 1999  Arnaldo Melo    Added local_addr to wanif_conf_t
+*                               WAN_DISCONNECTING state added
+* Jul 20, 1998  David Fong      Added Inverse ARP options to 'wanif_conf_t'
+* Jun 12, 1998  David Fong      Added Cisco HDLC support.
+* Dec 16, 1997  Jaspreet Singh  Moved 'enable_IPX' and 'network_number' to
+*                               'wanif_conf_t'
+* Dec 05, 1997  Jaspreet Singh  Added 'pap', 'chap' to 'wanif_conf_t'
+*                               Added 'authenticator' to 'wan_ppp_conf_t'
+* Nov 06, 1997  Jaspreet Singh  Changed Router Driver version to 1.1 from 1.0
+* Oct 20, 1997  Jaspreet Singh  Added 'cir','bc','be' and 'mc' to 'wanif_conf_t'
+*                               Added 'enable_IPX' and 'network_number' to 
+*                               'wan_device_t'.  Also added defines for
+*                               UDP PACKET TYPE, Interrupt test, critical values
+*                               for RACE conditions.
+* Oct 05, 1997  Jaspreet Singh  Added 'dlci_num' and 'dlci[100]' to 
+*                               'wan_fr_conf_t' to configure a list of dlci(s)
+*                               for a NODE 
+* Jul 07, 1997  Jaspreet Singh  Added 'ttl' to 'wandev_conf_t' & 'wan_device_t'
+* May 29, 1997  Jaspreet Singh  Added 'tx_int_enabled' to 'wan_device_t'
+* May 21, 1997  Jaspreet Singh  Added 'udp_port' to 'wan_device_t'
+* Apr 25, 1997  Farhan Thawar   Added 'udp_port' to 'wandev_conf_t'
+* Jan 16, 1997  Gene Kozin      router_devlist made public
+* Jan 02, 1997  Gene Kozin      Initial version (based on wanpipe.h).
+*****************************************************************************/
+
+#ifndef _UAPI_ROUTER_H
+#define _UAPI_ROUTER_H
+
+#define ROUTER_NAME     "wanrouter"     /* in case we ever change it */
+#define ROUTER_VERSION  1               /* version number */
+#define ROUTER_RELEASE  1               /* release (minor version) number */
+#define ROUTER_IOCTL    'W'             /* for IOCTL calls */
+#define ROUTER_MAGIC    0x524D4157L     /* signature: 'WANR' reversed */
+
+/* IOCTL codes for /proc/router/<device> entries (up to 255) */
+enum router_ioctls
+{
+        ROUTER_SETUP    = ROUTER_IOCTL<<8,      /* configure device */
+        ROUTER_DOWN,                            /* shut down device */
+        ROUTER_STAT,                            /* get device status */
+        ROUTER_IFNEW,                           /* add interface */
+        ROUTER_IFDEL,                           /* delete interface */
+        ROUTER_IFSTAT,                          /* get interface status */
+        ROUTER_USER     = (ROUTER_IOCTL<<8)+16, /* driver-specific calls */
+        ROUTER_USER_MAX = (ROUTER_IOCTL<<8)+31
+};
+
+/* identifiers for displaying proc file data for dual port adapters */
+#define PROC_DATA_PORT_0 0x8000 /* the data is for port 0 */
+#define PROC_DATA_PORT_1 0x8001 /* the data is for port 1 */
+
+/* NLPID for packet encapsulation (ISO/IEC TR 9577) */
+#define NLPID_IP        0xCC    /* Internet Protocol Datagram */
+#define NLPID_SNAP      0x80    /* IEEE Subnetwork Access Protocol */
+#define NLPID_CLNP      0x81    /* ISO/IEC 8473 */
+#define NLPID_ESIS      0x82    /* ISO/IEC 9542 */
+#define NLPID_ISIS      0x83    /* ISO/IEC ISIS */
+#define NLPID_Q933      0x08    /* CCITT Q.933 */
+
+/* Miscellaneous */
+#define WAN_IFNAME_SZ   15      /* max length of the interface name */
+#define WAN_DRVNAME_SZ  15      /* max length of the link driver name */
+#define WAN_ADDRESS_SZ  31      /* max length of the WAN media address */
+#define USED_BY_FIELD   8       /* max length of the used by field */
+
+/* Defines for UDP PACKET TYPE */
+#define UDP_PTPIPE_TYPE         0x01
+#define UDP_FPIPE_TYPE          0x02
+#define UDP_CPIPE_TYPE          0x03
+#define UDP_DRVSTATS_TYPE       0x04
+#define UDP_INVALID_TYPE        0x05
+
+/* Command return code */
+#define CMD_OK          0               /* normal firmware return code */
+#define CMD_TIMEOUT     0xFF            /* firmware command timed out */
+
+/* UDP Packet Management */
+#define UDP_PKT_FRM_STACK       0x00
+#define UDP_PKT_FRM_NETWORK     0x01
+
+/* Maximum interrupt test counter */
+#define MAX_INTR_TEST_COUNTER   100
+
+/* Critical Values for RACE conditions*/
+#define CRITICAL_IN_ISR         0xA1
+#define CRITICAL_INTR_HANDLED   0xB1
+
+/****** Data Types **********************************************************/
+
+/*----------------------------------------------------------------------------
+ * X.25-specific link-level configuration.
+ */
+typedef struct wan_x25_conf
+{
+        unsigned lo_pvc;        /* lowest permanent circuit number */
+        unsigned hi_pvc;        /* highest permanent circuit number */
+        unsigned lo_svc;        /* lowest switched circuit number */
+        unsigned hi_svc;        /* highest switched circuit number */
+        unsigned hdlc_window;   /* HDLC window size (1..7) */
+        unsigned pkt_window;    /* X.25 packet window size (1..7) */
+        unsigned t1;            /* HDLC timer T1, sec (1..30) */
+        unsigned t2;            /* HDLC timer T2, sec (0..29) */
+        unsigned t4;            /* HDLC supervisory frame timer = T4 * T1 */
+        unsigned n2;            /* HDLC retransmission limit (1..30) */
+        unsigned t10_t20;       /* X.25 RESTART timeout, sec (1..255) */
+        unsigned t11_t21;       /* X.25 CALL timeout, sec (1..255) */
+        unsigned t12_t22;       /* X.25 RESET timeout, sec (1..255) */
+        unsigned t13_t23;       /* X.25 CLEAR timeout, sec (1..255) */
+        unsigned t16_t26;       /* X.25 INTERRUPT timeout, sec (1..255) */
+        unsigned t28;           /* X.25 REGISTRATION timeout, sec (1..255) */
+        unsigned r10_r20;       /* RESTART retransmission limit (0..250) */
+        unsigned r12_r22;       /* RESET retransmission limit (0..250) */
+        unsigned r13_r23;       /* CLEAR retransmission limit (0..250) */
+        unsigned ccitt_compat;  /* compatibility mode: 1988/1984/1980 */
+        unsigned x25_conf_opt;   /* User defined x25 config optoins */
+        unsigned char LAPB_hdlc_only; /* Run in HDLC only mode */
+        unsigned char logging;   /* Control connection logging */  
+        unsigned char oob_on_modem; /* Whether to send modem status to the user app */
+} wan_x25_conf_t;
+
+/*----------------------------------------------------------------------------
+ * Frame relay specific link-level configuration.
+ */
+typedef struct wan_fr_conf
+{
+        unsigned signalling;    /* local in-channel signalling type */
+        unsigned t391;          /* link integrity verification timer */
+        unsigned t392;          /* polling verification timer */
+        unsigned n391;          /* full status polling cycle counter */
+        unsigned n392;          /* error threshold counter */
+        unsigned n393;          /* monitored events counter */
+        unsigned dlci_num;      /* number of DLCs (access node) */
+        unsigned  dlci[100];    /* List of all DLCIs */
+} wan_fr_conf_t;
+
+/*----------------------------------------------------------------------------
+ * PPP-specific link-level configuration.
+ */
+typedef struct wan_ppp_conf
+{
+        unsigned restart_tmr;   /* restart timer */
+        unsigned auth_rsrt_tmr; /* authentication timer */
+        unsigned auth_wait_tmr; /* authentication timer */
+        unsigned mdm_fail_tmr;  /* modem failure timer */
+        unsigned dtr_drop_tmr;  /* DTR drop timer */
+        unsigned connect_tmout; /* connection timeout */
+        unsigned conf_retry;    /* max. retry */
+        unsigned term_retry;    /* max. retry */
+        unsigned fail_retry;    /* max. retry */
+        unsigned auth_retry;    /* max. retry */
+        unsigned auth_options;  /* authentication opt. */
+        unsigned ip_options;    /* IP options */
+        char    authenticator;  /* AUTHENTICATOR or not */
+        char    ip_mode;        /* Static/Host/Peer */
+} wan_ppp_conf_t;
+
+/*----------------------------------------------------------------------------
+ * CHDLC-specific link-level configuration.
+ */
+typedef struct wan_chdlc_conf
+{
+        unsigned char ignore_dcd;       /* Protocol options:            */
+        unsigned char ignore_cts;       /*  Ignore these to determine   */
+        unsigned char ignore_keepalive; /*  link status (Yes or No)     */
+        unsigned char hdlc_streaming;   /*  hdlc_streaming mode (Y/N) */
+        unsigned char receive_only;     /*  no transmit buffering (Y/N) */
+        unsigned keepalive_tx_tmr;      /* transmit keepalive timer */
+        unsigned keepalive_rx_tmr;      /* receive  keepalive timer */
+        unsigned keepalive_err_margin;  /* keepalive_error_tolerance */
+        unsigned slarp_timer;           /* SLARP request timer */
+} wan_chdlc_conf_t;
+
+
+/*----------------------------------------------------------------------------
+ * WAN device configuration. Passed to ROUTER_SETUP IOCTL.
+ */
+typedef struct wandev_conf
+{
+        unsigned magic;         /* magic number (for verification) */
+        unsigned config_id;     /* configuration structure identifier */
+                                /****** hardware configuration ******/
+        unsigned ioport;        /* adapter I/O port base */
+        unsigned long maddr;    /* dual-port memory address */
+        unsigned msize;         /* dual-port memory size */
+        int irq;                /* interrupt request level */
+        int dma;                /* DMA request level */
+        char S514_CPU_no[1];    /* S514 PCI adapter CPU number ('A' or 'B') */
+        unsigned PCI_slot_no;   /* S514 PCI adapter slot number */
+        char auto_pci_cfg;      /* S515 PCI automatic slot detection */
+        char comm_port;         /* Communication Port (PRI=0, SEC=1) */ 
+        unsigned bps;           /* data transfer rate */
+        unsigned mtu;           /* maximum transmit unit size */
+        unsigned udp_port;      /* UDP port for management */
+        unsigned char ttl;      /* Time To Live for UDP security */
+        unsigned char ft1;      /* FT1 Configurator Option */
+        char interface;         /* RS-232/V.35, etc. */
+        char clocking;          /* external/internal */
+        char line_coding;       /* NRZ/NRZI/FM0/FM1, etc. */
+        char station;           /* DTE/DCE, primary/secondary, etc. */
+        char connection;        /* permanent/switched/on-demand */
+        char read_mode;         /* read mode: Polling or interrupt */
+        char receive_only;      /* disable tx buffers */
+        char tty;               /* Create a fake tty device */
+        unsigned tty_major;     /* Major number for wanpipe tty device */
+        unsigned tty_minor;     /* Minor number for wanpipe tty device */
+        unsigned tty_mode;      /* TTY operation mode SYNC or ASYNC */
+        char backup;            /* Backup Mode */
+        unsigned hw_opt[4];     /* other hardware options */
+        unsigned reserved[4];
+                                /****** arbitrary data ***************/
+        unsigned data_size;     /* data buffer size */
+        void* data;             /* data buffer, e.g. firmware */
+        union                   /****** protocol-specific ************/
+        {
+                wan_x25_conf_t x25;     /* X.25 configuration */
+                wan_ppp_conf_t ppp;     /* PPP configuration */
+                wan_fr_conf_t fr;       /* frame relay configuration */
+                wan_chdlc_conf_t chdlc; /* Cisco HDLC configuration */
+        } u;
+} wandev_conf_t;
+
+/* 'config_id' definitions */
+#define WANCONFIG_X25   101     /* X.25 link */
+#define WANCONFIG_FR    102     /* frame relay link */
+#define WANCONFIG_PPP   103     /* synchronous PPP link */
+#define WANCONFIG_CHDLC 104     /* Cisco HDLC Link */
+#define WANCONFIG_BSC   105     /* BiSync Streaming */
+#define WANCONFIG_HDLC  106     /* HDLC Support */
+#define WANCONFIG_MPPP  107     /* Multi Port PPP over RAW CHDLC */
+
+/*
+ * Configuration options defines.
+ */
+/* general options */
+#define WANOPT_OFF      0
+#define WANOPT_ON       1
+#define WANOPT_NO       0
+#define WANOPT_YES      1
+
+/* intercace options */
+#define WANOPT_RS232    0
+#define WANOPT_V35      1
+
+/* data encoding options */
+#define WANOPT_NRZ      0
+#define WANOPT_NRZI     1
+#define WANOPT_FM0      2
+#define WANOPT_FM1      3
+
+/* link type options */
+#define WANOPT_POINTTOPOINT     0       /* RTS always active */
+#define WANOPT_MULTIDROP        1       /* RTS is active when transmitting */
+
+/* clocking options */
+#define WANOPT_EXTERNAL 0
+#define WANOPT_INTERNAL 1
+
+/* station options */
+#define WANOPT_DTE              0
+#define WANOPT_DCE              1
+#define WANOPT_CPE              0
+#define WANOPT_NODE             1
+#define WANOPT_SECONDARY        0
+#define WANOPT_PRIMARY          1
+
+/* connection options */
+#define WANOPT_PERMANENT        0       /* DTR always active */
+#define WANOPT_SWITCHED         1       /* use DTR to setup link (dial-up) */
+#define WANOPT_ONDEMAND         2       /* activate DTR only before sending */
+
+/* frame relay in-channel signalling */
+#define WANOPT_FR_ANSI          1       /* ANSI T1.617 Annex D */
+#define WANOPT_FR_Q933          2       /* ITU Q.933A */
+#define WANOPT_FR_LMI           3       /* LMI */
+
+/* PPP IP Mode Options */
+#define WANOPT_PPP_STATIC       0
+#define WANOPT_PPP_HOST         1
+#define WANOPT_PPP_PEER         2
+
+/* ASY Mode Options */
+#define WANOPT_ONE              1
+#define WANOPT_TWO              2
+#define WANOPT_ONE_AND_HALF     3
+
+#define WANOPT_NONE     0
+#define WANOPT_ODD      1
+#define WANOPT_EVEN     2
+
+/* CHDLC Protocol Options */
+/* DF Commented out for now.
+
+#define WANOPT_CHDLC_NO_DCD             IGNORE_DCD_FOR_LINK_STAT
+#define WANOPT_CHDLC_NO_CTS             IGNORE_CTS_FOR_LINK_STAT
+#define WANOPT_CHDLC_NO_KEEPALIVE       IGNORE_KPALV_FOR_LINK_STAT
+*/
+
+/* Port options */
+#define WANOPT_PRI 0
+#define WANOPT_SEC 1
+/* read mode */
+#define WANOPT_INTR     0
+#define WANOPT_POLL     1
+
+
+#define WANOPT_TTY_SYNC  0
+#define WANOPT_TTY_ASYNC 1
+/*----------------------------------------------------------------------------
+ * WAN Link Status Info (for ROUTER_STAT IOCTL).
+ */
+typedef struct wandev_stat
+{
+        unsigned state;         /* link state */
+        unsigned ndev;          /* number of configured interfaces */
+
+        /* link/interface configuration */
+        unsigned connection;    /* permanent/switched/on-demand */
+        unsigned media_type;    /* Frame relay/PPP/X.25/SDLC, etc. */
+        unsigned mtu;           /* max. transmit unit for this device */
+
+        /* physical level statistics */
+        unsigned modem_status;  /* modem status */
+        unsigned rx_frames;     /* received frames count */
+        unsigned rx_overruns;   /* receiver overrun error count */
+        unsigned rx_crc_err;    /* receive CRC error count */
+        unsigned rx_aborts;     /* received aborted frames count */
+        unsigned rx_bad_length; /* unexpetedly long/short frames count */
+        unsigned rx_dropped;    /* frames discarded at device level */
+        unsigned tx_frames;     /* transmitted frames count */
+        unsigned tx_underruns;  /* aborted transmissions (underruns) count */
+        unsigned tx_timeouts;   /* transmission timeouts */
+        unsigned tx_rejects;    /* other transmit errors */
+
+        /* media level statistics */
+        unsigned rx_bad_format; /* frames with invalid format */
+        unsigned rx_bad_addr;   /* frames with invalid media address */
+        unsigned tx_retries;    /* frames re-transmitted */
+        unsigned reserved[16];  /* reserved for future use */
+} wandev_stat_t;
+
+/* 'state' defines */
+enum wan_states
+{
+        WAN_UNCONFIGURED,       /* link/channel is not configured */
+        WAN_DISCONNECTED,       /* link/channel is disconnected */
+        WAN_CONNECTING,         /* connection is in progress */
+        WAN_CONNECTED,          /* link/channel is operational */
+        WAN_LIMIT,              /* for verification only */
+        WAN_DUALPORT,           /* for Dual Port cards */
+        WAN_DISCONNECTING,
+        WAN_FT1_READY           /* FT1 Configurator Ready */
+};
+
+enum {
+        WAN_LOCAL_IP,
+        WAN_POINTOPOINT_IP,
+        WAN_NETMASK_IP,
+        WAN_BROADCAST_IP
+};
+
+/* 'modem_status' masks */
+#define WAN_MODEM_CTS   0x0001  /* CTS line active */
+#define WAN_MODEM_DCD   0x0002  /* DCD line active */
+#define WAN_MODEM_DTR   0x0010  /* DTR line active */
+#define WAN_MODEM_RTS   0x0020  /* RTS line active */
+
+/*----------------------------------------------------------------------------
+ * WAN interface (logical channel) configuration (for ROUTER_IFNEW IOCTL).
+ */
+typedef struct wanif_conf
+{
+        unsigned magic;                 /* magic number */
+        unsigned config_id;             /* configuration identifier */
+        char name[WAN_IFNAME_SZ+1];     /* interface name, ASCIIZ */
+        char addr[WAN_ADDRESS_SZ+1];    /* media address, ASCIIZ */
+        char usedby[USED_BY_FIELD];     /* used by API or WANPIPE */
+        unsigned idle_timeout;          /* sec, before disconnecting */
+        unsigned hold_timeout;          /* sec, before re-connecting */
+        unsigned cir;                   /* Committed Information Rate fwd,bwd*/
+        unsigned bc;                    /* Committed Burst Size fwd, bwd */
+        unsigned be;                    /* Excess Burst Size fwd, bwd */ 
+        unsigned char enable_IPX;       /* Enable or Disable IPX */
+        unsigned char inarp;            /* Send Inverse ARP requests Y/N */
+        unsigned inarp_interval;        /* sec, between InARP requests */
+        unsigned long network_number;   /* Network Number for IPX */
+        char mc;                        /* Multicast on or off */
+        char local_addr[WAN_ADDRESS_SZ+1];/* local media address, ASCIIZ */
+        unsigned char port;             /* board port */
+        unsigned char protocol;         /* prococol used in this channel (TCPOX25 or X25) */
+        char pap;                       /* PAP enabled or disabled */
+        char chap;                      /* CHAP enabled or disabled */
+        unsigned char userid[511];      /* List of User Id */
+        unsigned char passwd[511];      /* List of passwords */
+        unsigned char sysname[31];      /* Name of the system */
+        unsigned char ignore_dcd;       /* Protocol options: */
+        unsigned char ignore_cts;       /*  Ignore these to determine */
+        unsigned char ignore_keepalive; /*  link status (Yes or No) */
+        unsigned char hdlc_streaming;   /*  Hdlc streaming mode (Y/N) */
+        unsigned keepalive_tx_tmr;      /* transmit keepalive timer */
+        unsigned keepalive_rx_tmr;      /* receive  keepalive timer */
+        unsigned keepalive_err_margin;  /* keepalive_error_tolerance */
+        unsigned slarp_timer;           /* SLARP request timer */
+        unsigned char ttl;              /* Time To Live for UDP security */
+        char interface;                 /* RS-232/V.35, etc. */
+        char clocking;                  /* external/internal */
+        unsigned bps;                   /* data transfer rate */
+        unsigned mtu;                   /* maximum transmit unit size */
+        unsigned char if_down;          /* brind down interface when disconnected */
+        unsigned char gateway;          /* Is this interface a gateway */
+        unsigned char true_if_encoding; /* Set the dev->type to true board protocol */
+
+        unsigned char asy_data_trans;     /* async API options */
+        unsigned char rts_hs_for_receive; /* async Protocol options */
+        unsigned char xon_xoff_hs_for_receive;
+        unsigned char xon_xoff_hs_for_transmit;
+        unsigned char dcd_hs_for_transmit;
+        unsigned char cts_hs_for_transmit;
+        unsigned char async_mode;
+        unsigned tx_bits_per_char;
+        unsigned rx_bits_per_char;
+        unsigned stop_bits;  
+        unsigned char parity;
+        unsigned break_timer;
+        unsigned inter_char_timer;
+        unsigned rx_complete_length;
+        unsigned xon_char;
+        unsigned xoff_char;
+        unsigned char receive_only;     /*  no transmit buffering (Y/N) */
+} wanif_conf_t;
+
+#endif /* _UAPI_ROUTER_H */
diff --git a/include/uapi/linux/watchdog.h b/include/uapi/linux/watchdog.h
new file mode 100644
index 000000000000..2babe72870ba
--- /dev/null
+++ b/include/uapi/linux/watchdog.h
@@ -0,0 +1,57 @@
+/*
+ *      Generic watchdog defines. Derived from..
+ *
+ * Berkshire PC Watchdog Defines
+ * by Ken Hollis <khollis@bitgate.com>
+ *
+ */
+
+#ifndef _UAPI_LINUX_WATCHDOG_H
+#define _UAPI_LINUX_WATCHDOG_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+#define WATCHDOG_IOCTL_BASE     'W'
+
+struct watchdog_info {
+        __u32 options;          /* Options the card/driver supports */
+        __u32 firmware_version; /* Firmware version of the card */
+        __u8  identity[32];     /* Identity of the board */
+};
+
+#define WDIOC_GETSUPPORT        _IOR(WATCHDOG_IOCTL_BASE, 0, struct watchdog_info)
+#define WDIOC_GETSTATUS         _IOR(WATCHDOG_IOCTL_BASE, 1, int)
+#define WDIOC_GETBOOTSTATUS     _IOR(WATCHDOG_IOCTL_BASE, 2, int)
+#define WDIOC_GETTEMP           _IOR(WATCHDOG_IOCTL_BASE, 3, int)
+#define WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
+#define WDIOC_KEEPALIVE         _IOR(WATCHDOG_IOCTL_BASE, 5, int)
+#define WDIOC_SETTIMEOUT        _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
+#define WDIOC_GETTIMEOUT        _IOR(WATCHDOG_IOCTL_BASE, 7, int)
+#define WDIOC_SETPRETIMEOUT     _IOWR(WATCHDOG_IOCTL_BASE, 8, int)
+#define WDIOC_GETPRETIMEOUT     _IOR(WATCHDOG_IOCTL_BASE, 9, int)
+#define WDIOC_GETTIMELEFT       _IOR(WATCHDOG_IOCTL_BASE, 10, int)
+
+#define WDIOF_UNKNOWN           -1      /* Unknown flag error */
+#define WDIOS_UNKNOWN           -1      /* Unknown status error */
+
+#define WDIOF_OVERHEAT          0x0001  /* Reset due to CPU overheat */
+#define WDIOF_FANFAULT          0x0002  /* Fan failed */
+#define WDIOF_EXTERN1           0x0004  /* External relay 1 */
+#define WDIOF_EXTERN2           0x0008  /* External relay 2 */
+#define WDIOF_POWERUNDER        0x0010  /* Power bad/power fault */
+#define WDIOF_CARDRESET         0x0020  /* Card previously reset the CPU */
+#define WDIOF_POWEROVER         0x0040  /* Power over voltage */
+#define WDIOF_SETTIMEOUT        0x0080  /* Set timeout (in seconds) */
+#define WDIOF_MAGICCLOSE        0x0100  /* Supports magic close char */
+#define WDIOF_PRETIMEOUT        0x0200  /* Pretimeout (in seconds), get/set */
+#define WDIOF_ALARMONLY         0x0400  /* Watchdog triggers a management or
+                                           other external alarm not a reboot */
+#define WDIOF_KEEPALIVEPING     0x8000  /* Keep alive ping reply */
+
+#define WDIOS_DISABLECARD       0x0001  /* Turn off the watchdog timer */
+#define WDIOS_ENABLECARD        0x0002  /* Turn on the watchdog timer */
+#define WDIOS_TEMPPANIC         0x0004  /* Kernel panic on temperature trip */
+
+
+#endif /* _UAPI_LINUX_WATCHDOG_H */
diff --git a/include/linux/wimax.h b/include/uapi/linux/wimax.h
index 9f6b77af2f6d..9f6b77af2f6d 100644
--- a/include/linux/wimax.h
+++ b/include/uapi/linux/wimax.h
diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild
index aafaa5aa54d4..1c97be49971f 100644
--- a/include/uapi/linux/wimax/Kbuild
+++ b/include/uapi/linux/wimax/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += i2400m.h
diff --git a/include/linux/wimax/i2400m.h b/include/uapi/linux/wimax/i2400m.h
index 62d356153565..62d356153565 100644
--- a/include/linux/wimax/i2400m.h
+++ b/include/uapi/linux/wimax/i2400m.h
diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h
new file mode 100644
index 000000000000..c1592e3e4036
--- /dev/null
+++ b/include/uapi/linux/wireless.h
@@ -0,0 +1,1128 @@
+/*
+ * This file define a set of standard wireless extensions
+ *
+ * Version :    22      16.3.07
+ *
+ * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
+ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
+ */
+
+#ifndef _UAPI_LINUX_WIRELESS_H
+#define _UAPI_LINUX_WIRELESS_H
+
+/************************** DOCUMENTATION **************************/
+/*
+ * Initial APIs (1996 -> onward) :
+ * -----------------------------
+ * Basically, the wireless extensions are for now a set of standard ioctl
+ * call + /proc/net/wireless
+ *
+ * The entry /proc/net/wireless give statistics and information on the
+ * driver.
+ * This is better than having each driver having its entry because
+ * its centralised and we may remove the driver module safely.
+ *
+ * Ioctl are used to configure the driver and issue commands.  This is
+ * better than command line options of insmod because we may want to
+ * change dynamically (while the driver is running) some parameters.
+ *
+ * The ioctl mechanimsm are copied from standard devices ioctl.
+ * We have the list of command plus a structure descibing the
+ * data exchanged...
+ * Note that to add these ioctl, I was obliged to modify :
+ *      # net/core/dev.c (two place + add include)
+ *      # net/ipv4/af_inet.c (one place + add include)
+ *
+ * /proc/net/wireless is a copy of /proc/net/dev.
+ * We have a structure for data passed from the driver to /proc/net/wireless
+ * Too add this, I've modified :
+ *      # net/core/dev.c (two other places)
+ *      # include/linux/netdevice.h (one place)
+ *      # include/linux/proc_fs.h (one place)
+ *
+ * New driver API (2002 -> onward) :
+ * -------------------------------
+ * This file is only concerned with the user space API and common definitions.
+ * The new driver API is defined and documented in :
+ *      # include/net/iw_handler.h
+ *
+ * Note as well that /proc/net/wireless implementation has now moved in :
+ *      # net/core/wireless.c
+ *
+ * Wireless Events (2002 -> onward) :
+ * --------------------------------
+ * Events are defined at the end of this file, and implemented in :
+ *      # net/core/wireless.c
+ *
+ * Other comments :
+ * --------------
+ * Do not add here things that are redundant with other mechanisms
+ * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
+ * wireless specific.
+ *
+ * These wireless extensions are not magic : each driver has to provide
+ * support for them...
+ *
+ * IMPORTANT NOTE : As everything in the kernel, this is very much a
+ * work in progress. Contact me if you have ideas of improvements...
+ */
+
+/***************************** INCLUDES *****************************/
+
+#include <linux/types.h>                /* for __u* and __s* typedefs */
+#include <linux/socket.h>               /* for "struct sockaddr" et al  */
+#include <linux/if.h>                   /* for IFNAMSIZ and co... */
+
+/***************************** VERSION *****************************/
+/*
+ * This constant is used to know the availability of the wireless
+ * extensions and to know which version of wireless extensions it is
+ * (there is some stuff that will be added in the future...)
+ * I just plan to increment with each new version.
+ */
+#define WIRELESS_EXT    22
+
+/*
+ * Changes :
+ *
+ * V2 to V3
+ * --------
+ *      Alan Cox start some incompatibles changes. I've integrated a bit more.
+ *      - Encryption renamed to Encode to avoid US regulation problems
+ *      - Frequency changed from float to struct to avoid problems on old 386
+ *
+ * V3 to V4
+ * --------
+ *      - Add sensitivity
+ *
+ * V4 to V5
+ * --------
+ *      - Missing encoding definitions in range
+ *      - Access points stuff
+ *
+ * V5 to V6
+ * --------
+ *      - 802.11 support (ESSID ioctls)
+ *
+ * V6 to V7
+ * --------
+ *      - define IW_ESSID_MAX_SIZE and IW_MAX_AP
+ *
+ * V7 to V8
+ * --------
+ *      - Changed my e-mail address
+ *      - More 802.11 support (nickname, rate, rts, frag)
+ *      - List index in frequencies
+ *
+ * V8 to V9
+ * --------
+ *      - Support for 'mode of operation' (ad-hoc, managed...)
+ *      - Support for unicast and multicast power saving
+ *      - Change encoding to support larger tokens (>64 bits)
+ *      - Updated iw_params (disable, flags) and use it for NWID
+ *      - Extracted iw_point from iwreq for clarity
+ *
+ * V9 to V10
+ * ---------
+ *      - Add PM capability to range structure
+ *      - Add PM modifier : MAX/MIN/RELATIVE
+ *      - Add encoding option : IW_ENCODE_NOKEY
+ *      - Add TxPower ioctls (work like TxRate)
+ *
+ * V10 to V11
+ * ----------
+ *      - Add WE version in range (help backward/forward compatibility)
+ *      - Add retry ioctls (work like PM)
+ *
+ * V11 to V12
+ * ----------
+ *      - Add SIOCSIWSTATS to get /proc/net/wireless programatically
+ *      - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
+ *      - Add new statistics (frag, retry, beacon)
+ *      - Add average quality (for user space calibration)
+ *
+ * V12 to V13
+ * ----------
+ *      - Document creation of new driver API.
+ *      - Extract union iwreq_data from struct iwreq (for new driver API).
+ *      - Rename SIOCSIWNAME as SIOCSIWCOMMIT
+ *
+ * V13 to V14
+ * ----------
+ *      - Wireless Events support : define struct iw_event
+ *      - Define additional specific event numbers
+ *      - Add "addr" and "param" fields in union iwreq_data
+ *      - AP scanning stuff (SIOCSIWSCAN and friends)
+ *
+ * V14 to V15
+ * ----------
+ *      - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
+ *      - Make struct iw_freq signed (both m & e), add explicit padding
+ *      - Add IWEVCUSTOM for driver specific event/scanning token
+ *      - Add IW_MAX_GET_SPY for driver returning a lot of addresses
+ *      - Add IW_TXPOW_RANGE for range of Tx Powers
+ *      - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
+ *      - Add IW_MODE_MONITOR for passive monitor
+ *
+ * V15 to V16
+ * ----------
+ *      - Increase the number of bitrates in iw_range to 32 (for 802.11g)
+ *      - Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
+ *      - Reshuffle struct iw_range for increases, add filler
+ *      - Increase IW_MAX_AP to 64 for driver returning a lot of addresses
+ *      - Remove IW_MAX_GET_SPY because conflict with enhanced spy support
+ *      - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
+ *      - Add IW_ENCODE_TEMP and iw_range->encoding_login_index
+ *
+ * V16 to V17
+ * ----------
+ *      - Add flags to frequency -> auto/fixed
+ *      - Document (struct iw_quality *)->updated, add new flags (INVALID)
+ *      - Wireless Event capability in struct iw_range
+ *      - Add support for relative TxPower (yick !)
+ *
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
+ * ----------
+ *      - Add support for WPA/WPA2
+ *      - Add extended encoding configuration (SIOCSIWENCODEEXT and
+ *        SIOCGIWENCODEEXT)
+ *      - Add SIOCSIWGENIE/SIOCGIWGENIE
+ *      - Add SIOCSIWMLME
+ *      - Add SIOCSIWPMKSA
+ *      - Add struct iw_range bit field for supported encoding capabilities
+ *      - Add optional scan request parameters for SIOCSIWSCAN
+ *      - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
+ *        related parameters (extensible up to 4096 parameter values)
+ *      - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
+ *        IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
+ *
+ * V18 to V19
+ * ----------
+ *      - Remove (struct iw_point *)->pointer from events and streams
+ *      - Remove header includes to help user space
+ *      - Increase IW_ENCODING_TOKEN_MAX from 32 to 64
+ *      - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
+ *      - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
+ *      - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
+ *
+ * V19 to V20
+ * ----------
+ *      - RtNetlink requests support (SET/GET)
+ *
+ * V20 to V21
+ * ----------
+ *      - Remove (struct net_device *)->get_wireless_stats()
+ *      - Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *      - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *      - Power/Retry relative values no longer * 100000
+ *      - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
+ *
+ * V21 to V22
+ * ----------
+ *      - Prevent leaking of kernel space in stream on 64 bits.
+ */
+
+/**************************** CONSTANTS ****************************/
+
+/* -------------------------- IOCTL LIST -------------------------- */
+
+/* Wireless Identification */
+#define SIOCSIWCOMMIT   0x8B00          /* Commit pending changes to driver */
+#define SIOCGIWNAME     0x8B01          /* get name == wireless protocol */
+/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
+ * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
+ * Don't put the name of your driver there, it's useless. */
+
+/* Basic operations */
+#define SIOCSIWNWID     0x8B02          /* set network id (pre-802.11) */
+#define SIOCGIWNWID     0x8B03          /* get network id (the cell) */
+#define SIOCSIWFREQ     0x8B04          /* set channel/frequency (Hz) */
+#define SIOCGIWFREQ     0x8B05          /* get channel/frequency (Hz) */
+#define SIOCSIWMODE     0x8B06          /* set operation mode */
+#define SIOCGIWMODE     0x8B07          /* get operation mode */
+#define SIOCSIWSENS     0x8B08          /* set sensitivity (dBm) */
+#define SIOCGIWSENS     0x8B09          /* get sensitivity (dBm) */
+
+/* Informative stuff */
+#define SIOCSIWRANGE    0x8B0A          /* Unused */
+#define SIOCGIWRANGE    0x8B0B          /* Get range of parameters */
+#define SIOCSIWPRIV     0x8B0C          /* Unused */
+#define SIOCGIWPRIV     0x8B0D          /* get private ioctl interface info */
+#define SIOCSIWSTATS    0x8B0E          /* Unused */
+#define SIOCGIWSTATS    0x8B0F          /* Get /proc/net/wireless stats */
+/* SIOCGIWSTATS is strictly used between user space and the kernel, and
+ * is never passed to the driver (i.e. the driver will never see it). */
+
+/* Spy support (statistics per MAC address - used for Mobile IP support) */
+#define SIOCSIWSPY      0x8B10          /* set spy addresses */
+#define SIOCGIWSPY      0x8B11          /* get spy info (quality of link) */
+#define SIOCSIWTHRSPY   0x8B12          /* set spy threshold (spy event) */
+#define SIOCGIWTHRSPY   0x8B13          /* get spy threshold */
+
+/* Access Point manipulation */
+#define SIOCSIWAP       0x8B14          /* set access point MAC addresses */
+#define SIOCGIWAP       0x8B15          /* get access point MAC addresses */
+#define SIOCGIWAPLIST   0x8B17          /* Deprecated in favor of scanning */
+#define SIOCSIWSCAN     0x8B18          /* trigger scanning (list cells) */
+#define SIOCGIWSCAN     0x8B19          /* get scanning results */
+
+/* 802.11 specific support */
+#define SIOCSIWESSID    0x8B1A          /* set ESSID (network name) */
+#define SIOCGIWESSID    0x8B1B          /* get ESSID */
+#define SIOCSIWNICKN    0x8B1C          /* set node name/nickname */
+#define SIOCGIWNICKN    0x8B1D          /* get node name/nickname */
+/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
+ * within the 'iwreq' structure, so we need to use the 'data' member to
+ * point to a string in user space, like it is done for RANGE... */
+
+/* Other parameters useful in 802.11 and some other devices */
+#define SIOCSIWRATE     0x8B20          /* set default bit rate (bps) */
+#define SIOCGIWRATE     0x8B21          /* get default bit rate (bps) */
+#define SIOCSIWRTS      0x8B22          /* set RTS/CTS threshold (bytes) */
+#define SIOCGIWRTS      0x8B23          /* get RTS/CTS threshold (bytes) */
+#define SIOCSIWFRAG     0x8B24          /* set fragmentation thr (bytes) */
+#define SIOCGIWFRAG     0x8B25          /* get fragmentation thr (bytes) */
+#define SIOCSIWTXPOW    0x8B26          /* set transmit power (dBm) */
+#define SIOCGIWTXPOW    0x8B27          /* get transmit power (dBm) */
+#define SIOCSIWRETRY    0x8B28          /* set retry limits and lifetime */
+#define SIOCGIWRETRY    0x8B29          /* get retry limits and lifetime */
+
+/* Encoding stuff (scrambling, hardware security, WEP...) */
+#define SIOCSIWENCODE   0x8B2A          /* set encoding token & mode */
+#define SIOCGIWENCODE   0x8B2B          /* get encoding token & mode */
+/* Power saving stuff (power management, unicast and multicast) */
+#define SIOCSIWPOWER    0x8B2C          /* set Power Management settings */
+#define SIOCGIWPOWER    0x8B2D          /* get Power Management settings */
+
+/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
+ * This ioctl uses struct iw_point and data buffer that includes IE id and len
+ * fields. More than one IE may be included in the request. Setting the generic
+ * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
+ * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
+ * are required to report the used IE as a wireless event, e.g., when
+ * associating with an AP. */
+#define SIOCSIWGENIE    0x8B30          /* set generic IE */
+#define SIOCGIWGENIE    0x8B31          /* get generic IE */
+
+/* WPA : IEEE 802.11 MLME requests */
+#define SIOCSIWMLME     0x8B16          /* request MLME operation; uses
+                                         * struct iw_mlme */
+/* WPA : Authentication mode parameters */
+#define SIOCSIWAUTH     0x8B32          /* set authentication mode params */
+#define SIOCGIWAUTH     0x8B33          /* get authentication mode params */
+
+/* WPA : Extended version of encoding configuration */
+#define SIOCSIWENCODEEXT 0x8B34         /* set encoding token & mode */
+#define SIOCGIWENCODEEXT 0x8B35         /* get encoding token & mode */
+
+/* WPA2 : PMKSA cache management */
+#define SIOCSIWPMKSA    0x8B36          /* PMKSA cache operation */
+
+/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
+
+/* These 32 ioctl are wireless device private, for 16 commands.
+ * Each driver is free to use them for whatever purpose it chooses,
+ * however the driver *must* export the description of those ioctls
+ * with SIOCGIWPRIV and *must* use arguments as defined below.
+ * If you don't follow those rules, DaveM is going to hate you (reason :
+ * it make mixed 32/64bit operation impossible).
+ */
+#define SIOCIWFIRSTPRIV 0x8BE0
+#define SIOCIWLASTPRIV  0x8BFF
+/* Previously, we were using SIOCDEVPRIVATE, but we now have our
+ * separate range because of collisions with other tools such as
+ * 'mii-tool'.
+ * We now have 32 commands, so a bit more space ;-).
+ * Also, all 'even' commands are only usable by root and don't return the
+ * content of ifr/iwr to user (but you are not obliged to use the set/get
+ * convention, just use every other two command). More details in iwpriv.c.
+ * And I repeat : you are not forced to use them with iwpriv, but you
+ * must be compliant with it.
+ */
+
+/* ------------------------- IOCTL STUFF ------------------------- */
+
+/* The first and the last (range) */
+#define SIOCIWFIRST     0x8B00
+#define SIOCIWLAST      SIOCIWLASTPRIV          /* 0x8BFF */
+#define IW_IOCTL_IDX(cmd)       ((cmd) - SIOCIWFIRST)
+#define IW_HANDLER(id, func)                    \
+        [IW_IOCTL_IDX(id)] = func
+
+/* Odd : get (world access), even : set (root access) */
+#define IW_IS_SET(cmd)  (!((cmd) & 0x1))
+#define IW_IS_GET(cmd)  ((cmd) & 0x1)
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/* Those are *NOT* ioctls, do not issue request on them !!! */
+/* Most events use the same identifier as ioctl requests */
+
+#define IWEVTXDROP      0x8C00          /* Packet dropped to excessive retry */
+#define IWEVQUAL        0x8C01          /* Quality part of statistics (scan) */
+#define IWEVCUSTOM      0x8C02          /* Driver specific ascii string */
+#define IWEVREGISTERED  0x8C03          /* Discovered a new node (AP mode) */
+#define IWEVEXPIRED     0x8C04          /* Expired a node (AP mode) */
+#define IWEVGENIE       0x8C05          /* Generic IE (WPA, RSN, WMM, ..)
+                                         * (scan results); This includes id and
+                                         * length fields. One IWEVGENIE may
+                                         * contain more than one IE. Scan
+                                         * results may contain one or more
+                                         * IWEVGENIE events. */
+#define IWEVMICHAELMICFAILURE 0x8C06    /* Michael MIC failure
+                                         * (struct iw_michaelmicfailure)
+                                         */
+#define IWEVASSOCREQIE  0x8C07          /* IEs used in (Re)Association Request.
+                                         * The data includes id and length
+                                         * fields and may contain more than one
+                                         * IE. This event is required in
+                                         * Managed mode if the driver
+                                         * generates its own WPA/RSN IE. This
+                                         * should be sent just before
+                                         * IWEVREGISTERED event for the
+                                         * association. */
+#define IWEVASSOCRESPIE 0x8C08          /* IEs used in (Re)Association
+                                         * Response. The data includes id and
+                                         * length fields and may contain more
+                                         * than one IE. This may be sent
+                                         * between IWEVASSOCREQIE and
+                                         * IWEVREGISTERED events for the
+                                         * association. */
+#define IWEVPMKIDCAND   0x8C09          /* PMKID candidate for RSN
+                                         * pre-authentication
+                                         * (struct iw_pmkid_cand) */
+
+#define IWEVFIRST       0x8C00
+#define IW_EVENT_IDX(cmd)       ((cmd) - IWEVFIRST)
+
+/* ------------------------- PRIVATE INFO ------------------------- */
+/*
+ * The following is used with SIOCGIWPRIV. It allow a driver to define
+ * the interface (name, type of data) for its private ioctl.
+ * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
+ */
+
+#define IW_PRIV_TYPE_MASK       0x7000  /* Type of arguments */
+#define IW_PRIV_TYPE_NONE       0x0000
+#define IW_PRIV_TYPE_BYTE       0x1000  /* Char as number */
+#define IW_PRIV_TYPE_CHAR       0x2000  /* Char as character */
+#define IW_PRIV_TYPE_INT        0x4000  /* 32 bits int */
+#define IW_PRIV_TYPE_FLOAT      0x5000  /* struct iw_freq */
+#define IW_PRIV_TYPE_ADDR       0x6000  /* struct sockaddr */
+
+#define IW_PRIV_SIZE_FIXED      0x0800  /* Variable or fixed number of args */
+
+#define IW_PRIV_SIZE_MASK       0x07FF  /* Max number of those args */
+
+/*
+ * Note : if the number of args is fixed and the size < 16 octets,
+ * instead of passing a pointer we will put args in the iwreq struct...
+ */
+
+/* ----------------------- OTHER CONSTANTS ----------------------- */
+
+/* Maximum frequencies in the range struct */
+#define IW_MAX_FREQUENCIES      32
+/* Note : if you have something like 80 frequencies,
+ * don't increase this constant and don't fill the frequency list.
+ * The user will be able to set by channel anyway... */
+
+/* Maximum bit rates in the range struct */
+#define IW_MAX_BITRATES         32
+
+/* Maximum tx powers in the range struct */
+#define IW_MAX_TXPOWER          8
+/* Note : if you more than 8 TXPowers, just set the max and min or
+ * a few of them in the struct iw_range. */
+
+/* Maximum of address that you may set with SPY */
+#define IW_MAX_SPY              8
+
+/* Maximum of address that you may get in the
+   list of access points in range */
+#define IW_MAX_AP               64
+
+/* Maximum size of the ESSID and NICKN strings */
+#define IW_ESSID_MAX_SIZE       32
+
+/* Modes of operation */
+#define IW_MODE_AUTO    0       /* Let the driver decides */
+#define IW_MODE_ADHOC   1       /* Single cell network */
+#define IW_MODE_INFRA   2       /* Multi cell network, roaming, ... */
+#define IW_MODE_MASTER  3       /* Synchronisation master or Access Point */
+#define IW_MODE_REPEAT  4       /* Wireless Repeater (forwarder) */
+#define IW_MODE_SECOND  5       /* Secondary master/repeater (backup) */
+#define IW_MODE_MONITOR 6       /* Passive monitor (listen only) */
+#define IW_MODE_MESH    7       /* Mesh (IEEE 802.11s) network */
+
+/* Statistics flags (bitmask in updated) */
+#define IW_QUAL_QUAL_UPDATED    0x01    /* Value was updated since last read */
+#define IW_QUAL_LEVEL_UPDATED   0x02
+#define IW_QUAL_NOISE_UPDATED   0x04
+#define IW_QUAL_ALL_UPDATED     0x07
+#define IW_QUAL_DBM             0x08    /* Level + Noise are dBm */
+#define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
+#define IW_QUAL_LEVEL_INVALID   0x20
+#define IW_QUAL_NOISE_INVALID   0x40
+#define IW_QUAL_RCPI            0x80    /* Level + Noise are 802.11k RCPI */
+#define IW_QUAL_ALL_INVALID     0x70
+
+/* Frequency flags */
+#define IW_FREQ_AUTO            0x00    /* Let the driver decides */
+#define IW_FREQ_FIXED           0x01    /* Force a specific value */
+
+/* Maximum number of size of encoding token available
+ * they are listed in the range structure */
+#define IW_MAX_ENCODING_SIZES   8
+
+/* Maximum size of the encoding token in bytes */
+#define IW_ENCODING_TOKEN_MAX   64      /* 512 bits (for now) */
+
+/* Flags for encoding (along with the token) */
+#define IW_ENCODE_INDEX         0x00FF  /* Token index (if needed) */
+#define IW_ENCODE_FLAGS         0xFF00  /* Flags defined below */
+#define IW_ENCODE_MODE          0xF000  /* Modes defined below */
+#define IW_ENCODE_DISABLED      0x8000  /* Encoding disabled */
+#define IW_ENCODE_ENABLED       0x0000  /* Encoding enabled */
+#define IW_ENCODE_RESTRICTED    0x4000  /* Refuse non-encoded packets */
+#define IW_ENCODE_OPEN          0x2000  /* Accept non-encoded packets */
+#define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not present */
+#define IW_ENCODE_TEMP          0x0400  /* Temporary key */
+
+/* Power management flags available (along with the value, if any) */
+#define IW_POWER_ON             0x0000  /* No details... */
+#define IW_POWER_TYPE           0xF000  /* Type of parameter */
+#define IW_POWER_PERIOD         0x1000  /* Value is a period/duration of  */
+#define IW_POWER_TIMEOUT        0x2000  /* Value is a timeout (to go asleep) */
+#define IW_POWER_MODE           0x0F00  /* Power Management mode */
+#define IW_POWER_UNICAST_R      0x0100  /* Receive only unicast messages */
+#define IW_POWER_MULTICAST_R    0x0200  /* Receive only multicast messages */
+#define IW_POWER_ALL_R          0x0300  /* Receive all messages though PM */
+#define IW_POWER_FORCE_S        0x0400  /* Force PM procedure for sending unicast */
+#define IW_POWER_REPEATER       0x0800  /* Repeat broadcast messages in PM period */
+#define IW_POWER_MODIFIER       0x000F  /* Modify a parameter */
+#define IW_POWER_MIN            0x0001  /* Value is a minimum  */
+#define IW_POWER_MAX            0x0002  /* Value is a maximum */
+#define IW_POWER_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
+
+/* Transmit Power flags available */
+#define IW_TXPOW_TYPE           0x00FF  /* Type of value */
+#define IW_TXPOW_DBM            0x0000  /* Value is in dBm */
+#define IW_TXPOW_MWATT          0x0001  /* Value is in mW */
+#define IW_TXPOW_RELATIVE       0x0002  /* Value is in arbitrary units */
+#define IW_TXPOW_RANGE          0x1000  /* Range of value between min/max */
+
+/* Retry limits and lifetime flags available */
+#define IW_RETRY_ON             0x0000  /* No details... */
+#define IW_RETRY_TYPE           0xF000  /* Type of parameter */
+#define IW_RETRY_LIMIT          0x1000  /* Maximum number of retries*/
+#define IW_RETRY_LIFETIME       0x2000  /* Maximum duration of retries in us */
+#define IW_RETRY_MODIFIER       0x00FF  /* Modify a parameter */
+#define IW_RETRY_MIN            0x0001  /* Value is a minimum  */
+#define IW_RETRY_MAX            0x0002  /* Value is a maximum */
+#define IW_RETRY_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT          0x0010  /* Value is for short packets  */
+#define IW_RETRY_LONG           0x0020  /* Value is for long packets */
+
+/* Scanning request flags */
+#define IW_SCAN_DEFAULT         0x0000  /* Default scan of the driver */
+#define IW_SCAN_ALL_ESSID       0x0001  /* Scan all ESSIDs */
+#define IW_SCAN_THIS_ESSID      0x0002  /* Scan only this ESSID */
+#define IW_SCAN_ALL_FREQ        0x0004  /* Scan all Frequencies */
+#define IW_SCAN_THIS_FREQ       0x0008  /* Scan only this Frequency */
+#define IW_SCAN_ALL_MODE        0x0010  /* Scan all Modes */
+#define IW_SCAN_THIS_MODE       0x0020  /* Scan only this Mode */
+#define IW_SCAN_ALL_RATE        0x0040  /* Scan all Bit-Rates */
+#define IW_SCAN_THIS_RATE       0x0080  /* Scan only this Bit-Rate */
+/* struct iw_scan_req scan_type */
+#define IW_SCAN_TYPE_ACTIVE 0
+#define IW_SCAN_TYPE_PASSIVE 1
+/* Maximum size of returned data */
+#define IW_SCAN_MAX_DATA        4096    /* In bytes */
+
+/* Scan capability flags - in (struct iw_range *)->scan_capa */
+#define IW_SCAN_CAPA_NONE               0x00
+#define IW_SCAN_CAPA_ESSID              0x01
+#define IW_SCAN_CAPA_BSSID              0x02
+#define IW_SCAN_CAPA_CHANNEL    0x04
+#define IW_SCAN_CAPA_MODE               0x08
+#define IW_SCAN_CAPA_RATE               0x10
+#define IW_SCAN_CAPA_TYPE               0x20
+#define IW_SCAN_CAPA_TIME               0x40
+
+/* Max number of char in custom event - use multiple of them if needed */
+#define IW_CUSTOM_MAX           256     /* In bytes */
+
+/* Generic information element */
+#define IW_GENERIC_IE_MAX       1024
+
+/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
+#define IW_MLME_DEAUTH          0
+#define IW_MLME_DISASSOC        1
+#define IW_MLME_AUTH            2
+#define IW_MLME_ASSOC           3
+
+/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
+#define IW_AUTH_INDEX           0x0FFF
+#define IW_AUTH_FLAGS           0xF000
+/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
+ * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
+ * parameter that is being set/get to; value will be read/written to
+ * struct iw_param value field) */
+#define IW_AUTH_WPA_VERSION             0
+#define IW_AUTH_CIPHER_PAIRWISE         1
+#define IW_AUTH_CIPHER_GROUP            2
+#define IW_AUTH_KEY_MGMT                3
+#define IW_AUTH_TKIP_COUNTERMEASURES    4
+#define IW_AUTH_DROP_UNENCRYPTED        5
+#define IW_AUTH_80211_AUTH_ALG          6
+#define IW_AUTH_WPA_ENABLED             7
+#define IW_AUTH_RX_UNENCRYPTED_EAPOL    8
+#define IW_AUTH_ROAMING_CONTROL         9
+#define IW_AUTH_PRIVACY_INVOKED         10
+#define IW_AUTH_CIPHER_GROUP_MGMT       11
+#define IW_AUTH_MFP                     12
+
+/* IW_AUTH_WPA_VERSION values (bit field) */
+#define IW_AUTH_WPA_VERSION_DISABLED    0x00000001
+#define IW_AUTH_WPA_VERSION_WPA         0x00000002
+#define IW_AUTH_WPA_VERSION_WPA2        0x00000004
+
+/* IW_AUTH_PAIRWISE_CIPHER, IW_AUTH_GROUP_CIPHER, and IW_AUTH_CIPHER_GROUP_MGMT
+ * values (bit field) */
+#define IW_AUTH_CIPHER_NONE     0x00000001
+#define IW_AUTH_CIPHER_WEP40    0x00000002
+#define IW_AUTH_CIPHER_TKIP     0x00000004
+#define IW_AUTH_CIPHER_CCMP     0x00000008
+#define IW_AUTH_CIPHER_WEP104   0x00000010
+#define IW_AUTH_CIPHER_AES_CMAC 0x00000020
+
+/* IW_AUTH_KEY_MGMT values (bit field) */
+#define IW_AUTH_KEY_MGMT_802_1X 1
+#define IW_AUTH_KEY_MGMT_PSK    2
+
+/* IW_AUTH_80211_AUTH_ALG values (bit field) */
+#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001
+#define IW_AUTH_ALG_SHARED_KEY  0x00000002
+#define IW_AUTH_ALG_LEAP        0x00000004
+
+/* IW_AUTH_ROAMING_CONTROL values */
+#define IW_AUTH_ROAMING_ENABLE  0       /* driver/firmware based roaming */
+#define IW_AUTH_ROAMING_DISABLE 1       /* user space program used for roaming
+                                         * control */
+
+/* IW_AUTH_MFP (management frame protection) values */
+#define IW_AUTH_MFP_DISABLED    0       /* MFP disabled */
+#define IW_AUTH_MFP_OPTIONAL    1       /* MFP optional */
+#define IW_AUTH_MFP_REQUIRED    2       /* MFP required */
+
+/* SIOCSIWENCODEEXT definitions */
+#define IW_ENCODE_SEQ_MAX_SIZE  8
+/* struct iw_encode_ext ->alg */
+#define IW_ENCODE_ALG_NONE      0
+#define IW_ENCODE_ALG_WEP       1
+#define IW_ENCODE_ALG_TKIP      2
+#define IW_ENCODE_ALG_CCMP      3
+#define IW_ENCODE_ALG_PMK       4
+#define IW_ENCODE_ALG_AES_CMAC  5
+/* struct iw_encode_ext ->ext_flags */
+#define IW_ENCODE_EXT_TX_SEQ_VALID      0x00000001
+#define IW_ENCODE_EXT_RX_SEQ_VALID      0x00000002
+#define IW_ENCODE_EXT_GROUP_KEY         0x00000004
+#define IW_ENCODE_EXT_SET_TX_KEY        0x00000008
+
+/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
+#define IW_MICFAILURE_KEY_ID    0x00000003 /* Key ID 0..3 */
+#define IW_MICFAILURE_GROUP     0x00000004
+#define IW_MICFAILURE_PAIRWISE  0x00000008
+#define IW_MICFAILURE_STAKEY    0x00000010
+#define IW_MICFAILURE_COUNT     0x00000060 /* 1 or 2 (0 = count not supported)
+                                            */
+
+/* Bit field values for enc_capa in struct iw_range */
+#define IW_ENC_CAPA_WPA         0x00000001
+#define IW_ENC_CAPA_WPA2        0x00000002
+#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004
+#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008
+#define IW_ENC_CAPA_4WAY_HANDSHAKE      0x00000010
+
+/* Event capability macros - in (struct iw_range *)->event_capa
+ * Because we have more than 32 possible events, we use an array of
+ * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
+#define IW_EVENT_CAPA_BASE(cmd)         ((cmd >= SIOCIWFIRSTPRIV) ? \
+                                         (cmd - SIOCIWFIRSTPRIV + 0x60) : \
+                                         (cmd - SIOCIWFIRST))
+#define IW_EVENT_CAPA_INDEX(cmd)        (IW_EVENT_CAPA_BASE(cmd) >> 5)
+#define IW_EVENT_CAPA_MASK(cmd)         (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
+/* Event capability constants - event autogenerated by the kernel
+ * This list is valid for most 802.11 devices, customise as needed... */
+#define IW_EVENT_CAPA_K_0       (IW_EVENT_CAPA_MASK(0x8B04) | \
+                                 IW_EVENT_CAPA_MASK(0x8B06) | \
+                                 IW_EVENT_CAPA_MASK(0x8B1A))
+#define IW_EVENT_CAPA_K_1       (IW_EVENT_CAPA_MASK(0x8B2A))
+/* "Easy" macro to set events in iw_range (less efficient) */
+#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
+#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
+
+
+/****************************** TYPES ******************************/
+
+/* --------------------------- SUBTYPES --------------------------- */
+/*
+ *      Generic format for most parameters that fit in an int
+ */
+struct  iw_param
+{
+  __s32         value;          /* The value of the parameter itself */
+  __u8          fixed;          /* Hardware should not use auto select */
+  __u8          disabled;       /* Disable the feature */
+  __u16         flags;          /* Various specifc flags (if any) */
+};
+
+/*
+ *      For all data larger than 16 octets, we need to use a
+ *      pointer to memory allocated in user space.
+ */
+struct  iw_point
+{
+  void __user   *pointer;       /* Pointer to the data  (in user space) */
+  __u16         length;         /* number of fields or size in bytes */
+  __u16         flags;          /* Optional params */
+};
+
+
+/*
+ *      A frequency
+ *      For numbers lower than 10^9, we encode the number in 'm' and
+ *      set 'e' to 0
+ *      For number greater than 10^9, we divide it by the lowest power
+ *      of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
+ *      The power of 10 is in 'e', the result of the division is in 'm'.
+ */
+struct  iw_freq
+{
+        __s32           m;              /* Mantissa */
+        __s16           e;              /* Exponent */
+        __u8            i;              /* List index (when in range struct) */
+        __u8            flags;          /* Flags (fixed/auto) */
+};
+
+/*
+ *      Quality of the link
+ */
+struct  iw_quality
+{
+        __u8            qual;           /* link quality (%retries, SNR,
+                                           %missed beacons or better...) */
+        __u8            level;          /* signal level (dBm) */
+        __u8            noise;          /* noise level (dBm) */
+        __u8            updated;        /* Flags to know if updated */
+};
+
+/*
+ *      Packet discarded in the wireless adapter due to
+ *      "wireless" specific problems...
+ *      Note : the list of counter and statistics in net_device_stats
+ *      is already pretty exhaustive, and you should use that first.
+ *      This is only additional stats...
+ */
+struct  iw_discarded
+{
+        __u32           nwid;           /* Rx : Wrong nwid/essid */
+        __u32           code;           /* Rx : Unable to code/decode (WEP) */
+        __u32           fragment;       /* Rx : Can't perform MAC reassembly */
+        __u32           retries;        /* Tx : Max MAC retries num reached */
+        __u32           misc;           /* Others cases */
+};
+
+/*
+ *      Packet/Time period missed in the wireless adapter due to
+ *      "wireless" specific problems...
+ */
+struct  iw_missed
+{
+        __u32           beacon;         /* Missed beacons/superframe */
+};
+
+/*
+ *      Quality range (for spy threshold)
+ */
+struct  iw_thrspy
+{
+        struct sockaddr         addr;           /* Source address (hw/mac) */
+        struct iw_quality       qual;           /* Quality of the link */
+        struct iw_quality       low;            /* Low threshold */
+        struct iw_quality       high;           /* High threshold */
+};
+
+/*
+ *      Optional data for scan request
+ *
+ *      Note: these optional parameters are controlling parameters for the
+ *      scanning behavior, these do not apply to getting scan results
+ *      (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
+ *      provide a merged results with all BSSes even if the previous scan
+ *      request limited scanning to a subset, e.g., by specifying an SSID.
+ *      Especially, scan results are required to include an entry for the
+ *      current BSS if the driver is in Managed mode and associated with an AP.
+ */
+struct  iw_scan_req
+{
+        __u8            scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
+        __u8            essid_len;
+        __u8            num_channels; /* num entries in channel_list;
+                                       * 0 = scan all allowed channels */
+        __u8            flags; /* reserved as padding; use zero, this may
+                                * be used in the future for adding flags
+                                * to request different scan behavior */
+        struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
+                                * individual address of a specific BSS */
+
+        /*
+         * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
+         * the current ESSID. This allows scan requests for specific ESSID
+         * without having to change the current ESSID and potentially breaking
+         * the current association.
+         */
+        __u8            essid[IW_ESSID_MAX_SIZE];
+
+        /*
+         * Optional parameters for changing the default scanning behavior.
+         * These are based on the MLME-SCAN.request from IEEE Std 802.11.
+         * TU is 1.024 ms. If these are set to 0, driver is expected to use
+         * reasonable default values. min_channel_time defines the time that
+         * will be used to wait for the first reply on each channel. If no
+         * replies are received, next channel will be scanned after this. If
+         * replies are received, total time waited on the channel is defined by
+         * max_channel_time.
+         */
+        __u32           min_channel_time; /* in TU */
+        __u32           max_channel_time; /* in TU */
+
+        struct iw_freq  channel_list[IW_MAX_FREQUENCIES];
+};
+
+/* ------------------------- WPA SUPPORT ------------------------- */
+
+/*
+ *      Extended data structure for get/set encoding (this is used with
+ *      SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
+ *      flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
+ *      only the data contents changes (key data -> this structure, including
+ *      key data).
+ *
+ *      If the new key is the first group key, it will be set as the default
+ *      TX key. Otherwise, default TX key index is only changed if
+ *      IW_ENCODE_EXT_SET_TX_KEY flag is set.
+ *
+ *      Key will be changed with SIOCSIWENCODEEXT in all cases except for
+ *      special "change TX key index" operation which is indicated by setting
+ *      key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
+ *
+ *      tx_seq/rx_seq are only used when respective
+ *      IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
+ *      TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
+ *      TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
+ *      used only by an Authenticator (AP or an IBSS station) to get the
+ *      current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
+ *      RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
+ *      debugging/testing.
+ */
+struct  iw_encode_ext
+{
+        __u32           ext_flags; /* IW_ENCODE_EXT_* */
+        __u8            tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+        __u8            rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+        struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
+                               * (group) keys or unicast address for
+                               * individual keys */
+        __u16           alg; /* IW_ENCODE_ALG_* */
+        __u16           key_len;
+        __u8            key[0];
+};
+
+/* SIOCSIWMLME data */
+struct  iw_mlme
+{
+        __u16           cmd; /* IW_MLME_* */
+        __u16           reason_code;
+        struct sockaddr addr;
+};
+
+/* SIOCSIWPMKSA data */
+#define IW_PMKSA_ADD            1
+#define IW_PMKSA_REMOVE         2
+#define IW_PMKSA_FLUSH          3
+
+#define IW_PMKID_LEN    16
+
+struct  iw_pmksa
+{
+        __u32           cmd; /* IW_PMKSA_* */
+        struct sockaddr bssid;
+        __u8            pmkid[IW_PMKID_LEN];
+};
+
+/* IWEVMICHAELMICFAILURE data */
+struct  iw_michaelmicfailure
+{
+        __u32           flags;
+        struct sockaddr src_addr;
+        __u8            tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+};
+
+/* IWEVPMKIDCAND data */
+#define IW_PMKID_CAND_PREAUTH   0x00000001 /* RNS pre-authentication enabled */
+struct  iw_pmkid_cand
+{
+        __u32           flags; /* IW_PMKID_CAND_* */
+        __u32           index; /* the smaller the index, the higher the
+                                * priority */
+        struct sockaddr bssid;
+};
+
+/* ------------------------ WIRELESS STATS ------------------------ */
+/*
+ * Wireless statistics (used for /proc/net/wireless)
+ */
+struct  iw_statistics
+{
+        __u16           status;         /* Status
+                                         * - device dependent for now */
+
+        struct iw_quality       qual;           /* Quality of the link
+                                                 * (instant/mean/max) */
+        struct iw_discarded     discard;        /* Packet discarded counts */
+        struct iw_missed        miss;           /* Packet missed counts */
+};
+
+/* ------------------------ IOCTL REQUEST ------------------------ */
+/*
+ * This structure defines the payload of an ioctl, and is used 
+ * below.
+ *
+ * Note that this structure should fit on the memory footprint
+ * of iwreq (which is the same as ifreq), which mean a max size of
+ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
+ * You should check this when increasing the structures defined
+ * above in this file...
+ */
+union   iwreq_data
+{
+        /* Config - generic */
+        char            name[IFNAMSIZ];
+        /* Name : used to verify the presence of  wireless extensions.
+         * Name of the protocol/provider... */
+
+        struct iw_point essid;          /* Extended network name */
+        struct iw_param nwid;           /* network id (or domain - the cell) */
+        struct iw_freq  freq;           /* frequency or channel :
+                                         * 0-1000 = channel
+                                         * > 1000 = frequency in Hz */
+
+        struct iw_param sens;           /* signal level threshold */
+        struct iw_param bitrate;        /* default bit rate */
+        struct iw_param txpower;        /* default transmit power */
+        struct iw_param rts;            /* RTS threshold threshold */
+        struct iw_param frag;           /* Fragmentation threshold */
+        __u32           mode;           /* Operation mode */
+        struct iw_param retry;          /* Retry limits & lifetime */
+
+        struct iw_point encoding;       /* Encoding stuff : tokens */
+        struct iw_param power;          /* PM duration/timeout */
+        struct iw_quality qual;         /* Quality part of statistics */
+
+        struct sockaddr ap_addr;        /* Access point address */
+        struct sockaddr addr;           /* Destination address (hw/mac) */
+
+        struct iw_param param;          /* Other small parameters */
+        struct iw_point data;           /* Other large parameters */
+};
+
+/*
+ * The structure to exchange data for ioctl.
+ * This structure is the same as 'struct ifreq', but (re)defined for
+ * convenience...
+ * Do I need to remind you about structure size (32 octets) ?
+ */
+struct  iwreq 
+{
+        union
+        {
+                char    ifrn_name[IFNAMSIZ];    /* if name, e.g. "eth0" */
+        } ifr_ifrn;
+
+        /* Data part (defined just above) */
+        union   iwreq_data      u;
+};
+
+/* -------------------------- IOCTL DATA -------------------------- */
+/*
+ *      For those ioctl which want to exchange mode data that what could
+ *      fit in the above structure...
+ */
+
+/*
+ *      Range of parameters
+ */
+
+struct  iw_range
+{
+        /* Informative stuff (to choose between different interface) */
+        __u32           throughput;     /* To give an idea... */
+        /* In theory this value should be the maximum benchmarked
+         * TCP/IP throughput, because with most of these devices the
+         * bit rate is meaningless (overhead an co) to estimate how
+         * fast the connection will go and pick the fastest one.
+         * I suggest people to play with Netperf or any benchmark...
+         */
+
+        /* NWID (or domain id) */
+        __u32           min_nwid;       /* Minimal NWID we are able to set */
+        __u32           max_nwid;       /* Maximal NWID we are able to set */
+
+        /* Old Frequency (backward compat - moved lower ) */
+        __u16           old_num_channels;
+        __u8            old_num_frequency;
+
+        /* Scan capabilities */
+        __u8            scan_capa;      /* IW_SCAN_CAPA_* bit field */
+
+        /* Wireless event capability bitmasks */
+        __u32           event_capa[6];
+
+        /* signal level threshold range */
+        __s32           sensitivity;
+
+        /* Quality of link & SNR stuff */
+        /* Quality range (link, level, noise)
+         * If the quality is absolute, it will be in the range [0 ; max_qual],
+         * if the quality is dBm, it will be in the range [max_qual ; 0].
+         * Don't forget that we use 8 bit arithmetics... */
+        struct iw_quality       max_qual;       /* Quality of the link */
+        /* This should contain the average/typical values of the quality
+         * indicator. This should be the threshold between a "good" and
+         * a "bad" link (example : monitor going from green to orange).
+         * Currently, user space apps like quality monitors don't have any
+         * way to calibrate the measurement. With this, they can split
+         * the range between 0 and max_qual in different quality level
+         * (using a geometric subdivision centered on the average).
+         * I expect that people doing the user space apps will feedback
+         * us on which value we need to put in each driver... */
+        struct iw_quality       avg_qual;       /* Quality of the link */
+
+        /* Rates */
+        __u8            num_bitrates;   /* Number of entries in the list */
+        __s32           bitrate[IW_MAX_BITRATES];       /* list, in bps */
+
+        /* RTS threshold */
+        __s32           min_rts;        /* Minimal RTS threshold */
+        __s32           max_rts;        /* Maximal RTS threshold */
+
+        /* Frag threshold */
+        __s32           min_frag;       /* Minimal frag threshold */
+        __s32           max_frag;       /* Maximal frag threshold */
+
+        /* Power Management duration & timeout */
+        __s32           min_pmp;        /* Minimal PM period */
+        __s32           max_pmp;        /* Maximal PM period */
+        __s32           min_pmt;        /* Minimal PM timeout */
+        __s32           max_pmt;        /* Maximal PM timeout */
+        __u16           pmp_flags;      /* How to decode max/min PM period */
+        __u16           pmt_flags;      /* How to decode max/min PM timeout */
+        __u16           pm_capa;        /* What PM options are supported */
+
+        /* Encoder stuff */
+        __u16   encoding_size[IW_MAX_ENCODING_SIZES];   /* Different token sizes */
+        __u8    num_encoding_sizes;     /* Number of entry in the list */
+        __u8    max_encoding_tokens;    /* Max number of tokens */
+        /* For drivers that need a "login/passwd" form */
+        __u8    encoding_login_index;   /* token index for login token */
+
+        /* Transmit power */
+        __u16           txpower_capa;   /* What options are supported */
+        __u8            num_txpower;    /* Number of entries in the list */
+        __s32           txpower[IW_MAX_TXPOWER];        /* list, in bps */
+
+        /* Wireless Extension version info */
+        __u8            we_version_compiled;    /* Must be WIRELESS_EXT */
+        __u8            we_version_source;      /* Last update of source */
+
+        /* Retry limits and lifetime */
+        __u16           retry_capa;     /* What retry options are supported */
+        __u16           retry_flags;    /* How to decode max/min retry limit */
+        __u16           r_time_flags;   /* How to decode max/min retry life */
+        __s32           min_retry;      /* Minimal number of retries */
+        __s32           max_retry;      /* Maximal number of retries */
+        __s32           min_r_time;     /* Minimal retry lifetime */
+        __s32           max_r_time;     /* Maximal retry lifetime */
+
+        /* Frequency */
+        __u16           num_channels;   /* Number of channels [0; num - 1] */
+        __u8            num_frequency;  /* Number of entry in the list */
+        struct iw_freq  freq[IW_MAX_FREQUENCIES];       /* list */
+        /* Note : this frequency list doesn't need to fit channel numbers,
+         * because each entry contain its channel index */
+
+        __u32           enc_capa;       /* IW_ENC_CAPA_* bit field */
+};
+
+/*
+ * Private ioctl interface information
+ */
+ 
+struct  iw_priv_args
+{
+        __u32           cmd;            /* Number of the ioctl to issue */
+        __u16           set_args;       /* Type and number of args */
+        __u16           get_args;       /* Type and number of args */
+        char            name[IFNAMSIZ]; /* Name of the extension */
+};
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/*
+ * Wireless events are carried through the rtnetlink socket to user
+ * space. They are encapsulated in the IFLA_WIRELESS field of
+ * a RTM_NEWLINK message.
+ */
+
+/*
+ * A Wireless Event. Contains basically the same data as the ioctl...
+ */
+struct iw_event
+{
+        __u16           len;                    /* Real length of this stuff */
+        __u16           cmd;                    /* Wireless IOCTL */
+        union iwreq_data        u;              /* IOCTL fixed payload */
+};
+
+/* Size of the Event prefix (including padding and alignement junk) */
+#define IW_EV_LCP_LEN   (sizeof(struct iw_event) - sizeof(union iwreq_data))
+/* Size of the various events */
+#define IW_EV_CHAR_LEN  (IW_EV_LCP_LEN + IFNAMSIZ)
+#define IW_EV_UINT_LEN  (IW_EV_LCP_LEN + sizeof(__u32))
+#define IW_EV_FREQ_LEN  (IW_EV_LCP_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_LEN  (IW_EV_LCP_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_LEN  (IW_EV_LCP_LEN + sizeof(struct iw_quality))
+
+/* iw_point events are special. First, the payload (extra data) come at
+ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
+ * we omit the pointer, so start at an offset. */
+#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
+                          (char *) NULL)
+#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \
+                         IW_EV_POINT_OFF)
+
+
+/* Size of the Event prefix when packed in stream */
+#define IW_EV_LCP_PK_LEN        (4)
+/* Size of the various events when packed in stream */
+#define IW_EV_CHAR_PK_LEN       (IW_EV_LCP_PK_LEN + IFNAMSIZ)
+#define IW_EV_UINT_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(__u32))
+#define IW_EV_FREQ_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_PK_LEN      (IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
+#define IW_EV_POINT_PK_LEN      (IW_EV_LCP_PK_LEN + 4)
+
+#endif /* _UAPI_LINUX_WIRELESS_H */
diff --git a/include/linux/x25.h b/include/uapi/linux/x25.h
index 810cce6737ea..810cce6737ea 100644
--- a/include/linux/x25.h
+++ b/include/uapi/linux/x25.h
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
new file mode 100644
index 000000000000..26607bd965fa
--- /dev/null
+++ b/include/uapi/linux/xattr.h
@@ -0,0 +1,64 @@
+/*
+  File: linux/xattr.h
+
+  Extended attributes handling.
+
+  Copyright (C) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org>
+  Copyright (c) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
+  Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
+*/
+#ifndef _UAPI_LINUX_XATTR_H
+#define _UAPI_LINUX_XATTR_H
+
+#define XATTR_CREATE    0x1     /* set value, fail if attr already exists */
+#define XATTR_REPLACE   0x2     /* set value, fail if attr does not exist */
+
+/* Namespaces */
+#define XATTR_OS2_PREFIX "os2."
+#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
+
+#define XATTR_SECURITY_PREFIX   "security."
+#define XATTR_SECURITY_PREFIX_LEN (sizeof (XATTR_SECURITY_PREFIX) - 1)
+
+#define XATTR_SYSTEM_PREFIX "system."
+#define XATTR_SYSTEM_PREFIX_LEN (sizeof (XATTR_SYSTEM_PREFIX) - 1)
+
+#define XATTR_TRUSTED_PREFIX "trusted."
+#define XATTR_TRUSTED_PREFIX_LEN (sizeof (XATTR_TRUSTED_PREFIX) - 1)
+
+#define XATTR_USER_PREFIX "user."
+#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
+
+/* Security namespace */
+#define XATTR_EVM_SUFFIX "evm"
+#define XATTR_NAME_EVM XATTR_SECURITY_PREFIX XATTR_EVM_SUFFIX
+
+#define XATTR_IMA_SUFFIX "ima"
+#define XATTR_NAME_IMA XATTR_SECURITY_PREFIX XATTR_IMA_SUFFIX
+
+#define XATTR_SELINUX_SUFFIX "selinux"
+#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
+
+#define XATTR_SMACK_SUFFIX "SMACK64"
+#define XATTR_SMACK_IPIN "SMACK64IPIN"
+#define XATTR_SMACK_IPOUT "SMACK64IPOUT"
+#define XATTR_SMACK_EXEC "SMACK64EXEC"
+#define XATTR_SMACK_TRANSMUTE "SMACK64TRANSMUTE"
+#define XATTR_SMACK_MMAP "SMACK64MMAP"
+#define XATTR_NAME_SMACK XATTR_SECURITY_PREFIX XATTR_SMACK_SUFFIX
+#define XATTR_NAME_SMACKIPIN    XATTR_SECURITY_PREFIX XATTR_SMACK_IPIN
+#define XATTR_NAME_SMACKIPOUT   XATTR_SECURITY_PREFIX XATTR_SMACK_IPOUT
+#define XATTR_NAME_SMACKEXEC    XATTR_SECURITY_PREFIX XATTR_SMACK_EXEC
+#define XATTR_NAME_SMACKTRANSMUTE XATTR_SECURITY_PREFIX XATTR_SMACK_TRANSMUTE
+#define XATTR_NAME_SMACKMMAP XATTR_SECURITY_PREFIX XATTR_SMACK_MMAP
+
+#define XATTR_CAPS_SUFFIX "capability"
+#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
+
+#define XATTR_POSIX_ACL_ACCESS  "posix_acl_access"
+#define XATTR_NAME_POSIX_ACL_ACCESS XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_ACCESS
+#define XATTR_POSIX_ACL_DEFAULT  "posix_acl_default"
+#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
+
+
+#endif /* _UAPI_LINUX_XATTR_H */
diff --git a/include/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 28e493b5b94c..28e493b5b94c 100644
--- a/include/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild
index aafaa5aa54d4..5a691e10cd0e 100644
--- a/include/uapi/mtd/Kbuild
+++ b/include/uapi/mtd/Kbuild
@@ -1 +1,6 @@
 # UAPI Header export list
+header-y += inftl-user.h
+header-y += mtd-abi.h
+header-y += mtd-user.h
+header-y += nftl-user.h
+header-y += ubi-user.h
diff --git a/include/mtd/inftl-user.h b/include/uapi/mtd/inftl-user.h
index 8376bd1a9e01..8376bd1a9e01 100644
--- a/include/mtd/inftl-user.h
+++ b/include/uapi/mtd/inftl-user.h
diff --git a/include/mtd/mtd-abi.h b/include/uapi/mtd/mtd-abi.h
index 36eace03b2ac..36eace03b2ac 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/uapi/mtd/mtd-abi.h
diff --git a/include/mtd/mtd-user.h b/include/uapi/mtd/mtd-user.h
index 83327c808c86..83327c808c86 100644
--- a/include/mtd/mtd-user.h
+++ b/include/uapi/mtd/mtd-user.h
diff --git a/include/mtd/nftl-user.h b/include/uapi/mtd/nftl-user.h
index bdeabd86ad99..bdeabd86ad99 100644
--- a/include/mtd/nftl-user.h
+++ b/include/uapi/mtd/nftl-user.h
diff --git a/include/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
index 53cae1e11e57..53cae1e11e57 100644
--- a/include/mtd/ubi-user.h
+++ b/include/uapi/mtd/ubi-user.h
diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild
index aafaa5aa54d4..61257cb14653 100644
--- a/include/uapi/xen/Kbuild
+++ b/include/uapi/xen/Kbuild
@@ -1 +1,3 @@
 # UAPI Header export list
+header-y += evtchn.h
+header-y += privcmd.h
diff --git a/include/xen/evtchn.h b/include/uapi/xen/evtchn.h
index 14e833ee4e0b..14e833ee4e0b 100644
--- a/include/xen/evtchn.h
+++ b/include/uapi/xen/evtchn.h
diff --git a/include/xen/privcmd.h b/include/uapi/xen/privcmd.h
index a85316811d79..a85316811d79 100644
--- a/include/xen/privcmd.h
+++ b/include/uapi/xen/privcmd.h
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index a6267a2d292b..3729173b7fbc 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -48,10 +48,10 @@
 #define DISPC_IRQ_FRAMEDONEWB           (1 << 23)
 #define DISPC_IRQ_FRAMEDONETV           (1 << 24)
 #define DISPC_IRQ_WBBUFFEROVERFLOW      (1 << 25)
-#define DISPC_IRQ_FRAMEDONE3            (1 << 26)
-#define DISPC_IRQ_VSYNC3                (1 << 27)
-#define DISPC_IRQ_ACBIAS_COUNT_STAT3    (1 << 28)
-#define DISPC_IRQ_SYNC_LOST3            (1 << 29)
+#define DISPC_IRQ_SYNC_LOST3            (1 << 27)
+#define DISPC_IRQ_VSYNC3                (1 << 28)
+#define DISPC_IRQ_ACBIAS_COUNT_STAT3    (1 << 29)
+#define DISPC_IRQ_FRAMEDONE3            (1 << 30)
 
 struct omap_dss_device;
 struct omap_overlay_manager;
@@ -73,6 +73,7 @@ enum omap_plane {
         OMAP_DSS_VIDEO1 = 1,
         OMAP_DSS_VIDEO2 = 2,
         OMAP_DSS_VIDEO3 = 3,
+        OMAP_DSS_WB     = 4,
 };
 
 enum omap_channel {
@@ -186,6 +187,8 @@ enum omap_overlay_caps {
         OMAP_DSS_OVL_CAP_GLOBAL_ALPHA = 1 << 1,
         OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA = 1 << 2,
         OMAP_DSS_OVL_CAP_ZORDER = 1 << 3,
+        OMAP_DSS_OVL_CAP_POS = 1 << 4,
+        OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5,
 };
 
 enum omap_overlay_manager_caps {
@@ -207,6 +210,16 @@ enum omap_hdmi_flags {
         OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0,
 };
 
+enum omap_dss_output_id {
+        OMAP_DSS_OUTPUT_DPI     = 1 << 0,
+        OMAP_DSS_OUTPUT_DBI     = 1 << 1,
+        OMAP_DSS_OUTPUT_SDI     = 1 << 2,
+        OMAP_DSS_OUTPUT_DSI1    = 1 << 3,
+        OMAP_DSS_OUTPUT_DSI2    = 1 << 4,
+        OMAP_DSS_OUTPUT_VENC    = 1 << 5,
+        OMAP_DSS_OUTPUT_HDMI    = 1 << 6,
+};
+
 /* RFBI */
 
 struct rfbi_timings {
@@ -243,7 +256,7 @@ void rfbi_bus_unlock(void);
 
 /* DSI */
 
-struct omap_dss_dsi_videomode_data {
+struct omap_dss_dsi_videomode_timings {
         /* DSI video mode blanking data */
         /* Unit: byte clock cycles */
         u16 hsa;
@@ -424,6 +437,8 @@ struct omap_overlay {
                         struct omap_overlay_info *info);
 
         int (*wait_for_go)(struct omap_overlay *ovl);
+
+        struct omap_dss_device *(*get_device)(struct omap_overlay *ovl);
 };
 
 struct omap_overlay_manager_info {
@@ -448,9 +463,10 @@ struct omap_overlay_manager {
         enum omap_overlay_manager_caps caps;
         struct list_head overlays;
         enum omap_display_type supported_displays;
+        enum omap_dss_output_id supported_outputs;
 
         /* dynamic fields */
-        struct omap_dss_device *device;
+        struct omap_dss_output *output;
 
         /*
          * The following functions do not block:
@@ -463,9 +479,9 @@ struct omap_overlay_manager {
          * interrupt context
          */
 
-        int (*set_device)(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev);
-        int (*unset_device)(struct omap_overlay_manager *mgr);
+        int (*set_output)(struct omap_overlay_manager *mgr,
+                struct omap_dss_output *output);
+        int (*unset_output)(struct omap_overlay_manager *mgr);
 
         int (*set_manager_info)(struct omap_overlay_manager *mgr,
                         struct omap_overlay_manager_info *info);
@@ -475,6 +491,8 @@ struct omap_overlay_manager {
         int (*apply)(struct omap_overlay_manager *mgr);
         int (*wait_for_go)(struct omap_overlay_manager *mgr);
         int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
+
+        struct omap_dss_device *(*get_device)(struct omap_overlay_manager *mgr);
 };
 
 /* 22 pins means 1 clk lane and 10 data lanes */
@@ -492,6 +510,37 @@ struct omap_dsi_pin_config {
         int pins[OMAP_DSS_MAX_DSI_PINS];
 };
 
+struct omap_dss_writeback_info {
+        u32 paddr;
+        u32 p_uv_addr;
+        u16 buf_width;
+        u16 width;
+        u16 height;
+        enum omap_color_mode color_mode;
+        u8 rotation;
+        enum omap_dss_rotation_type rotation_type;
+        bool mirror;
+        u8 pre_mult_alpha;
+};
+
+struct omap_dss_output {
+        struct list_head list;
+
+        /* display type supported by the output */
+        enum omap_display_type type;
+
+        /* output instance */
+        enum omap_dss_output_id id;
+
+        /* output's platform device pointer */
+        struct platform_device *pdev;
+
+        /* dynamic fields */
+        struct omap_overlay_manager *manager;
+
+        struct omap_dss_device *device;
+};
+
 struct omap_dss_device {
         struct device dev;
 
@@ -564,7 +613,7 @@ struct omap_dss_device {
 
                 enum omap_dss_dsi_pixel_format dsi_pix_fmt;
                 enum omap_dss_dsi_mode dsi_mode;
-                struct omap_dss_dsi_videomode_data dsi_vm_data;
+                struct omap_dss_dsi_videomode_timings dsi_vm_timings;
         } panel;
 
         struct {
@@ -590,7 +639,7 @@ struct omap_dss_device {
 
         enum omap_display_caps caps;
 
-        struct omap_overlay_manager *manager;
+        struct omap_dss_output *output;
 
         enum omap_dss_display_state state;
 
@@ -605,6 +654,8 @@ struct omap_dss_device {
 
 struct omap_dss_hdmi_data
 {
+        int ct_cp_hpd_gpio;
+        int ls_oe_gpio;
         int hpd_gpio;
 };
 
@@ -699,6 +750,11 @@ struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
 int omap_dss_get_num_overlays(void);
 struct omap_overlay *omap_dss_get_overlay(int num);
 
+struct omap_dss_output *omap_dss_get_output(enum omap_dss_output_id id);
+int omapdss_output_set_device(struct omap_dss_output *out,
+                struct omap_dss_device *dssdev);
+int omapdss_output_unset_device(struct omap_dss_output *out);
+
 void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres);
 int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);
@@ -719,6 +775,15 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
 void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,
                 bool enable);
 int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);
+void omapdss_dsi_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
+void omapdss_dsi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h);
+void omapdss_dsi_set_pixel_format(struct omap_dss_device *dssdev,
+                enum omap_dss_dsi_pixel_format fmt);
+void omapdss_dsi_set_operation_mode(struct omap_dss_device *dssdev,
+                enum omap_dss_dsi_mode mode);
+void omapdss_dsi_set_videomode_timings(struct omap_dss_device *dssdev,
+                struct omap_dss_dsi_videomode_timings *timings);
 
 int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
                 void (*callback)(int, void *), void *data);
@@ -727,6 +792,8 @@ int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
 void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
 int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,
                 const struct omap_dsi_pin_config *pin_cfg);
+int omapdss_dsi_set_clocks(struct omap_dss_device *dssdev,
+                unsigned long ddr_clk, unsigned long lp_clk);
 
 int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,
@@ -734,22 +801,29 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,
 
 int omapdss_dpi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_dpi_display_disable(struct omap_dss_device *dssdev);
-void dpi_set_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
+void omapdss_dpi_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
 int dpi_check_timings(struct omap_dss_device *dssdev,
                         struct omap_video_timings *timings);
+void omapdss_dpi_set_data_lines(struct omap_dss_device *dssdev, int data_lines);
 
 int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);
+void omapdss_sdi_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings);
+void omapdss_sdi_set_datapairs(struct omap_dss_device *dssdev, int datapairs);
 
 int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev);
 void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev);
-int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
-                u16 *x, u16 *y, u16 *w, u16 *h);
-int omap_rfbi_update(struct omap_dss_device *dssdev,
-                u16 x, u16 y, u16 w, u16 h,
-                void (*callback)(void *), void *data);
-int omap_rfbi_configure(struct omap_dss_device *dssdev, int pixel_size,
+int omap_rfbi_update(struct omap_dss_device *dssdev, void (*callback)(void *),
+                void *data);
+int omap_rfbi_configure(struct omap_dss_device *dssdev);
+void omapdss_rfbi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h);
+void omapdss_rfbi_set_pixel_size(struct omap_dss_device *dssdev,
+                int pixel_size);
+void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev,
                 int data_lines);
+void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
+                struct rfbi_timings *timings);
 
 #endif
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
new file mode 100644
index 000000000000..7ae6c07f2ef8
--- /dev/null
+++ b/include/video/samsung_fimd.h
@@ -0,0 +1,533 @@
+/* include/video/samsung_fimd.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C Platform - new-style fimd and framebuffer register definitions
+ *
+ * This is the register set for the fimd and new style framebuffer interface
+ * found from the S3C2443 onwards into the S3C2416, S3C2450 and the
+ * S3C64XX series such as the S3C6400 and S3C6410.
+ *
+ * The file does not contain the cpu specific items which are based on
+ * whichever architecture is selected, it only contains the core of the
+ * register set. See <mach/regs-fb.h> to get the specifics.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+/* VIDCON0 */
+
+#define VIDCON0                                 (0x00)
+#define VIDCON0_INTERLACE                       (1 << 29)
+#define VIDCON0_VIDOUT_MASK                     (0x3 << 26)
+#define VIDCON0_VIDOUT_SHIFT                    (26)
+#define VIDCON0_VIDOUT_RGB                      (0x0 << 26)
+#define VIDCON0_VIDOUT_TV                       (0x1 << 26)
+#define VIDCON0_VIDOUT_I80_LDI0                 (0x2 << 26)
+#define VIDCON0_VIDOUT_I80_LDI1                 (0x3 << 26)
+
+#define VIDCON0_L1_DATA_MASK                    (0x7 << 23)
+#define VIDCON0_L1_DATA_SHIFT                   (23)
+#define VIDCON0_L1_DATA_16BPP                   (0x0 << 23)
+#define VIDCON0_L1_DATA_18BPP16                 (0x1 << 23)
+#define VIDCON0_L1_DATA_18BPP9                  (0x2 << 23)
+#define VIDCON0_L1_DATA_24BPP                   (0x3 << 23)
+#define VIDCON0_L1_DATA_18BPP                   (0x4 << 23)
+#define VIDCON0_L1_DATA_16BPP8                  (0x5 << 23)
+
+#define VIDCON0_L0_DATA_MASK                    (0x7 << 20)
+#define VIDCON0_L0_DATA_SHIFT                   (20)
+#define VIDCON0_L0_DATA_16BPP                   (0x0 << 20)
+#define VIDCON0_L0_DATA_18BPP16                 (0x1 << 20)
+#define VIDCON0_L0_DATA_18BPP9                  (0x2 << 20)
+#define VIDCON0_L0_DATA_24BPP                   (0x3 << 20)
+#define VIDCON0_L0_DATA_18BPP                   (0x4 << 20)
+#define VIDCON0_L0_DATA_16BPP8                  (0x5 << 20)
+
+#define VIDCON0_PNRMODE_MASK                    (0x3 << 17)
+#define VIDCON0_PNRMODE_SHIFT                   (17)
+#define VIDCON0_PNRMODE_RGB                     (0x0 << 17)
+#define VIDCON0_PNRMODE_BGR                     (0x1 << 17)
+#define VIDCON0_PNRMODE_SERIAL_RGB              (0x2 << 17)
+#define VIDCON0_PNRMODE_SERIAL_BGR              (0x3 << 17)
+
+#define VIDCON0_CLKVALUP                        (1 << 16)
+#define VIDCON0_CLKVAL_F_MASK                   (0xff << 6)
+#define VIDCON0_CLKVAL_F_SHIFT                  (6)
+#define VIDCON0_CLKVAL_F_LIMIT                  (0xff)
+#define VIDCON0_CLKVAL_F(_x)                    ((_x) << 6)
+#define VIDCON0_VLCKFREE                        (1 << 5)
+#define VIDCON0_CLKDIR                          (1 << 4)
+
+#define VIDCON0_CLKSEL_MASK                     (0x3 << 2)
+#define VIDCON0_CLKSEL_SHIFT                    (2)
+#define VIDCON0_CLKSEL_HCLK                     (0x0 << 2)
+#define VIDCON0_CLKSEL_LCD                      (0x1 << 2)
+#define VIDCON0_CLKSEL_27M                      (0x3 << 2)
+
+#define VIDCON0_ENVID                           (1 << 1)
+#define VIDCON0_ENVID_F                         (1 << 0)
+
+#define VIDCON1                                 (0x04)
+#define VIDCON1_LINECNT_MASK                    (0x7ff << 16)
+#define VIDCON1_LINECNT_SHIFT                   (16)
+#define VIDCON1_LINECNT_GET(_v)                 (((_v) >> 16) & 0x7ff)
+#define VIDCON1_VSTATUS_MASK                    (0x3 << 13)
+#define VIDCON1_VSTATUS_SHIFT                   (13)
+#define VIDCON1_VSTATUS_VSYNC                   (0x0 << 13)
+#define VIDCON1_VSTATUS_BACKPORCH               (0x1 << 13)
+#define VIDCON1_VSTATUS_ACTIVE                  (0x2 << 13)
+#define VIDCON1_VSTATUS_FRONTPORCH              (0x0 << 13)
+#define VIDCON1_VCLK_MASK                       (0x3 << 9)
+#define VIDCON1_VCLK_HOLD                       (0x0 << 9)
+#define VIDCON1_VCLK_RUN                        (0x1 << 9)
+
+#define VIDCON1_INV_VCLK                        (1 << 7)
+#define VIDCON1_INV_HSYNC                       (1 << 6)
+#define VIDCON1_INV_VSYNC                       (1 << 5)
+#define VIDCON1_INV_VDEN                        (1 << 4)
+
+/* VIDCON2 */
+
+#define VIDCON2                                 (0x08)
+#define VIDCON2_EN601                           (1 << 23)
+#define VIDCON2_TVFMTSEL_SW                     (1 << 14)
+
+#define VIDCON2_TVFMTSEL1_MASK                  (0x3 << 12)
+#define VIDCON2_TVFMTSEL1_SHIFT                 (12)
+#define VIDCON2_TVFMTSEL1_RGB                   (0x0 << 12)
+#define VIDCON2_TVFMTSEL1_YUV422                (0x1 << 12)
+#define VIDCON2_TVFMTSEL1_YUV444                (0x2 << 12)
+
+#define VIDCON2_ORGYCbCr                        (1 << 8)
+#define VIDCON2_YUVORDCrCb                      (1 << 7)
+
+/* PRTCON (S3C6410, S5PC100)
+ * Might not be present in the S3C6410 documentation,
+ * but tests prove it's there almost for sure; shouldn't hurt in any case.
+ */
+#define PRTCON                                  (0x0c)
+#define PRTCON_PROTECT                          (1 << 11)
+
+/* VIDTCON0 */
+
+#define VIDTCON0_VBPDE_MASK                     (0xff << 24)
+#define VIDTCON0_VBPDE_SHIFT                    (24)
+#define VIDTCON0_VBPDE_LIMIT                    (0xff)
+#define VIDTCON0_VBPDE(_x)                      ((_x) << 24)
+
+#define VIDTCON0_VBPD_MASK                      (0xff << 16)
+#define VIDTCON0_VBPD_SHIFT                     (16)
+#define VIDTCON0_VBPD_LIMIT                     (0xff)
+#define VIDTCON0_VBPD(_x)                       ((_x) << 16)
+
+#define VIDTCON0_VFPD_MASK                      (0xff << 8)
+#define VIDTCON0_VFPD_SHIFT                     (8)
+#define VIDTCON0_VFPD_LIMIT                     (0xff)
+#define VIDTCON0_VFPD(_x)                       ((_x) << 8)
+
+#define VIDTCON0_VSPW_MASK                      (0xff << 0)
+#define VIDTCON0_VSPW_SHIFT                     (0)
+#define VIDTCON0_VSPW_LIMIT                     (0xff)
+#define VIDTCON0_VSPW(_x)                       ((_x) << 0)
+
+/* VIDTCON1 */
+
+#define VIDTCON1_VFPDE_MASK                     (0xff << 24)
+#define VIDTCON1_VFPDE_SHIFT                    (24)
+#define VIDTCON1_VFPDE_LIMIT                    (0xff)
+#define VIDTCON1_VFPDE(_x)                      ((_x) << 24)
+
+#define VIDTCON1_HBPD_MASK                      (0xff << 16)
+#define VIDTCON1_HBPD_SHIFT                     (16)
+#define VIDTCON1_HBPD_LIMIT                     (0xff)
+#define VIDTCON1_HBPD(_x)                       ((_x) << 16)
+
+#define VIDTCON1_HFPD_MASK                      (0xff << 8)
+#define VIDTCON1_HFPD_SHIFT                     (8)
+#define VIDTCON1_HFPD_LIMIT                     (0xff)
+#define VIDTCON1_HFPD(_x)                       ((_x) << 8)
+
+#define VIDTCON1_HSPW_MASK                      (0xff << 0)
+#define VIDTCON1_HSPW_SHIFT                     (0)
+#define VIDTCON1_HSPW_LIMIT                     (0xff)
+#define VIDTCON1_HSPW(_x)                       ((_x) << 0)
+
+#define VIDTCON2                                (0x18)
+#define VIDTCON2_LINEVAL_E(_x)                  ((((_x) & 0x800) >> 11) << 23)
+#define VIDTCON2_LINEVAL_MASK                   (0x7ff << 11)
+#define VIDTCON2_LINEVAL_SHIFT                  (11)
+#define VIDTCON2_LINEVAL_LIMIT                  (0x7ff)
+#define VIDTCON2_LINEVAL(_x)                    (((_x) & 0x7ff) << 11)
+
+#define VIDTCON2_HOZVAL_E(_x)                   ((((_x) & 0x800) >> 11) << 22)
+#define VIDTCON2_HOZVAL_MASK                    (0x7ff << 0)
+#define VIDTCON2_HOZVAL_SHIFT                   (0)
+#define VIDTCON2_HOZVAL_LIMIT                   (0x7ff)
+#define VIDTCON2_HOZVAL(_x)                     (((_x) & 0x7ff) << 0)
+
+/* WINCONx */
+
+
+#define WINCONx_BITSWP                          (1 << 18)
+#define WINCONx_BYTSWP                          (1 << 17)
+#define WINCONx_HAWSWP                          (1 << 16)
+#define WINCONx_WSWP                            (1 << 15)
+#define WINCONx_BURSTLEN_MASK                   (0x3 << 9)
+#define WINCONx_BURSTLEN_SHIFT                  (9)
+#define WINCONx_BURSTLEN_16WORD                 (0x0 << 9)
+#define WINCONx_BURSTLEN_8WORD                  (0x1 << 9)
+#define WINCONx_BURSTLEN_4WORD                  (0x2 << 9)
+
+#define WINCONx_ENWIN                           (1 << 0)
+#define WINCON0_BPPMODE_MASK                    (0xf << 2)
+#define WINCON0_BPPMODE_SHIFT                   (2)
+#define WINCON0_BPPMODE_1BPP                    (0x0 << 2)
+#define WINCON0_BPPMODE_2BPP                    (0x1 << 2)
+#define WINCON0_BPPMODE_4BPP                    (0x2 << 2)
+#define WINCON0_BPPMODE_8BPP_PALETTE            (0x3 << 2)
+#define WINCON0_BPPMODE_16BPP_565               (0x5 << 2)
+#define WINCON0_BPPMODE_16BPP_1555              (0x7 << 2)
+#define WINCON0_BPPMODE_18BPP_666               (0x8 << 2)
+#define WINCON0_BPPMODE_24BPP_888               (0xb << 2)
+
+#define WINCON1_BLD_PIX                         (1 << 6)
+
+#define WINCON1_ALPHA_SEL                       (1 << 1)
+#define WINCON1_BPPMODE_MASK                    (0xf << 2)
+#define WINCON1_BPPMODE_SHIFT                   (2)
+#define WINCON1_BPPMODE_1BPP                    (0x0 << 2)
+#define WINCON1_BPPMODE_2BPP                    (0x1 << 2)
+#define WINCON1_BPPMODE_4BPP                    (0x2 << 2)
+#define WINCON1_BPPMODE_8BPP_PALETTE            (0x3 << 2)
+#define WINCON1_BPPMODE_8BPP_1232               (0x4 << 2)
+#define WINCON1_BPPMODE_16BPP_565               (0x5 << 2)
+#define WINCON1_BPPMODE_16BPP_A1555             (0x6 << 2)
+#define WINCON1_BPPMODE_16BPP_I1555             (0x7 << 2)
+#define WINCON1_BPPMODE_18BPP_666               (0x8 << 2)
+#define WINCON1_BPPMODE_18BPP_A1665             (0x9 << 2)
+#define WINCON1_BPPMODE_19BPP_A1666             (0xa << 2)
+#define WINCON1_BPPMODE_24BPP_888               (0xb << 2)
+#define WINCON1_BPPMODE_24BPP_A1887             (0xc << 2)
+#define WINCON1_BPPMODE_25BPP_A1888             (0xd << 2)
+#define WINCON1_BPPMODE_28BPP_A4888             (0xd << 2)
+
+/* S5PV210 */
+#define SHADOWCON                               (0x34)
+#define SHADOWCON_WINx_PROTECT(_win)            (1 << (10 + (_win)))
+/* DMA channels (all windows) */
+#define SHADOWCON_CHx_ENABLE(_win)              (1 << (_win))
+/* Local input channels (windows 0-2) */
+#define SHADOWCON_CHx_LOCAL_ENABLE(_win)        (1 << (5 + (_win)))
+
+#define VIDOSDxA_TOPLEFT_X_E(_x)                ((((_x) & 0x800) >> 11) << 23)
+#define VIDOSDxA_TOPLEFT_X_MASK                 (0x7ff << 11)
+#define VIDOSDxA_TOPLEFT_X_SHIFT                (11)
+#define VIDOSDxA_TOPLEFT_X_LIMIT                (0x7ff)
+#define VIDOSDxA_TOPLEFT_X(_x)                  (((_x) & 0x7ff) << 11)
+
+#define VIDOSDxA_TOPLEFT_Y_E(_x)                ((((_x) & 0x800) >> 11) << 22)
+#define VIDOSDxA_TOPLEFT_Y_MASK                 (0x7ff << 0)
+#define VIDOSDxA_TOPLEFT_Y_SHIFT                (0)
+#define VIDOSDxA_TOPLEFT_Y_LIMIT                (0x7ff)
+#define VIDOSDxA_TOPLEFT_Y(_x)                  (((_x) & 0x7ff) << 0)
+
+#define VIDOSDxB_BOTRIGHT_X_E(_x)               ((((_x) & 0x800) >> 11) << 23)
+#define VIDOSDxB_BOTRIGHT_X_MASK                (0x7ff << 11)
+#define VIDOSDxB_BOTRIGHT_X_SHIFT               (11)
+#define VIDOSDxB_BOTRIGHT_X_LIMIT               (0x7ff)
+#define VIDOSDxB_BOTRIGHT_X(_x)                 (((_x) & 0x7ff) << 11)
+
+#define VIDOSDxB_BOTRIGHT_Y_E(_x)               ((((_x) & 0x800) >> 11) << 22)
+#define VIDOSDxB_BOTRIGHT_Y_MASK                (0x7ff << 0)
+#define VIDOSDxB_BOTRIGHT_Y_SHIFT               (0)
+#define VIDOSDxB_BOTRIGHT_Y_LIMIT               (0x7ff)
+#define VIDOSDxB_BOTRIGHT_Y(_x)                 (((_x) & 0x7ff) << 0)
+
+/* For VIDOSD[1..4]C */
+#define VIDISD14C_ALPHA0_R(_x)                  ((_x) << 20)
+#define VIDISD14C_ALPHA0_G_MASK                 (0xf << 16)
+#define VIDISD14C_ALPHA0_G_SHIFT                (16)
+#define VIDISD14C_ALPHA0_G_LIMIT                (0xf)
+#define VIDISD14C_ALPHA0_G(_x)                  ((_x) << 16)
+#define VIDISD14C_ALPHA0_B_MASK                 (0xf << 12)
+#define VIDISD14C_ALPHA0_B_SHIFT                (12)
+#define VIDISD14C_ALPHA0_B_LIMIT                (0xf)
+#define VIDISD14C_ALPHA0_B(_x)                  ((_x) << 12)
+#define VIDISD14C_ALPHA1_R_MASK                 (0xf << 8)
+#define VIDISD14C_ALPHA1_R_SHIFT                (8)
+#define VIDISD14C_ALPHA1_R_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_R(_x)                  ((_x) << 8)
+#define VIDISD14C_ALPHA1_G_MASK                 (0xf << 4)
+#define VIDISD14C_ALPHA1_G_SHIFT                (4)
+#define VIDISD14C_ALPHA1_G_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_G(_x)                  ((_x) << 4)
+#define VIDISD14C_ALPHA1_B_MASK                 (0xf << 0)
+#define VIDISD14C_ALPHA1_B_SHIFT                (0)
+#define VIDISD14C_ALPHA1_B_LIMIT                (0xf)
+#define VIDISD14C_ALPHA1_B(_x)                  ((_x) << 0)
+
+/* Video buffer addresses */
+#define VIDW_BUF_START(_buff)                   (0xA0 + ((_buff) * 8))
+#define VIDW_BUF_START1(_buff)                  (0xA4 + ((_buff) * 8))
+#define VIDW_BUF_END(_buff)                     (0xD0 + ((_buff) * 8))
+#define VIDW_BUF_END1(_buff)                    (0xD4 + ((_buff) * 8))
+#define VIDW_BUF_SIZE(_buff)                    (0x100 + ((_buff) * 4))
+
+#define VIDW_BUF_SIZE_OFFSET_E(_x)              ((((_x) & 0x2000) >> 13) << 27)
+#define VIDW_BUF_SIZE_OFFSET_MASK               (0x1fff << 13)
+#define VIDW_BUF_SIZE_OFFSET_SHIFT              (13)
+#define VIDW_BUF_SIZE_OFFSET_LIMIT              (0x1fff)
+#define VIDW_BUF_SIZE_OFFSET(_x)                (((_x) & 0x1fff) << 13)
+
+#define VIDW_BUF_SIZE_PAGEWIDTH_E(_x)           ((((_x) & 0x2000) >> 13) << 26)
+#define VIDW_BUF_SIZE_PAGEWIDTH_MASK            (0x1fff << 0)
+#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT           (0)
+#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT           (0x1fff)
+#define VIDW_BUF_SIZE_PAGEWIDTH(_x)             (((_x) & 0x1fff) << 0)
+
+/* Interrupt controls and status */
+
+#define VIDINTCON0_FIFOINTERVAL_MASK            (0x3f << 20)
+#define VIDINTCON0_FIFOINTERVAL_SHIFT           (20)
+#define VIDINTCON0_FIFOINTERVAL_LIMIT           (0x3f)
+#define VIDINTCON0_FIFOINTERVAL(_x)             ((_x) << 20)
+
+#define VIDINTCON0_INT_SYSMAINCON               (1 << 19)
+#define VIDINTCON0_INT_SYSSUBCON                (1 << 18)
+#define VIDINTCON0_INT_I80IFDONE                (1 << 17)
+
+#define VIDINTCON0_FRAMESEL0_MASK               (0x3 << 15)
+#define VIDINTCON0_FRAMESEL0_SHIFT              (15)
+#define VIDINTCON0_FRAMESEL0_BACKPORCH          (0x0 << 15)
+#define VIDINTCON0_FRAMESEL0_VSYNC              (0x1 << 15)
+#define VIDINTCON0_FRAMESEL0_ACTIVE             (0x2 << 15)
+#define VIDINTCON0_FRAMESEL0_FRONTPORCH         (0x3 << 15)
+
+#define VIDINTCON0_FRAMESEL1                    (1 << 13)
+#define VIDINTCON0_FRAMESEL1_MASK               (0x3 << 13)
+#define VIDINTCON0_FRAMESEL1_NONE               (0x0 << 13)
+#define VIDINTCON0_FRAMESEL1_BACKPORCH          (0x1 << 13)
+#define VIDINTCON0_FRAMESEL1_VSYNC              (0x2 << 13)
+#define VIDINTCON0_FRAMESEL1_FRONTPORCH         (0x3 << 13)
+
+#define VIDINTCON0_INT_FRAME                    (1 << 12)
+#define VIDINTCON0_FIFIOSEL_MASK                (0x7f << 5)
+#define VIDINTCON0_FIFIOSEL_SHIFT               (5)
+#define VIDINTCON0_FIFIOSEL_WINDOW0             (0x1 << 5)
+#define VIDINTCON0_FIFIOSEL_WINDOW1             (0x2 << 5)
+
+#define VIDINTCON0_FIFOLEVEL_MASK               (0x7 << 2)
+#define VIDINTCON0_FIFOLEVEL_SHIFT              (2)
+#define VIDINTCON0_FIFOLEVEL_TO25PC             (0x0 << 2)
+#define VIDINTCON0_FIFOLEVEL_TO50PC             (0x1 << 2)
+#define VIDINTCON0_FIFOLEVEL_TO75PC             (0x2 << 2)
+#define VIDINTCON0_FIFOLEVEL_EMPTY              (0x3 << 2)
+#define VIDINTCON0_FIFOLEVEL_FULL               (0x4 << 2)
+
+#define VIDINTCON0_INT_FIFO_MASK                (0x3 << 0)
+#define VIDINTCON0_INT_FIFO_SHIFT               (0)
+#define VIDINTCON0_INT_ENABLE                   (1 << 0)
+
+#define VIDINTCON1                              (0x134)
+#define VIDINTCON1_INT_I180                     (1 << 2)
+#define VIDINTCON1_INT_FRAME                    (1 << 1)
+#define VIDINTCON1_INT_FIFO                     (1 << 0)
+
+/* Window colour-key control registers */
+#define WKEYCON                                 (0x140) /* 6410,V210 */
+
+#define WKEYCON0                                (0x00)
+#define WKEYCON1                                (0x04)
+
+#define WxKEYCON0_KEYBL_EN                      (1 << 26)
+#define WxKEYCON0_KEYEN_F                       (1 << 25)
+#define WxKEYCON0_DIRCON                        (1 << 24)
+#define WxKEYCON0_COMPKEY_MASK                  (0xffffff << 0)
+#define WxKEYCON0_COMPKEY_SHIFT                 (0)
+#define WxKEYCON0_COMPKEY_LIMIT                 (0xffffff)
+#define WxKEYCON0_COMPKEY(_x)                   ((_x) << 0)
+#define WxKEYCON1_COLVAL_MASK                   (0xffffff << 0)
+#define WxKEYCON1_COLVAL_SHIFT                  (0)
+#define WxKEYCON1_COLVAL_LIMIT                  (0xffffff)
+#define WxKEYCON1_COLVAL(_x)                    ((_x) << 0)
+
+
+/* Window blanking (MAP) */
+
+#define WINxMAP_MAP                             (1 << 24)
+#define WINxMAP_MAP_COLOUR_MASK                 (0xffffff << 0)
+#define WINxMAP_MAP_COLOUR_SHIFT                (0)
+#define WINxMAP_MAP_COLOUR_LIMIT                (0xffffff)
+#define WINxMAP_MAP_COLOUR(_x)                  ((_x) << 0)
+
+#define WPALCON_PAL_UPDATE                      (1 << 9)
+#define WPALCON_W1PAL_MASK                      (0x7 << 3)
+#define WPALCON_W1PAL_SHIFT                     (3)
+#define WPALCON_W1PAL_25BPP_A888                (0x0 << 3)
+#define WPALCON_W1PAL_24BPP                     (0x1 << 3)
+#define WPALCON_W1PAL_19BPP_A666                (0x2 << 3)
+#define WPALCON_W1PAL_18BPP_A665                (0x3 << 3)
+#define WPALCON_W1PAL_18BPP                     (0x4 << 3)
+#define WPALCON_W1PAL_16BPP_A555                (0x5 << 3)
+#define WPALCON_W1PAL_16BPP_565                 (0x6 << 3)
+
+#define WPALCON_W0PAL_MASK                      (0x7 << 0)
+#define WPALCON_W0PAL_SHIFT                     (0)
+#define WPALCON_W0PAL_25BPP_A888                (0x0 << 0)
+#define WPALCON_W0PAL_24BPP                     (0x1 << 0)
+#define WPALCON_W0PAL_19BPP_A666                (0x2 << 0)
+#define WPALCON_W0PAL_18BPP_A665                (0x3 << 0)
+#define WPALCON_W0PAL_18BPP                     (0x4 << 0)
+#define WPALCON_W0PAL_16BPP_A555                (0x5 << 0)
+#define WPALCON_W0PAL_16BPP_565                 (0x6 << 0)
+
+/* Blending equation control */
+#define BLENDCON                                (0x260)
+#define BLENDCON_NEW_MASK                       (1 << 0)
+#define BLENDCON_NEW_8BIT_ALPHA_VALUE           (1 << 0)
+#define BLENDCON_NEW_4BIT_ALPHA_VALUE           (0 << 0)
+
+#define S3C_FB_MAX_WIN (5)  /* number of hardware windows available. */
+#define VIDCON1_FSTATUS_EVEN    (1 << 15)
+
+/* Video timing controls */
+#define VIDTCON0                                (0x10)
+#define VIDTCON1                                (0x14)
+#define VIDTCON2                                (0x18)
+
+/* Window position controls */
+
+#define WINCON(_win)                            (0x20 + ((_win) * 4))
+
+/* OSD1 and OSD4 do not have register D */
+
+#define VIDOSD_BASE                             (0x40)
+
+#define VIDINTCON0                              (0x130)
+
+/* WINCONx */
+
+#define WINCONx_CSCWIDTH_MASK                   (0x3 << 26)
+#define WINCONx_CSCWIDTH_SHIFT                  (26)
+#define WINCONx_CSCWIDTH_WIDE                   (0x0 << 26)
+#define WINCONx_CSCWIDTH_NARROW                 (0x3 << 26)
+
+#define WINCONx_ENLOCAL                         (1 << 22)
+#define WINCONx_BUFSTATUS                       (1 << 21)
+#define WINCONx_BUFSEL                          (1 << 20)
+#define WINCONx_BUFAUTOEN                       (1 << 19)
+#define WINCONx_YCbCr                           (1 << 13)
+
+#define WINCON1_LOCALSEL_CAMIF                  (1 << 23)
+
+#define WINCON2_LOCALSEL_CAMIF                  (1 << 23)
+#define WINCON2_BLD_PIX                         (1 << 6)
+
+#define WINCON2_ALPHA_SEL                       (1 << 1)
+#define WINCON2_BPPMODE_MASK                    (0xf << 2)
+#define WINCON2_BPPMODE_SHIFT                   (2)
+#define WINCON2_BPPMODE_1BPP                    (0x0 << 2)
+#define WINCON2_BPPMODE_2BPP                    (0x1 << 2)
+#define WINCON2_BPPMODE_4BPP                    (0x2 << 2)
+#define WINCON2_BPPMODE_8BPP_1232               (0x4 << 2)
+#define WINCON2_BPPMODE_16BPP_565               (0x5 << 2)
+#define WINCON2_BPPMODE_16BPP_A1555             (0x6 << 2)
+#define WINCON2_BPPMODE_16BPP_I1555             (0x7 << 2)
+#define WINCON2_BPPMODE_18BPP_666               (0x8 << 2)
+#define WINCON2_BPPMODE_18BPP_A1665             (0x9 << 2)
+#define WINCON2_BPPMODE_19BPP_A1666             (0xa << 2)
+#define WINCON2_BPPMODE_24BPP_888               (0xb << 2)
+#define WINCON2_BPPMODE_24BPP_A1887             (0xc << 2)
+#define WINCON2_BPPMODE_25BPP_A1888             (0xd << 2)
+#define WINCON2_BPPMODE_28BPP_A4888             (0xd << 2)
+
+#define WINCON3_BLD_PIX                         (1 << 6)
+
+#define WINCON3_ALPHA_SEL                       (1 << 1)
+#define WINCON3_BPPMODE_MASK                    (0xf << 2)
+#define WINCON3_BPPMODE_SHIFT                   (2)
+#define WINCON3_BPPMODE_1BPP                    (0x0 << 2)
+#define WINCON3_BPPMODE_2BPP                    (0x1 << 2)
+#define WINCON3_BPPMODE_4BPP                    (0x2 << 2)
+#define WINCON3_BPPMODE_16BPP_565               (0x5 << 2)
+#define WINCON3_BPPMODE_16BPP_A1555             (0x6 << 2)
+#define WINCON3_BPPMODE_16BPP_I1555             (0x7 << 2)
+#define WINCON3_BPPMODE_18BPP_666               (0x8 << 2)
+#define WINCON3_BPPMODE_18BPP_A1665             (0x9 << 2)
+#define WINCON3_BPPMODE_19BPP_A1666             (0xa << 2)
+#define WINCON3_BPPMODE_24BPP_888               (0xb << 2)
+#define WINCON3_BPPMODE_24BPP_A1887             (0xc << 2)
+#define WINCON3_BPPMODE_25BPP_A1888             (0xd << 2)
+#define WINCON3_BPPMODE_28BPP_A4888             (0xd << 2)
+
+#define VIDINTCON0_FIFIOSEL_WINDOW2             (0x10 << 5)
+#define VIDINTCON0_FIFIOSEL_WINDOW3             (0x20 << 5)
+#define VIDINTCON0_FIFIOSEL_WINDOW4             (0x40 << 5)
+
+#define DITHMODE                                (0x170)
+#define WINxMAP(_win)                           (0x180 + ((_win) * 4))
+
+
+#define DITHMODE_R_POS_MASK                     (0x3 << 5)
+#define DITHMODE_R_POS_SHIFT                    (5)
+#define DITHMODE_R_POS_8BIT                     (0x0 << 5)
+#define DITHMODE_R_POS_6BIT                     (0x1 << 5)
+#define DITHMODE_R_POS_5BIT                     (0x2 << 5)
+
+#define DITHMODE_G_POS_MASK                     (0x3 << 3)
+#define DITHMODE_G_POS_SHIFT                    (3)
+#define DITHMODE_G_POS_8BIT                     (0x0 << 3)
+#define DITHMODE_G_POS_6BIT                     (0x1 << 3)
+#define DITHMODE_G_POS_5BIT                     (0x2 << 3)
+
+#define DITHMODE_B_POS_MASK                     (0x3 << 1)
+#define DITHMODE_B_POS_SHIFT                    (1)
+#define DITHMODE_B_POS_8BIT                     (0x0 << 1)
+#define DITHMODE_B_POS_6BIT                     (0x1 << 1)
+#define DITHMODE_B_POS_5BIT                     (0x2 << 1)
+
+#define DITHMODE_DITH_EN                        (1 << 0)
+
+#define WPALCON                                 (0x1A0)
+
+/* Palette control */
+/* Note for S5PC100: you can still use those macros on WPALCON (aka WPALCON_L),
+ * but make sure that WPALCON_H W2PAL-W4PAL entries are zeroed out */
+#define WPALCON_W4PAL_16BPP_A555                (1 << 8)
+#define WPALCON_W3PAL_16BPP_A555                (1 << 7)
+#define WPALCON_W2PAL_16BPP_A555                (1 << 6)
+
+
+/* Notes on per-window bpp settings
+ *
+ * Value        Win0     Win1     Win2     Win3     Win 4
+ * 0000         1(P)     1(P)     1(P)     1(P)     1(P)
+ * 0001         2(P)     2(P)     2(P)     2(P)     2(P)
+ * 0010         4(P)     4(P)     4(P)     4(P)     -none-
+ * 0011         8(P)     8(P)     -none-   -none-   -none-
+ * 0100         -none-   8(A232)  8(A232)  -none-   -none-
+ * 0101         16(565)  16(565)  16(565)  16(565)   16(565)
+ * 0110         -none-   16(A555) 16(A555) 16(A555)  16(A555)
+ * 0111         16(I555) 16(I565) 16(I555) 16(I555)  16(I555)
+ * 1000         18(666)  18(666)  18(666)  18(666)   18(666)
+ * 1001         -none-   18(A665) 18(A665) 18(A665)  16(A665)
+ * 1010         -none-   19(A666) 19(A666) 19(A666)  19(A666)
+ * 1011         24(888)  24(888)  24(888)  24(888)   24(888)
+ * 1100         -none-   24(A887) 24(A887) 24(A887)  24(A887)
+ * 1101         -none-   25(A888) 25(A888) 25(A888)  25(A888)
+ * 1110         -none-   -none-   -none-   -none-    -none-
+ * 1111         -none-   -none-   -none-   -none-    -none-
+*/
+
+/* FIMD Version 8 register offset definitions */
+#define FIMD_V8_VIDTCON0        (0x20010)
+#define FIMD_V8_VIDTCON1        (0x20014)
+#define FIMD_V8_VIDTCON2        (0x20018)
+#define FIMD_V8_VIDTCON3        (0x2001C)
+#define FIMD_V8_VIDCON1         (0x20004)
diff --git a/include/xen/Kbuild b/include/xen/Kbuild
deleted file mode 100644
index 84ad8f02fee5..000000000000
--- a/include/xen/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-header-y += evtchn.h
-header-y += privcmd.h
diff --git a/include/xen/events.h b/include/xen/events.h
index 04399b28e821..c6bfe01acf6b 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -109,4 +109,6 @@ int xen_irq_from_gsi(unsigned gsi);
 /* Determine whether to ignore this IRQ if it is passed to a guest. */
 int xen_test_irq_shared(int irq);
 
+/* initialize Xen IRQ subsystem */
+void xen_init_IRQ(void);
 #endif  /* _XEN_EVENTS_H */
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index aecee9d112cb..694dcaf266e6 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -170,7 +170,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
         unmap->dev_bus_addr = 0;
 }
 
-int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
+int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes,
                            unsigned long max_nr_gframes,
                            void **__shared);
 int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index b6ca39a069d8..131a6ccdba25 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -50,6 +50,9 @@
 /* x86: pirq can be used by HVM guests */
 #define XENFEAT_hvm_pirqs           10
 
+/* operation as Dom0 is supported */
+#define XENFEAT_dom0                      11
+
 #define XENFEAT_NR_SUBMAPS 1
 
 #endif /* __XEN_PUBLIC_FEATURES_H__ */
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index f9f8b975ae74..e40fae9bf11a 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -310,7 +310,7 @@ struct gnttab_setup_table {
     uint32_t nr_frames;
     /* OUT parameters. */
     int16_t  status;              /* GNTST_* */
-    GUEST_HANDLE(ulong) frame_list;
+    GUEST_HANDLE(xen_pfn_t) frame_list;
 };
 DEFINE_GUEST_HANDLE_STRUCT(gnttab_setup_table);
 
diff --git a/include/xen/interface/hvm/hvm_op.h b/include/xen/interface/hvm/hvm_op.h
index a4827f46ee97..956a04682865 100644
--- a/include/xen/interface/hvm/hvm_op.h
+++ b/include/xen/interface/hvm/hvm_op.h
@@ -43,4 +43,23 @@ struct xen_hvm_pagetable_dying {
 typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t;
 DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_pagetable_dying_t);
  
+enum hvmmem_type_t {
+    HVMMEM_ram_rw,             /* Normal read/write guest RAM */
+    HVMMEM_ram_ro,             /* Read-only; writes are discarded */
+    HVMMEM_mmio_dm,            /* Reads and write go to the device model */
+};
+
+#define HVMOP_get_mem_type    15
+/* Return hvmmem_type_t for the specified pfn. */
+struct xen_hvm_get_mem_type {
+    /* Domain to be queried. */
+    domid_t domid;
+    /* OUT variable. */
+    uint16_t mem_type;
+    uint16_t pad[2]; /* align next field on 8-byte boundary */
+    /* IN variable. */
+    uint64_t pfn;
+};
+DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_get_mem_type);
+
 #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */
diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h
index 01fc8ae5f0b0..0eafaf254fff 100644
--- a/include/xen/interface/io/protocols.h
+++ b/include/xen/interface/io/protocols.h
@@ -5,6 +5,7 @@
 #define XEN_IO_PROTO_ABI_X86_64     "x86_64-abi"
 #define XEN_IO_PROTO_ABI_IA64       "ia64-abi"
 #define XEN_IO_PROTO_ABI_POWERPC64  "powerpc64-abi"
+#define XEN_IO_PROTO_ABI_ARM        "arm-abi"
 
 #if defined(__i386__)
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32
@@ -14,6 +15,8 @@
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64
 #elif defined(__powerpc64__)
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64
+#elif defined(__arm__)
+# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM
 #else
 # error arch fixup needed here
 #endif
diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index d8e33a93ea4d..90712e2072d5 100644
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -34,7 +34,7 @@ struct xen_memory_reservation {
     GUEST_HANDLE(xen_pfn_t) extent_start;
 
     /* Number of extents, and size/alignment of each (2^extent_order pages). */
-    unsigned long  nr_extents;
+    xen_ulong_t  nr_extents;
     unsigned int   extent_order;
 
     /*
@@ -92,7 +92,7 @@ struct xen_memory_exchange {
      *     command will be non-zero.
      *  5. THIS FIELD MUST BE INITIALISED TO ZERO BY THE CALLER!
      */
-    unsigned long nr_exchanged;
+    xen_ulong_t nr_exchanged;
 };
 
 DEFINE_GUEST_HANDLE_STRUCT(xen_memory_exchange);
@@ -148,8 +148,8 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mfn_list);
  */
 #define XENMEM_machphys_mapping     12
 struct xen_machphys_mapping {
-    unsigned long v_start, v_end; /* Start and end virtual addresses.   */
-    unsigned long max_mfn;        /* Maximum MFN that can be looked up. */
+    xen_ulong_t v_start, v_end; /* Start and end virtual addresses.   */
+    xen_ulong_t max_mfn;        /* Maximum MFN that can be looked up. */
 };
 DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mapping_t);
 
@@ -172,35 +172,15 @@ struct xen_add_to_physmap {
     unsigned int space;
 
     /* Index into source mapping space. */
-    unsigned long idx;
+    xen_ulong_t idx;
 
     /* GPFN where the source mapping page should appear. */
     xen_pfn_t gpfn;
 };
 DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap);
 
-/*
- * Translates a list of domain-specific GPFNs into MFNs. Returns a -ve error
- * code on failure. This call only works for auto-translated guests.
- */
-#define XENMEM_translate_gpfn_list  8
-struct xen_translate_gpfn_list {
-    /* Which domain to translate for? */
-    domid_t domid;
-
-    /* Length of list. */
-    unsigned long nr_gpfns;
-
-    /* List of GPFNs to translate. */
-    GUEST_HANDLE(ulong) gpfn_list;
-
-    /*
-     * Output list to contain MFN translations. May be the same as the input
-     * list (in which case each input GPFN is overwritten with the output MFN).
-     */
-    GUEST_HANDLE(ulong) mfn_list;
-};
-DEFINE_GUEST_HANDLE_STRUCT(xen_translate_gpfn_list);
+/*** REMOVED ***/
+/*#define XENMEM_translate_gpfn_list  8*/
 
 /*
  * Returns the pseudo-physical memory map as it was when the domain
diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
index bfa1d50fe15b..1844d31f4552 100644
--- a/include/xen/interface/physdev.h
+++ b/include/xen/interface/physdev.h
@@ -56,7 +56,7 @@ struct physdev_eoi {
 #define PHYSDEVOP_pirq_eoi_gmfn_v2       28
 struct physdev_pirq_eoi_gmfn {
     /* IN */
-    unsigned long gmfn;
+    xen_ulong_t gmfn;
 };
 
 /*
diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h
index 5f5e551cf546..7ff6498679a3 100644
--- a/include/xen/interface/version.h
+++ b/include/xen/interface/version.h
@@ -45,7 +45,7 @@ struct xen_changeset_info {
 
 #define XENVER_platform_parameters 5
 struct xen_platform_parameters {
-    unsigned long virt_start;
+    xen_ulong_t virt_start;
 };
 
 #define XENVER_get_features 6
diff --git a/include/xen/xen.h b/include/xen/xen.h
index a16402418d31..a74d4362c4f8 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -23,8 +23,8 @@ extern enum xen_domain_type xen_domain_type;
 #include <xen/interface/xen.h>
 #include <asm/xen/hypervisor.h>
 
-#define xen_initial_domain()    (xen_pv_domain() && \
-                                 xen_start_info->flags & SIF_INITDOMAIN)
+#define xen_initial_domain()    (xen_domain() && \
+                                 xen_start_info && xen_start_info->flags & SIF_INITDOMAIN)
 #else  /* !CONFIG_XEN_DOM0 */
 #define xen_initial_domain()    (0)
 #endif  /* CONFIG_XEN_DOM0 */