954 files changed, 18665 insertions, 36407 deletions

diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index eda04546cdf6..473d584b1d31 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -103,8 +103,9 @@
 #define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0006 | AE_CODE_PROGRAMMER)
 #define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
 #define AE_MISSING_ARGUMENTS            (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
+#define AE_BAD_ADDRESS                  (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)
 
-#define AE_CODE_PGM_MAX                 0x0008
+#define AE_CODE_PGM_MAX                 0x0009
 
 /*
  * Acpi table exceptions
@@ -224,7 +225,8 @@ char const *acpi_gbl_exception_names_pgm[] = {
         "AE_BAD_HEX_CONSTANT",
         "AE_BAD_OCTAL_CONSTANT",
         "AE_BAD_DECIMAL_CONSTANT",
-        "AE_MISSING_ARGUMENTS"
+        "AE_MISSING_ARGUMENTS",
+        "AE_BAD_ADDRESS"
 };
 
 char const *acpi_gbl_exception_names_tbl[] = {
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index e9f6574930ef..c34b11022908 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -88,44 +88,30 @@ struct acpi_device;
 
 typedef int (*acpi_op_add) (struct acpi_device * device);
 typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
-typedef int (*acpi_op_lock) (struct acpi_device * device, int type);
 typedef int (*acpi_op_start) (struct acpi_device * device);
 typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
 typedef int (*acpi_op_suspend) (struct acpi_device * device,
                                 pm_message_t state);
 typedef int (*acpi_op_resume) (struct acpi_device * device);
-typedef int (*acpi_op_scan) (struct acpi_device * device);
 typedef int (*acpi_op_bind) (struct acpi_device * device);
 typedef int (*acpi_op_unbind) (struct acpi_device * device);
-typedef int (*acpi_op_shutdown) (struct acpi_device * device);
+typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
 
 struct acpi_bus_ops {
         u32 acpi_op_add:1;
-        u32 acpi_op_remove:1;
-        u32 acpi_op_lock:1;
         u32 acpi_op_start:1;
-        u32 acpi_op_stop:1;
-        u32 acpi_op_suspend:1;
-        u32 acpi_op_resume:1;
-        u32 acpi_op_scan:1;
-        u32 acpi_op_bind:1;
-        u32 acpi_op_unbind:1;
-        u32 acpi_op_shutdown:1;
-        u32 reserved:21;
 };
 
 struct acpi_device_ops {
         acpi_op_add add;
         acpi_op_remove remove;
-        acpi_op_lock lock;
         acpi_op_start start;
         acpi_op_stop stop;
         acpi_op_suspend suspend;
         acpi_op_resume resume;
-        acpi_op_scan scan;
         acpi_op_bind bind;
         acpi_op_unbind unbind;
-        acpi_op_shutdown shutdown;
+        acpi_op_notify notify;
 };
 
 struct acpi_driver {
@@ -284,7 +270,6 @@ struct acpi_device {
         struct list_head children;
         struct list_head node;
         struct list_head wakeup_list;
-        struct list_head g_list;
         struct acpi_device_status status;
         struct acpi_device_flags flags;
         struct acpi_device_pnp pnp;
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 5fc1bb0f4a90..0352c8f0b05b 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -67,6 +67,16 @@
 #define ACPI_BAY_HID                    "LNXIOBAY"
 #define ACPI_DOCK_HID                   "LNXDOCK"
 
+/*
+ * For fixed hardware buttons, we fabricate acpi_devices with HID
+ * ACPI_BUTTON_HID_POWERF or ACPI_BUTTON_HID_SLEEPF.  Fixed hardware
+ * signals only an event; it doesn't supply a notification value.
+ * To allow drivers to treat notifications from fixed hardware the
+ * same as those from real devices, we turn the events into this
+ * notification value.
+ */
+#define ACPI_FIXED_HARDWARE_EVENT       0x100
+
 /* --------------------------------------------------------------------------
                                        PCI
    -------------------------------------------------------------------------- */
@@ -99,24 +109,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
                                    int bus);
 
 /* --------------------------------------------------------------------------
-                                  Power Resource
-   -------------------------------------------------------------------------- */
-
-int acpi_device_sleep_wake(struct acpi_device *dev,
-                           int enable, int sleep_state, int dev_state);
-int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
-int acpi_disable_wakeup_device_power(struct acpi_device *dev);
-int acpi_power_get_inferred_state(struct acpi_device *device);
-int acpi_power_transition(struct acpi_device *device, int state);
-extern int acpi_power_nocheck;
-
-/* --------------------------------------------------------------------------
-                                  Embedded Controller
-   -------------------------------------------------------------------------- */
-int acpi_ec_ecdt_probe(void);
-int acpi_boot_ec_enable(void);
-
-/* --------------------------------------------------------------------------
                                     Processor
    -------------------------------------------------------------------------- */
 
@@ -165,9 +157,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
 }
 #endif
 
-/*--------------------------------------------------------------------------
-                                  Suspend/Resume
-  -------------------------------------------------------------------------- */
-extern int acpi_sleep_init(void);
-
 #endif /*__ACPI_DRIVERS_H__*/
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index a62720a7edc0..3e798593b17b 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -144,6 +144,7 @@ void __iomem *acpi_os_map_memory(acpi_physical_address where,
                                 acpi_size length);
 
 void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
+void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
 
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
@@ -241,10 +242,6 @@ acpi_os_derive_pci_id(acpi_handle rhandle,
 acpi_status acpi_os_validate_interface(char *interface);
 acpi_status acpi_osi_invalidate(char* interface);
 
-acpi_status
-acpi_os_validate_address(u8 space_id, acpi_physical_address address,
-                         acpi_size length, char *name);
-
 u64 acpi_os_get_timer(void);
 
 acpi_status acpi_os_signal(u32 function, void *info);
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index c8e8cf45830f..4db89e98535d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20081204
+#define ACPI_CA_VERSION                 0x20090320
 
 #include "actypes.h"
 #include "actbl.h"
@@ -130,6 +130,10 @@ acpi_get_table_header(acpi_string signature,
                       struct acpi_table_header *out_table_header);
 
 acpi_status
+acpi_get_table_with_size(acpi_string signature,
+               u32 instance, struct acpi_table_header **out_table,
+               acpi_size *tbl_size);
+acpi_status
 acpi_get_table(acpi_string signature,
                u32 instance, struct acpi_table_header **out_table);
 
@@ -187,14 +191,12 @@ acpi_evaluate_object(acpi_handle object,
                      struct acpi_object_list *parameter_objects,
                      struct acpi_buffer *return_object_buffer);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_evaluate_object_typed(acpi_handle object,
                            acpi_string pathname,
                            struct acpi_object_list *external_params,
                            struct acpi_buffer *return_buffer,
                            acpi_object_type return_type);
-#endif
 
 acpi_status
 acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
@@ -345,17 +347,15 @@ acpi_resource_to_address64(struct acpi_resource *resource,
  */
 acpi_status acpi_reset(void);
 
-acpi_status acpi_get_register(u32 register_id, u32 * return_value);
+acpi_status acpi_read_bit_register(u32 register_id, u32 *return_value);
 
-acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value);
+acpi_status acpi_write_bit_register(u32 register_id, u32 value);
 
-acpi_status acpi_set_register(u32 register_id, u32 value);
+acpi_status acpi_set_firmware_waking_vector(u32 physical_address);
 
-acpi_status
-acpi_set_firmware_waking_vector(u32 physical_address);
-
-acpi_status
-acpi_set_firmware_waking_vector64(u64 physical_address);
+#if ACPI_MACHINE_WIDTH == 64
+acpi_status acpi_set_firmware_waking_vector64(u64 physical_address);
+#endif
 
 acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg);
 
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index bf8d4cfd8cf5..222733d01f36 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -214,11 +214,11 @@ struct acpi_table_fadt {
         u16 flush_size;         /* Processor's 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_width;          /* Processor duty cycle value bit width in P_CNT register. */
+        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 */
         u8 century;             /* Index to century in RTC CMOS RAM */
-        u16 boot_flags;         /* IA-PC Boot Architecture Flags. See Table 5-10 for description */
+        u16 boot_flags;         /* IA-PC Boot Architecture Flags (see below for individual flags) */
         u8 reserved;            /* Reserved, must be zero */
         u32 flags;              /* Miscellaneous flag bits (see below for individual flags) */
         struct acpi_generic_address reset_register;     /* 64-bit address of the Reset register */
@@ -236,32 +236,41 @@ struct acpi_table_fadt {
         struct acpi_generic_address xgpe1_block;        /* 64-bit Extended General Purpose Event 1 Reg Blk address */
 };
 
+/* FADT Boot Architecture Flags (boot_flags) */
+
+#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 */
+#define ACPI_FADT_NO_VGA            (1<<2)      /* 02: [V4] It is not safe to probe for VGA hardware */
+#define ACPI_FADT_NO_MSI            (1<<3)      /* 03: [V4] Message Signaled Interrupts (MSI) must not be enabled */
+#define ACPI_FADT_NO_ASPM           (1<<4)      /* 04: [V4] PCIe ASPM control must not be enabled */
+
+#define FADT2_REVISION_ID               3
+
 /* FADT flags */
 
-#define ACPI_FADT_WBINVD            (1) /* 00: The wbinvd instruction works properly */
-#define ACPI_FADT_WBINVD_FLUSH      (1<<1)      /* 01: The wbinvd flushes but does not invalidate */
-#define ACPI_FADT_C1_SUPPORTED      (1<<2)      /* 02: All processors support C1 state */
-#define ACPI_FADT_C2_MP_SUPPORTED   (1<<3)      /* 03: C2 state works on MP system */
-#define ACPI_FADT_POWER_BUTTON      (1<<4)      /* 04: Power button is handled as a generic feature */
-#define ACPI_FADT_SLEEP_BUTTON      (1<<5)      /* 05: Sleep button is handled as a generic feature, or  not present */
-#define ACPI_FADT_FIXED_RTC         (1<<6)      /* 06: RTC wakeup stat not in fixed register space */
-#define ACPI_FADT_S4_RTC_WAKE       (1<<7)      /* 07: RTC wakeup possible from S4 */
-#define ACPI_FADT_32BIT_TIMER       (1<<8)      /* 08: tmr_val is 32 bits 0=24-bits */
-#define ACPI_FADT_DOCKING_SUPPORTED (1<<9)      /* 09: Docking supported */
-#define ACPI_FADT_RESET_REGISTER    (1<<10)     /* 10: System reset via the FADT RESET_REG supported */
-#define ACPI_FADT_SEALED_CASE       (1<<11)     /* 11: No internal expansion capabilities and case is sealed */
-#define ACPI_FADT_HEADLESS          (1<<12)     /* 12: No local video capabilities or local input devices */
-#define ACPI_FADT_SLEEP_TYPE        (1<<13)     /* 13: Must execute native instruction after writing  SLP_TYPx register */
-#define ACPI_FADT_PCI_EXPRESS_WAKE  (1<<14)     /* 14: System supports PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */
-#define ACPI_FADT_PLATFORM_CLOCK    (1<<15)     /* 15: OSPM should use platform-provided timer (ACPI 3.0) */
-#define ACPI_FADT_S4_RTC_VALID      (1<<16)     /* 16: Contents of RTC_STS valid after S4 wake (ACPI 3.0) */
-#define ACPI_FADT_REMOTE_POWER_ON   (1<<17)     /* 17: System is compatible with remote power on (ACPI 3.0) */
-#define ACPI_FADT_APIC_CLUSTER      (1<<18)     /* 18: All local APICs must use cluster model (ACPI 3.0) */
-#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: All local x_aPICs must use physical dest mode (ACPI 3.0) */
+#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_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 */
+#define ACPI_FADT_RESET_REGISTER    (1<<10)     /* 10: [V2] System reset via the FADT RESET_REG supported */
+#define ACPI_FADT_SEALED_CASE       (1<<11)     /* 11: [V3] No internal expansion capabilities and case is sealed */
+#define ACPI_FADT_HEADLESS          (1<<12)     /* 12: [V3] No local video capabilities or local input devices */
+#define ACPI_FADT_SLEEP_TYPE        (1<<13)     /* 13: [V3] Must execute native instruction after writing  SLP_TYPx register */
+#define ACPI_FADT_PCI_EXPRESS_WAKE  (1<<14)     /* 14: [V4] System supports PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */
+#define ACPI_FADT_PLATFORM_CLOCK    (1<<15)     /* 15: [V4] OSPM should use platform-provided timer (ACPI 3.0) */
+#define ACPI_FADT_S4_RTC_VALID      (1<<16)     /* 16: [V4] Contents of RTC_STS valid after S4 wake (ACPI 3.0) */
+#define ACPI_FADT_REMOTE_POWER_ON   (1<<17)     /* 17: [V4] System is compatible with remote power on (ACPI 3.0) */
+#define ACPI_FADT_APIC_CLUSTER      (1<<18)     /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */
+#define ACPI_FADT_APIC_PHYSICAL     (1<<19)     /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */
+
+/* FADT Prefered Power Management Profiles */
 
-/*
- * FADT Prefered Power Management Profiles
- */
 enum acpi_prefered_pm_profiles {
         PM_UNSPECIFIED = 0,
         PM_DESKTOP = 1,
@@ -272,16 +281,6 @@ enum acpi_prefered_pm_profiles {
         PM_APPLIANCE_PC = 6
 };
 
-/* FADT Boot Arch Flags */
-
-#define BAF_LEGACY_DEVICES              0x0001
-#define BAF_8042_KEYBOARD_CONTROLLER    0x0002
-#define BAF_MSI_NOT_SUPPORTED           0x0008
-#define BAF_PCIE_ASPM_CONTROL           0x0010
-
-#define FADT2_REVISION_ID               3
-#define FADT2_MINUS_REVISION_ID         2
-
 /* Reset to default packing */
 
 #pragma pack()
@@ -310,8 +309,9 @@ struct acpi_table_desc {
 #define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
 #define ACPI_TABLE_ORIGIN_MAPPED        (1)
 #define ACPI_TABLE_ORIGIN_ALLOCATED     (2)
-#define ACPI_TABLE_ORIGIN_MASK          (3)
-#define ACPI_TABLE_IS_LOADED            (4)
+#define ACPI_TABLE_ORIGIN_OVERRIDE      (4)
+#define ACPI_TABLE_ORIGIN_MASK          (7)
+#define ACPI_TABLE_IS_LOADED            (8)
 
 /*
  * Get the remaining ACPI tables
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 18963b968114..59ade0752473 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -1016,9 +1016,9 @@ struct acpi_madt_interrupt_source {
 struct acpi_madt_local_x2apic {
         struct acpi_subtable_header header;
         u16 reserved;           /* Reserved - must be zero */
-        u32 local_apic_id;      /* Processor X2_APIC ID  */
+        u32 local_apic_id;      /* Processor x2APIC ID  */
         u32 lapic_flags;
-        u32 uid;                /* Extended X2_APIC processor ID */
+        u32 uid;                /* ACPI processor UID */
 };
 
 /* 10: Local X2APIC NMI (07/2008) */
@@ -1026,7 +1026,7 @@ struct acpi_madt_local_x2apic {
 struct acpi_madt_local_x2apic_nmi {
         struct acpi_subtable_header header;
         u16 inti_flags;
-        u32 uid;                /* Processor X2_APIC ID */
+        u32 uid;                /* ACPI processor UID */
         u8 lint;                /* LINTn to which NMI is connected */
         u8 reserved[3];
 };
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index a20aab510173..f555d927f7c0 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -777,17 +777,25 @@ typedef u8 acpi_adr_space_type;
 #define ACPI_BITREG_SCI_ENABLE                  0x0E
 #define ACPI_BITREG_BUS_MASTER_RLD              0x0F
 #define ACPI_BITREG_GLOBAL_LOCK_RELEASE         0x10
-#define ACPI_BITREG_SLEEP_TYPE_A                0x11
-#define ACPI_BITREG_SLEEP_TYPE_B                0x12
-#define ACPI_BITREG_SLEEP_ENABLE                0x13
+#define ACPI_BITREG_SLEEP_TYPE                  0x11
+#define ACPI_BITREG_SLEEP_ENABLE                0x12
 
 /* PM2 Control register */
 
-#define ACPI_BITREG_ARB_DISABLE                 0x14
+#define ACPI_BITREG_ARB_DISABLE                 0x13
 
-#define ACPI_BITREG_MAX                         0x14
+#define ACPI_BITREG_MAX                         0x13
 #define ACPI_NUM_BITREG                         ACPI_BITREG_MAX + 1
 
+/* Status register values. A 1 clears a status bit. 0 = no effect */
+
+#define ACPI_CLEAR_STATUS                       1
+
+/* Enable and Control register values */
+
+#define ACPI_ENABLE_EVENT                       1
+#define ACPI_DISABLE_EVENT                      0
+
 /*
  * External ACPI object definition
  */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 0574add2a1e3..4927c063347c 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -84,7 +84,6 @@ struct acpi_processor_power {
         struct acpi_processor_cx *state;
         unsigned long bm_check_timestamp;
         u32 default_state;
-        u32 bm_activity;
         int count;
         struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
         int timer_broadcast_on_state;
@@ -322,7 +321,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr)
 int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
 int acpi_processor_get_throttling_info(struct acpi_processor *pr);
 extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state);
-extern struct file_operations acpi_processor_throttling_fops;
+extern const struct file_operations acpi_processor_throttling_fops;
 extern void acpi_processor_throttling_init(void);
 /* in processor_idle.c */
 int acpi_processor_power_init(struct acpi_processor *pr,
@@ -336,7 +335,7 @@ extern struct cpuidle_driver acpi_idle_driver;
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
-extern struct file_operations acpi_processor_limit_fops;
+extern const struct file_operations acpi_processor_limit_fops;
 extern struct thermal_cooling_device_ops processor_cooling_ops;
 #ifdef CONFIG_CPU_FREQ
 void acpi_thermal_cpufreq_init(void);
diff --git a/include/acpi/video.h b/include/acpi/video.h
new file mode 100644
index 000000000000..af6fe95fd3d0
--- /dev/null
+++ b/include/acpi/video.h
@@ -0,0 +1,13 @@
+#ifndef __ACPI_VIDEO_H
+#define __ACPI_VIDEO_H
+
+#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+extern int acpi_video_register(void);
+extern int acpi_video_exit(void);
+#else
+static inline int acpi_video_register(void) { return 0; }
+static inline void acpi_video_exit(void) { return; }
+#endif
+
+#endif
+
diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore
deleted file mode 100644
index e02c15d158fc..000000000000
--- a/include/asm-arm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-arch
-mach-types.h
diff --git a/include/asm-arm/plat-s3c24xx/regs-iis.h b/include/asm-arm/plat-s3c24xx/regs-iis.h
deleted file mode 100644
index a6f1d5df13b4..000000000000
--- a/include/asm-arm/plat-s3c24xx/regs-iis.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-iis.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2410 IIS register definition
-*/
-
-#ifndef __ASM_ARCH_REGS_IIS_H
-#define __ASM_ARCH_REGS_IIS_H
-
-#define S3C2410_IISCON   (0x00)
-
-#define S3C2410_IISCON_LRINDEX    (1<<8)
-#define S3C2410_IISCON_TXFIFORDY  (1<<7)
-#define S3C2410_IISCON_RXFIFORDY  (1<<6)
-#define S3C2410_IISCON_TXDMAEN    (1<<5)
-#define S3C2410_IISCON_RXDMAEN    (1<<4)
-#define S3C2410_IISCON_TXIDLE     (1<<3)
-#define S3C2410_IISCON_RXIDLE     (1<<2)
-#define S3C2410_IISCON_PSCEN      (1<<1)
-#define S3C2410_IISCON_IISEN      (1<<0)
-
-#define S3C2410_IISMOD   (0x04)
-
-#define S3C2440_IISMOD_MPLL       (1<<9)
-#define S3C2410_IISMOD_SLAVE      (1<<8)
-#define S3C2410_IISMOD_NOXFER     (0<<6)
-#define S3C2410_IISMOD_RXMODE     (1<<6)
-#define S3C2410_IISMOD_TXMODE     (2<<6)
-#define S3C2410_IISMOD_TXRXMODE   (3<<6)
-#define S3C2410_IISMOD_LR_LLOW    (0<<5)
-#define S3C2410_IISMOD_LR_RLOW    (1<<5)
-#define S3C2410_IISMOD_IIS        (0<<4)
-#define S3C2410_IISMOD_MSB        (1<<4)
-#define S3C2410_IISMOD_8BIT       (0<<3)
-#define S3C2410_IISMOD_16BIT      (1<<3)
-#define S3C2410_IISMOD_BITMASK    (1<<3)
-#define S3C2410_IISMOD_256FS      (0<<2)
-#define S3C2410_IISMOD_384FS      (1<<2)
-#define S3C2410_IISMOD_16FS       (0<<0)
-#define S3C2410_IISMOD_32FS       (1<<0)
-#define S3C2410_IISMOD_48FS       (2<<0)
-#define S3C2410_IISMOD_FS_MASK    (3<<0)
-
-#define S3C2410_IISPSR          (0x08)
-#define S3C2410_IISPSR_INTMASK  (31<<5)
-#define S3C2410_IISPSR_INTSHIFT (5)
-#define S3C2410_IISPSR_EXTMASK  (31<<0)
-#define S3C2410_IISPSR_EXTSHFIT (0)
-
-#define S3C2410_IISFCON  (0x0c)
-
-#define S3C2410_IISFCON_TXDMA     (1<<15)
-#define S3C2410_IISFCON_RXDMA     (1<<14)
-#define S3C2410_IISFCON_TXENABLE  (1<<13)
-#define S3C2410_IISFCON_RXENABLE  (1<<12)
-#define S3C2410_IISFCON_TXMASK    (0x3f << 6)
-#define S3C2410_IISFCON_TXSHIFT   (6)
-#define S3C2410_IISFCON_RXMASK    (0x3f)
-#define S3C2410_IISFCON_RXSHIFT   (0)
-
-#define S3C2400_IISFCON_TXDMA     (1<<11)
-#define S3C2400_IISFCON_RXDMA     (1<<10)
-#define S3C2400_IISFCON_TXENABLE  (1<<9)
-#define S3C2400_IISFCON_RXENABLE  (1<<8)
-#define S3C2400_IISFCON_TXMASK    (0x07 << 4)
-#define S3C2400_IISFCON_TXSHIFT   (4)
-#define S3C2400_IISFCON_RXMASK    (0x07)
-#define S3C2400_IISFCON_RXSHIFT   (0)
-
-#define S3C2410_IISFIFO  (0x10)
-#endif /* __ASM_ARCH_REGS_IIS_H */
diff --git a/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h b/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h
deleted file mode 100644
index 25d4058bcfed..000000000000
--- a/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h
- *
- * Copyright 2007 Simtec Electronics <linux@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * 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.
- *
- * S3C2412 IIS register definition
-*/
-
-#ifndef __ASM_ARCH_REGS_S3C2412_IIS_H
-#define __ASM_ARCH_REGS_S3C2412_IIS_H
-
-#define S3C2412_IISCON                  (0x00)
-#define S3C2412_IISMOD                  (0x04)
-#define S3C2412_IISFIC                  (0x08)
-#define S3C2412_IISPSR                  (0x0C)
-#define S3C2412_IISTXD                  (0x10)
-#define S3C2412_IISRXD                  (0x14)
-
-#define S3C2412_IISCON_LRINDEX          (1 << 11)
-#define S3C2412_IISCON_TXFIFO_EMPTY     (1 << 10)
-#define S3C2412_IISCON_RXFIFO_EMPTY     (1 << 9)
-#define S3C2412_IISCON_TXFIFO_FULL      (1 << 8)
-#define S3C2412_IISCON_RXFIFO_FULL      (1 << 7)
-#define S3C2412_IISCON_TXDMA_PAUSE      (1 << 6)
-#define S3C2412_IISCON_RXDMA_PAUSE      (1 << 5)
-#define S3C2412_IISCON_TXCH_PAUSE       (1 << 4)
-#define S3C2412_IISCON_RXCH_PAUSE       (1 << 3)
-#define S3C2412_IISCON_TXDMA_ACTIVE     (1 << 2)
-#define S3C2412_IISCON_RXDMA_ACTIVE     (1 << 1)
-#define S3C2412_IISCON_IIS_ACTIVE       (1 << 0)
-
-#define S3C2412_IISMOD_MASTER_INTERNAL  (0 << 10)
-#define S3C2412_IISMOD_MASTER_EXTERNAL  (1 << 10)
-#define S3C2412_IISMOD_SLAVE            (2 << 10)
-#define S3C2412_IISMOD_MASTER_MASK      (3 << 10)
-#define S3C2412_IISMOD_MODE_TXONLY      (0 << 8)
-#define S3C2412_IISMOD_MODE_RXONLY      (1 << 8)
-#define S3C2412_IISMOD_MODE_TXRX        (2 << 8)
-#define S3C2412_IISMOD_MODE_MASK        (3 << 8)
-#define S3C2412_IISMOD_LR_LLOW          (0 << 7)
-#define S3C2412_IISMOD_LR_RLOW          (1 << 7)
-#define S3C2412_IISMOD_SDF_IIS          (0 << 5)
-#define S3C2412_IISMOD_SDF_MSB          (0 << 5)
-#define S3C2412_IISMOD_SDF_LSB          (0 << 5)
-#define S3C2412_IISMOD_SDF_MASK         (3 << 5)
-#define S3C2412_IISMOD_RCLK_256FS       (0 << 3)
-#define S3C2412_IISMOD_RCLK_512FS       (1 << 3)
-#define S3C2412_IISMOD_RCLK_384FS       (2 << 3)
-#define S3C2412_IISMOD_RCLK_768FS       (3 << 3)
-#define S3C2412_IISMOD_RCLK_MASK        (3 << 3)
-#define S3C2412_IISMOD_BCLK_32FS        (0 << 1)
-#define S3C2412_IISMOD_BCLK_48FS        (1 << 1)
-#define S3C2412_IISMOD_BCLK_16FS        (2 << 1)
-#define S3C2412_IISMOD_BCLK_24FS        (3 << 1)
-#define S3C2412_IISMOD_BCLK_MASK        (3 << 1)
-#define S3C2412_IISMOD_8BIT             (1 << 0)
-
-#define S3C2412_IISPSR_PSREN            (1 << 15)
-
-#define S3C2412_IISFIC_TXFLUSH          (1 << 15)
-#define S3C2412_IISFIC_RXFLUSH          (1 << 7)
-#define S3C2412_IISFIC_TXCOUNT(x)       (((x) >>  8) & 0xf)
-#define S3C2412_IISFIC_RXCOUNT(x)       (((x) >>  0) & 0xf)
-
-
-
-#endif /* __ASM_ARCH_REGS_S3C2412_IIS_H */
-
diff --git a/include/asm-frv/Kbuild b/include/asm-frv/Kbuild
deleted file mode 100644
index 0f8956def738..000000000000
--- a/include/asm-frv/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-header-y += registers.h
-
-unifdef-y += termios.h
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
deleted file mode 100644
index 296c35cfb207..000000000000
--- a/include/asm-frv/atomic.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* atomic.h: atomic operation emulation for FR-V
- *
- * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/frv/atomic-ops.txt
- *
- * Copyright (C) 2004 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 _ASM_ATOMIC_H
-#define _ASM_ATOMIC_H
-
-#include <linux/types.h>
-#include <asm/spr-regs.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_SMP
-#error not SMP safe
-#endif
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- *
- * We do not have SMP systems, so we don't have to deal with that.
- */
-
-/* Atomic operations are already serializing */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-
-#define ATOMIC_INIT(i)          { (i) }
-#define atomic_read(v)          ((v)->counter)
-#define atomic_set(v, i)        (((v)->counter) = (i))
-
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long val;
-
-        asm("0:                                         \n"
-            "   orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-            "   ckeq            icc3,cc7                \n"
-            "   ld.p            %M0,%1                  \n"     /* LD.P/ORCR must be atomic */
-            "   orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-            "   add%I2          %1,%2,%1                \n"
-            "   cst.p           %1,%M0          ,cc3,#1 \n"
-            "   corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* clear ICC3.Z if store happens */
-            "   beq             icc3,#0,0b              \n"
-            : "+U"(v->counter), "=&r"(val)
-            : "NPr"(i)
-            : "memory", "cc7", "cc3", "icc3"
-            );
-
-        return val;
-}
-
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long val;
-
-        asm("0:                                         \n"
-            "   orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-            "   ckeq            icc3,cc7                \n"
-            "   ld.p            %M0,%1                  \n"     /* LD.P/ORCR must be atomic */
-            "   orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-            "   sub%I2          %1,%2,%1                \n"
-            "   cst.p           %1,%M0          ,cc3,#1 \n"
-            "   corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* clear ICC3.Z if store happens */
-            "   beq             icc3,#0,0b              \n"
-            : "+U"(v->counter), "=&r"(val)
-            : "NPr"(i)
-            : "memory", "cc7", "cc3", "icc3"
-            );
-
-        return val;
-}
-
-#else
-
-extern int atomic_add_return(int i, atomic_t *v);
-extern int atomic_sub_return(int i, atomic_t *v);
-
-#endif
-
-static inline int atomic_add_negative(int i, atomic_t *v)
-{
-        return atomic_add_return(i, v) < 0;
-}
-
-static inline void atomic_add(int i, atomic_t *v)
-{
-        atomic_add_return(i, v);
-}
-
-static inline void atomic_sub(int i, atomic_t *v)
-{
-        atomic_sub_return(i, v);
-}
-
-static inline void atomic_inc(atomic_t *v)
-{
-        atomic_add_return(1, v);
-}
-
-static inline void atomic_dec(atomic_t *v)
-{
-        atomic_sub_return(1, v);
-}
-
-#define atomic_dec_return(v)            atomic_sub_return(1, (v))
-#define atomic_inc_return(v)            atomic_add_return(1, (v))
-
-#define atomic_sub_and_test(i,v)        (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v)          (atomic_sub_return(1, (v)) == 0)
-#define atomic_inc_and_test(v)          (atomic_add_return(1, (v)) == 0)
-
-/*****************************************************************************/
-/*
- * exchange value with memory
- */
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-
-#define xchg(ptr, x)                                                            \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig;                                           \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4:                                                                 \
-                asm volatile(                                                   \
-                        "swap%I0 %M0,%1"                                        \
-                        : "+m"(*__xg_ptr), "=r"(__xg_orig)                      \
-                        : "1"(x)                                                \
-                        : "memory"                                              \
-                        );                                                      \
-                break;                                                          \
-                                                                                \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-
-#else
-
-extern uint32_t __xchg_32(uint32_t i, volatile void *v);
-
-#define xchg(ptr, x)                                                                            \
-({                                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                                       \
-        __typeof__(*(ptr)) __xg_orig;                                                           \
-                                                                                                \
-        switch (sizeof(__xg_orig)) {                                                            \
-        case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr);     break;  \
-        default:                                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                                                                   \
-                asm volatile("break");                                                          \
-                break;                                                                          \
-        }                                                                                       \
-        __xg_orig;                                                                              \
-})
-
-#endif
-
-#define tas(ptr) (xchg((ptr), 1))
-
-#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), old, new))
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
-static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
-{
-        int c, old;
-        c = atomic_read(v);
-        for (;;) {
-                if (unlikely(c == (u)))
-                        break;
-                old = atomic_cmpxchg((v), c, c + (a));
-                if (likely(old == c))
-                        break;
-                c = old;
-        }
-        return c != (u);
-}
-
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-#include <asm-generic/atomic.h>
-#endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-frv/auxvec.h b/include/asm-frv/auxvec.h
deleted file mode 100644
index 07710778fa10..000000000000
--- a/include/asm-frv/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __FRV_AUXVEC_H
-#define __FRV_AUXVEC_H
-
-#endif
diff --git a/include/asm-frv/ax88796.h b/include/asm-frv/ax88796.h
deleted file mode 100644
index 637e980393c5..000000000000
--- a/include/asm-frv/ax88796.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ax88796.h: access points to the driver for the AX88796 NE2000 clone
- *
- * Copyright (C) 2004 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 _ASM_AX88796_H
-#define _ASM_AX88796_H
-
-#include <asm/mb-regs.h>
-
-#define AX88796_IOADDR          (__region_CS1 + 0x200)
-#define AX88796_IRQ             IRQ_CPU_EXTERNAL7
-#define AX88796_FULL_DUPLEX     0                       /* force full duplex */
-#define AX88796_BUS_INFO        "CS1#+0x200"            /* bus info for ethtool */
-
-#endif /* _ASM_AX88796_H */
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
deleted file mode 100644
index 287f6f697ce2..000000000000
--- a/include/asm-frv/bitops.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/* bitops.h: bit operations for the Fujitsu FR-V CPUs
- *
- * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/frv/atomic-ops.txt
- *
- * Copyright (C) 2004 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 _ASM_BITOPS_H
-#define _ASM_BITOPS_H
-
-#include <linux/compiler.h>
-#include <asm/byteorder.h>
-
-#ifdef __KERNEL__
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <asm-generic/bitops/ffz.h>
-
-/*
- * clear_bit() doesn't provide any barrier for the compiler.
- */
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-static inline
-unsigned long atomic_test_and_ANDNOT_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       and%I3          %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(~mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-
-        return old;
-}
-
-static inline
-unsigned long atomic_test_and_OR_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       or%I3           %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-
-        return old;
-}
-
-static inline
-unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       xor%I3          %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-
-        return old;
-}
-
-#else
-
-extern unsigned long atomic_test_and_ANDNOT_mask(unsigned long mask, volatile unsigned long *v);
-extern unsigned long atomic_test_and_OR_mask(unsigned long mask, volatile unsigned long *v);
-extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsigned long *v);
-
-#endif
-
-#define atomic_clear_mask(mask, v)      atomic_test_and_ANDNOT_mask((mask), (v))
-#define atomic_set_mask(mask, v)        atomic_test_and_OR_mask((mask), (v))
-
-static inline int test_and_clear_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_ANDNOT_mask(mask, ptr) & mask) != 0;
-}
-
-static inline int test_and_set_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_OR_mask(mask, ptr) & mask) != 0;
-}
-
-static inline int test_and_change_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_XOR_mask(mask, ptr) & mask) != 0;
-}
-
-static inline void clear_bit(int nr, volatile void *addr)
-{
-        test_and_clear_bit(nr, addr);
-}
-
-static inline void set_bit(int nr, volatile void *addr)
-{
-        test_and_set_bit(nr, addr);
-}
-
-static inline void change_bit(int nr, volatile void * addr)
-{
-        test_and_change_bit(nr, addr);
-}
-
-static inline void __clear_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a &= ~mask;
-}
-
-static inline void __set_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a |= mask;
-}
-
-static inline void __change_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a ^= mask;
-}
-
-static inline int __test_and_clear_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a &= ~mask;
-        return retval;
-}
-
-static inline int __test_and_set_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a |= mask;
-        return retval;
-}
-
-static inline int __test_and_change_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-        return retval;
-}
-
-/*
- * This routine doesn't need to be atomic.
- */
-static inline int __constant_test_bit(int nr, const volatile void * addr)
-{
-        return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
-}
-
-static inline int __test_bit(int nr, const volatile void * addr)
-{
-        int     * a = (int *) addr;
-        int     mask;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        return ((mask & *a) != 0);
-}
-
-#define test_bit(nr,addr) \
-(__builtin_constant_p(nr) ? \
- __constant_test_bit((nr),(addr)) : \
- __test_bit((nr),(addr)))
-
-#include <asm-generic/bitops/find.h>
-
-/**
- * fls - find last bit set
- * @x: the word to search
- *
- * This is defined the same way as ffs:
- * - return 32..1 to indicate bit 31..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-#define fls(x)                                          \
-({                                                      \
-        int bit;                                        \
-                                                        \
-        asm("   subcc   %1,gr0,gr0,icc0         \n"     \
-            "   ckne    icc0,cc4                \n"     \
-            "   cscan.p %1,gr0,%0       ,cc4,#1 \n"     \
-            "   csub    %0,%0,%0        ,cc4,#0 \n"     \
-            "   csub    %2,%0,%0        ,cc4,#1 \n"     \
-            : "=&r"(bit)                                \
-            : "r"(x), "r"(32)                           \
-            : "icc0", "cc4"                             \
-            );                                          \
-                                                        \
-        bit;                                            \
-})
-
-/**
- * fls64 - find last bit set in a 64-bit value
- * @n: the value to search
- *
- * This is defined the same way as ffs:
- * - return 64..1 to indicate bit 63..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int fls64(u64 n)
-{
-        union {
-                u64 ll;
-                struct { u32 h, l; };
-        } _;
-        int bit, x, y;
-
-        _.ll = n;
-
-        asm("   subcc.p         %3,gr0,gr0,icc0         \n"
-            "   subcc           %4,gr0,gr0,icc1         \n"
-            "   ckne            icc0,cc4                \n"
-            "   ckne            icc1,cc5                \n"
-            "   norcr           cc4,cc5,cc6             \n"
-            "   csub.p          %0,%0,%0        ,cc6,1  \n"
-            "   orcr            cc5,cc4,cc4             \n"
-            "   andcr           cc4,cc5,cc4             \n"
-            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
-            "   setlos          #64,%1                  \n"
-            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
-            "   setlos          #32,%2                  \n"
-            "   csub.p          %1,%0,%0        ,cc4,0  \n"
-            "   csub            %2,%0,%0        ,cc4,1  \n"
-            : "=&r"(bit), "=r"(x), "=r"(y)
-            : "0r"(_.h), "r"(_.l)
-            : "icc0", "icc1", "cc4", "cc5", "cc6"
-            );
-        return bit;
-
-}
-
-/**
- * ffs - find first bit set
- * @x: the word to search
- *
- * - return 32..1 to indicate bit 31..0 most least significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int ffs(int x)
-{
-        /* Note: (x & -x) gives us a mask that is the least significant
-         * (rightmost) 1-bit of the value in x.
-         */
-        return fls(x & -x);
-}
-
-/**
- * __ffs - find first bit set
- * @x: the word to search
- *
- * - return 31..0 to indicate bit 31..0 most least significant bit set
- * - if no bits are set in x, the result is undefined
- */
-static inline __attribute__((const))
-int __ffs(unsigned long x)
-{
-        int bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(x & -x));
-        return 31 - bit;
-}
-
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __fls(unsigned long word)
-{
-        unsigned long bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(word));
-        return bit;
-}
-
-/*
- * special slimline version of fls() for calculating ilog2_u32()
- * - note: no protection against n == 0
- */
-#define ARCH_HAS_ILOG2_U32
-static inline __attribute__((const))
-int __ilog2_u32(u32 n)
-{
-        int bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(n));
-        return 31 - bit;
-}
-
-/*
- * special slimline version of fls64() for calculating ilog2_u64()
- * - note: no protection against n == 0
- */
-#define ARCH_HAS_ILOG2_U64
-static inline __attribute__((const))
-int __ilog2_u64(u64 n)
-{
-        union {
-                u64 ll;
-                struct { u32 h, l; };
-        } _;
-        int bit, x, y;
-
-        _.ll = n;
-
-        asm("   subcc           %3,gr0,gr0,icc0         \n"
-            "   ckeq            icc0,cc4                \n"
-            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
-            "   setlos          #63,%1                  \n"
-            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
-            "   setlos          #31,%2                  \n"
-            "   csub.p          %1,%0,%0        ,cc4,0  \n"
-            "   csub            %2,%0,%0        ,cc4,1  \n"
-            : "=&r"(bit), "=r"(x), "=r"(y)
-            : "0r"(_.h), "r"(_.l)
-            : "icc0", "cc4"
-            );
-        return bit;
-}
-
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-
-#include <asm-generic/bitops/ext2-non-atomic.h>
-
-#define ext2_set_bit_atomic(lock,nr,addr)       test_and_set_bit  ((nr) ^ 0x18, (addr))
-#define ext2_clear_bit_atomic(lock,nr,addr)     test_and_clear_bit((nr) ^ 0x18, (addr))
-
-#include <asm-generic/bitops/minix-le.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_BITOPS_H */
diff --git a/include/asm-frv/bug.h b/include/asm-frv/bug.h
deleted file mode 100644
index 6b1b44d71028..000000000000
--- a/include/asm-frv/bug.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* bug.h: FRV bug trapping
- *
- * Copyright (C) 2004 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 _ASM_BUG_H
-#define _ASM_BUG_H
-
-#include <linux/linkage.h>
-
-#ifdef CONFIG_BUG
-/*
- * Tell the user there is some problem.
- */
-extern asmlinkage void __debug_bug_trap(int signr);
-
-#ifdef CONFIG_NO_KERNEL_MSG
-#define _debug_bug_printk()
-#else
-extern void __debug_bug_printk(const char *file, unsigned line);
-#define _debug_bug_printk() __debug_bug_printk(__FILE__, __LINE__)
-#endif
-
-#define _debug_bug_trap(signr)                  \
-do {                                            \
-        __debug_bug_trap(signr);                \
-        asm volatile("nop");                    \
-} while(0)
-
-#define HAVE_ARCH_BUG
-#define BUG()                                   \
-do {                                            \
-        _debug_bug_printk();                    \
-        _debug_bug_trap(6 /*SIGABRT*/);         \
-} while (0)
-
-#ifdef CONFIG_GDBSTUB
-#define HAVE_ARCH_KGDB_RAISE
-#define kgdb_raise(signr) do { _debug_bug_trap(signr); } while(0)
-
-#define HAVE_ARCH_KGDB_BAD_PAGE
-#define kgdb_bad_page(page) do { kgdb_raise(SIGABRT); } while(0)
-#endif
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif
diff --git a/include/asm-frv/bugs.h b/include/asm-frv/bugs.h
deleted file mode 100644
index f2382be2b46c..000000000000
--- a/include/asm-frv/bugs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* bugs.h: arch bug checking entry
- *
- * 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.
- */
-
-static inline void check_bugs(void)
-{
-}
diff --git a/include/asm-frv/busctl-regs.h b/include/asm-frv/busctl-regs.h
deleted file mode 100644
index bb0ff4816e27..000000000000
--- a/include/asm-frv/busctl-regs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* busctl-regs.h: FR400-series CPU bus controller registers
- *
- * 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 _ASM_BUSCTL_REGS_H
-#define _ASM_BUSCTL_REGS_H
-
-/* bus controller registers */
-#define __get_LGCR()    ({ *(volatile unsigned long *)(0xfe000010); })
-#define __get_LMAICR()  ({ *(volatile unsigned long *)(0xfe000030); })
-#define __get_LEMBR()   ({ *(volatile unsigned long *)(0xfe000040); })
-#define __get_LEMAM()   ({ *(volatile unsigned long *)(0xfe000048); })
-#define __get_LCR(R)    ({ *(volatile unsigned long *)(0xfe000100 + 8*(R)); })
-#define __get_LSBR(R)   ({ *(volatile unsigned long *)(0xfe000c00 + 8*(R)); })
-#define __get_LSAM(R)   ({ *(volatile unsigned long *)(0xfe000d00 + 8*(R)); })
-
-#define __set_LGCR(V)   do { *(volatile unsigned long *)(0xfe000010) = (V); } while(0)
-#define __set_LMAICR(V) do { *(volatile unsigned long *)(0xfe000030) = (V); } while(0)
-#define __set_LEMBR(V)  do { *(volatile unsigned long *)(0xfe000040) = (V); } while(0)
-#define __set_LEMAM(V)  do { *(volatile unsigned long *)(0xfe000048) = (V); } while(0)
-#define __set_LCR(R,V)  do { *(volatile unsigned long *)(0xfe000100 + 8*(R)) = (V); } while(0)
-#define __set_LSBR(R,V) do { *(volatile unsigned long *)(0xfe000c00 + 8*(R)) = (V); } while(0)
-#define __set_LSAM(R,V) do { *(volatile unsigned long *)(0xfe000d00 + 8*(R)) = (V); } while(0)
-
-/* FR401 SDRAM controller registers */
-#define __get_DBR(R)    ({ *(volatile unsigned long *)(0xfe000e00 + 8*(R)); })
-#define __get_DAM(R)    ({ *(volatile unsigned long *)(0xfe000f00 + 8*(R)); })
-
-/* FR551 SDRAM controller registers */
-#define __get_DARS(R)   ({ *(volatile unsigned long *)(0xfeff0100 + 8*(R)); })
-#define __get_DAMK(R)   ({ *(volatile unsigned long *)(0xfeff0110 + 8*(R)); })
-
-
-#endif /* _ASM_BUSCTL_REGS_H */
diff --git a/include/asm-frv/byteorder.h b/include/asm-frv/byteorder.h
deleted file mode 100644
index f29b7593e088..000000000000
--- a/include/asm-frv/byteorder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_BYTEORDER_H
-#define _ASM_BYTEORDER_H
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _ASM_BYTEORDER_H */
diff --git a/include/asm-frv/cache.h b/include/asm-frv/cache.h
deleted file mode 100644
index 2797163b8f4f..000000000000
--- a/include/asm-frv/cache.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* cache.h: FRV cache definitions
- *
- * Copyright (C) 2004 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 __ASM_CACHE_H
-#define __ASM_CACHE_H
-
-
-/* bytes per L1 cache line */
-#define L1_CACHE_SHIFT          (CONFIG_FRV_L1_CACHE_SHIFT)
-#define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)
-
-#define __cacheline_aligned     __attribute__((aligned(L1_CACHE_BYTES)))
-#define ____cacheline_aligned   __attribute__((aligned(L1_CACHE_BYTES)))
-
-#endif
diff --git a/include/asm-frv/cacheflush.h b/include/asm-frv/cacheflush.h
deleted file mode 100644
index 432a69e7f3d4..000000000000
--- a/include/asm-frv/cacheflush.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* cacheflush.h: FRV cache flushing routines
- *
- * Copyright (C) 2004 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 _ASM_CACHEFLUSH_H
-#define _ASM_CACHEFLUSH_H
-
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-
-/*
- * virtually-indexed cache management (our cache is physically indexed)
- */
-#define flush_cache_all()                       do {} while(0)
-#define flush_cache_mm(mm)                      do {} while(0)
-#define flush_cache_dup_mm(mm)                  do {} while(0)
-#define flush_cache_range(mm, start, end)       do {} while(0)
-#define flush_cache_page(vma, vmaddr, pfn)      do {} while(0)
-#define flush_cache_vmap(start, end)            do {} while(0)
-#define flush_cache_vunmap(start, end)          do {} while(0)
-#define flush_dcache_mmap_lock(mapping)         do {} while(0)
-#define flush_dcache_mmap_unlock(mapping)       do {} while(0)
-
-/*
- * physically-indexed cache management
- * - see arch/frv/lib/cache.S
- */
-extern void frv_dcache_writeback(unsigned long start, unsigned long size);
-extern void frv_cache_invalidate(unsigned long start, unsigned long size);
-extern void frv_icache_invalidate(unsigned long start, unsigned long size);
-extern void frv_cache_wback_inv(unsigned long start, unsigned long size);
-
-static inline void __flush_cache_all(void)
-{
-        asm volatile("  dcef    @(gr0,gr0),#1   \n"
-                     "  icei    @(gr0,gr0),#1   \n"
-                     "  membar                  \n"
-                     : : : "memory"
-                     );
-}
-
-/* dcache/icache coherency... */
-#ifdef CONFIG_MMU
-extern void flush_dcache_page(struct page *page);
-#else
-static inline void flush_dcache_page(struct page *page)
-{
-        unsigned long addr = page_to_phys(page);
-        frv_dcache_writeback(addr, addr + PAGE_SIZE);
-}
-#endif
-
-static inline void flush_page_to_ram(struct page *page)
-{
-        flush_dcache_page(page);
-}
-
-static inline void flush_icache(void)
-{
-        __flush_cache_all();
-}
-
-static inline void flush_icache_range(unsigned long start, unsigned long end)
-{
-        frv_cache_wback_inv(start, end);
-}
-
-#ifdef CONFIG_MMU
-extern void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                                    unsigned long start, unsigned long len);
-#else
-static inline void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                                           unsigned long start, unsigned long len)
-{
-        frv_cache_wback_inv(start, start + len);
-}
-#endif
-
-static inline void flush_icache_page(struct vm_area_struct *vma, struct page *page)
-{
-        flush_icache_user_range(vma, page, page_to_phys(page), PAGE_SIZE);
-}
-
-/*
- * permit ptrace to access another process's address space through the icache
- * and the dcache
- */
-#define copy_to_user_page(vma, page, vaddr, dst, src, len)      \
-do {                                                            \
-        memcpy((dst), (src), (len));                            \
-        flush_icache_user_range((vma), (page), (vaddr), (len)); \
-} while(0)
-
-#define copy_from_user_page(vma, page, vaddr, dst, src, len)    \
-        memcpy((dst), (src), (len))
-
-#endif /* _ASM_CACHEFLUSH_H */
diff --git a/include/asm-frv/checksum.h b/include/asm-frv/checksum.h
deleted file mode 100644
index 269da09ff637..000000000000
--- a/include/asm-frv/checksum.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* checksum.h: FRV checksumming
- *
- * Copyright (C) 2004 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 _ASM_CHECKSUM_H
-#define _ASM_CHECKSUM_H
-
-#include <linux/in6.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * the same as csum_partial, but copies from src while it
- * checksums
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
-
-/*
- * the same as csum_partial_copy, but copies from user space.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
-                                                int len, __wsum sum, int *csum_err);
-
-/*
- *      This is a version of ip_compute_csum() optimized for IP headers,
- *      which always checksum on 4 octet boundaries.
- *
- */
-static inline
-__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-        unsigned int tmp, inc, sum = 0;
-
-        asm("   addcc           gr0,gr0,gr0,icc0\n" /* clear icc0.C */
-            "   subi            %1,#4,%1        \n"
-            "0:                                 \n"
-            "   ldu.p           @(%1,%3),%4     \n"
-            "   subicc          %2,#1,%2,icc1   \n"
-            "   addxcc.p        %4,%0,%0,icc0   \n"
-            "   bhi             icc1,#2,0b      \n"
-
-            /* fold the 33-bit result into 16-bits */
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            "   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-
-            : "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (inc), "=&r"(tmp)
-            : "0" (sum), "1" (iph), "2" (ihl), "3" (4),
-            "m"(*(volatile struct { int _[100]; } *)iph)
-            : "icc0", "icc1", "memory"
-            );
-
-        return (__force __sum16)~sum;
-}
-
-/*
- *      Fold a partial checksum
- */
-static inline __sum16 csum_fold(__wsum sum)
-{
-        unsigned int tmp;
-
-        asm("   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-            : "=r"(sum), "=&r"(tmp)
-            : "0"(sum)
-            );
-
-        return (__force __sum16)~sum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
-{
-        asm("   addcc           %1,%0,%0,icc0   \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   addxcc          %3,%0,%0,icc0   \n"
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            : "=r" (sum)
-            : "r" (daddr), "r" (saddr), "r" (len + proto), "0"(sum)
-            : "icc0"
-            );
-        return sum;
-}
-
-static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-extern __sum16 ip_compute_csum(const void *buff, int len);
-
-#define _HAVE_ARCH_IPV6_CSUM
-static inline __sum16
-csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-                __u32 len, unsigned short proto, __wsum sum)
-{
-        unsigned long tmp, tmp2;
-
-        asm("   addcc           %2,%0,%0,icc0   \n"
-
-            /* add up the source addr */
-            "   ldi             @(%3,0),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%3,4),%2      \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   ldi             @(%3,8),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%3,12),%2     \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-
-            /* add up the dest addr */
-            "   ldi             @(%4,0),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%4,4),%2      \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   ldi             @(%4,8),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%4,12),%2     \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-
-            /* fold the 33-bit result into 16-bits */
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            "   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-
-            : "=r" (sum), "=&r" (tmp), "=r" (tmp2)
-            : "r" (saddr), "r" (daddr), "0" (sum), "2" (len + proto)
-            : "icc0"
-            );
-
-        return (__force __sum16)~sum;
-}
-
-#endif /* _ASM_CHECKSUM_H */
diff --git a/include/asm-frv/cpu-irqs.h b/include/asm-frv/cpu-irqs.h
deleted file mode 100644
index 478f3498fcfe..000000000000
--- a/include/asm-frv/cpu-irqs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* cpu-irqs.h: on-CPU peripheral irqs
- *
- * Copyright (C) 2004 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 _ASM_CPU_IRQS_H
-#define _ASM_CPU_IRQS_H
-
-#ifndef __ASSEMBLY__
-
-/* IRQ to level mappings */
-#define IRQ_GDBSTUB_LEVEL       15
-#define IRQ_UART_LEVEL          13
-
-#ifdef CONFIG_GDBSTUB_UART0
-#define IRQ_UART0_LEVEL         IRQ_GDBSTUB_LEVEL
-#else
-#define IRQ_UART0_LEVEL         IRQ_UART_LEVEL
-#endif
-
-#ifdef CONFIG_GDBSTUB_UART1
-#define IRQ_UART1_LEVEL         IRQ_GDBSTUB_LEVEL
-#else
-#define IRQ_UART1_LEVEL         IRQ_UART_LEVEL
-#endif
-
-#define IRQ_DMA0_LEVEL          14
-#define IRQ_DMA1_LEVEL          14
-#define IRQ_DMA2_LEVEL          14
-#define IRQ_DMA3_LEVEL          14
-#define IRQ_DMA4_LEVEL          14
-#define IRQ_DMA5_LEVEL          14
-#define IRQ_DMA6_LEVEL          14
-#define IRQ_DMA7_LEVEL          14
-
-#define IRQ_TIMER0_LEVEL        12
-#define IRQ_TIMER1_LEVEL        11
-#define IRQ_TIMER2_LEVEL        10
-
-#define IRQ_XIRQ0_LEVEL         1
-#define IRQ_XIRQ1_LEVEL         2
-#define IRQ_XIRQ2_LEVEL         3
-#define IRQ_XIRQ3_LEVEL         4
-#define IRQ_XIRQ4_LEVEL         5
-#define IRQ_XIRQ5_LEVEL         6
-#define IRQ_XIRQ6_LEVEL         7
-#define IRQ_XIRQ7_LEVEL         8
-
-/* IRQ IDs presented to drivers */
-#define IRQ_CPU__UNUSED         IRQ_BASE_CPU
-#define IRQ_CPU_UART0           (IRQ_BASE_CPU + IRQ_UART0_LEVEL)
-#define IRQ_CPU_UART1           (IRQ_BASE_CPU + IRQ_UART1_LEVEL)
-#define IRQ_CPU_TIMER0          (IRQ_BASE_CPU + IRQ_TIMER0_LEVEL)
-#define IRQ_CPU_TIMER1          (IRQ_BASE_CPU + IRQ_TIMER1_LEVEL)
-#define IRQ_CPU_TIMER2          (IRQ_BASE_CPU + IRQ_TIMER2_LEVEL)
-#define IRQ_CPU_DMA0            (IRQ_BASE_CPU + IRQ_DMA0_LEVEL)
-#define IRQ_CPU_DMA1            (IRQ_BASE_CPU + IRQ_DMA1_LEVEL)
-#define IRQ_CPU_DMA2            (IRQ_BASE_CPU + IRQ_DMA2_LEVEL)
-#define IRQ_CPU_DMA3            (IRQ_BASE_CPU + IRQ_DMA3_LEVEL)
-#define IRQ_CPU_DMA4            (IRQ_BASE_CPU + IRQ_DMA4_LEVEL)
-#define IRQ_CPU_DMA5            (IRQ_BASE_CPU + IRQ_DMA5_LEVEL)
-#define IRQ_CPU_DMA6            (IRQ_BASE_CPU + IRQ_DMA6_LEVEL)
-#define IRQ_CPU_DMA7            (IRQ_BASE_CPU + IRQ_DMA7_LEVEL)
-#define IRQ_CPU_EXTERNAL0       (IRQ_BASE_CPU + IRQ_XIRQ0_LEVEL)
-#define IRQ_CPU_EXTERNAL1       (IRQ_BASE_CPU + IRQ_XIRQ1_LEVEL)
-#define IRQ_CPU_EXTERNAL2       (IRQ_BASE_CPU + IRQ_XIRQ2_LEVEL)
-#define IRQ_CPU_EXTERNAL3       (IRQ_BASE_CPU + IRQ_XIRQ3_LEVEL)
-#define IRQ_CPU_EXTERNAL4       (IRQ_BASE_CPU + IRQ_XIRQ4_LEVEL)
-#define IRQ_CPU_EXTERNAL5       (IRQ_BASE_CPU + IRQ_XIRQ5_LEVEL)
-#define IRQ_CPU_EXTERNAL6       (IRQ_BASE_CPU + IRQ_XIRQ6_LEVEL)
-#define IRQ_CPU_EXTERNAL7       (IRQ_BASE_CPU + IRQ_XIRQ7_LEVEL)
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_CPU_IRQS_H */
diff --git a/include/asm-frv/cpumask.h b/include/asm-frv/cpumask.h
deleted file mode 100644
index d999c20c84d2..000000000000
--- a/include/asm-frv/cpumask.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUMASK_H
-#define _ASM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_CPUMASK_H */
diff --git a/include/asm-frv/cputime.h b/include/asm-frv/cputime.h
deleted file mode 100644
index f6c373ad2b80..000000000000
--- a/include/asm-frv/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUTIME_H
-#define _ASM_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* _ASM_CPUTIME_H */
diff --git a/include/asm-frv/current.h b/include/asm-frv/current.h
deleted file mode 100644
index 86b027491b08..000000000000
--- a/include/asm-frv/current.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* current.h: FRV current task pointer
- *
- * Copyright (C) 2004 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 _ASM_CURRENT_H
-#define _ASM_CURRENT_H
-
-#ifndef __ASSEMBLY__
-
-/*
- * dedicate GR29 to keeping the current task pointer
- */
-register struct task_struct *current asm("gr29");
-
-#define get_current() current
-
-#else
-
-#define CURRENT gr29
-
-#endif
-
-#endif /* _ASM_CURRENT_H */
diff --git a/include/asm-frv/delay.h b/include/asm-frv/delay.h
deleted file mode 100644
index 597b4ebf03b4..000000000000
--- a/include/asm-frv/delay.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* delay.h: FRV delay code
- *
- * 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 _ASM_DELAY_H
-#define _ASM_DELAY_H
-
-#include <asm/param.h>
-#include <asm/timer-regs.h>
-
-/*
- * delay loop - runs at __core_clock_speed_HZ / 2 [there are 2 insns in the loop]
- */
-extern unsigned long __delay_loops_MHz;
-
-static inline void __delay(unsigned long loops)
-{
-        asm volatile("1:        subicc  %0,#1,%0,icc0   \n"
-                     "          bnc     icc0,#2,1b      \n"
-                     : "=r" (loops)
-                     : "0" (loops)
-                     : "icc0"
-                     );
-}
-
-/*
- * Use only for very small delays ( < 1 msec).  Should probably use a
- * lookup table, really, as the multiplications take much too long with
- * short delays.  This is a "reasonable" implementation, though (and the
- * first constant multiplications gets optimized away if the delay is
- * a constant)
- */
-
-extern unsigned long loops_per_jiffy;
-
-static inline void udelay(unsigned long usecs)
-{
-        __delay(usecs * __delay_loops_MHz);
-}
-
-#define ndelay(n)       udelay((n) * 5)
-
-#endif /* _ASM_DELAY_H */
diff --git a/include/asm-frv/device.h b/include/asm-frv/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-frv/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/include/asm-frv/div64.h b/include/asm-frv/div64.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/include/asm-frv/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/include/asm-frv/dm9000.h b/include/asm-frv/dm9000.h
deleted file mode 100644
index f6f48fd9ec6e..000000000000
--- a/include/asm-frv/dm9000.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* dm9000.h: Davicom DM9000 adapter configuration
- *
- * Copyright (C) 2004 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 _ASM_DM9000_H
-#define _ASM_DM9000_H
-
-#include <asm/mb-regs.h>
-
-#define DM9000_ARCH_IOBASE      (__region_CS6 + 0x300)
-#define DM9000_ARCH_IRQ         IRQ_CPU_EXTERNAL3       /* XIRQ #3 (shared with FPGA) */
-#undef DM9000_ARCH_IRQ_ACTLOW                           /* IRQ pin active high */
-#define DM9000_ARCH_BUS_INFO    "CS6#+0x300"            /* bus info for ethtool */
-
-#undef __is_PCI_IO
-#define __is_PCI_IO(addr)       0       /* not PCI */
-
-#undef inl
-#define inl(addr)                                                                               \
-({                                                                                              \
-        unsigned long __ioaddr = (unsigned long) addr;                                          \
-        uint32_t x = readl(__ioaddr);                                                           \
-        ((x & 0xff) << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff);    \
-})
-
-#undef insl
-#define insl(a,b,l)     __insl(a,b,l,0) /* don't byte-swap */
-
-
-#endif /* _ASM_DM9000_H */
diff --git a/include/asm-frv/dma-mapping.h b/include/asm-frv/dma-mapping.h
deleted file mode 100644
index b2898877c07b..000000000000
--- a/include/asm-frv/dma-mapping.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#ifndef _ASM_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-
-#include <linux/device.h>
-#include <asm/cache.h>
-#include <asm/cacheflush.h>
-#include <asm/scatterlist.h>
-#include <asm/io.h>
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-
-extern unsigned long __nongprelbss dma_coherent_mem_start;
-extern unsigned long __nongprelbss dma_coherent_mem_end;
-
-void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp);
-void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);
-
-/*
- * Map a single buffer of the indicated size for DMA in streaming mode.
- * The 32-bit bus address to use is returned.
- *
- * Once the device is given the dma address, the device owns this memory
- * until either pci_unmap_single or pci_dma_sync_single is performed.
- */
-extern dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
-                                 enum dma_data_direction direction);
-
-/*
- * Unmap a single streaming mode DMA translation.  The dma_addr and size
- * must match what was provided for in a previous pci_map_single call.  All
- * other usages are undefined.
- *
- * After this call, reads by the cpu to the buffer are guarenteed to see
- * whatever the device wrote there.
- */
-static inline
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                      enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-
-/*
- * Map a set of buffers described by scatterlist in streaming
- * mode for DMA.  This is the scather-gather version of the
- * above pci_map_single interface.  Here the scatter gather list
- * elements are each tagged with the appropriate dma address
- * and length.  They are obtained via sg_dma_{address,length}(SG).
- *
- * NOTE: An implementation may be able to use a smaller number of
- *       DMA address/length pairs than there are SG table elements.
- *       (for example via virtual mapping capabilities)
- *       The routine returns the number of addr/length pairs actually
- *       used, at most nents.
- *
- * Device ownership issues as mentioned above for pci_map_single are
- * the same here.
- */
-extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-                      enum dma_data_direction direction);
-
-/*
- * Unmap a set of streaming mode DMA translations.
- * Again, cpu read rules concerning calls here are the same as for
- * pci_unmap_single() above.
- */
-static inline
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-             enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-
-extern
-dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset,
-                        size_t size, enum dma_data_direction direction);
-
-static inline
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-                    enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-
-
-static inline
-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-                             enum dma_data_direction direction)
-{
-}
-
-static inline
-void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-                                enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-
-static inline
-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction direction)
-{
-}
-
-static inline
-void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-
-static inline
-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-                         enum dma_data_direction direction)
-{
-}
-
-static inline
-void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-                            enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-
-static inline
-int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-
-static inline
-int dma_supported(struct device *dev, u64 mask)
-{
-        /*
-         * we fall back to GFP_DMA when the mask isn't all 1s,
-         * so we can't guarantee allocations that must be
-         * within a tighter range than GFP_DMA..
-         */
-        if (mask < 0x00ffffff)
-                return 0;
-
-        return 1;
-}
-
-static inline
-int dma_set_mask(struct device *dev, u64 mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-
-        *dev->dma_mask = mask;
-
-        return 0;
-}
-
-static inline
-int dma_get_cache_alignment(void)
-{
-        return 1 << L1_CACHE_SHIFT;
-}
-
-#define dma_is_consistent(d, h) (1)
-
-static inline
-void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-                    enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-
-#endif  /* _ASM_DMA_MAPPING_H */
diff --git a/include/asm-frv/dma.h b/include/asm-frv/dma.h
deleted file mode 100644
index 683c47d48a5b..000000000000
--- a/include/asm-frv/dma.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* dma.h: FRV DMA controller management
- *
- * Copyright (C) 2004 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 _ASM_DMA_H
-#define _ASM_DMA_H
-
-//#define DMA_DEBUG 1
-
-#include <linux/interrupt.h>
-
-#undef MAX_DMA_CHANNELS         /* don't use kernel/dma.c */
-
-/* under 2.4 this is actually needed by the new bootmem allocator */
-#define MAX_DMA_ADDRESS         PAGE_OFFSET
-
-/*
- * FRV DMA controller management
- */
-typedef irqreturn_t (*dma_irq_handler_t)(int dmachan, unsigned long cstr, void *data);
-
-extern void frv_dma_init(void);
-
-extern int frv_dma_open(const char *devname,
-                        unsigned long dmamask,
-                        int dmacap,
-                        dma_irq_handler_t handler,
-                        unsigned long irq_flags,
-                        void *data);
-
-/* channels required */
-#define FRV_DMA_MASK_ANY        ULONG_MAX       /* any channel */
-
-/* capabilities required */
-#define FRV_DMA_CAP_DREQ        0x01            /* DMA request pin */
-#define FRV_DMA_CAP_DACK        0x02            /* DMA ACK pin */
-#define FRV_DMA_CAP_DONE        0x04            /* DMA done pin */
-
-extern void frv_dma_close(int dma);
-
-extern void frv_dma_config(int dma, unsigned long ccfr, unsigned long cctr, unsigned long apr);
-
-extern void frv_dma_start(int dma,
-                          unsigned long sba, unsigned long dba,
-                          unsigned long pix, unsigned long six, unsigned long bcl);
-
-extern void frv_dma_restart_circular(int dma, unsigned long six);
-
-extern void frv_dma_stop(int dma);
-
-extern int is_frv_dma_interrupting(int dma);
-
-extern void frv_dma_dump(int dma);
-
-extern void frv_dma_status_clear(int dma);
-
-#define FRV_DMA_NCHANS  8
-#define FRV_DMA_4CHANS  4
-#define FRV_DMA_8CHANS  8
-
-#define DMAC_CCFRx              0x00    /* channel configuration reg */
-#define DMAC_CCFRx_CM_SHIFT     16
-#define DMAC_CCFRx_CM_DA        0x00000000
-#define DMAC_CCFRx_CM_SCA       0x00010000
-#define DMAC_CCFRx_CM_DCA       0x00020000
-#define DMAC_CCFRx_CM_2D        0x00030000
-#define DMAC_CCFRx_ATS_SHIFT    8
-#define DMAC_CCFRx_RS_INTERN    0x00000000
-#define DMAC_CCFRx_RS_EXTERN    0x00000001
-#define DMAC_CCFRx_RS_SHIFT     0
-
-#define DMAC_CSTRx              0x08    /* channel status reg */
-#define DMAC_CSTRx_FS           0x0000003f
-#define DMAC_CSTRx_NE           0x00000100
-#define DMAC_CSTRx_FED          0x00000200
-#define DMAC_CSTRx_WER          0x00000800
-#define DMAC_CSTRx_RER          0x00001000
-#define DMAC_CSTRx_CE           0x00002000
-#define DMAC_CSTRx_INT          0x00800000
-#define DMAC_CSTRx_BUSY         0x80000000
-
-#define DMAC_CCTRx              0x10    /* channel control reg */
-#define DMAC_CCTRx_DSIZ_1       0x00000000
-#define DMAC_CCTRx_DSIZ_2       0x00000001
-#define DMAC_CCTRx_DSIZ_4       0x00000002
-#define DMAC_CCTRx_DSIZ_32      0x00000005
-#define DMAC_CCTRx_DAU_HOLD     0x00000000
-#define DMAC_CCTRx_DAU_INC      0x00000010
-#define DMAC_CCTRx_DAU_DEC      0x00000020
-#define DMAC_CCTRx_SSIZ_1       0x00000000
-#define DMAC_CCTRx_SSIZ_2       0x00000100
-#define DMAC_CCTRx_SSIZ_4       0x00000200
-#define DMAC_CCTRx_SSIZ_32      0x00000500
-#define DMAC_CCTRx_SAU_HOLD     0x00000000
-#define DMAC_CCTRx_SAU_INC      0x00001000
-#define DMAC_CCTRx_SAU_DEC      0x00002000
-#define DMAC_CCTRx_FC           0x08000000
-#define DMAC_CCTRx_ICE          0x10000000
-#define DMAC_CCTRx_IE           0x40000000
-#define DMAC_CCTRx_ACT          0x80000000
-
-#define DMAC_SBAx               0x18    /* source base address reg */
-#define DMAC_DBAx               0x20    /* data base address reg */
-#define DMAC_PIXx               0x28    /* primary index reg */
-#define DMAC_SIXx               0x30    /* secondary index reg */
-#define DMAC_BCLx               0x38    /* byte count limit reg */
-#define DMAC_APRx               0x40    /* alternate pointer reg */
-
-/*
- * required for PCI + MODULES
- */
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy    (0)
-#endif
-
-#endif /* _ASM_DMA_H */
diff --git a/include/asm-frv/elf.h b/include/asm-frv/elf.h
deleted file mode 100644
index 7279ec07d62e..000000000000
--- a/include/asm-frv/elf.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* elf.h: FR-V ELF definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m68knommu/elf.h
- *
- * 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 __ASM_ELF_H
-#define __ASM_ELF_H
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-struct elf32_hdr;
-
-/*
- * ELF header e_flags defines.
- */
-#define EF_FRV_GPR_MASK         0x00000003 /* mask for # of gprs */
-#define EF_FRV_GPR32            0x00000001 /* Only uses GR on 32-register */
-#define EF_FRV_GPR64            0x00000002 /* Only uses GR on 64-register */
-#define EF_FRV_FPR_MASK         0x0000000c /* mask for # of fprs */
-#define EF_FRV_FPR32            0x00000004 /* Only uses FR on 32-register */
-#define EF_FRV_FPR64            0x00000008 /* Only uses FR on 64-register */
-#define EF_FRV_FPR_NONE         0x0000000C /* Uses software floating-point */
-#define EF_FRV_DWORD_MASK       0x00000030 /* mask for dword support */
-#define EF_FRV_DWORD_YES        0x00000010 /* Assumes stack aligned to 8-byte boundaries. */
-#define EF_FRV_DWORD_NO         0x00000020 /* Assumes stack aligned to 4-byte boundaries. */
-#define EF_FRV_DOUBLE           0x00000040 /* Uses double instructions. */
-#define EF_FRV_MEDIA            0x00000080 /* Uses media instructions. */
-#define EF_FRV_PIC              0x00000100 /* Uses position independent code. */
-#define EF_FRV_NON_PIC_RELOCS   0x00000200 /* Does not use position Independent code. */
-#define EF_FRV_MULADD           0x00000400 /* -mmuladd */
-#define EF_FRV_BIGPIC           0x00000800 /* -fPIC */
-#define EF_FRV_LIBPIC           0x00001000 /* -mlibrary-pic */
-#define EF_FRV_G0               0x00002000 /* -G 0, no small data ptr */
-#define EF_FRV_NOPACK           0x00004000 /* -mnopack */
-#define EF_FRV_FDPIC            0x00008000 /* -mfdpic */
-#define EF_FRV_CPU_MASK         0xff000000 /* specific cpu bits */
-#define EF_FRV_CPU_GENERIC      0x00000000 /* Set CPU type is FR-V */
-#define EF_FRV_CPU_FR500        0x01000000 /* Set CPU type is FR500 */
-#define EF_FRV_CPU_FR300        0x02000000 /* Set CPU type is FR300 */
-#define EF_FRV_CPU_SIMPLE       0x03000000 /* SIMPLE */
-#define EF_FRV_CPU_TOMCAT       0x04000000 /* Tomcat, FR500 prototype */
-#define EF_FRV_CPU_FR400        0x05000000 /* Set CPU type is FR400 */
-#define EF_FRV_CPU_FR550        0x06000000 /* Set CPU type is FR550 */
-#define EF_FRV_CPU_FR405        0x07000000 /* Set CPU type is FR405 */
-#define EF_FRV_CPU_FR450        0x08000000 /* Set CPU type is FR450 */
-
-/*
- * FR-V ELF relocation types
- */
-
-
-/*
- * ELF register definitions..
- */
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_fpmedia_regs elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-extern int elf_check_arch(const struct elf32_hdr *hdr);
-
-#define elf_check_fdpic(x) ((x)->e_flags & EF_FRV_FDPIC && !((x)->e_flags & EF_FRV_NON_PIC_RELOCS))
-#define elf_check_const_displacement(x) ((x)->e_flags & EF_FRV_PIC)
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#define ELF_ARCH        EM_FRV
-
-#define ELF_PLAT_INIT(_r)                       \
-do {                                            \
-        __kernel_frame0_ptr->gr16       = 0;    \
-        __kernel_frame0_ptr->gr17       = 0;    \
-        __kernel_frame0_ptr->gr18       = 0;    \
-        __kernel_frame0_ptr->gr19       = 0;    \
-        __kernel_frame0_ptr->gr20       = 0;    \
-        __kernel_frame0_ptr->gr21       = 0;    \
-        __kernel_frame0_ptr->gr22       = 0;    \
-        __kernel_frame0_ptr->gr23       = 0;    \
-        __kernel_frame0_ptr->gr24       = 0;    \
-        __kernel_frame0_ptr->gr25       = 0;    \
-        __kernel_frame0_ptr->gr26       = 0;    \
-        __kernel_frame0_ptr->gr27       = 0;    \
-        __kernel_frame0_ptr->gr29       = 0;    \
-} while(0)
-
-#define ELF_FDPIC_PLAT_INIT(_regs, _exec_map_addr, _interp_map_addr, _dynamic_addr)     \
-do {                                                                                    \
-        __kernel_frame0_ptr->gr16       = _exec_map_addr;                               \
-        __kernel_frame0_ptr->gr17       = _interp_map_addr;                             \
-        __kernel_frame0_ptr->gr18       = _dynamic_addr;                                \
-        __kernel_frame0_ptr->gr19       = 0;                                            \
-        __kernel_frame0_ptr->gr20       = 0;                                            \
-        __kernel_frame0_ptr->gr21       = 0;                                            \
-        __kernel_frame0_ptr->gr22       = 0;                                            \
-        __kernel_frame0_ptr->gr23       = 0;                                            \
-        __kernel_frame0_ptr->gr24       = 0;                                            \
-        __kernel_frame0_ptr->gr25       = 0;                                            \
-        __kernel_frame0_ptr->gr26       = 0;                                            \
-        __kernel_frame0_ptr->gr27       = 0;                                            \
-        __kernel_frame0_ptr->gr29       = 0;                                            \
-} while(0)
-
-#define USE_ELF_CORE_DUMP
-#define ELF_FDPIC_CORE_EFLAGS   EF_FRV_FDPIC
-#define ELF_EXEC_PAGESIZE       16384
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE         0x08000000UL
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  */
-
-#define ELF_HWCAP       (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.  */
-
-#define ELF_PLATFORM  (NULL)
-
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-
-#endif
diff --git a/include/asm-frv/emergency-restart.h b/include/asm-frv/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-frv/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-frv/errno.h b/include/asm-frv/errno.h
deleted file mode 100644
index d010795ceefe..000000000000
--- a/include/asm-frv/errno.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_ERRNO_H
-#define _ASM_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_ERRNO_H */
-
diff --git a/include/asm-frv/fb.h b/include/asm-frv/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/include/asm-frv/fb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/include/asm-frv/fcntl.h b/include/asm-frv/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-frv/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-frv/fpu.h b/include/asm-frv/fpu.h
deleted file mode 100644
index d73c60b56641..000000000000
--- a/include/asm-frv/fpu.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_FPU_H
-#define __ASM_FPU_H
-
-
-/*
- * MAX floating point unit state size (FSAVE/FRESTORE)
- */
-
-#define kernel_fpu_end() do { asm volatile("bar":::"memory"); preempt_enable(); } while(0)
-
-#endif /* __ASM_FPU_H */
diff --git a/include/asm-frv/futex.h b/include/asm-frv/futex.h
deleted file mode 100644
index 08b3d1da3583..000000000000
--- a/include/asm-frv/futex.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#ifdef __KERNEL__
-
-#include <linux/futex.h>
-#include <asm/errno.h>
-#include <asm/uaccess.h>
-
-extern int futex_atomic_op_inuser(int encoded_op, int __user *uaddr);
-
-static inline int
-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
-{
-        return -ENOSYS;
-}
-
-#endif
-#endif
diff --git a/include/asm-frv/gdb-stub.h b/include/asm-frv/gdb-stub.h
deleted file mode 100644
index 24f9738670bd..000000000000
--- a/include/asm-frv/gdb-stub.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* gdb-stub.h: FRV GDB stub
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from asm-mips/gdb-stub.h (c) 1995 Andreas Busse
- *
- * 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 __ASM_GDB_STUB_H
-#define __ASM_GDB_STUB_H
-
-#undef GDBSTUB_DEBUG_PROTOCOL
-
-#include <asm/ptrace.h>
-
-/*
- * important register numbers in GDB protocol
- * - GR0,  GR1,  GR2,  GR3,  GR4,  GR5,  GR6,  GR7,
- * - GR8,  GR9,  GR10, GR11, GR12, GR13, GR14, GR15,
- * - GR16, GR17, GR18, GR19, GR20, GR21, GR22, GR23,
- * - GR24, GR25, GR26, GR27, GR28, GR29, GR30, GR31,
- * - GR32, GR33, GR34, GR35, GR36, GR37, GR38, GR39,
- * - GR40, GR41, GR42, GR43, GR44, GR45, GR46, GR47,
- * - GR48, GR49, GR50, GR51, GR52, GR53, GR54, GR55,
- * - GR56, GR57, GR58, GR59, GR60, GR61, GR62, GR63,
- * - FR0,  FR1,  FR2,  FR3,  FR4,  FR5,  FR6,  FR7,
- * - FR8,  FR9,  FR10, FR11, FR12, FR13, FR14, FR15,
- * - FR16, FR17, FR18, FR19, FR20, FR21, FR22, FR23,
- * - FR24, FR25, FR26, FR27, FR28, FR29, FR30, FR31,
- * - FR32, FR33, FR34, FR35, FR36, FR37, FR38, FR39,
- * - FR40, FR41, FR42, FR43, FR44, FR45, FR46, FR47,
- * - FR48, FR49, FR50, FR51, FR52, FR53, FR54, FR55,
- * - FR56, FR57, FR58, FR59, FR60, FR61, FR62, FR63,
- * - PC, PSR, CCR, CCCR,
- * - _X132, _X133, _X134
- * - TBR, BRR, DBAR0, DBAR1, DBAR2, DBAR3,
- * - SCR0, SCR1, SCR2, SCR3,
- * - LR, LCR,
- * - IACC0H, IACC0L,
- * - FSR0,
- * - ACC0, ACC1, ACC2, ACC3, ACC4, ACC5, ACC6, ACC7,
- * - ACCG0123, ACCG4567,
- * - MSR0, MSR1,
- * - GNER0, GNER1,
- * - FNER0, FNER1,
- */
-#define GDB_REG_GR(N)   (N)
-#define GDB_REG_FR(N)   (64+(N))
-#define GDB_REG_PC      128
-#define GDB_REG_PSR     129
-#define GDB_REG_CCR     130
-#define GDB_REG_CCCR    131
-#define GDB_REG_TBR     135
-#define GDB_REG_BRR     136
-#define GDB_REG_DBAR(N) (137+(N))
-#define GDB_REG_SCR(N)  (141+(N))
-#define GDB_REG_LR      145
-#define GDB_REG_LCR     146
-#define GDB_REG_FSR0    149
-#define GDB_REG_ACC(N)  (150+(N))
-#define GDB_REG_ACCG(N) (158+(N)/4)
-#define GDB_REG_MSR(N)  (160+(N))
-#define GDB_REG_GNER(N) (162+(N))
-#define GDB_REG_FNER(N) (164+(N))
-
-#define GDB_REG_SP      GDB_REG_GR(1)
-#define GDB_REG_FP      GDB_REG_GR(2)
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-/*
- * Prototypes
- */
-extern void show_registers_only(struct pt_regs *regs);
-
-extern void gdbstub_init(void);
-extern void gdbstub(int type);
-extern void gdbstub_exit(int status);
-
-extern void gdbstub_io_init(void);
-extern void gdbstub_set_baud(unsigned baud);
-extern int gdbstub_rx_char(unsigned char *_ch, int nonblock);
-extern void gdbstub_tx_char(unsigned char ch);
-extern void gdbstub_tx_flush(void);
-extern void gdbstub_do_rx(void);
-
-extern asmlinkage void __debug_stub_init_break(void);
-extern asmlinkage void __break_hijack_kernel_event(void);
-extern asmlinkage void __break_hijack_kernel_event_breaks_here(void);
-extern asmlinkage void start_kernel(void);
-
-extern asmlinkage void gdbstub_rx_handler(void);
-extern asmlinkage void gdbstub_rx_irq(void);
-extern asmlinkage void gdbstub_intercept(void);
-
-extern uint32_t __entry_usertrap_table[];
-extern uint32_t __entry_kerneltrap_table[];
-
-extern volatile u8      gdbstub_rx_buffer[PAGE_SIZE];
-extern volatile u32     gdbstub_rx_inp;
-extern volatile u32     gdbstub_rx_outp;
-extern volatile u8      gdbstub_rx_overflow;
-extern u8               gdbstub_rx_unget;
-
-extern void gdbstub_printk(const char *fmt, ...);
-extern void debug_to_serial(const char *p, int n);
-extern void console_set_baud(unsigned baud);
-
-#ifdef GDBSTUB_DEBUG_PROTOCOL
-#define gdbstub_proto(FMT,...) gdbstub_printk(FMT,##__VA_ARGS__)
-#else
-#define gdbstub_proto(FMT,...) ({ 0; })
-#endif
-
-/*
- * we dedicate GR31 to keeping a pointer to the gdbstub exception frame
- * - gr31 is destroyed on entry to the gdbstub if !MMU
- * - gr31 is saved in scr3 on entry to the gdbstub if in !MMU
- */
-register struct frv_frame0 *__debug_frame0 asm("gr31");
-
-#define __debug_frame           (&__debug_frame0->regs)
-#define __debug_user_context    (&__debug_frame0->uc)
-#define __debug_regs            (&__debug_frame0->debug)
-#define __debug_reg(X)          ((unsigned long *) ((unsigned long) &__debug_frame0 + (X)))
-
-struct frv_debug_status {
-        unsigned long           bpsr;
-        unsigned long           dcr;
-        unsigned long           brr;
-        unsigned long           nmar;
-};
-
-extern struct frv_debug_status __debug_status;
-
-#endif /* _LANGUAGE_ASSEMBLY */
-#endif /* __ASM_GDB_STUB_H */
diff --git a/include/asm-frv/gpio-regs.h b/include/asm-frv/gpio-regs.h
deleted file mode 100644
index 9edf5d5d4d3f..000000000000
--- a/include/asm-frv/gpio-regs.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* gpio-regs.h: on-chip general purpose I/O registers
- *
- * 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 _ASM_GPIO_REGS
-#define _ASM_GPIO_REGS
-
-#define __reg(ADDR) (*(volatile unsigned long *)(ADDR))
-
-#define __get_PDR()     ({ __reg(0xfeff0400); })
-#define __set_PDR(V)    do { __reg(0xfeff0400) = (V); mb(); } while(0)
-
-#define __get_GPDR()    ({ __reg(0xfeff0408); })
-#define __set_GPDR(V)   do { __reg(0xfeff0408) = (V); mb(); } while(0)
-
-#define __get_SIR()     ({ __reg(0xfeff0410); })
-#define __set_SIR(V)    do { __reg(0xfeff0410) = (V); mb(); } while(0)
-
-#define __get_SOR()     ({ __reg(0xfeff0418); })
-#define __set_SOR(V)    do { __reg(0xfeff0418) = (V); mb(); } while(0)
-
-#define __set_PDSR(V)   do { __reg(0xfeff0420) = (V); mb(); } while(0)
-
-#define __set_PDCR(V)   do { __reg(0xfeff0428) = (V); mb(); } while(0)
-
-#define __get_RSTR()    ({ __reg(0xfeff0500); })
-#define __set_RSTR(V)   do { __reg(0xfeff0500) = (V); mb(); } while(0)
-
-
-
-/* PDR definitions */
-#define PDR_GPIO_DATA(X)        (1 << (X))
-
-/* GPDR definitions */
-#define GPDR_INPUT              0
-#define GPDR_OUTPUT             1
-#define GPDR_DREQ0_BIT          0x00001000
-#define GPDR_DREQ1_BIT          0x00008000
-#define GPDR_DREQ2_BIT          0x00040000
-#define GPDR_DREQ3_BIT          0x00080000
-#define GPDR_DREQ4_BIT          0x00004000
-#define GPDR_DREQ5_BIT          0x00020000
-#define GPDR_DREQ6_BIT          0x00100000
-#define GPDR_DREQ7_BIT          0x00200000
-#define GPDR_DACK0_BIT          0x00002000
-#define GPDR_DACK1_BIT          0x00010000
-#define GPDR_DACK2_BIT          0x00100000
-#define GPDR_DACK3_BIT          0x00200000
-#define GPDR_DONE0_BIT          0x00004000
-#define GPDR_DONE1_BIT          0x00020000
-#define GPDR_GPIO_DIR(X,D)      ((D) << (X))
-
-/* SIR definitions */
-#define SIR_GPIO_INPUT          0
-#define SIR_DREQ7_INPUT         0x00200000
-#define SIR_DREQ6_INPUT         0x00100000
-#define SIR_DREQ3_INPUT         0x00080000
-#define SIR_DREQ2_INPUT         0x00040000
-#define SIR_DREQ5_INPUT         0x00020000
-#define SIR_DREQ1_INPUT         0x00008000
-#define SIR_DREQ4_INPUT         0x00004000
-#define SIR_DREQ0_INPUT         0x00001000
-#define SIR_RXD1_INPUT          0x00000400
-#define SIR_CTS0_INPUT          0x00000100
-#define SIR_RXD0_INPUT          0x00000040
-#define SIR_GATE1_INPUT         0x00000020
-#define SIR_GATE0_INPUT         0x00000010
-#define SIR_IRQ3_INPUT          0x00000008
-#define SIR_IRQ2_INPUT          0x00000004
-#define SIR_IRQ1_INPUT          0x00000002
-#define SIR_IRQ0_INPUT          0x00000001
-#define SIR_DREQ_BITS           (SIR_DREQ0_INPUT | SIR_DREQ1_INPUT | \
-                                 SIR_DREQ2_INPUT | SIR_DREQ3_INPUT | \
-                                 SIR_DREQ4_INPUT | SIR_DREQ5_INPUT | \
-                                 SIR_DREQ6_INPUT | SIR_DREQ7_INPUT)
-
-/* SOR definitions */
-#define SOR_GPIO_OUTPUT         0
-#define SOR_DACK3_OUTPUT        0x00200000
-#define SOR_DACK2_OUTPUT        0x00100000
-#define SOR_DONE1_OUTPUT        0x00020000
-#define SOR_DACK1_OUTPUT        0x00010000
-#define SOR_DONE0_OUTPUT        0x00004000
-#define SOR_DACK0_OUTPUT        0x00002000
-#define SOR_TXD1_OUTPUT         0x00000800
-#define SOR_RTS0_OUTPUT         0x00000200
-#define SOR_TXD0_OUTPUT         0x00000080
-#define SOR_TOUT1_OUTPUT        0x00000020
-#define SOR_TOUT0_OUTPUT        0x00000010
-#define SOR_DONE_BITS           (SOR_DONE0_OUTPUT | SOR_DONE1_OUTPUT)
-#define SOR_DACK_BITS           (SOR_DACK0_OUTPUT | SOR_DACK1_OUTPUT | \
-                                 SOR_DACK2_OUTPUT | SOR_DACK3_OUTPUT)
-
-/* PDSR definitions */
-#define PDSR_UNCHANGED          0
-#define PDSR_SET_BIT(X)         (1 << (X))
-
-/* PDCR definitions */
-#define PDCR_UNCHANGED          0
-#define PDCR_CLEAR_BIT(X)       (1 << (X))
-
-/* RSTR definitions */
-/* Read Only */
-#define RSTR_POWERON            0x00000400
-#define RSTR_SOFTRESET_STATUS   0x00000100
-/* Write Only */
-#define RSTR_SOFTRESET          0x00000001
-
-#endif /* _ASM_GPIO_REGS */
diff --git a/include/asm-frv/hardirq.h b/include/asm-frv/hardirq.h
deleted file mode 100644
index fc47515822a2..000000000000
--- a/include/asm-frv/hardirq.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* hardirq.h: FRV hardware IRQ management
- *
- * Copyright (C) 2004 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 __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
-        unsigned int __softirq_pending;
-        unsigned long idle_timestamp;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-
-#ifdef CONFIG_SMP
-#error SMP not available on FR-V
-#endif /* CONFIG_SMP */
-
-extern atomic_t irq_err_count;
-static inline void ack_bad_irq(int irq)
-{
-        atomic_inc(&irq_err_count);
-}
-
-#endif
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
deleted file mode 100644
index 26cefcde5cee..000000000000
--- a/include/asm-frv/highmem.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* highmem.h: virtual kernel memory mappings for high memory
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/highmem.h
- *
- * See Documentation/frv/mmu-layout.txt for more information.
- *
- * 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 _ASM_HIGHMEM_H
-#define _ASM_HIGHMEM_H
-
-#ifdef __KERNEL__
-
-#include <linux/init.h>
-#include <asm/mem-layout.h>
-#include <asm/spr-regs.h>
-#include <asm/mb-regs.h>
-
-#define NR_TLB_LINES            64      /* number of lines in the TLB */
-
-#ifndef __ASSEMBLY__
-
-#include <linux/interrupt.h>
-#include <asm/kmap_types.h>
-#include <asm/pgtable.h>
-
-#ifdef CONFIG_DEBUG_HIGHMEM
-#define HIGHMEM_DEBUG 1
-#else
-#define HIGHMEM_DEBUG 0
-#endif
-
-/* declarations for highmem.c */
-extern unsigned long highstart_pfn, highend_pfn;
-
-#define kmap_prot PAGE_KERNEL
-#define kmap_pte ______kmap_pte_in_TLB
-extern pte_t *pkmap_page_table;
-
-#define flush_cache_kmaps()  do { } while (0)
-
-/*
- * Right now we initialize only a single pte table. It can be extended
- * easily, subsequent pte tables have to be allocated in one physical
- * chunk of RAM.
- */
-#define LAST_PKMAP      PTRS_PER_PTE
-#define LAST_PKMAP_MASK (LAST_PKMAP - 1)
-#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)
-#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
-
-extern void *kmap_high(struct page *page);
-extern void kunmap_high(struct page *page);
-
-extern void *kmap(struct page *page);
-extern void kunmap(struct page *page);
-
-extern struct page *kmap_atomic_to_page(void *ptr);
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
- * gives a more generic (and caching) interface. But kmap_atomic can
- * be used in IRQ contexts, so in some (very limited) cases we need
- * it.
- */
-#define KMAP_ATOMIC_CACHE_DAMR          8
-
-#ifndef __ASSEMBLY__
-
-#define __kmap_atomic_primary(type, paddr, ampr)                                                \
-({                                                                                              \
-        unsigned long damlr, dampr;                                                             \
-                                                                                                \
-        dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V;             \
-                                                                                                \
-        if (type != __KM_CACHE)                                                                 \
-                asm volatile("movgs %0,dampr"#ampr :: "r"(dampr) : "memory");                   \
-        else                                                                                    \
-                asm volatile("movgs %0,iampr"#ampr"\n"                                          \
-                             "movgs %0,dampr"#ampr"\n"                                          \
-                             :: "r"(dampr) : "memory"                                           \
-                             );                                                                 \
-                                                                                                \
-        asm("movsg damlr"#ampr",%0" : "=r"(damlr));                                             \
-                                                                                                \
-        /*printk("DAMR"#ampr": PRIM sl=%d L=%08lx P=%08lx\n", type, damlr, dampr);*/            \
-                                                                                                \
-        (void *) damlr;                                                                         \
-})
-
-#define __kmap_atomic_secondary(slot, paddr)                                                      \
-({                                                                                                \
-        unsigned long damlr = KMAP_ATOMIC_SECONDARY_FRAME + (slot) * PAGE_SIZE;                   \
-        unsigned long dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V; \
-                                                                                                  \
-        asm volatile("movgs %0,tplr \n"                                                           \
-                     "movgs %1,tppr \n"                                                           \
-                     "tlbpr %0,gr0,#2,#1"                                                         \
-                     : : "r"(damlr), "r"(dampr) : "memory");                                      \
-                                                                                                  \
-        /*printk("TLB: SECN sl=%d L=%08lx P=%08lx\n", slot, damlr, dampr);*/                      \
-                                                                                                  \
-        (void *) damlr;                                                                           \
-})
-
-static inline void *kmap_atomic(struct page *page, enum km_type type)
-{
-        unsigned long paddr;
-
-        pagefault_disable();
-        paddr = page_to_phys(page);
-
-        switch (type) {
-        case 0:         return __kmap_atomic_primary(0, paddr, 2);
-        case 1:         return __kmap_atomic_primary(1, paddr, 3);
-        case 2:         return __kmap_atomic_primary(2, paddr, 4);
-        case 3:         return __kmap_atomic_primary(3, paddr, 5);
-        case 4:         return __kmap_atomic_primary(4, paddr, 6);
-        case 5:         return __kmap_atomic_primary(5, paddr, 7);
-        case 6:         return __kmap_atomic_primary(6, paddr, 8);
-        case 7:         return __kmap_atomic_primary(7, paddr, 9);
-        case 8:         return __kmap_atomic_primary(8, paddr, 10);
-
-        case 9 ... 9 + NR_TLB_LINES - 1:
-                return __kmap_atomic_secondary(type - 9, paddr);
-
-        default:
-                BUG();
-                return NULL;
-        }
-}
-
-#define __kunmap_atomic_primary(type, ampr)                             \
-do {                                                                    \
-        asm volatile("movgs gr0,dampr"#ampr"\n" ::: "memory");          \
-        if (type == __KM_CACHE)                                         \
-                asm volatile("movgs gr0,iampr"#ampr"\n" ::: "memory");  \
-} while(0)
-
-#define __kunmap_atomic_secondary(slot, vaddr)                          \
-do {                                                                    \
-        asm volatile("tlbpr %0,gr0,#4,#1" : : "r"(vaddr) : "memory");   \
-} while(0)
-
-static inline void kunmap_atomic(void *kvaddr, enum km_type type)
-{
-        switch (type) {
-        case 0:         __kunmap_atomic_primary(0, 2);  break;
-        case 1:         __kunmap_atomic_primary(1, 3);  break;
-        case 2:         __kunmap_atomic_primary(2, 4);  break;
-        case 3:         __kunmap_atomic_primary(3, 5);  break;
-        case 4:         __kunmap_atomic_primary(4, 6);  break;
-        case 5:         __kunmap_atomic_primary(5, 7);  break;
-        case 6:         __kunmap_atomic_primary(6, 8);  break;
-        case 7:         __kunmap_atomic_primary(7, 9);  break;
-        case 8:         __kunmap_atomic_primary(8, 10); break;
-
-        case 9 ... 9 + NR_TLB_LINES - 1:
-                __kunmap_atomic_secondary(type - 9, kvaddr);
-                break;
-
-        default:
-                BUG();
-        }
-        pagefault_enable();
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_HIGHMEM_H */
diff --git a/include/asm-frv/hw_irq.h b/include/asm-frv/hw_irq.h
deleted file mode 100644
index 522ad37923d8..000000000000
--- a/include/asm-frv/hw_irq.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* hw_irq.h: FR-V specific h/w IRQ stuff
- *
- * 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 _ASM_HW_IRQ_H
-#define _ASM_HW_IRQ_H
-
-
-#endif /* _ASM_HW_IRQ_H */
diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h
deleted file mode 100644
index 361076611855..000000000000
--- a/include/asm-frv/ide.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ide.h: FRV IDE declarations
- *
- * Copyright (C) 2004 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 _ASM_IDE_H
-#define _ASM_IDE_H
-
-#ifdef __KERNEL__
-
-#include <asm/setup.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <asm-generic/ide_iops.h>
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_IDE_H */
diff --git a/include/asm-frv/init.h b/include/asm-frv/init.h
deleted file mode 100644
index 8b15838de216..000000000000
--- a/include/asm-frv/init.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_INIT_H
-#define _ASM_INIT_H
-
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-/* For assembly routines */
-#define __INIT          .section        ".text.init",#alloc,#execinstr
-#define __FINIT         .previous
-#define __INITDATA      .section        ".data.init",#alloc,#write
-
-#endif
-
diff --git a/include/asm-frv/io.h b/include/asm-frv/io.h
deleted file mode 100644
index ca7475e73b5e..000000000000
--- a/include/asm-frv/io.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/* io.h: FRV I/O operations
- *
- * Copyright (C) 2004 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.
- *
- * This gets interesting when talking to the PCI bus - the CPU is in big endian
- * mode, the PCI bus is little endian and the hardware in the middle can do
- * byte swapping
- */
-#ifndef _ASM_IO_H
-#define _ASM_IO_H
-
-#ifdef __KERNEL__
-
-#include <linux/types.h>
-#include <asm/virtconvert.h>
-#include <asm/string.h>
-#include <asm/mb-regs.h>
-#include <linux/delay.h>
-
-/*
- * swap functions are sometimes needed to interface little-endian hardware
- */
-
-static inline unsigned short _swapw(unsigned short v)
-{
-    return ((v << 8) | (v >> 8));
-}
-
-static inline unsigned long _swapl(unsigned long v)
-{
-    return ((v << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | (v >> 24));
-}
-
-//#define __iormb() asm volatile("membar")
-//#define __iowmb() asm volatile("membar")
-
-#define __raw_readb __builtin_read8
-#define __raw_readw __builtin_read16
-#define __raw_readl __builtin_read32
-
-#define __raw_writeb(datum, addr) __builtin_write8(addr, datum)
-#define __raw_writew(datum, addr) __builtin_write16(addr, datum)
-#define __raw_writel(datum, addr) __builtin_write32(addr, datum)
-
-static inline void io_outsb(unsigned int addr, const void *buf, int len)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-        const uint8_t *bp = buf;
-
-        while (len--)
-                __builtin_write8((volatile void __iomem *) __ioaddr, *bp++);
-}
-
-static inline void io_outsw(unsigned int addr, const void *buf, int len)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-        const uint16_t *bp = buf;
-
-        while (len--)
-                __builtin_write16((volatile void __iomem *) __ioaddr, (*bp++));
-}
-
-extern void __outsl_ns(unsigned int addr, const void *buf, int len);
-extern void __outsl_sw(unsigned int addr, const void *buf, int len);
-static inline void __outsl(unsigned int addr, const void *buf, int len, int swap)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-
-        if (!swap)
-                __outsl_ns(__ioaddr, buf, len);
-        else
-                __outsl_sw(__ioaddr, buf, len);
-}
-
-static inline void io_insb(unsigned long addr, void *buf, int len)
-{
-        uint8_t *bp = buf;
-
-        while (len--)
-                *bp++ = __builtin_read8((volatile void __iomem *) addr);
-}
-
-static inline void io_insw(unsigned long addr, void *buf, int len)
-{
-        uint16_t *bp = buf;
-
-        while (len--)
-                *bp++ = __builtin_read16((volatile void __iomem *) addr);
-}
-
-extern void __insl_ns(unsigned long addr, void *buf, int len);
-extern void __insl_sw(unsigned long addr, void *buf, int len);
-static inline void __insl(unsigned long addr, void *buf, int len, int swap)
-{
-        if (!swap)
-                __insl_ns(addr, buf, len);
-        else
-                __insl_sw(addr, buf, len);
-}
-
-#define mmiowb() mb()
-
-/*
- *      make the short names macros so specific devices
- *      can override them as required
- */
-
-static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
-{
-        memset((void __force *) addr, val, count);
-}
-
-static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
-{
-        memcpy(dst, (void __force *) src, count);
-}
-
-static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
-{
-        memcpy((void __force *) dst, src, count);
-}
-
-static inline uint8_t inb(unsigned long addr)
-{
-        return __builtin_read8((void __iomem *)addr);
-}
-
-static inline uint16_t inw(unsigned long addr)
-{
-        uint16_t ret = __builtin_read16((void __iomem *)addr);
-
-        if (__is_PCI_IO(addr))
-                ret = _swapw(ret);
-
-        return ret;
-}
-
-static inline uint32_t inl(unsigned long addr)
-{
-        uint32_t ret = __builtin_read32((void __iomem *)addr);
-
-        if (__is_PCI_IO(addr))
-                ret = _swapl(ret);
-
-        return ret;
-}
-
-static inline void outb(uint8_t datum, unsigned long addr)
-{
-        __builtin_write8((void __iomem *)addr, datum);
-}
-
-static inline void outw(uint16_t datum, unsigned long addr)
-{
-        if (__is_PCI_IO(addr))
-                datum = _swapw(datum);
-        __builtin_write16((void __iomem *)addr, datum);
-}
-
-static inline void outl(uint32_t datum, unsigned long addr)
-{
-        if (__is_PCI_IO(addr))
-                datum = _swapl(datum);
-        __builtin_write32((void __iomem *)addr, datum);
-}
-
-#define inb_p(addr)     inb(addr)
-#define inw_p(addr)     inw(addr)
-#define inl_p(addr)     inl(addr)
-#define outb_p(x,addr)  outb(x,addr)
-#define outw_p(x,addr)  outw(x,addr)
-#define outl_p(x,addr)  outl(x,addr)
-
-#define outsb(a,b,l)    io_outsb(a,b,l)
-#define outsw(a,b,l)    io_outsw(a,b,l)
-#define outsl(a,b,l)    __outsl(a,b,l,0)
-
-#define insb(a,b,l)     io_insb(a,b,l)
-#define insw(a,b,l)     io_insw(a,b,l)
-#define insl(a,b,l)     __insl(a,b,l,0)
-
-#define IO_SPACE_LIMIT  0xffffffff
-
-static inline uint8_t readb(const volatile void __iomem *addr)
-{
-        return __builtin_read8((__force void volatile __iomem *) addr);
-}
-
-static inline uint16_t readw(const volatile void __iomem *addr)
-{
-        uint16_t ret =  __builtin_read16((__force void volatile __iomem *)addr);
-
-        if (__is_PCI_MEM(addr))
-                ret = _swapw(ret);
-        return ret;
-}
-
-static inline uint32_t readl(const volatile void __iomem *addr)
-{
-        uint32_t ret =  __builtin_read32((__force void volatile __iomem *)addr);
-
-        if (__is_PCI_MEM(addr))
-                ret = _swapl(ret);
-
-        return ret;
-}
-
-#define readb_relaxed readb
-#define readw_relaxed readw
-#define readl_relaxed readl
-
-static inline void writeb(uint8_t datum, volatile void __iomem *addr)
-{
-        __builtin_write8(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-
-static inline void writew(uint16_t datum, volatile void __iomem *addr)
-{
-        if (__is_PCI_MEM(addr))
-                datum = _swapw(datum);
-
-        __builtin_write16(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-
-static inline void writel(uint32_t datum, volatile void __iomem *addr)
-{
-        if (__is_PCI_MEM(addr))
-                datum = _swapl(datum);
-
-        __builtin_write32(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-
-
-/* Values for nocacheflag and cmode */
-#define IOMAP_FULL_CACHING              0
-#define IOMAP_NOCACHE_SER               1
-#define IOMAP_NOCACHE_NONSER            2
-#define IOMAP_WRITETHROUGH              3
-
-extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-
-static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-
-static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-
-static inline void __iomem *ioremap_writethrough(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
-}
-
-static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
-}
-
-#define ioremap_wc ioremap_nocache
-
-extern void iounmap(void volatile __iomem *addr);
-
-static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-        return (void __iomem *) port;
-}
-
-static inline void ioport_unmap(void __iomem *p)
-{
-}
-
-static inline void flush_write_buffers(void)
-{
-        __asm__ __volatile__ ("membar" : : :"memory");
-}
-
-/*
- * do appropriate I/O accesses for token type
- */
-static inline unsigned int ioread8(void __iomem *p)
-{
-        return __builtin_read8(p);
-}
-
-static inline unsigned int ioread16(void __iomem *p)
-{
-        uint16_t ret = __builtin_read16(p);
-        if (__is_PCI_addr(p))
-                ret = _swapw(ret);
-        return ret;
-}
-
-static inline unsigned int ioread32(void __iomem *p)
-{
-        uint32_t ret = __builtin_read32(p);
-        if (__is_PCI_addr(p))
-                ret = _swapl(ret);
-        return ret;
-}
-
-static inline void iowrite8(u8 val, void __iomem *p)
-{
-        __builtin_write8(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-
-static inline void iowrite16(u16 val, void __iomem *p)
-{
-        if (__is_PCI_addr(p))
-                val = _swapw(val);
-        __builtin_write16(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-
-static inline void iowrite32(u32 val, void __iomem *p)
-{
-        if (__is_PCI_addr(p))
-                val = _swapl(val);
-        __builtin_write32(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-
-static inline void ioread8_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        io_insb((unsigned long) p, dst, count);
-}
-
-static inline void ioread16_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        io_insw((unsigned long) p, dst, count);
-}
-
-static inline void ioread32_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        __insl_ns((unsigned long) p, dst, count);
-}
-
-static inline void iowrite8_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        io_outsb((unsigned long) p, src, count);
-}
-
-static inline void iowrite16_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        io_outsw((unsigned long) p, src, count);
-}
-
-static inline void iowrite32_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        __outsl_ns((unsigned long) p, src, count);
-}
-
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
-static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
-{
-}
-
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_IO_H */
diff --git a/include/asm-frv/ioctl.h b/include/asm-frv/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-frv/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-frv/ioctls.h b/include/asm-frv/ioctls.h
deleted file mode 100644
index d0c30e31fbda..000000000000
--- a/include/asm-frv/ioctls.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef __ASM_IOCTLS_H__
-#define __ASM_IOCTLS_H__
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT  0x5426  /* For debugging only */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T',0x2A, struct termios2)
-#define TCSETS2         _IOW('T',0x2B, struct termios2)
-#define TCSETSW2        _IOW('T',0x2C, struct termios2)
-#define TCSETSF2        _IOW('T',0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX        0x5450  /* these numbers need to be adjusted. */
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define FIOQSIZE        0x545E
-
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#endif /* __ASM_IOCTLS_H__ */
-
diff --git a/include/asm-frv/ipcbuf.h b/include/asm-frv/ipcbuf.h
deleted file mode 100644
index b546f67e455f..000000000000
--- a/include/asm-frv/ipcbuf.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_IPCBUF_H__
-#define __ASM_IPCBUF_H__
-
-/*
- * The user_ipc_perm structure for FR-V architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* __ASM_IPCBUF_H__ */
-
diff --git a/include/asm-frv/irc-regs.h b/include/asm-frv/irc-regs.h
deleted file mode 100644
index afa30aeacc82..000000000000
--- a/include/asm-frv/irc-regs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* irc-regs.h: on-chip interrupt controller registers
- *
- * 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 _ASM_IRC_REGS
-#define _ASM_IRC_REGS
-
-#define __reg(ADDR) (*(volatile unsigned long *)(ADDR))
-
-#define __get_TM0()     ({ __reg(0xfeff9800); })
-#define __get_TM1()     ({ __reg(0xfeff9808); })
-#define __set_TM1(V)    do { __reg(0xfeff9808) = (V); mb(); } while(0)
-
-#define __set_TM1x(XI,V)                        \
-do {                                            \
-        int shift = (XI) * 2 + 16;              \
-        unsigned long tm1 = __reg(0xfeff9808);  \
-        tm1 &= ~(0x3 << shift);                 \
-        tm1 |= (V) << shift;                    \
-        __reg(0xfeff9808) = tm1;                \
-        mb();                                   \
-} while(0)
-
-#define __get_RS(C)     ({ (__reg(0xfeff9810) >> ((C)+16)) & 1; })
-
-#define __clr_RC(C)     do { __reg(0xfeff9818) = 1 << ((C)+16); mb(); } while(0)
-
-#define __get_MASK(C)   ({ (__reg(0xfeff9820) >> ((C)+16)) & 1; })
-#define __set_MASK(C)   do { __reg(0xfeff9820) |=  1 << ((C)+16); mb(); } while(0)
-#define __clr_MASK(C)   do { __reg(0xfeff9820) &=  ~(1 << ((C)+16)); mb(); } while(0)
-
-#define __get_MASK_all() __get_MASK(0)
-#define __set_MASK_all() __set_MASK(0)
-#define __clr_MASK_all() __clr_MASK(0)
-
-#define __get_IRL()     ({ (__reg(0xfeff9828) >> 16) & 0xf; })
-#define __clr_IRL()     do { __reg(0xfeff9828) = 0x100000; mb(); } while(0)
-
-#define __get_IRR(N)    ({ __reg(0xfeff9840 + (N) * 8); })
-#define __set_IRR(N,V)  do { __reg(0xfeff9840 + (N) * 8) = (V); } while(0)
-
-#define __get_IITMR(N)  ({ __reg(0xfeff9880 + (N) * 8); })
-#define __set_IITMR(N,V) do { __reg(0xfeff9880 + (N) * 8) = (V); } while(0)
-
-
-#endif /* _ASM_IRC_REGS */
diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h
deleted file mode 100644
index 3a66ebd754bd..000000000000
--- a/include/asm-frv/irq.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* irq.h: FRV IRQ definitions
- *
- * Copyright (C) 2006 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 _ASM_IRQ_H_
-#define _ASM_IRQ_H_
-
-#define NR_IRQS                         48
-#define IRQ_BASE_CPU                    (0 * 16)
-#define IRQ_BASE_FPGA                   (1 * 16)
-#define IRQ_BASE_MB93493                (2 * 16)
-
-/* probe returns a 32-bit IRQ mask:-/ */
-#define MIN_PROBE_IRQ                   (NR_IRQS - 32)
-
-#ifndef __ASSEMBLY__
-static inline int irq_canonicalize(int irq)
-{
-        return irq;
-}
-#endif
-
-#endif /* _ASM_IRQ_H_ */
diff --git a/include/asm-frv/irq_regs.h b/include/asm-frv/irq_regs.h
deleted file mode 100644
index d22e83289ad1..000000000000
--- a/include/asm-frv/irq_regs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* FRV per-CPU frame pointer holder
- *
- * Copyright (C) 2006 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 _ASM_IRQ_REGS_H
-#define _ASM_IRQ_REGS_H
-
-/*
- * Per-cpu current frame pointer - the location of the last exception frame on
- * the stack
- * - on FRV, GR28 is dedicated to keeping a pointer to the current exception
- *   frame
- */
-#define ARCH_HAS_OWN_IRQ_REGS
-
-#ifndef __ASSEMBLY__
-#define get_irq_regs() (__frame)
-#endif
-
-#endif /* _ASM_IRQ_REGS_H */
diff --git a/include/asm-frv/kdebug.h b/include/asm-frv/kdebug.h
deleted file mode 100644
index 6ece1b037665..000000000000
--- a/include/asm-frv/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/include/asm-frv/kmap_types.h b/include/asm-frv/kmap_types.h
deleted file mode 100644
index f8e16b2a5804..000000000000
--- a/include/asm-frv/kmap_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-        /* arch specific kmaps - change the numbers attached to these at your peril */
-        __KM_CACHE,             /* cache flush page attachment point */
-        __KM_PGD,               /* current page directory */
-        __KM_ITLB_PTD,          /* current instruction TLB miss page table lookup */
-        __KM_DTLB_PTD,          /* current data TLB miss page table lookup */
-
-        /* general kmaps */
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
-
-#endif
diff --git a/include/asm-frv/linkage.h b/include/asm-frv/linkage.h
deleted file mode 100644
index 636c1bced7d4..000000000000
--- a/include/asm-frv/linkage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-#define __ALIGN         .align 4
-#define __ALIGN_STR     ".align 4"
-
-#endif
diff --git a/include/asm-frv/local.h b/include/asm-frv/local.h
deleted file mode 100644
index c27bdf04630e..000000000000
--- a/include/asm-frv/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_LOCAL_H
-#define _ASM_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* _ASM_LOCAL_H */
diff --git a/include/asm-frv/math-emu.h b/include/asm-frv/math-emu.h
deleted file mode 100644
index 0c8f731b2180..000000000000
--- a/include/asm-frv/math-emu.h
+++ /dev/null
@@ -1,301 +0,0 @@
-#ifndef _ASM_MATH_EMU_H
-#define _ASM_MATH_EMU_H
-
-#include <asm/setup.h>
-#include <linux/linkage.h>
-
-/* Status Register bits */
-
-/* accrued exception bits */
-#define FPSR_AEXC_INEX  3
-#define FPSR_AEXC_DZ    4
-#define FPSR_AEXC_UNFL  5
-#define FPSR_AEXC_OVFL  6
-#define FPSR_AEXC_IOP   7
-
-/* exception status bits */
-#define FPSR_EXC_INEX1  8
-#define FPSR_EXC_INEX2  9
-#define FPSR_EXC_DZ     10
-#define FPSR_EXC_UNFL   11
-#define FPSR_EXC_OVFL   12
-#define FPSR_EXC_OPERR  13
-#define FPSR_EXC_SNAN   14
-#define FPSR_EXC_BSUN   15
-
-/* quotient byte, assumes big-endian, of course */
-#define FPSR_QUOTIENT(fpsr) (*((signed char *) &(fpsr) + 1))
-
-/* condition code bits */
-#define FPSR_CC_NAN     24
-#define FPSR_CC_INF     25
-#define FPSR_CC_Z       26
-#define FPSR_CC_NEG     27
-
-
-/* Control register bits */
-
-/* rounding mode */
-#define FPCR_ROUND_RN   0               /* round to nearest/even */
-#define FPCR_ROUND_RZ   1               /* round to zero */
-#define FPCR_ROUND_RM   2               /* minus infinity */
-#define FPCR_ROUND_RP   3               /* plus infinity */
-
-/* rounding precision */
-#define FPCR_PRECISION_X        0       /* long double */
-#define FPCR_PRECISION_S        1       /* double */
-#define FPCR_PRECISION_D        2       /* float */
-
-
-/* Flags to select the debugging output */
-#define PDECODE         0
-#define PEXECUTE        1
-#define PCONV           2
-#define PNORM           3
-#define PREGISTER       4
-#define PINSTR          5
-#define PUNIMPL         6
-#define PMOVEM          7
-
-#define PMDECODE        (1<<PDECODE)
-#define PMEXECUTE       (1<<PEXECUTE)
-#define PMCONV          (1<<PCONV)
-#define PMNORM          (1<<PNORM)
-#define PMREGISTER      (1<<PREGISTER)
-#define PMINSTR         (1<<PINSTR)
-#define PMUNIMPL        (1<<PUNIMPL)
-#define PMMOVEM         (1<<PMOVEM)
-
-#ifndef __ASSEMBLY__
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-
-union fp_mant64 {
-        unsigned long long m64;
-        unsigned long m32[2];
-};
-
-union fp_mant128 {
-        unsigned long long m64[2];
-        unsigned long m32[4];
-};
-
-/* internal representation of extended fp numbers */
-struct fp_ext {
-        unsigned char lowmant;
-        unsigned char sign;
-        unsigned short exp;
-        union fp_mant64 mant;
-};
-
-/* C representation of FPU registers */
-/* NOTE: if you change this, you have to change the assembler offsets
-   below and the size in <asm/fpu.h>, too */
-struct fp_data {
-        struct fp_ext fpreg[8];
-        unsigned int fpcr;
-        unsigned int fpsr;
-        unsigned int fpiar;
-        unsigned short prec;
-        unsigned short rnd;
-        struct fp_ext temp[2];
-};
-
-#if FPU_EMU_DEBUG
-extern unsigned int fp_debugprint;
-
-#define dprint(bit, fmt, args...) ({                    \
-        if (fp_debugprint & (1 << (bit)))               \
-                printk(fmt, ## args);                   \
-})
-#else
-#define dprint(bit, fmt, args...)
-#endif
-
-#define uprint(str) ({                                  \
-        static int __count = 3;                         \
-                                                        \
-        if (__count > 0) {                              \
-                printk("You just hit an unimplemented " \
-                       "fpu instruction (%s)\n", str);  \
-                printk("Please report this to ....\n"); \
-                __count--;                              \
-        }                                               \
-})
-
-#define FPDATA          ((struct fp_data *)current->thread.fp)
-
-#else   /* __ASSEMBLY__ */
-
-#define FPDATA          %a2
-
-/* offsets from the base register to the floating point data in the task struct */
-#define FPD_FPREG       (TASK_THREAD+THREAD_FPREG+0)
-#define FPD_FPCR        (TASK_THREAD+THREAD_FPREG+96)
-#define FPD_FPSR        (TASK_THREAD+THREAD_FPREG+100)
-#define FPD_FPIAR       (TASK_THREAD+THREAD_FPREG+104)
-#define FPD_PREC        (TASK_THREAD+THREAD_FPREG+108)
-#define FPD_RND         (TASK_THREAD+THREAD_FPREG+110)
-#define FPD_TEMPFP1     (TASK_THREAD+THREAD_FPREG+112)
-#define FPD_TEMPFP2     (TASK_THREAD+THREAD_FPREG+124)
-#define FPD_SIZEOF      (TASK_THREAD+THREAD_FPREG+136)
-
-/* offsets on the stack to access saved registers,
- * these are only used during instruction decoding
- * where we always know how deep we're on the stack.
- */
-#define FPS_DO          (PT_D0)
-#define FPS_D1          (PT_D1)
-#define FPS_D2          (PT_D2)
-#define FPS_A0          (PT_A0)
-#define FPS_A1          (PT_A1)
-#define FPS_A2          (PT_A2)
-#define FPS_SR          (PT_SR)
-#define FPS_PC          (PT_PC)
-#define FPS_EA          (PT_PC+6)
-#define FPS_PC2         (PT_PC+10)
-
-.macro  fp_get_fp_reg
-        lea     (FPD_FPREG,FPDATA,%d0.w*4),%a0
-        lea     (%a0,%d0.w*8),%a0
-.endm
-
-/* Macros used to get/put the current program counter.
- * 020/030 use a different stack frame then 040/060, for the
- * 040/060 the return pc points already to the next location,
- * so this only needs to be modified for jump instructions.
- */
-.macro  fp_get_pc dest
-        move.l  (FPS_PC+4,%sp),\dest
-.endm
-
-.macro  fp_put_pc src,jump=0
-        move.l  \src,(FPS_PC+4,%sp)
-.endm
-
-.macro  fp_get_instr_data       f,s,dest,label
-        getuser \f,%sp@(FPS_PC+4)@(0),\dest,\label,%sp@(FPS_PC+4)
-        addq.l  #\s,%sp@(FPS_PC+4)
-.endm
-
-.macro  fp_get_instr_word       dest,label,addr
-        fp_get_instr_data       w,2,\dest,\label,\addr
-.endm
-
-.macro  fp_get_instr_long       dest,label,addr
-        fp_get_instr_data       l,4,\dest,\label,\addr
-.endm
-
-/* These macros are used to read from/write to user space
- * on error we jump to the fixup section, load the fault
- * address into %a0 and jump to the exit.
- * (derived from <asm/uaccess.h>)
- */
-.macro  getuser size,src,dest,label,addr
-|       printf  ,"[\size<%08x]",1,\addr
-.Lu1\@: moves\size      \src,\dest
-
-        .section .fixup,"ax"
-        .even
-.Lu2\@: move.l  \addr,%a0
-        jra     \label
-        .previous
-
-        .section __ex_table,"a"
-        .align  4
-        .long   .Lu1\@,.Lu2\@
-        .previous
-.endm
-
-.macro  putuser size,src,dest,label,addr
-|       printf  ,"[\size>%08x]",1,\addr
-.Lu1\@: moves\size      \src,\dest
-.Lu2\@:
-
-        .section .fixup,"ax"
-        .even
-.Lu3\@: move.l  \addr,%a0
-        jra     \label
-        .previous
-
-        .section __ex_table,"a"
-        .align  4
-        .long   .Lu1\@,.Lu3\@
-        .long   .Lu2\@,.Lu3\@
-        .previous
-.endm
-
-
-.macro  movestack       nr,arg1,arg2,arg3,arg4,arg5
-        .if     \nr
-        movestack       (\nr-1),\arg2,\arg3,\arg4,\arg5
-        move.l  \arg1,-(%sp)
-        .endif
-.endm
-
-.macro  printf  bit=-1,string,nr=0,arg1,arg2,arg3,arg4,arg5
-#ifdef FPU_EMU_DEBUG
-        .data
-.Lpdata\@:
-        .string "\string"
-        .previous
-
-        movem.l %d0/%d1/%a0/%a1,-(%sp)
-        .if     \bit+1
-#if 0
-        moveq   #\bit,%d0
-        andw    #7,%d0
-        btst    %d0,fp_debugprint+((31-\bit)/8)
-#else
-        btst    #\bit,fp_debugprint+((31-\bit)/8)
-#endif
-        jeq     .Lpskip\@
-        .endif
-        movestack       \nr,\arg1,\arg2,\arg3,\arg4,\arg5
-        pea     .Lpdata\@
-        jsr     printk
-        lea     ((\nr+1)*4,%sp),%sp
-.Lpskip\@:
-        movem.l (%sp)+,%d0/%d1/%a0/%a1
-#endif
-.endm
-
-.macro  printx  bit,fp
-#ifdef FPU_EMU_DEBUG
-        movem.l %d0/%a0,-(%sp)
-        lea     \fp,%a0
-#if 0
-        moveq   #'+',%d0
-        tst.w   (%a0)
-        jeq     .Lx1\@
-        moveq   #'-',%d0
-.Lx1\@: printf  \bit," %c",1,%d0
-        move.l  (4,%a0),%d0
-        bclr    #31,%d0
-        jne     .Lx2\@
-        printf  \bit,"0."
-        jra     .Lx3\@
-.Lx2\@: printf  \bit,"1."
-.Lx3\@: printf  \bit,"%08x%08x",2,%d0,%a0@(8)
-        move.w  (2,%a0),%d0
-        ext.l   %d0
-        printf  \bit,"E%04x",1,%d0
-#else
-        printf  \bit," %08x%08x%08x",3,%a0@,%a0@(4),%a0@(8)
-#endif
-        movem.l (%sp)+,%d0/%a0
-#endif
-.endm
-
-.macro  debug   instr,args
-#ifdef FPU_EMU_DEBUG
-        \instr  \args
-#endif
-.endm
-
-
-#endif  /* __ASSEMBLY__ */
-
-#endif  /* _ASM_FRV_MATH_EMU_H */
-
diff --git a/include/asm-frv/mb-regs.h b/include/asm-frv/mb-regs.h
deleted file mode 100644
index 219e5f926f18..000000000000
--- a/include/asm-frv/mb-regs.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* mb-regs.h: motherboard registers
- *
- * Copyright (C) 2003, 2004 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 _ASM_MB_REGS_H
-#define _ASM_MB_REGS_H
-
-#include <asm/cpu-irqs.h>
-#include <asm/sections.h>
-#include <asm/mem-layout.h>
-
-#ifndef __ASSEMBLY__
-/* gcc builtins, annotated */
-
-unsigned long __builtin_read8(volatile void __iomem *);
-unsigned long __builtin_read16(volatile void __iomem *);
-unsigned long __builtin_read32(volatile void __iomem *);
-void __builtin_write8(volatile void __iomem *, unsigned char);
-void __builtin_write16(volatile void __iomem *, unsigned short);
-void __builtin_write32(volatile void __iomem *, unsigned long);
-#endif
-
-#define __region_IO     KERNEL_IO_START /* the region from 0xe0000000 to 0xffffffff has suitable
-                                         * protection laid over the top for use in memory-mapped
-                                         * I/O
-                                         */
-
-#define __region_CS0    0xff000000      /* Boot ROMs area */
-
-#ifdef CONFIG_MB93091_VDK
-/*
- * VDK motherboard and CPU card specific stuff
- */
-
-#include <asm/mb93091-fpga-irqs.h>
-
-#define IRQ_CPU_MB93493_0       IRQ_CPU_EXTERNAL0
-#define IRQ_CPU_MB93493_1       IRQ_CPU_EXTERNAL1
-
-#define __region_CS2    0xe0000000      /* SLBUS/PCI I/O space */
-#define __region_CS2_M          0x0fffffff /* mask */
-#define __region_CS2_C          0x00000000 /* control */
-#define __region_CS5    0xf0000000      /* MB93493 CSC area (DAV daughter board) */
-#define __region_CS5_M          0x00ffffff
-#define __region_CS5_C          0x00010000
-#define __region_CS7    0xf1000000      /* CB70 CPU-card PCMCIA port I/O space */
-#define __region_CS7_M          0x00ffffff
-#define __region_CS7_C          0x00410701
-#define __region_CS1    0xfc000000      /* SLBUS/PCI bridge control registers */
-#define __region_CS1_M          0x000fffff
-#define __region_CS1_C          0x00000000
-#define __region_CS6    0xfc100000      /* CB70 CPU-card DM9000 LAN I/O space */
-#define __region_CS6_M          0x000fffff
-#define __region_CS6_C          0x00400707
-#define __region_CS3    0xfc200000      /* MB93493 CSR area (DAV daughter board) */
-#define __region_CS3_M          0x000fffff
-#define __region_CS3_C          0xc8100000
-#define __region_CS4    0xfd000000      /* CB70 CPU-card extra flash space */
-#define __region_CS4_M          0x00ffffff
-#define __region_CS4_C          0x00000f07
-
-#define __region_PCI_IO         (__region_CS2 + 0x04000000UL)
-#define __region_PCI_MEM        (__region_CS2 + 0x08000000UL)
-#define __flush_PCI_writes()                                            \
-do {                                                                    \
-        __builtin_write8((volatile void __iomem *) __region_PCI_MEM, 0);        \
-} while(0)
-
-#define __is_PCI_IO(addr) \
-        (((unsigned long)(addr) >> 24) - (__region_PCI_IO >> 24)  < (0x04000000UL >> 24))
-
-#define __is_PCI_MEM(addr) \
-        ((unsigned long)(addr) - __region_PCI_MEM < 0x08000000UL)
-
-#define __is_PCI_addr(addr) \
-        ((unsigned long)(addr) - __region_PCI_IO < 0x0c000000UL)
-
-#define __get_CLKSW()   ({ *(volatile unsigned long *)(__region_CS2 + 0x0130000cUL) & 0xffUL; })
-#define __get_CLKIN()   (__get_CLKSW() * 125U * 100000U / 24U)
-
-#ifndef __ASSEMBLY__
-extern int __nongprelbss mb93090_mb00_detected;
-#endif
-
-#define __addr_LEDS()           (__region_CS2 + 0x01200004UL)
-#ifdef CONFIG_MB93090_MB00
-#define __set_LEDS(X)                                                   \
-do {                                                                    \
-        if (mb93090_mb00_detected)                                      \
-                __builtin_write32((void __iomem *) __addr_LEDS(), ~(X));        \
-} while (0)
-#else
-#define __set_LEDS(X)
-#endif
-
-#define __addr_LCD()            (__region_CS2 + 0x01200008UL)
-#define __get_LCD(B)            __builtin_read32((volatile void __iomem *) (B))
-#define __set_LCD(B,X)          __builtin_write32((volatile void __iomem *) (B), (X))
-
-#define LCD_D                   0x000000ff              /* LCD data bus */
-#define LCD_RW                  0x00000100              /* LCD R/W signal */
-#define LCD_RS                  0x00000200              /* LCD Register Select */
-#define LCD_E                   0x00000400              /* LCD Start Enable Signal */
-
-#define LCD_CMD_CLEAR           (LCD_E|0x001)
-#define LCD_CMD_HOME            (LCD_E|0x002)
-#define LCD_CMD_CURSOR_INC      (LCD_E|0x004)
-#define LCD_CMD_SCROLL_INC      (LCD_E|0x005)
-#define LCD_CMD_CURSOR_DEC      (LCD_E|0x006)
-#define LCD_CMD_SCROLL_DEC      (LCD_E|0x007)
-#define LCD_CMD_OFF             (LCD_E|0x008)
-#define LCD_CMD_ON(CRSR,BLINK)  (LCD_E|0x00c|(CRSR<<1)|BLINK)
-#define LCD_CMD_CURSOR_MOVE_L   (LCD_E|0x010)
-#define LCD_CMD_CURSOR_MOVE_R   (LCD_E|0x014)
-#define LCD_CMD_DISPLAY_SHIFT_L (LCD_E|0x018)
-#define LCD_CMD_DISPLAY_SHIFT_R (LCD_E|0x01c)
-#define LCD_CMD_FUNCSET(DL,N,F) (LCD_E|0x020|(DL<<4)|(N<<3)|(F<<2))
-#define LCD_CMD_SET_CG_ADDR(X)  (LCD_E|0x040|X)
-#define LCD_CMD_SET_DD_ADDR(X)  (LCD_E|0x080|X)
-#define LCD_CMD_READ_BUSY       (LCD_E|LCD_RW)
-#define LCD_DATA_WRITE(X)       (LCD_E|LCD_RS|(X))
-#define LCD_DATA_READ           (LCD_E|LCD_RS|LCD_RW)
-
-#else
-/*
- * PDK unit specific stuff
- */
-
-#include <asm/mb93093-fpga-irqs.h>
-
-#define IRQ_CPU_MB93493_0       IRQ_CPU_EXTERNAL0
-#define IRQ_CPU_MB93493_1       IRQ_CPU_EXTERNAL1
-
-#define __region_CS5    0xf0000000      /* MB93493 CSC area (DAV daughter board) */
-#define __region_CS5_M          0x00ffffff /* mask */
-#define __region_CS5_C          0x00010000 /* control */
-#define __region_CS2    0x20000000      /* FPGA registers */
-#define __region_CS2_M          0x000fffff
-#define __region_CS2_C          0x00000000
-#define __region_CS1    0xfc100000      /* LAN registers */
-#define __region_CS1_M          0x000fffff
-#define __region_CS1_C          0x00010404
-#define __region_CS3    0xfc200000      /* MB93493 CSR area (DAV daughter board) */
-#define __region_CS3_M          0x000fffff
-#define __region_CS3_C          0xc8000000
-#define __region_CS4    0xfd000000      /* extra ROMs area */
-#define __region_CS4_M          0x00ffffff
-#define __region_CS4_C          0x00000f07
-
-#define __region_CS6    0xfe000000      /* not used - hide behind CPU resource I/O regs */
-#define __region_CS6_M          0x000fffff
-#define __region_CS6_C          0x00000f07
-#define __region_CS7    0xfe000000      /* not used - hide behind CPU resource I/O regs */
-#define __region_CS7_M          0x000fffff
-#define __region_CS7_C          0x00000f07
-
-#define __is_PCI_IO(addr)       0       /* no PCI */
-#define __is_PCI_MEM(addr)      0
-#define __is_PCI_addr(addr)     0
-#define __region_PCI_IO         0
-#define __region_PCI_MEM        0
-#define __flush_PCI_writes()    do { } while(0)
-
-#define __get_CLKSW()           0UL
-#define __get_CLKIN()           66000000UL
-
-#define __addr_LEDS()           (__region_CS2 + 0x00000023UL)
-#define __set_LEDS(X)           __builtin_write8((volatile void __iomem *) __addr_LEDS(), (X))
-
-#define __addr_FPGATR()         (__region_CS2 + 0x00000030UL)
-#define __set_FPGATR(X)         __builtin_write32((volatile void __iomem *) __addr_FPGATR(), (X))
-#define __get_FPGATR()          __builtin_read32((volatile void __iomem *) __addr_FPGATR())
-
-#define MB93093_FPGA_FPGATR_AUDIO_CLK   0x00000003
-
-#define __set_FPGATR_AUDIO_CLK(V) \
-        __set_FPGATR((__get_FPGATR() & ~MB93093_FPGA_FPGATR_AUDIO_CLK) | (V))
-
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_OFF       0x0
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_11MHz     0x1
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_12MHz     0x2
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_02MHz     0x3
-
-#define MB93093_FPGA_SWR_PUSHSWMASK     (0x1F<<26)
-#define MB93093_FPGA_SWR_PUSHSW4        (1<<29)
-
-#define __addr_FPGA_SWR         ((volatile void __iomem *)(__region_CS2 + 0x28UL))
-#define __get_FPGA_PUSHSW1_5()  (__builtin_read32(__addr_FPGA_SWR) & MB93093_FPGA_SWR_PUSHSWMASK)
-
-
-#endif
-
-#endif /* _ASM_MB_REGS_H */
diff --git a/include/asm-frv/mb86943a.h b/include/asm-frv/mb86943a.h
deleted file mode 100644
index e87ef924bfb4..000000000000
--- a/include/asm-frv/mb86943a.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* mb86943a.h: MB86943 SPARClite <-> PCI bridge registers
- *
- * 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 _ASM_MB86943A_H
-#define _ASM_MB86943A_H
-
-#include <asm/mb-regs.h>
-
-#define __reg_MB86943_sl_ctl            *(volatile uint32_t *) (__region_CS1 + 0x00)
-
-#define MB86943_SL_CTL_BUS_WIDTH_64     0x00000001
-#define MB86943_SL_CTL_AS_HOST          0x00000002
-#define MB86943_SL_CTL_DRCT_MASTER_SWAP 0x00000004
-#define MB86943_SL_CTL_DRCT_SLAVE_SWAP  0x00000008
-#define MB86943_SL_CTL_PCI_CONFIG_SWAP  0x00000010
-#define MB86943_SL_CTL_ECS0_ENABLE      0x00000020
-#define MB86943_SL_CTL_ECS1_ENABLE      0x00000040
-#define MB86943_SL_CTL_ECS2_ENABLE      0x00000080
-
-#define __reg_MB86943_ecs_ctl(N)        *(volatile uint32_t *) (__region_CS1 + 0x08 + (0x08*(N)))
-#define __reg_MB86943_ecs_range(N)      *(volatile uint32_t *) (__region_CS1 + 0x20 + (0x10*(N)))
-#define __reg_MB86943_ecs_base(N)       *(volatile uint32_t *) (__region_CS1 + 0x28 + (0x10*(N)))
-
-#define __reg_MB86943_sl_pci_io_range   *(volatile uint32_t *) (__region_CS1 + 0x50)
-#define __reg_MB86943_sl_pci_io_base    *(volatile uint32_t *) (__region_CS1 + 0x58)
-#define __reg_MB86943_sl_pci_mem_range  *(volatile uint32_t *) (__region_CS1 + 0x60)
-#define __reg_MB86943_sl_pci_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x68)
-#define __reg_MB86943_pci_sl_io_base    *(volatile uint32_t *) (__region_CS1 + 0x70)
-#define __reg_MB86943_pci_sl_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x78)
-
-#define __reg_MB86943_pci_arbiter       *(volatile uint32_t *) (__region_CS2 + 0x01300014)
-#define MB86943_PCIARB_EN               0x00000001
-
-#endif /* _ASM_MB86943A_H */
diff --git a/include/asm-frv/mb93091-fpga-irqs.h b/include/asm-frv/mb93091-fpga-irqs.h
deleted file mode 100644
index 19778c5ba9d6..000000000000
--- a/include/asm-frv/mb93091-fpga-irqs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* mb93091-fpga-irqs.h: MB93091 CPU board FPGA IRQs
- *
- * Copyright (C) 2004 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 _ASM_MB93091_FPGA_IRQS_H
-#define _ASM_MB93091_FPGA_IRQS_H
-
-#include <asm/irq.h>
-
-#ifndef __ASSEMBLY__
-
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_FPGA__UNUSED                        = IRQ_BASE_FPGA,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_1,
-        IRQ_FPGA_SL_BUS_EXPANSION_2,
-        IRQ_FPGA_PCI_INTD,
-        IRQ_FPGA_PCI_INTC,
-        IRQ_FPGA_PCI_INTB,
-        IRQ_FPGA_PCI_INTA,
-        IRQ_FPGA_SL_BUS_EXPANSION_7,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_8,
-        IRQ_FPGA_SL_BUS_EXPANSION_9,
-        IRQ_FPGA_MB86943_PCI_INTA,
-        IRQ_FPGA_MB86943_SLBUS_SIDE,
-        IRQ_FPGA_RTL8029_INTA,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_13,
-        IRQ_FPGA_SL_BUS_EXPANSION_14,
-        IRQ_FPGA_NMI,
-};
-
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_MB93091_FPGA_IRQS_H */
diff --git a/include/asm-frv/mb93093-fpga-irqs.h b/include/asm-frv/mb93093-fpga-irqs.h
deleted file mode 100644
index 590266b1a6d3..000000000000
--- a/include/asm-frv/mb93093-fpga-irqs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* mb93093-fpga-irqs.h: MB93093 CPU board FPGA IRQs
- *
- * Copyright (C) 2004 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 _ASM_MB93093_FPGA_IRQS_H
-#define _ASM_MB93093_FPGA_IRQS_H
-
-#include <asm/irq.h>
-
-#ifndef __ASSEMBLY__
-
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_FPGA_PUSH_BUTTON_SW1_5              = IRQ_BASE_FPGA + 8,
-        IRQ_FPGA_ROCKER_C_SW8                   = IRQ_BASE_FPGA + 9,
-        IRQ_FPGA_ROCKER_C_SW9                   = IRQ_BASE_FPGA + 10,
-};
-
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_MB93093_FPGA_IRQS_H */
diff --git a/include/asm-frv/mb93493-irqs.h b/include/asm-frv/mb93493-irqs.h
deleted file mode 100644
index 82c7aeddd333..000000000000
--- a/include/asm-frv/mb93493-irqs.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* mb93493-irqs.h: MB93493 companion chip IRQs
- *
- * Copyright (C) 2004 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 _ASM_MB93493_IRQS_H
-#define _ASM_MB93493_IRQS_H
-
-#include <asm/irq.h>
-
-#ifndef __ASSEMBLY__
-
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_MB93493_VDC                 = IRQ_BASE_MB93493 + 0,
-        IRQ_MB93493_VCC                 = IRQ_BASE_MB93493 + 1,
-        IRQ_MB93493_AUDIO_OUT           = IRQ_BASE_MB93493 + 2,
-        IRQ_MB93493_I2C_0               = IRQ_BASE_MB93493 + 3,
-        IRQ_MB93493_I2C_1               = IRQ_BASE_MB93493 + 4,
-        IRQ_MB93493_USB                 = IRQ_BASE_MB93493 + 5,
-        IRQ_MB93493_LOCAL_BUS           = IRQ_BASE_MB93493 + 7,
-        IRQ_MB93493_PCMCIA              = IRQ_BASE_MB93493 + 8,
-        IRQ_MB93493_GPIO                = IRQ_BASE_MB93493 + 9,
-        IRQ_MB93493_AUDIO_IN            = IRQ_BASE_MB93493 + 10,
-};
-
-/* IRQ multiplexor mappings */
-#define ROUTE_VIA_IRQ0  0       /* route IRQ by way of CPU external IRQ 0 */
-#define ROUTE_VIA_IRQ1  1       /* route IRQ by way of CPU external IRQ 1 */
-
-#define IRQ_MB93493_VDC_ROUTE           ROUTE_VIA_IRQ0
-#define IRQ_MB93493_VCC_ROUTE           ROUTE_VIA_IRQ1
-#define IRQ_MB93493_AUDIO_OUT_ROUTE     ROUTE_VIA_IRQ1
-#define IRQ_MB93493_I2C_0_ROUTE         ROUTE_VIA_IRQ1
-#define IRQ_MB93493_I2C_1_ROUTE         ROUTE_VIA_IRQ1
-#define IRQ_MB93493_USB_ROUTE           ROUTE_VIA_IRQ1
-#define IRQ_MB93493_LOCAL_BUS_ROUTE     ROUTE_VIA_IRQ1
-#define IRQ_MB93493_PCMCIA_ROUTE        ROUTE_VIA_IRQ1
-#define IRQ_MB93493_GPIO_ROUTE          ROUTE_VIA_IRQ1
-#define IRQ_MB93493_AUDIO_IN_ROUTE      ROUTE_VIA_IRQ1
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_MB93493_IRQS_H */
diff --git a/include/asm-frv/mb93493-regs.h b/include/asm-frv/mb93493-regs.h
deleted file mode 100644
index 8a1f6aac8cf1..000000000000
--- a/include/asm-frv/mb93493-regs.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* mb93493-regs.h: MB93493 companion chip registers
- *
- * Copyright (C) 2004 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 _ASM_MB93493_REGS_H
-#define _ASM_MB93493_REGS_H
-
-#include <asm/mb-regs.h>
-#include <asm/mb93493-irqs.h>
-
-#define __addr_MB93493(X)       ((volatile unsigned long *)(__region_CS3 + (X)))
-#define __get_MB93493(X)        ({ *(volatile unsigned long *)(__region_CS3 + (X)); })
-
-#define __set_MB93493(X,V)                                              \
-do {                                                                    \
-        *(volatile unsigned long *)(__region_CS3 + (X)) = (V); mb();    \
-} while(0)
-
-#define __get_MB93493_STSR(X)   __get_MB93493(0x3c0 + (X) * 4)
-#define __set_MB93493_STSR(X,V) __set_MB93493(0x3c0 + (X) * 4, (V))
-#define MB93493_STSR_EN
-
-#define __addr_MB93493_IQSR(X)  __addr_MB93493(0x3d0 + (X) * 4)
-#define __get_MB93493_IQSR(X)   __get_MB93493(0x3d0 + (X) * 4)
-#define __set_MB93493_IQSR(X,V) __set_MB93493(0x3d0 + (X) * 4, (V))
-
-#define __get_MB93493_DQSR(X)   __get_MB93493(0x3e0 + (X) * 4)
-#define __set_MB93493_DQSR(X,V) __set_MB93493(0x3e0 + (X) * 4, (V))
-
-#define __get_MB93493_LBSER()   __get_MB93493(0x3f0)
-#define __set_MB93493_LBSER(V)  __set_MB93493(0x3f0, (V))
-
-#define MB93493_LBSER_VDC       0x00010000
-#define MB93493_LBSER_VCC       0x00020000
-#define MB93493_LBSER_AUDIO     0x00040000
-#define MB93493_LBSER_I2C_0     0x00080000
-#define MB93493_LBSER_I2C_1     0x00100000
-#define MB93493_LBSER_USB       0x00200000
-#define MB93493_LBSER_GPIO      0x00800000
-#define MB93493_LBSER_PCMCIA    0x01000000
-
-#define __get_MB93493_LBSR()    __get_MB93493(0x3fc)
-#define __set_MB93493_LBSR(V)   __set_MB93493(0x3fc, (V))
-
-/*
- * video display controller
- */
-#define __get_MB93493_VDC(X)    __get_MB93493(MB93493_VDC_##X)
-#define __set_MB93493_VDC(X,V)  __set_MB93493(MB93493_VDC_##X, (V))
-
-#define MB93493_VDC_RCURSOR     0x140   /* cursor position */
-#define MB93493_VDC_RCT1        0x144   /* cursor colour 1 */
-#define MB93493_VDC_RCT2        0x148   /* cursor colour 2 */
-#define MB93493_VDC_RHDC        0x150   /* horizontal display period */
-#define MB93493_VDC_RH_MARGINS  0x154   /* horizontal margin sizes */
-#define MB93493_VDC_RVDC        0x158   /* vertical display period */
-#define MB93493_VDC_RV_MARGINS  0x15c   /* vertical margin sizes */
-#define MB93493_VDC_RC          0x170   /* VDC control */
-#define MB93493_VDC_RCLOCK      0x174   /* clock divider, DMA req delay */
-#define MB93493_VDC_RBLACK      0x178   /* black insert sizes */
-#define MB93493_VDC_RS          0x17c   /* VDC status */
-
-#define __addr_MB93493_VDC_BCI(X)  ({ (volatile unsigned long *)(__region_CS3 + 0x000 + (X)); })
-#define __addr_MB93493_VDC_TPO(X)  (__region_CS3 + 0x1c0 + (X))
-
-#define VDC_TPO_WIDTH           32
-
-#define VDC_RC_DSR              0x00000080      /* VDC master reset */
-
-#define VDC_RS_IT               0x00060000      /* interrupt indicators */
-#define VDC_RS_IT_UNDERFLOW     0x00040000      /* - underflow event */
-#define VDC_RS_IT_VSYNC         0x00020000      /* - VSYNC event */
-#define VDC_RS_DFI              0x00010000      /* current interlace field number */
-#define VDC_RS_DFI_TOP          0x00000000      /* - top field */
-#define VDC_RS_DFI_BOTTOM       0x00010000      /* - bottom field */
-#define VDC_RS_DCSR             0x00000010      /* cursor state */
-#define VDC_RS_DCM              0x00000003      /* display mode */
-#define VDC_RS_DCM_DISABLED     0x00000000      /* - display disabled */
-#define VDC_RS_DCM_STOPPED      0x00000001      /* - VDC stopped */
-#define VDC_RS_DCM_FREERUNNING  0x00000002      /* - VDC free-running */
-#define VDC_RS_DCM_TRANSFERRING 0x00000003      /* - data being transferred to VDC */
-
-/*
- * video capture controller
- */
-#define __get_MB93493_VCC(X)    __get_MB93493(MB93493_VCC_##X)
-#define __set_MB93493_VCC(X,V)  __set_MB93493(MB93493_VCC_##X, (V))
-
-#define MB93493_VCC_RREDUCT     0x104   /* reduction rate */
-#define MB93493_VCC_RHY         0x108   /* horizontal brightness filter coefficients */
-#define MB93493_VCC_RHC         0x10c   /* horizontal colour-difference filter coefficients */
-#define MB93493_VCC_RHSIZE      0x110   /* horizontal cycle sizes */
-#define MB93493_VCC_RHBC        0x114   /* horizontal back porch size */
-#define MB93493_VCC_RVCC        0x118   /* vertical capture period */
-#define MB93493_VCC_RVBC        0x11c   /* vertical back porch period */
-#define MB93493_VCC_RV          0x120   /* vertical filter coefficients */
-#define MB93493_VCC_RDTS        0x128   /* DMA transfer size */
-#define MB93493_VCC_RDTS_4B     0x01000000      /* 4-byte transfer */
-#define MB93493_VCC_RDTS_32B    0x03000000      /* 32-byte transfer */
-#define MB93493_VCC_RDTS_SHIFT  24
-#define MB93493_VCC_RCC         0x130   /* VCC control */
-#define MB93493_VCC_RIS         0x134   /* VCC interrupt status */
-
-#define __addr_MB93493_VCC_TPI(X)  (__region_CS3 + 0x180 + (X))
-
-#define VCC_RHSIZE_RHCC         0x000007ff
-#define VCC_RHSIZE_RHCC_SHIFT   0
-#define VCC_RHSIZE_RHTCC        0x0fff0000
-#define VCC_RHSIZE_RHTCC_SHIFT  16
-
-#define VCC_RVBC_RVBC           0x00003f00
-#define VCC_RVBC_RVBC_SHIFT     8
-
-#define VCC_RREDUCT_RHR         0x07ff0000
-#define VCC_RREDUCT_RHR_SHIFT   16
-#define VCC_RREDUCT_RVR         0x000007ff
-#define VCC_RREDUCT_RVR_SHIFT   0
-
-#define VCC_RCC_CE              0x00000001      /* VCC enable */
-#define VCC_RCC_CS              0x00000002      /* request video capture start */
-#define VCC_RCC_CPF             0x0000000c      /* pixel format */
-#define VCC_RCC_CPF_YCBCR_16    0x00000000      /* - YCbCr 4:2:2 16-bit format */
-#define VCC_RCC_CPF_RGB         0x00000004      /* - RGB 4:4:4 format */
-#define VCC_RCC_CPF_YCBCR_24    0x00000008      /* - YCbCr 4:2:2 24-bit format */
-#define VCC_RCC_CPF_BT656       0x0000000c      /* - ITU R-BT.656 format */
-#define VCC_RCC_CPF_SHIFT       2
-#define VCC_RCC_CSR             0x00000080      /* request reset */
-#define VCC_RCC_HSIP            0x00000100      /* HSYNC polarity */
-#define VCC_RCC_HSIP_LOACT      0x00000000      /* - low active */
-#define VCC_RCC_HSIP_HIACT      0x00000100      /* - high active */
-#define VCC_RCC_VSIP            0x00000200      /* VSYNC polarity */
-#define VCC_RCC_VSIP_LOACT      0x00000000      /* - low active */
-#define VCC_RCC_VSIP_HIACT      0x00000200      /* - high active */
-#define VCC_RCC_CIE             0x00000800      /* interrupt enable */
-#define VCC_RCC_CFP             0x00001000      /* RGB pixel packing */
-#define VCC_RCC_CFP_4TO3        0x00000000      /* - pack 4 pixels into 3 words */
-#define VCC_RCC_CFP_1TO1        0x00001000      /* - pack 1 pixel into 1 words */
-#define VCC_RCC_CSM             0x00006000      /* interlace specification */
-#define VCC_RCC_CSM_ONEPASS     0x00002000      /* - non-interlaced */
-#define VCC_RCC_CSM_INTERLACE   0x00004000      /* - interlaced */
-#define VCC_RCC_CSM_SHIFT       13
-#define VCC_RCC_ES              0x00008000      /* capture start polarity */
-#define VCC_RCC_ES_NEG          0x00000000      /* - negative edge */
-#define VCC_RCC_ES_POS          0x00008000      /* - positive edge */
-#define VCC_RCC_IFI             0x00080000      /* inferlace field evaluation reverse */
-#define VCC_RCC_FDTS            0x00300000      /* interlace field start */
-#define VCC_RCC_FDTS_3_8        0x00000000      /* - 3/8 of horizontal entire cycle */
-#define VCC_RCC_FDTS_1_4        0x00100000      /* - 1/4 of horizontal entire cycle */
-#define VCC_RCC_FDTS_7_16       0x00200000      /* - 7/16 of horizontal entire cycle */
-#define VCC_RCC_FDTS_SHIFT      20
-#define VCC_RCC_MOV             0x00400000      /* test bit - always set to 1 */
-#define VCC_RCC_STP             0x00800000      /* request video capture stop */
-#define VCC_RCC_TO              0x01000000      /* input during top-field only */
-
-#define VCC_RIS_VSYNC           0x01000000      /* VSYNC interrupt */
-#define VCC_RIS_OV              0x02000000      /* overflow interrupt */
-#define VCC_RIS_BOTTOM          0x08000000      /* interlace bottom field */
-#define VCC_RIS_STARTED         0x10000000      /* capture started */
-
-/*
- * I2C
- */
-#define MB93493_I2C_BSR         0x340           /* bus status */
-#define MB93493_I2C_BCR         0x344           /* bus control */
-#define MB93493_I2C_CCR         0x348           /* clock control */
-#define MB93493_I2C_ADR         0x34c           /* address */
-#define MB93493_I2C_DTR         0x350           /* data */
-#define MB93493_I2C_BC2R        0x35c           /* bus control 2 */
-
-#define __addr_MB93493_I2C(port,X)   (__region_CS3 + MB93493_I2C_##X + ((port)*0x20))
-#define __get_MB93493_I2C(port,X)    __get_MB93493(MB93493_I2C_##X + ((port)*0x20))
-#define __set_MB93493_I2C(port,X,V)  __set_MB93493(MB93493_I2C_##X + ((port)*0x20), (V))
-
-#define I2C_BSR_BB      (1 << 7)
-
-/*
- * audio controller (I2S) registers
- */
-#define __get_MB93493_I2S(X)    __get_MB93493(MB93493_I2S_##X)
-#define __set_MB93493_I2S(X,V)  __set_MB93493(MB93493_I2S_##X, (V))
-
-#define MB93493_I2S_ALDR        0x300           /* L-channel data */
-#define MB93493_I2S_ARDR        0x304           /* R-channel data */
-#define MB93493_I2S_APDR        0x308           /* 16-bit packed data */
-#define MB93493_I2S_AISTR       0x310           /* status */
-#define MB93493_I2S_AICR        0x314           /* control */
-
-#define __addr_MB93493_I2S_ALDR(X)      (__region_CS3 + MB93493_I2S_ALDR + (X))
-#define __addr_MB93493_I2S_ARDR(X)      (__region_CS3 + MB93493_I2S_ARDR + (X))
-#define __addr_MB93493_I2S_APDR(X)      (__region_CS3 + MB93493_I2S_APDR + (X))
-#define __addr_MB93493_I2S_ADR(X)       (__region_CS3 + 0x320 + (X))
-
-#define I2S_AISTR_OTST          0x00000003      /* status of output data transfer */
-#define I2S_AISTR_OTR           0x00000010      /* output transfer request pending */
-#define I2S_AISTR_OUR           0x00000020      /* output FIFO underrun detected */
-#define I2S_AISTR_OOR           0x00000040      /* output FIFO overrun detected */
-#define I2S_AISTR_ODS           0x00000100      /* output DMA transfer size */
-#define I2S_AISTR_ODE           0x00000400      /* output DMA transfer request enable */
-#define I2S_AISTR_OTRIE         0x00001000      /* output transfer request interrupt enable */
-#define I2S_AISTR_OURIE         0x00002000      /* output FIFO underrun interrupt enable */
-#define I2S_AISTR_OORIE         0x00004000      /* output FIFO overrun interrupt enable */
-#define I2S_AISTR__OUT_MASK     0x00007570
-#define I2S_AISTR_ITST          0x00030000      /* status of input data transfer */
-#define I2S_AISTR_ITST_SHIFT    16
-#define I2S_AISTR_ITR           0x00100000      /* input transfer request pending */
-#define I2S_AISTR_IUR           0x00200000      /* input FIFO underrun detected */
-#define I2S_AISTR_IOR           0x00400000      /* input FIFO overrun detected */
-#define I2S_AISTR_IDS           0x01000000      /* input DMA transfer size */
-#define I2S_AISTR_IDE           0x04000000      /* input DMA transfer request enable */
-#define I2S_AISTR_ITRIE         0x10000000      /* input transfer request interrupt enable */
-#define I2S_AISTR_IURIE         0x20000000      /* input FIFO underrun interrupt enable */
-#define I2S_AISTR_IORIE         0x40000000      /* input FIFO overrun interrupt enable */
-#define I2S_AISTR__IN_MASK      0x75700000
-
-#define I2S_AICR_MI             0x00000001      /* mono input requested */
-#define I2S_AICR_AMI            0x00000002      /* relation between LRCKI/FS1 and SDI */
-#define I2S_AICR_LRI            0x00000004      /* function of LRCKI pin */
-#define I2S_AICR_SDMI           0x00000070      /* format of input audio data */
-#define I2S_AICR_SDMI_SHIFT     4
-#define I2S_AICR_CLI            0x00000080      /* input FIFO clearing control */
-#define I2S_AICR_IM             0x00000300      /* input state control */
-#define I2S_AICR_IM_SHIFT       8
-#define I2S_AICR__IN_MASK       0x000003f7
-#define I2S_AICR_MO             0x00001000      /* mono output requested */
-#define I2S_AICR_AMO            0x00002000      /* relation between LRCKO/FS0 and SDO */
-#define I2S_AICR_AMO_SHIFT      13
-#define I2S_AICR_LRO            0x00004000      /* function of LRCKO pin */
-#define I2S_AICR_SDMO           0x00070000      /* format of output audio data */
-#define I2S_AICR_SDMO_SHIFT     16
-#define I2S_AICR_CLO            0x00080000      /* output FIFO clearing control */
-#define I2S_AICR_OM             0x00100000      /* output state control */
-#define I2S_AICR__OUT_MASK      0x001f7000
-#define I2S_AICR_DIV            0x03000000      /* frequency division rate */
-#define I2S_AICR_DIV_SHIFT      24
-#define I2S_AICR_FL             0x20000000      /* frame length */
-#define I2S_AICR_FS             0x40000000      /* frame sync method */
-#define I2S_AICR_ME             0x80000000      /* master enable */
-
-/*
- * PCMCIA
- */
-#define __addr_MB93493_PCMCIA(X)  ((volatile unsigned long *)(__region_CS5 + (X)))
-
-/*
- * GPIO
- */
-#define __get_MB93493_GPIO_PDR(X)       __get_MB93493(0x380 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDR(X,V)     __set_MB93493(0x380 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_GPDR(X)      __get_MB93493(0x384 + (X) * 0xc0)
-#define __set_MB93493_GPIO_GPDR(X,V)    __set_MB93493(0x384 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_SIR(X)       __get_MB93493(0x388 + (X) * 0xc0)
-#define __set_MB93493_GPIO_SIR(X,V)     __set_MB93493(0x388 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_SOR(X)       __get_MB93493(0x38c + (X) * 0xc0)
-#define __set_MB93493_GPIO_SOR(X,V)     __set_MB93493(0x38c + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_PDSR(X)      __get_MB93493(0x390 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDSR(X,V)    __set_MB93493(0x390 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_PDCR(X)      __get_MB93493(0x394 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDCR(X,V)    __set_MB93493(0x394 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_INTST(X)     __get_MB93493(0x398 + (X) * 0xc0)
-#define __set_MB93493_GPIO_INTST(X,V)   __set_MB93493(0x398 + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_IEHL(X)      __get_MB93493(0x39c + (X) * 0xc0)
-#define __set_MB93493_GPIO_IEHL(X,V)    __set_MB93493(0x39c + (X) * 0xc0, (V))
-
-#define __get_MB93493_GPIO_IELH(X)      __get_MB93493(0x3a0 + (X) * 0xc0)
-#define __set_MB93493_GPIO_IELH(X,V)    __set_MB93493(0x3a0 + (X) * 0xc0, (V))
-
-#endif /* _ASM_MB93493_REGS_H */
diff --git a/include/asm-frv/mc146818rtc.h b/include/asm-frv/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/include/asm-frv/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 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 _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/include/asm-frv/mem-layout.h b/include/asm-frv/mem-layout.h
deleted file mode 100644
index 2947764fc0e0..000000000000
--- a/include/asm-frv/mem-layout.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* mem-layout.h: memory layout
- *
- * Copyright (C) 2004 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 _ASM_MEM_LAYOUT_H
-#define _ASM_MEM_LAYOUT_H
-
-#ifndef __ASSEMBLY__
-#define __UL(X) ((unsigned long) (X))
-#else
-#define __UL(X) (X)
-#endif
-
-/*
- * PAGE_SHIFT determines the page size
- */
-#define PAGE_SHIFT                      14
-
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE                       (1UL << PAGE_SHIFT)
-#else
-#define PAGE_SIZE                       (1 << PAGE_SHIFT)
-#endif
-
-#define PAGE_MASK                       (~(PAGE_SIZE-1))
-
-/*
- * the slab must be aligned such that load- and store-double instructions don't
- * fault if used
- */
-#define ARCH_KMALLOC_MINALIGN           8
-#define ARCH_SLAB_MINALIGN              8
-
-/*****************************************************************************/
-/*
- * virtual memory layout from kernel's point of view
- */
-#define PAGE_OFFSET                     ((unsigned long) &__page_offset)
-
-#ifdef CONFIG_MMU
-
-/* see Documentation/frv/mmu-layout.txt */
-#define KERNEL_LOWMEM_START             __UL(0xc0000000)
-#define KERNEL_LOWMEM_END               __UL(0xd0000000)
-#define VMALLOC_START                   __UL(0xd0000000)
-#define VMALLOC_END                     __UL(0xd8000000)
-#define PKMAP_BASE                      __UL(0xd8000000)
-#define PKMAP_END                       __UL(0xdc000000)
-#define KMAP_ATOMIC_SECONDARY_FRAME     __UL(0xdc000000)
-#define KMAP_ATOMIC_PRIMARY_FRAME       __UL(0xdd000000)
-
-#endif
-
-#define KERNEL_IO_START                 __UL(0xe0000000)
-
-
-/*****************************************************************************/
-/*
- * memory layout from userspace's point of view
- */
-#define BRK_BASE                        __UL(2 * 1024 * 1024 + PAGE_SIZE)
-#define STACK_TOP                       __UL(2 * 1024 * 1024)
-#define STACK_TOP_MAX                   __UL(0xc0000000)
-
-/* userspace process size */
-#ifdef CONFIG_MMU
-#define TASK_SIZE                       (PAGE_OFFSET)
-#else
-#define TASK_SIZE                       __UL(0xFFFFFFFFUL)
-#endif
-
-/* base of area at which unspecified mmaps will start */
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-#define TASK_UNMAPPED_BASE              __UL(16 * 1024 * 1024)
-#else
-#define TASK_UNMAPPED_BASE              __UL(TASK_SIZE / 3)
-#endif
-
-#endif /* _ASM_MEM_LAYOUT_H */
diff --git a/include/asm-frv/mman.h b/include/asm-frv/mman.h
deleted file mode 100644
index b4371e928683..000000000000
--- a/include/asm-frv/mman.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __ASM_MMAN_H__
-#define __ASM_MMAN_H__
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MAP_LOCKED      0x2000          /* pages are locked */
-#define MAP_NORESERVE   0x4000          /* don't check for reservations */
-#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
-
-#endif /* __ASM_MMAN_H__ */
-
diff --git a/include/asm-frv/mmu.h b/include/asm-frv/mmu.h
deleted file mode 100644
index 86ca0e86e7d2..000000000000
--- a/include/asm-frv/mmu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* mmu.h: memory management context for FR-V with or without MMU support
- *
- * Copyright (C) 2004 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 _ASM_MMU_H
-#define _ASM_MMU_H
-
-typedef struct {
-#ifdef CONFIG_MMU
-        struct list_head id_link;               /* link in list of context ID owners */
-        unsigned short  id;                     /* MMU context ID */
-        unsigned short  id_busy;                /* true if ID is in CXNR */
-        unsigned long   itlb_cached_pge;        /* [SCR0] PGE cached for insn TLB handler */
-        unsigned long   itlb_ptd_mapping;       /* [DAMR4] PTD mapping for itlb cached PGE */
-        unsigned long   dtlb_cached_pge;        /* [SCR1] PGE cached for data TLB handler */
-        unsigned long   dtlb_ptd_mapping;       /* [DAMR5] PTD mapping for dtlb cached PGE */
-
-#else
-        unsigned long           end_brk;
-
-#endif
-
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-        unsigned long   exec_fdpic_loadmap;
-        unsigned long   interp_fdpic_loadmap;
-#endif
-
-} mm_context_t;
-
-#ifdef CONFIG_MMU
-extern int __nongpreldata cxn_pinned;
-extern int cxn_pin_by_pid(pid_t pid);
-#endif
-
-#endif /* _ASM_MMU_H */
diff --git a/include/asm-frv/mmu_context.h b/include/asm-frv/mmu_context.h
deleted file mode 100644
index c7daa395156a..000000000000
--- a/include/asm-frv/mmu_context.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* mmu_context.h: MMU context management routines
- *
- * Copyright (C) 2004 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 _ASM_MMU_CONTEXT_H
-#define _ASM_MMU_CONTEXT_H
-
-#include <asm/setup.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm-generic/mm_hooks.h>
-
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-#ifdef CONFIG_MMU
-extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
-extern void change_mm_context(mm_context_t *old, mm_context_t *ctx, pgd_t *_pgd);
-extern void destroy_context(struct mm_struct *mm);
-
-#else
-#define init_new_context(tsk, mm)               ({ 0; })
-#define change_mm_context(old, ctx, _pml4)      do {} while(0)
-#define destroy_context(mm)                     do {} while(0)
-#endif
-
-#define switch_mm(prev, next, tsk)                                              \
-do {                                                                            \
-        if (prev != next)                                                       \
-                change_mm_context(&prev->context, &next->context, next->pgd);   \
-} while(0)
-
-#define activate_mm(prev, next)                                         \
-do {                                                                    \
-        change_mm_context(&prev->context, &next->context, next->pgd);   \
-} while(0)
-
-#define deactivate_mm(tsk, mm)                  \
-do {                                            \
-} while(0)
-
-#endif
diff --git a/include/asm-frv/module.h b/include/asm-frv/module.h
deleted file mode 100644
index 3d5c6360289a..000000000000
--- a/include/asm-frv/module.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* module.h: FRV module stuff
- *
- * Copyright (C) 2004 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 _ASM_MODULE_H
-#define _ASM_MODULE_H
-
-struct mod_arch_specific
-{
-};
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-
-/*
- * Include the architecture version.
- */
-#define MODULE_ARCH_VERMAGIC __stringify(PROCESSOR_MODEL_NAME) " "
-
-#endif /* _ASM_MODULE_H */
-
diff --git a/include/asm-frv/msgbuf.h b/include/asm-frv/msgbuf.h
deleted file mode 100644
index 97ceb55a06fb..000000000000
--- a/include/asm-frv/msgbuf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _ASM_MSGBUF_H
-#define _ASM_MSGBUF_H
-
-/*
- * The msqid64_ds structure for FR-V architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm       msg_perm;
-        __kernel_time_t         msg_stime;      /* last msgsnd time */
-        unsigned long           __unused1;
-        __kernel_time_t         msg_rtime;      /* last msgrcv time */
-        unsigned long           __unused2;
-        __kernel_time_t         msg_ctime;      /* last change time */
-        unsigned long           __unused3;
-        unsigned long           msg_cbytes;     /* current number of bytes on queue */
-        unsigned long           msg_qnum;       /* number of messages in queue */
-        unsigned long           msg_qbytes;     /* max number of bytes on queue */
-        __kernel_pid_t          msg_lspid;      /* pid of last msgsnd */
-        __kernel_pid_t          msg_lrpid;      /* last receive pid */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-#endif /* _ASM_MSGBUF_H */
-
diff --git a/include/asm-frv/mutex.h b/include/asm-frv/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/include/asm-frv/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h
deleted file mode 100644
index bd9c220094c7..000000000000
--- a/include/asm-frv/page.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _ASM_PAGE_H
-#define _ASM_PAGE_H
-
-#include <asm/virtconvert.h>
-#include <asm/mem-layout.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-
-#ifndef __ASSEMBLY__
-
-#define get_user_page(vaddr)                    __get_free_page(GFP_KERNEL)
-#define free_user_page(page, addr)              free_page(addr)
-
-#define clear_page(pgaddr)                      memset((pgaddr), 0, PAGE_SIZE)
-#define copy_page(to,from)                      memcpy((to), (from), PAGE_SIZE)
-
-#define clear_user_page(pgaddr, vaddr, page)    memset((pgaddr), 0, PAGE_SIZE)
-#define copy_user_page(vto, vfrom, vaddr, topg) memcpy((vto), (vfrom), PAGE_SIZE)
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long  pte;    } pte_t;
-typedef struct { unsigned long  ste[64];} pmd_t;
-typedef struct { pmd_t          pue[1]; } pud_t;
-typedef struct { pud_t          pge[1]; } pgd_t;
-typedef struct { unsigned long  pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-
-#define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).ste[0])
-#define pud_val(x)      ((x).pue[0])
-#define pgd_val(x)      ((x).pge[0])
-#define pgprot_val(x)   ((x).pgprot)
-
-#define __pte(x)        ((pte_t) { (x) } )
-#define __pmd(x)        ((pmd_t) { (x) } )
-#define __pud(x)        ((pud_t) { (x) } )
-#define __pgd(x)        ((pgd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-#define PTE_MASK        PAGE_MASK
-
-#define devmem_is_allowed(pfn)  1
-
-#define __pa(vaddr)             virt_to_phys((void *) (unsigned long) (vaddr))
-#define __va(paddr)             phys_to_virt((unsigned long) (paddr))
-
-#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
-
-extern unsigned long max_low_pfn;
-extern unsigned long min_low_pfn;
-extern unsigned long max_pfn;
-
-#ifdef CONFIG_MMU
-#define pfn_valid(pfn)          ((pfn) < max_mapnr)
-#else
-#define ARCH_PFN_OFFSET         (PAGE_OFFSET >> PAGE_SHIFT)
-#define pfn_valid(pfn)          ((pfn) >= min_low_pfn && (pfn) < max_low_pfn)
-
-#endif
-
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-
-
-#ifdef CONFIG_MMU
-#define VM_DATA_DEFAULT_FLAGS \
-        (VM_READ | VM_WRITE | \
-        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
-                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#endif /* _ASM_PAGE_H */
diff --git a/include/asm-frv/param.h b/include/asm-frv/param.h
deleted file mode 100644
index 6859dd503ed3..000000000000
--- a/include/asm-frv/param.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _ASM_PARAM_H
-#define _ASM_PARAM_H
-
-#ifdef __KERNEL__
-#define HZ              CONFIG_HZ       /* Internal kernel timer frequency */
-#define USER_HZ         100             /* .. some user interfaces are in "ticks" */
-#define CLOCKS_PER_SEC  (USER_HZ)       /* like times() */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#define EXEC_PAGESIZE   16384
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN          64      /* max length of hostname */
-
-#endif /* _ASM_PARAM_H */
diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h
deleted file mode 100644
index 585d9b49949a..000000000000
--- a/include/asm-frv/pci.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* pci.h: FR-V specific PCI declarations
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m68k/pci.h
- *
- * 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 ASM_PCI_H
-#define ASM_PCI_H
-
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-#include <asm-generic/pci-dma-compat.h>
-#include <asm-generic/pci.h>
-
-struct pci_dev;
-
-#define pcibios_assign_all_busses()     0
-
-extern void pcibios_set_master(struct pci_dev *dev);
-
-extern void pcibios_penalize_isa_irq(int irq);
-
-#ifdef CONFIG_MMU
-extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);
-extern void consistent_free(void *vaddr);
-extern void consistent_sync(void *vaddr, size_t size, int direction);
-extern void consistent_sync_page(struct page *page, unsigned long offset,
-                                 size_t size, int direction);
-#endif
-
-extern void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                                  dma_addr_t *dma_handle);
-
-extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                                void *vaddr, dma_addr_t dma_handle);
-
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)        (0)
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-/* pci_unmap_{page,single} is a nop so... */
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define pci_unmap_addr(PTR, ADDR_NAME)          (0)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
-#define pci_unmap_len(PTR, LEN_NAME)            (0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)   do { } while (0)
-
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
-                                        enum pci_dma_burst_strategy *strat,
-                                        unsigned long *strategy_parameter)
-{
-        *strat = PCI_DMA_BURST_INFINITY;
-        *strategy_parameter = ~0UL;
-}
-#endif
-
-/*
- *      These are pretty much arbitary with the CoMEM implementation.
- *      We have the whole address space to ourselves.
- */
-#define PCIBIOS_MIN_IO          0x100
-#define PCIBIOS_MIN_MEM         0x00010000
-
-/* Make physical memory consistent for a single
- * streaming mode DMA translation after a transfer.
- *
- * If you perform a pci_map_single() but wish to interrogate the
- * buffer using the cpu, yet do not wish to teardown the PCI dma
- * mapping, you must call this function before doing so.  At the
- * next point you give the PCI dma address back to the card, the
- * device again owns the buffer.
- */
-static inline void pci_dma_sync_single(struct pci_dev *hwdev,
-                                       dma_addr_t dma_handle,
-                                       size_t size, int direction)
-{
-        if (direction == PCI_DMA_NONE)
-                BUG();
-
-        frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle),
-                            (unsigned long)bus_to_virt(dma_handle) + size);
-}
-
-/* Make physical memory consistent for a set of streaming
- * mode DMA translations after a transfer.
- *
- * The same as pci_dma_sync_single but for a scatter-gather list,
- * same rules and usage.
- */
-static inline void pci_dma_sync_sg(struct pci_dev *hwdev,
-                                   struct scatterlist *sg,
-                                   int nelems, int direction)
-{
-        int i;
-
-        if (direction == PCI_DMA_NONE)
-                BUG();
-
-        for (i = 0; i < nelems; i++)
-                frv_cache_wback_inv(sg_dma_address(&sg[i]),
-                                    sg_dma_address(&sg[i])+sg_dma_len(&sg[i]));
-}
-
-
-#endif
diff --git a/include/asm-frv/percpu.h b/include/asm-frv/percpu.h
deleted file mode 100644
index 2cad3f874ded..000000000000
--- a/include/asm-frv/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_PERCPU_H
-#define __ASM_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif  /* __ASM_PERCPU_H */
diff --git a/include/asm-frv/pgalloc.h b/include/asm-frv/pgalloc.h
deleted file mode 100644
index 971e6addb009..000000000000
--- a/include/asm-frv/pgalloc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* pgalloc.h: Page allocation routines for FRV
- *
- * Copyright (C) 2004 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.
- *
- * Derived from:
- *      include/asm-m68knommu/pgalloc.h
- *      include/asm-i386/pgalloc.h
- */
-#ifndef _ASM_PGALLOC_H
-#define _ASM_PGALLOC_H
-
-#include <asm/setup.h>
-#include <asm/virtconvert.h>
-
-#ifdef CONFIG_MMU
-
-#define pmd_populate_kernel(mm, pmd, pte) __set_pmd(pmd, __pa(pte) | _PAGE_TABLE)
-#define pmd_populate(MM, PMD, PAGE)                                             \
-do {                                                                            \
-        __set_pmd((PMD), page_to_pfn(PAGE) << PAGE_SHIFT | _PAGE_TABLE);        \
-} while(0)
-#define pmd_pgtable(pmd) pmd_page(pmd)
-
-/*
- * Allocate and free page tables.
- */
-
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(struct mm_struct *mm, pgd_t *);
-
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
-
-extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);
-
-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
-{
-        free_page((unsigned long)pte);
-}
-
-static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
-{
-        pgtable_page_dtor(pte);
-        __free_page(pte);
-}
-
-#define __pte_free_tlb(tlb,pte)                         \
-do {                                                    \
-        pgtable_page_dtor(pte);                         \
-        tlb_remove_page((tlb),(pte));                   \
-} while (0)
-
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- * (In the PAE case we free the pmds as part of the pgd.)
- */
-#define pmd_alloc_one(mm, addr)         ({ BUG(); ((pmd_t *) 2); })
-#define pmd_free(mm, x)                 do { } while (0)
-#define __pmd_free_tlb(tlb,x)           do { } while (0)
-
-#endif /* CONFIG_MMU */
-
-#endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h
deleted file mode 100644
index e16fdb1f4f4f..000000000000
--- a/include/asm-frv/pgtable.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/* pgtable.h: FR-V page table mangling
- *
- * Copyright (C) 2004 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.
- *
- * Derived from:
- *      include/asm-m68knommu/pgtable.h
- *      include/asm-i386/pgtable.h
- */
-
-#ifndef _ASM_PGTABLE_H
-#define _ASM_PGTABLE_H
-
-#include <asm/mem-layout.h>
-#include <asm/setup.h>
-#include <asm/processor.h>
-
-#ifndef __ASSEMBLY__
-#include <linux/threads.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/sched.h>
-struct vm_area_struct;
-#endif
-
-#ifndef __ASSEMBLY__
-#if defined(CONFIG_HIGHPTE)
-typedef unsigned long pte_addr_t;
-#else
-typedef pte_t *pte_addr_t;
-#endif
-#endif
-
-/*****************************************************************************/
-/*
- * MMU-less operation case first
- */
-#ifndef CONFIG_MMU
-
-#define pgd_present(pgd)        (1)             /* pages are always present on NO_MM */
-#define pgd_none(pgd)           (0)
-#define pgd_bad(pgd)            (0)
-#define pgd_clear(pgdp)
-#define kern_addr_valid(addr)   (1)
-#define pmd_offset(a, b)        ((void *) 0)
-
-#define PAGE_NONE               __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_SHARED             __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_COPY               __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_READONLY           __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_KERNEL             __pgprot(0)     /* these mean nothing to NO_MM */
-
-#define __swp_type(x)           (0)
-#define __swp_offset(x)         (0)
-#define __swp_entry(typ,off)    ((swp_entry_t) { ((typ) | ((off) << 7)) })
-#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
-
-#ifndef __ASSEMBLY__
-static inline int pte_file(pte_t pte) { return 0; }
-#endif
-
-#define ZERO_PAGE(vaddr)        ({ BUG(); NULL; })
-
-#define swapper_pg_dir          ((pgd_t *) NULL)
-
-#define pgtable_cache_init()            do {} while (0)
-#define arch_enter_lazy_mmu_mode()      do {} while (0)
-#define arch_leave_lazy_mmu_mode()      do {} while (0)
-#define arch_enter_lazy_cpu_mode()      do {} while (0)
-#define arch_leave_lazy_cpu_mode()      do {} while (0)
-
-#else /* !CONFIG_MMU */
-/*****************************************************************************/
-/*
- * then MMU operation
- */
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#ifndef __ASSEMBLY__
-extern unsigned long empty_zero_page;
-#define ZERO_PAGE(vaddr)        virt_to_page(empty_zero_page)
-#endif
-
-/*
- * we use 2-level page tables, folding the PMD (mid-level table) into the PGE (top-level entry)
- * [see Documentation/frv/mmu-layout.txt]
- *
- * Page Directory:
- *  - Size: 16KB
- *  - 64 PGEs per PGD
- *  - Each PGE holds 1 PUD and covers 64MB
- *
- * Page Upper Directory:
- *  - Size: 256B
- *  - 1 PUE per PUD
- *  - Each PUE holds 1 PMD and covers 64MB
- *
- * Page Mid-Level Directory
- *  - Size: 256B
- *  - 1 PME per PMD
- *  - Each PME holds 64 STEs, all of which point to separate chunks of the same Page Table
- *  - All STEs are instantiated at the same time
- *
- * Page Table
- *  - Size: 16KB
- *  - 4096 PTEs per PT
- *  - Each Linux PT is subdivided into 64 FR451 PT's, each of which holds 64 entries
- *
- * Pages
- *  - Size: 4KB
- *
- * total PTEs
- *      = 1 PML4E * 64 PGEs * 1 PUEs * 1 PMEs * 4096 PTEs
- *      = 1 PML4E * 64 PGEs * 64 STEs * 64 PTEs/FR451-PT
- *      = 262144 (or 256 * 1024)
- */
-#define PGDIR_SHIFT             26
-#define PGDIR_SIZE              (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK              (~(PGDIR_SIZE - 1))
-#define PTRS_PER_PGD            64
-
-#define PUD_SHIFT               26
-#define PTRS_PER_PUD            1
-#define PUD_SIZE                (1UL << PUD_SHIFT)
-#define PUD_MASK                (~(PUD_SIZE - 1))
-#define PUE_SIZE                256
-
-#define PMD_SHIFT               26
-#define PMD_SIZE                (1UL << PMD_SHIFT)
-#define PMD_MASK                (~(PMD_SIZE - 1))
-#define PTRS_PER_PMD            1
-#define PME_SIZE                256
-
-#define __frv_PT_SIZE           256
-
-#define PTRS_PER_PTE            4096
-
-#define USER_PGDS_IN_LAST_PML4  (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-
-#define USER_PGD_PTRS           (PAGE_OFFSET >> PGDIR_SHIFT)
-#define KERNEL_PGD_PTRS         (PTRS_PER_PGD - USER_PGD_PTRS)
-
-#define TWOLEVEL_PGDIR_SHIFT    26
-#define BOOT_USER_PGD_PTRS      (__PAGE_OFFSET >> TWOLEVEL_PGDIR_SHIFT)
-#define BOOT_KERNEL_PGD_PTRS    (PTRS_PER_PGD - BOOT_USER_PGD_PTRS)
-
-#ifndef __ASSEMBLY__
-
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte)
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
-#define pud_ERROR(e) \
-        printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pmd_val(pud_val(e)))
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pmd_val(pud_val(pgd_val(e))))
-
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#define set_pte(pteptr, pteval)                         \
-do {                                                    \
-        *(pteptr) = (pteval);                           \
-        asm volatile("dcf %M0" :: "U"(*pteptr));        \
-} while(0)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-
-/*
- * pgd_offset() returns a (pgd_t *)
- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
- */
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-
-/*
- * a shortcut which implies the use of the kernel's pgd, instead
- * of a process's
- */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-
-/*
- * The "pgd_xxx()" functions here are trivial for a folded two-level
- * setup: the pud is never bad, and a pud always exists (as it's folded
- * into the pgd entry)
- */
-static inline int pgd_none(pgd_t pgd)           { return 0; }
-static inline int pgd_bad(pgd_t pgd)            { return 0; }
-static inline int pgd_present(pgd_t pgd)        { return 1; }
-static inline void pgd_clear(pgd_t *pgd)        { }
-
-#define pgd_populate(mm, pgd, pud)              do { } while (0)
-/*
- * (puds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pgd(pgdptr, pgdval)                         \
-do {                                                    \
-        memcpy((pgdptr), &(pgdval), sizeof(pgd_t));     \
-        asm volatile("dcf %M0" :: "U"(*(pgdptr)));      \
-} while(0)
-
-static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
-{
-        return (pud_t *) pgd;
-}
-
-#define pgd_page(pgd)                           (pud_page((pud_t){ pgd }))
-#define pgd_page_vaddr(pgd)                     (pud_page_vaddr((pud_t){ pgd }))
-
-/*
- * allocating and freeing a pud is trivial: the 1-entry pud is
- * inside the pgd, so has no extra memory associated with it.
- */
-#define pud_alloc_one(mm, address)              NULL
-#define pud_free(mm, x)                         do { } while (0)
-#define __pud_free_tlb(tlb, x)                  do { } while (0)
-
-/*
- * The "pud_xxx()" functions here are trivial for a folded two-level
- * setup: the pmd is never bad, and a pmd always exists (as it's folded
- * into the pud entry)
- */
-static inline int pud_none(pud_t pud)           { return 0; }
-static inline int pud_bad(pud_t pud)            { return 0; }
-static inline int pud_present(pud_t pud)        { return 1; }
-static inline void pud_clear(pud_t *pud)        { }
-
-#define pud_populate(mm, pmd, pte)              do { } while (0)
-
-/*
- * (pmds are folded into puds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pud(pudptr, pudval)                 set_pmd((pmd_t *)(pudptr), (pmd_t) { pudval })
-
-#define pud_page(pud)                           (pmd_page((pmd_t){ pud }))
-#define pud_page_vaddr(pud)                     (pmd_page_vaddr((pmd_t){ pud }))
-
-/*
- * (pmds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-extern void __set_pmd(pmd_t *pmdptr, unsigned long __pmd);
-
-#define set_pmd(pmdptr, pmdval)                 \
-do {                                            \
-        __set_pmd((pmdptr), (pmdval).ste[0]);   \
-} while(0)
-
-#define __pmd_index(address)                    0
-
-static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address)
-{
-        return (pmd_t *) dir + __pmd_index(address);
-}
-
-#define pte_same(a, b)          ((a).pte == (b).pte)
-#define pte_page(x)             (mem_map + ((unsigned long)(((x).pte >> PAGE_SHIFT))))
-#define pte_none(x)             (!(x).pte)
-#define pte_pfn(x)              ((unsigned long)(((x).pte >> PAGE_SHIFT)))
-#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-
-#define VMALLOC_VMADDR(x)       ((unsigned long) (x))
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * control flags in AMPR registers and TLB entries
- */
-#define _PAGE_BIT_PRESENT       xAMPRx_V_BIT
-#define _PAGE_BIT_WP            DAMPRx_WP_BIT
-#define _PAGE_BIT_NOCACHE       xAMPRx_C_BIT
-#define _PAGE_BIT_SUPER         xAMPRx_S_BIT
-#define _PAGE_BIT_ACCESSED      xAMPRx_RESERVED8_BIT
-#define _PAGE_BIT_DIRTY         xAMPRx_M_BIT
-#define _PAGE_BIT_NOTGLOBAL     xAMPRx_NG_BIT
-
-#define _PAGE_PRESENT           xAMPRx_V
-#define _PAGE_WP                DAMPRx_WP
-#define _PAGE_NOCACHE           xAMPRx_C
-#define _PAGE_SUPER             xAMPRx_S
-#define _PAGE_ACCESSED          xAMPRx_RESERVED8        /* accessed if set */
-#define _PAGE_DIRTY             xAMPRx_M
-#define _PAGE_NOTGLOBAL         xAMPRx_NG
-
-#define _PAGE_RESERVED_MASK     (xAMPRx_RESERVED8 | xAMPRx_RESERVED13)
-
-#define _PAGE_FILE              0x002   /* set:pagecache unset:swap */
-#define _PAGE_PROTNONE          0x000   /* If not present */
-
-#define _PAGE_CHG_MASK          (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-
-#define __PGPROT_BASE \
-        (_PAGE_PRESENT | xAMPRx_SS_16Kb | xAMPRx_D | _PAGE_NOTGLOBAL | _PAGE_ACCESSED)
-
-#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)
-#define PAGE_SHARED     __pgprot(__PGPROT_BASE)
-#define PAGE_COPY       __pgprot(__PGPROT_BASE | _PAGE_WP)
-#define PAGE_READONLY   __pgprot(__PGPROT_BASE | _PAGE_WP)
-
-#define __PAGE_KERNEL           (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY)
-#define __PAGE_KERNEL_NOCACHE   (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY | _PAGE_NOCACHE)
-#define __PAGE_KERNEL_RO        (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY | _PAGE_WP)
-
-#define MAKE_GLOBAL(x) __pgprot((x) & ~_PAGE_NOTGLOBAL)
-
-#define PAGE_KERNEL             MAKE_GLOBAL(__PAGE_KERNEL)
-#define PAGE_KERNEL_RO          MAKE_GLOBAL(__PAGE_KERNEL_RO)
-#define PAGE_KERNEL_NOCACHE     MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)
-
-#define _PAGE_TABLE             (_PAGE_PRESENT | xAMPRx_SS_16Kb)
-
-#ifndef __ASSEMBLY__
-
-/*
- * The FR451 can do execute protection by virtue of having separate TLB miss handlers for
- * instruction access and for data access. However, we don't have enough reserved bits to say
- * "execute only", so we don't bother. If you can read it, you can execute it and vice versa.
- */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY
-#define __P010  PAGE_COPY
-#define __P011  PAGE_COPY
-#define __P100  PAGE_READONLY
-#define __P101  PAGE_READONLY
-#define __P110  PAGE_COPY
-#define __P111  PAGE_COPY
-
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY
-#define __S010  PAGE_SHARED
-#define __S011  PAGE_SHARED
-#define __S100  PAGE_READONLY
-#define __S101  PAGE_READONLY
-#define __S110  PAGE_SHARED
-#define __S111  PAGE_SHARED
-
-/*
- * Define this to warn about kernel memory accesses that are
- * done without a 'access_ok(VERIFY_WRITE,..)'
- */
-#undef TEST_ACCESS_OK
-
-#define pte_present(x)  (pte_val(x) & _PAGE_PRESENT)
-#define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
-
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (pmd_val(x) & _PAGE_PRESENT)
-#define pmd_bad(x)      (pmd_val(x) & xAMPRx_SS)
-#define pmd_clear(xp)   do { __set_pmd(xp, 0); } while(0)
-
-#define pmd_page_vaddr(pmd) \
-        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
-
-#ifndef CONFIG_DISCONTIGMEM
-#define pmd_page(pmd)   (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
-#endif
-
-#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
-
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-static inline int pte_dirty(pte_t pte)          { return (pte).pte & _PAGE_DIRTY; }
-static inline int pte_young(pte_t pte)          { return (pte).pte & _PAGE_ACCESSED; }
-static inline int pte_write(pte_t pte)          { return !((pte).pte & _PAGE_WP); }
-static inline int pte_special(pte_t pte)        { return 0; }
-
-static inline pte_t pte_mkclean(pte_t pte)      { (pte).pte &= ~_PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { (pte).pte &= ~_PAGE_ACCESSED; return pte; }
-static inline pte_t pte_wrprotect(pte_t pte)    { (pte).pte |= _PAGE_WP; return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { (pte).pte |= _PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { (pte).pte |= _PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkwrite(pte_t pte)      { (pte).pte &= ~_PAGE_WP; return pte; }
-static inline pte_t pte_mkspecial(pte_t pte)    { return pte; }
-
-static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-{
-        int i = test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-        return i;
-}
-
-static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        unsigned long x = xchg(&ptep->pte, 0);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-        return __pte(x);
-}
-
-static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        set_bit(_PAGE_BIT_WP, ptep);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-}
-
-/*
- * Macro to mark a page protection value as "uncacheable"
- */
-#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NOCACHE))
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-#define mk_pte_huge(entry)      ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
-
-/* This takes a physical page address that is used by the remapping functions */
-#define mk_pte_phys(physpage, pgprot)   pfn_pte((physpage) >> PAGE_SHIFT, pgprot)
-
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte.pte &= _PAGE_CHG_MASK;
-        pte.pte |= pgprot_val(newprot);
-        return pte;
-}
-
-/* to find an entry in a page-table-directory. */
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-#define pgd_index_k(addr) pgd_index(addr)
-
-/* Find an entry in the bottom-level page table.. */
-#define __pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-
-/*
- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
- *
- * this macro returns the index of the entry in the pte page which would
- * control the given virtual address
- */
-#define pte_index(address) \
-                (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
-
-#if defined(CONFIG_HIGHPTE)
-#define pte_offset_map(dir, address) \
-        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
-#define pte_offset_map_nested(dir, address) \
-        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address))
-#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
-#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
-#else
-#define pte_offset_map(dir, address) \
-        ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
-#define pte_offset_map_nested(dir, address) pte_offset_map((dir), (address))
-#define pte_unmap(pte) do { } while (0)
-#define pte_unmap_nested(pte) do { } while (0)
-#endif
-
-/*
- * Handle swap and file entries
- * - the PTE is encoded in the following format:
- *      bit 0:          Must be 0 (!_PAGE_PRESENT)
- *      bit 1:          Type: 0 for swap, 1 for file (_PAGE_FILE)
- *      bits 2-7:       Swap type
- *      bits 8-31:      Swap offset
- *      bits 2-31:      File pgoff
- */
-#define __swp_type(x)                   (((x).val >> 2) & 0x1f)
-#define __swp_offset(x)                 ((x).val >> 8)
-#define __swp_entry(type, offset)       ((swp_entry_t) { ((type) << 2) | ((offset) << 8) })
-#define __pte_to_swp_entry(_pte)        ((swp_entry_t) { (_pte).pte })
-#define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
-
-static inline int pte_file(pte_t pte)
-{
-        return pte.pte & _PAGE_FILE;
-}
-
-#define PTE_FILE_MAX_BITS       29
-
-#define pte_to_pgoff(PTE)       ((PTE).pte >> 2)
-#define pgoff_to_pte(off)       __pte((off) << 2 | _PAGE_FILE)
-
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define PageSkip(page)          (0)
-#define kern_addr_valid(addr)   (1)
-
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
-                remap_pfn_range(vma, vaddr, pfn, size, prot)
-
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTE_SAME
-#include <asm-generic/pgtable.h>
-
-/*
- * preload information about a newly instantiated PTE into the SCR0/SCR1 PGE cache
- */
-static inline void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
-{
-        struct mm_struct *mm;
-        unsigned long ampr;
-
-        mm = current->mm;
-        if (mm) {
-                pgd_t *pge = pgd_offset(mm, address);
-                pud_t *pue = pud_offset(pge, address);
-                pmd_t *pme = pmd_offset(pue, address);
-
-                ampr = pme->ste[0] & 0xffffff00;
-                ampr |= xAMPRx_L | xAMPRx_SS_16Kb | xAMPRx_S | xAMPRx_C |
-                        xAMPRx_V;
-        } else {
-                address = ULONG_MAX;
-                ampr = 0;
-        }
-
-        asm volatile("movgs %0,scr0\n"
-                     "movgs %0,scr1\n"
-                     "movgs %1,dampr4\n"
-                     "movgs %1,dampr5\n"
-                     :
-                     : "r"(address), "r"(ampr)
-                     );
-}
-
-#ifdef CONFIG_PROC_FS
-extern char *proc_pid_status_frv_cxnr(struct mm_struct *mm, char *buffer);
-#endif
-
-extern void __init pgtable_cache_init(void);
-
-#endif /* !__ASSEMBLY__ */
-#endif /* !CONFIG_MMU */
-
-#ifndef __ASSEMBLY__
-extern void __init paging_init(void);
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-frv/poll.h b/include/asm-frv/poll.h
deleted file mode 100644
index 0d01479ccc56..000000000000
--- a/include/asm-frv/poll.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_POLL_H
-#define _ASM_POLL_H
-
-#define POLLWRNORM      POLLOUT
-#define POLLWRBAND      256
-
-#include <asm-generic/poll.h>
-
-#undef POLLREMOVE
-
-#endif
-
diff --git a/include/asm-frv/posix_types.h b/include/asm-frv/posix_types.h
deleted file mode 100644
index a9f1f5be0632..000000000000
--- a/include/asm-frv/posix_types.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _ASM_POSIX_TYPES_H
-#define _ASM_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned int    __kernel_size_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
-
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
-typedef unsigned short  __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-        int     val[2];
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__)
-
-#undef  __FD_SET
-#define __FD_SET(d, set)        ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-
-#undef  __FD_CLR
-#define __FD_CLR(d, set)        ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-
-#undef  __FD_ISSET
-#define __FD_ISSET(d, set)      (!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))
-
-#undef  __FD_ZERO
-#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
-
-#endif /* defined(__KERNEL__) */
-
-#endif
-
diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h
deleted file mode 100644
index 3744f2e47f48..000000000000
--- a/include/asm-frv/processor.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* processor.h: FRV processor definitions
- *
- * 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 _ASM_PROCESSOR_H
-#define _ASM_PROCESSOR_H
-
-#include <asm/mem-layout.h>
-
-#ifndef __ASSEMBLY__
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ __label__ _l; _l: &&_l;})
-
-#include <linux/compiler.h>
-#include <linux/linkage.h>
-#include <asm/sections.h>
-#include <asm/segment.h>
-#include <asm/fpu.h>
-#include <asm/registers.h>
-#include <asm/ptrace.h>
-#include <asm/current.h>
-#include <asm/cache.h>
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- */
-struct cpuinfo_frv {
-#ifdef CONFIG_MMU
-        unsigned long   *pgd_quick;
-        unsigned long   *pte_quick;
-        unsigned long   pgtable_cache_sz;
-#endif
-} __cacheline_aligned;
-
-extern struct cpuinfo_frv __nongprelbss boot_cpu_data;
-
-#define cpu_data                (&boot_cpu_data)
-#define current_cpu_data        boot_cpu_data
-
-/*
- * Bus types
- */
-#define EISA_bus 0
-#define MCA_bus 0
-
-struct thread_struct {
-        struct pt_regs          *frame;         /* [GR28] exception frame ptr for this thread */
-        struct task_struct      *curr;          /* [GR29] current pointer for this thread */
-        unsigned long           sp;             /* [GR1 ] kernel stack pointer */
-        unsigned long           fp;             /* [GR2 ] kernel frame pointer */
-        unsigned long           lr;             /* link register */
-        unsigned long           pc;             /* program counter */
-        unsigned long           gr[12];         /* [GR16-GR27] */
-        unsigned long           sched_lr;       /* LR from schedule() */
-
-        union {
-                struct pt_regs          *frame0;        /* top (user) stack frame */
-                struct user_context     *user;          /* userspace context */
-        };
-} __attribute__((aligned(8)));
-
-extern struct pt_regs *__kernel_frame0_ptr;
-extern struct task_struct *__kernel_current_task;
-
-#endif
-
-#ifndef __ASSEMBLY__
-#define INIT_THREAD_FRAME0 \
-        ((struct pt_regs *) \
-        (sizeof(init_stack) + (unsigned long) init_stack - sizeof(struct user_context)))
-
-#define INIT_THREAD {                           \
-        NULL,                                   \
-        (struct task_struct *) init_stack,      \
-        0, 0, 0, 0,                             \
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, \
-        0,                                      \
-        { INIT_THREAD_FRAME0 },                 \
-}
-
-/*
- * do necessary setup to start up a newly executed thread.
- * - need to discard the frame stacked by init() invoking the execve syscall
- */
-#define start_thread(_regs, _pc, _usp)                  \
-do {                                                    \
-        set_fs(USER_DS); /* reads from user space */    \
-        __frame = __kernel_frame0_ptr;                  \
-        __frame->pc     = (_pc);                        \
-        __frame->psr    &= ~PSR_S;                      \
-        __frame->sp     = (_usp);                       \
-} while(0)
-
-extern void prepare_to_copy(struct task_struct *tsk);
-
-/* Free all resources held by a thread. */
-static inline void release_thread(struct task_struct *dead_task)
-{
-}
-
-extern asmlinkage int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-extern asmlinkage void save_user_regs(struct user_context *target);
-extern asmlinkage void *restore_user_regs(const struct user_context *target, ...);
-
-#define copy_segments(tsk, mm)          do { } while (0)
-#define release_segments(mm)            do { } while (0)
-#define forget_segments()               do { } while (0)
-
-/*
- * Free current thread data structures etc..
- */
-static inline void exit_thread(void)
-{
-}
-
-/*
- * Return saved PC of a blocked thread.
- */
-extern unsigned long thread_saved_pc(struct task_struct *tsk);
-
-unsigned long get_wchan(struct task_struct *p);
-
-#define KSTK_EIP(tsk)   ((tsk)->thread.frame0->pc)
-#define KSTK_ESP(tsk)   ((tsk)->thread.frame0->sp)
-
-/* Allocation and freeing of basic task resources. */
-extern struct task_struct *alloc_task_struct(void);
-extern void free_task_struct(struct task_struct *p);
-
-#define cpu_relax()    barrier()
-
-/* data cache prefetch */
-#define ARCH_HAS_PREFETCH
-static inline void prefetch(const void *x)
-{
-        asm volatile("dcpl %0,gr0,#0" : : "r"(x));
-}
-
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_PROCESSOR_H */
diff --git a/include/asm-frv/ptrace.h b/include/asm-frv/ptrace.h
deleted file mode 100644
index cf6934012b64..000000000000
--- a/include/asm-frv/ptrace.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ptrace.h: ptrace() relevant definitions
- *
- * 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 _ASM_PTRACE_H
-#define _ASM_PTRACE_H
-
-#include <asm/registers.h>
-#ifdef __KERNEL__
-#include <asm/irq_regs.h>
-
-#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
-#endif
-
-
-#define PT_PSR          0
-#define PT_ISR          1
-#define PT_CCR          2
-#define PT_CCCR         3
-#define PT_LR           4
-#define PT_LCR          5
-#define PT_PC           6
-
-#define PT__STATUS      7       /* exception status */
-#define PT_SYSCALLNO    8       /* syscall number or -1 */
-#define PT_ORIG_GR8     9       /* saved GR8 for signal handling */
-#define PT_GNER0        10
-#define PT_GNER1        11
-#define PT_IACC0H       12
-#define PT_IACC0L       13
-
-#define PT_GR(j)        ( 14 + (j))     /* GRj for 0<=j<=63 */
-#define PT_FR(j)        ( 78 + (j))     /* FRj for 0<=j<=63 */
-#define PT_FNER(j)      (142 + (j))     /* FNERj for 0<=j<=1 */
-#define PT_MSR(j)       (144 + (j))     /* MSRj for 0<=j<=2 */
-#define PT_ACC(j)       (146 + (j))     /* ACCj for 0<=j<=7 */
-#define PT_ACCG(jklm)   (154 + (jklm))  /* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */
-#define PT_FSR(j)       (156 + (j))     /* FSRj for 0<=j<=0 */
-#define PT__GPEND       78
-#define PT__END         157
-
-#define PT_TBR          PT_GR(0)
-#define PT_SP           PT_GR(1)
-#define PT_FP           PT_GR(2)
-#define PT_PREV_FRAME   PT_GR(28)       /* previous exception frame pointer (old gr28 value) */
-#define PT_CURR_TASK    PT_GR(29)       /* current task */
-
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
-
-#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
-#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-/*
- * we dedicate GR28 to keeping a pointer to the current exception frame
- * - gr28 is destroyed on entry to the kernel from userspace
- */
-register struct pt_regs *__frame asm("gr28");
-
-#define user_mode(regs)                 (!((regs)->psr & PSR_S))
-#define instruction_pointer(regs)       ((regs)->pc)
-
-extern unsigned long user_stack(const struct pt_regs *);
-extern void show_regs(struct pt_regs *);
-#define profile_pc(regs) ((regs)->pc)
-#endif
-
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_PTRACE_H */
diff --git a/include/asm-frv/registers.h b/include/asm-frv/registers.h
deleted file mode 100644
index 9666119fcf6e..000000000000
--- a/include/asm-frv/registers.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* registers.h: register frame declarations
- *
- * 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.
- */
-
-/*
- * notes:
- *
- * (1) that the members of all these structures are carefully aligned to permit
- *     usage of STD/STDF instructions
- *
- * (2) if you change these structures, you must change the code in
- *     arch/frvnommu/kernel/{break.S,entry.S,switch_to.S,gdb-stub.c}
- *
- *
- * the kernel stack space block looks like this:
- *
- *      +0x2000 +----------------------
- *              | union {
- *              |       struct frv_frame0 {
- *              |               struct user_context {
- *              |                       struct user_int_regs
- *              |                       struct user_fpmedia_regs
- *              |               }
- *              |               struct frv_debug_regs
- *              |       }
- *              |       struct pt_regs [user exception]
- *              | }
- *              +---------------------- <-- __kernel_frame0_ptr (maybe GR28)
- *              |
- *              | kernel stack
- *              |
- *              |......................
- *              | struct pt_regs [kernel exception]
- *              |...................... <-- __kernel_frame0_ptr (maybe GR28)
- *              |
- *              | kernel stack
- *              |
- *              |...................... <-- stack pointer (GR1)
- *              |
- *              | unused stack space
- *              |
- *              +----------------------
- *              | struct thread_info
- *      +0x0000 +---------------------- <-- __current_thread_info (GR15);
- *
- * note that GR28 points to the current exception frame
- */
-
-#ifndef _ASM_REGISTERS_H
-#define _ASM_REGISTERS_H
-
-#ifndef __ASSEMBLY__
-#define __OFFSET(X,N)   ((X)+(N)*4)
-#define __OFFSETC(X,N)  xxxxxxxxxxxxxxxxxxxxxxxx
-#else
-#define __OFFSET(X,N)   ((X)+(N)*4)
-#define __OFFSETC(X,N)  ((X)+(N))
-#endif
-
-/*****************************************************************************/
-/*
- * Exception/Interrupt frame
- * - held on kernel stack
- * - 8-byte aligned on stack (old SP is saved in frame)
- * - GR0 is fixed 0, so we don't save it
- */
-#ifndef __ASSEMBLY__
-
-struct pt_regs {
-        unsigned long           psr;            /* Processor Status Register */
-        unsigned long           isr;            /* Integer Status Register */
-        unsigned long           ccr;            /* Condition Code Register */
-        unsigned long           cccr;           /* Condition Code for Conditional Insns Register */
-        unsigned long           lr;             /* Link Register */
-        unsigned long           lcr;            /* Loop Count Register */
-        unsigned long           pc;             /* Program Counter Register */
-        unsigned long           __status;       /* exception status */
-        unsigned long           syscallno;      /* syscall number or -1 */
-        unsigned long           orig_gr8;       /* original syscall arg #1 */
-        unsigned long           gner0;
-        unsigned long           gner1;
-        unsigned long long      iacc0;
-        unsigned long           tbr;            /* GR0 is fixed zero, so we use this for TBR */
-        unsigned long           sp;             /* GR1: USP/KSP */
-        unsigned long           fp;             /* GR2: FP */
-        unsigned long           gr3;
-        unsigned long           gr4;
-        unsigned long           gr5;
-        unsigned long           gr6;
-        unsigned long           gr7;            /* syscall number */
-        unsigned long           gr8;            /* 1st syscall param; syscall return */
-        unsigned long           gr9;            /* 2nd syscall param */
-        unsigned long           gr10;           /* 3rd syscall param */
-        unsigned long           gr11;           /* 4th syscall param */
-        unsigned long           gr12;           /* 5th syscall param */
-        unsigned long           gr13;           /* 6th syscall param */
-        unsigned long           gr14;
-        unsigned long           gr15;
-        unsigned long           gr16;           /* GP pointer */
-        unsigned long           gr17;           /* small data */
-        unsigned long           gr18;           /* PIC/PID */
-        unsigned long           gr19;
-        unsigned long           gr20;
-        unsigned long           gr21;
-        unsigned long           gr22;
-        unsigned long           gr23;
-        unsigned long           gr24;
-        unsigned long           gr25;
-        unsigned long           gr26;
-        unsigned long           gr27;
-        struct pt_regs          *next_frame;    /* GR28 - next exception frame */
-        unsigned long           gr29;           /* GR29 - OS reserved */
-        unsigned long           gr30;           /* GR30 - OS reserved */
-        unsigned long           gr31;           /* GR31 - OS reserved */
-} __attribute__((aligned(8)));
-
-#endif
-
-#define REG__STATUS_STEP        0x00000001      /* - reenable single stepping on return */
-#define REG__STATUS_STEPPED     0x00000002      /* - single step caused exception */
-#define REG__STATUS_BROKE       0x00000004      /* - BREAK insn caused exception */
-#define REG__STATUS_SYSC_ENTRY  0x40000000      /* - T on syscall entry (ptrace.c only) */
-#define REG__STATUS_SYSC_EXIT   0x80000000      /* - T on syscall exit (ptrace.c only) */
-
-#define REG_GR(R)       __OFFSET(REG_GR0, (R))
-
-#define REG_SP          REG_GR(1)
-#define REG_FP          REG_GR(2)
-#define REG_PREV_FRAME  REG_GR(28)      /* previous exception frame pointer (old gr28 value) */
-#define REG_CURR_TASK   REG_GR(29)      /* current task */
-
-/*****************************************************************************/
-/*
- * debugging registers
- */
-#ifndef __ASSEMBLY__
-
-struct frv_debug_regs
-{
-        unsigned long           dcr;
-        unsigned long           ibar[4] __attribute__((aligned(8)));
-        unsigned long           dbar[4] __attribute__((aligned(8)));
-        unsigned long           dbdr[4][4] __attribute__((aligned(8)));
-        unsigned long           dbmr[4][4] __attribute__((aligned(8)));
-} __attribute__((aligned(8)));
-
-#endif
-
-/*****************************************************************************/
-/*
- * userspace registers
- */
-#ifndef __ASSEMBLY__
-
-struct user_int_regs
-{
-        /* integer registers
-         * - up to gr[31] mirror pt_regs
-         * - total size must be multiple of 8 bytes
-         */
-        unsigned long           psr;            /* Processor Status Register */
-        unsigned long           isr;            /* Integer Status Register */
-        unsigned long           ccr;            /* Condition Code Register */
-        unsigned long           cccr;           /* Condition Code for Conditional Insns Register */
-        unsigned long           lr;             /* Link Register */
-        unsigned long           lcr;            /* Loop Count Register */
-        unsigned long           pc;             /* Program Counter Register */
-        unsigned long           __status;       /* exception status */
-        unsigned long           syscallno;      /* syscall number or -1 */
-        unsigned long           orig_gr8;       /* original syscall arg #1 */
-        unsigned long           gner[2];
-        unsigned long long      iacc[1];
-
-        union {
-                unsigned long   tbr;
-                unsigned long   gr[64];
-        };
-};
-
-struct user_fpmedia_regs
-{
-        /* FP/Media registers */
-        unsigned long   fr[64];
-        unsigned long   fner[2];
-        unsigned long   msr[2];
-        unsigned long   acc[8];
-        unsigned char   accg[8];
-        unsigned long   fsr[1];
-};
-
-struct user_context
-{
-        struct user_int_regs            i;
-        struct user_fpmedia_regs        f;
-
-        /* we provide a context extension so that we can save the regs for CPUs that
-         * implement many more of Fujitsu's lavish register spec
-         */
-        void *extension;
-} __attribute__((aligned(8)));
-
-struct frv_frame0 {
-        union {
-                struct pt_regs          regs;
-                struct user_context     uc;
-        };
-
-        struct frv_debug_regs           debug;
-
-} __attribute__((aligned(32)));
-
-#endif
-
-#define __INT_GR(R)             __OFFSET(__INT_GR0,             (R))
-
-#define __FPMEDIA_FR(R)         __OFFSET(__FPMEDIA_FR0,         (R))
-#define __FPMEDIA_FNER(R)       __OFFSET(__FPMEDIA_FNER0,       (R))
-#define __FPMEDIA_MSR(R)        __OFFSET(__FPMEDIA_MSR0,        (R))
-#define __FPMEDIA_ACC(R)        __OFFSET(__FPMEDIA_ACC0,        (R))
-#define __FPMEDIA_ACCG(R)       __OFFSETC(__FPMEDIA_ACCG0,      (R))
-#define __FPMEDIA_FSR(R)        __OFFSET(__FPMEDIA_FSR0,        (R))
-
-#define __THREAD_GR(R)          __OFFSET(__THREAD_GR16,         (R) - 16)
-
-#endif /* _ASM_REGISTERS_H */
diff --git a/include/asm-frv/resource.h b/include/asm-frv/resource.h
deleted file mode 100644
index 5fc60548fd02..000000000000
--- a/include/asm-frv/resource.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_RESOURCE_H
-#define _ASM_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _ASM_RESOURCE_H */
-
diff --git a/include/asm-frv/scatterlist.h b/include/asm-frv/scatterlist.h
deleted file mode 100644
index 4bca8a28546c..000000000000
--- a/include/asm-frv/scatterlist.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm/types.h>
-
-/*
- * Drivers must set either ->address or (preferred) page and ->offset
- * to indicate where data must be transferred to/from.
- *
- * Using page is recommended since it handles highmem data as well as
- * low mem. ->address is restricted to data which has a virtual mapping, and
- * it will go away in the future. Updating to page can be automated very
- * easily -- something like
- *
- * sg->address = some_ptr;
- *
- * can be rewritten as
- *
- * sg_set_buf(sg, some_ptr, length);
- *
- * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
- */
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;         /* for highmem, page offset */
-
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#define ISA_DMA_THRESHOLD (0xffffffffUL)
-
-#endif /* !_ASM_SCATTERLIST_H */
diff --git a/include/asm-frv/sections.h b/include/asm-frv/sections.h
deleted file mode 100644
index 17d0fb171bba..000000000000
--- a/include/asm-frv/sections.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* sections.h: linkage layout variables
- *
- * Copyright (C) 2004 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 _ASM_SECTIONS_H
-#define _ASM_SECTIONS_H
-
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-#include <asm-generic/sections.h>
-
-#ifdef __KERNEL__
-
-/*
- * we don't want to put variables in the GP-REL section if they're not used very much - that would
- * be waste since GP-REL addressing is limited to GP16+/-2048
- */
-#define __nongpreldata  __attribute__((section(".data")))
-#define __nongprelbss   __attribute__((section(".bss")))
-
-/*
- * linker symbols
- */
-extern const void __kernel_image_start, __kernel_image_end, __page_offset;
-
-extern unsigned long __nongprelbss memory_start;
-extern unsigned long __nongprelbss memory_end;
-extern unsigned long __nongprelbss rom_length;
-
-/* determine if we're running from ROM */
-static inline int is_in_rom(unsigned long addr)
-{
-        return 0; /* default case: not in ROM */
-}
-
-#endif
-#endif
-#endif /* _ASM_SECTIONS_H */
diff --git a/include/asm-frv/segment.h b/include/asm-frv/segment.h
deleted file mode 100644
index e3616a6f941d..000000000000
--- a/include/asm-frv/segment.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* segment.h: MMU segment settings
- *
- * 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 _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-
-#ifndef __ASSEMBLY__
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#define KERNEL_DS               MAKE_MM_SEG(0xdfffffffUL)
-
-#ifdef CONFIG_MMU
-#define USER_DS                 MAKE_MM_SEG(TASK_SIZE - 1)
-#else
-#define USER_DS                 KERNEL_DS
-#endif
-
-#define get_ds()                (KERNEL_DS)
-#define get_fs()                (__current_thread_info->addr_limit)
-#define segment_eq(a,b)         ((a).seg == (b).seg)
-#define __kernel_ds_p()         segment_eq(get_fs(), KERNEL_DS)
-#define get_addr_limit()        (get_fs().seg)
-
-#define set_fs(_x)                                      \
-do {                                                    \
-        __current_thread_info->addr_limit = (_x);       \
-} while(0)
-
-
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_SEGMENT_H */
diff --git a/include/asm-frv/sembuf.h b/include/asm-frv/sembuf.h
deleted file mode 100644
index 164b12786d6d..000000000000
--- a/include/asm-frv/sembuf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _ASM_SEMBUF_H
-#define _ASM_SEMBUF_H
-
-/*
- * The semid64_ds structure for FR-V architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm       sem_perm;       /* permissions .. see ipc.h */
-        __kernel_time_t         sem_otime;      /* last semop time */
-        unsigned long           __unused1;
-        __kernel_time_t         sem_ctime;      /* last change time */
-        unsigned long           __unused2;
-        unsigned long           sem_nsems;      /* no. of semaphores in array */
-        unsigned long           __unused3;
-        unsigned long           __unused4;
-};
-
-#endif /* _ASM_SEMBUF_H */
-
diff --git a/include/asm-frv/serial-regs.h b/include/asm-frv/serial-regs.h
deleted file mode 100644
index e1286bda00eb..000000000000
--- a/include/asm-frv/serial-regs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* serial-regs.h: serial port registers
- *
- * 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 _ASM_SERIAL_REGS_H
-#define _ASM_SERIAL_REGS_H
-
-#include <linux/serial_reg.h>
-#include <asm/irc-regs.h>
-
-#define SERIAL_ICLK     33333333        /* the target serial input clock */
-#define UART0_BASE      0xfeff9c00
-#define UART1_BASE      0xfeff9c40
-
-#define __get_UART0(R) ({ __reg(UART0_BASE + (R) * 8) >> 24; })
-#define __get_UART1(R) ({ __reg(UART1_BASE + (R) * 8) >> 24; })
-#define __set_UART0(R,V) do { __reg(UART0_BASE + (R) * 8) = (V) << 24; } while(0)
-#define __set_UART1(R,V) do { __reg(UART1_BASE + (R) * 8) = (V) << 24; } while(0)
-
-#define __get_UART0_LSR() ({ __get_UART0(UART_LSR); })
-#define __get_UART1_LSR() ({ __get_UART1(UART_LSR); })
-
-#define __set_UART0_IER(V) __set_UART0(UART_IER,(V))
-#define __set_UART1_IER(V) __set_UART1(UART_IER,(V))
-
-/* serial prescaler select register */
-#define __get_UCPSR()   ({ *(volatile unsigned long *)(0xfeff9c90); })
-#define __set_UCPSR(V)  do { *(volatile unsigned long *)(0xfeff9c90) = (V); } while(0)
-#define UCPSR_SELECT0   0x07000000
-#define UCPSR_SELECT1   0x38000000
-
-/* serial prescaler base value register */
-#define __get_UCPVR()   ({ *(volatile unsigned long *)(0xfeff9c98); mb(); })
-#define __set_UCPVR(V)  do { *(volatile unsigned long *)(0xfeff9c98) = (V) << 24; mb(); } while(0)
-
-
-#endif /* _ASM_SERIAL_REGS_H */
diff --git a/include/asm-frv/serial.h b/include/asm-frv/serial.h
deleted file mode 100644
index dbb825998689..000000000000
--- a/include/asm-frv/serial.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * serial.h
- *
- * Copyright (C) 2003 Develer S.r.l. (http://www.develer.com/)
- * Author: Bernardo Innocenti <bernie@codewiz.org>
- *
- * Based on linux/include/asm-i386/serial.h
- */
-#include <asm/serial-regs.h>
-
-/*
- * the base baud is derived from the clock speed and so is variable
- */
-#define BASE_BAUD 0
-
-#define STD_COM_FLAGS           ASYNC_BOOT_AUTOCONF
-
-#define SERIAL_PORT_DFNS
diff --git a/include/asm-frv/setup.h b/include/asm-frv/setup.h
deleted file mode 100644
index afd787ceede6..000000000000
--- a/include/asm-frv/setup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* setup.h: setup stuff
- *
- * Copyright (C) 2004 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 _ASM_SETUP_H
-#define _ASM_SETUP_H
-
-#define COMMAND_LINE_SIZE       512
-
-#ifdef __KERNEL__
-
-#include <linux/init.h>
-
-#ifndef __ASSEMBLY__
-
-#ifdef CONFIG_MMU
-extern unsigned long __initdata num_mappedpages;
-#endif
-
-#endif /* !__ASSEMBLY__ */
-
-#endif  /*  __KERNEL__  */
-
-#endif /* _ASM_SETUP_H */
diff --git a/include/asm-frv/shmbuf.h b/include/asm-frv/shmbuf.h
deleted file mode 100644
index 4c6e711a4779..000000000000
--- a/include/asm-frv/shmbuf.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _ASM_SHMBUF_H
-#define _ASM_SHMBUF_H
-
-/*
- * The shmid64_ds structure for FR-V architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASM_SHMBUF_H */
-
diff --git a/include/asm-frv/shmparam.h b/include/asm-frv/shmparam.h
deleted file mode 100644
index ab711009cfaa..000000000000
--- a/include/asm-frv/shmparam.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_SHMPARAM_H
-#define _ASM_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-
-#endif /* _ASM_SHMPARAM_H */
-
diff --git a/include/asm-frv/sigcontext.h b/include/asm-frv/sigcontext.h
deleted file mode 100644
index 3b263f3cc96f..000000000000
--- a/include/asm-frv/sigcontext.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* sigcontext.h: FRV signal context
- *
- * 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 _ASM_SIGCONTEXT_H
-#define _ASM_SIGCONTEXT_H
-
-#include <asm/registers.h>
-
-/*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.  Note: only add new entries
- * to the end of the structure.
- */
-struct sigcontext {
-        struct user_context     sc_context;
-        unsigned long           sc_oldmask;     /* old sigmask */
-} __attribute__((aligned(8)));
-
-#endif
diff --git a/include/asm-frv/siginfo.h b/include/asm-frv/siginfo.h
deleted file mode 100644
index d3fd1ca45653..000000000000
--- a/include/asm-frv/siginfo.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_SIGINFO_H
-#define _ASM_SIGINFO_H
-
-#include <linux/types.h>
-#include <asm-generic/siginfo.h>
-
-#define FPE_MDAOVF      (__SI_FAULT|9)  /* media overflow */
-#undef NSIGFPE
-#define NSIGFPE         9
-
-#endif
-
diff --git a/include/asm-frv/signal.h b/include/asm-frv/signal.h
deleted file mode 100644
index 2079197d483d..000000000000
--- a/include/asm-frv/signal.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef _ASM_SIGNAL_H
-#define _ASM_SIGNAL_H
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#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
-#define SIGRTMAX        (_NSIG-1)
-
-/*
- * 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 /* not supported yet */
-#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
-
-#define SA_RESTORER     0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#ifdef __KERNEL__
-
-#include <asm/sigcontext.h>
-#undef __HAVE_ARCH_SIG_BITOPS
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_SIGNAL_H */
diff --git a/include/asm-frv/smp.h b/include/asm-frv/smp.h
deleted file mode 100644
index 38349ec8b61b..000000000000
--- a/include/asm-frv/smp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_SMP_H
-#define __ASM_SMP_H
-
-
-#ifdef CONFIG_SMP
-#error SMP not supported
-#endif
-
-#endif
diff --git a/include/asm-frv/socket.h b/include/asm-frv/socket.h
deleted file mode 100644
index e51ca67b9356..000000000000
--- a/include/asm-frv/socket.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET      1
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_ACCEPTCONN           30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#define SO_MARK                 36
-
-#endif /* _ASM_SOCKET_H */
-
diff --git a/include/asm-frv/sockios.h b/include/asm-frv/sockios.h
deleted file mode 100644
index 5dbdd13e6de3..000000000000
--- a/include/asm-frv/sockios.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _ASM_SOCKIOS__
-#define _ASM_SOCKIOS__
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-
-#endif /* _ASM_SOCKIOS__ */
-
diff --git a/include/asm-frv/spinlock.h b/include/asm-frv/spinlock.h
deleted file mode 100644
index fe385f45d1fd..000000000000
--- a/include/asm-frv/spinlock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* spinlock.h: spinlocks for FR-V
- *
- * 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 _ASM_SPINLOCK_H
-#define _ASM_SPINLOCK_H
-
-#error no spinlocks for FR-V yet
-
-#endif /* _ASM_SPINLOCK_H */
diff --git a/include/asm-frv/spr-regs.h b/include/asm-frv/spr-regs.h
deleted file mode 100644
index 01e6af5e99b8..000000000000
--- a/include/asm-frv/spr-regs.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/* spr-regs.h: special-purpose registers on the FRV
- *
- * Copyright (C) 2003, 2004 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 _ASM_SPR_REGS_H
-#define _ASM_SPR_REGS_H
-
-/*
- * PSR - Processor Status Register
- */
-#define PSR_ET                  0x00000001      /* enable interrupts/exceptions flag */
-#define PSR_PS                  0x00000002      /* previous supervisor mode flag */
-#define PSR_S                   0x00000004      /* supervisor mode flag */
-#define PSR_PIL                 0x00000078      /* processor external interrupt level */
-#define PSR_PIL_0               0x00000000      /* - no interrupt in progress */
-#define PSR_PIL_13              0x00000068      /* - debugging only */
-#define PSR_PIL_14              0x00000070      /* - debugging in progress */
-#define PSR_PIL_15              0x00000078      /* - NMI in progress */
-#define PSR_EM                  0x00000080      /* enable media operation */
-#define PSR_EF                  0x00000100      /* enable FPU operation */
-#define PSR_BE                  0x00001000      /* endianness mode */
-#define PSR_BE_LE               0x00000000      /* - little endian mode */
-#define PSR_BE_BE               0x00001000      /* - big endian mode */
-#define PSR_CM                  0x00002000      /* conditional mode */
-#define PSR_NEM                 0x00004000      /* non-excepting mode */
-#define PSR_ICE                 0x00010000      /* in-circuit emulation mode */
-#define PSR_VERSION_SHIFT       24              /* CPU silicon ID */
-#define PSR_IMPLE_SHIFT         28              /* CPU core ID */
-
-#define PSR_VERSION(psr)        (((psr) >> PSR_VERSION_SHIFT) & 0xf)
-#define PSR_IMPLE(psr)          (((psr) >> PSR_IMPLE_SHIFT) & 0xf)
-
-#define PSR_IMPLE_FR401         0x2
-#define PSR_VERSION_FR401_MB93401       0x0
-#define PSR_VERSION_FR401_MB93401A      0x1
-#define PSR_VERSION_FR401_MB93403       0x2
-
-#define PSR_IMPLE_FR405         0x4
-#define PSR_VERSION_FR405_MB93405       0x0
-
-#define PSR_IMPLE_FR451         0x5
-#define PSR_VERSION_FR451_MB93451       0x0
-
-#define PSR_IMPLE_FR501         0x1
-#define PSR_VERSION_FR501_MB93501       0x1
-#define PSR_VERSION_FR501_MB93501A      0x2
-
-#define PSR_IMPLE_FR551         0x3
-#define PSR_VERSION_FR551_MB93555       0x1
-
-#define __get_PSR()     ({ unsigned long x; asm volatile("movsg psr,%0" : "=r"(x)); x; })
-#define __set_PSR(V)    do { asm volatile("movgs %0,psr" : : "r"(V)); } while(0)
-
-/*
- * TBR - Trap Base Register
- */
-#define TBR_TT                  0x00000ff0
-#define TBR_TT_INSTR_MMU_MISS   (0x01 << 4)
-#define TBR_TT_INSTR_ACC_ERROR  (0x02 << 4)
-#define TBR_TT_INSTR_ACC_EXCEP  (0x03 << 4)
-#define TBR_TT_PRIV_INSTR       (0x06 << 4)
-#define TBR_TT_ILLEGAL_INSTR    (0x07 << 4)
-#define TBR_TT_FP_EXCEPTION     (0x0d << 4)
-#define TBR_TT_MP_EXCEPTION     (0x0e << 4)
-#define TBR_TT_DATA_ACC_ERROR   (0x11 << 4)
-#define TBR_TT_DATA_MMU_MISS    (0x12 << 4)
-#define TBR_TT_DATA_ACC_EXCEP   (0x13 << 4)
-#define TBR_TT_DATA_STR_ERROR   (0x14 << 4)
-#define TBR_TT_DIVISION_EXCEP   (0x17 << 4)
-#define TBR_TT_COMMIT_EXCEP     (0x19 << 4)
-#define TBR_TT_INSTR_TLB_MISS   (0x1a << 4)
-#define TBR_TT_DATA_TLB_MISS    (0x1b << 4)
-#define TBR_TT_DATA_DAT_EXCEP   (0x1d << 4)
-#define TBR_TT_DECREMENT_TIMER  (0x1f << 4)
-#define TBR_TT_COMPOUND_EXCEP   (0x20 << 4)
-#define TBR_TT_INTERRUPT_1      (0x21 << 4)
-#define TBR_TT_INTERRUPT_2      (0x22 << 4)
-#define TBR_TT_INTERRUPT_3      (0x23 << 4)
-#define TBR_TT_INTERRUPT_4      (0x24 << 4)
-#define TBR_TT_INTERRUPT_5      (0x25 << 4)
-#define TBR_TT_INTERRUPT_6      (0x26 << 4)
-#define TBR_TT_INTERRUPT_7      (0x27 << 4)
-#define TBR_TT_INTERRUPT_8      (0x28 << 4)
-#define TBR_TT_INTERRUPT_9      (0x29 << 4)
-#define TBR_TT_INTERRUPT_10     (0x2a << 4)
-#define TBR_TT_INTERRUPT_11     (0x2b << 4)
-#define TBR_TT_INTERRUPT_12     (0x2c << 4)
-#define TBR_TT_INTERRUPT_13     (0x2d << 4)
-#define TBR_TT_INTERRUPT_14     (0x2e << 4)
-#define TBR_TT_INTERRUPT_15     (0x2f << 4)
-#define TBR_TT_TRAP0            (0x80 << 4)
-#define TBR_TT_TRAP1            (0x81 << 4)
-#define TBR_TT_TRAP2            (0x82 << 4)
-#define TBR_TT_TRAP3            (0x83 << 4)
-#define TBR_TT_TRAP120          (0xf8 << 4)
-#define TBR_TT_TRAP121          (0xf9 << 4)
-#define TBR_TT_TRAP122          (0xfa << 4)
-#define TBR_TT_TRAP123          (0xfb << 4)
-#define TBR_TT_TRAP124          (0xfc << 4)
-#define TBR_TT_TRAP125          (0xfd << 4)
-#define TBR_TT_TRAP126          (0xfe << 4)
-#define TBR_TT_BREAK            (0xff << 4)
-
-#define TBR_TT_ATOMIC_CMPXCHG32 TBR_TT_TRAP120
-#define TBR_TT_ATOMIC_XCHG32    TBR_TT_TRAP121
-#define TBR_TT_ATOMIC_XOR       TBR_TT_TRAP122
-#define TBR_TT_ATOMIC_OR        TBR_TT_TRAP123
-#define TBR_TT_ATOMIC_AND       TBR_TT_TRAP124
-#define TBR_TT_ATOMIC_SUB       TBR_TT_TRAP125
-#define TBR_TT_ATOMIC_ADD       TBR_TT_TRAP126
-
-#define __get_TBR()     ({ unsigned long x; asm volatile("movsg tbr,%0" : "=r"(x)); x; })
-
-/*
- * HSR0 - Hardware Status Register 0
- */
-#define HSR0_PDM                0x00000007      /* power down mode */
-#define HSR0_PDM_NORMAL         0x00000000      /* - normal mode */
-#define HSR0_PDM_CORE_SLEEP     0x00000001      /* - CPU core sleep mode */
-#define HSR0_PDM_BUS_SLEEP      0x00000003      /* - bus sleep mode */
-#define HSR0_PDM_PLL_RUN        0x00000005      /* - PLL run */
-#define HSR0_PDM_PLL_STOP       0x00000007      /* - PLL stop */
-#define HSR0_GRLE               0x00000040      /* GR lower register set enable */
-#define HSR0_GRHE               0x00000080      /* GR higher register set enable */
-#define HSR0_FRLE               0x00000100      /* FR lower register set enable */
-#define HSR0_FRHE               0x00000200      /* FR higher register set enable */
-#define HSR0_GRN                0x00000400      /* GR quantity */
-#define HSR0_GRN_64             0x00000000      /* - 64 GR registers */
-#define HSR0_GRN_32             0x00000400      /* - 32 GR registers */
-#define HSR0_FRN                0x00000800      /* FR quantity */
-#define HSR0_FRN_64             0x00000000      /* - 64 FR registers */
-#define HSR0_FRN_32             0x00000800      /* - 32 FR registers */
-#define HSR0_SA                 0x00001000      /* start address (RAMBOOT#) */
-#define HSR0_ETMI               0x00008000      /* enable TIMERI (64-bit up timer) */
-#define HSR0_ETMD               0x00004000      /* enable TIMERD (32-bit down timer) */
-#define HSR0_PEDAT              0x00010000      /* previous DAT mode */
-#define HSR0_XEDAT              0x00020000      /* exception DAT mode */
-#define HSR0_EDAT               0x00080000      /* enable DAT mode */
-#define HSR0_RME                0x00400000      /* enable RAM mode */
-#define HSR0_EMEM               0x00800000      /* enable MMU_Miss mask */
-#define HSR0_EXMMU              0x01000000      /* enable extended MMU mode */
-#define HSR0_EDMMU              0x02000000      /* enable data MMU */
-#define HSR0_EIMMU              0x04000000      /* enable instruction MMU */
-#define HSR0_CBM                0x08000000      /* copy back mode */
-#define HSR0_CBM_WRITE_THRU     0x00000000      /* - write through */
-#define HSR0_CBM_COPY_BACK      0x08000000      /* - copy back */
-#define HSR0_NWA                0x10000000      /* no write allocate */
-#define HSR0_DCE                0x40000000      /* data cache enable */
-#define HSR0_ICE                0x80000000      /* instruction cache enable */
-
-#define __get_HSR(R)    ({ unsigned long x; asm volatile("movsg hsr"#R",%0" : "=r"(x)); x; })
-#define __set_HSR(R,V)  do { asm volatile("movgs %0,hsr"#R : : "r"(V)); } while(0)
-
-/*
- * CCR - Condition Codes Register
- */
-#define CCR_FCC0                0x0000000f      /* FP/Media condition 0 (fcc0 reg) */
-#define CCR_FCC1                0x000000f0      /* FP/Media condition 1 (fcc1 reg) */
-#define CCR_FCC2                0x00000f00      /* FP/Media condition 2 (fcc2 reg) */
-#define CCR_FCC3                0x0000f000      /* FP/Media condition 3 (fcc3 reg) */
-#define CCR_ICC0                0x000f0000      /* Integer condition 0 (icc0 reg) */
-#define CCR_ICC0_C              0x00010000      /* - Carry flag */
-#define CCR_ICC0_V              0x00020000      /* - Overflow flag */
-#define CCR_ICC0_Z              0x00040000      /* - Zero flag */
-#define CCR_ICC0_N              0x00080000      /* - Negative flag */
-#define CCR_ICC1                0x00f00000      /* Integer condition 1 (icc1 reg) */
-#define CCR_ICC2                0x0f000000      /* Integer condition 2 (icc2 reg) */
-#define CCR_ICC3                0xf0000000      /* Integer condition 3 (icc3 reg) */
-
-/*
- * CCCR - Condition Codes for Conditional Instructions Register
- */
-#define CCCR_CC0                0x00000003      /* condition 0 (cc0 reg) */
-#define CCCR_CC0_FALSE          0x00000002      /* - condition is false */
-#define CCCR_CC0_TRUE           0x00000003      /* - condition is true */
-#define CCCR_CC1                0x0000000c      /* condition 1 (cc1 reg) */
-#define CCCR_CC2                0x00000030      /* condition 2 (cc2 reg) */
-#define CCCR_CC3                0x000000c0      /* condition 3 (cc3 reg) */
-#define CCCR_CC4                0x00000300      /* condition 4 (cc4 reg) */
-#define CCCR_CC5                0x00000c00      /* condition 5 (cc5 reg) */
-#define CCCR_CC6                0x00003000      /* condition 6 (cc6 reg) */
-#define CCCR_CC7                0x0000c000      /* condition 7 (cc7 reg) */
-
-/*
- * ISR - Integer Status Register
- */
-#define ISR_EMAM                0x00000001      /* memory misaligned access handling */
-#define ISR_EMAM_EXCEPTION      0x00000000      /* - generate exception */
-#define ISR_EMAM_FUDGE          0x00000001      /* - mask out invalid address bits */
-#define ISR_AEXC                0x00000004      /* accrued [overflow] exception */
-#define ISR_DTT                 0x00000018      /* division type trap */
-#define ISR_DTT_IGNORE          0x00000000      /* - ignore division error */
-#define ISR_DTT_DIVBYZERO       0x00000008      /* - generate exception */
-#define ISR_DTT_OVERFLOW        0x00000010      /* - record overflow */
-#define ISR_EDE                 0x00000020      /* enable division exception */
-#define ISR_PLI                 0x20000000      /* pre-load instruction information */
-#define ISR_QI                  0x80000000      /* quad data implementation information */
-
-/*
- * EPCR0 - Exception PC Register
- */
-#define EPCR0_V                 0x00000001      /* register content validity indicator */
-#define EPCR0_PC                0xfffffffc      /* faulting instruction address */
-
-/*
- * ESR0/14/15 - Exception Status Register
- */
-#define ESRx_VALID              0x00000001      /* register content validity indicator */
-#define ESRx_EC                 0x0000003e      /* exception type */
-#define ESRx_EC_DATA_STORE      0x00000000      /* - data_store_error */
-#define ESRx_EC_INSN_ACCESS     0x00000006      /* - instruction_access_error */
-#define ESRx_EC_PRIV_INSN       0x00000008      /* - privileged_instruction */
-#define ESRx_EC_ILL_INSN        0x0000000a      /* - illegal_instruction */
-#define ESRx_EC_MP_EXCEP        0x0000001c      /* - mp_exception */
-#define ESRx_EC_DATA_ACCESS     0x00000020      /* - data_access_error */
-#define ESRx_EC_DIVISION        0x00000026      /* - division_exception */
-#define ESRx_EC_ITLB_MISS       0x00000034      /* - instruction_access_TLB_miss */
-#define ESRx_EC_DTLB_MISS       0x00000036      /* - data_access_TLB_miss */
-#define ESRx_EC_DATA_ACCESS_DAT 0x0000003a      /* - data_access_DAT_exception */
-
-#define ESR0_IAEC               0x00000100      /* info for instruction-access-exception */
-#define ESR0_IAEC_RESV          0x00000000      /* - reserved */
-#define ESR0_IAEC_PROT_VIOL     0x00000100      /* - protection violation */
-
-#define ESR0_ATXC               0x00f00000      /* address translation exception code */
-#define ESR0_ATXC_MMU_MISS      0x00000000      /* - MMU miss exception and more (?) */
-#define ESR0_ATXC_MULTI_DAT     0x00800000      /* - multiple DAT entry hit */
-#define ESR0_ATXC_MULTI_SAT     0x00900000      /* - multiple SAT entry hit */
-#define ESR0_ATXC_AMRTLB_MISS   0x00a00000      /* - MMU/TLB miss exception */
-#define ESR0_ATXC_PRIV_EXCEP    0x00c00000      /* - privilege protection fault */
-#define ESR0_ATXC_WP_EXCEP      0x00d00000      /* - write protection fault */
-
-#define ESR0_EAV                0x00000800      /* true if EAR0 register valid */
-#define ESR15_EAV               0x00000800      /* true if EAR15 register valid */
-
-/*
- * ESFR1 - Exception Status Valid Flag Register
- */
-#define ESFR1_ESR0              0x00000001      /* true if ESR0 is valid */
-#define ESFR1_ESR14             0x00004000      /* true if ESR14 is valid */
-#define ESFR1_ESR15             0x00008000      /* true if ESR15 is valid */
-
-/*
- * MSR - Media Status Register
- */
-#define MSR0_AOVF               0x00000001      /* overflow exception accrued */
-#define MSRx_OVF                0x00000002      /* overflow exception detected */
-#define MSRx_SIE                0x0000003c      /* last SIMD instruction exception detected */
-#define MSRx_SIE_NONE           0x00000000      /* - none detected */
-#define MSRx_SIE_FRkHI_ACCk     0x00000020      /* - exception at FRkHI or ACCk */
-#define MSRx_SIE_FRkLO_ACCk1    0x00000010      /* - exception at FRkLO or ACCk+1 */
-#define MSRx_SIE_FRk1HI_ACCk2   0x00000008      /* - exception at FRk+1HI or ACCk+2 */
-#define MSRx_SIE_FRk1LO_ACCk3   0x00000004      /* - exception at FRk+1LO or ACCk+3 */
-#define MSR0_MTT                0x00007000      /* type of last media trap detected */
-#define MSR0_MTT_NONE           0x00000000      /* - none detected */
-#define MSR0_MTT_OVERFLOW       0x00001000      /* - overflow detected */
-#define MSR0_HI                 0x00c00000      /* hardware implementation */
-#define MSR0_HI_ROUNDING        0x00000000      /* - rounding mode */
-#define MSR0_HI_NONROUNDING     0x00c00000      /* - non-rounding mode */
-#define MSR0_EMCI               0x01000000      /* enable media custom instructions */
-#define MSR0_SRDAV              0x10000000      /* select rounding mode of MAVEH */
-#define MSR0_SRDAV_RDAV         0x00000000      /* - controlled by MSR.RDAV */
-#define MSR0_SRDAV_RD           0x10000000      /* - controlled by MSR.RD */
-#define MSR0_RDAV               0x20000000      /* rounding mode of MAVEH */
-#define MSR0_RDAV_NEAREST_MI    0x00000000      /* - round to nearest minus */
-#define MSR0_RDAV_NEAREST_PL    0x20000000      /* - round to nearest plus */
-#define MSR0_RD                 0xc0000000      /* rounding mode */
-#define MSR0_RD_NEAREST         0x00000000      /* - nearest */
-#define MSR0_RD_ZERO            0x40000000      /* - zero */
-#define MSR0_RD_POS_INF         0x80000000      /* - postive infinity */
-#define MSR0_RD_NEG_INF         0xc0000000      /* - negative infinity */
-
-/*
- * IAMPR0-7 - Instruction Address Mapping Register
- * DAMPR0-7 - Data Address Mapping Register
- */
-#define xAMPRx_V                0x00000001      /* register content validity indicator */
-#define DAMPRx_WP               0x00000002      /* write protect */
-#define DAMPRx_WP_RW            0x00000000      /* - read/write */
-#define DAMPRx_WP_RO            0x00000002      /* - read-only */
-#define xAMPRx_C                0x00000004      /* cached/uncached */
-#define xAMPRx_C_CACHED         0x00000000      /* - cached */
-#define xAMPRx_C_UNCACHED       0x00000004      /* - uncached */
-#define xAMPRx_S                0x00000008      /* supervisor only */
-#define xAMPRx_S_USER           0x00000000      /* - userspace can access */
-#define xAMPRx_S_KERNEL         0x00000008      /* - kernel only */
-#define xAMPRx_SS               0x000000f0      /* segment size */
-#define xAMPRx_SS_16Kb          0x00000000      /* - 16 kilobytes */
-#define xAMPRx_SS_64Kb          0x00000010      /* - 64 kilobytes */
-#define xAMPRx_SS_256Kb         0x00000020      /* - 256 kilobytes */
-#define xAMPRx_SS_1Mb           0x00000030      /* - 1 megabyte */
-#define xAMPRx_SS_2Mb           0x00000040      /* - 2 megabytes */
-#define xAMPRx_SS_4Mb           0x00000050      /* - 4 megabytes */
-#define xAMPRx_SS_8Mb           0x00000060      /* - 8 megabytes */
-#define xAMPRx_SS_16Mb          0x00000070      /* - 16 megabytes */
-#define xAMPRx_SS_32Mb          0x00000080      /* - 32 megabytes */
-#define xAMPRx_SS_64Mb          0x00000090      /* - 64 megabytes */
-#define xAMPRx_SS_128Mb         0x000000a0      /* - 128 megabytes */
-#define xAMPRx_SS_256Mb         0x000000b0      /* - 256 megabytes */
-#define xAMPRx_SS_512Mb         0x000000c0      /* - 512 megabytes */
-#define xAMPRx_RESERVED8        0x00000100      /* reserved bit */
-#define xAMPRx_NG               0x00000200      /* non-global */
-#define xAMPRx_L                0x00000400      /* locked */
-#define xAMPRx_M                0x00000800      /* modified */
-#define xAMPRx_D                0x00001000      /* DAT entry */
-#define xAMPRx_RESERVED13       0x00002000      /* reserved bit */
-#define xAMPRx_PPFN             0xfff00000      /* physical page frame number */
-
-#define xAMPRx_V_BIT            0
-#define DAMPRx_WP_BIT           1
-#define xAMPRx_C_BIT            2
-#define xAMPRx_S_BIT            3
-#define xAMPRx_RESERVED8_BIT    8
-#define xAMPRx_NG_BIT           9
-#define xAMPRx_L_BIT            10
-#define xAMPRx_M_BIT            11
-#define xAMPRx_D_BIT            12
-#define xAMPRx_RESERVED13_BIT   13
-
-#define __get_IAMPR(R) ({ unsigned long x; asm volatile("movsg iampr"#R",%0" : "=r"(x)); x; })
-#define __get_DAMPR(R) ({ unsigned long x; asm volatile("movsg dampr"#R",%0" : "=r"(x)); x; })
-
-#define __get_IAMLR(R) ({ unsigned long x; asm volatile("movsg iamlr"#R",%0" : "=r"(x)); x; })
-#define __get_DAMLR(R) ({ unsigned long x; asm volatile("movsg damlr"#R",%0" : "=r"(x)); x; })
-
-#define __set_IAMPR(R,V)        do { asm volatile("movgs %0,iampr"#R : : "r"(V)); } while(0)
-#define __set_DAMPR(R,V)        do { asm volatile("movgs %0,dampr"#R : : "r"(V)); } while(0)
-
-#define __set_IAMLR(R,V)        do { asm volatile("movgs %0,iamlr"#R : : "r"(V)); } while(0)
-#define __set_DAMLR(R,V)        do { asm volatile("movgs %0,damlr"#R : : "r"(V)); } while(0)
-
-#define save_dampr(R, _dampr)                                   \
-do {                                                            \
-        asm volatile("movsg dampr"R",%0" : "=r"(_dampr));       \
-} while(0)
-
-#define restore_dampr(R, _dampr)                        \
-do {                                                    \
-        asm volatile("movgs %0,dampr"R :: "r"(_dampr)); \
-} while(0)
-
-/*
- * AMCR - Address Mapping Control Register
- */
-#define AMCR_IAMRN              0x000000ff      /* quantity of IAMPR registers */
-#define AMCR_DAMRN              0x0000ff00      /* quantity of DAMPR registers */
-
-/*
- * TTBR - Address Translation Table Base Register
- */
-#define __get_TTBR()            ({ unsigned long x; asm volatile("movsg ttbr,%0" : "=r"(x)); x; })
-
-/*
- * TPXR - TLB Probe Extend Register
- */
-#define TPXR_E                  0x00000001
-#define TPXR_LMAX_SHIFT         20
-#define TPXR_LMAX_SMASK         0xf
-#define TPXR_WMAX_SHIFT         24
-#define TPXR_WMAX_SMASK         0xf
-#define TPXR_WAY_SHIFT          28
-#define TPXR_WAY_SMASK          0xf
-
-/*
- * DCR - Debug Control Register
- */
-#define DCR_IBCE3               0x00000001      /* break on conditional insn pointed to by IBAR3 */
-#define DCR_IBE3                0x00000002      /* break on insn pointed to by IBAR3 */
-#define DCR_IBCE1               0x00000004      /* break on conditional insn pointed to by IBAR2 */
-#define DCR_IBE1                0x00000008      /* break on insn pointed to by IBAR2 */
-#define DCR_IBCE2               0x00000010      /* break on conditional insn pointed to by IBAR1 */
-#define DCR_IBE2                0x00000020      /* break on insn pointed to by IBAR1 */
-#define DCR_IBCE0               0x00000040      /* break on conditional insn pointed to by IBAR0 */
-#define DCR_IBE0                0x00000080      /* break on insn pointed to by IBAR0 */
-
-#define DCR_DDBE1               0x00004000      /* use DBDR1x when checking DBAR1 */
-#define DCR_DWBE1               0x00008000      /* break on store to address in DBAR1/DBMR1x */
-#define DCR_DRBE1               0x00010000      /* break on load from address in DBAR1/DBMR1x */
-#define DCR_DDBE0               0x00020000      /* use DBDR0x when checking DBAR0 */
-#define DCR_DWBE0               0x00040000      /* break on store to address in DBAR0/DBMR0x */
-#define DCR_DRBE0               0x00080000      /* break on load from address in DBAR0/DBMR0x */
-
-#define DCR_EIM                 0x0c000000      /* external interrupt disable */
-#define DCR_IBM                 0x10000000      /* instruction break disable */
-#define DCR_SE                  0x20000000      /* single step enable */
-#define DCR_EBE                 0x40000000      /* exception break enable */
-
-/*
- * BRR - Break Interrupt Request Register
- */
-#define BRR_ST                  0x00000001      /* single-step detected */
-#define BRR_SB                  0x00000002      /* break instruction detected */
-#define BRR_BB                  0x00000004      /* branch with hint detected */
-#define BRR_CBB                 0x00000008      /* branch to LR detected */
-#define BRR_IBx                 0x000000f0      /* hardware breakpoint detected */
-#define BRR_DBx                 0x00000f00      /* hardware watchpoint detected */
-#define BRR_DBNEx               0x0000f000      /* ? */
-#define BRR_EBTT                0x00ff0000      /* trap type of exception break */
-#define BRR_TB                  0x10000000      /* external break request detected */
-#define BRR_CB                  0x20000000      /* ICE break command detected */
-#define BRR_EB                  0x40000000      /* exception break detected */
-
-/*
- * BPSR - Break PSR Save Register
- */
-#define BPSR_BET                0x00000001      /* former PSR.ET */
-#define BPSR_BS                 0x00001000      /* former PSR.S */
-
-#endif /* _ASM_SPR_REGS_H */
diff --git a/include/asm-frv/stat.h b/include/asm-frv/stat.h
deleted file mode 100644
index ce56de9b37ba..000000000000
--- a/include/asm-frv/stat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _ASM_STAT_H
-#define _ASM_STAT_H
-
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-/* This matches struct stat in uClibc/glibc.  */
-struct stat {
-        unsigned char __pad1[6];
-        unsigned short st_dev;
-
-        unsigned long __pad2;
-        unsigned long st_ino;
-
-        unsigned short __pad3;
-        unsigned short st_mode;
-        unsigned short __pad4;
-        unsigned short st_nlink;
-
-        unsigned short __pad5;
-        unsigned short st_uid;
-        unsigned short __pad6;
-        unsigned short st_gid;
-
-        unsigned char __pad7[6];
-        unsigned short st_rdev;
-
-        unsigned long __pad8;
-        unsigned long st_size;
-
-        unsigned long __pad9;           /* align 64-bit st_blocks to 2-word */
-        unsigned long st_blksize;
-
-        unsigned long __pad10;  /* future possible st_blocks high bits */
-        unsigned long st_blocks;        /* Number 512-byte blocks allocated. */
-
-        unsigned long __unused1;
-        unsigned long st_atime;
-
-        unsigned long __unused2;
-        unsigned long st_mtime;
-
-        unsigned long __unused3;
-        unsigned long st_ctime;
-
-        unsigned long long __unused4;
-};
-
-/* This matches struct stat64 in uClibc/glibc.  The layout is exactly
-   the same as that of struct stat above, with 64-bit types taking up
-   space that was formerly used by padding.  stat syscalls are still
-   different from stat64, though, in that the former tests for
-   overflow.  */
-struct stat64 {
-        unsigned char __pad1[6];
-        unsigned short st_dev;
-
-        unsigned long long st_ino;
-
-        unsigned int st_mode;
-        unsigned int st_nlink;
-
-        unsigned long st_uid;
-        unsigned long st_gid;
-
-        unsigned char __pad2[6];
-        unsigned short st_rdev;
-
-        long long st_size;
-
-        unsigned long __pad3;           /* align 64-bit st_blocks to 2-word */
-        unsigned long st_blksize;
-
-        unsigned long __pad4;           /* future possible st_blocks high bits */
-        unsigned long st_blocks;        /* Number 512-byte blocks allocated. */
-
-        unsigned long st_atime_nsec;
-        unsigned long st_atime;
-
-        unsigned int st_mtime_nsec;
-        unsigned long st_mtime;
-
-        unsigned long st_ctime_nsec;
-        unsigned long st_ctime;
-
-        unsigned long long __unused4;
-};
-
-#endif /* _ASM_STAT_H */
diff --git a/include/asm-frv/statfs.h b/include/asm-frv/statfs.h
deleted file mode 100644
index 741f586045ba..000000000000
--- a/include/asm-frv/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_STATFS_H
-#define _ASM_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _ASM_STATFS_H */
-
diff --git a/include/asm-frv/string.h b/include/asm-frv/string.h
deleted file mode 100644
index 5ed310f64b7e..000000000000
--- a/include/asm-frv/string.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* string.h: FRV string handling
- *
- * Copyright (C) 2004 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 _ASM_STRING_H_
-#define _ASM_STRING_H_
-
-#ifdef __KERNEL__ /* only set these up for kernel code */
-
-#define __HAVE_ARCH_MEMSET 1
-#define __HAVE_ARCH_MEMCPY 1
-
-extern void *memset(void *, int, __kernel_size_t);
-extern void *memcpy(void *, const void *, __kernel_size_t);
-
-#else /* KERNEL */
-
-/*
- *      let user libraries deal with these,
- *      IMHO the kernel has no place defining these functions for user apps
- */
-
-#define __HAVE_ARCH_STRCPY 1
-#define __HAVE_ARCH_STRNCPY 1
-#define __HAVE_ARCH_STRCAT 1
-#define __HAVE_ARCH_STRNCAT 1
-#define __HAVE_ARCH_STRCMP 1
-#define __HAVE_ARCH_STRNCMP 1
-#define __HAVE_ARCH_STRNICMP 1
-#define __HAVE_ARCH_STRCHR 1
-#define __HAVE_ARCH_STRRCHR 1
-#define __HAVE_ARCH_STRSTR 1
-#define __HAVE_ARCH_STRLEN 1
-#define __HAVE_ARCH_STRNLEN 1
-#define __HAVE_ARCH_MEMSET 1
-#define __HAVE_ARCH_MEMCPY 1
-#define __HAVE_ARCH_MEMMOVE 1
-#define __HAVE_ARCH_MEMSCAN 1
-#define __HAVE_ARCH_MEMCMP 1
-#define __HAVE_ARCH_MEMCHR 1
-#define __HAVE_ARCH_STRTOK 1
-
-#endif /* KERNEL */
-#endif /* _ASM_STRING_H_ */
diff --git a/include/asm-frv/suspend.h b/include/asm-frv/suspend.h
deleted file mode 100644
index 5fa7b5a6ee40..000000000000
--- a/include/asm-frv/suspend.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* suspend.h: suspension stuff
- *
- * Copyright (C) 2004 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 _ASM_SUSPEND_H
-#define _ASM_SUSPEND_H
-
-static inline int arch_prepare_suspend(void)
-{
-        return 0;
-}
-
-#endif /* _ASM_SUSPEND_H */
diff --git a/include/asm-frv/swab.h b/include/asm-frv/swab.h
deleted file mode 100644
index afb3396ba5ed..000000000000
--- a/include/asm-frv/swab.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_SWAB_H
-#define _ASM_SWAB_H
-
-#include <asm/types.h>
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* _ASM_SWAB_H */
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
deleted file mode 100644
index 7742ec000cc4..000000000000
--- a/include/asm-frv/system.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* system.h: FR-V CPU control definitions
- *
- * 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 _ASM_SYSTEM_H
-#define _ASM_SYSTEM_H
-
-#include <linux/types.h>
-#include <linux/linkage.h>
-#include <linux/kernel.h>
-
-struct thread_struct;
-
-/*
- * switch_to(prev, next) should switch from task `prev' to `next'
- * `prev' will never be the same as `next'.
- * The `mb' is to tell GCC not to cache `current' across this call.
- */
-extern asmlinkage
-struct task_struct *__switch_to(struct thread_struct *prev_thread,
-                                struct thread_struct *next_thread,
-                                struct task_struct *prev);
-
-#define switch_to(prev, next, last)                                     \
-do {                                                                    \
-        (prev)->thread.sched_lr =                                       \
-                (unsigned long) __builtin_return_address(0);            \
-        (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
-        mb();                                                           \
-} while(0)
-
-/*
- * interrupt flag manipulation
- * - use virtual interrupt management since touching the PSR is slow
- *   - ICC2.Z: T if interrupts virtually disabled
- *   - ICC2.C: F if interrupts really disabled
- * - if Z==1 upon interrupt:
- *   - C is set to 0
- *   - interrupts are really disabled
- *   - entry.S returns immediately
- * - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
- *   - if taken, the trap:
- *     - sets ICC2.C
- *     - enables interrupts
- */
-#define local_irq_disable()                                     \
-do {                                                            \
-        /* set Z flag, but don't change the C flag */           \
-        asm volatile("  andcc   gr0,gr0,gr0,icc2        \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-
-#define local_irq_enable()                                      \
-do {                                                            \
-        /* clear Z flag and then test the C flag */             \
-        asm volatile("  oricc   gr0,#1,gr0,icc2         \n"     \
-                     "  tihi    icc2,gr0,#2             \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-
-#define local_save_flags(flags)                                 \
-do {                                                            \
-        typecheck(unsigned long, flags);                        \
-        asm volatile("movsg ccr,%0"                             \
-                     : "=r"(flags)                              \
-                     :                                          \
-                     : "memory");                               \
-                                                                \
-        /* shift ICC2.Z to bit 0 */                             \
-        flags >>= 26;                                           \
-                                                                \
-        /* make flags 1 if interrupts disabled, 0 otherwise */  \
-        flags &= 1UL;                                           \
-} while(0)
-
-#define irqs_disabled() \
-        ({unsigned long flags; local_save_flags(flags); !!flags; })
-
-#define local_irq_save(flags)                   \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        local_save_flags(flags);                \
-        local_irq_disable();                    \
-} while(0)
-
-#define local_irq_restore(flags)                                        \
-do {                                                                    \
-        typecheck(unsigned long, flags);                                \
-                                                                        \
-        /* load the Z flag by turning 1 if disabled into 0 if disabled  \
-         * and thus setting the Z flag but not the C flag */            \
-        asm volatile("  xoricc  %0,#1,gr0,icc2          \n"             \
-                     /* then test Z=0 and C=0 */                        \
-                     "  tihi    icc2,gr0,#2             \n"             \
-                     :                                                  \
-                     : "r"(flags)                                       \
-                     : "memory", "icc2"                                 \
-                     );                                                 \
-                                                                        \
-} while(0)
-
-/*
- * real interrupt flag manipulation
- */
-#define __local_irq_disable()                           \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%2,%0        \n"     \
-                     "  ori     %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-
-#define __local_irq_enable()                            \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (~PSR_PIL)                   \
-                     : "memory");                       \
-} while(0)
-
-#define __local_save_flags(flags)               \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        asm("movsg psr,%0"                      \
-            : "=r"(flags)                       \
-            :                                   \
-            : "memory");                        \
-} while(0)
-
-#define __local_irq_save(flags)                         \
-do {                                                    \
-        unsigned long npsr;                             \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%3,%1        \n"     \
-                     "  ori     %1,%2,%1        \n"     \
-                     "  movgs   %1,psr          \n"     \
-                     : "=r"(flags), "=r"(npsr)          \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-
-#define __local_irq_restore(flags)                      \
-do {                                                    \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movgs   %0,psr          \n"     \
-                     :                                  \
-                     : "r" (flags)                      \
-                     : "memory");                       \
-} while(0)
-
-#define __irqs_disabled() \
-        ((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
-
-/*
- * Force strict CPU ordering.
- */
-#define nop()                   asm volatile ("nop"::)
-#define mb()                    asm volatile ("membar" : : :"memory")
-#define rmb()                   asm volatile ("membar" : : :"memory")
-#define wmb()                   asm volatile ("membar" : : :"memory")
-#define read_barrier_depends()  do { } while (0)
-
-#ifdef CONFIG_SMP
-#define smp_mb()                        mb()
-#define smp_rmb()                       rmb()
-#define smp_wmb()                       wmb()
-#define smp_read_barrier_depends()      read_barrier_depends()
-#define set_mb(var, value) \
-        do { xchg(&var, (value)); } while (0)
-#else
-#define smp_mb()                        barrier()
-#define smp_rmb()                       barrier()
-#define smp_wmb()                       barrier()
-#define smp_read_barrier_depends()      do {} while(0)
-#define set_mb(var, value) \
-        do { var = (value); barrier(); } while (0)
-#endif
-
-extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));
-extern void free_initmem(void);
-
-#define arch_align_stack(x) (x)
-
-/*****************************************************************************/
-/*
- * compare and conditionally exchange value with memory
- * - if (*ptr == test) then orig = *ptr; *ptr = test;
- * - if (*ptr != test) then orig = *ptr;
- */
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-
-#define cmpxchg(ptr, test, new)                                                 \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig, __xg_tmp;                                 \
-        __typeof__(*(ptr)) __xg_test = (test);                                  \
-        __typeof__(*(ptr)) __xg_new = (new);                                    \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4:                                                                 \
-                asm volatile(                                                   \
-                        "0:                                             \n"     \
-                        "       orcc            gr0,gr0,gr0,icc3        \n"     \
-                        "       ckeq            icc3,cc7                \n"     \
-                        "       ld.p            %M0,%1                  \n"     \
-                        "       orcr            cc7,cc7,cc3             \n"     \
-                        "       sub%I4cc        %1,%4,%2,icc0           \n"     \
-                        "       bne             icc0,#0,1f              \n"     \
-                        "       cst.p           %3,%M0          ,cc3,#1 \n"     \
-                        "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     \
-                        "       beq             icc3,#0,0b              \n"     \
-                        "1:                                             \n"     \
-                        : "+U"(*__xg_ptr), "=&r"(__xg_orig), "=&r"(__xg_tmp)    \
-                        : "r"(__xg_new), "NPr"(__xg_test)                       \
-                        : "memory", "cc7", "cc3", "icc3", "icc0"                \
-                        );                                                      \
-                break;                                                          \
-                                                                                \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-
-#else
-
-extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
-
-#define cmpxchg(ptr, test, new)                                                 \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig;                                           \
-        __typeof__(*(ptr)) __xg_test = (test);                                  \
-        __typeof__(*(ptr)) __xg_new = (new);                                    \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4: __xg_orig = (__force __typeof__(*ptr))                          \
-                        __cmpxchg_32((__force uint32_t *)__xg_ptr,              \
-                                         (__force uint32_t)__xg_test,           \
-                                         (__force uint32_t)__xg_new); break;    \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-
-#endif
-
-#include <asm-generic/cmpxchg-local.h>
-
-static inline unsigned long __cmpxchg_local(volatile void *ptr,
-                                      unsigned long old,
-                                      unsigned long new, int size)
-{
-        switch (size) {
-        case 4:
-                return cmpxchg((unsigned long *)ptr, old, new);
-        default:
-                return __cmpxchg_local_generic(ptr, old, new, size);
-        }
-
-        return old;
-}
-
-/*
- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
- * them available.
- */
-#define cmpxchg_local(ptr, o, n)                                        \
-        ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \
-                        (unsigned long)(n), sizeof(*(ptr))))
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-
-#endif /* _ASM_SYSTEM_H */
diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h
deleted file mode 100644
index 5568492b5086..000000000000
--- a/include/asm-frv/termbits.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef _ASM_TERMBITS_H__
-#define _ASM_TERMBITS_H__
-
-#include <linux/posix_types.h>
-
-typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
-
-#define NCCS 19
-struct termios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-};
-
-struct termios2 {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-struct ktermios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-
-/* c_iflag bits */
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-/* c_oflag bits */
-#define OPOST   0000001
-#define OLCUC   0000002
-#define ONLCR   0000004
-#define OCRNL   0000010
-#define ONOCR   0000020
-#define ONLRET  0000040
-#define OFILL   0000100
-#define OFDEL   0000200
-#define NLDLY   0000400
-#define   NL0   0000000
-#define   NL1   0000400
-#define CRDLY   0003000
-#define   CR0   0000000
-#define   CR1   0001000
-#define   CR2   0002000
-#define   CR3   0003000
-#define TABDLY  0014000
-#define   TAB0  0000000
-#define   TAB1  0004000
-#define   TAB2  0010000
-#define   TAB3  0014000
-#define   XTABS 0014000
-#define BSDLY   0020000
-#define   BS0   0000000
-#define   BS1   0020000
-#define VTDLY   0040000
-#define   VT0   0000000
-#define   VT1   0040000
-#define FFDLY   0100000
-#define   FF0   0000000
-#define   FF1   0100000
-
-/* c_cflag bit meaning */
-#define CBAUD   0010017
-#define  B0     0000000         /* hang up */
-#define  B50    0000001
-#define  B75    0000002
-#define  B110   0000003
-#define  B134   0000004
-#define  B150   0000005
-#define  B200   0000006
-#define  B300   0000007
-#define  B600   0000010
-#define  B1200  0000011
-#define  B1800  0000012
-#define  B2400  0000013
-#define  B4800  0000014
-#define  B9600  0000015
-#define  B19200 0000016
-#define  B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE   0000060
-#define   CS5   0000000
-#define   CS6   0000020
-#define   CS7   0000040
-#define   CS8   0000060
-#define CSTOPB  0000100
-#define CREAD   0000200
-#define PARENB  0000400
-#define PARODD  0001000
-#define HUPCL   0002000
-#define CLOCAL  0004000
-#define CBAUDEX 0010000
-#define    BOTHER 0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD    002003600000          /* Input baud rate */
-#define CTVB      004000000000          /* VisioBraille Terminal flow control */
-#define CMSPAR    010000000000          /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
-
-#define IBSHIFT 16                      /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG    0000001
-#define ICANON  0000002
-#define XCASE   0000004
-#define ECHO    0000010
-#define ECHOE   0000020
-#define ECHOK   0000040
-#define ECHONL  0000100
-#define NOFLSH  0000200
-#define TOSTOP  0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE  0004000
-#define FLUSHO  0010000
-#define PENDIN  0040000
-#define IEXTEN  0100000
-
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF          0
-#define TCOON           1
-#define TCIOFF          2
-#define TCION           3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH        0
-#define TCOFLUSH        1
-#define TCIOFLUSH       2
-
-/* tcsetattr uses these */
-#define TCSANOW         0
-#define TCSADRAIN       1
-#define TCSAFLUSH       2
-
-#endif /* _ASM_TERMBITS_H__ */
-
diff --git a/include/asm-frv/termios.h b/include/asm-frv/termios.h
deleted file mode 100644
index a62fb5872375..000000000000
--- a/include/asm-frv/termios.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _ASM_TERMIOS_H
-#define _ASM_TERMIOS_H
-
-#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 */
-};
-
-#ifdef __KERNEL__
-/*      intr=^C         quit=^|         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-
-/* 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
-
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
-#include <asm-generic/termios.h>
-#endif
-
-#endif /* _ASM_TERMIOS_H */
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h
deleted file mode 100644
index b7ac6bf2844c..000000000000
--- a/include/asm-frv/thread_info.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* thread_info.h: description
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * Derived from include/asm-i386/thread_info.h
- *
- * 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 _ASM_THREAD_INFO_H
-#define _ASM_THREAD_INFO_H
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#endif
-
-#define THREAD_SIZE             8192
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants must also be changed
- */
-#ifndef __ASSEMBLY__
-
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        unsigned long           status;         /* thread-synchronous flags */
-        __u32                   cpu;            /* current CPU */
-        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-
-        mm_segment_t            addr_limit;     /* thread address space:
-                                                   0-0xBFFFFFFF for user-thead
-                                                   0-0xFFFFFFFF for kernel-thread
-                                                */
-        struct restart_block    restart_block;
-
-        __u8                    supervisor_stack[0];
-};
-
-#else /* !__ASSEMBLY__ */
-
-#include <asm/asm-offsets.h>
-
-#endif
-
-#define PREEMPT_ACTIVE          0x10000000
-
-/*
- * macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
- */
-#ifndef __ASSEMBLY__
-
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-
-/* how to get the thread information struct from C */
-register struct thread_info *__current_thread_info asm("gr15");
-
-#define current_thread_info() ({ __current_thread_info; })
-
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk)                                  \
-        ({                                                      \
-                struct thread_info *ret;                        \
-                                                                \
-                ret = kzalloc(THREAD_SIZE, GFP_KERNEL);         \
-                                                                \
-                ret;                                            \
-        })
-#else
-#define alloc_thread_info(tsk)  kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-
-#define free_thread_info(info)  kfree(info)
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * thread information flags
- * - these are process state flags that various assembly files may need to access
- * - pending work-to-be-done flags are in LSW
- * - other flags in MSW
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_SIGPENDING          1       /* signal pending */
-#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
-#define TIF_IRET                4       /* return with iret */
-#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_MEMDIE              17      /* OOM killer killed process */
-#define TIF_FREEZE              18      /* freezing for suspend */
-
-#define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
-#define _TIF_IRET               (1 << TIF_IRET)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
-#define _TIF_FREEZE             (1 << TIF_FREEZE)
-
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
-
-/*
- * Thread-synchronous status.
- *
- * This is different from the flags in that nobody else
- * ever touches our thread-synchronous status, so we don't
- * have to worry about atomic accesses.
- */
-#define TS_USEDFPM              0x0001  /* FPU/Media was used by this task this quantum (SMP) */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-frv/timer-regs.h b/include/asm-frv/timer-regs.h
deleted file mode 100644
index 6c5a871ce5e9..000000000000
--- a/include/asm-frv/timer-regs.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* timer-regs.h: hardware timer register definitions
- *
- * 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 _ASM_TIMER_REGS_H
-#define _ASM_TIMER_REGS_H
-
-#include <asm/sections.h>
-
-extern unsigned long __nongprelbss __clkin_clock_speed_HZ;
-extern unsigned long __nongprelbss __ext_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __res_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __sdram_clock_speed_HZ;
-extern unsigned long __nongprelbss __core_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __core_clock_speed_HZ;
-extern unsigned long __nongprelbss __dsu_clock_speed_HZ;
-extern unsigned long __nongprelbss __serial_clock_speed_HZ;
-
-#define __get_CLKC()    ({ *(volatile unsigned long *)(0xfeff9a00); })
-
-static inline void __set_CLKC(unsigned long v)
-{
-        int tmp;
-
-        asm volatile("  st%I0.p %2,%M0          \n"
-                     "  setlos  %3,%1           \n"
-                     "  membar                  \n"
-                     "0:                        \n"
-                     "  subicc  %1,#1,%1,icc0   \n"
-                     "  bnc     icc0,#1,0b      \n"
-                     : "=m"(*(volatile unsigned long *) 0xfeff9a00), "=r"(tmp)
-                     : "r"(v), "i"(256)
-                     : "icc0");
-}
-
-#define __get_TCTR()    ({ *(volatile unsigned long *)(0xfeff9418); })
-#define __get_TPRV()    ({ *(volatile unsigned long *)(0xfeff9420); })
-#define __get_TPRCKSL() ({ *(volatile unsigned long *)(0xfeff9428); })
-#define __get_TCSR(T)   ({ *(volatile unsigned long *)(0xfeff9400 + 8 * (T)); })
-#define __get_TxCKSL(T) ({ *(volatile unsigned long *)(0xfeff9430 + 8 * (T)); })
-
-#define __get_TCSR_DATA(T) ({ __get_TCSR(T) >> 24; })
-
-#define __set_TCTR(V)   do { *(volatile unsigned long *)(0xfeff9418) = (V); mb(); } while(0)
-#define __set_TPRV(V)   do { *(volatile unsigned long *)(0xfeff9420) = (V) << 24; mb(); } while(0)
-#define __set_TPRCKSL(V) do { *(volatile unsigned long *)(0xfeff9428) = (V); mb(); } while(0)
-#define __set_TCSR(T,V) \
-do { *(volatile unsigned long *)(0xfeff9400 + 8 * (T)) = (V); mb(); } while(0)
-
-#define __set_TxCKSL(T,V) \
-do { *(volatile unsigned long *)(0xfeff9430 + 8 * (T)) = (V); mb(); } while(0)
-
-#define __set_TCSR_DATA(T,V) __set_TCSR(T, (V) << 24)
-#define __set_TxCKSL_DATA(T,V) __set_TxCKSL(T, TxCKSL_EIGHT | __TxCKSL_SELECT((V)))
-
-/* clock control register */
-#define CLKC_CMODE              0x0f000000
-#define CLKC_SLPL               0x000f0000
-#define CLKC_P0                 0x00000100
-#define CLKC_CM                 0x00000003
-
-#define CLKC_CMODE_s            24
-
-/* timer control register - non-readback mode */
-#define TCTR_MODE_0             0x00000000
-#define TCTR_MODE_2             0x04000000
-#define TCTR_MODE_4             0x08000000
-#define TCTR_MODE_5             0x0a000000
-#define TCTR_RL_LATCH           0x00000000
-#define TCTR_RL_RW_LOW8         0x10000000
-#define TCTR_RL_RW_HIGH8        0x20000000
-#define TCTR_RL_RW_LH8          0x30000000
-#define TCTR_SC_CTR0            0x00000000
-#define TCTR_SC_CTR1            0x40000000
-#define TCTR_SC_CTR2            0x80000000
-
-/* timer control register - readback mode */
-#define TCTR_CNT0               0x02000000
-#define TCTR_CNT1               0x04000000
-#define TCTR_CNT2               0x08000000
-#define TCTR_NSTATUS            0x10000000
-#define TCTR_NCOUNT             0x20000000
-#define TCTR_SC_READBACK        0xc0000000
-
-/* timer control status registers - non-readback mode */
-#define TCSRx_DATA              0xff000000
-
-/* timer control status registers - readback mode */
-#define TCSRx_OUTPUT            0x80000000
-#define TCSRx_NULLCOUNT         0x40000000
-#define TCSRx_RL                0x30000000
-#define TCSRx_MODE              0x07000000
-
-/* timer clock select registers */
-#define TxCKSL_SELECT           0x0f000000
-#define __TxCKSL_SELECT(X)      ((X) << 24)
-#define TxCKSL_EIGHT            0xf0000000
-
-#endif /* _ASM_TIMER_REGS_H */
diff --git a/include/asm-frv/timex.h b/include/asm-frv/timex.h
deleted file mode 100644
index a89bddefdacf..000000000000
--- a/include/asm-frv/timex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* timex.h: FR-V architecture timex specifications
- */
-#ifndef _ASM_TIMEX_H
-#define _ASM_TIMEX_H
-
-#define CLOCK_TICK_RATE         1193180 /* Underlying HZ */
-#define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-        return 0;
-}
-
-#define vxtime_lock()           do {} while (0)
-#define vxtime_unlock()         do {} while (0)
-
-#endif
-
diff --git a/include/asm-frv/tlb.h b/include/asm-frv/tlb.h
deleted file mode 100644
index cd458eb6d75e..000000000000
--- a/include/asm-frv/tlb.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ASM_TLB_H
-#define _ASM_TLB_H
-
-#include <asm/tlbflush.h>
-
-#ifdef CONFIG_MMU
-extern void check_pgt_cache(void);
-#else
-#define check_pgt_cache() do {} while(0)
-#endif
-
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#define tlb_start_vma(tlb, vma)                         do { } while (0)
-#define tlb_end_vma(tlb, vma)                           do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)      do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)          flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_TLB_H */
-
diff --git a/include/asm-frv/tlbflush.h b/include/asm-frv/tlbflush.h
deleted file mode 100644
index 7ac5eafc5d98..000000000000
--- a/include/asm-frv/tlbflush.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tlbflush.h: TLB flushing functions
- *
- * Copyright (C) 2004 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 _ASM_TLBFLUSH_H
-#define _ASM_TLBFLUSH_H
-
-#include <linux/mm.h>
-#include <asm/processor.h>
-
-#ifdef CONFIG_MMU
-
-#ifndef __ASSEMBLY__
-extern void asmlinkage __flush_tlb_all(void);
-extern void asmlinkage __flush_tlb_mm(unsigned long contextid);
-extern void asmlinkage __flush_tlb_page(unsigned long contextid, unsigned long start);
-extern void asmlinkage __flush_tlb_range(unsigned long contextid,
-                                         unsigned long start, unsigned long end);
-#endif /* !__ASSEMBLY__ */
-
-#define flush_tlb_all()                         \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while(0)
-
-#define flush_tlb_mm(mm)                        \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_mm((mm)->context.id);       \
-        preempt_enable();                       \
-} while(0)
-
-#define flush_tlb_range(vma,start,end)                                  \
-do {                                                                    \
-        preempt_disable();                                              \
-        __flush_tlb_range((vma)->vm_mm->context.id, start, end);        \
-        preempt_enable();                                               \
-} while(0)
-
-#define flush_tlb_page(vma,addr)                                \
-do {                                                            \
-        preempt_disable();                                      \
-        __flush_tlb_page((vma)->vm_mm->context.id, addr);       \
-        preempt_enable();                                       \
-} while(0)
-
-
-#define __flush_tlb_global()                    flush_tlb_all()
-#define flush_tlb()                             flush_tlb_all()
-#define flush_tlb_kernel_range(start, end)      flush_tlb_all()
-
-#else
-
-#define flush_tlb()                             BUG()
-#define flush_tlb_all()                         BUG()
-#define flush_tlb_mm(mm)                        BUG()
-#define flush_tlb_page(vma,addr)                BUG()
-#define flush_tlb_range(mm,start,end)           BUG()
-#define flush_tlb_kernel_range(start, end)      BUG()
-
-#endif
-
-
-#endif /* _ASM_TLBFLUSH_H */
diff --git a/include/asm-frv/topology.h b/include/asm-frv/topology.h
deleted file mode 100644
index 942724352705..000000000000
--- a/include/asm-frv/topology.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_TOPOLOGY_H
-#define _ASM_TOPOLOGY_H
-
-#ifdef CONFIG_NUMA
-
-#error NUMA not supported yet
-
-#endif /* CONFIG_NUMA */
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_TOPOLOGY_H */
diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h
deleted file mode 100644
index 613bf1e962f0..000000000000
--- a/include/asm-frv/types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* types.h: FRV types
- *
- * Copyright (C) 2004 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 _ASM_TYPES_H
-#define _ASM_TYPES_H
-
-#include <asm-generic/int-ll64.h>
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#define BITS_PER_LONG 32
-
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_TYPES_H */
diff --git a/include/asm-frv/uaccess.h b/include/asm-frv/uaccess.h
deleted file mode 100644
index 53650c958f41..000000000000
--- a/include/asm-frv/uaccess.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/* uaccess.h: userspace accessor functions
- *
- * Copyright (C) 2004 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 _ASM_UACCESS_H
-#define _ASM_UACCESS_H
-
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/segment.h>
-#include <asm/sections.h>
-
-#define HAVE_ARCH_UNMAPPED_AREA /* we decide where to put mmaps */
-
-#define __ptr(x) ((unsigned long __force *)(x))
-
-#define VERIFY_READ     0
-#define VERIFY_WRITE    1
-
-#define __addr_ok(addr) ((unsigned long)(addr) < get_addr_limit())
-
-/*
- * check that a range of addresses falls within the current address limit
- */
-static inline int ___range_ok(unsigned long addr, unsigned long size)
-{
-#ifdef CONFIG_MMU
-        int flag = -EFAULT, tmp;
-
-        asm volatile (
-                "       addcc   %3,%2,%1,icc0   \n"     /* set C-flag if addr+size>4GB */
-                "       subcc.p %1,%4,gr0,icc1  \n"     /* jump if addr+size>limit */
-                "       bc      icc0,#0,0f      \n"
-                "       bhi     icc1,#0,0f      \n"
-                "       setlos  #0,%0           \n"     /* mark okay */
-                "0:                             \n"
-                : "=r"(flag), "=&r"(tmp)
-                : "r"(addr), "r"(size), "r"(get_addr_limit()), "0"(flag)
-                );
-
-        return flag;
-
-#else
-
-        if (addr < memory_start ||
-            addr > memory_end ||
-            size > memory_end - memory_start ||
-            addr + size > memory_end)
-                return -EFAULT;
-
-        return 0;
-#endif
-}
-
-#define __range_ok(addr,size) ___range_ok((unsigned long) (addr), (unsigned long) (size))
-
-#define access_ok(type,addr,size) (__range_ok((void __user *)(addr), (size)) == 0)
-#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern unsigned long search_exception_table(unsigned long);
-
-
-/*
- * These are the main single-value transfer routines.  They automatically
- * use the right size if we just have the right pointer type.
- */
-#define __put_user(x, ptr)                                              \
-({                                                                      \
-        int __pu_err = 0;                                               \
-                                                                        \
-        typeof(*(ptr)) __pu_val = (x);                                  \
-        __chk_user_ptr(ptr);                                            \
-                                                                        \
-        switch (sizeof (*(ptr))) {                                      \
-        case 1:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "b", "r");      \
-                break;                                                  \
-        case 2:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "h", "r");      \
-                break;                                                  \
-        case 4:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "",  "r");      \
-                break;                                                  \
-        case 8:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "d", "e");      \
-                break;                                                  \
-        default:                                                        \
-                __pu_err = __put_user_bad();                            \
-                break;                                                  \
-        }                                                               \
-        __pu_err;                                                       \
-})
-
-#define put_user(x, ptr)                        \
-({                                              \
-        typeof(*(ptr)) __user *_p = (ptr);      \
-        int _e;                                 \
-                                                \
-        _e = __range_ok(_p, sizeof(*_p));       \
-        if (_e == 0)                            \
-                _e = __put_user((x), _p);       \
-        _e;                                     \
-})
-
-extern int __put_user_bad(void);
-
-/*
- * Tell gcc we read from memory instead of writing: this is because
- * we do not write to any memory gcc knows about, so there are no
- * aliasing issues.
- */
-
-#ifdef CONFIG_MMU
-
-#define __put_user_asm(err,x,ptr,dsize,constraint)                                      \
-do {                                                                                    \
-        asm volatile("1:        st"dsize"%I1    %2,%M1  \n"                             \
-                     "2:                                \n"                             \
-                     ".subsection 2                     \n"                             \
-                     "3:        setlos          %3,%0   \n"                             \
-                     "          bra             2b      \n"                             \
-                     ".previous                         \n"                             \
-                     ".section __ex_table,\"a\"         \n"                             \
-                     "          .balign         8       \n"                             \
-                     "          .long           1b,3b   \n"                             \
-                     ".previous"                                                        \
-                     : "=r" (err)                                                       \
-                     : "m" (*__ptr(ptr)), constraint (x), "i"(-EFAULT), "0"(err)        \
-                     : "memory");                                                       \
-} while (0)
-
-#else
-
-#define __put_user_asm(err,x,ptr,bwl,con)       \
-do {                                            \
-        asm("   st"bwl"%I0      %1,%M0  \n"     \
-            "   membar                  \n"     \
-            :                                   \
-            : "m" (*__ptr(ptr)), con (x)        \
-            : "memory");                        \
-} while (0)
-
-#endif
-
-/*****************************************************************************/
-/*
- *
- */
-#define __get_user(x, ptr)                                              \
-({                                                                      \
-        int __gu_err = 0;                                               \
-        __chk_user_ptr(ptr);                                            \
-                                                                        \
-        switch (sizeof(*(ptr))) {                                       \
-        case 1: {                                                       \
-                unsigned char __gu_val;                                 \
-                __get_user_asm(__gu_err, __gu_val, ptr, "ub", "=r");    \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 2: {                                                       \
-                unsigned short __gu_val;                                \
-                __get_user_asm(__gu_err, __gu_val, ptr, "uh", "=r");    \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 4: {                                                       \
-                unsigned int __gu_val;                                  \
-                __get_user_asm(__gu_err, __gu_val, ptr, "", "=r");      \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 8: {                                                       \
-                unsigned long long __gu_val;                            \
-                __get_user_asm(__gu_err, __gu_val, ptr, "d", "=e");     \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        default:                                                        \
-                __gu_err = __get_user_bad();                            \
-                break;                                                  \
-        }                                                               \
-        __gu_err;                                                       \
-})
-
-#define get_user(x, ptr)                        \
-({                                              \
-        const typeof(*(ptr)) __user *_p = (ptr);\
-        int _e;                                 \
-                                                \
-        _e = __range_ok(_p, sizeof(*_p));       \
-        if (likely(_e == 0))                    \
-                _e = __get_user((x), _p);       \
-        else                                    \
-                (x) = (typeof(x)) 0;            \
-        _e;                                     \
-})
-
-extern int __get_user_bad(void);
-
-#ifdef CONFIG_MMU
-
-#define __get_user_asm(err,x,ptr,dtype,constraint)      \
-do {                                                    \
-        asm("1:         ld"dtype"%I2    %M2,%1  \n"     \
-            "2:                                 \n"     \
-            ".subsection 2                      \n"     \
-            "3:         setlos          %3,%0   \n"     \
-            "           setlos          #0,%1   \n"     \
-            "           bra             2b      \n"     \
-            ".previous                          \n"     \
-            ".section __ex_table,\"a\"          \n"     \
-            "           .balign         8       \n"     \
-            "           .long           1b,3b   \n"     \
-            ".previous"                                 \
-            : "=r" (err), constraint (x)                \
-            : "m" (*__ptr(ptr)), "i"(-EFAULT), "0"(err) \
-            );                                          \
-} while(0)
-
-#else
-
-#define __get_user_asm(err,x,ptr,bwl,con)       \
-        asm("   ld"bwl"%I1      %M1,%0  \n"     \
-            "   membar                  \n"     \
-            : con(x)                            \
-            : "m" (*__ptr(ptr)))
-
-#endif
-
-/*****************************************************************************/
-/*
- *
- */
-#define ____force(x) (__force void *)(void __user *)(x)
-#ifdef CONFIG_MMU
-extern long __memset_user(void *dst, unsigned long count);
-extern long __memcpy_user(void *dst, const void *src, unsigned long count);
-
-#define clear_user(dst,count)                   __memset_user(____force(dst), (count))
-#define __copy_from_user_inatomic(to, from, n)  __memcpy_user((to), ____force(from), (n))
-#define __copy_to_user_inatomic(to, from, n)    __memcpy_user(____force(to), (from), (n))
-
-#else
-
-#define clear_user(dst,count)                   (memset(____force(dst), 0, (count)), 0)
-#define __copy_from_user_inatomic(to, from, n)  (memcpy((to), ____force(from), (n)), 0)
-#define __copy_to_user_inatomic(to, from, n)    (memcpy(____force(to), (from), (n)), 0)
-
-#endif
-
-#define __clear_user clear_user
-
-static inline unsigned long __must_check
-__copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-       might_sleep();
-       return __copy_to_user_inatomic(to, from, n);
-}
-
-static inline unsigned long
-__copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-       might_sleep();
-       return __copy_from_user_inatomic(to, from, n);
-}
-
-static inline long copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        unsigned long ret = n;
-
-        if (likely(__access_ok(from, n)))
-                ret = __copy_from_user(to, from, n);
-
-        if (unlikely(ret != 0))
-                memset(to + (n - ret), 0, ret);
-
-        return ret;
-}
-
-static inline long copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        return likely(__access_ok(to, n)) ? __copy_to_user(to, from, n) : n;
-}
-
-extern long strncpy_from_user(char *dst, const char __user *src, long count);
-extern long strnlen_user(const char __user *src, long count);
-
-#define strlen_user(str) strnlen_user(str, 32767)
-
-extern unsigned long search_exception_table(unsigned long addr);
-
-#endif /* _ASM_UACCESS_H */
diff --git a/include/asm-frv/ucontext.h b/include/asm-frv/ucontext.h
deleted file mode 100644
index 8d8c0c948007..000000000000
--- a/include/asm-frv/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_UCONTEXT_H
-#define _ASM_UCONTEXT_H
-
-struct ucontext {
-        unsigned long           uc_flags;
-        struct ucontext         *uc_link;
-        stack_t                 uc_stack;
-        struct sigcontext       uc_mcontext;
-        sigset_t                uc_sigmask;     /* mask last for extensibility */
-};
-
-#endif
diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h
deleted file mode 100644
index 6c61c05b2e0c..000000000000
--- a/include/asm-frv/unaligned.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* unaligned.h: unaligned access handler
- *
- * Copyright (C) 2004 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 _ASM_UNALIGNED_H
-#define _ASM_UNALIGNED_H
-
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-
-#endif /* _ASM_UNALIGNED_H */
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
deleted file mode 100644
index edcfaf5f0414..000000000000
--- a/include/asm-frv/unistd.h
+++ /dev/null
@@ -1,382 +0,0 @@
-#ifndef _ASM_UNISTD_H_
-#define _ASM_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-// #define __NR_oldolduname      /* 59 */ obsolete
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-// #define __NR_mmap             90     /* obsolete - not implemented */
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-// #define __NR_profil           /* 98 */ obsolete
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-// #define __NR_ioperm          /* 101 */ not supported
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-// #define __NR_olduname                /* 109 */ obsolete
-// #define __NR_iopl            /* 110 */ not supported
-#define __NR_vhangup            111
-// #define __NR_idle            /* 112 */ Obsolete
-// #define __NR_vm86old         /* 113 */ not supported
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-// #define __NR_modify_ldt      /* 123 */ not supported
-#define __NR_cacheflush         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-// #define __NR_vm86            /* 166 */ not supported
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-#define __NR_security           223     /* syscall for security modules */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-/* #define __NR_sys_setaltroot  285 */
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_ioprio_set         289
-#define __NR_ioprio_get         290
-#define __NR_inotify_init       291
-#define __NR_inotify_add_watch  292
-#define __NR_inotify_rm_watch   293
-#define __NR_migrate_pages      294
-#define __NR_openat             295
-#define __NR_mkdirat            296
-#define __NR_mknodat            297
-#define __NR_fchownat           298
-#define __NR_futimesat          299
-#define __NR_fstatat64          300
-#define __NR_unlinkat           301
-#define __NR_renameat           302
-#define __NR_linkat             303
-#define __NR_symlinkat          304
-#define __NR_readlinkat         305
-#define __NR_fchmodat           306
-#define __NR_faccessat          307
-#define __NR_pselect6           308
-#define __NR_ppoll              309
-#define __NR_unshare            310
-#define __NR_set_robust_list    311
-#define __NR_get_robust_list    312
-#define __NR_splice             313
-#define __NR_sync_file_range    314
-#define __NR_tee                315
-#define __NR_vmsplice           316
-#define __NR_move_pages         317
-#define __NR_getcpu             318
-#define __NR_epoll_pwait        319
-#define __NR_utimensat          320
-#define __NR_signalfd           321
-#define __NR_timerfd_create     322
-#define __NR_eventfd            323
-#define __NR_fallocate          324
-#define __NR_timerfd_settime    325
-#define __NR_timerfd_gettime    326
-#define __NR_signalfd4          327
-#define __NR_eventfd2           328
-#define __NR_epoll_create1      329
-#define __NR_dup3               330
-#define __NR_pipe2              331
-#define __NR_inotify_init1      332
-
-#ifdef __KERNEL__
-
-#define NR_syscalls 333
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-/* #define __ARCH_WANT_OLD_READDIR */
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-/* #define __ARCH_WANT_SYS_GETHOSTNAME */
-#define __ARCH_WANT_SYS_PAUSE
-/* #define __ARCH_WANT_SYS_SGETMASK */
-/* #define __ARCH_WANT_SYS_SIGNAL */
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-/* #define __ARCH_WANT_SYS_OLD_GETRLIMIT */
-#define __ARCH_WANT_SYS_OLDUMOUNT
-/* #define __ARCH_WANT_SYS_SIGPENDING */
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-#define __ARCH_WANT_SYS_RT_SIGSUSPEND
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_UNISTD_H_ */
diff --git a/include/asm-frv/user.h b/include/asm-frv/user.h
deleted file mode 100644
index 82fa8fab64ae..000000000000
--- a/include/asm-frv/user.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* user.h: FR-V core file format stuff
- *
- * 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 _ASM_USER_H
-#define _ASM_USER_H
-
-#include <asm/page.h>
-#include <asm/registers.h>
-
-/* Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the 'trad-core' bfd).  There are quite a number of
- * obstacles to being able to view the contents of the floating point
- * registers, and until these are solved you will not be able to view
- * the contents of them.  Actually, you can read in the core file and
- * look at the contents of the user struct to find out what the
- * floating point registers contain.
- *
- * The actual file contents are as follows:
- * UPAGE:
- *   1 page consisting of a user struct that tells gdb what is present
- *   in the file.  Directly after this is a copy of the task_struct,
- *   which is currently not used by gdb, but it may come in useful at
- *   some point.  All of the registers are stored as part of the
- *   upage.  The upage should always be only one page.
- *
- * DATA:
- *   The data area is stored.  We use current->end_text to
- *   current->brk to pick up all of the user variables, plus any
- *   memory that may have been malloced.  No attempt is made to
- *   determine if a page is demand-zero or if a page is totally
- *   unused, we just cover the entire range.  All of the addresses are
- *   rounded in such a way that an integral number of pages is
- *   written.
- *
- * STACK:
- *   We need the stack information in order to get a meaningful
- *   backtrace.  We need to write the data from (esp) to
- *   current->start_stack, so we round each of these off in order to
- *   be able to write an integer number of pages.  The minimum core
- *   file size is 3 pages, or 12288 bytes.
- */
-
-/* When the kernel dumps core, it starts by dumping the user struct -
- * this will be used by gdb to figure out where the data and stack segments
- *  are within the file, and what virtual addresses to use.
- */
-struct user {
-        /* We start with the registers, to mimic the way that "memory" is returned
-         * from the ptrace(3,...) function.  */
-        struct user_context     regs;
-
-        /* The rest of this junk is to help gdb figure out what goes where */
-        unsigned long           u_tsize;        /* Text segment size (pages). */
-        unsigned long           u_dsize;        /* Data segment size (pages). */
-        unsigned long           u_ssize;        /* Stack segment size (pages). */
-        unsigned long           start_code;     /* Starting virtual address of text. */
-        unsigned long           start_stack;    /* Starting virtual address of stack area.
-                                                 * This is actually the bottom of the stack,
-                                                 * the top of the stack is always found in the
-                                                 * esp register.  */
-        long int                signal;         /* Signal that caused the core dump. */
-
-        unsigned long           magic;          /* To uniquely identify a core file */
-        char                    u_comm[32];     /* User command that was responsible */
-};
-
-#define NBPG                    PAGE_SIZE
-#define UPAGES                  1
-#define HOST_TEXT_START_ADDR    (u.start_code)
-#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-
-#endif
diff --git a/include/asm-frv/vga.h b/include/asm-frv/vga.h
deleted file mode 100644
index a702c800a229..000000000000
--- a/include/asm-frv/vga.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vga.h: VGA register stuff
- *
- * Copyright (C) 2006 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 _ASM_VGA_H
-#define _ASM_VGA_H
-
-
-
-#endif /* _ASM_VGA_H */
diff --git a/include/asm-frv/virtconvert.h b/include/asm-frv/virtconvert.h
deleted file mode 100644
index 59788fa2a813..000000000000
--- a/include/asm-frv/virtconvert.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* virtconvert.h: virtual/physical/page address convertion
- *
- * Copyright (C) 2004 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 _ASM_VIRTCONVERT_H
-#define _ASM_VIRTCONVERT_H
-
-/*
- * Macros used for converting between virtual and physical mappings.
- */
-
-#ifdef __KERNEL__
-
-#include <asm/setup.h>
-
-#ifdef CONFIG_MMU
-
-#define phys_to_virt(vaddr)     ((void *) ((unsigned long)(vaddr) + PAGE_OFFSET))
-#define virt_to_phys(vaddr)     ((unsigned long) (vaddr) - PAGE_OFFSET)
-
-#else
-
-#define phys_to_virt(vaddr)     ((void *) (vaddr))
-#define virt_to_phys(vaddr)     ((unsigned long) (vaddr))
-
-#endif
-
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-
-#define __page_address(page)    (PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT))
-#define page_to_phys(page)      virt_to_phys((void *)__page_address(page))
-
-#endif
-#endif
diff --git a/include/asm-frv/xor.h b/include/asm-frv/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/include/asm-frv/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 7abdaa91ccd3..3673a13b6703 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -132,9 +132,9 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
 #define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l))
 
 #define atomic_long_cmpxchg(l, old, new) \
-        (atomic_cmpxchg((atomic64_t *)(l), (old), (new)))
+        (atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))
 #define atomic_long_xchg(v, new) \
-        (atomic_xchg((atomic64_t *)(l), (new)))
+        (atomic64_xchg((atomic64_t *)(l), (new)))
 
 #else  /*  BITS_PER_LONG == 64  */
 
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 37b82cb96c89..4b6755984d24 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -58,12 +58,13 @@ struct bug_entry {
  */
 #ifndef __WARN
 #ifndef __ASSEMBLY__
-extern void warn_slowpath(const char *file, const int line,
+extern void warn_slowpath_fmt(const char *file, const int line,
                 const char *fmt, ...) __attribute__((format(printf, 3, 4)));
+extern void warn_slowpath_null(const char *file, const int line);
 #define WANT_WARN_ON_SLOWPATH
 #endif
-#define __WARN()                warn_slowpath(__FILE__, __LINE__, NULL)
-#define __WARN_printf(arg...)   warn_slowpath(__FILE__, __LINE__, arg)
+#define __WARN()                warn_slowpath_null(__FILE__, __LINE__)
+#define __WARN_printf(arg...)   warn_slowpath_fmt(__FILE__, __LINE__, arg)
 #else
 #define __WARN_printf(arg...)   do { printk(arg); __WARN(); } while (0)
 #endif
@@ -88,7 +89,7 @@ extern void warn_slowpath(const char *file, const int line,
 
 #else /* !CONFIG_BUG */
 #ifndef HAVE_ARCH_BUG
-#define BUG()
+#define BUG() do {} while(0)
 #endif
 
 #ifndef HAVE_ARCH_BUG_ON
diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h
deleted file mode 100644
index 189486c3f92e..000000000000
--- a/include/asm-generic/dma-mapping.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/* Copyright (C) 2002 by James.Bottomley@HansenPartnership.com 
- *
- * Implements the generic device dma API via the existing pci_ one
- * for unconverted architectures
- */
-
-#ifndef _ASM_GENERIC_DMA_MAPPING_H
-#define _ASM_GENERIC_DMA_MAPPING_H
-
-
-#ifdef CONFIG_PCI
-
-/* we implement the API below in terms of the existing PCI one,
- * so include it */
-#include <linux/pci.h>
-/* need struct page definitions */
-#include <linux/mm.h>
-
-static inline int
-dma_supported(struct device *dev, u64 mask)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_dma_supported(to_pci_dev(dev), mask);
-}
-
-static inline int
-dma_set_mask(struct device *dev, u64 dma_mask)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
-}
-
-static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                   gfp_t flag)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle);
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
-                    dma_addr_t dma_handle)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
-}
-
-static inline dma_addr_t
-dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-               enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                 enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
-}
-
-static inline dma_addr_t
-dma_map_page(struct device *dev, struct page *page,
-             unsigned long offset, size_t size,
-             enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
-}
-
-static inline void
-dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-               enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
-}
-
-static inline int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-           enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
-}
-
-static inline void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-             enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
-}
-
-static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-                        enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
-                                    size, (int)direction);
-}
-
-static inline void
-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-                           enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
-                                       size, (int)direction);
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-                    enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
-}
-
-static inline void
-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-                       enum dma_data_direction direction)
-{
-        BUG_ON(dev->bus != &pci_bus_type);
-
-        pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
-}
-
-static inline int
-dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return pci_dma_mapping_error(to_pci_dev(dev), dma_addr);
-}
-
-
-#else
-
-static inline int
-dma_supported(struct device *dev, u64 mask)
-{
-        return 0;
-}
-
-static inline int
-dma_set_mask(struct device *dev, u64 dma_mask)
-{
-        BUG();
-        return 0;
-}
-
-static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                   gfp_t flag)
-{
-        BUG();
-        return NULL;
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
-                    dma_addr_t dma_handle)
-{
-        BUG();
-}
-
-static inline dma_addr_t
-dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-               enum dma_data_direction direction)
-{
-        BUG();
-        return 0;
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                 enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline dma_addr_t
-dma_map_page(struct device *dev, struct page *page,
-             unsigned long offset, size_t size,
-             enum dma_data_direction direction)
-{
-        BUG();
-        return 0;
-}
-
-static inline void
-dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-               enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-           enum dma_data_direction direction)
-{
-        BUG();
-        return 0;
-}
-
-static inline void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-             enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-                        enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline void
-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-                           enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-                    enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline void
-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-                       enum dma_data_direction direction)
-{
-        BUG();
-}
-
-static inline int
-dma_error(dma_addr_t dma_addr)
-{
-        return 0;
-}
-
-#endif
-
-/* Now for the API extensions over the pci_ one */
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-#define dma_is_consistent(d, h) (1)
-
-static inline int
-dma_get_cache_alignment(void)
-{
-        /* no easy way to get cache size on all processors, so return
-         * the maximum possible, to be safe */
-        return (1 << INTERNODE_CACHE_SHIFT);
-}
-
-static inline void
-dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                              unsigned long offset, size_t size,
-                              enum dma_data_direction direction)
-{
-        /* just sync everything, that's all the pci API can do */
-        dma_sync_single_for_cpu(dev, dma_handle, offset+size, direction);
-}
-
-static inline void
-dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                 unsigned long offset, size_t size,
-                                 enum dma_data_direction direction)
-{
-        /* just sync everything, that's all the pci API can do */
-        dma_sync_single_for_device(dev, dma_handle, offset+size, direction);
-}
-
-static inline void
-dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-               enum dma_data_direction direction)
-{
-        /* could define this in terms of the dma_cache ... operations,
-         * but if you get this on a platform, you should convert the platform
-         * to using the generic device DMA API */
-        BUG();
-}
-
-#endif
-
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index b8477414c5c8..4d3e48373e74 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -117,9 +117,9 @@
 struct flock {
         short   l_type;
         short   l_whence;
-        off_t   l_start;
-        off_t   l_len;
-        pid_t   l_pid;
+        __kernel_off_t  l_start;
+        __kernel_off_t  l_len;
+        __kernel_pid_t  l_pid;
         __ARCH_FLOCK_PAD
 };
 #endif
@@ -140,9 +140,9 @@ struct flock {
 struct flock64 {
         short  l_type;
         short  l_whence;
-        loff_t l_start;
-        loff_t l_len;
-        pid_t  l_pid;
+        __kernel_loff_t l_start;
+        __kernel_loff_t l_len;
+        __kernel_pid_t  l_pid;
         __ARCH_FLOCK64_PAD
 };
 #endif
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 81797ec9ab29..d6c379dc64fa 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -55,6 +55,10 @@ struct module;
  *      handled is (base + ngpio - 1).
  * @can_sleep: flag must be set iff get()/set() methods sleep, as they
  *      must while accessing GPIO expander chips over I2C or SPI
+ * @names: if set, must be an array of strings to use as alternative
+ *      names for the GPIOs in this chip. Any entry in the array
+ *      may be NULL if there is no alias for the GPIO, however the
+ *      array must be @ngpio entries long.
  *
  * A gpio_chip can help platforms abstract various sources of GPIOs so
  * they can all be accessed through a common programing interface.
@@ -92,6 +96,7 @@ struct gpio_chip {
                                                 struct gpio_chip *chip);
         int                     base;
         u16                     ngpio;
+        char                    **names;
         unsigned                can_sleep:1;
         unsigned                exported:1;
 };
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index b0e63c672ebd..d7d50d7ee51e 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -1,13 +1,9 @@
 #ifndef _ASM_GENERIC_PERCPU_H_
 #define _ASM_GENERIC_PERCPU_H_
+
 #include <linux/compiler.h>
 #include <linux/threads.h>
-
-/*
- * Determine the real variable name from the name visible in the
- * kernel sources.
- */
-#define per_cpu_var(var) per_cpu__##var
+#include <linux/percpu-defs.h>
 
 #ifdef CONFIG_SMP
 
@@ -73,11 +69,32 @@ extern void setup_per_cpu_areas(void);
 
 #endif  /* SMP */
 
+#ifndef PER_CPU_BASE_SECTION
+#ifdef CONFIG_SMP
+#define PER_CPU_BASE_SECTION ".data.percpu"
+#else
+#define PER_CPU_BASE_SECTION ".data"
+#endif
+#endif
+
+#ifdef CONFIG_SMP
+
+#ifdef MODULE
+#define PER_CPU_SHARED_ALIGNED_SECTION ""
+#else
+#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned"
+#endif
+#define PER_CPU_FIRST_SECTION ".first"
+
+#else
+
+#define PER_CPU_SHARED_ALIGNED_SECTION ""
+#define PER_CPU_FIRST_SECTION ""
+
+#endif
+
 #ifndef PER_CPU_ATTRIBUTES
 #define PER_CPU_ATTRIBUTES
 #endif
 
-#define DECLARE_PER_CPU(type, name) extern PER_CPU_ATTRIBUTES \
-                                        __typeof__(type) per_cpu_var(name)
-
 #endif /* _ASM_GENERIC_PERCPU_H_ */
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index 79a7ff925bf8..4ce48e878530 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -9,7 +9,7 @@ extern char __bss_start[], __bss_stop[];
 extern char __init_begin[], __init_end[];
 extern char _sinittext[], _einittext[];
 extern char _end[];
-extern char __per_cpu_start[], __per_cpu_end[];
+extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
 extern char __kprobes_text_start[], __kprobes_text_end[];
 extern char __initdata_begin[], __initdata_end[];
 extern char __start_rodata[], __end_rodata[];
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 969570167e9e..c840719a8c59 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -23,7 +23,7 @@ typedef union sigval {
 #endif
 
 #ifndef __ARCH_SI_UID_T
-#define __ARCH_SI_UID_T uid_t
+#define __ARCH_SI_UID_T __kernel_uid32_t
 #endif
 
 /*
@@ -47,13 +47,13 @@ typedef struct siginfo {
 
                 /* kill() */
                 struct {
-                        pid_t _pid;             /* sender's pid */
+                        __kernel_pid_t _pid;    /* sender's pid */
                         __ARCH_SI_UID_T _uid;   /* sender's uid */
                 } _kill;
 
                 /* POSIX.1b timers */
                 struct {
-                        timer_t _tid;           /* timer id */
+                        __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 */
@@ -62,18 +62,18 @@ typedef struct siginfo {
 
                 /* POSIX.1b signals */
                 struct {
-                        pid_t _pid;             /* sender's pid */
+                        __kernel_pid_t _pid;    /* sender's pid */
                         __ARCH_SI_UID_T _uid;   /* sender's uid */
                         sigval_t _sigval;
                 } _rt;
 
                 /* SIGCHLD */
                 struct {
-                        pid_t _pid;             /* which child */
+                        __kernel_pid_t _pid;    /* which child */
                         __ARCH_SI_UID_T _uid;   /* sender's uid */
                         int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
+                        __kernel_clock_t _utime;
+                        __kernel_clock_t _stime;
                 } _sigchld;
 
                 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
@@ -201,7 +201,7 @@ typedef struct siginfo {
 #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        2
+#define NSIGTRAP        4
 
 /*
  * SIGCHLD si_codes
diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h
index 6129d6802149..3b4fb3e52f0d 100644
--- a/include/asm-generic/statfs.h
+++ b/include/asm-generic/statfs.h
@@ -1,8 +1,9 @@
 #ifndef _GENERIC_STATFS_H
 #define _GENERIC_STATFS_H
 
-#ifndef __KERNEL_STRICT_NAMES
-# include <linux/types.h>
+#include <linux/types.h>
+
+#ifdef __KERNEL__
 typedef __kernel_fsid_t fsid_t;
 #endif
 
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
index 0e9e2bc0ee96..88bada2ebc4b 100644
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -43,20 +43,10 @@
 #ifndef cpumask_of_node
 #define cpumask_of_node(node)   ((void)node, cpu_online_mask)
 #endif
-#ifndef node_to_first_cpu
-#define node_to_first_cpu(node) ((void)(node),0)
-#endif
 #ifndef pcibus_to_node
 #define pcibus_to_node(bus)     ((void)(bus), -1)
 #endif
 
-#ifndef pcibus_to_cpumask
-#define pcibus_to_cpumask(bus)  (pcibus_to_node(bus) == -1 ? \
-                                        CPU_MASK_ALL : \
-                                        node_to_cpumask(pcibus_to_node(bus)) \
-                                )
-#endif
-
 #ifndef cpumask_of_pcibus
 #define cpumask_of_pcibus(bus)  (pcibus_to_node(bus) == -1 ?            \
                                  cpu_all_mask :                         \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c61fab1dd2f8..89853bcd27a6 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -1,3 +1,5 @@
+#include <linux/section-names.h>
+
 #ifndef LOAD_OFFSET
 #define LOAD_OFFSET 0
 #endif
@@ -61,10 +63,33 @@
 #define BRANCH_PROFILE()
 #endif
 
+#ifdef CONFIG_EVENT_TRACER
+#define FTRACE_EVENTS() VMLINUX_SYMBOL(__start_ftrace_events) = .;      \
+                        *(_ftrace_events)                               \
+                        VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+#else
+#define FTRACE_EVENTS()
+#endif
+
+#ifdef CONFIG_TRACING
+#define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+                         *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
+                         VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+#else
+#define TRACE_PRINTKS()
+#endif
+
+#ifdef CONFIG_FTRACE_SYSCALLS
+#define TRACE_SYSCALLS() VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \
+                         *(__syscalls_metadata)                         \
+                         VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+#else
+#define TRACE_SYSCALLS()
+#endif
+
 /* .data section */
 #define DATA_DATA                                                       \
         *(.data)                                                        \
-        *(.data.init.refok)                                             \
         *(.ref.data)                                                    \
         DEV_KEEP(init.data)                                             \
         DEV_KEEP(exit.data)                                             \
@@ -80,8 +105,16 @@
         VMLINUX_SYMBOL(__start___tracepoints) = .;                      \
         *(__tracepoints)                                                \
         VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
+        /* implement dynamic printk debug */                            \
+        . = ALIGN(8);                                                   \
+        VMLINUX_SYMBOL(__start___verbose) = .;                          \
+        *(__verbose)                                                    \
+        VMLINUX_SYMBOL(__stop___verbose) = .;                           \
         LIKELY_PROFILE()                                                \
-        BRANCH_PROFILE()
+        BRANCH_PROFILE()                                                \
+        TRACE_PRINTKS()                                                 \
+        FTRACE_EVENTS()                                                 \
+        TRACE_SYSCALLS()
 
 #define RO_DATA(align)                                                  \
         . = ALIGN((align));                                             \
@@ -255,8 +288,6 @@
                 *(.text.hot)                                            \
                 *(.text)                                                \
                 *(.ref.text)                                            \
-                *(.text.init.refok)                                     \
-                *(.exit.text.refok)                                     \
         DEV_KEEP(init.text)                                             \
         DEV_KEEP(exit.text)                                             \
         CPU_KEEP(init.text)                                             \
@@ -299,7 +330,7 @@
 #endif
 
 /* Section used for early init (in .S files) */
-#define HEAD_TEXT  *(.head.text)
+#define HEAD_TEXT  *(HEAD_TEXT_SECTION)
 
 /* init and exit section handling */
 #define INIT_DATA                                                       \
@@ -309,15 +340,7 @@
         CPU_DISCARD(init.data)                                          \
         CPU_DISCARD(init.rodata)                                        \
         MEM_DISCARD(init.data)                                          \
-        MEM_DISCARD(init.rodata)                                        \
-        /* implement dynamic printk debug */                            \
-        VMLINUX_SYMBOL(__start___verbose_strings) = .;                  \
-        *(__verbose_strings)                                            \
-        VMLINUX_SYMBOL(__stop___verbose_strings) = .;                   \
-        . = ALIGN(8);                                                   \
-        VMLINUX_SYMBOL(__start___verbose) = .;                          \
-        *(__verbose)                                                    \
-        VMLINUX_SYMBOL(__stop___verbose) = .;
+        MEM_DISCARD(init.rodata)
 
 #define INIT_TEXT                                                       \
         *(.init.text)                                                   \
@@ -430,12 +453,59 @@
         *(.initcall7.init)                                              \
         *(.initcall7s.init)
 
+/**
+ * PERCPU_VADDR - define output section for percpu area
+ * @vaddr: explicit base address (optional)
+ * @phdr: destination PHDR (optional)
+ *
+ * Macro which expands to output section for percpu area.  If @vaddr
+ * is not blank, it specifies explicit base address and all percpu
+ * symbols will be offset from the given address.  If blank, @vaddr
+ * always equals @laddr + LOAD_OFFSET.
+ *
+ * @phdr defines the output PHDR to use if not blank.  Be warned that
+ * output PHDR is sticky.  If @phdr is specified, the next output
+ * section in the linker script will go there too.  @phdr should have
+ * a leading colon.
+ *
+ * Note that this macros defines __per_cpu_load as an absolute symbol.
+ * If there is no need to put the percpu section at a predetermined
+ * address, use PERCPU().
+ */
+#define PERCPU_VADDR(vaddr, phdr)                                       \
+        VMLINUX_SYMBOL(__per_cpu_load) = .;                             \
+        .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load)          \
+                                - LOAD_OFFSET) {                        \
+                VMLINUX_SYMBOL(__per_cpu_start) = .;                    \
+                *(.data.percpu.first)                                   \
+                *(.data.percpu.page_aligned)                            \
+                *(.data.percpu)                                         \
+                *(.data.percpu.shared_aligned)                          \
+                VMLINUX_SYMBOL(__per_cpu_end) = .;                      \
+        } phdr                                                          \
+        . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
+
+/**
+ * PERCPU - define output section for percpu area, simple version
+ * @align: required alignment
+ *
+ * Align to @align and outputs output section for percpu area.  This
+ * macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
+ * __per_cpu_start will be identical.
+ *
+ * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
+ * that __per_cpu_load is defined as a relative symbol against
+ * .data.percpu which is required for relocatable x86_32
+ * configuration.
+ */
 #define PERCPU(align)                                                   \
         . = ALIGN(align);                                               \
-        VMLINUX_SYMBOL(__per_cpu_start) = .;                            \
-        .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {          \
+        .data.percpu    : AT(ADDR(.data.percpu) - LOAD_OFFSET) {        \
+                VMLINUX_SYMBOL(__per_cpu_load) = .;                     \
+                VMLINUX_SYMBOL(__per_cpu_start) = .;                    \
+                *(.data.percpu.first)                                   \
                 *(.data.percpu.page_aligned)                            \
                 *(.data.percpu)                                         \
                 *(.data.percpu.shared_aligned)                          \
-        }                                                               \
-        VMLINUX_SYMBOL(__per_cpu_end) = .;
+                VMLINUX_SYMBOL(__per_cpu_end) = .;                      \
+        }
diff --git a/include/asm-h8300/timer.h b/include/asm-h8300/timer.h
deleted file mode 100644
index def80464d38f..000000000000
--- a/include/asm-h8300/timer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __H8300_TIMER_H
-#define __H8300_TIMER_H
-
-void h8300_timer_tick(void);
-void h8300_timer_setup(void);
-void h8300_gettod(unsigned int *year, unsigned int *mon, unsigned int *day,
-                   unsigned int *hour, unsigned int *min, unsigned int *sec);
-
-#define TIMER_FREQ (CONFIG_CPU_CLOCK*10000) /* Timer input freq. */
-
-#define calc_param(cnt, div, rate, limit)                       \
-do {                                                            \
-        cnt = TIMER_FREQ / HZ;                                  \
-        for (div = 0; div < ARRAY_SIZE(divide_rate); div++) {   \
-                if (rate[div] == 0)                             \
-                        continue;                               \
-                if ((cnt / rate[div]) > limit)                  \
-                        break;                                  \
-        }                                                       \
-        if (div == ARRAY_SIZE(divide_rate))                     \
-                panic("Timer counter overflow");                \
-        cnt /= divide_rate[div];                                \
-} while(0)
-
-#endif
diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild
deleted file mode 100644
index c68e1680da01..000000000000
--- a/include/asm-m32r/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/include/asm-m32r/addrspace.h b/include/asm-m32r/addrspace.h
deleted file mode 100644
index 81782c122da4..000000000000
--- a/include/asm-m32r/addrspace.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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) 2001 by Hiroyuki Kondo
- *
- * Defitions for the address spaces of the M32R CPUs.
- */
-#ifndef __ASM_M32R_ADDRSPACE_H
-#define __ASM_M32R_ADDRSPACE_H
-
-/*
- * Memory segments (32bit kernel mode addresses)
- */
-#define KUSEG                   0x00000000
-#define KSEG0                   0x80000000
-#define KSEG1                   0xa0000000
-#define KSEG2                   0xc0000000
-#define KSEG3                   0xe0000000
-
-#define K0BASE  KSEG0
-
-/*
- * Returns the kernel segment base of a given address
- */
-#ifndef __ASSEMBLY__
-#define KSEGX(a)                (((unsigned long)(a)) & 0xe0000000)
-#else
-#define KSEGX(a)                ((a) & 0xe0000000)
-#endif
-
-/*
- * Returns the physical address of a KSEG0/KSEG1 address
- */
-#ifndef __ASSEMBLY__
-#define PHYSADDR(a)             (((unsigned long)(a)) & 0x1fffffff)
-#else
-#define PHYSADDR(a)             ((a) & 0x1fffffff)
-#endif
-
-/*
- * Map an address to a certain kernel segment
- */
-#ifndef __ASSEMBLY__
-#define KSEG0ADDR(a)            ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG0))
-#define KSEG1ADDR(a)            ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG1))
-#define KSEG2ADDR(a)            ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG2))
-#define KSEG3ADDR(a)            ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG3))
-#else
-#define KSEG0ADDR(a)            (((a) & 0x1fffffff) | KSEG0)
-#define KSEG1ADDR(a)            (((a) & 0x1fffffff) | KSEG1)
-#define KSEG2ADDR(a)            (((a) & 0x1fffffff) | KSEG2)
-#define KSEG3ADDR(a)            (((a) & 0x1fffffff) | KSEG3)
-#endif
-
-#endif /* __ASM_M32R_ADDRSPACE_H */
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h
deleted file mode 100644
index 26351539b5ff..000000000000
--- a/include/asm-m32r/assembler.h
+++ /dev/null
@@ -1,229 +0,0 @@
-#ifndef _ASM_M32R_ASSEMBLER_H
-#define _ASM_M32R_ASSEMBLER_H
-
-/*
- * linux/asm-m32r/assembler.h
- *
- * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- *
- * This file contains M32R architecture specific macro definitions.
- */
-
-
-#ifndef __STR
-#ifdef __ASSEMBLY__
-#define __STR(x) x
-#else
-#define __STR(x) #x
-#endif
-#endif /* __STR */
-
-#ifdef CONFIG_SMP
-#define M32R_LOCK       __STR(lock)
-#define M32R_UNLOCK     __STR(unlock)
-#else
-#define M32R_LOCK       __STR(ld)
-#define M32R_UNLOCK     __STR(st)
-#endif
-
-#ifdef __ASSEMBLY__
-#undef ENTRY
-#define ENTRY(name) ENTRY_M name
-        .macro  ENTRY_M name
-        .global \name
-        ALIGN
-\name:
-        .endm
-#endif
-
-
-/**
- * LDIMM - load immediate value
- * STI - enable interruption
- * CLI - disable interruption
- */
-
-#ifdef __ASSEMBLY__
-
-#define LDIMM(reg,x) LDIMM reg x
-        .macro LDIMM reg x
-        seth    \reg, #high(\x)
-        or3     \reg, \reg, #low(\x)
-        .endm
-
-#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
-#define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg
-        .macro ENABLE_INTERRUPTS reg
-        setpsw  #0x40       ->  nop
-        ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1).
-        .endm
-
-#define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg
-        .macro DISABLE_INTERRUPTS reg
-        clrpsw  #0x40       ->  nop
-        ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1).
-        .endm
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg
-        .macro ENABLE_INTERRUPTS reg
-        mvfc    \reg, psw
-        or3     \reg, \reg, #0x0040
-        mvtc    \reg, psw
-        .endm
-
-#define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg
-        .macro DISABLE_INTERRUPTS reg
-        mvfc    \reg, psw
-        and3    \reg, \reg, #0xffbf
-        mvtc    \reg, psw
-        .endm
-#endif  /* CONFIG_CHIP_M32102 */
-
-        .macro  SAVE_ALL
-        push    r0              ; orig_r0
-        push    sp              ; spi (r15)
-        push    lr              ; r14
-        push    r13
-        mvfc    r13, cr3        ; spu
-        push    r13
-        mvfc    r13, bbpc
-        push    r13
-        mvfc    r13, bbpsw
-        push    r13
-        mvfc    r13, bpc
-        push    r13
-        mvfc    r13, psw
-        push    r13
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
-        mvfaclo r13, a1
-        push    r13
-        mvfachi r13, a1
-        push    r13
-        mvfaclo r13, a0
-        push    r13
-        mvfachi r13, a0
-        push    r13
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        mvfaclo r13
-        push    r13
-        mvfachi r13
-        push    r13
-        ldi     r13, #0
-        push    r13             ; dummy push acc1h
-        push    r13             ; dummy push acc1l
-#else
-#error unknown isa configuration
-#endif
-        ldi     r13, #-1
-        push    r13             ; syscall_nr (default: -1)
-        push    r12
-        push    r11
-        push    r10
-        push    r9
-        push    r8
-        push    r7
-        push    r3
-        push    r2
-        push    r1
-        push    r0
-        addi    sp, #-4         ; room for implicit pt_regs parameter
-        push    r6
-        push    r5
-        push    r4
-        .endm
-
-        .macro  RESTORE_ALL
-        pop     r4
-        pop     r5
-        pop     r6
-        addi    sp, #4
-        pop     r0
-        pop     r1
-        pop     r2
-        pop     r3
-        pop     r7
-        pop     r8
-        pop     r9
-        pop     r10
-        pop     r11
-        pop     r12
-        addi    r15, #4         ; Skip syscall number
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
-        pop     r13
-        mvtachi r13, a0
-        pop     r13
-        mvtaclo r13, a0
-        pop     r13
-        mvtachi r13, a1
-        pop     r13
-        mvtaclo r13, a1
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        pop     r13             ; dummy pop acc1h
-        pop     r13             ; dummy pop acc1l
-        pop     r13
-        mvtachi r13
-        pop     r13
-        mvtaclo r13
-#else
-#error unknown isa configuration
-#endif
-        pop     r14
-        mvtc    r14, psw
-        pop     r14
-        mvtc    r14, bpc
-        addi    sp, #8          ; Skip bbpsw, bbpc
-        pop     r14
-        mvtc    r14, cr3        ; spu
-        pop     r13
-        pop     lr              ; r14
-        pop     sp              ; spi (r15)
-        addi    sp, #4          ; Skip orig_r0
-        .fillinsn
-1:      rte
-        .section .fixup,"ax"
-2:      bl      do_exit
-        .previous
-        .section __ex_table,"a"
-        ALIGN
-        .long   1b, 2b
-        .previous
-        .endm
-
-#define GET_CURRENT(reg)  get_current reg
-        .macro get_current reg
-        ldi  \reg, #-8192
-        and  \reg, sp
-        .endm
-
-#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
-        .macro  SWITCH_TO_KERNEL_STACK
-        ; switch to kernel stack (spi)
-        clrpsw  #0x80       ->  nop
-        .endm
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-        .macro  SWITCH_TO_KERNEL_STACK
-        push    r0              ; save r0 for working
-        mvfc    r0, psw
-        and3    r0, r0, #0x00ff7f
-        mvtc    r0, psw
-        slli    r0, #16
-        bltz    r0, 1f          ; check BSM-bit
-;
-        ;; called from kernel context: previous stack = spi
-        pop     r0              ; retrieve r0
-        bra     2f
-        .fillinsn
-1:
-        ;; called from user context: previous stack = spu
-        mvfc    r0, cr3         ; spu
-        addi    r0, #4
-        mvtc    r0, cr3         ; spu
-        ld      r0, @(-4,r0)    ; retrieve r0
-        .fillinsn
-2:
-        .endm
-#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-
-#endif  /* __ASSEMBLY__ */
-
-#endif  /* _ASM_M32R_ASSEMBLER_H */
diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h
deleted file mode 100644
index 2eed30f84080..000000000000
--- a/include/asm-m32r/atomic.h
+++ /dev/null
@@ -1,318 +0,0 @@
-#ifndef _ASM_M32R_ATOMIC_H
-#define _ASM_M32R_ATOMIC_H
-
-/*
- *  linux/include/asm-m32r/atomic.h
- *
- *  M32R version:
- *    Copyright (C) 2001, 2002  Hitoshi Yamamoto
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <linux/types.h>
-#include <asm/assembler.h>
-#include <asm/system.h>
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- */
-
-#define ATOMIC_INIT(i)  { (i) }
-
-/**
- * atomic_read - read atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically reads the value of @v.
- */
-#define atomic_read(v)  ((v)->counter)
-
-/**
- * atomic_set - set atomic variable
- * @v: pointer of type atomic_t
- * @i: required value
- *
- * Atomically sets the value of @v to @i.
- */
-#define atomic_set(v,i) (((v)->counter) = (i))
-
-/**
- * atomic_add_return - add integer to atomic variable and return it
- * @i: integer value to add
- * @v: pointer of type atomic_t
- *
- * Atomically adds @i to @v and return (@i + @v).
- */
-static __inline__ int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_add_return            \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "add    %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (result)
-                : "r" (&v->counter), "r" (i)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * atomic_sub_return - subtract integer from atomic variable and return it
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v and return (@v - @i).
- */
-static __inline__ int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_sub_return            \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "sub    %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (result)
-                : "r" (&v->counter), "r" (i)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * atomic_add - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
- *
- * Atomically adds @i to @v.
- */
-#define atomic_add(i,v) ((void) atomic_add_return((i), (v)))
-
-/**
- * atomic_sub - subtract the atomic variable
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v.
- */
-#define atomic_sub(i,v) ((void) atomic_sub_return((i), (v)))
-
-/**
- * atomic_sub_and_test - subtract value from variable and test result
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v and returns
- * true if the result is zero, or false for all
- * other cases.
- */
-#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)
-
-/**
- * atomic_inc_return - increment atomic variable and return it
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1 and returns the result.
- */
-static __inline__ int atomic_inc_return(atomic_t *v)
-{
-        unsigned long flags;
-        int result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_inc_return            \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "addi   %0, #1;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (result)
-                : "r" (&v->counter)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * atomic_dec_return - decrement atomic variable and return it
- * @v: pointer of type atomic_t
- *
- * Atomically decrements @v by 1 and returns the result.
- */
-static __inline__ int atomic_dec_return(atomic_t *v)
-{
-        unsigned long flags;
-        int result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_dec_return            \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "addi   %0, #-1;                \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (result)
-                : "r" (&v->counter)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * atomic_inc - increment atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1.
- */
-#define atomic_inc(v) ((void)atomic_inc_return(v))
-
-/**
- * atomic_dec - decrement atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically decrements @v by 1.
- */
-#define atomic_dec(v) ((void)atomic_dec_return(v))
-
-/**
- * atomic_inc_and_test - increment and test
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1
- * and returns true if the result is zero, or false for all
- * other cases.
- */
-#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
-
-/**
- * atomic_dec_and_test - decrement and test
- * @v: pointer of type atomic_t
- *
- * Atomically decrements @v by 1 and
- * returns true if the result is 0, or false for all
- * other cases.
- */
-#define atomic_dec_and_test(v) (atomic_dec_return(v) == 0)
-
-/**
- * atomic_add_negative - add and test if negative
- * @v: pointer of type atomic_t
- * @i: integer value to add
- *
- * Atomically adds @i to @v and returns true
- * if the result is negative, or false when
- * result is greater than or equal to zero.
- */
-#define atomic_add_negative(i,v) (atomic_add_return((i), (v)) < 0)
-
-#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
-/**
- * atomic_add_unless - add unless the number is a given value
- * @v: pointer of type atomic_t
- * @a: the amount to add to v...
- * @u: ...unless v is equal to u.
- *
- * Atomically adds @a to @v, so long as it was not @u.
- * Returns non-zero if @v was not @u, and zero otherwise.
- */
-static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
-{
-        int c, old;
-        c = atomic_read(v);
-        for (;;) {
-                if (unlikely(c == (u)))
-                        break;
-                old = atomic_cmpxchg((v), c, c + (a));
-                if (likely(old == c))
-                        break;
-                c = old;
-        }
-        return c != (u);
-}
-
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-static __inline__ void atomic_clear_mask(unsigned long  mask, atomic_t *addr)
-{
-        unsigned long flags;
-        unsigned long tmp;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_clear_mask            \n\t"
-                DCACHE_CLEAR("%0", "r5", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "and    %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (tmp)
-                : "r" (addr), "r" (~mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r5"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-static __inline__ void atomic_set_mask(unsigned long  mask, atomic_t *addr)
-{
-        unsigned long flags;
-        unsigned long tmp;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# atomic_set_mask              \n\t"
-                DCACHE_CLEAR("%0", "r5", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "or     %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (tmp)
-                : "r" (addr), "r" (mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r5"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-/* Atomic operations are already serializing on m32r */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-
-#include <asm-generic/atomic.h>
-#endif  /* _ASM_M32R_ATOMIC_H */
diff --git a/include/asm-m32r/auxvec.h b/include/asm-m32r/auxvec.h
deleted file mode 100644
index f76dcc860fae..000000000000
--- a/include/asm-m32r/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_M32R__AUXVEC_H
-#define _ASM_M32R__AUXVEC_H
-
-#endif  /* _ASM_M32R__AUXVEC_H */
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h
deleted file mode 100644
index aaddf0d57603..000000000000
--- a/include/asm-m32r/bitops.h
+++ /dev/null
@@ -1,275 +0,0 @@
-#ifndef _ASM_M32R_BITOPS_H
-#define _ASM_M32R_BITOPS_H
-
-/*
- *  linux/include/asm-m32r/bitops.h
- *
- *  Copyright 1992, Linus Torvalds.
- *
- *  M32R version:
- *    Copyright (C) 2001, 2002  Hitoshi Yamamoto
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <linux/compiler.h>
-#include <asm/assembler.h>
-#include <asm/system.h>
-#include <asm/byteorder.h>
-#include <asm/types.h>
-
-/*
- * These have to be done with inline assembly: that way the bit-setting
- * is guaranteed to be atomic. All bit operations return 0 if the bit
- * was cleared before the operation and != 0 if it was not.
- *
- * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
- */
-
-/**
- * set_bit - Atomically set a bit in memory
- * @nr: the bit to set
- * @addr: the address to start counting from
- *
- * This function is atomic and may not be reordered.  See __set_bit()
- * if you do not require the atomic guarantees.
- * Note that @nr may be almost arbitrarily large; this function is not
- * restricted to acting on a single-word quantity.
- */
-static __inline__ void set_bit(int nr, volatile void * addr)
-{
-        __u32 mask;
-        volatile __u32 *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "r6", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "or     %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (tmp)
-                : "r" (a), "r" (mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-/**
- * clear_bit - Clears a bit in memory
- * @nr: Bit to clear
- * @addr: Address to start counting from
- *
- * clear_bit() is atomic and may not be reordered.  However, it does
- * not contain a memory barrier, so if it is used for locking purposes,
- * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
- * in order to ensure changes are visible on other processors.
- */
-static __inline__ void clear_bit(int nr, volatile void * addr)
-{
-        __u32 mask;
-        volatile __u32 *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "r6", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "and    %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (tmp)
-                : "r" (a), "r" (~mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-
-/**
- * change_bit - Toggle a bit in memory
- * @nr: Bit to clear
- * @addr: Address to start counting from
- *
- * change_bit() is atomic and may not be reordered.
- * Note that @nr may be almost arbitrarily large; this function is not
- * restricted to acting on a single-word quantity.
- */
-static __inline__ void change_bit(int nr, volatile void * addr)
-{
-        __u32  mask;
-        volatile __u32  *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "r6", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "xor    %0, %2;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (tmp)
-                : "r" (a), "r" (mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-/**
- * test_and_set_bit - Set a bit and return its old value
- * @nr: Bit to set
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static __inline__ int test_and_set_bit(int nr, volatile void * addr)
-{
-        __u32 mask, oldbit;
-        volatile __u32 *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "%1", "%2")
-                M32R_LOCK" %0, @%2;             \n\t"
-                "mv     %1, %0;                 \n\t"
-                "and    %0, %3;                 \n\t"
-                "or     %1, %3;                 \n\t"
-                M32R_UNLOCK" %1, @%2;           \n\t"
-                : "=&r" (oldbit), "=&r" (tmp)
-                : "r" (a), "r" (mask)
-                : "memory"
-        );
-        local_irq_restore(flags);
-
-        return (oldbit != 0);
-}
-
-/**
- * test_and_clear_bit - Clear a bit and return its old value
- * @nr: Bit to set
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
-{
-        __u32 mask, oldbit;
-        volatile __u32 *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "%1", "%3")
-                M32R_LOCK" %0, @%3;             \n\t"
-                "mv     %1, %0;                 \n\t"
-                "and    %0, %2;                 \n\t"
-                "not    %2, %2;                 \n\t"
-                "and    %1, %2;                 \n\t"
-                M32R_UNLOCK" %1, @%3;           \n\t"
-                : "=&r" (oldbit), "=&r" (tmp), "+r" (mask)
-                : "r" (a)
-                : "memory"
-        );
-        local_irq_restore(flags);
-
-        return (oldbit != 0);
-}
-
-/**
- * test_and_change_bit - Change a bit and return its old value
- * @nr: Bit to set
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static __inline__ int test_and_change_bit(int nr, volatile void * addr)
-{
-        __u32 mask, oldbit;
-        volatile __u32 *a = addr;
-        unsigned long flags;
-        unsigned long tmp;
-
-        a += (nr >> 5);
-        mask = (1 << (nr & 0x1F));
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                DCACHE_CLEAR("%0", "%1", "%2")
-                M32R_LOCK" %0, @%2;             \n\t"
-                "mv     %1, %0;                 \n\t"
-                "and    %0, %3;                 \n\t"
-                "xor    %1, %3;                 \n\t"
-                M32R_UNLOCK" %1, @%2;           \n\t"
-                : "=&r" (oldbit), "=&r" (tmp)
-                : "r" (a), "r" (mask)
-                : "memory"
-        );
-        local_irq_restore(flags);
-
-        return (oldbit != 0);
-}
-
-#include <asm-generic/bitops/non-atomic.h>
-#include <asm-generic/bitops/ffz.h>
-#include <asm-generic/bitops/__ffs.h>
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/fls64.h>
-
-#ifdef __KERNEL__
-
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-
-#endif /* __KERNEL__ */
-
-#ifdef __KERNEL__
-
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#include <asm-generic/bitops/ext2-atomic.h>
-#include <asm-generic/bitops/minix.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_M32R_BITOPS_H */
diff --git a/include/asm-m32r/bug.h b/include/asm-m32r/bug.h
deleted file mode 100644
index 4cc0462c15b8..000000000000
--- a/include/asm-m32r/bug.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _M32R_BUG_H
-#define _M32R_BUG_H
-#include <asm-generic/bug.h>
-#endif
diff --git a/include/asm-m32r/bugs.h b/include/asm-m32r/bugs.h
deleted file mode 100644
index f77214eff136..000000000000
--- a/include/asm-m32r/bugs.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_M32R_BUGS_H
-#define _ASM_M32R_BUGS_H
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *     void check_bugs(void);
- */
-#include <asm/processor.h>
-
-static void __init check_bugs(void)
-{
-        extern unsigned long loops_per_jiffy;
-
-        current_cpu_data.loops_per_jiffy = loops_per_jiffy;
-}
-
-#endif  /* _ASM_M32R_BUGS_H */
diff --git a/include/asm-m32r/byteorder.h b/include/asm-m32r/byteorder.h
deleted file mode 100644
index 21855d8b028b..000000000000
--- a/include/asm-m32r/byteorder.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_BYTEORDER_H
-#define _ASM_M32R_BYTEORDER_H
-
-#if defined(__LITTLE_ENDIAN__)
-#  include <linux/byteorder/little_endian.h>
-#else
-#  include <linux/byteorder/big_endian.h>
-#endif
-
-#endif /* _ASM_M32R_BYTEORDER_H */
diff --git a/include/asm-m32r/cache.h b/include/asm-m32r/cache.h
deleted file mode 100644
index 40b3ee98193d..000000000000
--- a/include/asm-m32r/cache.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_M32R_CACHE_H
-#define _ASM_M32R_CACHE_H
-
-/* L1 cache line size */
-#define L1_CACHE_SHIFT          4
-#define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)
-
-#endif  /* _ASM_M32R_CACHE_H */
diff --git a/include/asm-m32r/cachectl.h b/include/asm-m32r/cachectl.h
deleted file mode 100644
index 2aab8f6fff41..000000000000
--- a/include/asm-m32r/cachectl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * cachectl.h -- defines for M32R cache control system calls
- *
- * Copyright (C) 2003 by Kazuhiro Inaoka
- */
-#ifndef __ASM_M32R_CACHECTL
-#define __ASM_M32R_CACHECTL
-
-/*
- * Options for cacheflush system call
- *
- * cacheflush() is currently fluch_cache_all().
- */
-#define ICACHE  (1<<0)          /* flush instruction cache        */
-#define DCACHE  (1<<1)          /* writeback and flush data cache */
-#define BCACHE  (ICACHE|DCACHE) /* flush both caches              */
-
-/*
- * Caching modes for the cachectl(2) call
- *
- * cachectl(2) is currently not supported and returns ENOSYS.
- */
-#define CACHEABLE       0       /* make pages cacheable */
-#define UNCACHEABLE     1       /* make pages uncacheable */
-
-#endif  /* __ASM_M32R_CACHECTL */
diff --git a/include/asm-m32r/cacheflush.h b/include/asm-m32r/cacheflush.h
deleted file mode 100644
index 78587c958146..000000000000
--- a/include/asm-m32r/cacheflush.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef _ASM_M32R_CACHEFLUSH_H
-#define _ASM_M32R_CACHEFLUSH_H
-
-#include <linux/mm.h>
-
-extern void _flush_cache_all(void);
-extern void _flush_cache_copyback_all(void);
-
-#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
-#define flush_cache_all()                       do { } while (0)
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_dup_mm(mm)                  do { } while (0)
-#define flush_cache_range(vma, start, end)      do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
-#define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#ifndef CONFIG_SMP
-#define flush_icache_range(start, end)          _flush_cache_copyback_all()
-#define flush_icache_page(vma,pg)               _flush_cache_copyback_all()
-#define flush_icache_user_range(vma,pg,adr,len) _flush_cache_copyback_all()
-#define flush_cache_sigtramp(addr)              _flush_cache_copyback_all()
-#else   /* CONFIG_SMP */
-extern void smp_flush_cache_all(void);
-#define flush_icache_range(start, end)          smp_flush_cache_all()
-#define flush_icache_page(vma,pg)               smp_flush_cache_all()
-#define flush_icache_user_range(vma,pg,adr,len) smp_flush_cache_all()
-#define flush_cache_sigtramp(addr)              _flush_cache_copyback_all()
-#endif  /* CONFIG_SMP */
-#elif defined(CONFIG_CHIP_M32102)
-#define flush_cache_all()                       do { } while (0)
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_dup_mm(mm)                  do { } while (0)
-#define flush_cache_range(vma, start, end)      do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
-#define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#define flush_icache_range(start, end)          _flush_cache_all()
-#define flush_icache_page(vma,pg)               _flush_cache_all()
-#define flush_icache_user_range(vma,pg,adr,len) _flush_cache_all()
-#define flush_cache_sigtramp(addr)              _flush_cache_all()
-#else
-#define flush_cache_all()                       do { } while (0)
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_dup_mm(mm)                  do { } while (0)
-#define flush_cache_range(vma, start, end)      do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
-#define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#define flush_icache_range(start, end)          do { } while (0)
-#define flush_icache_page(vma,pg)               do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
-#define flush_cache_sigtramp(addr)              do { } while (0)
-#endif  /* CONFIG_CHIP_* */
-
-#define flush_cache_vmap(start, end)    do { } while (0)
-#define flush_cache_vunmap(start, end)  do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len)      \
-do {                                                            \
-        memcpy(dst, src, len);                                  \
-        flush_icache_user_range(vma, page, vaddr, len);         \
-} while (0)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len)    \
-        memcpy(dst, src, len)
-
-#endif /* _ASM_M32R_CACHEFLUSH_H */
diff --git a/include/asm-m32r/checksum.h b/include/asm-m32r/checksum.h
deleted file mode 100644
index a7a7c4f44abe..000000000000
--- a/include/asm-m32r/checksum.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_M32R_CHECKSUM_H
-#define _ASM_M32R_CHECKSUM_H
-
-/*
- * include/asm-m32r/checksum.h
- *
- * IP/TCP/UDP checksum routines
- *
- * 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.
- *
- * Some code taken from mips and parisc architecture.
- *
- *    Copyright (C) 2001, 2002  Hiroyuki Kondo, Hirokazu Takata
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <linux/in6.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * The same as csum_partial, but copies from src while it checksums.
- *
- * Here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                              int len, __wsum sum);
-
-/*
- * This is a new version of the above that records errors it finds in *errp,
- * but continues and zeros thre rest of the buffer.
- */
-extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
-                                                int len, __wsum sum,
-                                                int *err_ptr);
-
-/*
- *      Fold a partial checksum
- */
-
-static inline __sum16 csum_fold(__wsum sum)
-{
-        unsigned long tmpreg;
-        __asm__(
-                "       sll3    %1, %0, #16 \n"
-                "       cmp     %0, %0 \n"
-                "       addx    %0, %1 \n"
-                "       ldi     %1, #0 \n"
-                "       srli    %0, #16 \n"
-                "       addx    %0, %1 \n"
-                "       xor3    %0, %0, #0x0000ffff \n"
-                : "=r" (sum), "=&r" (tmpreg)
-                : "0"  (sum)
-                : "cbit"
-        );
-        return (__force __sum16)sum;
-}
-
-/*
- * This is a version of ip_compute_csum() optimized for IP headers,
- * which always checksum on 4 octet boundaries.
- */
-static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-        unsigned long tmpreg0, tmpreg1;
-        __wsum sum;
-
-        __asm__ __volatile__(
-                "       ld      %0, @%1+ \n"
-                "       addi    %2, #-4 \n"
-                "#      bgez    %2, 2f \n"
-                "       cmp     %0, %0 \n"
-                "       ld      %3, @%1+ \n"
-                "       ld      %4, @%1+ \n"
-                "       addx    %0, %3 \n"
-                "       ld      %3, @%1+ \n"
-                "       addx    %0, %4 \n"
-                "       addx    %0, %3 \n"
-                "       .fillinsn\n"
-                "1: \n"
-                "       ld      %4, @%1+ \n"
-                "       addi    %2, #-1 \n"
-                "       addx    %0, %4 \n"
-                "       bgtz    %2, 1b \n"
-                "\n"
-                "       ldi     %3, #0 \n"
-                "       addx    %0, %3 \n"
-                "       .fillinsn\n"
-                "2: \n"
-        /* Since the input registers which are loaded with iph and ihl
-           are modified, we must also specify them as outputs, or gcc
-           will assume they contain their original values. */
-        : "=&r" (sum), "=r" (iph), "=r" (ihl), "=&r" (tmpreg0), "=&r" (tmpreg1)
-        : "1" (iph), "2" (ihl)
-        : "cbit", "memory");
-
-        return csum_fold(sum);
-}
-
-static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned short len,
-                                               unsigned short proto,
-                                               __wsum sum)
-{
-#if defined(__LITTLE_ENDIAN)
-        unsigned long len_proto = (proto + len) << 8;
-#else
-        unsigned long len_proto = proto + len;
-#endif
-        unsigned long tmpreg;
-
-        __asm__(
-                "       cmp     %0, %0 \n"
-                "       addx    %0, %2 \n"
-                "       addx    %0, %3 \n"
-                "       addx    %0, %4 \n"
-                "       ldi     %1, #0 \n"
-                "       addx    %0, %1 \n"
-                : "=r" (sum), "=&r" (tmpreg)
-                : "r" (daddr), "r" (saddr), "r" (len_proto), "0" (sum)
-                : "cbit"
-        );
-
-        return sum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
-                                                   unsigned short proto,
-                                                   __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-
-static inline __sum16 ip_compute_csum(const void *buff, int len)
-{
-        return csum_fold (csum_partial(buff, len, 0));
-}
-
-#define _HAVE_ARCH_IPV6_CSUM
-static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
-                                      const struct in6_addr *daddr,
-                                      __u32 len, unsigned short proto,
-                                      __wsum sum)
-{
-        unsigned long tmpreg0, tmpreg1, tmpreg2, tmpreg3;
-        __asm__(
-                "       ld      %1, @(%5) \n"
-                "       ld      %2, @(4,%5) \n"
-                "       ld      %3, @(8,%5) \n"
-                "       ld      %4, @(12,%5) \n"
-                "       add     %0, %1 \n"
-                "       addx    %0, %2 \n"
-                "       addx    %0, %3 \n"
-                "       addx    %0, %4 \n"
-                "       ld      %1, @(%6) \n"
-                "       ld      %2, @(4,%6) \n"
-                "       ld      %3, @(8,%6) \n"
-                "       ld      %4, @(12,%6) \n"
-                "       addx    %0, %1 \n"
-                "       addx    %0, %2 \n"
-                "       addx    %0, %3 \n"
-                "       addx    %0, %4 \n"
-                "       addx    %0, %7 \n"
-                "       addx    %0, %8 \n"
-                "       ldi     %1, #0 \n"
-                "       addx    %0, %1 \n"
-                : "=&r" (sum), "=&r" (tmpreg0), "=&r" (tmpreg1),
-                  "=&r" (tmpreg2), "=&r" (tmpreg3)
-                : "r" (saddr), "r" (daddr),
-                  "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
-                : "cbit"
-        );
-
-        return csum_fold(sum);
-}
-
-#endif /* _ASM_M32R_CHECKSUM_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-m32r/cputime.h b/include/asm-m32r/cputime.h
deleted file mode 100644
index 0a47550df2b7..000000000000
--- a/include/asm-m32r/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M32R_CPUTIME_H
-#define __M32R_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __M32R_CPUTIME_H */
diff --git a/include/asm-m32r/current.h b/include/asm-m32r/current.h
deleted file mode 100644
index 7859d864f2c2..000000000000
--- a/include/asm-m32r/current.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASM_M32R_CURRENT_H
-#define _ASM_M32R_CURRENT_H
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static __inline__ struct task_struct *get_current(void)
-{
-        return current_thread_info()->task;
-}
-
-#define current (get_current())
-
-#endif  /* _ASM_M32R_CURRENT_H */
diff --git a/include/asm-m32r/delay.h b/include/asm-m32r/delay.h
deleted file mode 100644
index 9dd9e999ea69..000000000000
--- a/include/asm-m32r/delay.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _ASM_M32R_DELAY_H
-#define _ASM_M32R_DELAY_H
-
-/*
- * Copyright (C) 1993 Linus Torvalds
- *
- * Delay routines calling functions in arch/m32r/lib/delay.c
- */
-
-extern void __bad_udelay(void);
-extern void __bad_ndelay(void);
-
-extern void __udelay(unsigned long usecs);
-extern void __ndelay(unsigned long nsecs);
-extern void __const_udelay(unsigned long xloops);
-extern void __delay(unsigned long loops);
-
-#define udelay(n) (__builtin_constant_p(n) ? \
-        ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \
-        __udelay(n))
-
-#define ndelay(n) (__builtin_constant_p(n) ? \
-        ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
-        __ndelay(n))
-
-#endif /* _ASM_M32R_DELAY_H */
diff --git a/include/asm-m32r/device.h b/include/asm-m32r/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-m32r/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/include/asm-m32r/div64.h b/include/asm-m32r/div64.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/include/asm-m32r/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/include/asm-m32r/dma.h b/include/asm-m32r/dma.h
deleted file mode 100644
index 52f6a22dd232..000000000000
--- a/include/asm-m32r/dma.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_M32R_DMA_H
-#define _ASM_M32R_DMA_H
-
-#include <asm/io.h>
-
-/*
- * The maximum address that we can perform a DMA transfer
- * to on this platform
- */
-#define MAX_DMA_ADDRESS      (PAGE_OFFSET+0x20000000)
-
-#endif /* _ASM_M32R_DMA_H */
diff --git a/include/asm-m32r/elf.h b/include/asm-m32r/elf.h
deleted file mode 100644
index 0cc34c94bf2b..000000000000
--- a/include/asm-m32r/elf.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _ASM_M32R__ELF_H
-#define _ASM_M32R__ELF_H
-
-/*
- * ELF-specific definitions.
- *
- * Copyright (C) 1999-2004, Renesas Technology Corp.
- *      Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-#include <asm/page.h>
-
-/* M32R relocation types  */
-#define R_M32R_NONE             0
-#define R_M32R_16               1
-#define R_M32R_32               2
-#define R_M32R_24               3
-#define R_M32R_10_PCREL         4
-#define R_M32R_18_PCREL         5
-#define R_M32R_26_PCREL         6
-#define R_M32R_HI16_ULO         7
-#define R_M32R_HI16_SLO         8
-#define R_M32R_LO16             9
-#define R_M32R_SDA16            10
-#define R_M32R_GNU_VTINHERIT    11
-#define R_M32R_GNU_VTENTRY      12
-
-#define R_M32R_16_RELA          33
-#define R_M32R_32_RELA          34
-#define R_M32R_24_RELA          35
-#define R_M32R_10_PCREL_RELA    36
-#define R_M32R_18_PCREL_RELA    37
-#define R_M32R_26_PCREL_RELA    38
-#define R_M32R_HI16_ULO_RELA    39
-#define R_M32R_HI16_SLO_RELA    40
-#define R_M32R_LO16_RELA        41
-#define R_M32R_SDA16_RELA       42
-#define R_M32R_RELA_GNU_VTINHERIT       43
-#define R_M32R_RELA_GNU_VTENTRY 44
-
-#define R_M32R_GOT24            48
-#define R_M32R_26_PLTREL        49
-#define R_M32R_COPY             50
-#define R_M32R_GLOB_DAT         51
-#define R_M32R_JMP_SLOT         52
-#define R_M32R_RELATIVE         53
-#define R_M32R_GOTOFF           54
-#define R_M32R_GOTPC24          55
-#define R_M32R_GOT16_HI_ULO     56
-#define R_M32R_GOT16_HI_SLO     57
-#define R_M32R_GOT16_LO         58
-#define R_M32R_GOTPC_HI_ULO     59
-#define R_M32R_GOTPC_HI_SLO     60
-#define R_M32R_GOTPC_LO         61
-#define R_M32R_GOTOFF_HI_ULO    62
-#define R_M32R_GOTOFF_HI_SLO    63
-#define R_M32R_GOTOFF_LO        64
-
-#define R_M32R_NUM              256
-
-/*
- * ELF register definitions..
- */
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-
-typedef unsigned long elf_greg_t;
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-/* We have no FP mumumu.  */
-typedef double elf_fpreg_t;
-typedef elf_fpreg_t elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) \
-        (((x)->e_machine == EM_M32R) || ((x)->e_machine == EM_CYGNUS_M32R))
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#if defined(__LITTLE_ENDIAN)
-#define ELF_DATA        ELFDATA2LSB
-#elif defined(__BIG_ENDIAN)
-#define ELF_DATA        ELFDATA2MSB
-#else
-#error no endian defined
-#endif
-#define ELF_ARCH        EM_M32R
-
-/* r0 is set by ld.so to a pointer to a function which might be
- * registered using 'atexit'.  This provides a mean for the dynamic
- * linker to call DT_FINI functions for shared libraries that have
- * been loaded before the code runs.
- *
- * So that we can use the same startup file with static executables,
- * we start programs with a value of 0 to indicate that there is no
- * such function.
- */
-#define ELF_PLAT_INIT(_r, load_addr)    (_r)->r0 = 0
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       PAGE_SIZE
-
-/*
- * This is the location that an ET_DYN program is loaded if exec'ed.
- * Typical use of this is to invoke "./ld.so someprog" to test out a
- * new version of the loader.  We need to make sure that it is out of
- * the way of the program that it will "exec", and that there is
- * sufficient room for the brk.
- */
-#define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
-
-/* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
-   now struct_user_regs, they are different) */
-
-#define ELF_CORE_COPY_REGS(pr_reg, regs)  \
-        memcpy((char *)pr_reg, (char *)regs, sizeof (struct pt_regs));
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this CPU supports.  */
-#define ELF_HWCAP       (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.  */
-#define ELF_PLATFORM    (NULL)
-
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-
-#endif  /* _ASM_M32R__ELF_H */
diff --git a/include/asm-m32r/emergency-restart.h b/include/asm-m32r/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-m32r/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-m32r/errno.h b/include/asm-m32r/errno.h
deleted file mode 100644
index 777149262aad..000000000000
--- a/include/asm-m32r/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_ERRNO_H
-#define _ASM_M32R_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_M32R_ERRNO_H */
diff --git a/include/asm-m32r/fb.h b/include/asm-m32r/fb.h
deleted file mode 100644
index d92e99cd8c8a..000000000000
--- a/include/asm-m32r/fb.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-
-#include <linux/fb.h>
-#include <linux/fs.h>
-#include <asm/page.h>
-
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-}
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-m32r/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-m32r/flat.h b/include/asm-m32r/flat.h
deleted file mode 100644
index d851cf0c4aa5..000000000000
--- a/include/asm-m32r/flat.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * include/asm-m32r/flat.h
- *
- * uClinux flat-format executables
- *
- * Copyright (C) 2004  Kazuhiro Inaoka
- *
- * 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.
- */
-#ifndef __ASM_M32R_FLAT_H
-#define __ASM_M32R_FLAT_H
-
-#define flat_stack_align(sp)            (*sp += (*sp & 3 ? (4 - (*sp & 3)): 0))
-#define flat_argvp_envp_on_stack()              0
-#define flat_old_ram_flag(flags)                (flags)
-#define flat_set_persistent(relval, p)          0
-#define flat_reloc_valid(reloc, size)           \
-        (((reloc) - textlen_for_m32r_lo16_data) <= (size))
-#define flat_get_addr_from_rp(rp, relval, flags, persistent) \
-        m32r_flat_get_addr_from_rp(rp, relval, (text_len) )
-
-#define flat_put_addr_at_rp(rp, addr, relval) \
-        m32r_flat_put_addr_at_rp(rp, addr, relval)
-
-/* Convert a relocation entry into an address.  */
-static inline unsigned long
-flat_get_relocate_addr (unsigned long relval)
-{
-        return relval & 0x00ffffff; /* Mask out top 8-bits */
-}
-
-#define flat_m32r_get_reloc_type(relval)        ((relval) >> 24)
-
-#define M32R_SETH_OPCODE        0xd0c00000 /* SETH instruction code */
-
-#define FLAT_M32R_32            0x00    /* 32bits reloc */
-#define FLAT_M32R_24            0x01    /* unsigned 24bits reloc */
-#define FLAT_M32R_16            0x02    /* 16bits reloc */
-#define FLAT_M32R_LO16          0x03    /* signed low 16bits reloc (low()) */
-#define FLAT_M32R_LO16_DATA     0x04    /* signed low 16bits reloc (low())
-                                           for a symbol in .data section */
-                                        /* High 16bits of an address used
-                                           when the lower 16bbits are treated
-                                           as unsigned.
-                                           To create SETH instruction only.
-                                           0x1X: X means a number of register.
-                                           0x10 - 0x3F are reserved. */
-#define FLAT_M32R_HI16_ULO      0x10    /* reloc for SETH Rn,#high(imm16) */
-                                        /* High 16bits of an address used
-                                           when the lower 16bbits are treated
-                                           as signed.
-                                           To create SETH instruction only.
-                                           0x2X: X means a number of register.
-                                           0x20 - 0x4F are reserved. */
-#define FLAT_M32R_HI16_SLO      0x20    /* reloc for SETH Rn,#shigh(imm16) */
-
-static unsigned long textlen_for_m32r_lo16_data = 0;
-
-static inline unsigned long m32r_flat_get_addr_from_rp (unsigned long *rp,
-                                                        unsigned long relval,
-                                                        unsigned long textlen)
-{
-        unsigned int reloc = flat_m32r_get_reloc_type (relval);
-        textlen_for_m32r_lo16_data = 0;
-        if (reloc & 0xf0) {
-                unsigned long addr = htonl(*rp);
-                switch (reloc & 0xf0)
-                {
-                case FLAT_M32R_HI16_ULO:
-                case FLAT_M32R_HI16_SLO:
-                        if (addr == 0) {
-                                /* put "seth Rn,#0x0" instead of 0 (addr). */
-                                *rp = (M32R_SETH_OPCODE | ((reloc & 0x0f)<<24));
-                        }
-                        return addr;
-                default:
-                        break;
-                }
-        } else {
-                switch (reloc)
-                {
-                case FLAT_M32R_LO16:
-                        return htonl(*rp) & 0xFFFF;
-                case FLAT_M32R_LO16_DATA:
-                        /* FIXME: The return value will decrease by textlen
-                           at m32r_flat_put_addr_at_rp () */
-                        textlen_for_m32r_lo16_data = textlen;
-                        return (htonl(*rp) & 0xFFFF) + textlen;
-                case FLAT_M32R_16:
-                        return htons(*(unsigned short *)rp) & 0xFFFF;
-                case FLAT_M32R_24:
-                        return htonl(*rp) & 0xFFFFFF;
-                case FLAT_M32R_32:
-                        return htonl(*rp);
-                default:
-                        break;
-                }
-        }
-        return ~0;      /* bogus value */
-}
-
-static inline void m32r_flat_put_addr_at_rp (unsigned long *rp,
-                                             unsigned long addr,
-                                             unsigned long relval)
-{
-        unsigned int reloc = flat_m32r_get_reloc_type (relval);
-        if (reloc & 0xf0) {
-                unsigned long Rn = reloc & 0x0f; /* get a number of register */
-                Rn <<= 24; /* 0x0R000000 */
-                reloc &= 0xf0;
-                switch (reloc)
-                {
-                case FLAT_M32R_HI16_ULO: /* To create SETH Rn,#high(imm16) */
-                        *rp = (M32R_SETH_OPCODE | Rn
-                               | ((addr >> 16) & 0xFFFF));
-                        break;
-                case FLAT_M32R_HI16_SLO: /* To create SETH Rn,#shigh(imm16) */
-                        *rp = (M32R_SETH_OPCODE | Rn
-                               | (((addr >> 16) + ((addr & 0x8000) ? 1 : 0))
-                                  & 0xFFFF));
-                        break;
-                }
-        } else {
-                switch (reloc) {
-                case FLAT_M32R_LO16_DATA:
-                        addr -= textlen_for_m32r_lo16_data;
-                        textlen_for_m32r_lo16_data = 0;
-                case FLAT_M32R_LO16:
-                        *rp = (htonl(*rp) & 0xFFFF0000) | (addr & 0xFFFF);
-                        break;
-                case FLAT_M32R_16:
-                        *(unsigned short *)rp = addr & 0xFFFF;
-                        break;
-                case FLAT_M32R_24:
-                        *rp = (htonl(*rp) & 0xFF000000) | (addr & 0xFFFFFF);
-                        break;
-                case FLAT_M32R_32:
-                        *rp = addr;
-                        break;
-                }
-        }
-}
-
-#endif /* __ASM_M32R_FLAT_H */
diff --git a/include/asm-m32r/futex.h b/include/asm-m32r/futex.h
deleted file mode 100644
index 6a332a9f099c..000000000000
--- a/include/asm-m32r/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/include/asm-m32r/hardirq.h b/include/asm-m32r/hardirq.h
deleted file mode 100644
index cb8aa762f235..000000000000
--- a/include/asm-m32r/hardirq.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifdef __KERNEL__
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
-        unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-
-#if NR_IRQS > 256
-#define HARDIRQ_BITS    9
-#else
-#define HARDIRQ_BITS    8
-#endif
-
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
-static inline void ack_bad_irq(int irq)
-{
-        printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
-        BUG();
-}
-
-#endif /* __ASM_HARDIRQ_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-m32r/hw_irq.h b/include/asm-m32r/hw_irq.h
deleted file mode 100644
index 7138537cda03..000000000000
--- a/include/asm-m32r/hw_irq.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_M32R_HW_IRQ_H
-#define _ASM_M32R_HW_IRQ_H
-
-#endif /* _ASM_M32R_HW_IRQ_H */
diff --git a/include/asm-m32r/io.h b/include/asm-m32r/io.h
deleted file mode 100644
index d06933bd6318..000000000000
--- a/include/asm-m32r/io.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef _ASM_M32R_IO_H
-#define _ASM_M32R_IO_H
-
-#include <linux/string.h>
-#include <linux/compiler.h>
-#include <asm/page.h>  /* __va */
-
-#ifdef __KERNEL__
-
-#define IO_SPACE_LIMIT  0xFFFFFFFF
-
-/**
- *      virt_to_phys    -       map virtual addresses to physical
- *      @address: address to remap
- *
- *      The returned physical address is the physical (CPU) mapping for
- *      the memory address given. It is only valid to use this function on
- *      addresses directly mapped or allocated via kmalloc.
- *
- *      This function does not give bus mappings for DMA transfers. In
- *      almost all conceivable cases a device driver should not be using
- *      this function
- */
-
-static inline unsigned long virt_to_phys(volatile void * address)
-{
-        return __pa(address);
-}
-
-/**
- *      phys_to_virt    -       map physical address to virtual
- *      @address: address to remap
- *
- *      The returned virtual address is a current CPU mapping for
- *      the memory address given. It is only valid to use this function on
- *      addresses that have a kernel mapping
- *
- *      This function does not handle bus mappings for DMA transfers. In
- *      almost all conceivable cases a device driver should not be using
- *      this function
- */
-
-static inline void *phys_to_virt(unsigned long address)
-{
-        return __va(address);
-}
-
-extern void __iomem *
-__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
-
-/**
- *      ioremap         -       map bus memory into CPU space
- *      @offset:        bus address of the memory
- *      @size:          size of the resource to map
- *
- *      ioremap performs a platform specific sequence of operations to
- *      make bus memory CPU accessible via the readb/readw/readl/writeb/
- *      writew/writel functions and the other mmio helpers. The returned
- *      address is not guaranteed to be usable directly as a virtual
- *      address.
- */
-
-static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
-{
-        return __ioremap(offset, size, 0);
-}
-
-extern void iounmap(volatile void __iomem *addr);
-#define ioremap_nocache(off,size) ioremap(off,size)
-
-/*
- * IO bus memory addresses are also 1:1 with the physical address
- */
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-#define page_to_bus     page_to_phys
-#define virt_to_bus     virt_to_phys
-
-extern unsigned char _inb(unsigned long);
-extern unsigned short _inw(unsigned long);
-extern unsigned long _inl(unsigned long);
-extern unsigned char _inb_p(unsigned long);
-extern unsigned short _inw_p(unsigned long);
-extern unsigned long _inl_p(unsigned long);
-extern void _outb(unsigned char, unsigned long);
-extern void _outw(unsigned short, unsigned long);
-extern void _outl(unsigned long, unsigned long);
-extern void _outb_p(unsigned char, unsigned long);
-extern void _outw_p(unsigned short, unsigned long);
-extern void _outl_p(unsigned long, unsigned long);
-extern void _insb(unsigned int, void *, unsigned long);
-extern void _insw(unsigned int, void *, unsigned long);
-extern void _insl(unsigned int, void *, unsigned long);
-extern void _outsb(unsigned int, const void *, unsigned long);
-extern void _outsw(unsigned int, const void *, unsigned long);
-extern void _outsl(unsigned int, const void *, unsigned long);
-
-static inline unsigned char _readb(unsigned long addr)
-{
-        return *(volatile unsigned char __force *)addr;
-}
-
-static inline unsigned short _readw(unsigned long addr)
-{
-        return *(volatile unsigned short __force *)addr;
-}
-
-static inline unsigned long _readl(unsigned long addr)
-{
-        return *(volatile unsigned long __force *)addr;
-}
-
-static inline void _writeb(unsigned char b, unsigned long addr)
-{
-        *(volatile unsigned char __force *)addr = b;
-}
-
-static inline void _writew(unsigned short w, unsigned long addr)
-{
-        *(volatile unsigned short __force *)addr = w;
-}
-
-static inline void _writel(unsigned long l, unsigned long addr)
-{
-        *(volatile unsigned long __force *)addr = l;
-}
-
-#define inb     _inb
-#define inw     _inw
-#define inl     _inl
-#define outb    _outb
-#define outw    _outw
-#define outl    _outl
-
-#define inb_p   _inb_p
-#define inw_p   _inw_p
-#define inl_p   _inl_p
-#define outb_p  _outb_p
-#define outw_p  _outw_p
-#define outl_p  _outl_p
-
-#define insb    _insb
-#define insw    _insw
-#define insl    _insl
-#define outsb   _outsb
-#define outsw   _outsw
-#define outsl   _outsl
-
-#define readb(addr)   _readb((unsigned long)(addr))
-#define readw(addr)   _readw((unsigned long)(addr))
-#define readl(addr)   _readl((unsigned long)(addr))
-#define __raw_readb readb
-#define __raw_readw readw
-#define __raw_readl readl
-#define readb_relaxed readb
-#define readw_relaxed readw
-#define readl_relaxed readl
-
-#define writeb(val, addr)  _writeb((val), (unsigned long)(addr))
-#define writew(val, addr)  _writew((val), (unsigned long)(addr))
-#define writel(val, addr)  _writel((val), (unsigned long)(addr))
-#define __raw_writeb writeb
-#define __raw_writew writew
-#define __raw_writel writel
-
-#define mmiowb()
-
-#define flush_write_buffers() do { } while (0)  /* M32R_FIXME */
-
-static inline void
-memset_io(volatile void __iomem *addr, unsigned char val, int count)
-{
-        memset((void __force *) addr, val, count);
-}
-
-static inline void
-memcpy_fromio(void *dst, volatile void __iomem *src, int count)
-{
-        memcpy(dst, (void __force *) src, count);
-}
-
-static inline void
-memcpy_toio(volatile void __iomem *dst, const void *src, int count)
-{
-        memcpy((void __force *) dst, src, count);
-}
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-#endif  /* __KERNEL__ */
-
-#endif  /* _ASM_M32R_IO_H */
diff --git a/include/asm-m32r/ioctl.h b/include/asm-m32r/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-m32r/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-m32r/ioctls.h b/include/asm-m32r/ioctls.h
deleted file mode 100644
index b9f54bb5d7cf..000000000000
--- a/include/asm-m32r/ioctls.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef __ARCH_M32R_IOCTLS_H__
-#define __ARCH_M32R_IOCTLS_H__
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T',0x2A, struct termios2)
-#define TCSETS2         _IOW('T',0x2B, struct termios2)
-#define TCSETSW2        _IOW('T',0x2C, struct termios2)
-#define TCSETSF2        _IOW('T',0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX        0x5450
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
-#define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
-#define FIOQSIZE        0x5460
-
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#endif /* __ARCH_M32R_IOCTLS_H__ */
diff --git a/include/asm-m32r/ipcbuf.h b/include/asm-m32r/ipcbuf.h
deleted file mode 100644
index 8d2d7c8ffdb0..000000000000
--- a/include/asm-m32r/ipcbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASM_M32R_IPCBUF_H
-#define _ASM_M32R_IPCBUF_H
-
-/*
- * The ipc64_perm structure for m32r architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* _ASM_M32R_IPCBUF_H */
diff --git a/include/asm-m32r/irq.h b/include/asm-m32r/irq.h
deleted file mode 100644
index 242028b4d86a..000000000000
--- a/include/asm-m32r/irq.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_M32R_IRQ_H
-#define _ASM_M32R_IRQ_H
-
-
-#if defined(CONFIG_PLAT_USRV)
-/*
- * IRQ definitions for M32700UT
- *  M32700 Chip: 64 interrupts
- *  ICU of M32700UT-on-board PLD: 32 interrupts cascaded to INT1# chip pin
- */
-#define M32700UT_NUM_CPU_IRQ    (64)
-#define M32700UT_NUM_PLD_IRQ    (32)
-#define M32700UT_IRQ_BASE       0
-#define M32700UT_CPU_IRQ_BASE   M32700UT_IRQ_BASE
-#define M32700UT_PLD_IRQ_BASE   (M32700UT_CPU_IRQ_BASE + M32700UT_NUM_CPU_IRQ)
-
-#define NR_IRQS (M32700UT_NUM_CPU_IRQ + M32700UT_NUM_PLD_IRQ)
-#elif defined(CONFIG_PLAT_M32700UT)
-/*
- * IRQ definitions for M32700UT(Rev.C) + M32R-LAN
- *  M32700 Chip: 64 interrupts
- *  ICU of M32700UT-on-board PLD: 32 interrupts cascaded to INT1# chip pin
- *  ICU of M32R-LCD-on-board PLD: 32 interrupts cascaded to INT2# chip pin
- *  ICU of M32R-LAN-on-board PLD: 32 interrupts cascaded to INT0# chip pin
- */
-#define M32700UT_NUM_CPU_IRQ            (64)
-#define M32700UT_NUM_PLD_IRQ            (32)
-#define M32700UT_NUM_LCD_PLD_IRQ        (32)
-#define M32700UT_NUM_LAN_PLD_IRQ        (32)
-#define M32700UT_IRQ_BASE               0
-#define M32700UT_CPU_IRQ_BASE           (M32700UT_IRQ_BASE)
-#define M32700UT_PLD_IRQ_BASE \
-        (M32700UT_CPU_IRQ_BASE + M32700UT_NUM_CPU_IRQ)
-#define M32700UT_LCD_PLD_IRQ_BASE \
-        (M32700UT_PLD_IRQ_BASE + M32700UT_NUM_PLD_IRQ)
-#define M32700UT_LAN_PLD_IRQ_BASE \
-        (M32700UT_LCD_PLD_IRQ_BASE + M32700UT_NUM_LCD_PLD_IRQ)
-
-#define NR_IRQS \
-        (M32700UT_NUM_CPU_IRQ + M32700UT_NUM_PLD_IRQ \
-        + M32700UT_NUM_LCD_PLD_IRQ + M32700UT_NUM_LAN_PLD_IRQ)
-#elif defined(CONFIG_PLAT_OPSPUT)
-/*
- * IRQ definitions for OPSPUT + M32R-LAN
- *  OPSP Chip: 64 interrupts
- *  ICU of OPSPUT-on-board PLD: 32 interrupts cascaded to INT1# chip pin
- *  ICU of M32R-LCD-on-board PLD: 32 interrupts cascaded to INT2# chip pin
- *  ICU of M32R-LAN-on-board PLD: 32 interrupts cascaded to INT0# chip pin
- */
-#define OPSPUT_NUM_CPU_IRQ              (64)
-#define OPSPUT_NUM_PLD_IRQ              (32)
-#define OPSPUT_NUM_LCD_PLD_IRQ  (32)
-#define OPSPUT_NUM_LAN_PLD_IRQ  (32)
-#define OPSPUT_IRQ_BASE         0
-#define OPSPUT_CPU_IRQ_BASE             (OPSPUT_IRQ_BASE)
-#define OPSPUT_PLD_IRQ_BASE \
-        (OPSPUT_CPU_IRQ_BASE + OPSPUT_NUM_CPU_IRQ)
-#define OPSPUT_LCD_PLD_IRQ_BASE \
-        (OPSPUT_PLD_IRQ_BASE + OPSPUT_NUM_PLD_IRQ)
-#define OPSPUT_LAN_PLD_IRQ_BASE \
-        (OPSPUT_LCD_PLD_IRQ_BASE + OPSPUT_NUM_LCD_PLD_IRQ)
-
-#define NR_IRQS \
-        (OPSPUT_NUM_CPU_IRQ + OPSPUT_NUM_PLD_IRQ \
-        + OPSPUT_NUM_LCD_PLD_IRQ + OPSPUT_NUM_LAN_PLD_IRQ)
-
-#elif defined(CONFIG_PLAT_M32104UT)
-/*
- * IRQ definitions for M32104UT
- *  M32104 Chip: 64 interrupts
- *  ICU of M32104UT-on-board PLD: 32 interrupts cascaded to INT1# chip pin
- */
-#define M32104UT_NUM_CPU_IRQ    (64)
-#define M32104UT_NUM_PLD_IRQ    (32)
-#define M32104UT_IRQ_BASE       0
-#define M32104UT_CPU_IRQ_BASE   M32104UT_IRQ_BASE
-#define M32104UT_PLD_IRQ_BASE   (M32104UT_CPU_IRQ_BASE + M32104UT_NUM_CPU_IRQ)
-
-#define NR_IRQS \
-    (M32104UT_NUM_CPU_IRQ + M32104UT_NUM_PLD_IRQ)
-
-#else
-#define NR_IRQS 64
-#endif
-
-#define irq_canonicalize(irq)   (irq)
-
-#endif /* _ASM_M32R_IRQ_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-m32r/irq_regs.h b/include/asm-m32r/irq_regs.h
deleted file mode 100644
index 3dd9c0b70270..000000000000
--- a/include/asm-m32r/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/include/asm-m32r/kdebug.h b/include/asm-m32r/kdebug.h
deleted file mode 100644
index 6ece1b037665..000000000000
--- a/include/asm-m32r/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/include/asm-m32r/kmap_types.h b/include/asm-m32r/kmap_types.h
deleted file mode 100644
index fa94dc6410ea..000000000000
--- a/include/asm-m32r/kmap_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __M32R_KMAP_TYPES_H
-#define __M32R_KMAP_TYPES_H
-
-#ifdef CONFIG_DEBUG_HIGHMEM
-# define D(n) __KM_FENCE_##n ,
-#else
-# define D(n)
-#endif
-
-enum km_type {
-D(0)    KM_BOUNCE_READ,
-D(1)    KM_SKB_SUNRPC_DATA,
-D(2)    KM_SKB_DATA_SOFTIRQ,
-D(3)    KM_USER0,
-D(4)    KM_USER1,
-D(5)    KM_BIO_SRC_IRQ,
-D(6)    KM_BIO_DST_IRQ,
-D(7)    KM_PTE0,
-D(8)    KM_PTE1,
-D(9)    KM_IRQ0,
-D(10)   KM_IRQ1,
-D(11)   KM_SOFTIRQ0,
-D(12)   KM_SOFTIRQ1,
-D(13)   KM_TYPE_NR
-};
-
-#undef D
-
-#endif /* __M32R_KMAP_TYPES_H */
diff --git a/include/asm-m32r/linkage.h b/include/asm-m32r/linkage.h
deleted file mode 100644
index a9fb151cf648..000000000000
--- a/include/asm-m32r/linkage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-#define __ALIGN         .balign 4
-#define __ALIGN_STR     ".balign 4"
-
-#endif /* __ASM_LINKAGE_H */
diff --git a/include/asm-m32r/local.h b/include/asm-m32r/local.h
deleted file mode 100644
index 22256d138630..000000000000
--- a/include/asm-m32r/local.h
+++ /dev/null
@@ -1,366 +0,0 @@
-#ifndef __M32R_LOCAL_H
-#define __M32R_LOCAL_H
-
-/*
- *  linux/include/asm-m32r/local.h
- *
- *  M32R version:
- *    Copyright (C) 2001, 2002  Hitoshi Yamamoto
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- *    Copyright (C) 2007  Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- */
-
-#include <linux/percpu.h>
-#include <asm/assembler.h>
-#include <asm/system.h>
-#include <asm/local.h>
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- */
-
-/*
- * Make sure gcc doesn't try to be clever and move things around
- * on us. We need to use _exactly_ the address the user gave us,
- * not some alias that contains the same information.
- */
-typedef struct { volatile int counter; } local_t;
-
-#define LOCAL_INIT(i)   { (i) }
-
-/**
- * local_read - read local variable
- * @l: pointer of type local_t
- *
- * Atomically reads the value of @l.
- */
-#define local_read(l)   ((l)->counter)
-
-/**
- * local_set - set local variable
- * @l: pointer of type local_t
- * @i: required value
- *
- * Atomically sets the value of @l to @i.
- */
-#define local_set(l, i) (((l)->counter) = (i))
-
-/**
- * local_add_return - add long to local variable and return it
- * @i: long value to add
- * @l: pointer of type local_t
- *
- * Atomically adds @i to @l and return (@i + @l).
- */
-static inline long local_add_return(long i, local_t *l)
-{
-        unsigned long flags;
-        long result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_add_return             \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                "ld %0, @%1;                    \n\t"
-                "add    %0, %2;                 \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (result)
-                : "r" (&l->counter), "r" (i)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * local_sub_return - subtract long from local variable and return it
- * @i: long value to subtract
- * @l: pointer of type local_t
- *
- * Atomically subtracts @i from @l and return (@l - @i).
- */
-static inline long local_sub_return(long i, local_t *l)
-{
-        unsigned long flags;
-        long result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_sub_return             \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                "ld %0, @%1;                    \n\t"
-                "sub    %0, %2;                 \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (result)
-                : "r" (&l->counter), "r" (i)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * local_add - add long to local variable
- * @i: long value to add
- * @l: pointer of type local_t
- *
- * Atomically adds @i to @l.
- */
-#define local_add(i, l) ((void) local_add_return((i), (l)))
-
-/**
- * local_sub - subtract the local variable
- * @i: long value to subtract
- * @l: pointer of type local_t
- *
- * Atomically subtracts @i from @l.
- */
-#define local_sub(i, l) ((void) local_sub_return((i), (l)))
-
-/**
- * local_sub_and_test - subtract value from variable and test result
- * @i: integer value to subtract
- * @l: pointer of type local_t
- *
- * Atomically subtracts @i from @l and returns
- * true if the result is zero, or false for all
- * other cases.
- */
-#define local_sub_and_test(i, l) (local_sub_return((i), (l)) == 0)
-
-/**
- * local_inc_return - increment local variable and return it
- * @l: pointer of type local_t
- *
- * Atomically increments @l by 1 and returns the result.
- */
-static inline long local_inc_return(local_t *l)
-{
-        unsigned long flags;
-        long result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_inc_return             \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                "ld %0, @%1;                    \n\t"
-                "addi   %0, #1;                 \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (result)
-                : "r" (&l->counter)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * local_dec_return - decrement local variable and return it
- * @l: pointer of type local_t
- *
- * Atomically decrements @l by 1 and returns the result.
- */
-static inline long local_dec_return(local_t *l)
-{
-        unsigned long flags;
-        long result;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_dec_return             \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                "ld %0, @%1;                    \n\t"
-                "addi   %0, #-1;                \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (result)
-                : "r" (&l->counter)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-
-        return result;
-}
-
-/**
- * local_inc - increment local variable
- * @l: pointer of type local_t
- *
- * Atomically increments @l by 1.
- */
-#define local_inc(l) ((void)local_inc_return(l))
-
-/**
- * local_dec - decrement local variable
- * @l: pointer of type local_t
- *
- * Atomically decrements @l by 1.
- */
-#define local_dec(l) ((void)local_dec_return(l))
-
-/**
- * local_inc_and_test - increment and test
- * @l: pointer of type local_t
- *
- * Atomically increments @l by 1
- * and returns true if the result is zero, or false for all
- * other cases.
- */
-#define local_inc_and_test(l) (local_inc_return(l) == 0)
-
-/**
- * local_dec_and_test - decrement and test
- * @l: pointer of type local_t
- *
- * Atomically decrements @l by 1 and
- * returns true if the result is 0, or false for all
- * other cases.
- */
-#define local_dec_and_test(l) (local_dec_return(l) == 0)
-
-/**
- * local_add_negative - add and test if negative
- * @l: pointer of type local_t
- * @i: integer value to add
- *
- * Atomically adds @i to @l and returns true
- * if the result is negative, or false when
- * result is greater than or equal to zero.
- */
-#define local_add_negative(i, l) (local_add_return((i), (l)) < 0)
-
-#define local_cmpxchg(l, o, n) (cmpxchg_local(&((l)->counter), (o), (n)))
-#define local_xchg(v, new) (xchg_local(&((l)->counter), new))
-
-/**
- * local_add_unless - add unless the number is a given value
- * @l: pointer of type local_t
- * @a: the amount to add to l...
- * @u: ...unless l is equal to u.
- *
- * Atomically adds @a to @l, so long as it was not @u.
- * Returns non-zero if @l was not @u, and zero otherwise.
- */
-static inline int local_add_unless(local_t *l, long a, long u)
-{
-        long c, old;
-        c = local_read(l);
-        for (;;) {
-                if (unlikely(c == (u)))
-                        break;
-                old = local_cmpxchg((l), c, c + (a));
-                if (likely(old == c))
-                        break;
-                c = old;
-        }
-        return c != (u);
-}
-
-#define local_inc_not_zero(l) local_add_unless((l), 1, 0)
-
-static inline void local_clear_mask(unsigned long  mask, local_t *addr)
-{
-        unsigned long flags;
-        unsigned long tmp;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_clear_mask             \n\t"
-                DCACHE_CLEAR("%0", "r5", "%1")
-                "ld %0, @%1;                    \n\t"
-                "and    %0, %2;                 \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (tmp)
-                : "r" (addr), "r" (~mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r5"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-static inline void local_set_mask(unsigned long  mask, local_t *addr)
-{
-        unsigned long flags;
-        unsigned long tmp;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# local_set_mask               \n\t"
-                DCACHE_CLEAR("%0", "r5", "%1")
-                "ld %0, @%1;                    \n\t"
-                "or     %0, %2;                 \n\t"
-                "st %0, @%1;                    \n\t"
-                : "=&r" (tmp)
-                : "r" (addr), "r" (mask)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r5"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-}
-
-/* Atomic operations are already serializing on m32r */
-#define smp_mb__before_local_dec()      barrier()
-#define smp_mb__after_local_dec()       barrier()
-#define smp_mb__before_local_inc()      barrier()
-#define smp_mb__after_local_inc()       barrier()
-
-/* Use these for per-cpu local_t variables: on some archs they are
- * much more efficient than these naive implementations.  Note they take
- * a variable, not an address.
- */
-
-#define __local_inc(l)          ((l)->a.counter++)
-#define __local_dec(l)          ((l)->a.counter++)
-#define __local_add(i, l)       ((l)->a.counter += (i))
-#define __local_sub(i, l)       ((l)->a.counter -= (i))
-
-/* Use these for per-cpu local_t variables: on some archs they are
- * much more efficient than these naive implementations.  Note they take
- * a variable, not an address.
- */
-
-/* Need to disable preemption for the cpu local counters otherwise we could
-   still access a variable of a previous CPU in a non local way. */
-#define cpu_local_wrap_v(l)             \
-        ({ local_t res__;               \
-           preempt_disable();           \
-           res__ = (l);                 \
-           preempt_enable();            \
-           res__; })
-#define cpu_local_wrap(l)               \
-        ({ preempt_disable();           \
-           l;                           \
-           preempt_enable(); })         \
-
-#define cpu_local_read(l)    cpu_local_wrap_v(local_read(&__get_cpu_var(l)))
-#define cpu_local_set(l, i)  cpu_local_wrap(local_set(&__get_cpu_var(l), (i)))
-#define cpu_local_inc(l)     cpu_local_wrap(local_inc(&__get_cpu_var(l)))
-#define cpu_local_dec(l)     cpu_local_wrap(local_dec(&__get_cpu_var(l)))
-#define cpu_local_add(i, l)  cpu_local_wrap(local_add((i), &__get_cpu_var(l)))
-#define cpu_local_sub(i, l)  cpu_local_wrap(local_sub((i), &__get_cpu_var(l)))
-
-#define __cpu_local_inc(l)      cpu_local_inc(l)
-#define __cpu_local_dec(l)      cpu_local_dec(l)
-#define __cpu_local_add(i, l)   cpu_local_add((i), (l))
-#define __cpu_local_sub(i, l)   cpu_local_sub((i), (l))
-
-#endif /* __M32R_LOCAL_H */
diff --git a/include/asm-m32r/m32102.h b/include/asm-m32r/m32102.h
deleted file mode 100644
index 52807f8db166..000000000000
--- a/include/asm-m32r/m32102.h
+++ /dev/null
@@ -1,314 +0,0 @@
-#ifndef _M32102_H_
-#define _M32102_H_
-
-/*
- * Renesas M32R 32102 group
- *
- * Copyright (c) 2001  Hitoshi Yamamoto
- * Copyright (c) 2003, 2004  Renesas Technology Corp.
- */
-
-/*======================================================================*
- * Special Function Register
- *======================================================================*/
-#if !defined(CONFIG_CHIP_M32104)
-#define M32R_SFR_OFFSET  (0x00E00000)  /* 0x00E00000-0x00EFFFFF 1[MB] */
-#else
-#define M32R_SFR_OFFSET  (0x00700000)  /* 0x00700000-0x007FFFFF 1[MB] */
-#endif
-
-/*
- * Clock and Power Management registers.
- */
-#define M32R_CPM_OFFSET          (0x000F4000+M32R_SFR_OFFSET)
-
-#define M32R_CPM_CPUCLKCR_PORTL  (0x00+M32R_CPM_OFFSET)
-#define M32R_CPM_CLKMOD_PORTL    (0x04+M32R_CPM_OFFSET)
-#define M32R_CPM_PLLCR_PORTL     (0x08+M32R_CPM_OFFSET)
-
-/*
- * DMA Controller registers.
- */
-#define M32R_DMA_OFFSET         (0x000F8000+M32R_SFR_OFFSET)
-
-#define M32R_DMAEN_PORTL        (0x000+M32R_DMA_OFFSET)
-#define M32R_DMAISTS_PORTL      (0x004+M32R_DMA_OFFSET)
-#define M32R_DMAEDET_PORTL      (0x008+M32R_DMA_OFFSET)
-#define M32R_DMAASTS_PORTL      (0x00c+M32R_DMA_OFFSET)
-
-#define M32R_DMA0CR0_PORTL      (0x100+M32R_DMA_OFFSET)
-#define M32R_DMA0CR1_PORTL      (0x104+M32R_DMA_OFFSET)
-#define M32R_DMA0CSA_PORTL      (0x108+M32R_DMA_OFFSET)
-#define M32R_DMA0RSA_PORTL      (0x10c+M32R_DMA_OFFSET)
-#define M32R_DMA0CDA_PORTL      (0x110+M32R_DMA_OFFSET)
-#define M32R_DMA0RDA_PORTL      (0x114+M32R_DMA_OFFSET)
-#define M32R_DMA0CBCUT_PORTL    (0x118+M32R_DMA_OFFSET)
-#define M32R_DMA0RBCUT_PORTL    (0x11c+M32R_DMA_OFFSET)
-
-#define M32R_DMA1CR0_PORTL      (0x200+M32R_DMA_OFFSET)
-#define M32R_DMA1CR1_PORTL      (0x204+M32R_DMA_OFFSET)
-#define M32R_DMA1CSA_PORTL      (0x208+M32R_DMA_OFFSET)
-#define M32R_DMA1RSA_PORTL      (0x20c+M32R_DMA_OFFSET)
-#define M32R_DMA1CDA_PORTL      (0x210+M32R_DMA_OFFSET)
-#define M32R_DMA1RDA_PORTL      (0x214+M32R_DMA_OFFSET)
-#define M32R_DMA1CBCUT_PORTL    (0x218+M32R_DMA_OFFSET)
-#define M32R_DMA1RBCUT_PORTL    (0x21c+M32R_DMA_OFFSET)
-
-/*
- * Multi Function Timer registers.
- */
-#define M32R_MFT_OFFSET        (0x000FC000+M32R_SFR_OFFSET)
-
-#define M32R_MFTCR_PORTL       (0x000+M32R_MFT_OFFSET)  /* MFT control */
-#define M32R_MFTRPR_PORTL      (0x004+M32R_MFT_OFFSET)  /* MFT real port */
-
-#define M32R_MFT0_OFFSET       (0x100+M32R_MFT_OFFSET)
-#define M32R_MFT0MOD_PORTL     (0x00+M32R_MFT0_OFFSET)  /* MFT0 mode */
-#define M32R_MFT0BOS_PORTL     (0x04+M32R_MFT0_OFFSET)  /* MFT0 b-port output status */
-#define M32R_MFT0CUT_PORTL     (0x08+M32R_MFT0_OFFSET)  /* MFT0 count */
-#define M32R_MFT0RLD_PORTL     (0x0C+M32R_MFT0_OFFSET)  /* MFT0 reload */
-#define M32R_MFT0CMPRLD_PORTL  (0x10+M32R_MFT0_OFFSET)  /* MFT0 compare reload */
-
-#define M32R_MFT1_OFFSET       (0x200+M32R_MFT_OFFSET)
-#define M32R_MFT1MOD_PORTL     (0x00+M32R_MFT1_OFFSET)  /* MFT1 mode */
-#define M32R_MFT1BOS_PORTL     (0x04+M32R_MFT1_OFFSET)  /* MFT1 b-port output status */
-#define M32R_MFT1CUT_PORTL     (0x08+M32R_MFT1_OFFSET)  /* MFT1 count */
-#define M32R_MFT1RLD_PORTL     (0x0C+M32R_MFT1_OFFSET)  /* MFT1 reload */
-#define M32R_MFT1CMPRLD_PORTL  (0x10+M32R_MFT1_OFFSET)  /* MFT1 compare reload */
-
-#define M32R_MFT2_OFFSET       (0x300+M32R_MFT_OFFSET)
-#define M32R_MFT2MOD_PORTL     (0x00+M32R_MFT2_OFFSET)  /* MFT2 mode */
-#define M32R_MFT2BOS_PORTL     (0x04+M32R_MFT2_OFFSET)  /* MFT2 b-port output status */
-#define M32R_MFT2CUT_PORTL     (0x08+M32R_MFT2_OFFSET)  /* MFT2 count */
-#define M32R_MFT2RLD_PORTL     (0x0C+M32R_MFT2_OFFSET)  /* MFT2 reload */
-#define M32R_MFT2CMPRLD_PORTL  (0x10+M32R_MFT2_OFFSET)  /* MFT2 compare reload */
-
-#define M32R_MFT3_OFFSET       (0x400+M32R_MFT_OFFSET)
-#define M32R_MFT3MOD_PORTL     (0x00+M32R_MFT3_OFFSET)  /* MFT3 mode */
-#define M32R_MFT3BOS_PORTL     (0x04+M32R_MFT3_OFFSET)  /* MFT3 b-port output status */
-#define M32R_MFT3CUT_PORTL     (0x08+M32R_MFT3_OFFSET)  /* MFT3 count */
-#define M32R_MFT3RLD_PORTL     (0x0C+M32R_MFT3_OFFSET)  /* MFT3 reload */
-#define M32R_MFT3CMPRLD_PORTL  (0x10+M32R_MFT3_OFFSET)  /* MFT3 compare reload */
-
-#define M32R_MFT4_OFFSET       (0x500+M32R_MFT_OFFSET)
-#define M32R_MFT4MOD_PORTL     (0x00+M32R_MFT4_OFFSET)  /* MFT4 mode */
-#define M32R_MFT4BOS_PORTL     (0x04+M32R_MFT4_OFFSET)  /* MFT4 b-port output status */
-#define M32R_MFT4CUT_PORTL     (0x08+M32R_MFT4_OFFSET)  /* MFT4 count */
-#define M32R_MFT4RLD_PORTL     (0x0C+M32R_MFT4_OFFSET)  /* MFT4 reload */
-#define M32R_MFT4CMPRLD_PORTL  (0x10+M32R_MFT4_OFFSET)  /* MFT4 compare reload */
-
-#define M32R_MFT5_OFFSET       (0x600+M32R_MFT_OFFSET)
-#define M32R_MFT5MOD_PORTL     (0x00+M32R_MFT5_OFFSET)  /* MFT4 mode */
-#define M32R_MFT5BOS_PORTL     (0x04+M32R_MFT5_OFFSET)  /* MFT4 b-port output status */
-#define M32R_MFT5CUT_PORTL     (0x08+M32R_MFT5_OFFSET)  /* MFT4 count */
-#define M32R_MFT5RLD_PORTL     (0x0C+M32R_MFT5_OFFSET)  /* MFT4 reload */
-#define M32R_MFT5CMPRLD_PORTL  (0x10+M32R_MFT5_OFFSET)  /* MFT4 compare reload */
-
-#if (defined(CONFIG_CHIP_M32700) && !defined(CONFIG_PLAT_MAPPI2)) \
-        || defined(CONFIG_CHIP_M32104)
-#define M32R_MFTCR_MFT0MSK  (1UL<<31)  /* b0 */
-#define M32R_MFTCR_MFT1MSK  (1UL<<30)  /* b1 */
-#define M32R_MFTCR_MFT2MSK  (1UL<<29)  /* b2 */
-#define M32R_MFTCR_MFT3MSK  (1UL<<28)  /* b3 */
-#define M32R_MFTCR_MFT4MSK  (1UL<<27)  /* b4 */
-#define M32R_MFTCR_MFT5MSK  (1UL<<26)  /* b5 */
-#define M32R_MFTCR_MFT0EN   (1UL<<23)  /* b8 */
-#define M32R_MFTCR_MFT1EN   (1UL<<22)  /* b9 */
-#define M32R_MFTCR_MFT2EN   (1UL<<21)  /* b10 */
-#define M32R_MFTCR_MFT3EN   (1UL<<20)  /* b11 */
-#define M32R_MFTCR_MFT4EN   (1UL<<19)  /* b12 */
-#define M32R_MFTCR_MFT5EN   (1UL<<18)  /* b13 */
-#else
-#define M32R_MFTCR_MFT0MSK  (1UL<<15)  /* b16 */
-#define M32R_MFTCR_MFT1MSK  (1UL<<14)  /* b17 */
-#define M32R_MFTCR_MFT2MSK  (1UL<<13)  /* b18 */
-#define M32R_MFTCR_MFT3MSK  (1UL<<12)  /* b19 */
-#define M32R_MFTCR_MFT4MSK  (1UL<<11)  /* b20 */
-#define M32R_MFTCR_MFT5MSK  (1UL<<10)  /* b21 */
-#define M32R_MFTCR_MFT0EN   (1UL<<7)   /* b24 */
-#define M32R_MFTCR_MFT1EN   (1UL<<6)   /* b25 */
-#define M32R_MFTCR_MFT2EN   (1UL<<5)   /* b26 */
-#define M32R_MFTCR_MFT3EN   (1UL<<4)   /* b27 */
-#define M32R_MFTCR_MFT4EN   (1UL<<3)   /* b28 */
-#define M32R_MFTCR_MFT5EN   (1UL<<2)   /* b29 */
-#endif
-
-#define M32R_MFTMOD_CC_MASK    (1UL<<15)  /* b16 */
-#define M32R_MFTMOD_TCCR       (1UL<<13)  /* b18 */
-#define M32R_MFTMOD_GTSEL000   (0UL<<8)   /* b21-23 : 000 */
-#define M32R_MFTMOD_GTSEL001   (1UL<<8)   /* b21-23 : 001 */
-#define M32R_MFTMOD_GTSEL010   (2UL<<8)   /* b21-23 : 010 */
-#define M32R_MFTMOD_GTSEL011   (3UL<<8)   /* b21-23 : 011 */
-#define M32R_MFTMOD_GTSEL110   (6UL<<8)   /* b21-23 : 110 */
-#define M32R_MFTMOD_GTSEL111   (7UL<<8)   /* b21-23 : 111 */
-#define M32R_MFTMOD_CMSEL      (1UL<<3)   /* b28 */
-#define M32R_MFTMOD_CSSEL000   (0UL<<0)   /* b29-b31 : 000 */
-#define M32R_MFTMOD_CSSEL001   (1UL<<0)   /* b29-b31 : 001 */
-#define M32R_MFTMOD_CSSEL010   (2UL<<0)   /* b29-b31 : 010 */
-#define M32R_MFTMOD_CSSEL011   (3UL<<0)   /* b29-b31 : 011 */
-#define M32R_MFTMOD_CSSEL100   (4UL<<0)   /* b29-b31 : 100 */
-#define M32R_MFTMOD_CSSEL110   (6UL<<0)   /* b29-b31 : 110 */
-
-/*
- * Serial I/O registers.
- */
-#define M32R_SIO_OFFSET  (0x000FD000+M32R_SFR_OFFSET)
-
-#define M32R_SIO0_CR_PORTL    (0x000+M32R_SIO_OFFSET)
-#define M32R_SIO0_MOD0_PORTL  (0x004+M32R_SIO_OFFSET)
-#define M32R_SIO0_MOD1_PORTL  (0x008+M32R_SIO_OFFSET)
-#define M32R_SIO0_STS_PORTL   (0x00C+M32R_SIO_OFFSET)
-#define M32R_SIO0_TRCR_PORTL  (0x010+M32R_SIO_OFFSET)
-#define M32R_SIO0_BAUR_PORTL  (0x014+M32R_SIO_OFFSET)
-#define M32R_SIO0_RBAUR_PORTL (0x018+M32R_SIO_OFFSET)
-#define M32R_SIO0_TXB_PORTL   (0x01C+M32R_SIO_OFFSET)
-#define M32R_SIO0_RXB_PORTL   (0x020+M32R_SIO_OFFSET)
-
-/*
- * Interrupt Control Unit registers.
- */
-#define M32R_ICU_OFFSET       (0x000FF000+M32R_SFR_OFFSET)
-#define M32R_ICU_ISTS_PORTL   (0x004+M32R_ICU_OFFSET)
-#define M32R_ICU_IREQ0_PORTL  (0x008+M32R_ICU_OFFSET)
-#define M32R_ICU_IREQ1_PORTL  (0x00C+M32R_ICU_OFFSET)
-#define M32R_ICU_SBICR_PORTL  (0x018+M32R_ICU_OFFSET)
-#define M32R_ICU_IMASK_PORTL  (0x01C+M32R_ICU_OFFSET)
-#define M32R_ICU_CR1_PORTL    (0x200+M32R_ICU_OFFSET)  /* INT0 */
-#define M32R_ICU_CR2_PORTL    (0x204+M32R_ICU_OFFSET)  /* INT1 */
-#define M32R_ICU_CR3_PORTL    (0x208+M32R_ICU_OFFSET)  /* INT2 */
-#define M32R_ICU_CR4_PORTL    (0x20C+M32R_ICU_OFFSET)  /* INT3 */
-#define M32R_ICU_CR5_PORTL    (0x210+M32R_ICU_OFFSET)  /* INT4 */
-#define M32R_ICU_CR6_PORTL    (0x214+M32R_ICU_OFFSET)  /* INT5 */
-#define M32R_ICU_CR7_PORTL    (0x218+M32R_ICU_OFFSET)  /* INT6 */
-#define M32R_ICU_CR8_PORTL    (0x219+M32R_ICU_OFFSET)  /* INT7 */
-#define M32R_ICU_CR16_PORTL   (0x23C+M32R_ICU_OFFSET)  /* MFT0 */
-#define M32R_ICU_CR17_PORTL   (0x240+M32R_ICU_OFFSET)  /* MFT1 */
-#define M32R_ICU_CR18_PORTL   (0x244+M32R_ICU_OFFSET)  /* MFT2 */
-#define M32R_ICU_CR19_PORTL   (0x248+M32R_ICU_OFFSET)  /* MFT3 */
-#define M32R_ICU_CR20_PORTL   (0x24C+M32R_ICU_OFFSET)  /* MFT4 */
-#define M32R_ICU_CR21_PORTL   (0x250+M32R_ICU_OFFSET)  /* MFT5 */
-#define M32R_ICU_CR32_PORTL   (0x27C+M32R_ICU_OFFSET)  /* DMA0 */
-#define M32R_ICU_CR33_PORTL   (0x280+M32R_ICU_OFFSET)  /* DMA1 */
-#define M32R_ICU_CR48_PORTL   (0x2BC+M32R_ICU_OFFSET)  /* SIO0 */
-#define M32R_ICU_CR49_PORTL   (0x2C0+M32R_ICU_OFFSET)  /* SIO0 */
-#define M32R_ICU_CR50_PORTL   (0x2C4+M32R_ICU_OFFSET)  /* SIO1 */
-#define M32R_ICU_CR51_PORTL   (0x2C8+M32R_ICU_OFFSET)  /* SIO1 */
-#define M32R_ICU_CR52_PORTL   (0x2CC+M32R_ICU_OFFSET)  /* SIO2 */
-#define M32R_ICU_CR53_PORTL   (0x2D0+M32R_ICU_OFFSET)  /* SIO2 */
-#define M32R_ICU_CR54_PORTL   (0x2D4+M32R_ICU_OFFSET)  /* SIO3 */
-#define M32R_ICU_CR55_PORTL   (0x2D8+M32R_ICU_OFFSET)  /* SIO3 */
-#define M32R_ICU_CR56_PORTL   (0x2DC+M32R_ICU_OFFSET)  /* SIO4 */
-#define M32R_ICU_CR57_PORTL   (0x2E0+M32R_ICU_OFFSET)  /* SIO4 */
-
-#ifdef CONFIG_SMP
-#define M32R_ICU_IPICR0_PORTL (0x2dc+M32R_ICU_OFFSET)  /* IPI0 */
-#define M32R_ICU_IPICR1_PORTL (0x2e0+M32R_ICU_OFFSET)  /* IPI1 */
-#define M32R_ICU_IPICR2_PORTL (0x2e4+M32R_ICU_OFFSET)  /* IPI2 */
-#define M32R_ICU_IPICR3_PORTL (0x2e8+M32R_ICU_OFFSET)  /* IPI3 */
-#define M32R_ICU_IPICR4_PORTL (0x2ec+M32R_ICU_OFFSET)  /* IPI4 */
-#define M32R_ICU_IPICR5_PORTL (0x2f0+M32R_ICU_OFFSET)  /* IPI5 */
-#define M32R_ICU_IPICR6_PORTL (0x2f4+M32R_ICU_OFFSET)  /* IPI6 */
-#define M32R_ICU_IPICR7_PORTL (0x2f8+M32R_ICU_OFFSET)  /* IPI7 */
-#endif /* CONFIG_SMP */
-
-#define M32R_ICUIMASK_IMSK0  (0UL<<16)  /* b13-b15: Disable interrupt */
-#define M32R_ICUIMASK_IMSK1  (1UL<<16)  /* b13-b15: Enable level 0 interrupt */
-#define M32R_ICUIMASK_IMSK2  (2UL<<16)  /* b13-b15: Enable level 0,1 interrupt */
-#define M32R_ICUIMASK_IMSK3  (3UL<<16)  /* b13-b15: Enable level 0-2 interrupt */
-#define M32R_ICUIMASK_IMSK4  (4UL<<16)  /* b13-b15: Enable level 0-3 interrupt */
-#define M32R_ICUIMASK_IMSK5  (5UL<<16)  /* b13-b15: Enable level 0-4 interrupt */
-#define M32R_ICUIMASK_IMSK6  (6UL<<16)  /* b13-b15: Enable level 0-5 interrupt */
-#define M32R_ICUIMASK_IMSK7  (7UL<<16)  /* b13-b15: Enable level 0-6 interrupt */
-
-#define M32R_ICUCR_IEN      (1UL<<12)  /* b19: Interrupt enable */
-#define M32R_ICUCR_IRQ      (1UL<<8)   /* b23: Interrupt request */
-#define M32R_ICUCR_ISMOD00  (0UL<<4)   /* b26-b27: Interrupt sense mode Edge HtoL */
-#define M32R_ICUCR_ISMOD01  (1UL<<4)   /* b26-b27: Interrupt sense mode Level L */
-#define M32R_ICUCR_ISMOD10  (2UL<<4)   /* b26-b27: Interrupt sense mode Edge LtoH*/
-#define M32R_ICUCR_ISMOD11  (3UL<<4)   /* b26-b27: Interrupt sense mode Level H */
-#define M32R_ICUCR_ILEVEL0  (0UL<<0)   /* b29-b31: Interrupt priority level 0 */
-#define M32R_ICUCR_ILEVEL1  (1UL<<0)   /* b29-b31: Interrupt priority level 1 */
-#define M32R_ICUCR_ILEVEL2  (2UL<<0)   /* b29-b31: Interrupt priority level 2 */
-#define M32R_ICUCR_ILEVEL3  (3UL<<0)   /* b29-b31: Interrupt priority level 3 */
-#define M32R_ICUCR_ILEVEL4  (4UL<<0)   /* b29-b31: Interrupt priority level 4 */
-#define M32R_ICUCR_ILEVEL5  (5UL<<0)   /* b29-b31: Interrupt priority level 5 */
-#define M32R_ICUCR_ILEVEL6  (6UL<<0)   /* b29-b31: Interrupt priority level 6 */
-#define M32R_ICUCR_ILEVEL7  (7UL<<0)   /* b29-b31: Disable interrupt */
-
-#define M32R_IRQ_INT0    (1)   /* INT0 */
-#define M32R_IRQ_INT1    (2)   /* INT1 */
-#define M32R_IRQ_INT2    (3)   /* INT2 */
-#define M32R_IRQ_INT3    (4)   /* INT3 */
-#define M32R_IRQ_INT4    (5)   /* INT4 */
-#define M32R_IRQ_INT5    (6)   /* INT5 */
-#define M32R_IRQ_INT6    (7)   /* INT6 */
-#define M32R_IRQ_MFT0    (16)  /* MFT0 */
-#define M32R_IRQ_MFT1    (17)  /* MFT1 */
-#define M32R_IRQ_MFT2    (18)  /* MFT2 */
-#define M32R_IRQ_MFT3    (19)  /* MFT3 */
-#ifdef CONFIG_CHIP_M32104
-#define M32R_IRQ_MFTX0   (24)  /* MFTX0 */
-#define M32R_IRQ_MFTX1   (25)  /* MFTX1 */
-#define M32R_IRQ_DMA0    (32)  /* DMA0 */
-#define M32R_IRQ_DMA1    (33)  /* DMA1 */
-#define M32R_IRQ_DMA2    (34)  /* DMA2 */
-#define M32R_IRQ_DMA3    (35)  /* DMA3 */
-#define M32R_IRQ_SIO0_R  (40)  /* SIO0 send    */
-#define M32R_IRQ_SIO0_S  (41)  /* SIO0 receive */
-#define M32R_IRQ_SIO1_R  (42)  /* SIO1 send    */
-#define M32R_IRQ_SIO1_S  (43)  /* SIO1 receive */
-#define M32R_IRQ_SIO2_R  (44)  /* SIO2 send    */
-#define M32R_IRQ_SIO2_S  (45)  /* SIO2 receive */
-#define M32R_IRQ_SIO3_R  (46)  /* SIO3 send    */
-#define M32R_IRQ_SIO3_S  (47)  /* SIO3 receive */
-#define M32R_IRQ_ADC     (56)  /* ADC */
-#define M32R_IRQ_PC      (57)  /* PC */
-#else /* ! M32104 */
-#define M32R_IRQ_DMA0    (32)  /* DMA0 */
-#define M32R_IRQ_DMA1    (33)  /* DMA1 */
-#define M32R_IRQ_SIO0_R  (48)  /* SIO0 send    */
-#define M32R_IRQ_SIO0_S  (49)  /* SIO0 receive */
-#define M32R_IRQ_SIO1_R  (50)  /* SIO1 send    */
-#define M32R_IRQ_SIO1_S  (51)  /* SIO1 receive */
-#define M32R_IRQ_SIO2_R  (52)  /* SIO2 send    */
-#define M32R_IRQ_SIO2_S  (53)  /* SIO2 receive */
-#define M32R_IRQ_SIO3_R  (54)  /* SIO3 send    */
-#define M32R_IRQ_SIO3_S  (55)  /* SIO3 receive */
-#define M32R_IRQ_SIO4_R  (56)  /* SIO4 send    */
-#define M32R_IRQ_SIO4_S  (57)  /* SIO4 receive */
-#endif /* ! M32104 */
-
-#ifdef CONFIG_SMP
-#define M32R_IRQ_IPI0    (56)
-#define M32R_IRQ_IPI1    (57)
-#define M32R_IRQ_IPI2    (58)
-#define M32R_IRQ_IPI3    (59)
-#define M32R_IRQ_IPI4    (60)
-#define M32R_IRQ_IPI5    (61)
-#define M32R_IRQ_IPI6    (62)
-#define M32R_IRQ_IPI7    (63)
-#define M32R_CPUID_PORTL (0xffffffe0)
-
-#define M32R_FPGA_TOP (0x000F0000+M32R_SFR_OFFSET)
-
-#define M32R_FPGA_NUM_OF_CPUS_PORTL (0x00+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME0_PORTL   (0x10+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME1_PORTL   (0x14+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME2_PORTL   (0x18+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME3_PORTL   (0x1c+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID0_PORTL   (0x20+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID1_PORTL   (0x24+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID2_PORTL   (0x28+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID3_PORTL   (0x2c+M32R_FPGA_TOP)
-#define M32R_FPGA_VERSION0_PORTL    (0x30+M32R_FPGA_TOP)
-#define M32R_FPGA_VERSION1_PORTL    (0x34+M32R_FPGA_TOP)
-
-#endif /* CONFIG_SMP */
-
-#ifndef __ASSEMBLY__
-typedef struct {
-        unsigned long icucr;    /* ICU Control Register */
-} icu_data_t;
-#endif
-
-#endif /* _M32102_H_ */
diff --git a/include/asm-m32r/m32104ut/m32104ut_pld.h b/include/asm-m32r/m32104ut/m32104ut_pld.h
deleted file mode 100644
index 2dc89d68b6d9..000000000000
--- a/include/asm-m32r/m32104ut/m32104ut_pld.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef _M32104UT_M32104UT_PLD_H
-#define _M32104UT_M32104UT_PLD_H
-
-/*
- * include/asm-m32r/m32104ut/m32104ut_pld.h
- *
- * Definitions for Programable Logic Device(PLD) on M32104UT board.
- * Based on m32700ut_pld.h
- *
- * Copyright (c) 2002   Takeo Takahashi
- * Copyright (c) 2005   Naoto Sugai
- *
- * 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.
- */
-
-#if defined(CONFIG_PLAT_M32104UT)
-#define PLD_PLAT_BASE           0x02c00000
-#else
-#error "no platform configuration"
-#endif
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define PLD_BASE                (PLD_PLAT_BASE /* + NONCACHE_OFFSET */)
-#define __reg8                  (volatile unsigned char *)
-#define __reg16                 (volatile unsigned short *)
-#define __reg32                 (volatile unsigned int *)
-#else
-#define PLD_BASE                (PLD_PLAT_BASE + NONCACHE_OFFSET)
-#define __reg8
-#define __reg16
-#define __reg32
-#endif /* __ASSEMBLY__ */
-
-/* CFC */
-#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
-#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
-#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
-#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
-
-/* MMC */
-#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
-#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
-#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
-#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
-#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
-#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
-#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
-#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
-#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
-#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
-#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
-#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
-
-/* ICU
- *  ICUISTS:    status register
- *  ICUIREQ0:   request register
- *  ICUIREQ1:   request register
- *  ICUCR3:     control register for CFIREQ# interrupt
- *  ICUCR4:     control register for CFC Card insert interrupt
- *  ICUCR5:     control register for CFC Card eject interrupt
- *  ICUCR6:     control register for external interrupt
- *  ICUCR11:    control register for MMC Card insert/eject interrupt
- *  ICUCR13:    control register for SC error interrupt
- *  ICUCR14:    control register for SC receive interrupt
- *  ICUCR15:    control register for SC send interrupt
- */
-
-#define PLD_IRQ_INT0            (M32104UT_PLD_IRQ_BASE + 0)     /* None */
-#define PLD_IRQ_CFIREQ          (M32104UT_PLD_IRQ_BASE + 3)     /* CF IREQ */
-#define PLD_IRQ_CFC_INSERT      (M32104UT_PLD_IRQ_BASE + 4)     /* CF Insert */
-#define PLD_IRQ_CFC_EJECT       (M32104UT_PLD_IRQ_BASE + 5)     /* CF Eject */
-#define PLD_IRQ_EXINT           (M32104UT_PLD_IRQ_BASE + 6)     /* EXINT */
-#define PLD_IRQ_MMCCARD         (M32104UT_PLD_IRQ_BASE + 11)    /* MMC Insert/Eject */
-#define PLD_IRQ_SC_ERROR        (M32104UT_PLD_IRQ_BASE + 13)    /* SC error */
-#define PLD_IRQ_SC_RCV          (M32104UT_PLD_IRQ_BASE + 14)    /* SC receive */
-#define PLD_IRQ_SC_SND          (M32104UT_PLD_IRQ_BASE + 15)    /* SC send */
-
-#define PLD_ICUISTS             __reg16(PLD_BASE + 0x8002)
-#define PLD_ICUISTS_VECB_MASK   (0xf000)
-#define PLD_ICUISTS_VECB(x)     ((x) & PLD_ICUISTS_VECB_MASK)
-#define PLD_ICUISTS_ISN_MASK    (0x07c0)
-#define PLD_ICUISTS_ISN(x)      ((x) & PLD_ICUISTS_ISN_MASK)
-#define PLD_ICUCR3              __reg16(PLD_BASE + 0x8104)
-#define PLD_ICUCR4              __reg16(PLD_BASE + 0x8106)
-#define PLD_ICUCR5              __reg16(PLD_BASE + 0x8108)
-#define PLD_ICUCR6              __reg16(PLD_BASE + 0x810a)
-#define PLD_ICUCR11             __reg16(PLD_BASE + 0x8114)
-#define PLD_ICUCR13             __reg16(PLD_BASE + 0x8118)
-#define PLD_ICUCR14             __reg16(PLD_BASE + 0x811a)
-#define PLD_ICUCR15             __reg16(PLD_BASE + 0x811c)
-#define PLD_ICUCR_IEN           (0x1000)
-#define PLD_ICUCR_IREQ          (0x0100)
-#define PLD_ICUCR_ISMOD00       (0x0000)        /* Low edge */
-#define PLD_ICUCR_ISMOD01       (0x0010)        /* Low level */
-#define PLD_ICUCR_ISMOD02       (0x0020)        /* High edge */
-#define PLD_ICUCR_ISMOD03       (0x0030)        /* High level */
-#define PLD_ICUCR_ILEVEL0       (0x0000)
-#define PLD_ICUCR_ILEVEL1       (0x0001)
-#define PLD_ICUCR_ILEVEL2       (0x0002)
-#define PLD_ICUCR_ILEVEL3       (0x0003)
-#define PLD_ICUCR_ILEVEL4       (0x0004)
-#define PLD_ICUCR_ILEVEL5       (0x0005)
-#define PLD_ICUCR_ILEVEL6       (0x0006)
-#define PLD_ICUCR_ILEVEL7       (0x0007)
-
-/* Power Control of MMC and CF */
-#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
-#define PLD_CPCR_CDP            0x0001
-
-/* LED Control
- *
- * 1: DIP swich side
- * 2: Reset switch side
- */
-#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
-#define PLD_IOLED_1_ON          0x001
-#define PLD_IOLED_1_OFF         0x000
-#define PLD_IOLED_2_ON          0x002
-#define PLD_IOLED_2_OFF         0x000
-
-/* DIP Switch
- *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
- *  1: -
- *  2: -
- *  3: -
- */
-#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
-#define PLD_IOSWSTS_IOSW2       0x0200
-#define PLD_IOSWSTS_IOSW1       0x0100
-#define PLD_IOSWSTS_IOWP0       0x0001
-
-/* CRC */
-#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
-#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
-#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
-#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
-#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
-#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
-
-/* RTC */
-#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
-#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
-#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
-#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
-#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
-
-/* SIM Card */
-#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
-#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
-#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
-#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
-#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
-#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
-#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
-
-#endif /* _M32104UT_M32104UT_PLD_H */
diff --git a/include/asm-m32r/m32700ut/m32700ut_lan.h b/include/asm-m32r/m32700ut/m32700ut_lan.h
deleted file mode 100644
index aae810a4fb2c..000000000000
--- a/include/asm-m32r/m32700ut/m32700ut_lan.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef _M32700UT_M32700UT_LAN_H
-#define _M32700UT_M32700UT_LAN_H
-
-/*
- * include/asm-m32r/m32700ut/m32700ut_lan.h
- *
- * M32700UT-LAN board
- *
- * Copyright (c) 2002   Takeo Takahashi
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define M32700UT_LAN_BASE       (0x10000000 /* + NONCACHE_OFFSET */)
-#else
-#define M32700UT_LAN_BASE       (0x10000000 + NONCACHE_OFFSET)
-#endif /* __ASSEMBLY__ */
-
-/* ICU
- *  ICUISTS:    status register
- *  ICUIREQ0:   request register
- *  ICUIREQ1:   request register
- *  ICUCR3:     control register for CFIREQ# interrupt
- *  ICUCR4:     control register for CFC Card insert interrupt
- *  ICUCR5:     control register for CFC Card eject interrupt
- *  ICUCR6:     control register for external interrupt
- *  ICUCR11:    control register for MMC Card insert/eject interrupt
- *  ICUCR13:    control register for SC error interrupt
- *  ICUCR14:    control register for SC receive interrupt
- *  ICUCR15:    control register for SC send interrupt
- *  ICUCR16:    control register for SIO0 receive interrupt
- *  ICUCR17:    control register for SIO0 send interrupt
- */
-#define M32700UT_LAN_IRQ_LAN    (M32700UT_LAN_PLD_IRQ_BASE + 1) /* LAN */
-#define M32700UT_LAN_IRQ_I2C    (M32700UT_LAN_PLD_IRQ_BASE + 3) /* I2C */
-
-#define M32700UT_LAN_ICUISTS    __reg16(M32700UT_LAN_BASE + 0xc0002)
-#define M32700UT_LAN_ICUISTS_VECB_MASK  (0xf000)
-#define M32700UT_LAN_VECB(x)    ((x) & M32700UT_LAN_ICUISTS_VECB_MASK)
-#define M32700UT_LAN_ICUISTS_ISN_MASK   (0x07c0)
-#define M32700UT_LAN_ICUISTS_ISN(x)     ((x) & M32700UT_LAN_ICUISTS_ISN_MASK)
-#define M32700UT_LAN_ICUIREQ0   __reg16(M32700UT_LAN_BASE + 0xc0004)
-#define M32700UT_LAN_ICUCR1     __reg16(M32700UT_LAN_BASE + 0xc0010)
-#define M32700UT_LAN_ICUCR3     __reg16(M32700UT_LAN_BASE + 0xc0014)
-
-/*
- * AR register on PLD
- */
-#define ARVCR0          __reg32(M32700UT_LAN_BASE + 0x40000)
-#define ARVCR0_VDS              0x00080000
-#define ARVCR0_RST              0x00010000
-#define ARVCR1          __reg32(M32700UT_LAN_BASE + 0x40004)
-#define ARVCR1_QVGA             0x02000000
-#define ARVCR1_NORMAL           0x01000000
-#define ARVCR1_HIEN             0x00010000
-#define ARVHCOUNT       __reg32(M32700UT_LAN_BASE + 0x40008)
-#define ARDATA          __reg32(M32700UT_LAN_BASE + 0x40010)
-#define ARINTSEL        __reg32(M32700UT_LAN_BASE + 0x40014)
-#define ARINTSEL_INT3           0x10000000      /* CPU INT3 */
-#define ARDATA32        __reg32(M32700UT_LAN_BASE + 0x04040010) // Block 5
-/*
-#define ARINTSEL_SEL2           0x00002000
-#define ARINTSEL_SEL3           0x00001000
-#define ARINTSEL_SEL6           0x00000200
-#define ARINTSEL_SEL7           0x00000100
-#define ARINTSEL_SEL9           0x00000040
-#define ARINTSEL_SEL10          0x00000020
-#define ARINTSEL_SEL11          0x00000010
-#define ARINTSEL_SEL12          0x00000008
-*/
-
-/*
- * I2C register on PLD
- */
-#define PLDI2CCR        __reg32(M32700UT_LAN_BASE + 0x40040)
-#define PLDI2CCR_ES0            0x00000001      /* enable I2C interface */
-#define PLDI2CMOD       __reg32(M32700UT_LAN_BASE + 0x40044)
-#define PLDI2CMOD_ACKCLK        0x00000200
-#define PLDI2CMOD_DTWD          0x00000100
-#define PLDI2CMOD_10BT          0x00000004
-#define PLDI2CMOD_ATM_NORMAL    0x00000000
-#define PLDI2CMOD_ATM_AUTO      0x00000003
-#define PLDI2CACK       __reg32(M32700UT_LAN_BASE + 0x40048)
-#define PLDI2CACK_ACK           0x00000001
-#define PLDI2CFREQ      __reg32(M32700UT_LAN_BASE + 0x4004c)
-#define PLDI2CCND       __reg32(M32700UT_LAN_BASE + 0x40050)
-#define PLDI2CCND_START         0x00000001
-#define PLDI2CCND_STOP          0x00000002
-#define PLDI2CSTEN      __reg32(M32700UT_LAN_BASE + 0x40054)
-#define PLDI2CSTEN_STEN         0x00000001
-#define PLDI2CDATA      __reg32(M32700UT_LAN_BASE + 0x40060)
-#define PLDI2CSTS       __reg32(M32700UT_LAN_BASE + 0x40064)
-#define PLDI2CSTS_TRX           0x00000020
-#define PLDI2CSTS_BB            0x00000010
-#define PLDI2CSTS_NOACK         0x00000001      /* 0:ack, 1:noack */
-
-#endif /* _M32700UT_M32700UT_LAN_H */
diff --git a/include/asm-m32r/m32700ut/m32700ut_lcd.h b/include/asm-m32r/m32700ut/m32700ut_lcd.h
deleted file mode 100644
index 4c2489079788..000000000000
--- a/include/asm-m32r/m32700ut/m32700ut_lcd.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _M32700UT_M32700UT_LCD_H
-#define _M32700UT_M32700UT_LCD_H
-
-/*
- * include/asm-m32r/m32700ut/m32700ut_lcd.h
- *
- * M32700UT-LCD board
- *
- * Copyright (c) 2002   Takeo Takahashi
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define M32700UT_LCD_BASE       (0x10000000 /* + NONCACHE_OFFSET */)
-#else
-#define M32700UT_LCD_BASE       (0x10000000 + NONCACHE_OFFSET)
-#endif /* __ASSEMBLY__ */
-
-/*
- * ICU
- */
-#define M32700UT_LCD_IRQ_BAT_INT        (M32700UT_LCD_PLD_IRQ_BASE + 1)
-#define M32700UT_LCD_IRQ_USB_INT1       (M32700UT_LCD_PLD_IRQ_BASE + 2)
-#define M32700UT_LCD_IRQ_AUDT0          (M32700UT_LCD_PLD_IRQ_BASE + 3)
-#define M32700UT_LCD_IRQ_AUDT2          (M32700UT_LCD_PLD_IRQ_BASE + 4)
-#define M32700UT_LCD_IRQ_BATSIO_RCV     (M32700UT_LCD_PLD_IRQ_BASE + 16)
-#define M32700UT_LCD_IRQ_BATSIO_SND     (M32700UT_LCD_PLD_IRQ_BASE + 17)
-#define M32700UT_LCD_IRQ_ASNDSIO_RCV    (M32700UT_LCD_PLD_IRQ_BASE + 18)
-#define M32700UT_LCD_IRQ_ASNDSIO_SND    (M32700UT_LCD_PLD_IRQ_BASE + 19)
-#define M32700UT_LCD_IRQ_ACNLSIO_SND    (M32700UT_LCD_PLD_IRQ_BASE + 21)
-
-#define M32700UT_LCD_ICUISTS    __reg16(M32700UT_LCD_BASE + 0x300002)
-#define M32700UT_LCD_ICUISTS_VECB_MASK  (0xf000)
-#define M32700UT_LCD_VECB(x)    ((x) & M32700UT_LCD_ICUISTS_VECB_MASK)
-#define M32700UT_LCD_ICUISTS_ISN_MASK   (0x07c0)
-#define M32700UT_LCD_ICUISTS_ISN(x)     ((x) & M32700UT_LCD_ICUISTS_ISN_MASK)
-#define M32700UT_LCD_ICUIREQ0   __reg16(M32700UT_LCD_BASE + 0x300004)
-#define M32700UT_LCD_ICUIREQ1   __reg16(M32700UT_LCD_BASE + 0x300006)
-#define M32700UT_LCD_ICUCR1     __reg16(M32700UT_LCD_BASE + 0x300020)
-#define M32700UT_LCD_ICUCR2     __reg16(M32700UT_LCD_BASE + 0x300022)
-#define M32700UT_LCD_ICUCR3     __reg16(M32700UT_LCD_BASE + 0x300024)
-#define M32700UT_LCD_ICUCR4     __reg16(M32700UT_LCD_BASE + 0x300026)
-#define M32700UT_LCD_ICUCR16    __reg16(M32700UT_LCD_BASE + 0x300030)
-#define M32700UT_LCD_ICUCR17    __reg16(M32700UT_LCD_BASE + 0x300032)
-#define M32700UT_LCD_ICUCR18    __reg16(M32700UT_LCD_BASE + 0x300034)
-#define M32700UT_LCD_ICUCR19    __reg16(M32700UT_LCD_BASE + 0x300036)
-#define M32700UT_LCD_ICUCR21    __reg16(M32700UT_LCD_BASE + 0x30003a)
-
-#endif /* _M32700UT_M32700UT_LCD_H */
diff --git a/include/asm-m32r/m32700ut/m32700ut_pld.h b/include/asm-m32r/m32700ut/m32700ut_pld.h
deleted file mode 100644
index 57623beb44cb..000000000000
--- a/include/asm-m32r/m32700ut/m32700ut_pld.h
+++ /dev/null
@@ -1,259 +0,0 @@
-#ifndef _M32700UT_M32700UT_PLD_H
-#define _M32700UT_M32700UT_PLD_H
-
-/*
- * include/asm-m32r/m32700ut/m32700ut_pld.h
- *
- * Definitions for Programable Logic Device(PLD) on M32700UT board.
- *
- * Copyright (c) 2002   Takeo Takahashi
- *
- * 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.
- */
-
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV)
-#define PLD_PLAT_BASE           0x04c00000
-#else
-#error "no platform configuration"
-#endif
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define PLD_BASE                (PLD_PLAT_BASE /* + NONCACHE_OFFSET */)
-#define __reg8                  (volatile unsigned char *)
-#define __reg16                 (volatile unsigned short *)
-#define __reg32                 (volatile unsigned int *)
-#else
-#define PLD_BASE                (PLD_PLAT_BASE + NONCACHE_OFFSET)
-#define __reg8
-#define __reg16
-#define __reg32
-#endif /* __ASSEMBLY__ */
-
-/* CFC */
-#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
-#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
-#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
-#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
-#define PLD_CFVENCR             __reg16(PLD_BASE + 0x0008)
-#define PLD_CFCR0               __reg16(PLD_BASE + 0x000a)
-#define PLD_CFCR1               __reg16(PLD_BASE + 0x000c)
-#define PLD_IDERSTCR            __reg16(PLD_BASE + 0x0010)
-
-/* MMC */
-#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
-#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
-#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
-#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
-#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
-#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
-#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
-#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
-#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
-#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
-#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
-#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
-
-/* ICU
- *  ICUISTS:    status register
- *  ICUIREQ0:   request register
- *  ICUIREQ1:   request register
- *  ICUCR3:     control register for CFIREQ# interrupt
- *  ICUCR4:     control register for CFC Card insert interrupt
- *  ICUCR5:     control register for CFC Card eject interrupt
- *  ICUCR6:     control register for external interrupt
- *  ICUCR11:    control register for MMC Card insert/eject interrupt
- *  ICUCR13:    control register for SC error interrupt
- *  ICUCR14:    control register for SC receive interrupt
- *  ICUCR15:    control register for SC send interrupt
- *  ICUCR16:    control register for SIO0 receive interrupt
- *  ICUCR17:    control register for SIO0 send interrupt
- */
-#if !defined(CONFIG_PLAT_USRV)
-#define PLD_IRQ_INT0            (M32700UT_PLD_IRQ_BASE + 0)     /* None */
-#define PLD_IRQ_INT1            (M32700UT_PLD_IRQ_BASE + 1)     /* reserved */
-#define PLD_IRQ_INT2            (M32700UT_PLD_IRQ_BASE + 2)     /* reserved */
-#define PLD_IRQ_CFIREQ          (M32700UT_PLD_IRQ_BASE + 3)     /* CF IREQ */
-#define PLD_IRQ_CFC_INSERT      (M32700UT_PLD_IRQ_BASE + 4)     /* CF Insert */
-#define PLD_IRQ_CFC_EJECT       (M32700UT_PLD_IRQ_BASE + 5)     /* CF Eject */
-#define PLD_IRQ_EXINT           (M32700UT_PLD_IRQ_BASE + 6)     /* EXINT */
-#define PLD_IRQ_INT7            (M32700UT_PLD_IRQ_BASE + 7)     /* reserved */
-#define PLD_IRQ_INT8            (M32700UT_PLD_IRQ_BASE + 8)     /* reserved */
-#define PLD_IRQ_INT9            (M32700UT_PLD_IRQ_BASE + 9)     /* reserved */
-#define PLD_IRQ_INT10           (M32700UT_PLD_IRQ_BASE + 10)    /* reserved */
-#define PLD_IRQ_MMCCARD         (M32700UT_PLD_IRQ_BASE + 11)    /* MMC Insert/Eject */
-#define PLD_IRQ_INT12           (M32700UT_PLD_IRQ_BASE + 12)    /* reserved */
-#define PLD_IRQ_SC_ERROR        (M32700UT_PLD_IRQ_BASE + 13)    /* SC error */
-#define PLD_IRQ_SC_RCV          (M32700UT_PLD_IRQ_BASE + 14)    /* SC receive */
-#define PLD_IRQ_SC_SND          (M32700UT_PLD_IRQ_BASE + 15)    /* SC send */
-#define PLD_IRQ_SIO0_RCV        (M32700UT_PLD_IRQ_BASE + 16)    /* SIO receive */
-#define PLD_IRQ_SIO0_SND        (M32700UT_PLD_IRQ_BASE + 17)    /* SIO send */
-#define PLD_IRQ_INT18           (M32700UT_PLD_IRQ_BASE + 18)    /* reserved */
-#define PLD_IRQ_INT19           (M32700UT_PLD_IRQ_BASE + 19)    /* reserved */
-#define PLD_IRQ_INT20           (M32700UT_PLD_IRQ_BASE + 20)    /* reserved */
-#define PLD_IRQ_INT21           (M32700UT_PLD_IRQ_BASE + 21)    /* reserved */
-#define PLD_IRQ_INT22           (M32700UT_PLD_IRQ_BASE + 22)    /* reserved */
-#define PLD_IRQ_INT23           (M32700UT_PLD_IRQ_BASE + 23)    /* reserved */
-#define PLD_IRQ_INT24           (M32700UT_PLD_IRQ_BASE + 24)    /* reserved */
-#define PLD_IRQ_INT25           (M32700UT_PLD_IRQ_BASE + 25)    /* reserved */
-#define PLD_IRQ_INT26           (M32700UT_PLD_IRQ_BASE + 26)    /* reserved */
-#define PLD_IRQ_INT27           (M32700UT_PLD_IRQ_BASE + 27)    /* reserved */
-#define PLD_IRQ_INT28           (M32700UT_PLD_IRQ_BASE + 28)    /* reserved */
-#define PLD_IRQ_INT29           (M32700UT_PLD_IRQ_BASE + 29)    /* reserved */
-#define PLD_IRQ_INT30           (M32700UT_PLD_IRQ_BASE + 30)    /* reserved */
-#define PLD_IRQ_INT31           (M32700UT_PLD_IRQ_BASE + 31)    /* reserved */
-
-#else   /* CONFIG_PLAT_USRV */
-
-#define PLD_IRQ_INT0            (M32700UT_PLD_IRQ_BASE + 0)     /* None */
-#define PLD_IRQ_INT1            (M32700UT_PLD_IRQ_BASE + 1)     /* reserved */
-#define PLD_IRQ_INT2            (M32700UT_PLD_IRQ_BASE + 2)     /* reserved */
-#define PLD_IRQ_CF0             (M32700UT_PLD_IRQ_BASE + 3)     /* CF0# */
-#define PLD_IRQ_CF1             (M32700UT_PLD_IRQ_BASE + 4)     /* CF1# */
-#define PLD_IRQ_CF2             (M32700UT_PLD_IRQ_BASE + 5)     /* CF2# */
-#define PLD_IRQ_CF3             (M32700UT_PLD_IRQ_BASE + 6)     /* CF3# */
-#define PLD_IRQ_CF4             (M32700UT_PLD_IRQ_BASE + 7)     /* CF4# */
-#define PLD_IRQ_INT8            (M32700UT_PLD_IRQ_BASE + 8)     /* reserved */
-#define PLD_IRQ_INT9            (M32700UT_PLD_IRQ_BASE + 9)     /* reserved */
-#define PLD_IRQ_INT10           (M32700UT_PLD_IRQ_BASE + 10)    /* reserved */
-#define PLD_IRQ_INT11           (M32700UT_PLD_IRQ_BASE + 11)    /* reserved */
-#define PLD_IRQ_UART0           (M32700UT_PLD_IRQ_BASE + 12)    /* UARTIRQ0 */
-#define PLD_IRQ_UART1           (M32700UT_PLD_IRQ_BASE + 13)    /* UARTIRQ1 */
-#define PLD_IRQ_INT14           (M32700UT_PLD_IRQ_BASE + 14)    /* reserved */
-#define PLD_IRQ_INT15           (M32700UT_PLD_IRQ_BASE + 15)    /* reserved */
-#define PLD_IRQ_SNDINT          (M32700UT_PLD_IRQ_BASE + 16)    /* SNDINT# */
-#define PLD_IRQ_INT17           (M32700UT_PLD_IRQ_BASE + 17)    /* reserved */
-#define PLD_IRQ_INT18           (M32700UT_PLD_IRQ_BASE + 18)    /* reserved */
-#define PLD_IRQ_INT19           (M32700UT_PLD_IRQ_BASE + 19)    /* reserved */
-#define PLD_IRQ_INT20           (M32700UT_PLD_IRQ_BASE + 20)    /* reserved */
-#define PLD_IRQ_INT21           (M32700UT_PLD_IRQ_BASE + 21)    /* reserved */
-#define PLD_IRQ_INT22           (M32700UT_PLD_IRQ_BASE + 22)    /* reserved */
-#define PLD_IRQ_INT23           (M32700UT_PLD_IRQ_BASE + 23)    /* reserved */
-#define PLD_IRQ_INT24           (M32700UT_PLD_IRQ_BASE + 24)    /* reserved */
-#define PLD_IRQ_INT25           (M32700UT_PLD_IRQ_BASE + 25)    /* reserved */
-#define PLD_IRQ_INT26           (M32700UT_PLD_IRQ_BASE + 26)    /* reserved */
-#define PLD_IRQ_INT27           (M32700UT_PLD_IRQ_BASE + 27)    /* reserved */
-#define PLD_IRQ_INT28           (M32700UT_PLD_IRQ_BASE + 28)    /* reserved */
-#define PLD_IRQ_INT29           (M32700UT_PLD_IRQ_BASE + 29)    /* reserved */
-#define PLD_IRQ_INT30           (M32700UT_PLD_IRQ_BASE + 30)    /* reserved */
-
-#endif  /* CONFIG_PLAT_USRV */
-
-#define PLD_ICUISTS             __reg16(PLD_BASE + 0x8002)
-#define PLD_ICUISTS_VECB_MASK   (0xf000)
-#define PLD_ICUISTS_VECB(x)     ((x) & PLD_ICUISTS_VECB_MASK)
-#define PLD_ICUISTS_ISN_MASK    (0x07c0)
-#define PLD_ICUISTS_ISN(x)      ((x) & PLD_ICUISTS_ISN_MASK)
-#define PLD_ICUIREQ0            __reg16(PLD_BASE + 0x8004)
-#define PLD_ICUIREQ1            __reg16(PLD_BASE + 0x8006)
-#define PLD_ICUCR1              __reg16(PLD_BASE + 0x8100)
-#define PLD_ICUCR2              __reg16(PLD_BASE + 0x8102)
-#define PLD_ICUCR3              __reg16(PLD_BASE + 0x8104)
-#define PLD_ICUCR4              __reg16(PLD_BASE + 0x8106)
-#define PLD_ICUCR5              __reg16(PLD_BASE + 0x8108)
-#define PLD_ICUCR6              __reg16(PLD_BASE + 0x810a)
-#define PLD_ICUCR7              __reg16(PLD_BASE + 0x810c)
-#define PLD_ICUCR8              __reg16(PLD_BASE + 0x810e)
-#define PLD_ICUCR9              __reg16(PLD_BASE + 0x8110)
-#define PLD_ICUCR10             __reg16(PLD_BASE + 0x8112)
-#define PLD_ICUCR11             __reg16(PLD_BASE + 0x8114)
-#define PLD_ICUCR12             __reg16(PLD_BASE + 0x8116)
-#define PLD_ICUCR13             __reg16(PLD_BASE + 0x8118)
-#define PLD_ICUCR14             __reg16(PLD_BASE + 0x811a)
-#define PLD_ICUCR15             __reg16(PLD_BASE + 0x811c)
-#define PLD_ICUCR16             __reg16(PLD_BASE + 0x811e)
-#define PLD_ICUCR17             __reg16(PLD_BASE + 0x8120)
-#define PLD_ICUCR_IEN           (0x1000)
-#define PLD_ICUCR_IREQ          (0x0100)
-#define PLD_ICUCR_ISMOD00       (0x0000)        /* Low edge */
-#define PLD_ICUCR_ISMOD01       (0x0010)        /* Low level */
-#define PLD_ICUCR_ISMOD02       (0x0020)        /* High edge */
-#define PLD_ICUCR_ISMOD03       (0x0030)        /* High level */
-#define PLD_ICUCR_ILEVEL0       (0x0000)
-#define PLD_ICUCR_ILEVEL1       (0x0001)
-#define PLD_ICUCR_ILEVEL2       (0x0002)
-#define PLD_ICUCR_ILEVEL3       (0x0003)
-#define PLD_ICUCR_ILEVEL4       (0x0004)
-#define PLD_ICUCR_ILEVEL5       (0x0005)
-#define PLD_ICUCR_ILEVEL6       (0x0006)
-#define PLD_ICUCR_ILEVEL7       (0x0007)
-
-/* Power Control of MMC and CF */
-#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
-#define PLD_CPCR_CF             0x0001
-#define PLD_CPCR_MMC            0x0002
-
-/* LED Control
- *
- * 1: DIP swich side
- * 2: Reset switch side
- */
-#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
-#define PLD_IOLED_1_ON          0x001
-#define PLD_IOLED_1_OFF         0x000
-#define PLD_IOLED_2_ON          0x002
-#define PLD_IOLED_2_OFF         0x000
-
-/* DIP Switch
- *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
- *  1: -
- *  2: -
- *  3: -
- */
-#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
-#define PLD_IOSWSTS_IOSW2       0x0200
-#define PLD_IOSWSTS_IOSW1       0x0100
-#define PLD_IOSWSTS_IOWP0       0x0001
-
-/* CRC */
-#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
-#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
-#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
-#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
-#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
-#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
-
-/* RTC */
-#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
-#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
-#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
-#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
-#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
-
-/* SIO0 */
-#define PLD_ESIO0CR             __reg16(PLD_BASE + 0x20000)
-#define PLD_ESIO0CR_TXEN        0x0001
-#define PLD_ESIO0CR_RXEN        0x0002
-#define PLD_ESIO0MOD0           __reg16(PLD_BASE + 0x20002)
-#define PLD_ESIO0MOD0_CTSS      0x0040
-#define PLD_ESIO0MOD0_RTSS      0x0080
-#define PLD_ESIO0MOD1           __reg16(PLD_BASE + 0x20004)
-#define PLD_ESIO0MOD1_LMFS      0x0010
-#define PLD_ESIO0STS            __reg16(PLD_BASE + 0x20006)
-#define PLD_ESIO0STS_TEMP       0x0001
-#define PLD_ESIO0STS_TXCP       0x0002
-#define PLD_ESIO0STS_RXCP       0x0004
-#define PLD_ESIO0STS_TXSC       0x0100
-#define PLD_ESIO0STS_RXSC       0x0200
-#define PLD_ESIO0STS_TXREADY    (PLD_ESIO0STS_TXCP | PLD_ESIO0STS_TEMP)
-#define PLD_ESIO0INTCR          __reg16(PLD_BASE + 0x20008)
-#define PLD_ESIO0INTCR_TXIEN    0x0002
-#define PLD_ESIO0INTCR_RXCEN    0x0004
-#define PLD_ESIO0BAUR           __reg16(PLD_BASE + 0x2000a)
-#define PLD_ESIO0TXB            __reg16(PLD_BASE + 0x2000c)
-#define PLD_ESIO0RXB            __reg16(PLD_BASE + 0x2000e)
-
-/* SIM Card */
-#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
-#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
-#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
-#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
-#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
-#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
-#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
-
-#endif /* _M32700UT_M32700UT_PLD.H */
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h
deleted file mode 100644
index 214b44b40757..000000000000
--- a/include/asm-m32r/m32r.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef _ASM_M32R_M32R_H_
-#define _ASM_M32R_M32R_H_
-
-/*
- * Renesas M32R processor
- *
- * Copyright (C) 2003, 2004  Renesas Technology Corp.
- */
-
-
-/* Chip type */
-#if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP)
-#include <asm/m32r_mp_fpga.h>
-#elif defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \
-        || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \
-        || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
-#include <asm/m32102.h>
-#endif
-
-/* Platform type */
-#if defined(CONFIG_PLAT_M32700UT)
-#include <asm/m32700ut/m32700ut_pld.h>
-#include <asm/m32700ut/m32700ut_lan.h>
-#include <asm/m32700ut/m32700ut_lcd.h>
-/* for ei_handler:linux/arch/m32r/kernel/entry.S */
-#define M32R_INT1ICU_ISTS       PLD_ICUISTS
-#define M32R_INT1ICU_IRQ_BASE   M32700UT_PLD_IRQ_BASE
-#define M32R_INT0ICU_ISTS       M32700UT_LAN_ICUISTS
-#define M32R_INT0ICU_IRQ_BASE   M32700UT_LAN_PLD_IRQ_BASE
-#define M32R_INT2ICU_ISTS       M32700UT_LCD_ICUISTS
-#define M32R_INT2ICU_IRQ_BASE   M32700UT_LCD_PLD_IRQ_BASE
-#endif  /* CONFIG_PLAT_M32700UT */
-
-#if defined(CONFIG_PLAT_OPSPUT)
-#include <asm/opsput/opsput_pld.h>
-#include <asm/opsput/opsput_lan.h>
-#include <asm/opsput/opsput_lcd.h>
-/* for ei_handler:linux/arch/m32r/kernel/entry.S */
-#define M32R_INT1ICU_ISTS       PLD_ICUISTS
-#define M32R_INT1ICU_IRQ_BASE   OPSPUT_PLD_IRQ_BASE
-#define M32R_INT0ICU_ISTS       OPSPUT_LAN_ICUISTS
-#define M32R_INT0ICU_IRQ_BASE   OPSPUT_LAN_PLD_IRQ_BASE
-#define M32R_INT2ICU_ISTS       OPSPUT_LCD_ICUISTS
-#define M32R_INT2ICU_IRQ_BASE   OPSPUT_LCD_PLD_IRQ_BASE
-#endif  /* CONFIG_PLAT_OPSPUT */
-
-#if defined(CONFIG_PLAT_MAPPI2)
-#include <asm/mappi2/mappi2_pld.h>
-#endif  /* CONFIG_PLAT_MAPPI2 */
-
-#if defined(CONFIG_PLAT_MAPPI3)
-#include <asm/mappi3/mappi3_pld.h>
-#endif  /* CONFIG_PLAT_MAPPI3 */
-
-#if defined(CONFIG_PLAT_USRV)
-#include <asm/m32700ut/m32700ut_pld.h>
-/* for ei_handler:linux/arch/m32r/kernel/entry.S */
-#define M32R_INT1ICU_ISTS       PLD_ICUISTS
-#define M32R_INT1ICU_IRQ_BASE   M32700UT_PLD_IRQ_BASE
-#endif
-
-#if defined(CONFIG_PLAT_M32104UT)
-#include <asm/m32104ut/m32104ut_pld.h>
-/* for ei_handler:linux/arch/m32r/kernel/entry.S */
-#define M32R_INT1ICU_ISTS       PLD_ICUISTS
-#define M32R_INT1ICU_IRQ_BASE   M32104UT_PLD_IRQ_BASE
-#endif  /* CONFIG_PLAT_M32104 */
-
-/*
- * M32R Register
- */
-
-/*
- * MMU Register
- */
-
-#define MMU_REG_BASE    (0xffff0000)
-#define ITLB_BASE       (0xfe000000)
-#define DTLB_BASE       (0xfe000800)
-
-#define NR_TLB_ENTRIES  CONFIG_TLB_ENTRIES
-
-#define MATM    MMU_REG_BASE            /* MMU Address Translation Mode
-                                           Register */
-#define MPSZ    (0x04 + MMU_REG_BASE)   /* MMU Page Size Designation Register */
-#define MASID   (0x08 + MMU_REG_BASE)   /* MMU Address Space ID Register */
-#define MESTS   (0x0c + MMU_REG_BASE)   /* MMU Exception Status Register */
-#define MDEVA   (0x10 + MMU_REG_BASE)   /* MMU Operand Exception Virtual
-                                           Address Register */
-#define MDEVP   (0x14 + MMU_REG_BASE)   /* MMU Operand Exception Virtual Page
-                                           Number Register */
-#define MPTB    (0x18 + MMU_REG_BASE)   /* MMU Page Table Base Register */
-#define MSVA    (0x20 + MMU_REG_BASE)   /* MMU Search Virtual Address
-                                           Register */
-#define MTOP    (0x24 + MMU_REG_BASE)   /* MMU TLB Operation Register */
-#define MIDXI   (0x28 + MMU_REG_BASE)   /* MMU Index Register for
-                                           Instruciton */
-#define MIDXD   (0x2c + MMU_REG_BASE)   /* MMU Index Register for Operand */
-
-#define MATM_offset     (MATM - MMU_REG_BASE)
-#define MPSZ_offset     (MPSZ - MMU_REG_BASE)
-#define MASID_offset    (MASID - MMU_REG_BASE)
-#define MESTS_offset    (MESTS - MMU_REG_BASE)
-#define MDEVA_offset    (MDEVA - MMU_REG_BASE)
-#define MDEVP_offset    (MDEVP - MMU_REG_BASE)
-#define MPTB_offset     (MPTB - MMU_REG_BASE)
-#define MSVA_offset     (MSVA - MMU_REG_BASE)
-#define MTOP_offset     (MTOP - MMU_REG_BASE)
-#define MIDXI_offset    (MIDXI - MMU_REG_BASE)
-#define MIDXD_offset    (MIDXD - MMU_REG_BASE)
-
-#define MESTS_IT        (1 << 0)        /* Instruction TLB miss */
-#define MESTS_IA        (1 << 1)        /* Instruction Access Exception */
-#define MESTS_DT        (1 << 4)        /* Operand TLB miss */
-#define MESTS_DA        (1 << 5)        /* Operand Access Exception */
-#define MESTS_DRW       (1 << 6)        /* Operand Write Exception Flag */
-
-/*
- * PSW (Processor Status Word)
- */
-
-/* PSW bit */
-#define M32R_PSW_BIT_SM   (7)    /* Stack Mode */
-#define M32R_PSW_BIT_IE   (6)    /* Interrupt Enable */
-#define M32R_PSW_BIT_PM   (3)    /* Processor Mode [0:Supervisor,1:User] */
-#define M32R_PSW_BIT_C    (0)    /* Condition */
-#define M32R_PSW_BIT_BSM  (7+8)  /* Backup Stack Mode */
-#define M32R_PSW_BIT_BIE  (6+8)  /* Backup Interrupt Enable */
-#define M32R_PSW_BIT_BPM  (3+8)  /* Backup Processor Mode */
-#define M32R_PSW_BIT_BC   (0+8)  /* Backup Condition */
-
-/* PSW bit map */
-#define M32R_PSW_SM   (1UL<< M32R_PSW_BIT_SM)   /* Stack Mode */
-#define M32R_PSW_IE   (1UL<< M32R_PSW_BIT_IE)   /* Interrupt Enable */
-#define M32R_PSW_PM   (1UL<< M32R_PSW_BIT_PM)   /* Processor Mode */
-#define M32R_PSW_C    (1UL<< M32R_PSW_BIT_C)    /* Condition */
-#define M32R_PSW_BSM  (1UL<< M32R_PSW_BIT_BSM)  /* Backup Stack Mode */
-#define M32R_PSW_BIE  (1UL<< M32R_PSW_BIT_BIE)  /* Backup Interrupt Enable */
-#define M32R_PSW_BPM  (1UL<< M32R_PSW_BIT_BPM)  /* Backup Processor Mode */
-#define M32R_PSW_BC   (1UL<< M32R_PSW_BIT_BC)   /* Backup Condition */
-
-/*
- * Direct address to SFR
- */
-
-#include <asm/page.h>
-#ifdef CONFIG_MMU
-#define NONCACHE_OFFSET  (__PAGE_OFFSET + 0x20000000)
-#else
-#define NONCACHE_OFFSET  __PAGE_OFFSET
-#endif /* CONFIG_MMU */
-
-#define M32R_ICU_ISTS_ADDR  M32R_ICU_ISTS_PORTL+NONCACHE_OFFSET
-#define M32R_ICU_IPICR_ADDR  M32R_ICU_IPICR0_PORTL+NONCACHE_OFFSET
-#define M32R_ICU_IMASK_ADDR  M32R_ICU_IMASK_PORTL+NONCACHE_OFFSET
-#define M32R_FPGA_CPU_NAME_ADDR  M32R_FPGA_CPU_NAME0_PORTL+NONCACHE_OFFSET
-#define M32R_FPGA_MODEL_ID_ADDR  M32R_FPGA_MODEL_ID0_PORTL+NONCACHE_OFFSET
-#define M32R_FPGA_VERSION_ADDR   M32R_FPGA_VERSION0_PORTL+NONCACHE_OFFSET
-
-#endif /* _ASM_M32R_M32R_H_ */
diff --git a/include/asm-m32r/m32r_mp_fpga.h b/include/asm-m32r/m32r_mp_fpga.h
deleted file mode 100644
index 976d2b995919..000000000000
--- a/include/asm-m32r/m32r_mp_fpga.h
+++ /dev/null
@@ -1,313 +0,0 @@
-#ifndef _ASM_M32R_M32R_MP_FPGA_
-#define _ASM_M32R_M32R_MP_FPGA_
-
-/*
- * Renesas M32R-MP-FPGA
- *
- * Copyright (c) 2002  Hitoshi Yamamoto
- * Copyright (c) 2003, 2004  Renesas Technology Corp.
- */
-
-/*
- * ========================================================
- * M32R-MP-FPGA Memory Map
- * ========================================================
- * 0x00000000 : Block#0 : 64[MB]
- *              0x03E00000 : SFR
- *                           0x03E00000 : reserved
- *                           0x03EF0000 : FPGA
- *                           0x03EF1000 : reserved
- *                           0x03EF4000 : CKM
- *                           0x03EF4000 : BSELC
- *                           0x03EF5000 : reserved
- *                           0x03EFC000 : MFT
- *                           0x03EFD000 : SIO
- *                           0x03EFE000 : reserved
- *                           0x03EFF000 : ICU
- *              0x03F00000 : Internal SRAM 64[KB]
- *              0x03F10000 : reserved
- * --------------------------------------------------------
- * 0x04000000 : Block#1 : 64[MB]
- *              0x04000000 : Debug board SRAM 4[MB]
- *              0x04400000 : reserved
- * --------------------------------------------------------
- * 0x08000000 : Block#2 : 64[MB]
- * --------------------------------------------------------
- * 0x0C000000 : Block#3 : 64[MB]
- * --------------------------------------------------------
- * 0x10000000 : Block#4 : 64[MB]
- * --------------------------------------------------------
- * 0x14000000 : Block#5 : 64[MB]
- * --------------------------------------------------------
- * 0x18000000 : Block#6 : 64[MB]
- * --------------------------------------------------------
- * 0x1C000000 : Block#7 : 64[MB]
- * --------------------------------------------------------
- * 0xFE000000 : TLB
- *              0xFE000000 : ITLB
- *              0xFE000080 : reserved
- *              0xFE000800 : DTLB
- *              0xFE000880 : reserved
- * --------------------------------------------------------
- * 0xFF000000 : System area
- *              0xFFFF0000 : MMU
- *              0xFFFF0030 : reserved
- *              0xFFFF8000 : Debug function
- *              0xFFFFA000 : reserved
- *              0xFFFFC000 : CPU control
- * 0xFFFFFFFF
- * ========================================================
- */
-
-/*======================================================================*
- * Special Function Register
- *======================================================================*/
-#define M32R_SFR_OFFSET  (0x00E00000)  /* 0x03E00000-0x03EFFFFF 1[MB] */
-
-/*
- * FPGA registers.
- */
-#define M32R_FPGA_TOP  (0x000F0000+M32R_SFR_OFFSET)
-
-#define M32R_FPGA_NUM_OF_CPUS_PORTL  (0x00+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME0_PORTL    (0x10+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME1_PORTL    (0x14+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME2_PORTL    (0x18+M32R_FPGA_TOP)
-#define M32R_FPGA_CPU_NAME3_PORTL    (0x1C+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID0_PORTL    (0x20+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID1_PORTL    (0x24+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID2_PORTL    (0x28+M32R_FPGA_TOP)
-#define M32R_FPGA_MODEL_ID3_PORTL    (0x2C+M32R_FPGA_TOP)
-#define M32R_FPGA_VERSION0_PORTL     (0x30+M32R_FPGA_TOP)
-#define M32R_FPGA_VERSION1_PORTL     (0x34+M32R_FPGA_TOP)
-
-/*
- * Clock and Power Manager registers.
- */
-#define M32R_CPM_OFFSET  (0x000F4000+M32R_SFR_OFFSET)
-
-#define M32R_CPM_CPUCLKCR_PORTL  (0x00+M32R_CPM_OFFSET)
-#define M32R_CPM_CLKMOD_PORTL    (0x04+M32R_CPM_OFFSET)
-#define M32R_CPM_PLLCR_PORTL     (0x08+M32R_CPM_OFFSET)
-
-/*
- * Block SELect Controller registers.
- */
-#define M32R_BSELC_OFFSET  (0x000F5000+M32R_SFR_OFFSET)
-
-#define M32R_BSEL0_CR0_PORTL  (0x000+M32R_BSELC_OFFSET)
-#define M32R_BSEL0_CR1_PORTL  (0x004+M32R_BSELC_OFFSET)
-#define M32R_BSEL1_CR0_PORTL  (0x100+M32R_BSELC_OFFSET)
-#define M32R_BSEL1_CR1_PORTL  (0x104+M32R_BSELC_OFFSET)
-#define M32R_BSEL2_CR0_PORTL  (0x200+M32R_BSELC_OFFSET)
-#define M32R_BSEL2_CR1_PORTL  (0x204+M32R_BSELC_OFFSET)
-#define M32R_BSEL3_CR0_PORTL  (0x300+M32R_BSELC_OFFSET)
-#define M32R_BSEL3_CR1_PORTL  (0x304+M32R_BSELC_OFFSET)
-#define M32R_BSEL4_CR0_PORTL  (0x400+M32R_BSELC_OFFSET)
-#define M32R_BSEL4_CR1_PORTL  (0x404+M32R_BSELC_OFFSET)
-#define M32R_BSEL5_CR0_PORTL  (0x500+M32R_BSELC_OFFSET)
-#define M32R_BSEL5_CR1_PORTL  (0x504+M32R_BSELC_OFFSET)
-#define M32R_BSEL6_CR0_PORTL  (0x600+M32R_BSELC_OFFSET)
-#define M32R_BSEL6_CR1_PORTL  (0x604+M32R_BSELC_OFFSET)
-#define M32R_BSEL7_CR0_PORTL  (0x700+M32R_BSELC_OFFSET)
-#define M32R_BSEL7_CR1_PORTL  (0x704+M32R_BSELC_OFFSET)
-
-/*
- * Multi Function Timer registers.
- */
-#define M32R_MFT_OFFSET        (0x000FC000+M32R_SFR_OFFSET)
-
-#define M32R_MFTCR_PORTL       (0x000+M32R_MFT_OFFSET)  /* MFT control */
-#define M32R_MFTRPR_PORTL      (0x004+M32R_MFT_OFFSET)  /* MFT real port */
-
-#define M32R_MFT0_OFFSET       (0x100+M32R_MFT_OFFSET)
-#define M32R_MFT0MOD_PORTL     (0x00+M32R_MFT0_OFFSET)  /* MFT0 mode */
-#define M32R_MFT0BOS_PORTL     (0x04+M32R_MFT0_OFFSET)  /* MFT0 b-port output status */
-#define M32R_MFT0CUT_PORTL     (0x08+M32R_MFT0_OFFSET)  /* MFT0 count */
-#define M32R_MFT0RLD_PORTL     (0x0C+M32R_MFT0_OFFSET)  /* MFT0 reload */
-#define M32R_MFT0CMPRLD_PORTL  (0x10+M32R_MFT0_OFFSET)  /* MFT0 compare reload */
-
-#define M32R_MFT1_OFFSET       (0x200+M32R_MFT_OFFSET)
-#define M32R_MFT1MOD_PORTL     (0x00+M32R_MFT1_OFFSET)  /* MFT1 mode */
-#define M32R_MFT1BOS_PORTL     (0x04+M32R_MFT1_OFFSET)  /* MFT1 b-port output status */
-#define M32R_MFT1CUT_PORTL     (0x08+M32R_MFT1_OFFSET)  /* MFT1 count */
-#define M32R_MFT1RLD_PORTL     (0x0C+M32R_MFT1_OFFSET)  /* MFT1 reload */
-#define M32R_MFT1CMPRLD_PORTL  (0x10+M32R_MFT1_OFFSET)  /* MFT1 compare reload */
-
-#define M32R_MFT2_OFFSET       (0x300+M32R_MFT_OFFSET)
-#define M32R_MFT2MOD_PORTL     (0x00+M32R_MFT2_OFFSET)  /* MFT2 mode */
-#define M32R_MFT2BOS_PORTL     (0x04+M32R_MFT2_OFFSET)  /* MFT2 b-port output status */
-#define M32R_MFT2CUT_PORTL     (0x08+M32R_MFT2_OFFSET)  /* MFT2 count */
-#define M32R_MFT2RLD_PORTL     (0x0C+M32R_MFT2_OFFSET)  /* MFT2 reload */
-#define M32R_MFT2CMPRLD_PORTL  (0x10+M32R_MFT2_OFFSET)  /* MFT2 compare reload */
-
-#define M32R_MFT3_OFFSET       (0x400+M32R_MFT_OFFSET)
-#define M32R_MFT3MOD_PORTL     (0x00+M32R_MFT3_OFFSET)  /* MFT3 mode */
-#define M32R_MFT3BOS_PORTL     (0x04+M32R_MFT3_OFFSET)  /* MFT3 b-port output status */
-#define M32R_MFT3CUT_PORTL     (0x08+M32R_MFT3_OFFSET)  /* MFT3 count */
-#define M32R_MFT3RLD_PORTL     (0x0C+M32R_MFT3_OFFSET)  /* MFT3 reload */
-#define M32R_MFT3CMPRLD_PORTL  (0x10+M32R_MFT3_OFFSET)  /* MFT3 compare reload */
-
-#define M32R_MFT4_OFFSET       (0x500+M32R_MFT_OFFSET)
-#define M32R_MFT4MOD_PORTL     (0x00+M32R_MFT4_OFFSET)  /* MFT4 mode */
-#define M32R_MFT4BOS_PORTL     (0x04+M32R_MFT4_OFFSET)  /* MFT4 b-port output status */
-#define M32R_MFT4CUT_PORTL     (0x08+M32R_MFT4_OFFSET)  /* MFT4 count */
-#define M32R_MFT4RLD_PORTL     (0x0C+M32R_MFT4_OFFSET)  /* MFT4 reload */
-#define M32R_MFT4CMPRLD_PORTL  (0x10+M32R_MFT4_OFFSET)  /* MFT4 compare reload */
-
-#define M32R_MFT5_OFFSET       (0x600+M32R_MFT_OFFSET)
-#define M32R_MFT5MOD_PORTL     (0x00+M32R_MFT5_OFFSET)  /* MFT4 mode */
-#define M32R_MFT5BOS_PORTL     (0x04+M32R_MFT5_OFFSET)  /* MFT4 b-port output status */
-#define M32R_MFT5CUT_PORTL     (0x08+M32R_MFT5_OFFSET)  /* MFT4 count */
-#define M32R_MFT5RLD_PORTL     (0x0C+M32R_MFT5_OFFSET)  /* MFT4 reload */
-#define M32R_MFT5CMPRLD_PORTL  (0x10+M32R_MFT5_OFFSET)  /* MFT4 compare reload */
-
-#define M32R_MFTCR_MFT0MSK  (1UL<<15)  /* b16 */
-#define M32R_MFTCR_MFT1MSK  (1UL<<14)  /* b17 */
-#define M32R_MFTCR_MFT2MSK  (1UL<<13)  /* b18 */
-#define M32R_MFTCR_MFT3MSK  (1UL<<12)  /* b19 */
-#define M32R_MFTCR_MFT4MSK  (1UL<<11)  /* b20 */
-#define M32R_MFTCR_MFT5MSK  (1UL<<10)  /* b21 */
-#define M32R_MFTCR_MFT0EN   (1UL<<7)   /* b24 */
-#define M32R_MFTCR_MFT1EN   (1UL<<6)   /* b25 */
-#define M32R_MFTCR_MFT2EN   (1UL<<5)   /* b26 */
-#define M32R_MFTCR_MFT3EN   (1UL<<4)   /* b27 */
-#define M32R_MFTCR_MFT4EN   (1UL<<3)   /* b28 */
-#define M32R_MFTCR_MFT5EN   (1UL<<2)   /* b29 */
-
-#define M32R_MFTMOD_CC_MASK    (1UL<<15)  /* b16 */
-#define M32R_MFTMOD_TCCR       (1UL<<13)  /* b18 */
-#define M32R_MFTMOD_GTSEL000   (0UL<<8)   /* b21-23 : 000 */
-#define M32R_MFTMOD_GTSEL001   (1UL<<8)   /* b21-23 : 001 */
-#define M32R_MFTMOD_GTSEL010   (2UL<<8)   /* b21-23 : 010 */
-#define M32R_MFTMOD_GTSEL011   (3UL<<8)   /* b21-23 : 011 */
-#define M32R_MFTMOD_GTSEL110   (6UL<<8)   /* b21-23 : 110 */
-#define M32R_MFTMOD_GTSEL111   (7UL<<8)   /* b21-23 : 111 */
-#define M32R_MFTMOD_CMSEL      (1UL<<3)   /* b28 */
-#define M32R_MFTMOD_CSSEL000   (0UL<<0)   /* b29-b31 : 000 */
-#define M32R_MFTMOD_CSSEL001   (1UL<<0)   /* b29-b31 : 001 */
-#define M32R_MFTMOD_CSSEL010   (2UL<<0)   /* b29-b31 : 010 */
-#define M32R_MFTMOD_CSSEL011   (3UL<<0)   /* b29-b31 : 011 */
-#define M32R_MFTMOD_CSSEL100   (4UL<<0)   /* b29-b31 : 100 */
-#define M32R_MFTMOD_CSSEL110   (6UL<<0)   /* b29-b31 : 110 */
-
-/*
- * Serial I/O registers.
- */
-#define M32R_SIO_OFFSET  (0x000FD000+M32R_SFR_OFFSET)
-
-#define M32R_SIO0_CR_PORTL     (0x000+M32R_SIO_OFFSET)
-#define M32R_SIO0_MOD0_PORTL   (0x004+M32R_SIO_OFFSET)
-#define M32R_SIO0_MOD1_PORTL   (0x008+M32R_SIO_OFFSET)
-#define M32R_SIO0_STS_PORTL    (0x00C+M32R_SIO_OFFSET)
-#define M32R_SIO0_TRCR_PORTL   (0x010+M32R_SIO_OFFSET)
-#define M32R_SIO0_BAUR_PORTL   (0x014+M32R_SIO_OFFSET)
-#define M32R_SIO0_RBAUR_PORTL  (0x018+M32R_SIO_OFFSET)
-#define M32R_SIO0_TXB_PORTL    (0x01C+M32R_SIO_OFFSET)
-#define M32R_SIO0_RXB_PORTL    (0x020+M32R_SIO_OFFSET)
-
-/*
- * Interrupt Control Unit registers.
- */
-#define M32R_ICU_OFFSET  (0x000FF000+M32R_SFR_OFFSET)
-
-#define M32R_ICU_ISTS_PORTL     (0x004+M32R_ICU_OFFSET)
-#define M32R_ICU_IREQ0_PORTL    (0x008+M32R_ICU_OFFSET)
-#define M32R_ICU_IREQ1_PORTL    (0x00C+M32R_ICU_OFFSET)
-#define M32R_ICU_SBICR_PORTL    (0x018+M32R_ICU_OFFSET)
-#define M32R_ICU_IMASK_PORTL    (0x01C+M32R_ICU_OFFSET)
-#define M32R_ICU_CR1_PORTL      (0x200+M32R_ICU_OFFSET)  /* INT0 */
-#define M32R_ICU_CR2_PORTL      (0x204+M32R_ICU_OFFSET)  /* INT1 */
-#define M32R_ICU_CR3_PORTL      (0x208+M32R_ICU_OFFSET)  /* INT2 */
-#define M32R_ICU_CR4_PORTL      (0x20C+M32R_ICU_OFFSET)  /* INT3 */
-#define M32R_ICU_CR5_PORTL      (0x210+M32R_ICU_OFFSET)  /* INT4 */
-#define M32R_ICU_CR6_PORTL      (0x214+M32R_ICU_OFFSET)  /* INT5 */
-#define M32R_ICU_CR7_PORTL      (0x218+M32R_ICU_OFFSET)  /* INT6 */
-#define M32R_ICU_CR8_PORTL      (0x218+M32R_ICU_OFFSET)  /* INT7 */
-#define M32R_ICU_CR32_PORTL     (0x27C+M32R_ICU_OFFSET)  /* SIO0 RX */
-#define M32R_ICU_CR33_PORTL     (0x280+M32R_ICU_OFFSET)  /* SIO0 TX */
-#define M32R_ICU_CR40_PORTL     (0x29C+M32R_ICU_OFFSET)  /* DMAC0 */
-#define M32R_ICU_CR41_PORTL     (0x2A0+M32R_ICU_OFFSET)  /* DMAC1 */
-#define M32R_ICU_CR48_PORTL     (0x2BC+M32R_ICU_OFFSET)  /* MFT0 */
-#define M32R_ICU_CR49_PORTL     (0x2C0+M32R_ICU_OFFSET)  /* MFT1 */
-#define M32R_ICU_CR50_PORTL     (0x2C4+M32R_ICU_OFFSET)  /* MFT2 */
-#define M32R_ICU_CR51_PORTL     (0x2C8+M32R_ICU_OFFSET)  /* MFT3 */
-#define M32R_ICU_CR52_PORTL     (0x2CC+M32R_ICU_OFFSET)  /* MFT4 */
-#define M32R_ICU_CR53_PORTL     (0x2D0+M32R_ICU_OFFSET)  /* MFT5 */
-#define M32R_ICU_IPICR0_PORTL   (0x2DC+M32R_ICU_OFFSET)  /* IPI0 */
-#define M32R_ICU_IPICR1_PORTL   (0x2E0+M32R_ICU_OFFSET)  /* IPI1 */
-#define M32R_ICU_IPICR2_PORTL   (0x2E4+M32R_ICU_OFFSET)  /* IPI2 */
-#define M32R_ICU_IPICR3_PORTL   (0x2E8+M32R_ICU_OFFSET)  /* IPI3 */
-#define M32R_ICU_IPICR4_PORTL   (0x2EC+M32R_ICU_OFFSET)  /* IPI4 */
-#define M32R_ICU_IPICR5_PORTL   (0x2F0+M32R_ICU_OFFSET)  /* IPI5 */
-#define M32R_ICU_IPICR6_PORTL   (0x2F4+M32R_ICU_OFFSET)  /* IPI6 */
-#define M32R_ICU_IPICR7_PORTL   (0x2FC+M32R_ICU_OFFSET)  /* IPI7 */
-
-#define M32R_ICUISTS_VECB(val)  ((val>>28) & 0xF)
-#define M32R_ICUISTS_ISN(val)   ((val>>22) & 0x3F)
-#define M32R_ICUISTS_PIML(val)  ((val>>16) & 0x7)
-
-#define M32R_ICUIMASK_IMSK0  (0UL<<16)  /* b13-b15: Disable interrupt */
-#define M32R_ICUIMASK_IMSK1  (1UL<<16)  /* b13-b15: Enable level 0 interrupt */
-#define M32R_ICUIMASK_IMSK2  (2UL<<16)  /* b13-b15: Enable level 0,1 interrupt */
-#define M32R_ICUIMASK_IMSK3  (3UL<<16)  /* b13-b15: Enable level 0-2 interrupt */
-#define M32R_ICUIMASK_IMSK4  (4UL<<16)  /* b13-b15: Enable level 0-3 interrupt */
-#define M32R_ICUIMASK_IMSK5  (5UL<<16)  /* b13-b15: Enable level 0-4 interrupt */
-#define M32R_ICUIMASK_IMSK6  (6UL<<16)  /* b13-b15: Enable level 0-5 interrupt */
-#define M32R_ICUIMASK_IMSK7  (7UL<<16)  /* b13-b15: Enable level 0-6 interrupt */
-
-#define M32R_ICUCR_IEN      (1UL<<12)  /* b19: Interrupt enable */
-#define M32R_ICUCR_IRQ      (1UL<<8)   /* b23: Interrupt request */
-#define M32R_ICUCR_ISMOD00  (0UL<<4)   /* b26-b27: Interrupt sense mode Edge HtoL */
-#define M32R_ICUCR_ISMOD01  (1UL<<4)   /* b26-b27: Interrupt sense mode Level L */
-#define M32R_ICUCR_ISMOD10  (2UL<<4)   /* b26-b27: Interrupt sense mode Edge LtoH*/
-#define M32R_ICUCR_ISMOD11  (3UL<<4)   /* b26-b27: Interrupt sense mode Level H */
-#define M32R_ICUCR_ILEVEL0  (0UL<<0)   /* b29-b31: Interrupt priority level 0 */
-#define M32R_ICUCR_ILEVEL1  (1UL<<0)   /* b29-b31: Interrupt priority level 1 */
-#define M32R_ICUCR_ILEVEL2  (2UL<<0)   /* b29-b31: Interrupt priority level 2 */
-#define M32R_ICUCR_ILEVEL3  (3UL<<0)   /* b29-b31: Interrupt priority level 3 */
-#define M32R_ICUCR_ILEVEL4  (4UL<<0)   /* b29-b31: Interrupt priority level 4 */
-#define M32R_ICUCR_ILEVEL5  (5UL<<0)   /* b29-b31: Interrupt priority level 5 */
-#define M32R_ICUCR_ILEVEL6  (6UL<<0)   /* b29-b31: Interrupt priority level 6 */
-#define M32R_ICUCR_ILEVEL7  (7UL<<0)   /* b29-b31: Disable interrupt */
-#define M32R_ICUCR_ILEVEL_MASK  (7UL)
-
-#define M32R_IRQ_INT0    (1)   /* INT0 */
-#define M32R_IRQ_INT1    (2)   /* INT1 */
-#define M32R_IRQ_INT2    (3)   /* INT2 */
-#define M32R_IRQ_INT3    (4)   /* INT3 */
-#define M32R_IRQ_INT4    (5)   /* INT4 */
-#define M32R_IRQ_INT5    (6)   /* INT5 */
-#define M32R_IRQ_INT6    (7)   /* INT6 */
-#define M32R_IRQ_INT7    (8)   /* INT7 */
-#define M32R_IRQ_MFT0    (16)  /* MFT0 */
-#define M32R_IRQ_MFT1    (17)  /* MFT1 */
-#define M32R_IRQ_MFT2    (18)  /* MFT2 */
-#define M32R_IRQ_MFT3    (19)  /* MFT3 */
-#define M32R_IRQ_MFT4    (20)  /* MFT4 */
-#define M32R_IRQ_MFT5    (21)  /* MFT5 */
-#define M32R_IRQ_DMAC0   (32)  /* DMAC0 */
-#define M32R_IRQ_DMAC1   (33)  /* DMAC1 */
-#define M32R_IRQ_SIO0_R  (48)  /* SIO0 receive */
-#define M32R_IRQ_SIO0_S  (49)  /* SIO0 send    */
-#define M32R_IRQ_SIO1_R  (50)  /* SIO1 send    */
-#define M32R_IRQ_SIO1_S  (51)  /* SIO1 receive */
-#define M32R_IRQ_IPI0    (56)  /* IPI0 */
-#define M32R_IRQ_IPI1    (57)  /* IPI1 */
-#define M32R_IRQ_IPI2    (58)  /* IPI2 */
-#define M32R_IRQ_IPI3    (59)  /* IPI3 */
-#define M32R_IRQ_IPI4    (60)  /* IPI4 */
-#define M32R_IRQ_IPI5    (61)  /* IPI5 */
-#define M32R_IRQ_IPI6    (62)  /* IPI6 */
-#define M32R_IRQ_IPI7    (63)  /* IPI7 */
-
-/*======================================================================*
- * CPU
- *======================================================================*/
-
-#define M32R_CPUID_PORTL   (0xFFFFFFE0)
-#define M32R_MCICAR_PORTL  (0xFFFFFFF0)
-#define M32R_MCDCAR_PORTL  (0xFFFFFFF4)
-#define M32R_MCCR_PORTL    (0xFFFFFFFC)
-
-#endif  /* _ASM_M32R_M32R_MP_FPGA_ */
diff --git a/include/asm-m32r/mappi2/mappi2_pld.h b/include/asm-m32r/mappi2/mappi2_pld.h
deleted file mode 100644
index 2624c9db7255..000000000000
--- a/include/asm-m32r/mappi2/mappi2_pld.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef _MAPPI2_PLD_H
-#define _MAPPI2_PLD_H
-
-/*
- * include/asm-m32r/mappi2/mappi2_pld.h
- *
- * Definitions for Extended IO Logic on MAPPI2 board.
- *  based on m32700ut_pld.h
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/* FIXME:
- * Some C functions use non-cache address, so can't define non-cache address.
- */
-#define PLD_BASE                (0x10c00000 /* + NONCACHE_OFFSET */)
-#define __reg8                  (volatile unsigned char *)
-#define __reg16                 (volatile unsigned short *)
-#define __reg32                 (volatile unsigned int *)
-#else
-#define PLD_BASE                (0x10c00000 + NONCACHE_OFFSET)
-#define __reg8
-#define __reg16
-#define __reg32
-#endif /* __ASSEMBLY__ */
-
-/* CFC */
-#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
-#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
-#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
-#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
-#define PLD_CFCR0               __reg16(PLD_BASE + 0x000a)
-#define PLD_CFCR1               __reg16(PLD_BASE + 0x000c)
-
-/* MMC */
-#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
-#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
-#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
-#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
-#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
-#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
-#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
-#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
-#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
-#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
-#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
-#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
-
-/* Power Control of MMC and CF */
-#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
-
-
-/*==== ICU ====*/
-#define  M32R_IRQ_PC104        (5)   /* INT4(PC/104) */
-#define  M32R_IRQ_I2C          (28)  /* I2C-BUS     */
-#if 1
-#define  PLD_IRQ_CFIREQ       (40)  /* CFC Card Interrupt */
-#define  PLD_IRQ_CFC_INSERT   (41)  /* CFC Card Insert */
-#define  PLD_IRQ_CFC_EJECT    (42)  /* CFC Card Eject */
-#define  PLD_IRQ_MMCCARD      (43)  /* MMC Card Insert */
-#define  PLD_IRQ_MMCIRQ       (44)  /* MMC Transfer Done */
-#else
-#define  PLD_IRQ_CFIREQ       (34)  /* CFC Card Interrupt */
-#define  PLD_IRQ_CFC_INSERT   (35)  /* CFC Card Insert */
-#define  PLD_IRQ_CFC_EJECT    (36)  /* CFC Card Eject */
-#define  PLD_IRQ_MMCCARD      (37)  /* MMC Card Insert */
-#define  PLD_IRQ_MMCIRQ       (38)  /* MMC Transfer Done */
-#endif
-
-
-#if 0
-/* LED Control
- *
- * 1: DIP swich side
- * 2: Reset switch side
- */
-#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
-#define PLD_IOLED_1_ON          0x001
-#define PLD_IOLED_1_OFF         0x000
-#define PLD_IOLED_2_ON          0x002
-#define PLD_IOLED_2_OFF         0x000
-
-/* DIP Switch
- *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
- *  1: -
- *  2: -
- *  3: -
- */
-#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
-#define PLD_IOSWSTS_IOSW2       0x0200
-#define PLD_IOSWSTS_IOSW1       0x0100
-#define PLD_IOSWSTS_IOWP0       0x0001
-
-#endif
-
-/* CRC */
-#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
-#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
-#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
-#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
-#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
-#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
-
-
-#if 0
-/* RTC */
-#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
-#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
-#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
-#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
-#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
-
-/* SIO0 */
-#define PLD_ESIO0CR             __reg16(PLD_BASE + 0x20000)
-#define PLD_ESIO0CR_TXEN        0x0001
-#define PLD_ESIO0CR_RXEN        0x0002
-#define PLD_ESIO0MOD0           __reg16(PLD_BASE + 0x20002)
-#define PLD_ESIO0MOD0_CTSS      0x0040
-#define PLD_ESIO0MOD0_RTSS      0x0080
-#define PLD_ESIO0MOD1           __reg16(PLD_BASE + 0x20004)
-#define PLD_ESIO0MOD1_LMFS      0x0010
-#define PLD_ESIO0STS            __reg16(PLD_BASE + 0x20006)
-#define PLD_ESIO0STS_TEMP       0x0001
-#define PLD_ESIO0STS_TXCP       0x0002
-#define PLD_ESIO0STS_RXCP       0x0004
-#define PLD_ESIO0STS_TXSC       0x0100
-#define PLD_ESIO0STS_RXSC       0x0200
-#define PLD_ESIO0STS_TXREADY    (PLD_ESIO0STS_TXCP | PLD_ESIO0STS_TEMP)
-#define PLD_ESIO0INTCR          __reg16(PLD_BASE + 0x20008)
-#define PLD_ESIO0INTCR_TXIEN    0x0002
-#define PLD_ESIO0INTCR_RXCEN    0x0004
-#define PLD_ESIO0BAUR           __reg16(PLD_BASE + 0x2000a)
-#define PLD_ESIO0TXB            __reg16(PLD_BASE + 0x2000c)
-#define PLD_ESIO0RXB            __reg16(PLD_BASE + 0x2000e)
-
-/* SIM Card */
-#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
-#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
-#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
-#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
-#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
-#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
-#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
-
-#endif
-
-#endif /* _MAPPI2_PLD.H */
diff --git a/include/asm-m32r/mappi3/mappi3_pld.h b/include/asm-m32r/mappi3/mappi3_pld.h
deleted file mode 100644
index 451c40ee70af..000000000000
--- a/include/asm-m32r/mappi3/mappi3_pld.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef _MAPPI3_PLD_H
-#define _MAPPI3_PLD_H
-
-/*
- * include/asm-m32r/mappi3/mappi3_pld.h
- *
- * Definitions for Extended IO Logic on MAPPI3 board.
- *  based on m32700ut_pld.h
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/* FIXME:
- * Some C functions use non-cache address, so can't define non-cache address.
- */
-#define PLD_BASE                (0x1c000000 /* + NONCACHE_OFFSET */)
-#define __reg8                  (volatile unsigned char *)
-#define __reg16                 (volatile unsigned short *)
-#define __reg32                 (volatile unsigned int *)
-#else
-#define PLD_BASE                (0x1c000000 + NONCACHE_OFFSET)
-#define __reg8
-#define __reg16
-#define __reg32
-#endif /* __ASSEMBLY__ */
-
-/* CFC */
-#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
-#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
-#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
-#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
-#define PLD_CFCR0               __reg16(PLD_BASE + 0x000a)
-#define PLD_CFCR1               __reg16(PLD_BASE + 0x000c)
-
-/* MMC */
-#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
-#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
-#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
-#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
-#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
-#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
-#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
-#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
-#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
-#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
-#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
-#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
-
-/* Power Control of MMC and CF */
-#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
-
-/* ICU */
-#define M32R_IRQ_PC104          (5)     /* INT4(PC/104) */
-#define M32R_IRQ_I2C            (28)    /* I2C-BUS */
-#define PLD_IRQ_CFIREQ          (6)     /* INT5 CFC Card Interrupt */
-#define PLD_IRQ_CFC_INSERT      (7)     /* INT6 CFC Card Insert & Eject */
-#define PLD_IRQ_IDEIREQ         (8)     /* INT7 IDE Interrupt */
-#define PLD_IRQ_MMCCARD         (43)    /* MMC Card Insert */
-#define PLD_IRQ_MMCIRQ          (44)    /* MMC Transfer Done */
-
-#if 0
-/* LED Control
- *
- * 1: DIP swich side
- * 2: Reset switch side
- */
-#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
-#define PLD_IOLED_1_ON          0x001
-#define PLD_IOLED_1_OFF         0x000
-#define PLD_IOLED_2_ON          0x002
-#define PLD_IOLED_2_OFF         0x000
-
-/* DIP Switch
- *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
- *  1: -
- *  2: -
- *  3: -
- */
-#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
-#define PLD_IOSWSTS_IOSW2       0x0200
-#define PLD_IOSWSTS_IOSW1       0x0100
-#define PLD_IOSWSTS_IOWP0       0x0001
-
-#endif
-
-/* CRC */
-#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
-#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
-#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
-#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
-#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
-#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
-
-#if 0
-/* RTC */
-#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
-#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
-#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
-#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
-#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
-
-/* SIO0 */
-#define PLD_ESIO0CR             __reg16(PLD_BASE + 0x20000)
-#define PLD_ESIO0CR_TXEN        0x0001
-#define PLD_ESIO0CR_RXEN        0x0002
-#define PLD_ESIO0MOD0           __reg16(PLD_BASE + 0x20002)
-#define PLD_ESIO0MOD0_CTSS      0x0040
-#define PLD_ESIO0MOD0_RTSS      0x0080
-#define PLD_ESIO0MOD1           __reg16(PLD_BASE + 0x20004)
-#define PLD_ESIO0MOD1_LMFS      0x0010
-#define PLD_ESIO0STS            __reg16(PLD_BASE + 0x20006)
-#define PLD_ESIO0STS_TEMP       0x0001
-#define PLD_ESIO0STS_TXCP       0x0002
-#define PLD_ESIO0STS_RXCP       0x0004
-#define PLD_ESIO0STS_TXSC       0x0100
-#define PLD_ESIO0STS_RXSC       0x0200
-#define PLD_ESIO0STS_TXREADY    (PLD_ESIO0STS_TXCP | PLD_ESIO0STS_TEMP)
-#define PLD_ESIO0INTCR          __reg16(PLD_BASE + 0x20008)
-#define PLD_ESIO0INTCR_TXIEN    0x0002
-#define PLD_ESIO0INTCR_RXCEN    0x0004
-#define PLD_ESIO0BAUR           __reg16(PLD_BASE + 0x2000a)
-#define PLD_ESIO0TXB            __reg16(PLD_BASE + 0x2000c)
-#define PLD_ESIO0RXB            __reg16(PLD_BASE + 0x2000e)
-
-/* SIM Card */
-#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
-#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
-#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
-#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
-#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
-#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
-#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
-
-#endif
-
-/* Reset Control */
-#define PLD_REBOOT              __reg16(PLD_BASE + 0x38000)
-
-#endif /* _MAPPI3_PLD.H */
diff --git a/include/asm-m32r/mc146818rtc.h b/include/asm-m32r/mc146818rtc.h
deleted file mode 100644
index aa1b7bf84f51..000000000000
--- a/include/asm-m32r/mc146818rtc.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#include <asm/io.h>
-
-#ifndef RTC_PORT
-#define RTC_PORT(x)     ((x))
-#define RTC_ALWAYS_BCD  1       /* RTC operates in binary mode */
-#endif
-
-/*
- * The yet supported machines all access the RTC index register via
- * an ISA port access but the way to access the date register differs ...
- */
-#define CMOS_READ(addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-outb_p((val),RTC_PORT(1)); \
-})
-
-#define RTC_IRQ 8
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/include/asm-m32r/mman.h b/include/asm-m32r/mman.h
deleted file mode 100644
index 516a8973b130..000000000000
--- a/include/asm-m32r/mman.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __M32R_MMAN_H__
-#define __M32R_MMAN_H__
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MAP_LOCKED      0x2000          /* pages are locked */
-#define MAP_NORESERVE   0x4000          /* don't check for reservations */
-#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
-
-#endif /* __M32R_MMAN_H__ */
diff --git a/include/asm-m32r/mmu.h b/include/asm-m32r/mmu.h
deleted file mode 100644
index 150cb92bb666..000000000000
--- a/include/asm-m32r/mmu.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _ASM_M32R_MMU_H
-#define _ASM_M32R_MMU_H
-
-#if !defined(CONFIG_MMU)
-
-typedef struct {
-        unsigned long           end_brk;
-} mm_context_t;
-
-#else /* CONFIG_MMU */
-
-/* Default "unsigned long" context */
-#ifndef CONFIG_SMP
-typedef unsigned long mm_context_t;
-#else
-typedef unsigned long mm_context_t[NR_CPUS];
-#endif
-
-#endif /* CONFIG_MMU */
-
-#endif /* _ASM_M32R_MMU_H */
diff --git a/include/asm-m32r/mmu_context.h b/include/asm-m32r/mmu_context.h
deleted file mode 100644
index 91909e5dd9d0..000000000000
--- a/include/asm-m32r/mmu_context.h
+++ /dev/null
@@ -1,164 +0,0 @@
-#ifndef _ASM_M32R_MMU_CONTEXT_H
-#define _ASM_M32R_MMU_CONTEXT_H
-#ifdef __KERNEL__
-
-#include <asm/m32r.h>
-
-#define MMU_CONTEXT_ASID_MASK      (0x000000FF)
-#define MMU_CONTEXT_VERSION_MASK   (0xFFFFFF00)
-#define MMU_CONTEXT_FIRST_VERSION  (0x00000100)
-#define NO_CONTEXT                 (0x00000000)
-
-#ifndef __ASSEMBLY__
-
-#include <asm/atomic.h>
-#include <asm/pgalloc.h>
-#include <asm/mmu.h>
-#include <asm/tlbflush.h>
-#include <asm-generic/mm_hooks.h>
-
-/*
- * Cache of MMU context last used.
- */
-#ifndef CONFIG_SMP
-extern unsigned long mmu_context_cache_dat;
-#define mmu_context_cache       mmu_context_cache_dat
-#define mm_context(mm)          mm->context
-#else /* not CONFIG_SMP */
-extern unsigned long mmu_context_cache_dat[];
-#define mmu_context_cache       mmu_context_cache_dat[smp_processor_id()]
-#define mm_context(mm)          mm->context[smp_processor_id()]
-#endif /* not CONFIG_SMP */
-
-#define set_tlb_tag(entry, tag)         (*entry = (tag & PAGE_MASK)|get_asid())
-#define set_tlb_data(entry, data)       (*entry = (data | _PAGE_PRESENT))
-
-#ifdef CONFIG_MMU
-#define enter_lazy_tlb(mm, tsk) do { } while (0)
-
-static inline void get_new_mmu_context(struct mm_struct *mm)
-{
-        unsigned long mc = ++mmu_context_cache;
-
-        if (!(mc & MMU_CONTEXT_ASID_MASK)) {
-                /* We exhaust ASID of this version.
-                   Flush all TLB and start new cycle. */
-                local_flush_tlb_all();
-                /* Fix version if needed.
-                   Note that we avoid version #0 to distingush NO_CONTEXT. */
-                if (!mc)
-                        mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
-        }
-        mm_context(mm) = mc;
-}
-
-/*
- * Get MMU context if needed.
- */
-static inline void get_mmu_context(struct mm_struct *mm)
-{
-        if (mm) {
-                unsigned long mc = mmu_context_cache;
-
-                /* Check if we have old version of context.
-                   If it's old, we need to get new context with new version. */
-                if ((mm_context(mm) ^ mc) & MMU_CONTEXT_VERSION_MASK)
-                        get_new_mmu_context(mm);
-        }
-}
-
-/*
- * Initialize the context related info for a new mm_struct
- * instance.
- */
-static inline int init_new_context(struct task_struct *tsk,
-        struct mm_struct *mm)
-{
-#ifndef CONFIG_SMP
-        mm->context = NO_CONTEXT;
-#else /* CONFIG_SMP */
-        int num_cpus = num_online_cpus();
-        int i;
-
-        for (i = 0 ; i < num_cpus ; i++)
-                mm->context[i] = NO_CONTEXT;
-#endif /* CONFIG_SMP */
-
-        return 0;
-}
-
-/*
- * Destroy context related info for an mm_struct that is about
- * to be put to rest.
- */
-#define destroy_context(mm)     do { } while (0)
-
-static inline void set_asid(unsigned long asid)
-{
-        *(volatile unsigned long *)MASID = (asid & MMU_CONTEXT_ASID_MASK);
-}
-
-static inline unsigned long get_asid(void)
-{
-        unsigned long asid;
-
-        asid = *(volatile long *)MASID;
-        asid &= MMU_CONTEXT_ASID_MASK;
-
-        return asid;
-}
-
-/*
- * After we have set current->mm to a new value, this activates
- * the context for the new mm so we see the new mappings.
- */
-static inline void activate_context(struct mm_struct *mm)
-{
-        get_mmu_context(mm);
-        set_asid(mm_context(mm) & MMU_CONTEXT_ASID_MASK);
-}
-
-static inline void switch_mm(struct mm_struct *prev,
-        struct mm_struct *next, struct task_struct *tsk)
-{
-#ifdef CONFIG_SMP
-        int cpu = smp_processor_id();
-#endif  /* CONFIG_SMP */
-
-        if (prev != next) {
-#ifdef CONFIG_SMP
-                cpu_set(cpu, next->cpu_vm_mask);
-#endif /* CONFIG_SMP */
-                /* Set MPTB = next->pgd */
-                *(volatile unsigned long *)MPTB = (unsigned long)next->pgd;
-                activate_context(next);
-        }
-#ifdef CONFIG_SMP
-        else
-                if (!cpu_test_and_set(cpu, next->cpu_vm_mask))
-                        activate_context(next);
-#endif /* CONFIG_SMP */
-}
-
-#define deactivate_mm(tsk, mm)  do { } while (0)
-
-#define activate_mm(prev, next) \
-        switch_mm((prev), (next), NULL)
-
-#else /* not CONFIG_MMU */
-#define get_mmu_context(mm)             do { } while (0)
-#define init_new_context(tsk,mm)        (0)
-#define destroy_context(mm)             do { } while (0)
-#define set_asid(asid)                  do { } while (0)
-#define get_asid()                      (0)
-#define activate_context(mm)            do { } while (0)
-#define switch_mm(prev,next,tsk)        do { } while (0)
-#define deactivate_mm(mm,tsk)           do { } while (0)
-#define activate_mm(prev,next)          do { } while (0)
-#define enter_lazy_tlb(mm,tsk)          do { } while (0)
-#endif /* not CONFIG_MMU */
-
-#endif /* not __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_M32R_MMU_CONTEXT_H */
diff --git a/include/asm-m32r/mmzone.h b/include/asm-m32r/mmzone.h
deleted file mode 100644
index 9f3b5accda88..000000000000
--- a/include/asm-m32r/mmzone.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Written by Pat Gaughen (gone@us.ibm.com) Mar 2002
- *
- */
-
-#ifndef _ASM_MMZONE_H_
-#define _ASM_MMZONE_H_
-
-#include <asm/smp.h>
-
-#ifdef CONFIG_DISCONTIGMEM
-
-extern struct pglist_data *node_data[];
-#define NODE_DATA(nid)          (node_data[nid])
-
-#define node_localnr(pfn, nid)  ((pfn) - NODE_DATA(nid)->node_start_pfn)
-#define node_start_pfn(nid)     (NODE_DATA(nid)->node_start_pfn)
-#define node_end_pfn(nid)                                               \
-({                                                                      \
-        pg_data_t *__pgdat = NODE_DATA(nid);                            \
-        __pgdat->node_start_pfn + __pgdat->node_spanned_pages - 1;      \
-})
-
-#define pmd_page(pmd)           (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
-/*
- * pfn_valid should be made as fast as possible, and the current definition
- * is valid for machines that are NUMA, but still contiguous, which is what
- * is currently supported. A more generalised, but slower definition would
- * be something like this - mbligh:
- * ( pfn_to_pgdat(pfn) && ((pfn) < node_end_pfn(pfn_to_nid(pfn))) )
- */
-#if 1   /* M32R_FIXME */
-#define pfn_valid(pfn)  (1)
-#else
-#define pfn_valid(pfn)  ((pfn) < num_physpages)
-#endif
-
-/*
- * generic node memory support, the following assumptions apply:
- */
-
-static __inline__ int pfn_to_nid(unsigned long pfn)
-{
-        int node;
-
-        for (node = 0 ; node < MAX_NUMNODES ; node++)
-                if (pfn >= node_start_pfn(node) && pfn <= node_end_pfn(node))
-                        break;
-
-        return node;
-}
-
-static __inline__ struct pglist_data *pfn_to_pgdat(unsigned long pfn)
-{
-        return(NODE_DATA(pfn_to_nid(pfn)));
-}
-
-#endif /* CONFIG_DISCONTIGMEM */
-#endif /* _ASM_MMZONE_H_ */
diff --git a/include/asm-m32r/module.h b/include/asm-m32r/module.h
deleted file mode 100644
index eb73ee011215..000000000000
--- a/include/asm-m32r/module.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_MODULE_H
-#define _ASM_M32R_MODULE_H
-
-struct mod_arch_specific { };
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-
-#endif /* _ASM_M32R_MODULE_H */
diff --git a/include/asm-m32r/msgbuf.h b/include/asm-m32r/msgbuf.h
deleted file mode 100644
index 0d5a877b813e..000000000000
--- a/include/asm-m32r/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _ASM_M32R_MSGBUF_H
-#define _ASM_M32R_MSGBUF_H
-
-/*
- * The msqid64_ds structure for m32r architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        unsigned long   __unused1;
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        unsigned long   __unused2;
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long   __unused3;
-        unsigned long  msg_cbytes;      /* current number of bytes on queue */
-        unsigned long  msg_qnum;        /* number of messages in queue */
-        unsigned long  msg_qbytes;      /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-#endif /* _ASM_M32R_MSGBUF_H */
diff --git a/include/asm-m32r/mutex.h b/include/asm-m32r/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/include/asm-m32r/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/include/asm-m32r/opsput/opsput_lan.h b/include/asm-m32r/opsput/opsput_lan.h
deleted file mode 100644
index a5f18dd1ab20..000000000000
--- a/include/asm-m32r/opsput/opsput_lan.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _OPSPUT_OPSPUT_LAN_H
-#define _OPSPUT_OPSPUT_LAN_H
-
-/*
- * include/asm-m32r/opsput/opsput_lan.h
- *
- * OPSPUT-LAN board
- *
- * Copyright (c) 2002-2004      Takeo Takahashi, Mamoru Sakugawa
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define OPSPUT_LAN_BASE (0x10000000 /* + NONCACHE_OFFSET */)
-#else
-#define OPSPUT_LAN_BASE (0x10000000 + NONCACHE_OFFSET)
-#endif /* __ASSEMBLY__ */
-
-/* ICU
- *  ICUISTS:    status register
- *  ICUIREQ0:   request register
- *  ICUIREQ1:   request register
- *  ICUCR3:     control register for CFIREQ# interrupt
- *  ICUCR4:     control register for CFC Card insert interrupt
- *  ICUCR5:     control register for CFC Card eject interrupt
- *  ICUCR6:     control register for external interrupt
- *  ICUCR11:    control register for MMC Card insert/eject interrupt
- *  ICUCR13:    control register for SC error interrupt
- *  ICUCR14:    control register for SC receive interrupt
- *  ICUCR15:    control register for SC send interrupt
- *  ICUCR16:    control register for SIO0 receive interrupt
- *  ICUCR17:    control register for SIO0 send interrupt
- */
-#define OPSPUT_LAN_IRQ_LAN      (OPSPUT_LAN_PLD_IRQ_BASE + 1)   /* LAN */
-#define OPSPUT_LAN_IRQ_I2C      (OPSPUT_LAN_PLD_IRQ_BASE + 3)   /* I2C */
-
-#define OPSPUT_LAN_ICUISTS      __reg16(OPSPUT_LAN_BASE + 0xc0002)
-#define OPSPUT_LAN_ICUISTS_VECB_MASK    (0xf000)
-#define OPSPUT_LAN_VECB(x)      ((x) & OPSPUT_LAN_ICUISTS_VECB_MASK)
-#define OPSPUT_LAN_ICUISTS_ISN_MASK     (0x07c0)
-#define OPSPUT_LAN_ICUISTS_ISN(x)       ((x) & OPSPUT_LAN_ICUISTS_ISN_MASK)
-#define OPSPUT_LAN_ICUIREQ0     __reg16(OPSPUT_LAN_BASE + 0xc0004)
-#define OPSPUT_LAN_ICUCR1       __reg16(OPSPUT_LAN_BASE + 0xc0010)
-#define OPSPUT_LAN_ICUCR3       __reg16(OPSPUT_LAN_BASE + 0xc0014)
-
-#endif /* _OPSPUT_OPSPUT_LAN_H */
diff --git a/include/asm-m32r/opsput/opsput_lcd.h b/include/asm-m32r/opsput/opsput_lcd.h
deleted file mode 100644
index 369c9f0832a6..000000000000
--- a/include/asm-m32r/opsput/opsput_lcd.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _OPSPUT_OPSPUT_LCD_H
-#define _OPSPUT_OPSPUT_LCD_H
-
-/*
- * include/asm-m32r/opsput/opsput_lcd.h
- *
- * OPSPUT-LCD board
- *
- * Copyright (c) 2002   Takeo Takahashi
- *
- * 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.
- */
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define OPSPUT_LCD_BASE (0x10000000 /* + NONCACHE_OFFSET */)
-#else
-#define OPSPUT_LCD_BASE (0x10000000 + NONCACHE_OFFSET)
-#endif /* __ASSEMBLY__ */
-
-/*
- * ICU
- */
-#define OPSPUT_LCD_IRQ_BAT_INT  (OPSPUT_LCD_PLD_IRQ_BASE + 1)
-#define OPSPUT_LCD_IRQ_USB_INT1 (OPSPUT_LCD_PLD_IRQ_BASE + 2)
-#define OPSPUT_LCD_IRQ_AUDT0            (OPSPUT_LCD_PLD_IRQ_BASE + 3)
-#define OPSPUT_LCD_IRQ_AUDT2            (OPSPUT_LCD_PLD_IRQ_BASE + 4)
-#define OPSPUT_LCD_IRQ_BATSIO_RCV       (OPSPUT_LCD_PLD_IRQ_BASE + 16)
-#define OPSPUT_LCD_IRQ_BATSIO_SND       (OPSPUT_LCD_PLD_IRQ_BASE + 17)
-#define OPSPUT_LCD_IRQ_ASNDSIO_RCV      (OPSPUT_LCD_PLD_IRQ_BASE + 18)
-#define OPSPUT_LCD_IRQ_ASNDSIO_SND      (OPSPUT_LCD_PLD_IRQ_BASE + 19)
-#define OPSPUT_LCD_IRQ_ACNLSIO_SND      (OPSPUT_LCD_PLD_IRQ_BASE + 21)
-
-#define OPSPUT_LCD_ICUISTS      __reg16(OPSPUT_LCD_BASE + 0x300002)
-#define OPSPUT_LCD_ICUISTS_VECB_MASK    (0xf000)
-#define OPSPUT_LCD_VECB(x)      ((x) & OPSPUT_LCD_ICUISTS_VECB_MASK)
-#define OPSPUT_LCD_ICUISTS_ISN_MASK     (0x07c0)
-#define OPSPUT_LCD_ICUISTS_ISN(x)       ((x) & OPSPUT_LCD_ICUISTS_ISN_MASK)
-#define OPSPUT_LCD_ICUIREQ0     __reg16(OPSPUT_LCD_BASE + 0x300004)
-#define OPSPUT_LCD_ICUIREQ1     __reg16(OPSPUT_LCD_BASE + 0x300006)
-#define OPSPUT_LCD_ICUCR1       __reg16(OPSPUT_LCD_BASE + 0x300020)
-#define OPSPUT_LCD_ICUCR2       __reg16(OPSPUT_LCD_BASE + 0x300022)
-#define OPSPUT_LCD_ICUCR3       __reg16(OPSPUT_LCD_BASE + 0x300024)
-#define OPSPUT_LCD_ICUCR4       __reg16(OPSPUT_LCD_BASE + 0x300026)
-#define OPSPUT_LCD_ICUCR16      __reg16(OPSPUT_LCD_BASE + 0x300030)
-#define OPSPUT_LCD_ICUCR17      __reg16(OPSPUT_LCD_BASE + 0x300032)
-#define OPSPUT_LCD_ICUCR18      __reg16(OPSPUT_LCD_BASE + 0x300034)
-#define OPSPUT_LCD_ICUCR19      __reg16(OPSPUT_LCD_BASE + 0x300036)
-#define OPSPUT_LCD_ICUCR21      __reg16(OPSPUT_LCD_BASE + 0x30003a)
-
-#endif /* _OPSPUT_OPSPUT_LCD_H */
diff --git a/include/asm-m32r/opsput/opsput_pld.h b/include/asm-m32r/opsput/opsput_pld.h
deleted file mode 100644
index 3f11ea1aac2d..000000000000
--- a/include/asm-m32r/opsput/opsput_pld.h
+++ /dev/null
@@ -1,255 +0,0 @@
-#ifndef _OPSPUT_OPSPUT_PLD_H
-#define _OPSPUT_OPSPUT_PLD_H
-
-/*
- * include/asm-m32r/opsput/opsput_pld.h
- *
- * Definitions for Programable Logic Device(PLD) on OPSPUT board.
- *
- * Copyright (c) 2002   Takeo Takahashi
- *
- * 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.
- */
-
-#define PLD_PLAT_BASE           0x1cc00000
-
-#ifndef __ASSEMBLY__
-/*
- * C functions use non-cache address.
- */
-#define PLD_BASE                (PLD_PLAT_BASE /* + NONCACHE_OFFSET */)
-#define __reg8                  (volatile unsigned char *)
-#define __reg16                 (volatile unsigned short *)
-#define __reg32                 (volatile unsigned int *)
-#else
-#define PLD_BASE                (PLD_PLAT_BASE + NONCACHE_OFFSET)
-#define __reg8
-#define __reg16
-#define __reg32
-#endif /* __ASSEMBLY__ */
-
-/* CFC */
-#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
-#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
-#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
-#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
-#define PLD_CFVENCR             __reg16(PLD_BASE + 0x0008)
-#define PLD_CFCR0               __reg16(PLD_BASE + 0x000a)
-#define PLD_CFCR1               __reg16(PLD_BASE + 0x000c)
-#define PLD_IDERSTCR            __reg16(PLD_BASE + 0x0010)
-
-/* MMC */
-#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
-#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
-#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
-#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
-#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
-#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
-#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
-#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
-#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
-#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
-#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
-#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
-
-/* ICU
- *  ICUISTS:    status register
- *  ICUIREQ0:   request register
- *  ICUIREQ1:   request register
- *  ICUCR3:     control register for CFIREQ# interrupt
- *  ICUCR4:     control register for CFC Card insert interrupt
- *  ICUCR5:     control register for CFC Card eject interrupt
- *  ICUCR6:     control register for external interrupt
- *  ICUCR11:    control register for MMC Card insert/eject interrupt
- *  ICUCR13:    control register for SC error interrupt
- *  ICUCR14:    control register for SC receive interrupt
- *  ICUCR15:    control register for SC send interrupt
- *  ICUCR16:    control register for SIO0 receive interrupt
- *  ICUCR17:    control register for SIO0 send interrupt
- */
-#if !defined(CONFIG_PLAT_USRV)
-#define PLD_IRQ_INT0            (OPSPUT_PLD_IRQ_BASE + 0)       /* None */
-#define PLD_IRQ_INT1            (OPSPUT_PLD_IRQ_BASE + 1)       /* reserved */
-#define PLD_IRQ_INT2            (OPSPUT_PLD_IRQ_BASE + 2)       /* reserved */
-#define PLD_IRQ_CFIREQ          (OPSPUT_PLD_IRQ_BASE + 3)       /* CF IREQ */
-#define PLD_IRQ_CFC_INSERT      (OPSPUT_PLD_IRQ_BASE + 4)       /* CF Insert */
-#define PLD_IRQ_CFC_EJECT       (OPSPUT_PLD_IRQ_BASE + 5)       /* CF Eject */
-#define PLD_IRQ_EXINT           (OPSPUT_PLD_IRQ_BASE + 6)       /* EXINT */
-#define PLD_IRQ_INT7            (OPSPUT_PLD_IRQ_BASE + 7)       /* reserved */
-#define PLD_IRQ_INT8            (OPSPUT_PLD_IRQ_BASE + 8)       /* reserved */
-#define PLD_IRQ_INT9            (OPSPUT_PLD_IRQ_BASE + 9)       /* reserved */
-#define PLD_IRQ_INT10           (OPSPUT_PLD_IRQ_BASE + 10)      /* reserved */
-#define PLD_IRQ_MMCCARD         (OPSPUT_PLD_IRQ_BASE + 11)      /* MMC Insert/Eject */
-#define PLD_IRQ_INT12           (OPSPUT_PLD_IRQ_BASE + 12)      /* reserved */
-#define PLD_IRQ_SC_ERROR        (OPSPUT_PLD_IRQ_BASE + 13)      /* SC error */
-#define PLD_IRQ_SC_RCV          (OPSPUT_PLD_IRQ_BASE + 14)      /* SC receive */
-#define PLD_IRQ_SC_SND          (OPSPUT_PLD_IRQ_BASE + 15)      /* SC send */
-#define PLD_IRQ_SIO0_RCV        (OPSPUT_PLD_IRQ_BASE + 16)      /* SIO receive */
-#define PLD_IRQ_SIO0_SND        (OPSPUT_PLD_IRQ_BASE + 17)      /* SIO send */
-#define PLD_IRQ_INT18           (OPSPUT_PLD_IRQ_BASE + 18)      /* reserved */
-#define PLD_IRQ_INT19           (OPSPUT_PLD_IRQ_BASE + 19)      /* reserved */
-#define PLD_IRQ_INT20           (OPSPUT_PLD_IRQ_BASE + 20)      /* reserved */
-#define PLD_IRQ_INT21           (OPSPUT_PLD_IRQ_BASE + 21)      /* reserved */
-#define PLD_IRQ_INT22           (OPSPUT_PLD_IRQ_BASE + 22)      /* reserved */
-#define PLD_IRQ_INT23           (OPSPUT_PLD_IRQ_BASE + 23)      /* reserved */
-#define PLD_IRQ_INT24           (OPSPUT_PLD_IRQ_BASE + 24)      /* reserved */
-#define PLD_IRQ_INT25           (OPSPUT_PLD_IRQ_BASE + 25)      /* reserved */
-#define PLD_IRQ_INT26           (OPSPUT_PLD_IRQ_BASE + 26)      /* reserved */
-#define PLD_IRQ_INT27           (OPSPUT_PLD_IRQ_BASE + 27)      /* reserved */
-#define PLD_IRQ_INT28           (OPSPUT_PLD_IRQ_BASE + 28)      /* reserved */
-#define PLD_IRQ_INT29           (OPSPUT_PLD_IRQ_BASE + 29)      /* reserved */
-#define PLD_IRQ_INT30           (OPSPUT_PLD_IRQ_BASE + 30)      /* reserved */
-#define PLD_IRQ_INT31           (OPSPUT_PLD_IRQ_BASE + 31)      /* reserved */
-
-#else   /* CONFIG_PLAT_USRV */
-
-#define PLD_IRQ_INT0            (OPSPUT_PLD_IRQ_BASE + 0)       /* None */
-#define PLD_IRQ_INT1            (OPSPUT_PLD_IRQ_BASE + 1)       /* reserved */
-#define PLD_IRQ_INT2            (OPSPUT_PLD_IRQ_BASE + 2)       /* reserved */
-#define PLD_IRQ_CF0             (OPSPUT_PLD_IRQ_BASE + 3)       /* CF0# */
-#define PLD_IRQ_CF1             (OPSPUT_PLD_IRQ_BASE + 4)       /* CF1# */
-#define PLD_IRQ_CF2             (OPSPUT_PLD_IRQ_BASE + 5)       /* CF2# */
-#define PLD_IRQ_CF3             (OPSPUT_PLD_IRQ_BASE + 6)       /* CF3# */
-#define PLD_IRQ_CF4             (OPSPUT_PLD_IRQ_BASE + 7)       /* CF4# */
-#define PLD_IRQ_INT8            (OPSPUT_PLD_IRQ_BASE + 8)       /* reserved */
-#define PLD_IRQ_INT9            (OPSPUT_PLD_IRQ_BASE + 9)       /* reserved */
-#define PLD_IRQ_INT10           (OPSPUT_PLD_IRQ_BASE + 10)      /* reserved */
-#define PLD_IRQ_INT11           (OPSPUT_PLD_IRQ_BASE + 11)      /* reserved */
-#define PLD_IRQ_UART0           (OPSPUT_PLD_IRQ_BASE + 12)      /* UARTIRQ0 */
-#define PLD_IRQ_UART1           (OPSPUT_PLD_IRQ_BASE + 13)      /* UARTIRQ1 */
-#define PLD_IRQ_INT14           (OPSPUT_PLD_IRQ_BASE + 14)      /* reserved */
-#define PLD_IRQ_INT15           (OPSPUT_PLD_IRQ_BASE + 15)      /* reserved */
-#define PLD_IRQ_SNDINT          (OPSPUT_PLD_IRQ_BASE + 16)      /* SNDINT# */
-#define PLD_IRQ_INT17           (OPSPUT_PLD_IRQ_BASE + 17)      /* reserved */
-#define PLD_IRQ_INT18           (OPSPUT_PLD_IRQ_BASE + 18)      /* reserved */
-#define PLD_IRQ_INT19           (OPSPUT_PLD_IRQ_BASE + 19)      /* reserved */
-#define PLD_IRQ_INT20           (OPSPUT_PLD_IRQ_BASE + 20)      /* reserved */
-#define PLD_IRQ_INT21           (OPSPUT_PLD_IRQ_BASE + 21)      /* reserved */
-#define PLD_IRQ_INT22           (OPSPUT_PLD_IRQ_BASE + 22)      /* reserved */
-#define PLD_IRQ_INT23           (OPSPUT_PLD_IRQ_BASE + 23)      /* reserved */
-#define PLD_IRQ_INT24           (OPSPUT_PLD_IRQ_BASE + 24)      /* reserved */
-#define PLD_IRQ_INT25           (OPSPUT_PLD_IRQ_BASE + 25)      /* reserved */
-#define PLD_IRQ_INT26           (OPSPUT_PLD_IRQ_BASE + 26)      /* reserved */
-#define PLD_IRQ_INT27           (OPSPUT_PLD_IRQ_BASE + 27)      /* reserved */
-#define PLD_IRQ_INT28           (OPSPUT_PLD_IRQ_BASE + 28)      /* reserved */
-#define PLD_IRQ_INT29           (OPSPUT_PLD_IRQ_BASE + 29)      /* reserved */
-#define PLD_IRQ_INT30           (OPSPUT_PLD_IRQ_BASE + 30)      /* reserved */
-
-#endif  /* CONFIG_PLAT_USRV */
-
-#define PLD_ICUISTS             __reg16(PLD_BASE + 0x8002)
-#define PLD_ICUISTS_VECB_MASK   (0xf000)
-#define PLD_ICUISTS_VECB(x)     ((x) & PLD_ICUISTS_VECB_MASK)
-#define PLD_ICUISTS_ISN_MASK    (0x07c0)
-#define PLD_ICUISTS_ISN(x)      ((x) & PLD_ICUISTS_ISN_MASK)
-#define PLD_ICUIREQ0            __reg16(PLD_BASE + 0x8004)
-#define PLD_ICUIREQ1            __reg16(PLD_BASE + 0x8006)
-#define PLD_ICUCR1              __reg16(PLD_BASE + 0x8100)
-#define PLD_ICUCR2              __reg16(PLD_BASE + 0x8102)
-#define PLD_ICUCR3              __reg16(PLD_BASE + 0x8104)
-#define PLD_ICUCR4              __reg16(PLD_BASE + 0x8106)
-#define PLD_ICUCR5              __reg16(PLD_BASE + 0x8108)
-#define PLD_ICUCR6              __reg16(PLD_BASE + 0x810a)
-#define PLD_ICUCR7              __reg16(PLD_BASE + 0x810c)
-#define PLD_ICUCR8              __reg16(PLD_BASE + 0x810e)
-#define PLD_ICUCR9              __reg16(PLD_BASE + 0x8110)
-#define PLD_ICUCR10             __reg16(PLD_BASE + 0x8112)
-#define PLD_ICUCR11             __reg16(PLD_BASE + 0x8114)
-#define PLD_ICUCR12             __reg16(PLD_BASE + 0x8116)
-#define PLD_ICUCR13             __reg16(PLD_BASE + 0x8118)
-#define PLD_ICUCR14             __reg16(PLD_BASE + 0x811a)
-#define PLD_ICUCR15             __reg16(PLD_BASE + 0x811c)
-#define PLD_ICUCR16             __reg16(PLD_BASE + 0x811e)
-#define PLD_ICUCR17             __reg16(PLD_BASE + 0x8120)
-#define PLD_ICUCR_IEN           (0x1000)
-#define PLD_ICUCR_IREQ          (0x0100)
-#define PLD_ICUCR_ISMOD00       (0x0000)        /* Low edge */
-#define PLD_ICUCR_ISMOD01       (0x0010)        /* Low level */
-#define PLD_ICUCR_ISMOD02       (0x0020)        /* High edge */
-#define PLD_ICUCR_ISMOD03       (0x0030)        /* High level */
-#define PLD_ICUCR_ILEVEL0       (0x0000)
-#define PLD_ICUCR_ILEVEL1       (0x0001)
-#define PLD_ICUCR_ILEVEL2       (0x0002)
-#define PLD_ICUCR_ILEVEL3       (0x0003)
-#define PLD_ICUCR_ILEVEL4       (0x0004)
-#define PLD_ICUCR_ILEVEL5       (0x0005)
-#define PLD_ICUCR_ILEVEL6       (0x0006)
-#define PLD_ICUCR_ILEVEL7       (0x0007)
-
-/* Power Control of MMC and CF */
-#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
-#define PLD_CPCR_CF             0x0001
-#define PLD_CPCR_MMC            0x0002
-
-/* LED Control
- *
- * 1: DIP swich side
- * 2: Reset switch side
- */
-#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
-#define PLD_IOLED_1_ON          0x001
-#define PLD_IOLED_1_OFF         0x000
-#define PLD_IOLED_2_ON          0x002
-#define PLD_IOLED_2_OFF         0x000
-
-/* DIP Switch
- *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
- *  1: -
- *  2: -
- *  3: -
- */
-#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
-#define PLD_IOSWSTS_IOSW2       0x0200
-#define PLD_IOSWSTS_IOSW1       0x0100
-#define PLD_IOSWSTS_IOWP0       0x0001
-
-/* CRC */
-#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
-#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
-#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
-#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
-#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
-#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
-
-/* RTC */
-#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
-#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
-#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
-#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
-#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
-
-/* SIO0 */
-#define PLD_ESIO0CR             __reg16(PLD_BASE + 0x20000)
-#define PLD_ESIO0CR_TXEN        0x0001
-#define PLD_ESIO0CR_RXEN        0x0002
-#define PLD_ESIO0MOD0           __reg16(PLD_BASE + 0x20002)
-#define PLD_ESIO0MOD0_CTSS      0x0040
-#define PLD_ESIO0MOD0_RTSS      0x0080
-#define PLD_ESIO0MOD1           __reg16(PLD_BASE + 0x20004)
-#define PLD_ESIO0MOD1_LMFS      0x0010
-#define PLD_ESIO0STS            __reg16(PLD_BASE + 0x20006)
-#define PLD_ESIO0STS_TEMP       0x0001
-#define PLD_ESIO0STS_TXCP       0x0002
-#define PLD_ESIO0STS_RXCP       0x0004
-#define PLD_ESIO0STS_TXSC       0x0100
-#define PLD_ESIO0STS_RXSC       0x0200
-#define PLD_ESIO0STS_TXREADY    (PLD_ESIO0STS_TXCP | PLD_ESIO0STS_TEMP)
-#define PLD_ESIO0INTCR          __reg16(PLD_BASE + 0x20008)
-#define PLD_ESIO0INTCR_TXIEN    0x0002
-#define PLD_ESIO0INTCR_RXCEN    0x0004
-#define PLD_ESIO0BAUR           __reg16(PLD_BASE + 0x2000a)
-#define PLD_ESIO0TXB            __reg16(PLD_BASE + 0x2000c)
-#define PLD_ESIO0RXB            __reg16(PLD_BASE + 0x2000e)
-
-/* SIM Card */
-#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
-#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
-#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
-#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
-#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
-#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
-#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
-
-#endif /* _OPSPUT_OPSPUT_PLD.H */
diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h
deleted file mode 100644
index c9333089fe11..000000000000
--- a/include/asm-m32r/page.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _ASM_M32R_PAGE_H
-#define _ASM_M32R_PAGE_H
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-#define PAGE_MASK       (~(PAGE_SIZE-1))
-
-#ifndef __ASSEMBLY__
-
-extern void clear_page(void *to);
-extern void copy_page(void *to, void *from);
-
-#define clear_user_page(page, vaddr, pg)        clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
-
-#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
-        alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
-#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
-typedef struct { unsigned long pgd; } pgd_t;
-#define pte_val(x)      ((x).pte)
-#define PTE_MASK        PAGE_MASK
-
-typedef struct { unsigned long pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-
-#define pmd_val(x)      ((x).pmd)
-#define pgd_val(x)      ((x).pgd)
-#define pgprot_val(x)   ((x).pgprot)
-
-#define __pte(x) ((pte_t) { (x) } )
-#define __pmd(x) ((pmd_t) { (x) } )
-#define __pgd(x) ((pgd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * This handles the memory map.. We could make this a config
- * option, but too many people screw it up, and too few need
- * it.
- *
- * A __PAGE_OFFSET of 0xC0000000 means that the kernel has
- * a virtual address space of one gigabyte, which limits the
- * amount of physical memory you can use to about 950MB.
- *
- * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
- * and CONFIG_HIGHMEM64G options in the kernel configuration.
- */
-
-#define __MEMORY_START  CONFIG_MEMORY_START
-#define __MEMORY_SIZE   CONFIG_MEMORY_SIZE
-
-#ifdef CONFIG_MMU
-#define __PAGE_OFFSET  (0x80000000)
-#else
-#define __PAGE_OFFSET  (0x00000000)
-#endif
-
-#define PAGE_OFFSET             ((unsigned long)__PAGE_OFFSET)
-#define __pa(x)                 ((unsigned long)(x) - PAGE_OFFSET)
-#define __va(x)                 ((void *)((unsigned long)(x) + PAGE_OFFSET))
-
-#ifndef CONFIG_DISCONTIGMEM
-#define PFN_BASE                (CONFIG_MEMORY_START >> PAGE_SHIFT)
-#define ARCH_PFN_OFFSET         PFN_BASE
-#define pfn_valid(pfn)          (((pfn) - PFN_BASE) < max_mapnr)
-#endif  /* !CONFIG_DISCONTIGMEM */
-
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC )
-
-#define devmem_is_allowed(x) 1
-
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#endif /* _ASM_M32R_PAGE_H */
diff --git a/include/asm-m32r/param.h b/include/asm-m32r/param.h
deleted file mode 100644
index 94c770196048..000000000000
--- a/include/asm-m32r/param.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _ASM_M32R_PARAM_H
-#define _ASM_M32R_PARAM_H
-
-#ifdef __KERNEL__
-# define HZ             CONFIG_HZ       /* Internal kernel timer frequency */
-# define USER_HZ        100             /* .. some user interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ)       /* like times() */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#define EXEC_PAGESIZE   4096
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-
-#endif /* _ASM_M32R_PARAM_H */
-
diff --git a/include/asm-m32r/pci.h b/include/asm-m32r/pci.h
deleted file mode 100644
index fe785d167db6..000000000000
--- a/include/asm-m32r/pci.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_M32R_PCI_H
-#define _ASM_M32R_PCI_H
-
-#include <asm-generic/pci.h>
-
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-#endif /* _ASM_M32R_PCI_H */
diff --git a/include/asm-m32r/percpu.h b/include/asm-m32r/percpu.h
deleted file mode 100644
index e3169301fe66..000000000000
--- a/include/asm-m32r/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M32R_PERCPU__
-#define __ARCH_M32R_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M32R_PERCPU__ */
diff --git a/include/asm-m32r/pgalloc.h b/include/asm-m32r/pgalloc.h
deleted file mode 100644
index f11a2b909cdb..000000000000
--- a/include/asm-m32r/pgalloc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _ASM_M32R_PGALLOC_H
-#define _ASM_M32R_PGALLOC_H
-
-#include <linux/mm.h>
-
-#include <asm/io.h>
-
-#define pmd_populate_kernel(mm, pmd, pte)       \
-        set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
-
-static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
-        pgtable_t pte)
-{
-        set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte)));
-}
-#define pmd_pgtable(pmd) pmd_page(pmd)
-
-/*
- * Allocate and free page tables.
- */
-static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
-{
-        pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
-
-        return pgd;
-}
-
-static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
-{
-        free_page((unsigned long)pgd);
-}
-
-static __inline__ pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-        unsigned long address)
-{
-        pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
-
-        return pte;
-}
-
-static __inline__ pgtable_t pte_alloc_one(struct mm_struct *mm,
-        unsigned long address)
-{
-        struct page *pte = alloc_page(GFP_KERNEL|__GFP_ZERO);
-
-        pgtable_page_ctor(pte);
-        return pte;
-}
-
-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
-{
-        free_page((unsigned long)pte);
-}
-
-static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
-{
-        pgtable_page_dtor(pte);
-        __free_page(pte);
-}
-
-#define __pte_free_tlb(tlb, pte)        pte_free((tlb)->mm, (pte))
-
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- * (In the PAE case we free the pmds as part of the pgd.)
- */
-
-#define pmd_alloc_one(mm, addr)         ({ BUG(); ((pmd_t *)2); })
-#define pmd_free(mm, x)                 do { } while (0)
-#define __pmd_free_tlb(tlb, x)          do { } while (0)
-#define pgd_populate(mm, pmd, pte)      BUG()
-
-#define check_pgt_cache()       do { } while (0)
-
-#endif /* _ASM_M32R_PGALLOC_H */
diff --git a/include/asm-m32r/pgtable-2level.h b/include/asm-m32r/pgtable-2level.h
deleted file mode 100644
index bca3475f9595..000000000000
--- a/include/asm-m32r/pgtable-2level.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _ASM_M32R_PGTABLE_2LEVEL_H
-#define _ASM_M32R_PGTABLE_2LEVEL_H
-#ifdef __KERNEL__
-
-/*
- * traditional M32R two-level paging structure:
- */
-
-#define PGDIR_SHIFT     22
-#define PTRS_PER_PGD    1024
-
-/*
- * the M32R is two-level, so we don't really have any
- * PMD directory physically.
- */
-#define PMD_SHIFT       22
-#define PTRS_PER_PMD    1
-
-#define PTRS_PER_PTE    1024
-
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
-
-/*
- * The "pgd_xxx()" functions here are trivial for a folded two-level
- * setup: the pgd is never bad, and a pmd always exists (as it's folded
- * into the pgd entry)
- */
-static inline int pgd_none(pgd_t pgd)   { return 0; }
-static inline int pgd_bad(pgd_t pgd)    { return 0; }
-static inline int pgd_present(pgd_t pgd)        { return 1; }
-#define pgd_clear(xp)                           do { } while (0)
-
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#define set_pte(pteptr, pteval) (*(pteptr) = pteval)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-
-/*
- * (pmds are folded into pgds so this doesnt get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
-#define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
-
-#define pgd_page_vaddr(pgd) \
-((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
-
-#ifndef CONFIG_DISCONTIGMEM
-#define pgd_page(pgd)   (mem_map + ((pgd_val(pgd) >> PAGE_SHIFT) - PFN_BASE))
-#endif /* !CONFIG_DISCONTIGMEM */
-
-static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
-{
-        return (pmd_t *) dir;
-}
-
-#define ptep_get_and_clear(mm,addr,xp)  __pte(xchg(&(xp)->pte, 0))
-#define pte_same(a, b)          (pte_val(a) == pte_val(b))
-#define pte_page(x)             pfn_to_page(pte_pfn(x))
-#define pte_none(x)             (!pte_val(x))
-#define pte_pfn(x)              (pte_val(x) >> PAGE_SHIFT)
-#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-
-#define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(pte)       (((pte_val(pte) >> 2) & 0x7f) | (((pte_val(pte) >> 10)) << 7))
-#define pgoff_to_pte(off)       ((pte_t) { (((off) & 0x7f) << 2) | (((off) >> 7) << 10) | _PAGE_FILE })
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_M32R_PGTABLE_2LEVEL_H */
diff --git a/include/asm-m32r/pgtable.h b/include/asm-m32r/pgtable.h
deleted file mode 100644
index e6359c566b50..000000000000
--- a/include/asm-m32r/pgtable.h
+++ /dev/null
@@ -1,363 +0,0 @@
-#ifndef _ASM_M32R_PGTABLE_H
-#define _ASM_M32R_PGTABLE_H
-
-#include <asm-generic/4level-fixup.h>
-
-#ifdef __KERNEL__
-/*
- * The Linux memory management assumes a three-level page table setup. On
- * the M32R, we use that, but "fold" the mid level into the top-level page
- * table, so that we physically have the same two-level page table as the
- * M32R mmu expects.
- *
- * This file contains the functions and defines necessary to modify and use
- * the M32R page table tree.
- */
-
-/* CAUTION!: If you change macro definitions in this file, you might have to
- * change arch/m32r/mmu.S manually.
- */
-
-#ifndef __ASSEMBLY__
-
-#include <linux/threads.h>
-#include <linux/bitops.h>
-#include <asm/processor.h>
-#include <asm/addrspace.h>
-#include <asm/page.h>
-
-struct mm_struct;
-struct vm_area_struct;
-
-extern pgd_t swapper_pg_dir[1024];
-extern void paging_init(void);
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern unsigned long empty_zero_page[1024];
-#define ZERO_PAGE(vaddr)        (virt_to_page(empty_zero_page))
-
-#endif /* !__ASSEMBLY__ */
-
-#ifndef __ASSEMBLY__
-#include <asm/pgtable-2level.h>
-#endif
-
-#define pgtable_cache_init()    do { } while (0)
-
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PMD_MASK        (~(PMD_SIZE - 1))
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE - 1))
-
-#define USER_PTRS_PER_PGD       (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-
-#ifndef __ASSEMBLY__
-/* Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 8MB value just means that there will be a 8MB "hole" after the
- * physical memory until the kernel virtual memory starts.  That means that
- * any out-of-bounds memory accesses will hopefully be caught.
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;)
- */
-#define VMALLOC_START           KSEG2
-#define VMALLOC_END             KSEG3
-
-/*
- *     M32R TLB format
- *
- *     [0]    [1:19]           [20:23]       [24:31]
- *     +-----------------------+----+-------------+
- *     |          VPN          |0000|    ASID     |
- *     +-----------------------+----+-------------+
- *     +-+---------------------+----+-+---+-+-+-+-+
- *     |0         PPN          |0000|N|AC |L|G|V| |
- *     +-+---------------------+----+-+---+-+-+-+-+
- *                                     RWX
- */
-
-#define _PAGE_BIT_DIRTY         0       /* software: page changed */
-#define _PAGE_BIT_FILE          0       /* when !present: nonlinear file
-                                           mapping */
-#define _PAGE_BIT_PRESENT       1       /* Valid: page is valid */
-#define _PAGE_BIT_GLOBAL        2       /* Global */
-#define _PAGE_BIT_LARGE         3       /* Large */
-#define _PAGE_BIT_EXEC          4       /* Execute */
-#define _PAGE_BIT_WRITE         5       /* Write */
-#define _PAGE_BIT_READ          6       /* Read */
-#define _PAGE_BIT_NONCACHABLE   7       /* Non cachable */
-#define _PAGE_BIT_ACCESSED      8       /* software: page referenced */
-#define _PAGE_BIT_PROTNONE      9       /* software: if not present */
-
-#define _PAGE_DIRTY             (1UL << _PAGE_BIT_DIRTY)
-#define _PAGE_FILE              (1UL << _PAGE_BIT_FILE)
-#define _PAGE_PRESENT           (1UL << _PAGE_BIT_PRESENT)
-#define _PAGE_GLOBAL            (1UL << _PAGE_BIT_GLOBAL)
-#define _PAGE_LARGE             (1UL << _PAGE_BIT_LARGE)
-#define _PAGE_EXEC              (1UL << _PAGE_BIT_EXEC)
-#define _PAGE_WRITE             (1UL << _PAGE_BIT_WRITE)
-#define _PAGE_READ              (1UL << _PAGE_BIT_READ)
-#define _PAGE_NONCACHABLE       (1UL << _PAGE_BIT_NONCACHABLE)
-#define _PAGE_ACCESSED          (1UL << _PAGE_BIT_ACCESSED)
-#define _PAGE_PROTNONE          (1UL << _PAGE_BIT_PROTNONE)
-
-#define _PAGE_TABLE     \
-        ( _PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_ACCESSED \
-        | _PAGE_DIRTY )
-#define _KERNPG_TABLE   \
-        ( _PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_ACCESSED \
-        | _PAGE_DIRTY )
-#define _PAGE_CHG_MASK  \
-        ( PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY )
-
-#ifdef CONFIG_MMU
-#define PAGE_NONE       \
-        __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)
-#define PAGE_SHARED     \
-        __pgprot(_PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | _PAGE_ACCESSED)
-#define PAGE_SHARED_EXEC \
-        __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_WRITE | _PAGE_READ \
-                | _PAGE_ACCESSED)
-#define PAGE_COPY       \
-        __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_ACCESSED)
-#define PAGE_COPY_EXEC  \
-        __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_ACCESSED)
-#define PAGE_READONLY   \
-        __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_ACCESSED)
-#define PAGE_READONLY_EXEC \
-        __pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_ACCESSED)
-
-#define __PAGE_KERNEL   \
-        ( _PAGE_PRESENT | _PAGE_EXEC | _PAGE_WRITE | _PAGE_READ | _PAGE_DIRTY \
-        | _PAGE_ACCESSED )
-#define __PAGE_KERNEL_RO        ( __PAGE_KERNEL & ~_PAGE_WRITE )
-#define __PAGE_KERNEL_NOCACHE   ( __PAGE_KERNEL | _PAGE_NONCACHABLE)
-
-#define MAKE_GLOBAL(x)  __pgprot((x) | _PAGE_GLOBAL)
-
-#define PAGE_KERNEL             MAKE_GLOBAL(__PAGE_KERNEL)
-#define PAGE_KERNEL_RO          MAKE_GLOBAL(__PAGE_KERNEL_RO)
-#define PAGE_KERNEL_NOCACHE     MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)
-
-#else
-#define PAGE_NONE               __pgprot(0)
-#define PAGE_SHARED             __pgprot(0)
-#define PAGE_SHARED_EXEC        __pgprot(0)
-#define PAGE_COPY               __pgprot(0)
-#define PAGE_COPY_EXEC          __pgprot(0)
-#define PAGE_READONLY           __pgprot(0)
-#define PAGE_READONLY_EXEC      __pgprot(0)
-
-#define PAGE_KERNEL             __pgprot(0)
-#define PAGE_KERNEL_RO          __pgprot(0)
-#define PAGE_KERNEL_NOCACHE     __pgprot(0)
-#endif /* CONFIG_MMU */
-
-        /* xwr */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY
-#define __P010  PAGE_COPY
-#define __P011  PAGE_COPY
-#define __P100  PAGE_READONLY_EXEC
-#define __P101  PAGE_READONLY_EXEC
-#define __P110  PAGE_COPY_EXEC
-#define __P111  PAGE_COPY_EXEC
-
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY
-#define __S010  PAGE_SHARED
-#define __S011  PAGE_SHARED
-#define __S100  PAGE_READONLY_EXEC
-#define __S101  PAGE_READONLY_EXEC
-#define __S110  PAGE_SHARED_EXEC
-#define __S111  PAGE_SHARED_EXEC
-
-/* page table for 0-4MB for everybody */
-
-#define pte_present(x)  (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
-#define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
-
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (pmd_val(x) & _PAGE_PRESENT)
-#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
-#define pmd_bad(x)      ((pmd_val(x) & ~PAGE_MASK) != _KERNPG_TABLE)
-
-#define pages_to_mb(x)  ((x) >> (20 - PAGE_SHIFT))
-
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-static inline int pte_dirty(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_DIRTY;
-}
-
-static inline int pte_young(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_ACCESSED;
-}
-
-static inline int pte_write(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_WRITE;
-}
-
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_FILE;
-}
-
-static inline int pte_special(pte_t pte)
-{
-        return 0;
-}
-
-static inline pte_t pte_mkclean(pte_t pte)
-{
-        pte_val(pte) &= ~_PAGE_DIRTY;
-        return pte;
-}
-
-static inline pte_t pte_mkold(pte_t pte)
-{
-        pte_val(pte) &= ~_PAGE_ACCESSED;
-        return pte;
-}
-
-static inline pte_t pte_wrprotect(pte_t pte)
-{
-        pte_val(pte) &= ~_PAGE_WRITE;
-        return pte;
-}
-
-static inline pte_t pte_mkdirty(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_DIRTY;
-        return pte;
-}
-
-static inline pte_t pte_mkyoung(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_ACCESSED;
-        return pte;
-}
-
-static inline pte_t pte_mkwrite(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_WRITE;
-        return pte;
-}
-
-static inline pte_t pte_mkspecial(pte_t pte)
-{
-        return pte;
-}
-
-static inline  int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-{
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
-}
-
-static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        clear_bit(_PAGE_BIT_WRITE, ptep);
-}
-
-/*
- * Macro and implementation to make a page protection as uncachable.
- */
-static inline pgprot_t pgprot_noncached(pgprot_t _prot)
-{
-        unsigned long prot = pgprot_val(_prot);
-
-        prot |= _PAGE_NONCACHABLE;
-        return __pgprot(prot);
-}
-
-#define pgprot_writecombine(prot) pgprot_noncached(prot)
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), pgprot)
-
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) \
-                | pgprot_val(newprot)));
-
-        return pte;
-}
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-
-static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
-{
-        pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK);
-}
-
-#define pmd_page_vaddr(pmd)     \
-        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
-
-#ifndef CONFIG_DISCONTIGMEM
-#define pmd_page(pmd)   (mem_map + ((pmd_val(pmd) >> PAGE_SHIFT) - PFN_BASE))
-#endif /* !CONFIG_DISCONTIGMEM */
-
-/* to find an entry in a page-table-directory. */
-#define pgd_index(address)      \
-        (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-
-/* to find an entry in a kernel page-table-directory */
-#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
-
-#define pmd_index(address)      \
-        (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
-
-#define pte_index(address)      \
-        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index(address))
-#define pte_offset_map(dir, address)    \
-        ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
-#define pte_offset_map_nested(dir, address)     pte_offset_map(dir, address)
-#define pte_unmap(pte)          do { } while (0)
-#define pte_unmap_nested(pte)   do { } while (0)
-
-/* Encode and de-code a swap entry */
-#define __swp_type(x)                   (((x).val >> 2) & 0x1f)
-#define __swp_offset(x)                 ((x).val >> 10)
-#define __swp_entry(type, offset)       \
-        ((swp_entry_t) { ((type) << 2) | ((offset) << 10) })
-#define __pte_to_swp_entry(pte)         ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
-
-#endif /* !__ASSEMBLY__ */
-
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define kern_addr_valid(addr)   (1)
-
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
-                remap_pfn_range(vma, vaddr, pfn, size, prot)
-
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTE_SAME
-#include <asm-generic/pgtable.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_M32R_PGTABLE_H */
diff --git a/include/asm-m32r/poll.h b/include/asm-m32r/poll.h
deleted file mode 100644
index c98509d3149e..000000000000
--- a/include/asm-m32r/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/include/asm-m32r/posix_types.h b/include/asm-m32r/posix_types.h
deleted file mode 100644
index b309c5858637..000000000000
--- a/include/asm-m32r/posix_types.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _ASM_M32R_POSIX_TYPES_H
-#define _ASM_M32R_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned int    __kernel_size_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
-
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
-typedef unsigned short  __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-        int     val[2];
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__)
-
-#undef  __FD_SET
-static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
-}
-
-#undef  __FD_CLR
-static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
-}
-
-
-#undef  __FD_ISSET
-static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
-}
-
-/*
- * This will unroll the loop for the normal constant case (8 ints,
- * for a 256-bit fd_set)
- */
-#undef  __FD_ZERO
-static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
-{
-        unsigned long *__tmp = __p->fds_bits;
-        int __i;
-
-        if (__builtin_constant_p(__FDSET_LONGS)) {
-                switch (__FDSET_LONGS) {
-                case 16:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        __tmp[ 8] = 0; __tmp[ 9] = 0;
-                        __tmp[10] = 0; __tmp[11] = 0;
-                        __tmp[12] = 0; __tmp[13] = 0;
-                        __tmp[14] = 0; __tmp[15] = 0;
-                        return;
-
-                case 8:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        return;
-
-                case 4:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        return;
-                }
-        }
-        __i = __FDSET_LONGS;
-        while (__i) {
-                __i--;
-                *__tmp = 0;
-                __tmp++;
-        }
-}
-
-#endif /* defined(__KERNEL__) */
-
-#endif  /* _ASM_M32R_POSIX_TYPES_H */
diff --git a/include/asm-m32r/processor.h b/include/asm-m32r/processor.h
deleted file mode 100644
index 1a997fc148a2..000000000000
--- a/include/asm-m32r/processor.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef _ASM_M32R_PROCESSOR_H
-#define _ASM_M32R_PROCESSOR_H
-
-/*
- * include/asm-m32r/processor.h
- *
- * 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) 1994  Linus Torvalds
- * Copyright (C) 2001  Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
- * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <linux/kernel.h>
-#include <asm/cache.h>
-#include <asm/ptrace.h>  /* pt_regs */
-
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ __label__ _l; _l: &&_l; })
-
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- *  Members of this structure are referenced in head.S, so think twice
- *  before touching them. [mj]
- */
-
-struct cpuinfo_m32r {
-        unsigned long pgtable_cache_sz;
-        unsigned long cpu_clock;
-        unsigned long bus_clock;
-        unsigned long timer_divide;
-        unsigned long loops_per_jiffy;
-};
-
-/*
- * capabilities of CPUs
- */
-
-extern struct cpuinfo_m32r boot_cpu_data;
-
-#ifdef CONFIG_SMP
-extern struct cpuinfo_m32r cpu_data[];
-#define current_cpu_data cpu_data[smp_processor_id()]
-#else
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
-#endif
-
-/*
- * User space process size: 2GB (default).
- */
-#ifdef CONFIG_MMU
-#define TASK_SIZE  (0x80000000UL)
-#else
-#define TASK_SIZE  (0x00400000UL)
-#endif
-
-#ifdef __KERNEL__
-#define STACK_TOP       TASK_SIZE
-#define STACK_TOP_MAX   STACK_TOP
-#endif
-
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE      PAGE_ALIGN(TASK_SIZE / 3)
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-#define MAX_TRAPS 10
-
-struct debug_trap {
-        int nr_trap;
-        unsigned long   addr[MAX_TRAPS];
-        unsigned long   insn[MAX_TRAPS];
-};
-
-struct thread_struct {
-        unsigned long address;
-        unsigned long trap_no;          /* Trap number  */
-        unsigned long error_code;       /* Error code of trap */
-        unsigned long lr;               /* saved pc */
-        unsigned long sp;               /* user stack pointer */
-        struct debug_trap debug_trap;
-};
-
-#define INIT_SP (sizeof(init_stack) + (unsigned long) &init_stack)
-
-#define INIT_THREAD     {       \
-        .sp = INIT_SP,          \
-}
-
-/*
- * Do necessary setup to start up a newly executed thread.
- */
-
-/* User process Backup PSW */
-#define USERPS_BPSW (M32R_PSW_BSM|M32R_PSW_BIE|M32R_PSW_BPM)
-
-#define start_thread(regs, new_pc, new_spu)                             \
-        do {                                                            \
-                set_fs(USER_DS);                                        \
-                regs->psw = (regs->psw | USERPS_BPSW) & 0x0000FFFFUL;   \
-                regs->bpc = new_pc;                                     \
-                regs->spu = new_spu;                                    \
-        } while (0)
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-
-#define prepare_to_copy(tsk)    do { } while (0)
-
-/*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-
-/* Copy and release all segment info associated with a VM */
-extern void copy_segments(struct task_struct *p, struct mm_struct * mm);
-extern void release_segments(struct mm_struct * mm);
-
-extern unsigned long thread_saved_pc(struct task_struct *);
-
-/* Copy and release all segment info associated with a VM */
-#define copy_segments(p, mm)  do { } while (0)
-#define release_segments(mm)  do { } while (0)
-
-unsigned long get_wchan(struct task_struct *p);
-#define KSTK_EIP(tsk)  ((tsk)->thread.lr)
-#define KSTK_ESP(tsk)  ((tsk)->thread.sp)
-
-#define THREAD_SIZE (2*PAGE_SIZE)
-
-#define cpu_relax()     barrier()
-
-#endif /* _ASM_M32R_PROCESSOR_H */
diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h
deleted file mode 100644
index a0755b982028..000000000000
--- a/include/asm-m32r/ptrace.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _ASM_M32R_PTRACE_H
-#define _ASM_M32R_PTRACE_H
-
-/*
- * linux/include/asm-m32r/ptrace.h
- *
- * 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.
- *
- * M32R version:
- *   Copyright (C) 2001-2002, 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-/* 0 - 13 are integer registers (general purpose registers).  */
-#define PT_R4           0
-#define PT_R5           1
-#define PT_R6           2
-#define PT_REGS         3
-#define PT_R0           4
-#define PT_R1           5
-#define PT_R2           6
-#define PT_R3           7
-#define PT_R7           8
-#define PT_R8           9
-#define PT_R9           10
-#define PT_R10          11
-#define PT_R11          12
-#define PT_R12          13
-#define PT_SYSCNR       14
-#define PT_R13          PT_FP
-#define PT_R14          PT_LR
-#define PT_R15          PT_SP
-
-/* processor status and miscellaneous context registers.  */
-#define PT_ACC0H        15
-#define PT_ACC0L        16
-#define PT_ACC1H        17      /* ISA_DSP_LEVEL2 only */
-#define PT_ACC1L        18      /* ISA_DSP_LEVEL2 only */
-#define PT_PSW          19
-#define PT_BPC          20
-#define PT_BBPSW        21
-#define PT_BBPC         22
-#define PT_SPU          23
-#define PT_FP           24
-#define PT_LR           25
-#define PT_SPI          26
-#define PT_ORIGR0       27
-
-/* virtual pt_reg entry for gdb */
-#define PT_PC           30
-#define PT_CBR          31
-#define PT_EVB          32
-
-
-/* Control registers.  */
-#define SPR_CR0 PT_PSW
-#define SPR_CR1 PT_CBR          /* read only */
-#define SPR_CR2 PT_SPI
-#define SPR_CR3 PT_SPU
-#define SPR_CR4
-#define SPR_CR5 PT_EVB          /* part of M32R/E, M32R/I core only */
-#define SPR_CR6 PT_BPC
-#define SPR_CR7
-#define SPR_CR8 PT_BBPSW
-#define SPR_CR9
-#define SPR_CR10
-#define SPR_CR11
-#define SPR_CR12
-#define SPR_CR13 PT_WR
-#define SPR_CR14 PT_BBPC
-#define SPR_CR15
-
-/* this struct defines the way the registers are stored on the
-   stack during a system call. */
-struct pt_regs {
-        /* Saved main processor registers. */
-        unsigned long r4;
-        unsigned long r5;
-        unsigned long r6;
-        struct pt_regs *pt_regs;
-        unsigned long r0;
-        unsigned long r1;
-        unsigned long r2;
-        unsigned long r3;
-        unsigned long r7;
-        unsigned long r8;
-        unsigned long r9;
-        unsigned long r10;
-        unsigned long r11;
-        unsigned long r12;
-        long syscall_nr;
-
-        /* Saved main processor status and miscellaneous context registers. */
-        unsigned long acc0h;
-        unsigned long acc0l;
-        unsigned long acc1h;    /* ISA_DSP_LEVEL2 only */
-        unsigned long acc1l;    /* ISA_DSP_LEVEL2 only */
-        unsigned long psw;
-        unsigned long bpc;              /* saved PC for TRAP syscalls */
-        unsigned long bbpsw;
-        unsigned long bbpc;
-        unsigned long spu;              /* saved user stack */
-        unsigned long fp;
-        unsigned long lr;               /* saved PC for JL syscalls */
-        unsigned long spi;              /* saved kernel stack */
-        unsigned long orig_r0;
-};
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-
-#define PTRACE_OLDSETOPTIONS    21
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD   0x00000001
-
-#ifdef __KERNEL__
-
-#include <asm/m32r.h>           /* M32R_PSW_BSM, M32R_PSW_BPM */
-
-struct task_struct;
-extern void init_debug_traps(struct task_struct *);
-#define arch_ptrace_attach(child) \
-        init_debug_traps(child)
-
-#if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
-#define user_mode(regs) ((M32R_PSW_BPM & (regs)->psw) != 0)
-#elif defined(CONFIG_ISA_M32R)
-#define user_mode(regs) ((M32R_PSW_BSM & (regs)->psw) != 0)
-#else
-#error unknown isa configuration
-#endif
-
-#define instruction_pointer(regs) ((regs)->bpc)
-#define profile_pc(regs) instruction_pointer(regs)
-
-extern void show_regs(struct pt_regs *);
-
-extern void withdraw_debug_trap(struct pt_regs *regs);
-
-#define task_pt_regs(task) \
-        ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE) - 1)
-
-#endif /* __KERNEL */
-
-#endif /* _ASM_M32R_PTRACE_H */
diff --git a/include/asm-m32r/resource.h b/include/asm-m32r/resource.h
deleted file mode 100644
index b1ce766e37a0..000000000000
--- a/include/asm-m32r/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_RESOURCE_H
-#define _ASM_M32R_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif  /* _ASM_M32R_RESOURCE_H */
diff --git a/include/asm-m32r/rtc.h b/include/asm-m32r/rtc.h
deleted file mode 100644
index 0340633f3f4d..000000000000
--- a/include/asm-m32r/rtc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __RTC_H__
-#define __RTC_H__
-
-   /* Dallas DS1302 clock/calendar register numbers. */
-#  define RTC_SECONDS      0
-#  define RTC_MINUTES      1
-#  define RTC_HOURS        2
-#  define RTC_DAY_OF_MONTH 3
-#  define RTC_MONTH        4
-#  define RTC_WEEKDAY      5
-#  define RTC_YEAR         6
-#  define RTC_CONTROL      7
-
-   /* Bits in CONTROL register. */
-#  define RTC_CONTROL_WRITEPROTECT      0x80
-#  define RTC_TRICKLECHARGER            8
-
-  /* Bits in TRICKLECHARGER register TCS TCS TCS TCS DS DS RS RS. */
-#  define RTC_TCR_PATTERN       0xA0    /* 1010xxxx */
-#  define RTC_TCR_1DIOD         0x04    /* xxxx01xx */
-#  define RTC_TCR_2DIOD         0x08    /* xxxx10xx */
-#  define RTC_TCR_DISABLED      0x00    /* xxxxxx00 Disabled */
-#  define RTC_TCR_2KOHM         0x01    /* xxxxxx01 2KOhm */
-#  define RTC_TCR_4KOHM         0x02    /* xxxxxx10 4kOhm */
-#  define RTC_TCR_8KOHM         0x03    /* xxxxxx11 8kOhm */
-
-#ifdef CONFIG_DS1302
-extern unsigned char ds1302_readreg(int reg);
-extern void ds1302_writereg(int reg, unsigned char val);
-extern int ds1302_init(void);
-#  define CMOS_READ(x) ds1302_readreg(x)
-#  define CMOS_WRITE(val,reg) ds1302_writereg(reg,val)
-#  define RTC_INIT() ds1302_init()
-#else
-  /* No RTC configured so we shouldn't try to access any. */
-#  define CMOS_READ(x) 42
-#  define CMOS_WRITE(x,y)
-#  define RTC_INIT() (-1)
-#endif
-
-/*
- * 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;
-};
-
-/* ioctl() calls that are permitted to the /dev/rtc interface. */
-#define RTC_MAGIC 'p'
-#define RTC_RD_TIME             _IOR(RTC_MAGIC, 0x09, struct rtc_time)  /* Read RTC time. */
-#define RTC_SET_TIME            _IOW(RTC_MAGIC, 0x0a, struct rtc_time)  /* Set RTC time. */
-#define RTC_SET_CHARGE          _IOW(RTC_MAGIC, 0x0b, int)
-#define RTC_MAX_IOCTL 0x0b
-
-#endif /* __RTC_H__ */
diff --git a/include/asm-m32r/s1d13806.h b/include/asm-m32r/s1d13806.h
deleted file mode 100644
index 248d36a82d79..000000000000
--- a/include/asm-m32r/s1d13806.h
+++ /dev/null
@@ -1,199 +0,0 @@
-//----------------------------------------------------------------------------
-//
-//  File generated by S1D13806CFG.EXE
-//
-//  Copyright (c) 2000,2001 Epson Research and Development, Inc.
-//  All rights reserved.
-//
-//----------------------------------------------------------------------------
-
-// Panel:  (active)  640x480 77Hz STN Single 8-bit (PCLK=CLKI=25.175MHz)
-// Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=33.333MHz)
-
-#define SWIVEL_VIEW             0       /* 0:none, 1:90 not completed */
-
-static struct s1d13xxxfb_regval s1d13xxxfb_initregs[] = {
-
-    {0x0001,0x00},   // Miscellaneous Register
-    {0x01FC,0x00},   // Display Mode Register
-#if defined(CONFIG_PLAT_MAPPI)
-    {0x0004,0x00},   // General IO Pins Configuration Register 0
-    {0x0005,0x00},   // General IO Pins Configuration Register 1
-    {0x0008,0x00},   // General IO Pins Control Register 0
-    {0x0009,0x00},   // General IO Pins Control Register 1
-    {0x0010,0x00},   // Memory Clock Configuration Register
-    {0x0014,0x00},   // LCD Pixel Clock Configuration Register
-    {0x0018,0x00},   // CRT/TV Pixel Clock Configuration Register
-    {0x001C,0x00},   // MediaPlug Clock Configuration Register
-/*
- * .. 10MHz: 0x00
- * .. 30MHz: 0x01
- * 30MHz ..: 0x02
- */
-    {0x001E,0x02},   // CPU To Memory Wait State Select Register
-    {0x0021,0x02},   // DRAM Refresh Rate Register
-    {0x002A,0x11},   // DRAM Timings Control Register 0
-    {0x002B,0x13},   // DRAM Timings Control Register 1
-    {0x0020,0x80},   // Memory Configuration Register
-    {0x0030,0x25},   // Panel Type Register
-    {0x0031,0x00},   // MOD Rate Register
-    {0x0032,0x4F},   // LCD Horizontal Display Width Register
-    {0x0034,0x12},   // LCD Horizontal Non-Display Period Register
-    {0x0035,0x01},   // TFT FPLINE Start Position Register
-    {0x0036,0x0B},   // TFT FPLINE Pulse Width Register
-    {0x0038,0xDF},   // LCD Vertical Display Height Register 0
-    {0x0039,0x01},   // LCD Vertical Display Height Register 1
-    {0x003A,0x2C},   // LCD Vertical Non-Display Period Register
-    {0x003B,0x0A},   // TFT FPFRAME Start Position Register
-    {0x003C,0x01},   // TFT FPFRAME Pulse Width Register
-
-    {0x0041,0x00},   // LCD Miscellaneous Register
-    {0x0042,0x00},   // LCD Display Start Address Register 0
-    {0x0043,0x00},   // LCD Display Start Address Register 1
-    {0x0044,0x00},   // LCD Display Start Address Register 2
-
-#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
-    {0x0004,0x07},   // GPIO[0:7] direction
-    {0x0005,0x00},   // GPIO[8:12] direction
-    {0x0008,0x00},   // GPIO[0:7] data
-    {0x0009,0x00},   // GPIO[8:12] data
-    {0x0008,0x04},   // LCD panel Vcc on
-    {0x0008,0x05},   // LCD panel reset
-    {0x0010,0x01},   // Memory Clock Configuration Register
-    {0x0014,0x30},   // LCD Pixel Clock Configuration Register (CLKI 22MHz/4)
-    {0x0018,0x00},   // CRT/TV Pixel Clock Configuration Register
-    {0x001C,0x00},   // MediaPlug Clock Configuration Register(10MHz)
-    {0x001E,0x00},   // CPU To Memory Wait State Select Register
-    {0x0020,0x80},   // Memory Configuration Register
-    {0x0021,0x03},   // DRAM Refresh Rate Register
-    {0x002A,0x00},   // DRAM Timings Control Register 0
-    {0x002B,0x01},   // DRAM Timings Control Register 1
-    {0x0030,0x25},   // Panel Type Register
-    {0x0031,0x00},   // MOD Rate Register
-    {0x0032,0x1d},   // LCD Horizontal Display Width Register
-    {0x0034,0x05},   // LCD Horizontal Non-Display Period Register
-    {0x0035,0x01},   // TFT FPLINE Start Position Register
-    {0x0036,0x01},   // TFT FPLINE Pulse Width Register
-    {0x0038,0x3F},   // LCD Vertical Display Height Register 0
-    {0x0039,0x01},   // LCD Vertical Display Height Register 1
-    {0x003A,0x0b},   // LCD Vertical Non-Display Period Register
-    {0x003B,0x07},   // TFT FPFRAME Start Position Register
-    {0x003C,0x02},   // TFT FPFRAME Pulse Width Register
-
-    {0x0041,0x00},   // LCD Miscellaneous Register
-#if (SWIVEL_VIEW == 0)
-    {0x0042,0x00},   // LCD Display Start Address Register 0
-    {0x0043,0x00},   // LCD Display Start Address Register 1
-    {0x0044,0x00},   // LCD Display Start Address Register 2
-
-#elif (SWIVEL_VIEW == 1)
-    // 1024 - W(320) = 0x2C0
-    {0x0042,0xC0},   // LCD Display Start Address Register 0
-    {0x0043,0x02},   // LCD Display Start Address Register 1
-    {0x0044,0x00},   // LCD Display Start Address Register 2
-    // 1024
-    {0x0046,0x00},   // LCD Memory Address Offset Register 0
-    {0x0047,0x02},   // LCD Memory Address Offset Register 1
-#else
-#error unsupported SWIVEL_VIEW mode
-#endif
-#else
-#error no platform configuration
-#endif  /* CONFIG_PLAT_XXX */
-
-    {0x0048,0x00},   // LCD Pixel Panning Register
-    {0x004A,0x00},   // LCD Display FIFO High Threshold Control Register
-    {0x004B,0x00},   // LCD Display FIFO Low Threshold Control Register
-    {0x0050,0x4F},   // CRT/TV Horizontal Display Width Register
-    {0x0052,0x13},   // CRT/TV Horizontal Non-Display Period Register
-    {0x0053,0x01},   // CRT/TV HRTC Start Position Register
-    {0x0054,0x0B},   // CRT/TV HRTC Pulse Width Register
-    {0x0056,0xDF},   // CRT/TV Vertical Display Height Register 0
-    {0x0057,0x01},   // CRT/TV Vertical Display Height Register 1
-    {0x0058,0x2B},   // CRT/TV Vertical Non-Display Period Register
-    {0x0059,0x09},   // CRT/TV VRTC Start Position Register
-    {0x005A,0x01},   // CRT/TV VRTC Pulse Width Register
-    {0x005B,0x10},   // TV Output Control Register
-
-    {0x0062,0x00},   // CRT/TV Display Start Address Register 0
-    {0x0063,0x00},   // CRT/TV Display Start Address Register 1
-    {0x0064,0x00},   // CRT/TV Display Start Address Register 2
-
-    {0x0068,0x00},   // CRT/TV Pixel Panning Register
-    {0x006A,0x00},   // CRT/TV Display FIFO High Threshold Control Register
-    {0x006B,0x00},   // CRT/TV Display FIFO Low Threshold Control Register
-    {0x0070,0x00},   // LCD Ink/Cursor Control Register
-    {0x0071,0x01},   // LCD Ink/Cursor Start Address Register
-    {0x0072,0x00},   // LCD Cursor X Position Register 0
-    {0x0073,0x00},   // LCD Cursor X Position Register 1
-    {0x0074,0x00},   // LCD Cursor Y Position Register 0
-    {0x0075,0x00},   // LCD Cursor Y Position Register 1
-    {0x0076,0x00},   // LCD Ink/Cursor Blue Color 0 Register
-    {0x0077,0x00},   // LCD Ink/Cursor Green Color 0 Register
-    {0x0078,0x00},   // LCD Ink/Cursor Red Color 0 Register
-    {0x007A,0x1F},   // LCD Ink/Cursor Blue Color 1 Register
-    {0x007B,0x3F},   // LCD Ink/Cursor Green Color 1 Register
-    {0x007C,0x1F},   // LCD Ink/Cursor Red Color 1 Register
-    {0x007E,0x00},   // LCD Ink/Cursor FIFO Threshold Register
-    {0x0080,0x00},   // CRT/TV Ink/Cursor Control Register
-    {0x0081,0x01},   // CRT/TV Ink/Cursor Start Address Register
-    {0x0082,0x00},   // CRT/TV Cursor X Position Register 0
-    {0x0083,0x00},   // CRT/TV Cursor X Position Register 1
-    {0x0084,0x00},   // CRT/TV Cursor Y Position Register 0
-    {0x0085,0x00},   // CRT/TV Cursor Y Position Register 1
-    {0x0086,0x00},   // CRT/TV Ink/Cursor Blue Color 0 Register
-    {0x0087,0x00},   // CRT/TV Ink/Cursor Green Color 0 Register
-    {0x0088,0x00},   // CRT/TV Ink/Cursor Red Color 0 Register
-    {0x008A,0x1F},   // CRT/TV Ink/Cursor Blue Color 1 Register
-    {0x008B,0x3F},   // CRT/TV Ink/Cursor Green Color 1 Register
-    {0x008C,0x1F},   // CRT/TV Ink/Cursor Red Color 1 Register
-    {0x008E,0x00},   // CRT/TV Ink/Cursor FIFO Threshold Register
-    {0x0100,0x00},   // BitBlt Control Register 0
-    {0x0101,0x00},   // BitBlt Control Register 1
-    {0x0102,0x00},   // BitBlt ROP Code/Color Expansion Register
-    {0x0103,0x00},   // BitBlt Operation Register
-    {0x0104,0x00},   // BitBlt Source Start Address Register 0
-    {0x0105,0x00},   // BitBlt Source Start Address Register 1
-    {0x0106,0x00},   // BitBlt Source Start Address Register 2
-    {0x0108,0x00},   // BitBlt Destination Start Address Register 0
-    {0x0109,0x00},   // BitBlt Destination Start Address Register 1
-    {0x010A,0x00},   // BitBlt Destination Start Address Register 2
-    {0x010C,0x00},   // BitBlt Memory Address Offset Register 0
-    {0x010D,0x00},   // BitBlt Memory Address Offset Register 1
-    {0x0110,0x00},   // BitBlt Width Register 0
-    {0x0111,0x00},   // BitBlt Width Register 1
-    {0x0112,0x00},   // BitBlt Height Register 0
-    {0x0113,0x00},   // BitBlt Height Register 1
-    {0x0114,0x00},   // BitBlt Background Color Register 0
-    {0x0115,0x00},   // BitBlt Background Color Register 1
-    {0x0118,0x00},   // BitBlt Foreground Color Register 0
-    {0x0119,0x00},   // BitBlt Foreground Color Register 1
-    {0x01E0,0x00},   // Look-Up Table Mode Register
-    {0x01E2,0x00},   // Look-Up Table Address Register
-    {0x01F0,0x10},   // Power Save Configuration Register
-    {0x01F1,0x00},   // Power Save Status Register
-    {0x01F4,0x00},   // CPU-to-Memory Access Watchdog Timer Register
-#if (SWIVEL_VIEW == 0)
-    {0x01FC,0x01},   // Display Mode Register(0x01:LCD, 0x02:CRT, 0x03:LCD&CRT)
-#elif (SWIVEL_VIEW == 1)
-    {0x01FC,0x41},   // Display Mode Register(0x01:LCD, 0x02:CRT, 0x03:LCD&CRT)
-#else
-#error unsupported SWIVEL_VIEW mode
-#endif  /* SWIVEL_VIEW */
-
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
-    {0x0008,0x07},   // LCD panel Vdd & Vg on
-#endif
-
-    {0x0040,0x05},   // LCD Display Mode Register (2:4bpp,3:8bpp,5:16bpp)
-#if defined(CONFIG_PLAT_MAPPI)
-    {0x0046,0x80},   // LCD Memory Address Offset Register 0
-    {0x0047,0x02},   // LCD Memory Address Offset Register 1
-#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
-    {0x0046,0xf0},   // LCD Memory Address Offset Register 0
-    {0x0047,0x00},   // LCD Memory Address Offset Register 1
-#endif
-    {0x0060,0x05},   // CRT/TV Display Mode Register (2:4bpp,3:8bpp,5:16bpp)
-    {0x0066,0x80},   // CRT/TV Memory Address Offset Register 0 // takeo
-    {0x0067,0x02},   // CRT/TV Memory Address Offset Register 1
-};
diff --git a/include/asm-m32r/scatterlist.h b/include/asm-m32r/scatterlist.h
deleted file mode 100644
index 1ed372c73d0b..000000000000
--- a/include/asm-m32r/scatterlist.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _ASM_M32R_SCATTERLIST_H
-#define _ASM_M32R_SCATTERLIST_H
-
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-    unsigned long sg_magic;
-#endif
-    char *  address;    /* Location data is to be transferred to, NULL for
-                         * highmem page */
-    unsigned long page_link;
-    unsigned int offset;/* for highmem, page offset */
-
-    dma_addr_t dma_address;
-    unsigned int length;
-};
-
-#define ISA_DMA_THRESHOLD (0x1fffffff)
-
-#endif /* _ASM_M32R_SCATTERLIST_H */
diff --git a/include/asm-m32r/sections.h b/include/asm-m32r/sections.h
deleted file mode 100644
index 5e5d21c4908a..000000000000
--- a/include/asm-m32r/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _M32R_SECTIONS_H
-#define _M32R_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif  /* _M32R_SECTIONS_H */
diff --git a/include/asm-m32r/segment.h b/include/asm-m32r/segment.h
deleted file mode 100644
index 42b11aeb3249..000000000000
--- a/include/asm-m32r/segment.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_SEGMENT_H
-#define _ASM_M32R_SEGMENT_H
-
-#define __KERNEL_CS     0x10
-#define __KERNEL_DS     0x18
-
-#define __USER_CS       0x23
-#define __USER_DS       0x2B
-
-#endif  /* _ASM_M32R_SEGMENT_H */
diff --git a/include/asm-m32r/sembuf.h b/include/asm-m32r/sembuf.h
deleted file mode 100644
index c9873d6890e2..000000000000
--- a/include/asm-m32r/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASM_M32R_SEMBUF_H
-#define _ASM_M32R_SEMBUF_H
-
-/*
- * The semid64_ds structure for m32r architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        unsigned long   __unused1;
-        __kernel_time_t sem_ctime;              /* last change time */
-        unsigned long   __unused2;
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASM_M32R_SEMBUF_H */
diff --git a/include/asm-m32r/serial.h b/include/asm-m32r/serial.h
deleted file mode 100644
index 5ac244c72f15..000000000000
--- a/include/asm-m32r/serial.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_M32R_SERIAL_H
-#define _ASM_M32R_SERIAL_H
-
-/* include/asm-m32r/serial.h */
-
-
-#define BASE_BAUD       115200
-
-#endif  /* _ASM_M32R_SERIAL_H */
diff --git a/include/asm-m32r/setup.h b/include/asm-m32r/setup.h
deleted file mode 100644
index c637ab992394..000000000000
--- a/include/asm-m32r/setup.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _ASM_M32R_SETUP_H
-#define _ASM_M32R_SETUP_H
-
-/*
- * This is set up by the setup-routine at boot-time
- */
-
-#define COMMAND_LINE_SIZE       512
-
-#ifdef __KERNEL__
-
-#define PARAM                   ((unsigned char *)empty_zero_page)
-
-#define MOUNT_ROOT_RDONLY       (*(unsigned long *) (PARAM+0x000))
-#define RAMDISK_FLAGS           (*(unsigned long *) (PARAM+0x004))
-#define ORIG_ROOT_DEV           (*(unsigned long *) (PARAM+0x008))
-#define LOADER_TYPE             (*(unsigned long *) (PARAM+0x00c))
-#define INITRD_START            (*(unsigned long *) (PARAM+0x010))
-#define INITRD_SIZE             (*(unsigned long *) (PARAM+0x014))
-
-#define M32R_CPUCLK             (*(unsigned long *) (PARAM+0x018))
-#define M32R_BUSCLK             (*(unsigned long *) (PARAM+0x01c))
-#define M32R_TIMER_DIVIDE       (*(unsigned long *) (PARAM+0x020))
-
-#define COMMAND_LINE            ((char *) (PARAM+0x100))
-
-#define SCREEN_INFO             (*(struct screen_info *) (PARAM+0x200))
-
-#define RAMDISK_IMAGE_START_MASK        (0x07FF)
-#define RAMDISK_PROMPT_FLAG             (0x8000)
-#define RAMDISK_LOAD_FLAG               (0x4000)
-
-extern unsigned long memory_start;
-extern unsigned long memory_end;
-
-#endif  /*  __KERNEL__  */
-
-#endif /* _ASM_M32R_SETUP_H */
diff --git a/include/asm-m32r/shmbuf.h b/include/asm-m32r/shmbuf.h
deleted file mode 100644
index b0cdf0aa7d65..000000000000
--- a/include/asm-m32r/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ASM_M32R_SHMBUF_H
-#define _ASM_M32R_SHMBUF_H
-
-/*
- * The shmid64_ds structure for M32R architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASM_M32R_SHMBUF_H */
diff --git a/include/asm-m32r/shmparam.h b/include/asm-m32r/shmparam.h
deleted file mode 100644
index 35986d81a528..000000000000
--- a/include/asm-m32r/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_SHMPARAM_H
-#define _ASM_M32R_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-
-#endif /* _ASM_M32R_SHMPARAM_H */
diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h
deleted file mode 100644
index da4a9c36d09b..000000000000
--- a/include/asm-m32r/sigcontext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _ASM_M32R_SIGCONTEXT_H
-#define _ASM_M32R_SIGCONTEXT_H
-
-struct sigcontext {
-        /* CPU registers */
-        /* Saved main processor registers. */
-        unsigned long sc_r4;
-        unsigned long sc_r5;
-        unsigned long sc_r6;
-        struct pt_regs *sc_pt_regs;
-        unsigned long sc_r0;
-        unsigned long sc_r1;
-        unsigned long sc_r2;
-        unsigned long sc_r3;
-        unsigned long sc_r7;
-        unsigned long sc_r8;
-        unsigned long sc_r9;
-        unsigned long sc_r10;
-        unsigned long sc_r11;
-        unsigned long sc_r12;
-
-        /* Saved main processor status and miscellaneous context registers. */
-        unsigned long sc_acc0h;
-        unsigned long sc_acc0l;
-        unsigned long sc_acc1h; /* ISA_DSP_LEVEL2 only */
-        unsigned long sc_acc1l; /* ISA_DSP_LEVEL2 only */
-        unsigned long sc_psw;
-        unsigned long sc_bpc;           /* saved PC for TRAP syscalls */
-        unsigned long sc_bbpsw;
-        unsigned long sc_bbpc;
-        unsigned long sc_spu;           /* saved user stack */
-        unsigned long sc_fp;
-        unsigned long sc_lr;            /* saved PC for JL syscalls */
-        unsigned long sc_spi;           /* saved kernel stack */
-
-        unsigned long   oldmask;
-};
-
-#endif  /* _ASM_M32R_SIGCONTEXT_H */
diff --git a/include/asm-m32r/siginfo.h b/include/asm-m32r/siginfo.h
deleted file mode 100644
index 7d9cd9ebfd0e..000000000000
--- a/include/asm-m32r/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M32R_SIGINFO_H
-#define _M32R_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* _M32R_SIGINFO_H */
diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h
deleted file mode 100644
index 1a607066bc64..000000000000
--- a/include/asm-m32r/signal.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef _ASM_M32R_SIGNAL_H
-#define _ASM_M32R_SIGNAL_H
-
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/compiler.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#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
-#define SIGRTMAX        _NSIG
-
-/*
- * 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    0x00000001u
-#define SA_NOCLDWAIT    0x00000002u
-#define SA_SIGINFO      0x00000004u
-#define SA_ONSTACK      0x08000000u
-#define SA_RESTART      0x10000000u
-#define SA_NODEFER      0x40000000u
-#define SA_RESETHAND    0x80000000u
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-#define SA_RESTORER     0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-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
-
-struct pt_regs;
-extern int do_signal(struct pt_regs *regs, sigset_t *oldset);
-
-#define ptrace_signal_deliver(regs, cookie)     do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif  /* _ASM_M32R_SIGNAL_H */
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
deleted file mode 100644
index b96a6d2ffbc3..000000000000
--- a/include/asm-m32r/smp.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef _ASM_M32R_SMP_H
-#define _ASM_M32R_SMP_H
-
-#ifdef CONFIG_SMP
-#ifndef __ASSEMBLY__
-
-#include <linux/cpumask.h>
-#include <linux/spinlock.h>
-#include <linux/threads.h>
-#include <asm/m32r.h>
-
-#define PHYSID_ARRAY_SIZE       1
-
-struct physid_mask
-{
-        unsigned long mask[PHYSID_ARRAY_SIZE];
-};
-
-typedef struct physid_mask physid_mask_t;
-
-#define physid_set(physid, map)                 set_bit(physid, (map).mask)
-#define physid_clear(physid, map)               clear_bit(physid, (map).mask)
-#define physid_isset(physid, map)               test_bit(physid, (map).mask)
-#define physid_test_and_set(physid, map)        test_and_set_bit(physid, (map).mask)
-
-#define physids_and(dst, src1, src2)            bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS)
-#define physids_or(dst, src1, src2)             bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS)
-#define physids_clear(map)                      bitmap_zero((map).mask, MAX_APICS)
-#define physids_complement(dst, src)            bitmap_complement((dst).mask,(src).mask, MAX_APICS)
-#define physids_empty(map)                      bitmap_empty((map).mask, MAX_APICS)
-#define physids_equal(map1, map2)               bitmap_equal((map1).mask, (map2).mask, MAX_APICS)
-#define physids_weight(map)                     bitmap_weight((map).mask, MAX_APICS)
-#define physids_shift_right(d, s, n)            bitmap_shift_right((d).mask, (s).mask, n, MAX_APICS)
-#define physids_shift_left(d, s, n)             bitmap_shift_left((d).mask, (s).mask, n, MAX_APICS)
-#define physids_coerce(map)                     ((map).mask[0])
-
-#define physids_promote(physids)                                        \
-        ({                                                              \
-                physid_mask_t __physid_mask = PHYSID_MASK_NONE;         \
-                __physid_mask.mask[0] = physids;                        \
-                __physid_mask;                                          \
-        })
-
-#define physid_mask_of_physid(physid)                                   \
-        ({                                                              \
-                physid_mask_t __physid_mask = PHYSID_MASK_NONE;         \
-                physid_set(physid, __physid_mask);                      \
-                __physid_mask;                                          \
-        })
-
-#define PHYSID_MASK_ALL         { {[0 ... PHYSID_ARRAY_SIZE-1] = ~0UL} }
-#define PHYSID_MASK_NONE        { {[0 ... PHYSID_ARRAY_SIZE-1] = 0UL} }
-
-extern physid_mask_t phys_cpu_present_map;
-
-/*
- * Some lowlevel functions might want to know about
- * the real CPU ID <-> CPU # mapping.
- */
-extern volatile int cpu_2_physid[NR_CPUS];
-#define cpu_to_physid(cpu_id)   cpu_2_physid[cpu_id]
-
-#define raw_smp_processor_id()  (current_thread_info()->cpu)
-
-extern cpumask_t cpu_callout_map;
-
-static __inline__ int hard_smp_processor_id(void)
-{
-        return (int)*(volatile long *)M32R_CPUID_PORTL;
-}
-
-static __inline__ int cpu_logical_map(int cpu)
-{
-        return cpu;
-}
-
-static __inline__ int cpu_number_map(int cpu)
-{
-        return cpu;
-}
-
-static __inline__ unsigned int num_booting_cpus(void)
-{
-        return cpus_weight(cpu_callout_map);
-}
-
-extern void smp_send_timer(void);
-extern unsigned long send_IPI_mask_phys(cpumask_t, int, int);
-
-extern void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi(cpumask_t mask);
-
-#endif  /* not __ASSEMBLY__ */
-
-#define NO_PROC_ID (0xff)       /* No processor magic marker */
-
-#define PROC_CHANGE_PENALTY     (15)    /* Schedule penalty */
-
-/*
- * M32R-mp IPI
- */
-#define RESCHEDULE_IPI          (M32R_IRQ_IPI0-M32R_IRQ_IPI0)
-#define INVALIDATE_TLB_IPI      (M32R_IRQ_IPI1-M32R_IRQ_IPI0)
-#define CALL_FUNCTION_IPI       (M32R_IRQ_IPI2-M32R_IRQ_IPI0)
-#define LOCAL_TIMER_IPI         (M32R_IRQ_IPI3-M32R_IRQ_IPI0)
-#define INVALIDATE_CACHE_IPI    (M32R_IRQ_IPI4-M32R_IRQ_IPI0)
-#define CPU_BOOT_IPI            (M32R_IRQ_IPI5-M32R_IRQ_IPI0)
-#define CALL_FUNC_SINGLE_IPI    (M32R_IRQ_IPI6-M32R_IRQ_IPI0)
-
-#define IPI_SHIFT       (0)
-#define NR_IPIS         (8)
-
-#else   /* CONFIG_SMP */
-
-#define hard_smp_processor_id()         0
-
-#endif /* CONFIG_SMP */
-
-#endif  /* _ASM_M32R_SMP_H */
diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h
deleted file mode 100644
index 9a0e20012224..000000000000
--- a/include/asm-m32r/socket.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _ASM_M32R_SOCKET_H
-#define _ASM_M32R_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockoptions(2) */
-#define SOL_SOCKET      1
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_ACCEPTCONN           30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#define SO_MARK                 36
-
-#endif /* _ASM_M32R_SOCKET_H */
diff --git a/include/asm-m32r/sockios.h b/include/asm-m32r/sockios.h
deleted file mode 100644
index 6c1fb9b43bdb..000000000000
--- a/include/asm-m32r/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_M32R_SOCKIOS_H
-#define _ASM_M32R_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-
-#endif  /* _ASM_M32R_SOCKIOS_H */
diff --git a/include/asm-m32r/spinlock.h b/include/asm-m32r/spinlock.h
deleted file mode 100644
index f5cfba81ee10..000000000000
--- a/include/asm-m32r/spinlock.h
+++ /dev/null
@@ -1,323 +0,0 @@
-#ifndef _ASM_M32R_SPINLOCK_H
-#define _ASM_M32R_SPINLOCK_H
-
-/*
- *  linux/include/asm-m32r/spinlock.h
- *
- *  M32R version:
- *    Copyright (C) 2001, 2002  Hitoshi Yamamoto
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <linux/compiler.h>
-#include <asm/atomic.h>
-#include <asm/page.h>
-
-/*
- * Your basic SMP spinlocks, allowing only a single CPU anywhere
- *
- * (the type definitions are in asm/spinlock_types.h)
- *
- * Simple spin lock operations.  There are two variants, one clears IRQ's
- * on the local processor, one does not.
- *
- * We make no fairness assumptions. They have a cost.
- */
-
-#define __raw_spin_is_locked(x)         (*(volatile int *)(&(x)->slock) <= 0)
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_spin_unlock_wait(x) \
-                do { cpu_relax(); } while (__raw_spin_is_locked(x))
-
-/**
- * __raw_spin_trylock - Try spin lock and return a result
- * @lock: Pointer to the lock variable
- *
- * __raw_spin_trylock() tries to get the lock and returns a result.
- * On the m32r, the result value is 1 (= Success) or 0 (= Failure).
- */
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
-{
-        int oldval;
-        unsigned long tmp1, tmp2;
-
-        /*
-         * lock->slock :  =1 : unlock
-         *             : <=0 : lock
-         * {
-         *   oldval = lock->slock; <--+ need atomic operation
-         *   lock->slock = 0;      <--+
-         * }
-         */
-        __asm__ __volatile__ (
-                "# __raw_spin_trylock           \n\t"
-                "ldi    %1, #0;                 \n\t"
-                "mvfc   %2, psw;                \n\t"
-                "clrpsw #0x40 -> nop;           \n\t"
-                DCACHE_CLEAR("%0", "r6", "%3")
-                "lock   %0, @%3;                \n\t"
-                "unlock %1, @%3;                \n\t"
-                "mvtc   %2, psw;                \n\t"
-                : "=&r" (oldval), "=&r" (tmp1), "=&r" (tmp2)
-                : "r" (&lock->slock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-
-        return (oldval > 0);
-}
-
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
-{
-        unsigned long tmp0, tmp1;
-
-        /*
-         * lock->slock :  =1 : unlock
-         *             : <=0 : lock
-         *
-         * for ( ; ; ) {
-         *   lock->slock -= 1;  <-- need atomic operation
-         *   if (lock->slock == 0) break;
-         *   for ( ; lock->slock <= 0 ; );
-         * }
-         */
-        __asm__ __volatile__ (
-                "# __raw_spin_lock              \n\t"
-                ".fillinsn                      \n"
-                "1:                             \n\t"
-                "mvfc   %1, psw;                \n\t"
-                "clrpsw #0x40 -> nop;           \n\t"
-                DCACHE_CLEAR("%0", "r6", "%2")
-                "lock   %0, @%2;                \n\t"
-                "addi   %0, #-1;                \n\t"
-                "unlock %0, @%2;                \n\t"
-                "mvtc   %1, psw;                \n\t"
-                "bltz   %0, 2f;                 \n\t"
-                LOCK_SECTION_START(".balign 4 \n\t")
-                ".fillinsn                      \n"
-                "2:                             \n\t"
-                "ld     %0, @%2;                \n\t"
-                "bgtz   %0, 1b;                 \n\t"
-                "bra    2b;                     \n\t"
-                LOCK_SECTION_END
-                : "=&r" (tmp0), "=&r" (tmp1)
-                : "r" (&lock->slock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-}
-
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
-{
-        mb();
-        lock->slock = 1;
-}
-
-/*
- * Read-write spinlocks, allowing multiple readers
- * but only one writer.
- *
- * NOTE! it is quite common to have readers in interrupts
- * but no interrupt writers. For those circumstances we
- * can "mix" irq-safe locks - any writer needs to get a
- * irq-safe write-lock, but readers can get non-irqsafe
- * read-locks.
- *
- * On x86, we implement read-write locks as a 32-bit counter
- * with the high bit (sign) being the "contended" bit.
- *
- * The inline assembly is non-obvious. Think about it.
- *
- * Changed to use the same technique as rw semaphores.  See
- * semaphore.h for details.  -ben
- */
-
-/**
- * read_can_lock - would read_trylock() succeed?
- * @lock: the rwlock in question.
- */
-#define __raw_read_can_lock(x) ((int)(x)->lock > 0)
-
-/**
- * write_can_lock - would write_trylock() succeed?
- * @lock: the rwlock in question.
- */
-#define __raw_write_can_lock(x) ((x)->lock == RW_LOCK_BIAS)
-
-static inline void __raw_read_lock(raw_rwlock_t *rw)
-{
-        unsigned long tmp0, tmp1;
-
-        /*
-         * rw->lock :  >0 : unlock
-         *          : <=0 : lock
-         *
-         * for ( ; ; ) {
-         *   rw->lock -= 1;  <-- need atomic operation
-         *   if (rw->lock >= 0) break;
-         *   rw->lock += 1;  <-- need atomic operation
-         *   for ( ; rw->lock <= 0 ; );
-         * }
-         */
-        __asm__ __volatile__ (
-                "# read_lock                    \n\t"
-                ".fillinsn                      \n"
-                "1:                             \n\t"
-                "mvfc   %1, psw;                \n\t"
-                "clrpsw #0x40 -> nop;           \n\t"
-                DCACHE_CLEAR("%0", "r6", "%2")
-                "lock   %0, @%2;                \n\t"
-                "addi   %0, #-1;                \n\t"
-                "unlock %0, @%2;                \n\t"
-                "mvtc   %1, psw;                \n\t"
-                "bltz   %0, 2f;                 \n\t"
-                LOCK_SECTION_START(".balign 4 \n\t")
-                ".fillinsn                      \n"
-                "2:                             \n\t"
-                "clrpsw #0x40 -> nop;           \n\t"
-                DCACHE_CLEAR("%0", "r6", "%2")
-                "lock   %0, @%2;                \n\t"
-                "addi   %0, #1;                 \n\t"
-                "unlock %0, @%2;                \n\t"
-                "mvtc   %1, psw;                \n\t"
-                ".fillinsn                      \n"
-                "3:                             \n\t"
-                "ld     %0, @%2;                \n\t"
-                "bgtz   %0, 1b;                 \n\t"
-                "bra    3b;                     \n\t"
-                LOCK_SECTION_END
-                : "=&r" (tmp0), "=&r" (tmp1)
-                : "r" (&rw->lock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-}
-
-static inline void __raw_write_lock(raw_rwlock_t *rw)
-{
-        unsigned long tmp0, tmp1, tmp2;
-
-        /*
-         * rw->lock :  =RW_LOCK_BIAS_STR : unlock
-         *          : !=RW_LOCK_BIAS_STR : lock
-         *
-         * for ( ; ; ) {
-         *   rw->lock -= RW_LOCK_BIAS_STR;  <-- need atomic operation
-         *   if (rw->lock == 0) break;
-         *   rw->lock += RW_LOCK_BIAS_STR;  <-- need atomic operation
-         *   for ( ; rw->lock != RW_LOCK_BIAS_STR ; ) ;
-         * }
-         */
-        __asm__ __volatile__ (
-                "# write_lock                                   \n\t"
-                "seth   %1, #high(" RW_LOCK_BIAS_STR ");        \n\t"
-                "or3    %1, %1, #low(" RW_LOCK_BIAS_STR ");     \n\t"
-                ".fillinsn                                      \n"
-                "1:                                             \n\t"
-                "mvfc   %2, psw;                                \n\t"
-                "clrpsw #0x40 -> nop;                           \n\t"
-                DCACHE_CLEAR("%0", "r7", "%3")
-                "lock   %0, @%3;                                \n\t"
-                "sub    %0, %1;                                 \n\t"
-                "unlock %0, @%3;                                \n\t"
-                "mvtc   %2, psw;                                \n\t"
-                "bnez   %0, 2f;                                 \n\t"
-                LOCK_SECTION_START(".balign 4 \n\t")
-                ".fillinsn                                      \n"
-                "2:                                             \n\t"
-                "clrpsw #0x40 -> nop;                           \n\t"
-                DCACHE_CLEAR("%0", "r7", "%3")
-                "lock   %0, @%3;                                \n\t"
-                "add    %0, %1;                                 \n\t"
-                "unlock %0, @%3;                                \n\t"
-                "mvtc   %2, psw;                                \n\t"
-                ".fillinsn                                      \n"
-                "3:                                             \n\t"
-                "ld     %0, @%3;                                \n\t"
-                "beq    %0, %1, 1b;                             \n\t"
-                "bra    3b;                                     \n\t"
-                LOCK_SECTION_END
-                : "=&r" (tmp0), "=&r" (tmp1), "=&r" (tmp2)
-                : "r" (&rw->lock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r7"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-}
-
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
-{
-        unsigned long tmp0, tmp1;
-
-        __asm__ __volatile__ (
-                "# read_unlock                  \n\t"
-                "mvfc   %1, psw;                \n\t"
-                "clrpsw #0x40 -> nop;           \n\t"
-                DCACHE_CLEAR("%0", "r6", "%2")
-                "lock   %0, @%2;                \n\t"
-                "addi   %0, #1;                 \n\t"
-                "unlock %0, @%2;                \n\t"
-                "mvtc   %1, psw;                \n\t"
-                : "=&r" (tmp0), "=&r" (tmp1)
-                : "r" (&rw->lock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r6"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-}
-
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
-{
-        unsigned long tmp0, tmp1, tmp2;
-
-        __asm__ __volatile__ (
-                "# write_unlock                                 \n\t"
-                "seth   %1, #high(" RW_LOCK_BIAS_STR ");        \n\t"
-                "or3    %1, %1, #low(" RW_LOCK_BIAS_STR ");     \n\t"
-                "mvfc   %2, psw;                                \n\t"
-                "clrpsw #0x40 -> nop;                           \n\t"
-                DCACHE_CLEAR("%0", "r7", "%3")
-                "lock   %0, @%3;                                \n\t"
-                "add    %0, %1;                                 \n\t"
-                "unlock %0, @%3;                                \n\t"
-                "mvtc   %2, psw;                                \n\t"
-                : "=&r" (tmp0), "=&r" (tmp1), "=&r" (tmp2)
-                : "r" (&rw->lock)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r7"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-}
-
-static inline int __raw_read_trylock(raw_rwlock_t *lock)
-{
-        atomic_t *count = (atomic_t*)lock;
-        if (atomic_dec_return(count) >= 0)
-                return 1;
-        atomic_inc(count);
-        return 0;
-}
-
-static inline int __raw_write_trylock(raw_rwlock_t *lock)
-{
-        atomic_t *count = (atomic_t *)lock;
-        if (atomic_sub_and_test(RW_LOCK_BIAS, count))
-                return 1;
-        atomic_add(RW_LOCK_BIAS, count);
-        return 0;
-}
-
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
-
-#endif  /* _ASM_M32R_SPINLOCK_H */
diff --git a/include/asm-m32r/spinlock_types.h b/include/asm-m32r/spinlock_types.h
deleted file mode 100644
index 83f52105c0e4..000000000000
--- a/include/asm-m32r/spinlock_types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _ASM_M32R_SPINLOCK_TYPES_H
-#define _ASM_M32R_SPINLOCK_TYPES_H
-
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
-typedef struct {
-        volatile int slock;
-} raw_spinlock_t;
-
-#define __RAW_SPIN_LOCK_UNLOCKED        { 1 }
-
-typedef struct {
-        volatile int lock;
-} raw_rwlock_t;
-
-#define RW_LOCK_BIAS                    0x01000000
-#define RW_LOCK_BIAS_STR                "0x01000000"
-
-#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
-
-#endif /* _ASM_M32R_SPINLOCK_TYPES_H */
diff --git a/include/asm-m32r/stat.h b/include/asm-m32r/stat.h
deleted file mode 100644
index da4518f82d6d..000000000000
--- a/include/asm-m32r/stat.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _ASM_M32R_STAT_H
-#define _ASM_M32R_STAT_H
-
-#include <asm/byteorder.h>
-
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-#define STAT_HAVE_NSEC  1
-
-struct stat {
-        unsigned short st_dev;
-        unsigned short __pad1;
-        unsigned long  st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned short __pad2;
-        unsigned long  st_size;
-        unsigned long  st_blksize;
-        unsigned long  st_blocks;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-        unsigned long long      st_dev;
-        unsigned char   __pad0[4];
-#define STAT64_HAS_BROKEN_ST_INO
-        unsigned long   __st_ino;
-
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-
-        unsigned long   st_uid;
-        unsigned long   st_gid;
-
-        unsigned long long      st_rdev;
-        unsigned char   __pad3[4];
-
-        long long       st_size;
-        unsigned long   st_blksize;
-
-#if defined(__BIG_ENDIAN)
-        unsigned long   __pad4;         /* future possible st_blocks high bits */
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-#elif defined(__LITTLE_ENDIAN)
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-        unsigned long   __pad4;         /* future possible st_blocks high bits */
-#else
-#error no endian defined
-#endif
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-
-        unsigned long   st_mtime;
-        unsigned long   st_mtime_nsec;
-
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;
-
-        unsigned long long      st_ino;
-};
-
-#endif  /* _ASM_M32R_STAT_H */
diff --git a/include/asm-m32r/statfs.h b/include/asm-m32r/statfs.h
deleted file mode 100644
index 6eb4c6007e6b..000000000000
--- a/include/asm-m32r/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_STATFS_H
-#define _ASM_M32R_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif  /* _ASM_M32R_STATFS_H */
diff --git a/include/asm-m32r/string.h b/include/asm-m32r/string.h
deleted file mode 100644
index e61e2b0bfc1f..000000000000
--- a/include/asm-m32r/string.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_M32R_STRING_H
-#define _ASM_M32R_STRING_H
-
-#define  __HAVE_ARCH_STRLEN
-extern size_t strlen(const char * s);
-
-#define  __HAVE_ARCH_MEMCPY
-extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-
-#define  __HAVE_ARCH_MEMSET
-extern void *memset(void *__s, int __c, size_t __count);
-
-#endif  /* _ASM_M32R_STRING_H */
diff --git a/include/asm-m32r/swab.h b/include/asm-m32r/swab.h
deleted file mode 100644
index 97973e101825..000000000000
--- a/include/asm-m32r/swab.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_SWAB_H
-#define _ASM_M32R_SWAB_H
-
-#include <asm/types.h>
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* _ASM_M32R_SWAB_H */
diff --git a/include/asm-m32r/syscall.h b/include/asm-m32r/syscall.h
deleted file mode 100644
index 25f316f2b78d..000000000000
--- a/include/asm-m32r/syscall.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_M32R_SYSCALL_H
-#define _ASM_M32R_SYSCALL_H
-
-/* Definitions for the system call vector.  */
-#define SYSCALL_VECTOR          "2"
-#define SYSCALL_VECTOR_ADDRESS  "0xa0"
-
-#endif /* _ASM_M32R_SYSCALL_H */
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
deleted file mode 100644
index c980f5ba8de7..000000000000
--- a/include/asm-m32r/system.h
+++ /dev/null
@@ -1,431 +0,0 @@
-#ifndef _ASM_M32R_SYSTEM_H
-#define _ASM_M32R_SYSTEM_H
-
-/*
- * 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) 2001  Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
- * Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#include <linux/compiler.h>
-#include <asm/assembler.h>
-
-#ifdef __KERNEL__
-
-/*
- * switch_to(prev, next) should switch from task `prev' to `next'
- * `prev' will never be the same as `next'.
- *
- * `next' and `prev' should be struct task_struct, but it isn't always defined
- */
-
-#if defined(CONFIG_FRAME_POINTER) || \
-        !defined(CONFIG_SCHED_OMIT_FRAME_POINTER)
-#define M32R_PUSH_FP "  push fp\n"
-#define M32R_POP_FP  "  pop  fp\n"
-#else
-#define M32R_PUSH_FP ""
-#define M32R_POP_FP  ""
-#endif
-
-#define switch_to(prev, next, last)  do { \
-        __asm__ __volatile__ ( \
-                "       seth    lr, #high(1f)                           \n" \
-                "       or3     lr, lr, #low(1f)                        \n" \
-                "       st      lr, @%4  ; store old LR                 \n" \
-                "       ld      lr, @%5  ; load new LR                  \n" \
-                        M32R_PUSH_FP \
-                "       st      sp, @%2  ; store old SP                 \n" \
-                "       ld      sp, @%3  ; load new SP                  \n" \
-                "       push    %1  ; store `prev' on new stack         \n" \
-                "       jmp     lr                                      \n" \
-                "       .fillinsn                                       \n" \
-                "1:                                                     \n" \
-                "       pop     %0  ; restore `__last' from new stack   \n" \
-                        M32R_POP_FP \
-                : "=r" (last) \
-                : "0" (prev), \
-                  "r" (&(prev->thread.sp)), "r" (&(next->thread.sp)), \
-                  "r" (&(prev->thread.lr)), "r" (&(next->thread.lr)) \
-                : "memory", "lr" \
-        ); \
-} while(0)
-
-/* Interrupt Control */
-#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
-#define local_irq_enable() \
-        __asm__ __volatile__ ("setpsw #0x40 -> nop": : :"memory")
-#define local_irq_disable() \
-        __asm__ __volatile__ ("clrpsw #0x40 -> nop": : :"memory")
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-static inline void local_irq_enable(void)
-{
-        unsigned long tmpreg;
-        __asm__ __volatile__(
-                "mvfc   %0, psw;                \n\t"
-                "or3    %0, %0, #0x0040;        \n\t"
-                "mvtc   %0, psw;                \n\t"
-        : "=&r" (tmpreg) : : "cbit", "memory");
-}
-
-static inline void local_irq_disable(void)
-{
-        unsigned long tmpreg0, tmpreg1;
-        __asm__ __volatile__(
-                "ld24   %0, #0  ; Use 32-bit insn. \n\t"
-                "mvfc   %1, psw ; No interrupt can be accepted here. \n\t"
-                "mvtc   %0, psw \n\t"
-                "and3   %0, %1, #0xffbf \n\t"
-                "mvtc   %0, psw \n\t"
-        : "=&r" (tmpreg0), "=&r" (tmpreg1) : : "cbit", "memory");
-}
-#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-
-#define local_save_flags(x) \
-        __asm__ __volatile__("mvfc %0,psw" : "=r"(x) : /* no input */)
-
-#define local_irq_restore(x) \
-        __asm__ __volatile__("mvtc %0,psw" : /* no outputs */ \
-                : "r" (x) : "cbit", "memory")
-
-#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
-#define local_irq_save(x)                               \
-        __asm__ __volatile__(                           \
-                "mvfc   %0, psw;                \n\t"   \
-                "clrpsw #0x40 -> nop;           \n\t"   \
-                : "=r" (x) : /* no input */ : "memory")
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define local_irq_save(x)                               \
-        ({                                              \
-                unsigned long tmpreg;                   \
-                __asm__ __volatile__(                   \
-                        "ld24   %1, #0 \n\t"            \
-                        "mvfc   %0, psw \n\t"           \
-                        "mvtc   %1, psw \n\t"           \
-                        "and3   %1, %0, #0xffbf \n\t"   \
-                        "mvtc   %1, psw \n\t"           \
-                        : "=r" (x), "=&r" (tmpreg)      \
-                        : : "cbit", "memory");          \
-        })
-#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-
-#define irqs_disabled()                                 \
-        ({                                              \
-                unsigned long flags;                    \
-                local_save_flags(flags);                \
-                !(flags & 0x40);                        \
-        })
-
-#define nop()   __asm__ __volatile__ ("nop" : : )
-
-#define xchg(ptr, x)                                                    \
-        ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
-#define xchg_local(ptr, x)                                              \
-        ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr),    \
-                        sizeof(*(ptr))))
-
-extern void  __xchg_called_with_bad_pointer(void);
-
-#ifdef CONFIG_CHIP_M32700_TS1
-#define DCACHE_CLEAR(reg0, reg1, addr)                          \
-        "seth   "reg1", #high(dcache_dummy);            \n\t"   \
-        "or3    "reg1", "reg1", #low(dcache_dummy);     \n\t"   \
-        "lock   "reg0", @"reg1";                        \n\t"   \
-        "add3   "reg0", "addr", #0x1000;                \n\t"   \
-        "ld     "reg0", @"reg0";                        \n\t"   \
-        "add3   "reg0", "addr", #0x2000;                \n\t"   \
-        "ld     "reg0", @"reg0";                        \n\t"   \
-        "unlock "reg0", @"reg1";                        \n\t"
-        /* FIXME: This workaround code cannot handle kernel modules
-         * correctly under SMP environment.
-         */
-#else   /* CONFIG_CHIP_M32700_TS1 */
-#define DCACHE_CLEAR(reg0, reg1, addr)
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-
-static __always_inline unsigned long
-__xchg(unsigned long x, volatile void *ptr, int size)
-{
-        unsigned long flags;
-        unsigned long tmp = 0;
-
-        local_irq_save(flags);
-
-        switch (size) {
-#ifndef CONFIG_SMP
-        case 1:
-                __asm__ __volatile__ (
-                        "ldb    %0, @%2 \n\t"
-                        "stb    %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-        case 2:
-                __asm__ __volatile__ (
-                        "ldh    %0, @%2 \n\t"
-                        "sth    %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-        case 4:
-                __asm__ __volatile__ (
-                        "ld     %0, @%2 \n\t"
-                        "st     %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-#else  /* CONFIG_SMP */
-        case 4:
-                __asm__ __volatile__ (
-                        DCACHE_CLEAR("%0", "r4", "%2")
-                        "lock   %0, @%2;        \n\t"
-                        "unlock %1, @%2;        \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr)
-                        : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                        , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-                );
-                break;
-#endif  /* CONFIG_SMP */
-        default:
-                __xchg_called_with_bad_pointer();
-        }
-
-        local_irq_restore(flags);
-
-        return (tmp);
-}
-
-static __always_inline unsigned long
-__xchg_local(unsigned long x, volatile void *ptr, int size)
-{
-        unsigned long flags;
-        unsigned long tmp = 0;
-
-        local_irq_save(flags);
-
-        switch (size) {
-        case 1:
-                __asm__ __volatile__ (
-                        "ldb    %0, @%2 \n\t"
-                        "stb    %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-        case 2:
-                __asm__ __volatile__ (
-                        "ldh    %0, @%2 \n\t"
-                        "sth    %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-        case 4:
-                __asm__ __volatile__ (
-                        "ld     %0, @%2 \n\t"
-                        "st     %1, @%2 \n\t"
-                        : "=&r" (tmp) : "r" (x), "r" (ptr) : "memory");
-                break;
-        default:
-                __xchg_called_with_bad_pointer();
-        }
-
-        local_irq_restore(flags);
-
-        return (tmp);
-}
-
-#define __HAVE_ARCH_CMPXCHG     1
-
-static inline unsigned long
-__cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
-{
-        unsigned long flags;
-        unsigned int retval;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                        DCACHE_CLEAR("%0", "r4", "%1")
-                        M32R_LOCK" %0, @%1;     \n"
-                "       bne     %0, %2, 1f;     \n"
-                        M32R_UNLOCK" %3, @%1;   \n"
-                "       bra     2f;             \n"
-                "       .fillinsn               \n"
-                "1:"
-                        M32R_UNLOCK" %0, @%1;   \n"
-                "       .fillinsn               \n"
-                "2:"
-                        : "=&r" (retval)
-                        : "r" (p), "r" (old), "r" (new)
-                        : "cbit", "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                        , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-                );
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-static inline unsigned long
-__cmpxchg_local_u32(volatile unsigned int *p, unsigned int old,
-                        unsigned int new)
-{
-        unsigned long flags;
-        unsigned int retval;
-
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                        DCACHE_CLEAR("%0", "r4", "%1")
-                        "ld %0, @%1;            \n"
-                "       bne     %0, %2, 1f;     \n"
-                        "st %3, @%1;            \n"
-                "       bra     2f;             \n"
-                "       .fillinsn               \n"
-                "1:"
-                        "st %0, @%1;            \n"
-                "       .fillinsn               \n"
-                "2:"
-                        : "=&r" (retval)
-                        : "r" (p), "r" (old), "r" (new)
-                        : "cbit", "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                        , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-                );
-        local_irq_restore(flags);
-
-        return retval;
-}
-
-/* This function doesn't exist, so you'll get a linker error
-   if something tries to do an invalid cmpxchg().  */
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-static inline unsigned long
-__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
-{
-        switch (size) {
-        case 4:
-                return __cmpxchg_u32(ptr, old, new);
-#if 0   /* we don't have __cmpxchg_u64 */
-        case 8:
-                return __cmpxchg_u64(ptr, old, new);
-#endif /* 0 */
-        }
-        __cmpxchg_called_with_bad_pointer();
-        return old;
-}
-
-#define cmpxchg(ptr, o, n)                                               \
-        ((__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)(o),       \
-                        (unsigned long)(n), sizeof(*(ptr))))
-
-#include <asm-generic/cmpxchg-local.h>
-
-static inline unsigned long __cmpxchg_local(volatile void *ptr,
-                                      unsigned long old,
-                                      unsigned long new, int size)
-{
-        switch (size) {
-        case 4:
-                return __cmpxchg_local_u32(ptr, old, new);
-        default:
-                return __cmpxchg_local_generic(ptr, old, new, size);
-        }
-
-        return old;
-}
-
-/*
- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
- * them available.
- */
-#define cmpxchg_local(ptr, o, n)                                            \
-        ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o),     \
-                        (unsigned long)(n), sizeof(*(ptr))))
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-
-#endif  /* __KERNEL__ */
-
-/*
- * Memory barrier.
- *
- * mb() prevents loads and stores being reordered across this point.
- * rmb() prevents loads being reordered across this point.
- * wmb() prevents stores being reordered across this point.
- */
-#define mb()   barrier()
-#define rmb()  mb()
-#define wmb()  mb()
-
-/**
- * read_barrier_depends - Flush all pending reads that subsequents reads
- * depend on.
- *
- * No data-dependent reads from memory-like regions are ever reordered
- * over this barrier.  All reads preceding this primitive are guaranteed
- * to access memory (but not necessarily other CPUs' caches) before any
- * reads following this primitive that depend on the data return by
- * any of the preceding reads.  This primitive is much lighter weight than
- * rmb() on most CPUs, and is never heavier weight than is
- * rmb().
- *
- * These ordering constraints are respected by both the local CPU
- * and the compiler.
- *
- * Ordering is not guaranteed by anything other than these primitives,
- * not even by data dependencies.  See the documentation for
- * memory_barrier() for examples and URLs to more information.
- *
- * For example, the following code would force ordering (the initial
- * value of "a" is zero, "b" is one, and "p" is "&a"):
- *
- * <programlisting>
- *      CPU 0                           CPU 1
- *
- *      b = 2;
- *      memory_barrier();
- *      p = &b;                         q = p;
- *                                      read_barrier_depends();
- *                                      d = *q;
- * </programlisting>
- *
- *
- * because the read of "*q" depends on the read of "p" and these
- * two reads are separated by a read_barrier_depends().  However,
- * the following code, with the same initial values for "a" and "b":
- *
- * <programlisting>
- *      CPU 0                           CPU 1
- *
- *      a = 2;
- *      memory_barrier();
- *      b = 3;                          y = b;
- *                                      read_barrier_depends();
- *                                      x = a;
- * </programlisting>
- *
- * does not enforce ordering, since there is no data dependency between
- * the read of "a" and the read of "b".  Therefore, on some CPUs, such
- * as Alpha, "y" could be set to 3 and "x" to 0.  Use rmb()
- * in cases like this where there are no data dependencies.
- **/
-
-#define read_barrier_depends()  do { } while (0)
-
-#ifdef CONFIG_SMP
-#define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
-#define smp_read_barrier_depends()      read_barrier_depends()
-#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
-#else
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-#define smp_read_barrier_depends()      do { } while (0)
-#define set_mb(var, value) do { var = value; barrier(); } while (0)
-#endif
-
-#define arch_align_stack(x) (x)
-
-#endif /* _ASM_M32R_SYSTEM_H */
diff --git a/include/asm-m32r/termbits.h b/include/asm-m32r/termbits.h
deleted file mode 100644
index bc104008b55b..000000000000
--- a/include/asm-m32r/termbits.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef _ASM_M32R_TERMBITS_H
-#define _ASM_M32R_TERMBITS_H
-
-#include <linux/posix_types.h>
-
-typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
-
-#define NCCS 19
-struct termios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-};
-
-struct termios2 {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-struct ktermios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-/* c_oflag bits */
-#define OPOST   0000001
-#define OLCUC   0000002
-#define ONLCR   0000004
-#define OCRNL   0000010
-#define ONOCR   0000020
-#define ONLRET  0000040
-#define OFILL   0000100
-#define OFDEL   0000200
-#define NLDLY   0000400
-#define   NL0   0000000
-#define   NL1   0000400
-#define CRDLY   0003000
-#define   CR0   0000000
-#define   CR1   0001000
-#define   CR2   0002000
-#define   CR3   0003000
-#define TABDLY  0014000
-#define   TAB0  0000000
-#define   TAB1  0004000
-#define   TAB2  0010000
-#define   TAB3  0014000
-#define   XTABS 0014000
-#define BSDLY   0020000
-#define   BS0   0000000
-#define   BS1   0020000
-#define VTDLY   0040000
-#define   VT0   0000000
-#define   VT1   0040000
-#define FFDLY   0100000
-#define   FF0   0000000
-#define   FF1   0100000
-
-/* c_cflag bit meaning */
-#define CBAUD   0010017
-#define  B0     0000000         /* hang up */
-#define  B50    0000001
-#define  B75    0000002
-#define  B110   0000003
-#define  B134   0000004
-#define  B150   0000005
-#define  B200   0000006
-#define  B300   0000007
-#define  B600   0000010
-#define  B1200  0000011
-#define  B1800  0000012
-#define  B2400  0000013
-#define  B4800  0000014
-#define  B9600  0000015
-#define  B19200 0000016
-#define  B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE   0000060
-#define   CS5   0000000
-#define   CS6   0000020
-#define   CS7   0000040
-#define   CS8   0000060
-#define CSTOPB  0000100
-#define CREAD   0000200
-#define PARENB  0000400
-#define PARODD  0001000
-#define HUPCL   0002000
-#define CLOCAL  0004000
-#define CBAUDEX 0010000
-#define    BOTHER 0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD    002003600000          /** input baud rate */
-#define CTVB      004000000000          /* VisioBraille Terminal flow control */
-#define CMSPAR    010000000000          /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
-
-#define IBSHIFT 16                      /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG    0000001
-#define ICANON  0000002
-#define XCASE   0000004
-#define ECHO    0000010
-#define ECHOE   0000020
-#define ECHOK   0000040
-#define ECHONL  0000100
-#define NOFLSH  0000200
-#define TOSTOP  0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE  0004000
-#define FLUSHO  0010000
-#define PENDIN  0040000
-#define IEXTEN  0100000
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF          0
-#define TCOON           1
-#define TCIOFF          2
-#define TCION           3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH        0
-#define TCOFLUSH        1
-#define TCIOFLUSH       2
-
-/* tcsetattr uses these */
-#define TCSANOW         0
-#define TCSADRAIN       1
-#define TCSAFLUSH       2
-
-#endif /* _ASM_M32R_TERMBITS_H */
diff --git a/include/asm-m32r/termios.h b/include/asm-m32r/termios.h
deleted file mode 100644
index 93ce79fd342a..000000000000
--- a/include/asm-m32r/termios.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _M32R_TERMIOS_H
-#define _M32R_TERMIOS_H
-
-#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 <linux/module.h>
-
-/*      intr=^C         quit=^\         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-        unsigned short __tmp; \
-        get_user(__tmp,&(termio)->x); \
-        *(unsigned short *) &(termios)->x = __tmp; \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif  /* __KERNEL__ */
-
-#endif  /* _M32R_TERMIOS_H */
diff --git a/include/asm-m32r/thread_info.h b/include/asm-m32r/thread_info.h
deleted file mode 100644
index 8589d462df27..000000000000
--- a/include/asm-m32r/thread_info.h
+++ /dev/null
@@ -1,184 +0,0 @@
-#ifndef _ASM_M32R_THREAD_INFO_H
-#define _ASM_M32R_THREAD_INFO_H
-
-/* thread_info.h: m32r low-level thread information
- *
- * Copyright (C) 2002  David Howells (dhowells@redhat.com)
- * - Incorporating suggestions made by Linus Torvalds and Dave Miller
- * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#endif
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants must also be changed
- */
-#ifndef __ASSEMBLY__
-
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        unsigned long           status;         /* thread-synchronous flags */
-        __u32                   cpu;            /* current CPU */
-        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-
-        mm_segment_t            addr_limit;     /* thread address space:
-                                                   0-0xBFFFFFFF for user-thread
-                                                   0-0xFFFFFFFF for kernel-thread
-                                                */
-        struct restart_block    restart_block;
-
-        __u8                    supervisor_stack[0];
-};
-
-#else /* !__ASSEMBLY__ */
-
-/* offsets into the thread_info struct for assembly code access */
-#define TI_TASK         0x00000000
-#define TI_EXEC_DOMAIN  0x00000004
-#define TI_FLAGS        0x00000008
-#define TI_STATUS       0x0000000C
-#define TI_CPU          0x00000010
-#define TI_PRE_COUNT    0x00000014
-#define TI_ADDR_LIMIT   0x00000018
-#define TI_RESTART_BLOCK 0x000001C
-
-#endif
-
-#define PREEMPT_ACTIVE          0x10000000
-
-/*
- * macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
- */
-#ifndef __ASSEMBLY__
-
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-
-#define THREAD_SIZE (2*PAGE_SIZE)
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-        struct thread_info *ti;
-
-        __asm__ __volatile__ (
-                "ldi    %0, #%1                 \n\t"
-                "and    %0, sp                  \n\t"
-                : "=r" (ti) : "i" (~(THREAD_SIZE - 1))
-        );
-
-        return ti;
-}
-
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk)                                  \
-        ({                                                      \
-                struct thread_info *ret;                        \
-                                                                \
-                ret = kzalloc(THREAD_SIZE, GFP_KERNEL);         \
-                                                                \
-                ret;                                            \
-         })
-#else
-#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-
-#define free_thread_info(info) kfree(info)
-
-#define TI_FLAG_FAULT_CODE_SHIFT        28
-
-static inline void set_thread_fault_code(unsigned int val)
-{
-        struct thread_info *ti = current_thread_info();
-        ti->flags = (ti->flags & (~0 >> (32 - TI_FLAG_FAULT_CODE_SHIFT)))
-                | (val << TI_FLAG_FAULT_CODE_SHIFT);
-}
-
-static inline unsigned int get_thread_fault_code(void)
-{
-        struct thread_info *ti = current_thread_info();
-        return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;
-}
-
-#else /* !__ASSEMBLY__ */
-
-#define THREAD_SIZE     8192
-
-/* how to get the thread information struct from ASM */
-#define GET_THREAD_INFO(reg)    GET_THREAD_INFO reg
-        .macro GET_THREAD_INFO reg
-        ldi     \reg, #-THREAD_SIZE
-        and     \reg, sp
-        .endm
-
-#endif
-
-/*
- * thread information flags
- * - these are process state flags that various assembly files may need to access
- * - pending work-to-be-done flags are in LSW
- * - other flags in MSW
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_SIGPENDING          1       /* signal pending */
-#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
-#define TIF_IRET                4       /* return with iret */
-#define TIF_RESTORE_SIGMASK     8       /* restore signal mask in do_signal() */
-#define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
-#define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_MEMDIE              18      /* OOM killer killed process */
-#define TIF_FREEZE              19      /* is freezing for suspend */
-
-#define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
-#define _TIF_IRET               (1<<TIF_IRET)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
-#define _TIF_USEDFPU            (1<<TIF_USEDFPU)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_FREEZE             (1<<TIF_FREEZE)
-
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
-
-/*
- * Thread-synchronous status.
- *
- * This is different from the flags in that nobody else
- * ever touches our thread-synchronous status, so we don't
- * have to worry about atomic accesses.
- */
-#define TS_USEDFPU              0x0001  /* FPU was used by this task this quantum (SMP) */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_M32R_THREAD_INFO_H */
diff --git a/include/asm-m32r/timex.h b/include/asm-m32r/timex.h
deleted file mode 100644
index bb9fe4feb12d..000000000000
--- a/include/asm-m32r/timex.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ASM_M32R_TIMEX_H
-#define _ASM_M32R_TIMEX_H
-
-/*
- * linux/include/asm-m32r/timex.h
- *
- * m32r architecture timex specifications
- */
-
-#define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)
-#define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-
-#ifdef __KERNEL__
-/*
- * Standard way to access the cycle counter.
- * Currently only used on SMP.
- */
-
-typedef unsigned long long cycles_t;
-
-static __inline__ cycles_t get_cycles (void)
-{
-        return 0;
-}
-#endif  /* __KERNEL__ */
-
-#endif  /* _ASM_M32R_TIMEX_H */
diff --git a/include/asm-m32r/tlb.h b/include/asm-m32r/tlb.h
deleted file mode 100644
index c7ebd8d48f3b..000000000000
--- a/include/asm-m32r/tlb.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _M32R_TLB_H
-#define _M32R_TLB_H
-
-/*
- * x86 doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _M32R_TLB_H */
diff --git a/include/asm-m32r/tlbflush.h b/include/asm-m32r/tlbflush.h
deleted file mode 100644
index 0ef95307784e..000000000000
--- a/include/asm-m32r/tlbflush.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef _ASM_M32R_TLBFLUSH_H
-#define _ASM_M32R_TLBFLUSH_H
-
-#include <asm/m32r.h>
-
-/*
- * TLB flushing:
- *
- *  - flush_tlb() flushes the current mm struct TLBs
- *  - flush_tlb_all() flushes all processes TLBs
- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
- *  - flush_tlb_page(vma, vmaddr) flushes one page
- *  - flush_tlb_range(vma, start, end) flushes a range of pages
- *  - flush_tlb_kernel_range(start, end) flushes a range of kernel pages
- */
-
-extern void local_flush_tlb_all(void);
-extern void local_flush_tlb_mm(struct mm_struct *);
-extern void local_flush_tlb_page(struct vm_area_struct *, unsigned long);
-extern void local_flush_tlb_range(struct vm_area_struct *, unsigned long,
-        unsigned long);
-
-#ifndef CONFIG_SMP
-#ifdef CONFIG_MMU
-#define flush_tlb_all()                 local_flush_tlb_all()
-#define flush_tlb_mm(mm)                local_flush_tlb_mm(mm)
-#define flush_tlb_page(vma, page)       local_flush_tlb_page(vma, page)
-#define flush_tlb_range(vma, start, end)        \
-        local_flush_tlb_range(vma, start, end)
-#define flush_tlb_kernel_range(start, end)      local_flush_tlb_all()
-#else   /* CONFIG_MMU */
-#define flush_tlb_all()                 do { } while (0)
-#define flush_tlb_mm(mm)                do { } while (0)
-#define flush_tlb_page(vma, vmaddr)     do { } while (0)
-#define flush_tlb_range(vma, start, end)        do { } while (0)
-#endif  /* CONFIG_MMU */
-#else   /* CONFIG_SMP */
-extern void smp_flush_tlb_all(void);
-extern void smp_flush_tlb_mm(struct mm_struct *);
-extern void smp_flush_tlb_page(struct vm_area_struct *, unsigned long);
-extern void smp_flush_tlb_range(struct vm_area_struct *, unsigned long,
-        unsigned long);
-
-#define flush_tlb_all()                 smp_flush_tlb_all()
-#define flush_tlb_mm(mm)                smp_flush_tlb_mm(mm)
-#define flush_tlb_page(vma, page)       smp_flush_tlb_page(vma, page)
-#define flush_tlb_range(vma, start, end)        \
-        smp_flush_tlb_range(vma, start, end)
-#define flush_tlb_kernel_range(start, end)      smp_flush_tlb_all()
-#endif  /* CONFIG_SMP */
-
-static __inline__ void __flush_tlb_page(unsigned long page)
-{
-        unsigned int tmpreg0, tmpreg1, tmpreg2;
-
-        __asm__ __volatile__ (
-                "seth   %0, #high(%4)   \n\t"
-                "st     %3, @(%5, %0)   \n\t"
-                "ldi    %1, #1          \n\t"
-                "st     %1, @(%6, %0)   \n\t"
-                "add3   %1, %0, %7      \n\t"
-                ".fillinsn              \n"
-                "1:                     \n\t"
-                "ld     %2, @(%6, %0)   \n\t"
-                "bnez   %2, 1b          \n\t"
-                "ld     %0, @%1+        \n\t"
-                "ld     %1, @%1         \n\t"
-                "st     %2, @+%0        \n\t"
-                "st     %2, @+%1        \n\t"
-                : "=&r" (tmpreg0), "=&r" (tmpreg1), "=&r" (tmpreg2)
-                : "r" (page), "i" (MMU_REG_BASE), "i" (MSVA_offset),
-                "i" (MTOP_offset), "i" (MIDXI_offset)
-                : "memory"
-        );
-}
-
-static __inline__ void __flush_tlb_all(void)
-{
-        unsigned int tmpreg0, tmpreg1;
-
-        __asm__ __volatile__ (
-                "seth   %0, #high(%2)           \n\t"
-                "or3    %0, %0, #low(%2)        \n\t"
-                "ldi    %1, #0xc                \n\t"
-                "st     %1, @%0                 \n\t"
-                ".fillinsn                      \n"
-                "1:                             \n\t"
-                "ld     %1, @%0                 \n\t"
-                "bnez   %1, 1b                  \n\t"
-                : "=&r" (tmpreg0), "=&r" (tmpreg1)
-                : "i" (MTOP) : "memory"
-        );
-}
-
-extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t);
-
-#endif  /* _ASM_M32R_TLBFLUSH_H */
diff --git a/include/asm-m32r/topology.h b/include/asm-m32r/topology.h
deleted file mode 100644
index d607eb32bd7e..000000000000
--- a/include/asm-m32r/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_TOPOLOGY_H
-#define _ASM_M32R_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_M32R_TOPOLOGY_H */
diff --git a/include/asm-m32r/types.h b/include/asm-m32r/types.h
deleted file mode 100644
index bc9f7fff0ac3..000000000000
--- a/include/asm-m32r/types.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _ASM_M32R_TYPES_H
-#define _ASM_M32R_TYPES_H
-
-#include <asm-generic/int-ll64.h>
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#define BITS_PER_LONG 32
-
-#ifndef __ASSEMBLY__
-
-/* DMA addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_M32R_TYPES_H */
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h
deleted file mode 100644
index 1c7047bea200..000000000000
--- a/include/asm-m32r/uaccess.h
+++ /dev/null
@@ -1,693 +0,0 @@
-#ifndef _ASM_M32R_UACCESS_H
-#define _ASM_M32R_UACCESS_H
-
-/*
- *  linux/include/asm-m32r/uaccess.h
- *
- *  M32R version.
- *    Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
- */
-
-/*
- * User space memory access functions
- */
-#include <linux/errno.h>
-#include <linux/thread_info.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-
-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons, these macros are grossly misnamed.
- */
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#ifdef CONFIG_MMU
-
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-
-#else /* not CONFIG_MMU */
-
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS         MAKE_MM_SEG(0xFFFFFFFF)
-#define get_ds()        (KERNEL_DS)
-
-static inline mm_segment_t get_fs(void)
-{
-        return USER_DS;
-}
-
-static inline void set_fs(mm_segment_t s)
-{
-}
-
-#endif /* not CONFIG_MMU */
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#define __addr_ok(addr) \
-        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-/*
- * Test whether a block of memory is a valid user space address.
- * Returns 0 if the range is valid, nonzero otherwise.
- *
- * This is equivalent to the following test:
- * (u33)addr + (u33)size >= (u33)current->addr_limit.seg
- *
- * This needs 33-bit arithmetic. We have a carry...
- */
-#define __range_ok(addr,size) ({                                        \
-        unsigned long flag, roksum;                                     \
-        __chk_user_ptr(addr);                                           \
-        asm (                                                           \
-                "       cmpu    %1, %1    ; clear cbit\n"               \
-                "       addx    %1, %3    ; set cbit if overflow\n"     \
-                "       subx    %0, %0\n"                               \
-                "       cmpu    %4, %1\n"                               \
-                "       subx    %0, %5\n"                               \
-                : "=&r" (flag), "=r" (roksum)                           \
-                : "1" (addr), "r" ((int)(size)),                        \
-                  "r" (current_thread_info()->addr_limit.seg), "r" (0)  \
-                : "cbit" );                                             \
-        flag; })
-
-/**
- * access_ok: - Checks if a user space pointer is valid
- * @type: Type of access: %VERIFY_READ or %VERIFY_WRITE.  Note that
- *        %VERIFY_WRITE is a superset of %VERIFY_READ - if it is safe
- *        to write to a block, it is always safe to read from it.
- * @addr: User space pointer to start of block to check
- * @size: Size of block to check
- *
- * Context: User context only.  This function may sleep.
- *
- * Checks if a pointer to a block of memory in user space is valid.
- *
- * Returns true (nonzero) if the memory block may be valid, false (zero)
- * if it is definitely invalid.
- *
- * Note that, depending on architecture, this function probably just
- * checks that the pointer is in the user space range - after calling
- * this function, memory access functions may still return -EFAULT.
- */
-#ifdef CONFIG_MMU
-#define access_ok(type,addr,size) (likely(__range_ok(addr,size) == 0))
-#else
-static inline int access_ok(int type, const void *addr, unsigned long size)
-{
-        unsigned long val = (unsigned long)addr;
-
-        return ((val >= memory_start) && ((val + size) < memory_end));
-}
-#endif /* CONFIG_MMU */
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-extern int fixup_exception(struct pt_regs *regs);
-
-/*
- * These are the main single-value transfer routines.  They automatically
- * use the right size if we just have the right pointer type.
- *
- * This gets kind of ugly. We want to return _two_ values in "get_user()"
- * and yet we don't want to do any pointers, because that is too much
- * of a performance impact. Thus we have a few rather ugly macros here,
- * and hide all the uglyness from the user.
- *
- * The "__xxx" versions of the user access functions are versions that
- * do not verify the address space, that must have been done previously
- * with a separate "access_ok()" call (this is used when we do multiple
- * accesses to the same area of user memory).
- */
-
-/* Careful: we have to cast the result to the type of the pointer for sign
-   reasons */
-/**
- * get_user: - Get a simple variable from user space.
- * @x:   Variable to store result.
- * @ptr: Source address, in user space.
- *
- * Context: User context only.  This function may sleep.
- *
- * This macro copies a single simple variable from user space to kernel
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and the result of
- * dereferencing @ptr must be assignable to @x without a cast.
- *
- * Returns zero on success, or -EFAULT on error.
- * On error, the variable @x is set to zero.
- */
-#define get_user(x,ptr)                                                 \
-        __get_user_check((x),(ptr),sizeof(*(ptr)))
-
-/**
- * put_user: - Write a simple value into user space.
- * @x:   Value to copy to user space.
- * @ptr: Destination address, in user space.
- *
- * Context: User context only.  This function may sleep.
- *
- * This macro copies a single simple value from kernel space to user
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and @x must be assignable
- * to the result of dereferencing @ptr.
- *
- * Returns zero on success, or -EFAULT on error.
- */
-#define put_user(x,ptr)                                                 \
-        __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-
-/**
- * __get_user: - Get a simple variable from user space, with less checking.
- * @x:   Variable to store result.
- * @ptr: Source address, in user space.
- *
- * Context: User context only.  This function may sleep.
- *
- * This macro copies a single simple variable from user space to kernel
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and the result of
- * dereferencing @ptr must be assignable to @x without a cast.
- *
- * Caller must check the pointer with access_ok() before calling this
- * function.
- *
- * Returns zero on success, or -EFAULT on error.
- * On error, the variable @x is set to zero.
- */
-#define __get_user(x,ptr) \
-        __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
-
-#define __get_user_nocheck(x,ptr,size)                                  \
-({                                                                      \
-        long __gu_err = 0;                                              \
-        unsigned long __gu_val;                                         \
-        might_sleep();                                                  \
-        __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-        __gu_err;                                                       \
-})
-
-#define __get_user_check(x,ptr,size)                                    \
-({                                                                      \
-        long __gu_err = -EFAULT;                                        \
-        unsigned long __gu_val = 0;                                     \
-        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);             \
-        might_sleep();                                                  \
-        if (access_ok(VERIFY_READ,__gu_addr,size))                      \
-                __get_user_size(__gu_val,__gu_addr,(size),__gu_err);    \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-        __gu_err;                                                       \
-})
-
-extern long __get_user_bad(void);
-
-#define __get_user_size(x,ptr,size,retval)                              \
-do {                                                                    \
-        retval = 0;                                                     \
-        __chk_user_ptr(ptr);                                            \
-        switch (size) {                                                 \
-          case 1: __get_user_asm(x,ptr,retval,"ub"); break;             \
-          case 2: __get_user_asm(x,ptr,retval,"uh"); break;             \
-          case 4: __get_user_asm(x,ptr,retval,""); break;               \
-          default: (x) = __get_user_bad();                              \
-        }                                                               \
-} while (0)
-
-#define __get_user_asm(x, addr, err, itype)                             \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     ld"itype" %1,@%2\n"                             \
-                "       .fillinsn\n"                                    \
-                "2:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "3:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(2b)\n"                           \
-                "       or3 r14,r14,#low(2b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,3b\n"                                  \
-                ".previous"                                             \
-                : "=&r" (err), "=&r" (x)                                \
-                : "r" (addr), "i" (-EFAULT), "0" (err)                  \
-                : "r14", "memory")
-
-/**
- * __put_user: - Write a simple value into user space, with less checking.
- * @x:   Value to copy to user space.
- * @ptr: Destination address, in user space.
- *
- * Context: User context only.  This function may sleep.
- *
- * This macro copies a single simple value from kernel space to user
- * space.  It supports simple types like char and int, but not larger
- * data types like structures or arrays.
- *
- * @ptr must have pointer-to-simple-variable type, and @x must be assignable
- * to the result of dereferencing @ptr.
- *
- * Caller must check the pointer with access_ok() before calling this
- * function.
- *
- * Returns zero on success, or -EFAULT on error.
- */
-#define __put_user(x,ptr) \
-        __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-
-
-#define __put_user_nocheck(x,ptr,size)                                  \
-({                                                                      \
-        long __pu_err;                                                  \
-        might_sleep();                                                  \
-        __put_user_size((x),(ptr),(size),__pu_err);                     \
-        __pu_err;                                                       \
-})
-
-
-#define __put_user_check(x,ptr,size)                                    \
-({                                                                      \
-        long __pu_err = -EFAULT;                                        \
-        __typeof__(*(ptr)) __user *__pu_addr = (ptr);                   \
-        might_sleep();                                                  \
-        if (access_ok(VERIFY_WRITE,__pu_addr,size))                     \
-                __put_user_size((x),__pu_addr,(size),__pu_err);         \
-        __pu_err;                                                       \
-})
-
-#if defined(__LITTLE_ENDIAN__)
-#define __put_user_u64(x, addr, err)                                    \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     st %L1,@%2\n"                                   \
-                "       .fillinsn\n"                                    \
-                "2:     st %H1,@(4,%2)\n"                               \
-                "       .fillinsn\n"                                    \
-                "3:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "4:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(3b)\n"                           \
-                "       or3 r14,r14,#low(3b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,4b\n"                                  \
-                "       .long 2b,4b\n"                                  \
-                ".previous"                                             \
-                : "=&r" (err)                                           \
-                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
-                : "r14", "memory")
-
-#elif defined(__BIG_ENDIAN__)
-#define __put_user_u64(x, addr, err)                                    \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     st %H1,@%2\n"                                   \
-                "       .fillinsn\n"                                    \
-                "2:     st %L1,@(4,%2)\n"                               \
-                "       .fillinsn\n"                                    \
-                "3:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "4:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(3b)\n"                           \
-                "       or3 r14,r14,#low(3b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,4b\n"                                  \
-                "       .long 2b,4b\n"                                  \
-                ".previous"                                             \
-                : "=&r" (err)                                           \
-                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
-                : "r14", "memory")
-#else
-#error no endian defined
-#endif
-
-extern void __put_user_bad(void);
-
-#define __put_user_size(x,ptr,size,retval)                              \
-do {                                                                    \
-        retval = 0;                                                     \
-        __chk_user_ptr(ptr);                                            \
-        switch (size) {                                                 \
-          case 1: __put_user_asm(x,ptr,retval,"b"); break;              \
-          case 2: __put_user_asm(x,ptr,retval,"h"); break;              \
-          case 4: __put_user_asm(x,ptr,retval,""); break;               \
-          case 8: __put_user_u64((__typeof__(*ptr))(x),ptr,retval); break;\
-          default: __put_user_bad();                                    \
-        }                                                               \
-} while (0)
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
-
-/*
- * Tell gcc we read from memory instead of writing: this is because
- * we do not write to any memory gcc knows about, so there are no
- * aliasing issues.
- */
-#define __put_user_asm(x, addr, err, itype)                             \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     st"itype" %1,@%2\n"                             \
-                "       .fillinsn\n"                                    \
-                "2:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "3:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(2b)\n"                           \
-                "       or3 r14,r14,#low(2b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,3b\n"                                  \
-                ".previous"                                             \
-                : "=&r" (err)                                           \
-                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
-                : "r14", "memory")
-
-/*
- * Here we special-case 1, 2 and 4-byte copy_*_user invocations.  On a fault
- * we return the initial request size (1, 2 or 4), as copy_*_user should do.
- * If a store crosses a page boundary and gets a fault, the m32r will not write
- * anything, so this is accurate.
- */
-
-/*
- * Copy To/From Userspace
- */
-
-/* Generic arbitrary sized copy.  */
-/* Return the number of bytes NOT copied.  */
-#define __copy_user(to,from,size)                                       \
-do {                                                                    \
-        unsigned long __dst, __src, __c;                                \
-        __asm__ __volatile__ (                                          \
-                "       mv      r14, %0\n"                              \
-                "       or      r14, %1\n"                              \
-                "       beq     %0, %1, 9f\n"                           \
-                "       beqz    %2, 9f\n"                               \
-                "       and3    r14, r14, #3\n"                         \
-                "       bnez    r14, 2f\n"                              \
-                "       and3    %2, %2, #3\n"                           \
-                "       beqz    %3, 2f\n"                               \
-                "       addi    %0, #-4         ; word_copy \n"         \
-                "       .fillinsn\n"                                    \
-                "0:     ld      r14, @%1+\n"                            \
-                "       addi    %3, #-1\n"                              \
-                "       .fillinsn\n"                                    \
-                "1:     st      r14, @+%0\n"                            \
-                "       bnez    %3, 0b\n"                               \
-                "       beqz    %2, 9f\n"                               \
-                "       addi    %0, #4\n"                               \
-                "       .fillinsn\n"                                    \
-                "2:     ldb     r14, @%1        ; byte_copy \n"         \
-                "       .fillinsn\n"                                    \
-                "3:     stb     r14, @%0\n"                             \
-                "       addi    %1, #1\n"                               \
-                "       addi    %2, #-1\n"                              \
-                "       addi    %0, #1\n"                               \
-                "       bnez    %2, 2b\n"                               \
-                "       .fillinsn\n"                                    \
-                "9:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "5:     addi    %3, #1\n"                               \
-                "       addi    %1, #-4\n"                              \
-                "       .fillinsn\n"                                    \
-                "6:     slli    %3, #2\n"                               \
-                "       add     %2, %3\n"                               \
-                "       addi    %0, #4\n"                               \
-                "       .fillinsn\n"                                    \
-                "7:     seth    r14, #high(9b)\n"                       \
-                "       or3     r14, r14, #low(9b)\n"                   \
-                "       jmp     r14\n"                                  \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 0b,6b\n"                                  \
-                "       .long 1b,5b\n"                                  \
-                "       .long 2b,9b\n"                                  \
-                "       .long 3b,9b\n"                                  \
-                ".previous\n"                                           \
-                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
-                  "=&r" (__c)                                           \
-                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
-                : "r14", "memory");                                     \
-} while (0)
-
-#define __copy_user_zeroing(to,from,size)                               \
-do {                                                                    \
-        unsigned long __dst, __src, __c;                                \
-        __asm__ __volatile__ (                                          \
-                "       mv      r14, %0\n"                              \
-                "       or      r14, %1\n"                              \
-                "       beq     %0, %1, 9f\n"                           \
-                "       beqz    %2, 9f\n"                               \
-                "       and3    r14, r14, #3\n"                         \
-                "       bnez    r14, 2f\n"                              \
-                "       and3    %2, %2, #3\n"                           \
-                "       beqz    %3, 2f\n"                               \
-                "       addi    %0, #-4         ; word_copy \n"         \
-                "       .fillinsn\n"                                    \
-                "0:     ld      r14, @%1+\n"                            \
-                "       addi    %3, #-1\n"                              \
-                "       .fillinsn\n"                                    \
-                "1:     st      r14, @+%0\n"                            \
-                "       bnez    %3, 0b\n"                               \
-                "       beqz    %2, 9f\n"                               \
-                "       addi    %0, #4\n"                               \
-                "       .fillinsn\n"                                    \
-                "2:     ldb     r14, @%1        ; byte_copy \n"         \
-                "       .fillinsn\n"                                    \
-                "3:     stb     r14, @%0\n"                             \
-                "       addi    %1, #1\n"                               \
-                "       addi    %2, #-1\n"                              \
-                "       addi    %0, #1\n"                               \
-                "       bnez    %2, 2b\n"                               \
-                "       .fillinsn\n"                                    \
-                "9:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "5:     addi    %3, #1\n"                               \
-                "       addi    %1, #-4\n"                              \
-                "       .fillinsn\n"                                    \
-                "6:     slli    %3, #2\n"                               \
-                "       add     %2, %3\n"                               \
-                "       addi    %0, #4\n"                               \
-                "       .fillinsn\n"                                    \
-                "7:     ldi     r14, #0         ; store zero \n"        \
-                "       .fillinsn\n"                                    \
-                "8:     addi    %2, #-1\n"                              \
-                "       stb     r14, @%0        ; ACE? \n"              \
-                "       addi    %0, #1\n"                               \
-                "       bnez    %2, 8b\n"                               \
-                "       seth    r14, #high(9b)\n"                       \
-                "       or3     r14, r14, #low(9b)\n"                   \
-                "       jmp     r14\n"                                  \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 0b,6b\n"                                  \
-                "       .long 1b,5b\n"                                  \
-                "       .long 2b,7b\n"                                  \
-                "       .long 3b,7b\n"                                  \
-                ".previous\n"                                           \
-                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
-                  "=&r" (__c)                                           \
-                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
-                : "r14", "memory");                                     \
-} while (0)
-
-
-/* We let the __ versions of copy_from/to_user inline, because they're often
- * used in fast paths and have only a small space overhead.
- */
-static inline unsigned long __generic_copy_from_user_nocheck(void *to,
-        const void __user *from, unsigned long n)
-{
-        __copy_user_zeroing(to,from,n);
-        return n;
-}
-
-static inline unsigned long __generic_copy_to_user_nocheck(void __user *to,
-        const void *from, unsigned long n)
-{
-        __copy_user(to,from,n);
-        return n;
-}
-
-unsigned long __generic_copy_to_user(void __user *, const void *, unsigned long);
-unsigned long __generic_copy_from_user(void *, const void __user *, unsigned long);
-
-/**
- * __copy_to_user: - Copy a block of data into user space, with less checking.
- * @to:   Destination address, in user space.
- * @from: Source address, in kernel space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from kernel space to user space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- */
-#define __copy_to_user(to,from,n)                       \
-        __generic_copy_to_user_nocheck((to),(from),(n))
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/**
- * copy_to_user: - Copy a block of data into user space.
- * @to:   Destination address, in user space.
- * @from: Source address, in kernel space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from kernel space to user space.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- */
-#define copy_to_user(to,from,n)                         \
-({                                                      \
-        might_sleep();                                  \
-        __generic_copy_to_user((to),(from),(n));        \
-})
-
-/**
- * __copy_from_user: - Copy a block of data from user space, with less checking. * @to:   Destination address, in kernel space.
- * @from: Source address, in user space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from user space to kernel space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- *
- * If some data could not be copied, this function will pad the copied
- * data to the requested size using zero bytes.
- */
-#define __copy_from_user(to,from,n)                     \
-        __generic_copy_from_user_nocheck((to),(from),(n))
-
-/**
- * copy_from_user: - Copy a block of data from user space.
- * @to:   Destination address, in kernel space.
- * @from: Source address, in user space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from user space to kernel space.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- *
- * If some data could not be copied, this function will pad the copied
- * data to the requested size using zero bytes.
- */
-#define copy_from_user(to,from,n)                       \
-({                                                      \
-        might_sleep();                                  \
-        __generic_copy_from_user((to),(from),(n));      \
-})
-
-long __must_check strncpy_from_user(char *dst, const char __user *src,
-                                long count);
-long __must_check __strncpy_from_user(char *dst,
-                                const char __user *src, long count);
-
-/**
- * __clear_user: - Zero a block of memory in user space, with less checking.
- * @to:   Destination address, in user space.
- * @n:    Number of bytes to zero.
- *
- * Zero a block of memory in user space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be cleared.
- * On success, this will be zero.
- */
-unsigned long __clear_user(void __user *mem, unsigned long len);
-
-/**
- * clear_user: - Zero a block of memory in user space.
- * @to:   Destination address, in user space.
- * @n:    Number of bytes to zero.
- *
- * Zero a block of memory in user space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be cleared.
- * On success, this will be zero.
- */
-unsigned long clear_user(void __user *mem, unsigned long len);
-
-/**
- * strlen_user: - Get the size of a string in user space.
- * @str: The string to measure.
- *
- * Context: User context only.  This function may sleep.
- *
- * Get the size of a NUL-terminated string in user space.
- *
- * Returns the size of the string INCLUDING the terminating NUL.
- * On exception, returns 0.
- *
- * If there is a limit on the length of a valid string, you may wish to
- * consider using strnlen_user() instead.
- */
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
-long strnlen_user(const char __user *str, long n);
-
-#endif /* _ASM_M32R_UACCESS_H */
diff --git a/include/asm-m32r/ucontext.h b/include/asm-m32r/ucontext.h
deleted file mode 100644
index 09324741eec3..000000000000
--- a/include/asm-m32r/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_M32R_UCONTEXT_H
-#define _ASM_M32R_UCONTEXT_H
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct sigcontext uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* _ASM_M32R_UCONTEXT_H */
diff --git a/include/asm-m32r/unaligned.h b/include/asm-m32r/unaligned.h
deleted file mode 100644
index 377eb20d1ec6..000000000000
--- a/include/asm-m32r/unaligned.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _ASM_M32R_UNALIGNED_H
-#define _ASM_M32R_UNALIGNED_H
-
-#if defined(__LITTLE_ENDIAN__)
-# include <linux/unaligned/le_memmove.h>
-# include <linux/unaligned/be_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned  __get_unaligned_le
-# define put_unaligned  __put_unaligned_le
-#else
-# include <linux/unaligned/be_memmove.h>
-# include <linux/unaligned/le_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned  __get_unaligned_be
-# define put_unaligned  __put_unaligned_be
-#endif
-
-#endif /* _ASM_M32R_UNALIGNED_H */
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
deleted file mode 100644
index cf701c933249..000000000000
--- a/include/asm-m32r/unistd.h
+++ /dev/null
@@ -1,389 +0,0 @@
-#ifndef _ASM_M32R_UNISTD_H
-#define _ASM_M32R_UNISTD_H
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-/* 16 is unused */
-/* 17 is unused */
-/* 18 is unused */
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-/* 23 is unused */
-/* 24 is unused */
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-/* 28 is unused */
-#define __NR_pause               29
-#define __NR_utime               30
-/* 31 is unused */
-#define __NR_cachectl            32 /* old #define __NR_gtty             32*/
-#define __NR_access              33
-/* 34 is unused */
-/* 35 is unused */
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-/* 44 is unused */
-#define __NR_brk                 45
-/* 46 is unused */
-/* 47 is unused (getgid16) */
-/* 48 is unused */
-/* 49 is unused */
-/* 50 is unused */
-#define __NR_acct                51
-#define __NR_umount2             52
-/* 53 is unused */
-#define __NR_ioctl               54
-/* 55 is unused (fcntl) */
-/* 56 is unused */
-#define __NR_setpgid             57
-/* 58 is unused */
-/* 59 is unused */
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-/* 67 is unused */
-/* 68 is unused*/
-/* 69 is unused*/
-/* 70 is unused */
-/* 71 is unused */
-/* 72 is unused */
-/* 73 is unused */
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-/* 76 is unused (old getrlimit) */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-/* 80 is unused */
-/* 81 is unused */
-/* 82 is unused */
-#define __NR_symlink             83
-/* 84 is unused */
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-/* 89 is unused */
-/* 90 is unused */
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-/* 95 is unused */
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-/* 98 is unused */
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-/* 101 is unused */
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-/* 109 is unused */
-/* 110 is unused */
-#define __NR_vhangup            111
-/* 112 is unused */
-/* 113 is unused */
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-/* 119 is unused */
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-/* 123 is unused */
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-/* 126 is unused */
-/* 127 is unused */
-#define __NR_init_module        128
-#define __NR_delete_module      129
-/* 130 is unused */
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-/* 137 is unused */
-/* 138 is unused */
-/* 139 is unused */
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-/* 164 is unused */
-/* 165 is unused */
-#define __NR_tas                166
-/* 167 is unused */
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-/* 170 is unused */
-/* 171 is unused */
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-/* 182 is unused */
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-/* 188 is unused */
-/* 189 is unused */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-/* 222 is unused */
-/* 223 is unused */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-/* 251 is unused */
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-/* 285 is unused */
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_ioprio_set         289
-#define __NR_ioprio_get         290
-#define __NR_inotify_init       291
-#define __NR_inotify_add_watch  292
-#define __NR_inotify_rm_watch   293
-#define __NR_migrate_pages      294
-#define __NR_openat             295
-#define __NR_mkdirat            296
-#define __NR_mknodat            297
-#define __NR_fchownat           298
-#define __NR_futimesat          299
-#define __NR_fstatat64          300
-#define __NR_unlinkat           301
-#define __NR_renameat           302
-#define __NR_linkat             303
-#define __NR_symlinkat          304
-#define __NR_readlinkat         305
-#define __NR_fchmodat           306
-#define __NR_faccessat          307
-#define __NR_pselect6           308
-#define __NR_ppoll              309
-#define __NR_unshare            310
-#define __NR_set_robust_list    311
-#define __NR_get_robust_list    312
-#define __NR_splice             313
-#define __NR_sync_file_range    314
-#define __NR_tee                315
-#define __NR_vmsplice           316
-#define __NR_move_pages         317
-#define __NR_getcpu             318
-#define __NR_epoll_pwait        319
-#define __NR_utimensat          320
-#define __NR_signalfd           321
-/* #define __NR_timerfd         322 removed */
-#define __NR_eventfd            323
-#define __NR_fallocate          324
-
-#ifdef __KERNEL__
-
-#define NR_syscalls 325
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_RT_SIGACTION
-
-#define __IGNORE_lchown
-#define __IGNORE_setuid
-#define __IGNORE_getuid
-#define __IGNORE_setgid
-#define __IGNORE_getgid
-#define __IGNORE_geteuid
-#define __IGNORE_getegid
-#define __IGNORE_fcntl
-#define __IGNORE_setreuid
-#define __IGNORE_setregid
-#define __IGNORE_getrlimit
-#define __IGNORE_getgroups
-#define __IGNORE_setgroups
-#define __IGNORE_select
-#define __IGNORE_mmap
-#define __IGNORE_fchown
-#define __IGNORE_setfsuid
-#define __IGNORE_setfsgid
-#define __IGNORE_setresuid
-#define __IGNORE_getresuid
-#define __IGNORE_setresgid
-#define __IGNORE_getresgid
-#define __IGNORE_chown
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_M32R_UNISTD_H */
diff --git a/include/asm-m32r/user.h b/include/asm-m32r/user.h
deleted file mode 100644
index 03b3c11c2aff..000000000000
--- a/include/asm-m32r/user.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _ASM_M32R_USER_H
-#define _ASM_M32R_USER_H
-
-#include <linux/types.h>
-#include <asm/ptrace.h>
-#include <asm/page.h>
-
-/*
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd).
- *
- * The actual file contents are as follows:
- * UPAGE: 1 page consisting of a user struct that tells gdb
- *      what is present in the file.  Directly after this is a
- *      copy of the task_struct, which is currently not used by gdb,
- *      but it may come in handy at some point.  All of the registers
- *      are stored as part of the upage.  The upage should always be
- *      only one page.
- * DATA: The data area is stored.  We use current->end_text to
- *      current->brk to pick up all of the user variables, plus any memory
- *      that may have been sbrk'ed.  No attempt is made to determine if a
- *      page is demand-zero or if a page is totally unused, we just cover
- *      the entire range.  All of the addresses are rounded in such a way
- *      that an integral number of pages is written.
- * STACK: We need the stack information in order to get a meaningful
- *      backtrace.  We need to write the data from usp to
- *      current->start_stack, so we round each of these off in order to be
- *      able to write an integer number of pages.
- */
-
-struct user {
-        struct pt_regs  regs;                   /* entire machine state */
-        size_t          u_tsize;                /* text size (pages) */
-        size_t          u_dsize;                /* data size (pages) */
-        size_t          u_ssize;                /* stack size (pages) */
-        unsigned long   start_code;             /* text starting address */
-        unsigned long   start_data;             /* data starting address */
-        unsigned long   start_stack;            /* stack starting address */
-        long int        signal;                 /* signal causing core dump */
-        unsigned long   u_ar0;                  /* help gdb find registers */
-        unsigned long   magic;                  /* identifies a core file */
-        char            u_comm[32];             /* user command name */
-};
-
-#define NBPG                    PAGE_SIZE
-#define UPAGES                  1
-#define HOST_TEXT_START_ADDR    (u.start_code)
-#define HOST_DATA_START_ADDR    (u.start_data)
-#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* _ASM_M32R_USER_H */
diff --git a/include/asm-m32r/vga.h b/include/asm-m32r/vga.h
deleted file mode 100644
index a1b63061c06f..000000000000
--- a/include/asm-m32r/vga.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_M32R_VGA_H
-#define _ASM_M32R_VGA_H
-
-/*
- *      Access to VGA videoram
- *
- *      (c) 1998 Martin Mares <mj@ucw.cz>
- */
-
-/*
- *      On the PC, we can just recalculate addresses and then
- *      access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x,s) (unsigned long)phys_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x,y) (*(y) = (x))
-
-#endif /* _ASM_M32R_VGA_H */
diff --git a/include/asm-m32r/xor.h b/include/asm-m32r/xor.h
deleted file mode 100644
index 6d525259df3e..000000000000
--- a/include/asm-m32r/xor.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_XOR_H
-#define _ASM_M32R_XOR_H
-
-#include <asm-generic/xor.h>
-
-#endif  /* _ASM_M32R_XOR_H */
diff --git a/include/asm-mn10300/.gitignore b/include/asm-mn10300/.gitignore
deleted file mode 100644
index 0f87ba790e26..000000000000
--- a/include/asm-mn10300/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-proc
-unit
diff --git a/include/asm-mn10300/Kbuild b/include/asm-mn10300/Kbuild
deleted file mode 100644
index c68e1680da01..000000000000
--- a/include/asm-mn10300/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/include/asm-mn10300/atomic.h b/include/asm-mn10300/atomic.h
deleted file mode 100644
index bc064825f9b1..000000000000
--- a/include/asm-mn10300/atomic.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* MN10300 Atomic counter operations
- *
- * Copyright (C) 2007 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_ATOMIC_H
-#define _ASM_ATOMIC_H
-
-#ifdef CONFIG_SMP
-#error not SMP safe
-#endif
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- */
-
-#define ATOMIC_INIT(i)  { (i) }
-
-#ifdef __KERNEL__
-
-/**
- * atomic_read - read atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically reads the value of @v.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-#define atomic_read(v)  ((v)->counter)
-
-/**
- * atomic_set - set atomic variable
- * @v: pointer of type atomic_t
- * @i: required value
- *
- * Atomically sets the value of @v to @i.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-#define atomic_set(v, i) (((v)->counter) = (i))
-
-#include <asm/system.h>
-
-/**
- * atomic_add_return - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
- *
- * Atomically adds @i to @v and returns the result
- * Note that the guaranteed useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int temp;
-
-        local_irq_save(flags);
-        temp = v->counter;
-        temp += i;
-        v->counter = temp;
-        local_irq_restore(flags);
-
-        return temp;
-}
-
-/**
- * atomic_sub_return - subtract integer from atomic variable
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v and returns the result
- * Note that the guaranteed useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int temp;
-
-        local_irq_save(flags);
-        temp = v->counter;
-        temp -= i;
-        v->counter = temp;
-        local_irq_restore(flags);
-
-        return temp;
-}
-
-static inline int atomic_add_negative(int i, atomic_t *v)
-{
-        return atomic_add_return(i, v) < 0;
-}
-
-static inline void atomic_add(int i, atomic_t *v)
-{
-        atomic_add_return(i, v);
-}
-
-static inline void atomic_sub(int i, atomic_t *v)
-{
-        atomic_sub_return(i, v);
-}
-
-static inline void atomic_inc(atomic_t *v)
-{
-        atomic_add_return(1, v);
-}
-
-static inline void atomic_dec(atomic_t *v)
-{
-        atomic_sub_return(1, v);
-}
-
-#define atomic_dec_return(v)            atomic_sub_return(1, (v))
-#define atomic_inc_return(v)            atomic_add_return(1, (v))
-
-#define atomic_sub_and_test(i, v)       (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v)          (atomic_sub_return(1, (v)) == 0)
-#define atomic_inc_and_test(v)          (atomic_add_return(1, (v)) == 0)
-
-#define atomic_add_unless(v, a, u)                              \
-({                                                              \
-        int c, old;                                             \
-        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
-                c = old;                                        \
-        c != (u);                                               \
-})
-
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
-{
-        unsigned long flags;
-
-        mask = ~mask;
-        local_irq_save(flags);
-        *addr &= mask;
-        local_irq_restore(flags);
-}
-
-#define atomic_xchg(ptr, v)             (xchg(&(ptr)->counter, (v)))
-#define atomic_cmpxchg(v, old, new)     (cmpxchg(&((v)->counter), (old), (new)))
-
-/* Atomic operations are already serializing on MN10300??? */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-
-#include <asm-generic/atomic.h>
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-mn10300/auxvec.h b/include/asm-mn10300/auxvec.h
deleted file mode 100644
index 4fdb60b2ae39..000000000000
--- a/include/asm-mn10300/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_AUXVEC_H
-#define _ASM_AUXVEC_H
-
-#endif
diff --git a/include/asm-mn10300/bitops.h b/include/asm-mn10300/bitops.h
deleted file mode 100644
index 0b610f482abb..000000000000
--- a/include/asm-mn10300/bitops.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* MN10300 bit operations
- *
- * Copyright (C) 2007 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.
- *
- * These have to be done with inline assembly: that way the bit-setting
- * is guaranteed to be atomic. All bit operations return 0 if the bit
- * was cleared before the operation and != 0 if it was not.
- *
- * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
- */
-#ifndef __ASM_BITOPS_H
-#define __ASM_BITOPS_H
-
-#include <asm/cpu-regs.h>
-
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-
-/*
- * set bit
- */
-#define __set_bit(nr, addr)                                     \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bset %2,(%1) # set_bit reg"               \
-                     : "=m"(*_a)                                \
-                     : "a"(_a), "d"(1 << shift),  "m"(*_a)      \
-                     : "memory", "cc");                         \
-})
-
-#define set_bit(nr, addr) __set_bit((nr), (addr))
-
-/*
- * clear bit
- */
-#define ___clear_bit(nr, addr)                                  \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bclr %2,(%1) # clear_bit reg"             \
-                     : "=m"(*_a)                                \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-})
-
-#define clear_bit(nr, addr) ___clear_bit((nr), (addr))
-
-
-static inline void __clear_bit(int nr, volatile void *addr)
-{
-        unsigned int *a = (unsigned int *) addr;
-        int mask;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        *a &= ~mask;
-}
-
-/*
- * test bit
- */
-static inline int test_bit(int nr, const volatile void *addr)
-{
-        return 1UL & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31));
-}
-
-/*
- * change bit
- */
-static inline void __change_bit(int nr, volatile void *addr)
-{
-        int     mask;
-        unsigned int *a = (unsigned int *) addr;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        *a ^= mask;
-}
-
-extern void change_bit(int nr, volatile void *addr);
-
-/*
- * test and set bit
- */
-#define __test_and_set_bit(nr,addr)                             \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        unsigned epsw;                                          \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bset %3,(%2) # test_set_bit reg\n"        \
-                     "mov epsw,%1"                              \
-                     : "=m"(*_a), "=d"(epsw)                    \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-                                                                \
-        !(epsw & EPSW_FLAG_Z);                                  \
-})
-
-#define test_and_set_bit(nr, addr) __test_and_set_bit((nr), (addr))
-
-/*
- * test and clear bit
- */
-#define __test_and_clear_bit(nr, addr)                          \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        unsigned epsw;                                          \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bclr %3,(%2) # test_clear_bit reg\n"      \
-                     "mov epsw,%1"                              \
-                     : "=m"(*_a), "=d"(epsw)                    \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-                                                                \
-        !(epsw & EPSW_FLAG_Z);                                  \
-})
-
-#define test_and_clear_bit(nr, addr) __test_and_clear_bit((nr), (addr))
-
-/*
- * test and change bit
- */
-static inline int __test_and_change_bit(int nr, volatile void *addr)
-{
-        int     mask, retval;
-        unsigned int *a = (unsigned int *)addr;
-
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-
-        return retval;
-}
-
-extern int test_and_change_bit(int nr, volatile void *addr);
-
-#include <asm-generic/bitops/lock.h>
-
-#ifdef __KERNEL__
-
-/**
- * __ffs - find first bit set
- * @x: the word to search
- *
- * - return 31..0 to indicate bit 31..0 most least significant bit set
- * - if no bits are set in x, the result is undefined
- */
-static inline __attribute__((const))
-unsigned long __ffs(unsigned long x)
-{
-        int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(x & -x));
-        return bit;
-}
-
-/*
- * special slimline version of fls() for calculating ilog2_u32()
- * - note: no protection against n == 0
- */
-static inline __attribute__((const))
-int __ilog2_u32(u32 n)
-{
-        int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(n));
-        return bit;
-}
-
-/**
- * fls - find last bit set
- * @x: the word to search
- *
- * This is defined the same way as ffs:
- * - return 32..1 to indicate bit 31..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int fls(int x)
-{
-        return (x != 0) ? __ilog2_u32(x) + 1 : 0;
-}
-
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __fls(unsigned long word)
-{
-        return __ilog2_u32(word);
-}
-
-/**
- * ffs - find first bit set
- * @x: the word to search
- *
- * - return 32..1 to indicate bit 31..0 most least significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int ffs(int x)
-{
-        /* Note: (x & -x) gives us a mask that is the least significant
-         * (rightmost) 1-bit of the value in x.
-         */
-        return fls(x & -x);
-}
-
-#include <asm-generic/bitops/ffz.h>
-#include <asm-generic/bitops/fls64.h>
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-
-#define ext2_set_bit_atomic(lock, nr, addr) \
-        test_and_set_bit((nr) ^ 0x18, (addr))
-#define ext2_clear_bit_atomic(lock, nr, addr) \
-        test_and_clear_bit((nr) ^ 0x18, (addr))
-
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#include <asm-generic/bitops/minix-le.h>
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_BITOPS_H */
diff --git a/include/asm-mn10300/bug.h b/include/asm-mn10300/bug.h
deleted file mode 100644
index 4fcf3384e259..000000000000
--- a/include/asm-mn10300/bug.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* MN10300 Kernel bug reporting
- *
- * Copyright (C) 2007 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_BUG_H
-#define _ASM_BUG_H
-
-/*
- * Tell the user there is some problem.
- */
-#define _debug_bug_trap()                                       \
-do {                                                            \
-        asm volatile(                                           \
-                "       syscall 15                      \n"     \
-                "0:                                     \n"     \
-                "       .section __bug_table,\"a\"      \n"     \
-                "       .long 0b,%0,%1                  \n"     \
-                "       .previous                       \n"     \
-                :                                               \
-                : "i"(__FILE__), "i"(__LINE__)                  \
-                );                                              \
-} while (0)
-
-#define BUG() _debug_bug_trap()
-
-#define HAVE_ARCH_BUG
-#include <asm-generic/bug.h>
-
-#endif /* _ASM_BUG_H */
diff --git a/include/asm-mn10300/bugs.h b/include/asm-mn10300/bugs.h
deleted file mode 100644
index 31c8bc592b47..000000000000
--- a/include/asm-mn10300/bugs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Checks for architecture-dependent bugs
- *
- * Copyright (C) 2007 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_BUGS_H
-#define _ASM_BUGS_H
-
-#include <asm/processor.h>
-
-static inline void __init check_bugs(void)
-{
-}
-
-#endif /* _ASM_BUGS_H */
diff --git a/include/asm-mn10300/busctl-regs.h b/include/asm-mn10300/busctl-regs.h
deleted file mode 100644
index 1632aef73401..000000000000
--- a/include/asm-mn10300/busctl-regs.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* AM33v2 on-board bus controller registers
- *
- * Copyright (C) 2002 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_BUSCTL_REGS_H
-#define _ASM_BUSCTL_REGS_H
-
-#include <asm/cpu-regs.h>
-
-#ifdef __KERNEL__
-
-/* bus controller registers */
-#define BCCR                    __SYSREG(0xc0002000, u32)       /* bus controller control reg */
-#define BCCR_B0AD               0x00000003      /* block 0 (80000000-83ffffff) bus allocation */
-#define BCCR_B1AD               0x0000000c      /* block 1 (84000000-87ffffff) bus allocation */
-#define BCCR_B2AD               0x00000030      /* block 2 (88000000-8bffffff) bus allocation */
-#define BCCR_B3AD               0x000000c0      /* block 3 (8c000000-8fffffff) bus allocation */
-#define BCCR_B4AD               0x00000300      /* block 4 (90000000-93ffffff) bus allocation */
-#define BCCR_B5AD               0x00000c00      /* block 5 (94000000-97ffffff) bus allocation */
-#define BCCR_B6AD               0x00003000      /* block 6 (98000000-9bffffff) bus allocation */
-#define BCCR_B7AD               0x0000c000      /* block 7 (9c000000-9fffffff) bus allocation */
-#define BCCR_BxAD_EXBUS         0x0             /* - direct to system bus controller */
-#define BCCR_BxAD_OPEXBUS       0x1             /* - direct to memory bus controller */
-#define BCCR_BxAD_OCMBUS        0x2             /* - direct to on chip memory */
-#define BCCR_API                0x00070000      /* bus arbitration priority */
-#define BCCR_API_DMACICD        0x00000000      /* - DMA > CI > CD */
-#define BCCR_API_DMACDCI        0x00010000      /* - DMA > CD > CI */
-#define BCCR_API_CICDDMA        0x00020000      /* - CI > CD > DMA */
-#define BCCR_API_CDCIDMA        0x00030000      /* - CD > CI > DMA */
-#define BCCR_API_ROUNDROBIN     0x00040000      /* - round robin */
-#define BCCR_BEPRI_DMACICD      0x00c00000      /* bus error address priority */
-#define BCCR_BEPRI_DMACDCI      0x00000000      /* - DMA > CI > CD */
-#define BCCR_BEPRI_CICDDMA      0x00400000      /* - DMA > CD > CI */
-#define BCCR_BEPRI_CDCIDMA      0x00800000      /* - CI > CD > DMA */
-#define BCCR_BEPRI              0x00c00000      /* - CD > CI > DMA */
-#define BCCR_TMON               0x03000000      /* timeout value settings */
-#define BCCR_TMON_16IOCLK       0x00000000      /* - 16 IOCLK cycles */
-#define BCCR_TMON_256IOCLK      0x01000000      /* - 256 IOCLK cycles */
-#define BCCR_TMON_4096IOCLK     0x02000000      /* - 4096 IOCLK cycles */
-#define BCCR_TMON_65536IOCLK    0x03000000      /* - 65536 IOCLK cycles */
-#define BCCR_TMOE               0x10000000      /* timeout detection enable */
-
-#define BCBERR                  __SYSREG(0xc0002010, u32)       /* bus error source reg */
-#define BCBERR_BESB             0x0000001f      /* erroneous access destination space */
-#define BCBERR_BESB_MON         0x00000001      /* - monitor space */
-#define BCBERR_BESB_IO          0x00000002      /* - IO bus */
-#define BCBERR_BESB_EX          0x00000004      /* - EX bus */
-#define BCBERR_BESB_OPEX        0x00000008      /* - OpEX bus */
-#define BCBERR_BESB_OCM         0x00000010      /* - on chip memory */
-#define BCBERR_BERW             0x00000100      /* type of access */
-#define BCBERR_BERW_WRITE       0x00000000      /* - write */
-#define BCBERR_BERW_READ        0x00000100      /* - read */
-#define BCBERR_BESD             0x00000200      /* error detector */
-#define BCBERR_BESD_BCU         0x00000000      /* - BCU detected error */
-#define BCBERR_BESD_SLAVE_BUS   0x00000200      /* - slave bus detected error */
-#define BCBERR_BEBST            0x00000400      /* type of access */
-#define BCBERR_BEBST_SINGLE     0x00000000      /* - single */
-#define BCBERR_BEBST_BURST      0x00000400      /* - burst */
-#define BCBERR_BEME             0x00000800      /* multiple bus error flag */
-#define BCBERR_BEMR             0x00007000      /* master bus that caused the error */
-#define BCBERR_BEMR_NOERROR     0x00000000      /* - no error */
-#define BCBERR_BEMR_CI          0x00001000      /* - CPU instruction fetch bus caused error */
-#define BCBERR_BEMR_CD          0x00002000      /* - CPU data bus caused error */
-#define BCBERR_BEMR_DMA         0x00004000      /* - DMA bus caused error */
-
-#define BCBEAR                  __SYSREGC(0xc0002020, u32)      /* bus error address reg */
-
-/* system bus controller registers */
-#define SBBASE(X)               __SYSREG(0xd8c00100 + (X) * 0x10, u32)  /* SBC base addr regs */
-#define SBBASE_BE               0x00000001      /* bank enable */
-#define SBBASE_BAM              0x0000fffe      /* bank address mask [31:17] */
-#define SBBASE_BBA              0xfffe0000      /* bank base address [31:17] */
-
-#define SBCNTRL0(X)             __SYSREG(0xd8c00200 + (X) * 0x10, u32)  /* SBC bank ctrl0 regs */
-#define SBCNTRL0_WEH            0x00000f00      /* write enable hold */
-#define SBCNTRL0_REH            0x0000f000      /* read enable hold */
-#define SBCNTRL0_RWH            0x000f0000      /* SRW signal hold */
-#define SBCNTRL0_CSH            0x00f00000      /* chip select hold */
-#define SBCNTRL0_DAH            0x0f000000      /* data hold */
-#define SBCNTRL0_ADH            0xf0000000      /* address hold */
-
-#define SBCNTRL1(X)             __SYSREG(0xd8c00204 + (X) * 0x10, u32)  /* SBC bank ctrl1 regs */
-#define SBCNTRL1_WED            0x00000f00      /* write enable delay */
-#define SBCNTRL1_RED            0x0000f000      /* read enable delay */
-#define SBCNTRL1_RWD            0x000f0000      /* SRW signal delay */
-#define SBCNTRL1_ASW            0x00f00000      /* address strobe width */
-#define SBCNTRL1_CSD            0x0f000000      /* chip select delay */
-#define SBCNTRL1_ASD            0xf0000000      /* address strobe delay */
-
-#define SBCNTRL2(X)             __SYSREG(0xd8c00208 + (X) * 0x10, u32)  /* SBC bank ctrl2 regs */
-#define SBCNTRL2_WC             0x000000ff      /* wait count */
-#define SBCNTRL2_BWC            0x00000f00      /* burst wait count */
-#define SBCNTRL2_WM             0x01000000      /* wait mode setting */
-#define SBCNTRL2_WM_FIXEDWAIT   0x00000000      /* - fixed wait access */
-#define SBCNTRL2_WM_HANDSHAKE   0x01000000      /* - handshake access */
-#define SBCNTRL2_BM             0x02000000      /* bus synchronisation mode */
-#define SBCNTRL2_BM_SYNC        0x00000000      /* - synchronous mode */
-#define SBCNTRL2_BM_ASYNC       0x02000000      /* - asynchronous mode */
-#define SBCNTRL2_BW             0x04000000      /* bus width */
-#define SBCNTRL2_BW_32          0x00000000      /* - 32 bits */
-#define SBCNTRL2_BW_16          0x04000000      /* - 16 bits */
-#define SBCNTRL2_RWINV          0x08000000      /* R/W signal invert polarity */
-#define SBCNTRL2_RWINV_NORM     0x00000000      /* - normal (read high) */
-#define SBCNTRL2_RWINV_INV      0x08000000      /* - inverted (read low) */
-#define SBCNTRL2_BT             0x70000000      /* bus type setting */
-#define SBCNTRL2_BT_SRAM        0x00000000      /* - SRAM interface */
-#define SBCNTRL2_BT_ADMUX       0x00000000      /* - addr/data multiplexed interface */
-#define SBCNTRL2_BT_BROM        0x00000000      /* - burst ROM interface */
-#define SBCNTRL2_BTSE           0x80000000      /* burst enable */
-
-/* memory bus controller */
-#define SDBASE(X)               __SYSREG(0xda000008 + (X) * 0x4, u32)   /* MBC base addr regs */
-#define SDBASE_CE               0x00000001      /* chip enable */
-#define SDBASE_CBAM             0x0000fff0      /* chip base address mask [31:20] */
-#define SDBASE_CBAM_SHIFT       16
-#define SDBASE_CBA              0xfff00000      /* chip base address [31:20] */
-
-#define SDRAMBUS                __SYSREG(0xda000000, u32)       /* bus mode control reg */
-#define SDRAMBUS_REFEN          0x00000004      /* refresh enable */
-#define SDRAMBUS_TRC            0x00000018      /* refresh command delay time */
-#define SDRAMBUS_BSTPT          0x00000020      /* burst stop command enable */
-#define SDRAMBUS_PONSEQ         0x00000040      /* power on sequence */
-#define SDRAMBUS_SELFREQ        0x00000080      /* self-refresh mode request */
-#define SDRAMBUS_SELFON         0x00000100      /* self-refresh mode on */
-#define SDRAMBUS_SIZE           0x00030000      /* SDRAM size */
-#define SDRAMBUS_SIZE_64Mbit    0x00010000      /* 64Mbit SDRAM (x16) */
-#define SDRAMBUS_SIZE_128Mbit   0x00020000      /* 128Mbit SDRAM (x16) */
-#define SDRAMBUS_SIZE_256Mbit   0x00030000      /* 256Mbit SDRAM (x16) */
-#define SDRAMBUS_TRASWAIT       0x000c0000      /* row address precharge command cycle number */
-#define SDRAMBUS_REFNUM         0x00300000      /* refresh command number */
-#define SDRAMBUS_BSTWAIT        0x00c00000      /* burst stop command cycle */
-#define SDRAMBUS_SETWAIT        0x03000000      /* mode register setting command cycle */
-#define SDRAMBUS_PREWAIT        0x0c000000      /* precharge command cycle */
-#define SDRAMBUS_RASLATE        0x30000000      /* RAS latency */
-#define SDRAMBUS_CASLATE        0xc0000000      /* CAS latency */
-
-#define SDREFCNT                __SYSREG(0xda000004, u32)       /* refresh period reg */
-#define SDREFCNT_PERI           0x00000fff      /* refresh period */
-
-#define SDSHDW                  __SYSREG(0xda000010, u32)       /* test reg */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_BUSCTL_REGS_H */
diff --git a/include/asm-mn10300/byteorder.h b/include/asm-mn10300/byteorder.h
deleted file mode 100644
index 5dd0bdd9feee..000000000000
--- a/include/asm-mn10300/byteorder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_BYTEORDER_H
-#define _ASM_BYTEORDER_H
-
-#include <linux/byteorder/little_endian.h>
-
-#endif /* _ASM_BYTEORDER_H */
diff --git a/include/asm-mn10300/cache.h b/include/asm-mn10300/cache.h
deleted file mode 100644
index 9e01122208a9..000000000000
--- a/include/asm-mn10300/cache.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* MN10300 cache management registers
- *
- * Copyright (C) 2007 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_CACHE_H
-#define _ASM_CACHE_H
-
-#include <asm/cpu-regs.h>
-#include <asm/proc/cache.h>
-
-#ifndef __ASSEMBLY__
-#define L1_CACHE_DISPARITY      (L1_CACHE_NENTRIES * L1_CACHE_BYTES)
-#else
-#define L1_CACHE_DISPARITY      L1_CACHE_NENTRIES * L1_CACHE_BYTES
-#endif
-
-/* data cache purge registers
- * - read from the register to unconditionally purge that cache line
- * - write address & 0xffffff00 to conditionally purge that cache line
- *   - clear LSB to request invalidation as well
- */
-#define DCACHE_PURGE(WAY, ENTRY) \
-        __SYSREG(0xc8400000 + (WAY) * L1_CACHE_WAYDISP + \
-                 (ENTRY) * L1_CACHE_BYTES, u32)
-
-#define DCACHE_PURGE_WAY0(ENTRY) \
-        __SYSREG(0xc8400000 + 0 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY1(ENTRY) \
-        __SYSREG(0xc8400000 + 1 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY2(ENTRY) \
-        __SYSREG(0xc8400000 + 2 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY3(ENTRY) \
-        __SYSREG(0xc8400000 + 3 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-
-/* instruction cache access registers */
-#define ICACHE_DATA(WAY, ENTRY, OFF) \
-        __SYSREG(0xc8000000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10 + (OFF) * 4, u32)
-#define ICACHE_TAG(WAY, ENTRY)   \
-        __SYSREG(0xc8100000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10, u32)
-
-/* instruction cache access registers */
-#define DCACHE_DATA(WAY, ENTRY, OFF) \
-        __SYSREG(0xc8200000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10 + (OFF) * 4, u32)
-#define DCACHE_TAG(WAY, ENTRY)   \
-        __SYSREG(0xc8300000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10, u32)
-
-#endif /* _ASM_CACHE_H */
diff --git a/include/asm-mn10300/cacheflush.h b/include/asm-mn10300/cacheflush.h
deleted file mode 100644
index 2db746a251f8..000000000000
--- a/include/asm-mn10300/cacheflush.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* MN10300 Cache flushing
- *
- * Copyright (C) 2007 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_CACHEFLUSH_H
-#define _ASM_CACHEFLUSH_H
-
-#ifndef __ASSEMBLY__
-
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-
-/*
- * virtually-indexed cache managment (our cache is physically indexed)
- */
-#define flush_cache_all()                       do {} while (0)
-#define flush_cache_mm(mm)                      do {} while (0)
-#define flush_cache_dup_mm(mm)                  do {} while (0)
-#define flush_cache_range(mm, start, end)       do {} while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do {} while (0)
-#define flush_cache_vmap(start, end)            do {} while (0)
-#define flush_cache_vunmap(start, end)          do {} while (0)
-#define flush_dcache_page(page)                 do {} while (0)
-#define flush_dcache_mmap_lock(mapping)         do {} while (0)
-#define flush_dcache_mmap_unlock(mapping)       do {} while (0)
-
-/*
- * physically-indexed cache managment
- */
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-
-extern void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg);
-
-#else
-
-#define flush_icache_range(start, end)          do {} while (0)
-#define flush_icache_page(vma, pg)              do {} while (0)
-
-#endif
-
-#define flush_icache_user_range(vma, pg, adr, len) \
-        flush_icache_range(adr, adr + len)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        do {                                    \
-                memcpy(dst, src, len);          \
-                flush_icache_page(vma, page);   \
-        } while (0)
-
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-
-/*
- * primitive routines
- */
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-extern void mn10300_icache_inv(void);
-extern void mn10300_dcache_inv(void);
-extern void mn10300_dcache_inv_page(unsigned start);
-extern void mn10300_dcache_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_inv_range2(unsigned start, unsigned size);
-#ifdef CONFIG_MN10300_CACHE_WBACK
-extern void mn10300_dcache_flush(void);
-extern void mn10300_dcache_flush_page(unsigned start);
-extern void mn10300_dcache_flush_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_range2(unsigned start, unsigned size);
-extern void mn10300_dcache_flush_inv(void);
-extern void mn10300_dcache_flush_inv_page(unsigned start);
-extern void mn10300_dcache_flush_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_inv_range2(unsigned start, unsigned size);
-#else
-#define mn10300_dcache_flush()                          do {} while (0)
-#define mn10300_dcache_flush_page(start)                do {} while (0)
-#define mn10300_dcache_flush_range(start, end)          do {} while (0)
-#define mn10300_dcache_flush_range2(start, size)        do {} while (0)
-#define mn10300_dcache_flush_inv()                      mn10300_dcache_inv()
-#define mn10300_dcache_flush_inv_page(start) \
-        mn10300_dcache_inv_page((start))
-#define mn10300_dcache_flush_inv_range(start, end) \
-        mn10300_dcache_inv_range((start), (end))
-#define mn10300_dcache_flush_inv_range2(start, size) \
-        mn10300_dcache_inv_range2((start), (size))
-#endif /* CONFIG_MN10300_CACHE_WBACK */
-#else
-#define mn10300_icache_inv()                            do {} while (0)
-#define mn10300_dcache_inv()                            do {} while (0)
-#define mn10300_dcache_inv_page(start)                  do {} while (0)
-#define mn10300_dcache_inv_range(start, end)            do {} while (0)
-#define mn10300_dcache_inv_range2(start, size)          do {} while (0)
-#define mn10300_dcache_flush()                          do {} while (0)
-#define mn10300_dcache_flush_inv_page(start)            do {} while (0)
-#define mn10300_dcache_flush_inv()                      do {} while (0)
-#define mn10300_dcache_flush_inv_range(start, end)      do {} while (0)
-#define mn10300_dcache_flush_inv_range2(start, size)    do {} while (0)
-#define mn10300_dcache_flush_page(start)                do {} while (0)
-#define mn10300_dcache_flush_range(start, end)          do {} while (0)
-#define mn10300_dcache_flush_range2(start, size)        do {} while (0)
-#endif /* CONFIG_MN10300_CACHE_DISABLED */
-
-/*
- * internal debugging function
- */
-#ifdef CONFIG_DEBUG_PAGEALLOC
-extern void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_CACHEFLUSH_H */
diff --git a/include/asm-mn10300/checksum.h b/include/asm-mn10300/checksum.h
deleted file mode 100644
index 9fb2a8d8826a..000000000000
--- a/include/asm-mn10300/checksum.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* MN10300 Optimised checksumming code
- *
- * Copyright (C) 2007 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_CHECKSUM_H
-#define _ASM_CHECKSUM_H
-
-extern __wsum csum_partial(const void *buff, int len, __wsum sum);
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                        int len, __wsum sum);
-extern __wsum csum_partial_copy_from_user(const void *src, void *dst,
-                                          int len, __wsum sum,
-                                          int *err_ptr);
-extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
-extern __wsum csum_partial(const void *buff, int len, __wsum sum);
-extern __sum16 ip_compute_csum(const void *buff, int len);
-
-#define csum_partial_copy_fromuser csum_partial_copy
-extern __wsum csum_partial_copy(const void *src, void *dst, int len,
-                                __wsum sum);
-
-static inline __sum16 csum_fold(__wsum sum)
-{
-        asm(
-                "       add     %1,%0           \n"
-                "       addc    0xffff,%0       \n"
-                : "=r" (sum)
-                : "r" (sum << 16), "0" (sum & 0xffff0000)
-                : "cc"
-            );
-        return (~sum) >> 16;
-}
-
-static inline __wsum csum_tcpudp_nofold(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-        __wsum tmp;
-
-        tmp = (__wsum) ntohs(len) << 16;
-        tmp += (__wsum) proto << 8;
-
-        asm(
-                "       add     %1,%0           \n"
-                "       addc    %2,%0           \n"
-                "       addc    %3,%0           \n"
-                "       addc    0,%0            \n"
-                : "=r" (sum)
-                : "r" (daddr), "r"(saddr), "r"(tmp), "0"(sum)
-                : "cc"
-            );
-        return sum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16 csum_tcpudp_magic(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
-}
-
-#undef _HAVE_ARCH_IPV6_CSUM
-
-/*
- *      Copy and checksum to user
- */
-#define HAVE_CSUM_COPY_USER
-extern __wsum csum_and_copy_to_user(const void *src, void *dst, int len,
-                                    __wsum sum, int *err_ptr);
-
-
-#endif /* _ASM_CHECKSUM_H */
diff --git a/include/asm-mn10300/cpu-regs.h b/include/asm-mn10300/cpu-regs.h
deleted file mode 100644
index 757e9b5388ea..000000000000
--- a/include/asm-mn10300/cpu-regs.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* MN10300 Core system registers
- *
- * Copyright (C) 2007 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_CPU_REGS_H
-#define _ASM_CPU_REGS_H
-
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-#endif
-
-#ifdef CONFIG_MN10300_CPU_AM33V2
-/* we tell the compiler to pretend to be AM33 so that it doesn't try and use
- * the FP regs, but tell the assembler that we're actually allowed AM33v2
- * instructions */
-#ifndef __ASSEMBLY__
-asm(" .am33_2\n");
-#else
-.am33_2
-#endif
-#endif
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-#define __SYSREG(ADDR, TYPE) (*(volatile TYPE *)(ADDR))
-#define __SYSREGC(ADDR, TYPE) (*(const volatile TYPE *)(ADDR))
-#else
-#define __SYSREG(ADDR, TYPE) ADDR
-#define __SYSREGC(ADDR, TYPE) ADDR
-#endif
-
-/* CPU registers */
-#define EPSW_FLAG_Z             0x00000001      /* zero flag */
-#define EPSW_FLAG_N             0x00000002      /* negative flag */
-#define EPSW_FLAG_C             0x00000004      /* carry flag */
-#define EPSW_FLAG_V             0x00000008      /* overflow flag */
-#define EPSW_IM                 0x00000700      /* interrupt mode */
-#define EPSW_IM_0               0x00000000      /* interrupt mode 0 */
-#define EPSW_IM_1               0x00000100      /* interrupt mode 1 */
-#define EPSW_IM_2               0x00000200      /* interrupt mode 2 */
-#define EPSW_IM_3               0x00000300      /* interrupt mode 3 */
-#define EPSW_IM_4               0x00000400      /* interrupt mode 4 */
-#define EPSW_IM_5               0x00000500      /* interrupt mode 5 */
-#define EPSW_IM_6               0x00000600      /* interrupt mode 6 */
-#define EPSW_IM_7               0x00000700      /* interrupt mode 7 */
-#define EPSW_IE                 0x00000800      /* interrupt enable */
-#define EPSW_S                  0x00003000      /* software auxilliary bits */
-#define EPSW_T                  0x00008000      /* trace enable */
-#define EPSW_nSL                0x00010000      /* not supervisor level */
-#define EPSW_NMID               0x00020000      /* nonmaskable interrupt disable */
-#define EPSW_nAR                0x00040000      /* register bank control */
-#define EPSW_ML                 0x00080000      /* monitor level */
-#define EPSW_FE                 0x00100000      /* FPU enable */
-
-/* FPU registers */
-#define FPCR_EF_I               0x00000001      /* inexact result FPU exception flag */
-#define FPCR_EF_U               0x00000002      /* underflow FPU exception flag */
-#define FPCR_EF_O               0x00000004      /* overflow FPU exception flag */
-#define FPCR_EF_Z               0x00000008      /* zero divide FPU exception flag */
-#define FPCR_EF_V               0x00000010      /* invalid operand FPU exception flag */
-#define FPCR_EE_I               0x00000020      /* inexact result FPU exception enable */
-#define FPCR_EE_U               0x00000040      /* underflow FPU exception enable */
-#define FPCR_EE_O               0x00000080      /* overflow FPU exception enable */
-#define FPCR_EE_Z               0x00000100      /* zero divide FPU exception enable */
-#define FPCR_EE_V               0x00000200      /* invalid operand FPU exception enable */
-#define FPCR_EC_I               0x00000400      /* inexact result FPU exception cause */
-#define FPCR_EC_U               0x00000800      /* underflow FPU exception cause */
-#define FPCR_EC_O               0x00001000      /* overflow FPU exception cause */
-#define FPCR_EC_Z               0x00002000      /* zero divide FPU exception cause */
-#define FPCR_EC_V               0x00004000      /* invalid operand FPU exception cause */
-#define FPCR_RM                 0x00030000      /* rounding mode */
-#define FPCR_RM_NEAREST         0x00000000      /* - round to nearest value */
-#define FPCR_FCC_U              0x00040000      /* FPU unordered condition code */
-#define FPCR_FCC_E              0x00080000      /* FPU equal condition code */
-#define FPCR_FCC_G              0x00100000      /* FPU greater than condition code */
-#define FPCR_FCC_L              0x00200000      /* FPU less than condition code */
-#define FPCR_INIT               0x00000000      /* no exceptions, rounding to nearest */
-
-/* CPU control registers */
-#define CPUP                    __SYSREG(0xc0000020, u16)       /* CPU pipeline register */
-#define CPUP_DWBD               0x0020          /* write buffer disable flag */
-#define CPUP_IPFD               0x0040          /* instruction prefetch disable flag */
-#define CPUP_EXM                0x0080          /* exception operation mode */
-#define CPUP_EXM_AM33V1         0x0000          /* - AM33 v1 exception mode */
-#define CPUP_EXM_AM33V2         0x0080          /* - AM33 v2 exception mode */
-
-#define CPUM                    __SYSREG(0xc0000040, u16)       /* CPU mode register */
-#define CPUM_SLEEP              0x0004          /* set to enter sleep state */
-#define CPUM_HALT               0x0008          /* set to enter halt state */
-#define CPUM_STOP               0x0010          /* set to enter stop state */
-
-#define CPUREV                  __SYSREGC(0xc0000050, u32)      /* CPU revision register */
-#define CPUREV_TYPE             0x0000000f      /* CPU type */
-#define CPUREV_TYPE_S           0
-#define CPUREV_TYPE_AM33V1      0x00000000      /* - AM33 V1 core, AM33/1.00 arch */
-#define CPUREV_TYPE_AM33V2      0x00000001      /* - AM33 V2 core, AM33/2.00 arch */
-#define CPUREV_TYPE_AM34V1      0x00000002      /* - AM34 V1 core, AM33/2.00 arch */
-#define CPUREV_REVISION         0x000000f0      /* CPU revision */
-#define CPUREV_REVISION_S       4
-#define CPUREV_ICWAY            0x00000f00      /* number of instruction cache ways */
-#define CPUREV_ICWAY_S          8
-#define CPUREV_ICSIZE           0x0000f000      /* instruction cache way size */
-#define CPUREV_ICSIZE_S         12
-#define CPUREV_DCWAY            0x000f0000      /* number of data cache ways */
-#define CPUREV_DCWAY_S          16
-#define CPUREV_DCSIZE           0x00f00000      /* data cache way size */
-#define CPUREV_DCSIZE_S         20
-#define CPUREV_FPUTYPE          0x0f000000      /* FPU core type */
-#define CPUREV_FPUTYPE_NONE     0x00000000      /* - no FPU core implemented */
-#define CPUREV_OCDCTG           0xf0000000      /* on-chip debug function category */
-
-#define DCR                     __SYSREG(0xc0000030, u16)       /* Debug control register */
-
-/* interrupt/exception control registers */
-#define IVAR0                   __SYSREG(0xc0000000, u16)       /* interrupt vector 0 */
-#define IVAR1                   __SYSREG(0xc0000004, u16)       /* interrupt vector 1 */
-#define IVAR2                   __SYSREG(0xc0000008, u16)       /* interrupt vector 2 */
-#define IVAR3                   __SYSREG(0xc000000c, u16)       /* interrupt vector 3 */
-#define IVAR4                   __SYSREG(0xc0000010, u16)       /* interrupt vector 4 */
-#define IVAR5                   __SYSREG(0xc0000014, u16)       /* interrupt vector 5 */
-#define IVAR6                   __SYSREG(0xc0000018, u16)       /* interrupt vector 6 */
-
-#define TBR                     __SYSREG(0xc0000024, u32)       /* Trap table base */
-#define TBR_TB                  0xff000000      /* table base address bits 31-24 */
-#define TBR_INT_CODE            0x00ffffff      /* interrupt code */
-
-#define DEAR                    __SYSREG(0xc0000038, u32)       /* Data access exception address */
-
-#define sISR                    __SYSREG(0xc0000044, u32)       /* Supervisor interrupt status */
-#define sISR_IRQICE             0x00000001      /* ICE interrupt */
-#define sISR_ISTEP              0x00000002      /* single step interrupt */
-#define sISR_MISSA              0x00000004      /* memory access address misalignment fault */
-#define sISR_UNIMP              0x00000008      /* unimplemented instruction execution fault */
-#define sISR_PIEXE              0x00000010      /* program interrupt */
-#define sISR_MEMERR             0x00000020      /* illegal memory access fault */
-#define sISR_IBREAK             0x00000040      /* instraction break interrupt */
-#define sISR_DBSRL              0x00000080      /* debug serial interrupt */
-#define sISR_PERIDB             0x00000100      /* peripheral debug interrupt */
-#define sISR_EXUNIMP            0x00000200      /* unimplemented ex-instruction execution fault */
-#define sISR_OBREAK             0x00000400      /* operand break interrupt */
-#define sISR_PRIV               0x00000800      /* privileged instruction execution fault */
-#define sISR_BUSERR             0x00001000      /* bus error fault */
-#define sISR_DBLFT              0x00002000      /* double fault */
-#define sISR_DBG                0x00008000      /* debug reserved interrupt */
-#define sISR_ITMISS             0x00010000      /* instruction TLB miss */
-#define sISR_DTMISS             0x00020000      /* data TLB miss */
-#define sISR_ITEX               0x00040000      /* instruction TLB access exception */
-#define sISR_DTEX               0x00080000      /* data TLB access exception */
-#define sISR_ILGIA              0x00100000      /* illegal instruction access exception */
-#define sISR_ILGDA              0x00200000      /* illegal data access exception */
-#define sISR_IOIA               0x00400000      /* internal I/O space instruction access excep */
-#define sISR_PRIVA              0x00800000      /* privileged space instruction access excep */
-#define sISR_PRIDA              0x01000000      /* privileged space data access excep */
-#define sISR_DISA               0x02000000      /* data space instruction access excep */
-#define sISR_SYSC               0x04000000      /* system call instruction excep */
-#define sISR_FPUD               0x08000000      /* FPU disabled excep */
-#define sISR_FPUUI              0x10000000      /* FPU unimplemented instruction excep */
-#define sISR_FPUOP              0x20000000      /* FPU operation excep */
-#define sISR_NE                 0x80000000      /* multiple synchronous exceptions excep */
-
-/* cache control registers */
-#define CHCTR                   __SYSREG(0xc0000070, u16)       /* cache control */
-#define CHCTR_ICEN              0x0001          /* instruction cache enable */
-#define CHCTR_DCEN              0x0002          /* data cache enable */
-#define CHCTR_ICBUSY            0x0004          /* instruction cache busy */
-#define CHCTR_DCBUSY            0x0008          /* data cache busy */
-#define CHCTR_ICINV             0x0010          /* instruction cache invalidate */
-#define CHCTR_DCINV             0x0020          /* data cache invalidate */
-#define CHCTR_DCWTMD            0x0040          /* data cache writing mode */
-#define CHCTR_DCWTMD_WRBACK     0x0000          /* - write back mode */
-#define CHCTR_DCWTMD_WRTHROUGH  0x0040          /* - write through mode */
-#define CHCTR_DCALMD            0x0080          /* data cache allocation mode */
-#define CHCTR_ICWMD             0x0f00          /* instruction cache way mode */
-#define CHCTR_DCWMD             0xf000          /* data cache way mode */
-
-/* MMU control registers */
-#define MMUCTR                  __SYSREG(0xc0000090, u32)       /* MMU control register */
-#define MMUCTR_IRP              0x0000003f      /* instruction TLB replace pointer */
-#define MMUCTR_ITE              0x00000040      /* instruction TLB enable */
-#define MMUCTR_IIV              0x00000080      /* instruction TLB invalidate */
-#define MMUCTR_ITL              0x00000700      /* instruction TLB lock pointer */
-#define MMUCTR_ITL_NOLOCK       0x00000000      /* - no lock */
-#define MMUCTR_ITL_LOCK0        0x00000100      /* - entry 0 locked */
-#define MMUCTR_ITL_LOCK0_1      0x00000200      /* - entry 0-1 locked */
-#define MMUCTR_ITL_LOCK0_3      0x00000300      /* - entry 0-3 locked */
-#define MMUCTR_ITL_LOCK0_7      0x00000400      /* - entry 0-7 locked */
-#define MMUCTR_ITL_LOCK0_15     0x00000500      /* - entry 0-15 locked */
-#define MMUCTR_CE               0x00008000      /* cacheable bit enable */
-#define MMUCTR_DRP              0x003f0000      /* data TLB replace pointer */
-#define MMUCTR_DTE              0x00400000      /* data TLB enable */
-#define MMUCTR_DIV              0x00800000      /* data TLB invalidate */
-#define MMUCTR_DTL              0x07000000      /* data TLB lock pointer */
-#define MMUCTR_DTL_NOLOCK       0x00000000      /* - no lock */
-#define MMUCTR_DTL_LOCK0        0x01000000      /* - entry 0 locked */
-#define MMUCTR_DTL_LOCK0_1      0x02000000      /* - entry 0-1 locked */
-#define MMUCTR_DTL_LOCK0_3      0x03000000      /* - entry 0-3 locked */
-#define MMUCTR_DTL_LOCK0_7      0x04000000      /* - entry 0-7 locked */
-#define MMUCTR_DTL_LOCK0_15     0x05000000      /* - entry 0-15 locked */
-
-#define PIDR                    __SYSREG(0xc0000094, u16)       /* PID register */
-#define PIDR_PID                0x00ff          /* process identifier */
-
-#define PTBR                    __SYSREG(0xc0000098, unsigned long) /* Page table base register */
-
-#define IPTEL                   __SYSREG(0xc00000a0, u32)       /* instruction TLB entry */
-#define DPTEL                   __SYSREG(0xc00000b0, u32)       /* data TLB entry */
-#define xPTEL_V                 0x00000001      /* TLB entry valid */
-#define xPTEL_UNUSED1           0x00000002      /* unused bit */
-#define xPTEL_UNUSED2           0x00000004      /* unused bit */
-#define xPTEL_C                 0x00000008      /* cached if set */
-#define xPTEL_PV                0x00000010      /* page valid */
-#define xPTEL_D                 0x00000020      /* dirty */
-#define xPTEL_PR                0x000001c0      /* page protection */
-#define xPTEL_PR_ROK            0x00000000      /* - R/O kernel */
-#define xPTEL_PR_RWK            0x00000100      /* - R/W kernel */
-#define xPTEL_PR_ROK_ROU        0x00000080      /* - R/O kernel and R/O user */
-#define xPTEL_PR_RWK_ROU        0x00000180      /* - R/W kernel and R/O user */
-#define xPTEL_PR_RWK_RWU        0x000001c0      /* - R/W kernel and R/W user */
-#define xPTEL_G                 0x00000200      /* global (use PID if 0) */
-#define xPTEL_PS                0x00000c00      /* page size */
-#define xPTEL_PS_4Kb            0x00000000      /* - 4Kb page */
-#define xPTEL_PS_128Kb          0x00000400      /* - 128Kb page */
-#define xPTEL_PS_1Kb            0x00000800      /* - 1Kb page */
-#define xPTEL_PS_4Mb            0x00000c00      /* - 4Mb page */
-#define xPTEL_PPN               0xfffff006      /* physical page number */
-
-#define xPTEL_V_BIT             0       /* bit numbers corresponding to above masks */
-#define xPTEL_UNUSED1_BIT       1
-#define xPTEL_UNUSED2_BIT       2
-#define xPTEL_C_BIT             3
-#define xPTEL_PV_BIT            4
-#define xPTEL_D_BIT             5
-#define xPTEL_G_BIT             9
-
-#define IPTEU                   __SYSREG(0xc00000a4, u32)       /* instruction TLB virtual addr */
-#define DPTEU                   __SYSREG(0xc00000b4, u32)       /* data TLB virtual addr */
-#define xPTEU_VPN               0xfffffc00      /* virtual page number */
-#define xPTEU_PID               0x000000ff      /* process identifier to which applicable */
-
-#define IPTEL2                  __SYSREG(0xc00000a8, u32)       /* instruction TLB entry */
-#define DPTEL2                  __SYSREG(0xc00000b8, u32)       /* data TLB entry */
-#define xPTEL2_V                0x00000001      /* TLB entry valid */
-#define xPTEL2_C                0x00000002      /* cacheable */
-#define xPTEL2_PV               0x00000004      /* page valid */
-#define xPTEL2_D                0x00000008      /* dirty */
-#define xPTEL2_PR               0x00000070      /* page protection */
-#define xPTEL2_PR_ROK           0x00000000      /* - R/O kernel */
-#define xPTEL2_PR_RWK           0x00000040      /* - R/W kernel */
-#define xPTEL2_PR_ROK_ROU       0x00000020      /* - R/O kernel and R/O user */
-#define xPTEL2_PR_RWK_ROU       0x00000060      /* - R/W kernel and R/O user */
-#define xPTEL2_PR_RWK_RWU       0x00000070      /* - R/W kernel and R/W user */
-#define xPTEL2_G                0x00000080      /* global (use PID if 0) */
-#define xPTEL2_PS               0x00000300      /* page size */
-#define xPTEL2_PS_4Kb           0x00000000      /* - 4Kb page */
-#define xPTEL2_PS_128Kb         0x00000100      /* - 128Kb page */
-#define xPTEL2_PS_1Kb           0x00000200      /* - 1Kb page */
-#define xPTEL2_PS_4Mb           0x00000300      /* - 4Mb page */
-#define xPTEL2_PPN              0xfffffc00      /* physical page number */
-
-#define MMUFCR                  __SYSREGC(0xc000009c, u32)      /* MMU exception cause */
-#define MMUFCR_IFC              __SYSREGC(0xc000009c, u16)      /* MMU instruction excep cause */
-#define MMUFCR_DFC              __SYSREGC(0xc000009e, u16)      /* MMU data exception cause */
-#define MMUFCR_xFC_TLBMISS      0x0001          /* TLB miss flag */
-#define MMUFCR_xFC_INITWR       0x0002          /* initial write excep flag */
-#define MMUFCR_xFC_PGINVAL      0x0004          /* page invalid excep flag */
-#define MMUFCR_xFC_PROTVIOL     0x0008          /* protection violation excep flag */
-#define MMUFCR_xFC_ACCESS       0x0010          /* access level flag */
-#define MMUFCR_xFC_ACCESS_USR   0x0000          /* - user mode */
-#define MMUFCR_xFC_ACCESS_SR    0x0010          /* - supervisor mode */
-#define MMUFCR_xFC_TYPE         0x0020          /* access type flag */
-#define MMUFCR_xFC_TYPE_READ    0x0000          /* - read */
-#define MMUFCR_xFC_TYPE_WRITE   0x0020          /* - write */
-#define MMUFCR_xFC_PR           0x01c0          /* page protection flag */
-#define MMUFCR_xFC_PR_ROK       0x0000          /* - R/O kernel */
-#define MMUFCR_xFC_PR_RWK       0x0100          /* - R/W kernel */
-#define MMUFCR_xFC_PR_ROK_ROU   0x0080          /* - R/O kernel and R/O user */
-#define MMUFCR_xFC_PR_RWK_ROU   0x0180          /* - R/W kernel and R/O user */
-#define MMUFCR_xFC_PR_RWK_RWU   0x01c0          /* - R/W kernel and R/W user */
-#define MMUFCR_xFC_ILLADDR      0x0200          /* illegal address excep flag */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_CPU_REGS_H */
diff --git a/include/asm-mn10300/cputime.h b/include/asm-mn10300/cputime.h
deleted file mode 100644
index 6d68ad7e0ea3..000000000000
--- a/include/asm-mn10300/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
diff --git a/include/asm-mn10300/current.h b/include/asm-mn10300/current.h
deleted file mode 100644
index ca6027d83743..000000000000
--- a/include/asm-mn10300/current.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* MN10300 Current task structure accessor
- *
- * Copyright (C) 2007 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_CURRENT_H
-#define _ASM_CURRENT_H
-
-#include <linux/thread_info.h>
-
-/*
- * dedicate E2 to keeping the current task pointer
- */
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-
-register struct task_struct *const current asm("e2") __attribute__((used));
-
-#define get_current() current
-
-extern struct task_struct *__current;
-
-#else
-static inline __attribute__((const))
-struct task_struct *get_current(void)
-{
-        return current_thread_info()->task;
-}
-
-#define current get_current()
-#endif
-
-#endif /* _ASM_CURRENT_H */
diff --git a/include/asm-mn10300/delay.h b/include/asm-mn10300/delay.h
deleted file mode 100644
index 34517b359399..000000000000
--- a/include/asm-mn10300/delay.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MN10300 Uninterruptible delay routines
- *
- * Copyright (C) 2007 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_DELAY_H
-#define _ASM_DELAY_H
-
-extern void __udelay(unsigned long usecs);
-extern void __delay(unsigned long loops);
-
-#define udelay(n) __udelay(n)
-
-#endif /* _ASM_DELAY_H */
diff --git a/include/asm-mn10300/device.h b/include/asm-mn10300/device.h
deleted file mode 100644
index f0a4c256403b..000000000000
--- a/include/asm-mn10300/device.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/device.h>
diff --git a/include/asm-mn10300/div64.h b/include/asm-mn10300/div64.h
deleted file mode 100644
index 3a8329b3e869..000000000000
--- a/include/asm-mn10300/div64.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* MN10300 64-bit division
- *
- * Copyright (C) 2007 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_DIV64
-#define _ASM_DIV64
-
-#include <linux/types.h>
-
-extern void ____unhandled_size_in_do_div___(void);
-
-/*
- * divide n by base, leaving the result in n and returning the remainder
- * - we can do this quite efficiently on the MN10300 by cascading the divides
- *   through the MDR register
- */
-#define do_div(n, base)                                                 \
-({                                                                      \
-        unsigned __rem = 0;                                             \
-        if (sizeof(n) <= 4) {                                           \
-                asm("mov        %1,mdr  \n"                             \
-                    "divu       %2,%0   \n"                             \
-                    "mov        mdr,%1  \n"                             \
-                    : "+r"(n), "=d"(__rem)                              \
-                    : "r"(base), "1"(__rem)                             \
-                    : "cc"                                              \
-                    );                                                  \
-        } else if (sizeof(n) <= 8) {                                    \
-                union {                                                 \
-                        unsigned long long l;                           \
-                        u32 w[2];                                       \
-                } __quot;                                               \
-                __quot.l = n;                                           \
-                asm("mov        %0,mdr  \n"     /* MDR = 0 */           \
-                    "divu       %3,%1   \n"                             \
-                    /* __quot.MSL = __div.MSL / base, */                \
-                    /* MDR = MDR:__div.MSL % base */                    \
-                    "divu       %3,%2   \n"                             \
-                    /* __quot.LSL = MDR:__div.LSL / base, */            \
-                    /* MDR = MDR:__div.LSL % base */                    \
-                    "mov        mdr,%0  \n"                             \
-                    : "=d"(__rem), "=r"(__quot.w[1]), "=r"(__quot.w[0]) \
-                    : "r"(base), "0"(__rem), "1"(__quot.w[1]),          \
-                      "2"(__quot.w[0])                                  \
-                    : "cc"                                              \
-                    );                                                  \
-                n = __quot.l;                                           \
-        } else {                                                        \
-                ____unhandled_size_in_do_div___();                      \
-        }                                                               \
-        __rem;                                                          \
-})
-
-/*
- * do an unsigned 32-bit multiply and divide with intermediate 64-bit product
- * so as not to lose accuracy
- * - we use the MDR register to hold the MSW of the product
- */
-static inline __attribute__((const))
-unsigned __muldiv64u(unsigned val, unsigned mult, unsigned div)
-{
-        unsigned result;
-
-        asm("mulu       %2,%0   \n"     /* MDR:val = val*mult */
-            "divu       %3,%0   \n"     /* val = MDR:val/div;
-                                         * MDR = MDR:val%div */
-            : "=r"(result)
-            : "0"(val), "ir"(mult), "r"(div)
-            );
-
-        return result;
-}
-
-/*
- * do a signed 32-bit multiply and divide with intermediate 64-bit product so
- * as not to lose accuracy
- * - we use the MDR register to hold the MSW of the product
- */
-static inline __attribute__((const))
-signed __muldiv64s(signed val, signed mult, signed div)
-{
-        signed result;
-
-        asm("mul        %2,%0   \n"     /* MDR:val = val*mult */
-            "div        %3,%0   \n"     /* val = MDR:val/div;
-                                         * MDR = MDR:val%div */
-            : "=r"(result)
-            : "0"(val), "ir"(mult), "r"(div)
-            );
-
-        return result;
-}
-
-#endif /* _ASM_DIV64 */
diff --git a/include/asm-mn10300/dma-mapping.h b/include/asm-mn10300/dma-mapping.h
deleted file mode 100644
index ccae8f6c6326..000000000000
--- a/include/asm-mn10300/dma-mapping.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/* DMA mapping routines for the MN10300 arch
- *
- * Copyright (C) 2007 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_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-
-#include <linux/mm.h>
-#include <linux/scatterlist.h>
-
-#include <asm/cache.h>
-#include <asm/io.h>
-
-extern void *dma_alloc_coherent(struct device *dev, size_t size,
-                                dma_addr_t *dma_handle, int flag);
-
-extern void dma_free_coherent(struct device *dev, size_t size,
-                              void *vaddr, dma_addr_t dma_handle);
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent((d), (s), (h), (f))
-#define dma_free_noncoherent(d, s, v, h)  dma_free_coherent((d), (s), (v), (h))
-
-/*
- * Map a single buffer of the indicated size for DMA in streaming mode.  The
- * 32-bit bus address to use is returned.
- *
- * Once the device is given the dma address, the device owns this memory until
- * either pci_unmap_single or pci_dma_sync_single is performed.
- */
-static inline
-dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
-                          enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-        mn10300_dcache_flush_inv();
-        return virt_to_bus(ptr);
-}
-
-/*
- * Unmap a single streaming mode DMA translation.  The dma_addr and size must
- * match what was provided for in a previous pci_map_single call.  All other
- * usages are undefined.
- *
- * After this call, reads by the cpu to the buffer are guarenteed to see
- * whatever the device wrote there.
- */
-static inline
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                      enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-
-/*
- * Map a set of buffers described by scatterlist in streaming mode for DMA.
- * This is the scather-gather version of the above pci_map_single interface.
- * Here the scatter gather list elements are each tagged with the appropriate
- * dma address and length.  They are obtained via sg_dma_{address,length}(SG).
- *
- * NOTE: An implementation may be able to use a smaller number of DMA
- *       address/length pairs than there are SG table elements.  (for example
- *       via virtual mapping capabilities) The routine returns the number of
- *       addr/length pairs actually used, at most nents.
- *
- * Device ownership issues as mentioned above for pci_map_single are the same
- * here.
- */
-static inline
-int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
-               enum dma_data_direction direction)
-{
-        struct scatterlist *sg;
-        int i;
-
-        BUG_ON(!valid_dma_direction(direction));
-        WARN_ON(nents == 0 || sglist[0].length == 0);
-
-        for_each_sg(sglist, sg, nents, i) {
-                BUG_ON(!sg_page(sg));
-
-                sg->dma_address = sg_phys(sg);
-        }
-
-        mn10300_dcache_flush_inv();
-        return nents;
-}
-
-/*
- * Unmap a set of streaming mode DMA translations.
- * Again, cpu read rules concerning calls here are the same as for
- * pci_unmap_single() above.
- */
-static inline
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-                  enum dma_data_direction direction)
-{
-        BUG_ON(!valid_dma_direction(direction));
-}
-
-/*
- * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical
- * to pci_map_single, but takes a struct page instead of a virtual address
- */
-static inline
-dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                        unsigned long offset, size_t size,
-                        enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-        return page_to_bus(page) + offset;
-}
-
-static inline
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-                    enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-
-/*
- * Make physical memory consistent for a single streaming mode DMA translation
- * after a transfer.
- *
- * If you perform a pci_map_single() but wish to interrogate the buffer using
- * the cpu, yet do not wish to teardown the PCI dma mapping, you must call this
- * function before doing so.  At the next point you give the PCI dma address
- * back to the card, the device again owns the buffer.
- */
-static inline
-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                             size_t size, enum dma_data_direction direction)
-{
-}
-
-static inline
-void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
-                                size_t size, enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-
-static inline
-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction direction)
-{
-}
-
-static inline void
-dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                 unsigned long offset, size_t size,
-                                 enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-
-
-/*
- * Make physical memory consistent for a set of streaming mode DMA translations
- * after a transfer.
- *
- * The same as pci_dma_sync_single but for a scatter-gather list, same rules
- * and usage.
- */
-static inline
-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                         int nelems, enum dma_data_direction direction)
-{
-}
-
-static inline
-void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
-                            int nelems, enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-
-static inline
-int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-
-/*
- * Return whether the given PCI device DMA address mask can be supported
- * properly.  For example, if your device can only drive the low 24-bits during
- * PCI bus mastering, then you would pass 0x00ffffff as the mask to this
- * function.
- */
-static inline
-int dma_supported(struct device *dev, u64 mask)
-{
-        /*
-         * we fall back to GFP_DMA when the mask isn't all 1s, so we can't
-         * guarantee allocations that must be within a tighter range than
-         * GFP_DMA
-         */
-        if (mask < 0x00ffffff)
-                return 0;
-        return 1;
-}
-
-static inline
-int dma_set_mask(struct device *dev, u64 mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-
-        *dev->dma_mask = mask;
-        return 0;
-}
-
-static inline
-int dma_get_cache_alignment(void)
-{
-        return 1 << L1_CACHE_SHIFT;
-}
-
-#define dma_is_consistent(d)    (1)
-
-static inline
-void dma_cache_sync(void *vaddr, size_t size,
-                    enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-
-#endif
diff --git a/include/asm-mn10300/dma.h b/include/asm-mn10300/dma.h
deleted file mode 100644
index 098df2e617ab..000000000000
--- a/include/asm-mn10300/dma.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* MN10300 ISA DMA handlers and definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_DMA_H
-#define _ASM_DMA_H
-
-#include <asm/system.h>
-#include <linux/spinlock.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-
-#undef MAX_DMA_CHANNELS         /* switch off linux/kernel/dma.c */
-#define MAX_DMA_ADDRESS         0xbfffffff
-
-extern spinlock_t dma_spin_lock;
-
-static inline unsigned long claim_dma_lock(void)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&dma_spin_lock, flags);
-        return flags;
-}
-
-static inline void release_dma_lock(unsigned long flags)
-{
-        spin_unlock_irqrestore(&dma_spin_lock, flags);
-}
-
-/* enable/disable a specific DMA channel */
-static inline void enable_dma(unsigned int dmanr)
-{
-}
-
-static inline void disable_dma(unsigned int dmanr)
-{
-}
-
-/* Clear the 'DMA Pointer Flip Flop'.
- * Write 0 for LSB/MSB, 1 for MSB/LSB access.
- * Use this once to initialize the FF to a known state.
- * After that, keep track of it. :-)
- * --- In order to do that, the DMA routines below should ---
- * --- only be used while holding the DMA lock ! ---
- */
-static inline void clear_dma_ff(unsigned int dmanr)
-{
-}
-
-/* set mode (above) for a specific DMA channel */
-static inline void set_dma_mode(unsigned int dmanr, char mode)
-{
-}
-
-/* Set only the page register bits of the transfer address.
- * This is used for successive transfers when we know the contents of
- * the lower 16 bits of the DMA current address register, but a 64k boundary
- * may have been crossed.
- */
-static inline void set_dma_page(unsigned int dmanr, char pagenr)
-{
-}
-
-
-/* Set transfer address & page bits for specific DMA channel.
- * Assumes dma flipflop is clear.
- */
-static inline void set_dma_addr(unsigned int dmanr, unsigned int a)
-{
-}
-
-
-/* Set transfer size (max 64k for DMA1..3, 128k for DMA5..7) for
- * a specific DMA channel.
- * You must ensure the parameters are valid.
- * NOTE: from a manual: "the number of transfers is one more
- * than the initial word count"! This is taken into account.
- * Assumes dma flip-flop is clear.
- * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7.
- */
-static inline void set_dma_count(unsigned int dmanr, unsigned int count)
-{
-}
-
-
-/* Get DMA residue count. After a DMA transfer, this
- * should return zero. Reading this while a DMA transfer is
- * still in progress will return unpredictable results.
- * If called before the channel has been used, it may return 1.
- * Otherwise, it returns the number of _bytes_ left to transfer.
- *
- * Assumes DMA flip-flop is clear.
- */
-static inline int get_dma_residue(unsigned int dmanr)
-{
-        return 0;
-}
-
-
-/* These are in kernel/dma.c: */
-extern int request_dma(unsigned int dmanr, const char *device_id);
-extern void free_dma(unsigned int dmanr);
-
-/* From PCI */
-
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy    (0)
-#endif
-
-#endif /* _ASM_DMA_H */
diff --git a/include/asm-mn10300/dmactl-regs.h b/include/asm-mn10300/dmactl-regs.h
deleted file mode 100644
index 58a199da0f4a..000000000000
--- a/include/asm-mn10300/dmactl-regs.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* MN10300 on-board DMA controller registers
- *
- * Copyright (C) 2007 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_DMACTL_REGS_H
-#define _ASM_DMACTL_REGS_H
-
-#include <asm/cpu-regs.h>
-
-#ifdef __KERNEL__
-
-/* DMA registers */
-#define DMxCTR(N)               __SYSREG(0xd2000000 + ((N) * 0x100), u32)       /* control reg */
-#define DMxCTR_BG               0x0000001f      /* transfer request source */
-#define DMxCTR_BG_SOFT          0x00000000      /* - software source */
-#define DMxCTR_BG_SC0TX         0x00000002      /* - serial port 0 transmission */
-#define DMxCTR_BG_SC0RX         0x00000003      /* - serial port 0 reception */
-#define DMxCTR_BG_SC1TX         0x00000004      /* - serial port 1 transmission */
-#define DMxCTR_BG_SC1RX         0x00000005      /* - serial port 1 reception */
-#define DMxCTR_BG_SC2TX         0x00000006      /* - serial port 2 transmission */
-#define DMxCTR_BG_SC2RX         0x00000007      /* - serial port 2 reception */
-#define DMxCTR_BG_TM0UFLOW      0x00000008      /* - timer 0 underflow */
-#define DMxCTR_BG_TM1UFLOW      0x00000009      /* - timer 1 underflow */
-#define DMxCTR_BG_TM2UFLOW      0x0000000a      /* - timer 2 underflow */
-#define DMxCTR_BG_TM3UFLOW      0x0000000b      /* - timer 3 underflow */
-#define DMxCTR_BG_TM6ACMPCAP    0x0000000c      /* - timer 6A compare/capture */
-#define DMxCTR_BG_AFE           0x0000000d      /* - analogue front-end interrupt source */
-#define DMxCTR_BG_ADC           0x0000000e      /* - A/D conversion end interrupt source */
-#define DMxCTR_BG_IRDA          0x0000000f      /* - IrDA interrupt source */
-#define DMxCTR_BG_RTC           0x00000010      /* - RTC interrupt source */
-#define DMxCTR_BG_XIRQ0         0x00000011      /* - XIRQ0 pin interrupt source */
-#define DMxCTR_BG_XIRQ1         0x00000012      /* - XIRQ1 pin interrupt source */
-#define DMxCTR_BG_XDMR0         0x00000013      /* - external request 0 source (XDMR0 pin) */
-#define DMxCTR_BG_XDMR1         0x00000014      /* - external request 1 source (XDMR1 pin) */
-#define DMxCTR_SAM              0x000000e0      /* DMA transfer src addr mode */
-#define DMxCTR_SAM_INCR         0x00000000      /* - increment */
-#define DMxCTR_SAM_DECR         0x00000020      /* - decrement */
-#define DMxCTR_SAM_FIXED        0x00000040      /* - fixed */
-#define DMxCTR_DAM              0x00000000      /* DMA transfer dest addr mode */
-#define DMxCTR_DAM_INCR         0x00000000      /* - increment */
-#define DMxCTR_DAM_DECR         0x00000100      /* - decrement */
-#define DMxCTR_DAM_FIXED        0x00000200      /* - fixed */
-#define DMxCTR_TM               0x00001800      /* DMA transfer mode */
-#define DMxCTR_TM_BATCH         0x00000000      /* - batch transfer */
-#define DMxCTR_TM_INTERM        0x00001000      /* - intermittent transfer */
-#define DMxCTR_UT               0x00006000      /* DMA transfer unit */
-#define DMxCTR_UT_1             0x00000000      /* - 1 byte */
-#define DMxCTR_UT_2             0x00002000      /* - 2 byte */
-#define DMxCTR_UT_4             0x00004000      /* - 4 byte */
-#define DMxCTR_UT_16            0x00006000      /* - 16 byte */
-#define DMxCTR_TEN              0x00010000      /* DMA channel transfer enable */
-#define DMxCTR_RQM              0x00060000      /* external request input source mode */
-#define DMxCTR_RQM_FALLEDGE     0x00000000      /* - falling edge */
-#define DMxCTR_RQM_RISEEDGE     0x00020000      /* - rising edge */
-#define DMxCTR_RQM_LOLEVEL      0x00040000      /* - low level */
-#define DMxCTR_RQM_HILEVEL      0x00060000      /* - high level */
-#define DMxCTR_RQF              0x01000000      /* DMA transfer request flag */
-#define DMxCTR_XEND             0x80000000      /* DMA transfer end flag */
-
-#define DMxSRC(N)               __SYSREG(0xd2000004 + ((N) * 0x100), u32)       /* control reg */
-
-#define DMxDST(N)               __SYSREG(0xd2000008 + ((N) * 0x100), u32)       /* src addr reg */
-
-#define DMxSIZ(N)               __SYSREG(0xd200000c + ((N) * 0x100), u32)       /* dest addr reg */
-#define DMxSIZ_CT               0x000fffff      /* number of bytes to transfer */
-
-#define DMxCYC(N)               __SYSREG(0xd2000010 + ((N) * 0x100), u32)       /* intermittent
-                                                                                 * size reg */
-#define DMxCYC_CYC              0x000000ff      /* number of interrmittent transfers -1 */
-
-#define DM0IRQ                  16              /* DMA channel 0 complete IRQ */
-#define DM1IRQ                  17              /* DMA channel 1 complete IRQ */
-#define DM2IRQ                  18              /* DMA channel 2 complete IRQ */
-#define DM3IRQ                  19              /* DMA channel 3 complete IRQ */
-
-#define DM0ICR                  GxICR(DM0IRQ)   /* DMA channel 0 complete intr ctrl reg */
-#define DM1ICR                  GxICR(DM0IR1)   /* DMA channel 1 complete intr ctrl reg */
-#define DM2ICR                  GxICR(DM0IR2)   /* DMA channel 2 complete intr ctrl reg */
-#define DM3ICR                  GxICR(DM0IR3)   /* DMA channel 3 complete intr ctrl reg */
-
-#ifndef __ASSEMBLY__
-
-struct mn10300_dmactl_regs {
-        u32             ctr;
-        const void      *src;
-        void            *dst;
-        u32             siz;
-        u32             cyc;
-} __attribute__((aligned(0x100)));
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_DMACTL_REGS_H */
diff --git a/include/asm-mn10300/elf.h b/include/asm-mn10300/elf.h
deleted file mode 100644
index bf09f8bb392e..000000000000
--- a/include/asm-mn10300/elf.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* MN10300 ELF constant and register definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 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_ELF_H
-#define _ASM_ELF_H
-
-#include <linux/utsname.h>
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-/*
- * AM33 relocations
- */
-#define R_MN10300_NONE          0       /* No reloc.  */
-#define R_MN10300_32            1       /* Direct 32 bit.  */
-#define R_MN10300_16            2       /* Direct 16 bit.  */
-#define R_MN10300_8             3       /* Direct 8 bit.  */
-#define R_MN10300_PCREL32       4       /* PC-relative 32-bit.  */
-#define R_MN10300_PCREL16       5       /* PC-relative 16-bit signed.  */
-#define R_MN10300_PCREL8        6       /* PC-relative 8-bit signed.  */
-#define R_MN10300_24            9       /* Direct 24 bit.  */
-#define R_MN10300_RELATIVE      23      /* Adjust by program base.  */
-
-/*
- * ELF register definitions..
- */
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-#define ELF_NFPREG 32
-typedef float elf_fpreg_t;
-
-typedef struct {
-        elf_fpreg_t     fpregs[ELF_NFPREG];
-        u_int32_t       fpcr;
-} elf_fpregset_t;
-
-extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
-
-/*
- * This is used to ensure we don't load something for the wrong architecture
- */
-#define elf_check_arch(x) \
-        (((x)->e_machine == EM_CYGNUS_MN10300) ||       \
-         ((x)->e_machine == EM_MN10300))
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2LSB
-#define ELF_ARCH        EM_MN10300
-
-/*
- * ELF process initialiser
- */
-#define ELF_PLAT_INIT(_r, load_addr)                                    \
-do {                                                                    \
-        struct pt_regs *_ur = current->thread.uregs;                    \
-        _ur->a3   = 0;  _ur->a2   = 0;  _ur->d3   = 0;  _ur->d2   = 0;  \
-        _ur->mcvf = 0;  _ur->mcrl = 0;  _ur->mcrh = 0;  _ur->mdrq = 0;  \
-        _ur->e1   = 0;  _ur->e0   = 0;  _ur->e7   = 0;  _ur->e6   = 0;  \
-        _ur->e5   = 0;  _ur->e4   = 0;  _ur->e3   = 0;  _ur->e2   = 0;  \
-        _ur->lar  = 0;  _ur->lir  = 0;  _ur->mdr  = 0;                  \
-        _ur->a1   = 0;  _ur->a0   = 0;  _ur->d1   = 0;  _ur->d0   = 0;  \
-} while (0)
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       4096
-
-/*
- * This is the location that an ET_DYN program is loaded if exec'ed.  Typical
- * use of this is to invoke "./ld.so someprog" to test out a new version of
- * the loader.  We need to make sure that it is out of the way of the program
- * that it will "exec", and that there is sufficient room for the brk.
- * - must clear the VMALLOC area
- */
-#define ELF_ET_DYN_BASE         0x04000000
-
-/*
- * regs is struct pt_regs, pr_reg is elf_gregset_t (which is
- * now struct user_regs, they are different)
- * - ELF_CORE_COPY_REGS has been guessed, and may be wrong
- */
-#define ELF_CORE_COPY_REGS(pr_reg, regs)        \
-do {                                            \
-        pr_reg[0]       = regs->a3;             \
-        pr_reg[1]       = regs->a2;             \
-        pr_reg[2]       = regs->d3;             \
-        pr_reg[3]       = regs->d2;             \
-        pr_reg[4]       = regs->mcvf;           \
-        pr_reg[5]       = regs->mcrl;           \
-        pr_reg[6]       = regs->mcrh;           \
-        pr_reg[7]       = regs->mdrq;           \
-        pr_reg[8]       = regs->e1;             \
-        pr_reg[9]       = regs->e0;             \
-        pr_reg[10]      = regs->e7;             \
-        pr_reg[11]      = regs->e6;             \
-        pr_reg[12]      = regs->e5;             \
-        pr_reg[13]      = regs->e4;             \
-        pr_reg[14]      = regs->e3;             \
-        pr_reg[15]      = regs->e2;             \
-        pr_reg[16]      = regs->sp;             \
-        pr_reg[17]      = regs->lar;            \
-        pr_reg[18]      = regs->lir;            \
-        pr_reg[19]      = regs->mdr;            \
-        pr_reg[20]      = regs->a1;             \
-        pr_reg[21]      = regs->a0;             \
-        pr_reg[22]      = regs->d1;             \
-        pr_reg[23]      = regs->d0;             \
-        pr_reg[24]      = regs->orig_d0;        \
-        pr_reg[25]      = regs->epsw;           \
-        pr_reg[26]      = regs->pc;             \
-} while (0);
-
-/*
- * This yields a mask that user programs can use to figure out what
- * instruction set this CPU supports.  This could be done in user space,
- * but it's not easy, and we've already done it here.
- */
-#define ELF_HWCAP       (0)
-
-/*
- * This yields a string that ld.so will use to load implementation
- * specific libraries for optimization.  This is more specific in
- * intent than poking at uname or /proc/cpuinfo.
- *
- * For the moment, we have only optimizations for the Intel generations,
- * but that could change...
- */
-#define ELF_PLATFORM  (NULL)
-
-#ifdef __KERNEL__
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-#endif
-
-#endif /* _ASM_ELF_H */
diff --git a/include/asm-mn10300/emergency-restart.h b/include/asm-mn10300/emergency-restart.h
deleted file mode 100644
index 3711bd9d50bd..000000000000
--- a/include/asm-mn10300/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
diff --git a/include/asm-mn10300/errno.h b/include/asm-mn10300/errno.h
deleted file mode 100644
index 4c82b503d92f..000000000000
--- a/include/asm-mn10300/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/include/asm-mn10300/exceptions.h b/include/asm-mn10300/exceptions.h
deleted file mode 100644
index fa16466ef3f9..000000000000
--- a/include/asm-mn10300/exceptions.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* MN10300 Microcontroller core exceptions
- *
- * Copyright (C) 2007 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_EXCEPTIONS_H
-#define _ASM_EXCEPTIONS_H
-
-#include <linux/linkage.h>
-
-/*
- * define the breakpoint instruction opcode to use
- * - note that the JTAG unit steals 0xFF, so we want to avoid that if we can
- *   (can use 0xF7)
- */
-#define GDBSTUB_BKPT            0xFF
-
-#ifndef __ASSEMBLY__
-
-/*
- * enumeration of exception codes (as extracted from TBR MSW)
- */
-enum exception_code {
-        EXCEP_RESET             = 0x000000,     /* reset */
-
-        /* MMU exceptions */
-        EXCEP_ITLBMISS          = 0x000100,     /* instruction TLB miss */
-        EXCEP_DTLBMISS          = 0x000108,     /* data TLB miss */
-        EXCEP_IAERROR           = 0x000110,     /* instruction address */
-        EXCEP_DAERROR           = 0x000118,     /* data address */
-
-        /* system exceptions */
-        EXCEP_TRAP              = 0x000128,     /* program interrupt (PI instruction) */
-        EXCEP_ISTEP             = 0x000130,     /* single step */
-        EXCEP_IBREAK            = 0x000150,     /* instruction breakpoint */
-        EXCEP_OBREAK            = 0x000158,     /* operand breakpoint */
-        EXCEP_PRIVINS           = 0x000160,     /* privileged instruction execution */
-        EXCEP_UNIMPINS          = 0x000168,     /* unimplemented instruction execution */
-        EXCEP_UNIMPEXINS        = 0x000170,     /* unimplemented extended instruction execution */
-        EXCEP_MEMERR            = 0x000178,     /* illegal memory access */
-        EXCEP_MISALIGN          = 0x000180,     /* misalignment */
-        EXCEP_BUSERROR          = 0x000188,     /* bus error */
-        EXCEP_ILLINSACC         = 0x000190,     /* illegal instruction access */
-        EXCEP_ILLDATACC         = 0x000198,     /* illegal data access */
-        EXCEP_IOINSACC          = 0x0001a0,     /* I/O space instruction access */
-        EXCEP_PRIVINSACC        = 0x0001a8,     /* privileged space instruction access */
-        EXCEP_PRIVDATACC        = 0x0001b0,     /* privileged space data access */
-        EXCEP_DATINSACC         = 0x0001b8,     /* data space instruction access */
-        EXCEP_DOUBLE_FAULT      = 0x000200,     /* double fault */
-
-        /* FPU exceptions */
-        EXCEP_FPU_DISABLED      = 0x0001c0,     /* FPU disabled */
-        EXCEP_FPU_UNIMPINS      = 0x0001c8,     /* FPU unimplemented operation */
-        EXCEP_FPU_OPERATION     = 0x0001d0,     /* FPU operation */
-
-        /* interrupts */
-        EXCEP_WDT               = 0x000240,     /* watchdog timer overflow */
-        EXCEP_NMI               = 0x000248,     /* non-maskable interrupt */
-        EXCEP_IRQ_LEVEL0        = 0x000280,     /* level 0 maskable interrupt */
-        EXCEP_IRQ_LEVEL1        = 0x000288,     /* level 1 maskable interrupt */
-        EXCEP_IRQ_LEVEL2        = 0x000290,     /* level 2 maskable interrupt */
-        EXCEP_IRQ_LEVEL3        = 0x000298,     /* level 3 maskable interrupt */
-        EXCEP_IRQ_LEVEL4        = 0x0002a0,     /* level 4 maskable interrupt */
-        EXCEP_IRQ_LEVEL5        = 0x0002a8,     /* level 5 maskable interrupt */
-        EXCEP_IRQ_LEVEL6        = 0x0002b0,     /* level 6 maskable interrupt */
-
-        /* system calls */
-        EXCEP_SYSCALL0          = 0x000300,     /* system call 0 */
-        EXCEP_SYSCALL1          = 0x000308,     /* system call 1 */
-        EXCEP_SYSCALL2          = 0x000310,     /* system call 2 */
-        EXCEP_SYSCALL3          = 0x000318,     /* system call 3 */
-        EXCEP_SYSCALL4          = 0x000320,     /* system call 4 */
-        EXCEP_SYSCALL5          = 0x000328,     /* system call 5 */
-        EXCEP_SYSCALL6          = 0x000330,     /* system call 6 */
-        EXCEP_SYSCALL7          = 0x000338,     /* system call 7 */
-        EXCEP_SYSCALL8          = 0x000340,     /* system call 8 */
-        EXCEP_SYSCALL9          = 0x000348,     /* system call 9 */
-        EXCEP_SYSCALL10         = 0x000350,     /* system call 10 */
-        EXCEP_SYSCALL11         = 0x000358,     /* system call 11 */
-        EXCEP_SYSCALL12         = 0x000360,     /* system call 12 */
-        EXCEP_SYSCALL13         = 0x000368,     /* system call 13 */
-        EXCEP_SYSCALL14         = 0x000370,     /* system call 14 */
-        EXCEP_SYSCALL15         = 0x000378,     /* system call 15 */
-};
-
-extern void __set_intr_stub(enum exception_code code, void *handler);
-extern void set_intr_stub(enum exception_code code, void *handler);
-extern void set_jtag_stub(enum exception_code code, void *handler);
-
-struct pt_regs;
-
-extern asmlinkage void __common_exception(void);
-extern asmlinkage void itlb_miss(void);
-extern asmlinkage void dtlb_miss(void);
-extern asmlinkage void itlb_aerror(void);
-extern asmlinkage void dtlb_aerror(void);
-extern asmlinkage void raw_bus_error(void);
-extern asmlinkage void double_fault(void);
-extern asmlinkage int  system_call(struct pt_regs *);
-extern asmlinkage void fpu_exception(struct pt_regs *, enum exception_code);
-extern asmlinkage void nmi(struct pt_regs *, enum exception_code);
-extern asmlinkage void uninitialised_exception(struct pt_regs *,
-                                               enum exception_code);
-extern asmlinkage void irq_handler(void);
-extern asmlinkage void profile_handler(void);
-extern asmlinkage void nmi_handler(void);
-extern asmlinkage void misalignment(struct pt_regs *, enum exception_code);
-
-extern void die(const char *, struct pt_regs *, enum exception_code)
-        ATTRIB_NORET;
-
-extern int die_if_no_fixup(const char *, struct pt_regs *, enum exception_code);
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_EXCEPTIONS_H */
diff --git a/include/asm-mn10300/fb.h b/include/asm-mn10300/fb.h
deleted file mode 100644
index 697b24a91e1a..000000000000
--- a/include/asm-mn10300/fb.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* MN10300 Frame buffer stuff
- *
- * Copyright (C) 2007 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_FB_H
-#define _ASM_FB_H
-
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H */
diff --git a/include/asm-mn10300/fcntl.h b/include/asm-mn10300/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-mn10300/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-mn10300/fpu.h b/include/asm-mn10300/fpu.h
deleted file mode 100644
index 64a2b83a7a6a..000000000000
--- a/include/asm-mn10300/fpu.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* MN10300 FPU definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * Derived from include/asm-i386/i387.h: Copyright (C) 1994 Linus Torvalds
- *
- * 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_FPU_H
-#define _ASM_FPU_H
-
-#include <asm/processor.h>
-#include <asm/sigcontext.h>
-#include <asm/user.h>
-
-#ifdef __KERNEL__
-
-/* the task that owns the FPU state */
-extern struct task_struct *fpu_state_owner;
-
-#define set_using_fpu(tsk)                              \
-do {                                                    \
-        (tsk)->thread.fpu_flags |= THREAD_USING_FPU;    \
-} while (0)
-
-#define clear_using_fpu(tsk)                            \
-do {                                                    \
-        (tsk)->thread.fpu_flags &= ~THREAD_USING_FPU;   \
-} while (0)
-
-#define is_using_fpu(tsk) ((tsk)->thread.fpu_flags & THREAD_USING_FPU)
-
-#define unlazy_fpu(tsk)                                 \
-do {                                                    \
-        preempt_disable();                              \
-        if (fpu_state_owner == (tsk))                   \
-                fpu_save(&tsk->thread.fpu_state);       \
-        preempt_enable();                               \
-} while (0)
-
-#define exit_fpu()                              \
-do {                                            \
-        struct task_struct *__tsk = current;    \
-        preempt_disable();                      \
-        if (fpu_state_owner == __tsk)           \
-                fpu_state_owner = NULL;         \
-        preempt_enable();                       \
-} while (0)
-
-#define flush_fpu()                                     \
-do {                                                    \
-        struct task_struct *__tsk = current;            \
-        preempt_disable();                              \
-        if (fpu_state_owner == __tsk) {                 \
-                fpu_state_owner = NULL;                 \
-                __tsk->thread.uregs->epsw &= ~EPSW_FE;  \
-        }                                               \
-        preempt_enable();                               \
-        clear_using_fpu(__tsk);                         \
-} while (0)
-
-extern asmlinkage void fpu_init_state(void);
-extern asmlinkage void fpu_kill_state(struct task_struct *);
-extern asmlinkage void fpu_disabled(struct pt_regs *, enum exception_code);
-extern asmlinkage void fpu_exception(struct pt_regs *, enum exception_code);
-
-#ifdef CONFIG_FPU
-extern asmlinkage void fpu_save(struct fpu_state_struct *);
-extern asmlinkage void fpu_restore(struct fpu_state_struct *);
-#else
-#define fpu_save(a)
-#define fpu_restore(a)
-#endif /* CONFIG_FPU  */
-
-/*
- * signal frame handlers
- */
-extern int fpu_setup_sigcontext(struct fpucontext *buf);
-extern int fpu_restore_sigcontext(struct fpucontext *buf);
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_FPU_H */
diff --git a/include/asm-mn10300/frame.inc b/include/asm-mn10300/frame.inc
deleted file mode 100644
index 5b1949bdf039..000000000000
--- a/include/asm-mn10300/frame.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/* MN10300 Microcontroller core system register definitions -*- asm -*-
- *
- * Copyright (C) 2007 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_FRAME_INC
-#define _ASM_FRAME_INC
-
-#ifndef __ASSEMBLY__
-#error not for use in C files
-#endif
-
-#ifndef __ASM_OFFSETS_H__
-#include <asm/asm-offsets.h>
-#endif
-
-#define pi break
-
-#define fp a3
-
-###############################################################################
-#
-# build a stack frame from the registers
-# - the caller has subtracted 4 from SP before coming here
-#
-###############################################################################
-.macro SAVE_ALL
-        add     -4,sp                           # next exception frame ptr save area
-        movm    [other],(sp)
-        mov     usp,a1
-        mov     a1,(sp)                         # USP in MOVM[other] dummy slot
-        movm    [d2,d3,a2,a3,exreg0,exreg1,exother],(sp)
-        mov     sp,fp                           # FRAME pointer in A3
-        add     -12,sp                          # allow for calls to be made
-        mov     (__frame),a1
-        mov     a1,(REG_NEXT,fp)
-        mov     fp,(__frame)
-
-        and     ~EPSW_FE,epsw                   # disable the FPU inside the kernel
-
-        # we may be holding current in E2
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-        mov     (__current),e2
-#endif
-.endm
-
-###############################################################################
-#
-# restore the registers from a stack frame
-#
-###############################################################################
-.macro RESTORE_ALL
-        # peel back the stack to the calling frame
-        # - this permits execve() to discard extra frames due to kernel syscalls
-        mov     (__frame),fp
-        mov     fp,sp
-        mov     (REG_NEXT,fp),d0                # userspace has regs->next == 0
-        mov     d0,(__frame)
-
-#ifndef CONFIG_MN10300_USING_JTAG
-        mov     (REG_EPSW,fp),d0
-        btst    EPSW_T,d0
-        beq     99f
-
-        or      EPSW_NMID,epsw
-        movhu   (DCR),d1
-        or      0x0001, d1
-        movhu   d1,(DCR)
-
-99:
-#endif
-        movm    (sp),[d2,d3,a2,a3,exreg0,exreg1,exother]
-
-        # must restore usp even if returning to kernel space,
-        # when CONFIG_PREEMPT is enabled.
-        mov     (sp),a1                         # USP in MOVM[other] dummy slot
-        mov     a1,usp
-
-        movm    (sp),[other]
-        add     8,sp
-        rti
-
-.endm
-
-
-#endif /* _ASM_FRAME_INC */
diff --git a/include/asm-mn10300/futex.h b/include/asm-mn10300/futex.h
deleted file mode 100644
index 0b745828f42b..000000000000
--- a/include/asm-mn10300/futex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/futex.h>
diff --git a/include/asm-mn10300/gdb-stub.h b/include/asm-mn10300/gdb-stub.h
deleted file mode 100644
index e5a6368559af..000000000000
--- a/include/asm-mn10300/gdb-stub.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* MN10300 Kernel GDB stub definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from asm-mips/gdb-stub.h (c) 1995 Andreas Busse
- *
- * 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_GDB_STUB_H
-#define _ASM_GDB_STUB_H
-
-#include <asm/exceptions.h>
-
-/*
- * register ID numbers in GDB remote protocol
- */
-
-#define GDB_REGID_PC            9
-#define GDB_REGID_FP            7
-#define GDB_REGID_SP            8
-
-/*
- * virtual stack layout for the GDB exception handler
- */
-#define NUMREGS                 64
-
-#define GDB_FR_D0               (0 * 4)
-#define GDB_FR_D1               (1 * 4)
-#define GDB_FR_D2               (2 * 4)
-#define GDB_FR_D3               (3 * 4)
-#define GDB_FR_A0               (4 * 4)
-#define GDB_FR_A1               (5 * 4)
-#define GDB_FR_A2               (6 * 4)
-#define GDB_FR_A3               (7 * 4)
-
-#define GDB_FR_SP               (8 * 4)
-#define GDB_FR_PC               (9 * 4)
-#define GDB_FR_MDR              (10 * 4)
-#define GDB_FR_EPSW             (11 * 4)
-#define GDB_FR_LIR              (12 * 4)
-#define GDB_FR_LAR              (13 * 4)
-#define GDB_FR_MDRQ             (14 * 4)
-
-#define GDB_FR_E0               (15 * 4)
-#define GDB_FR_E1               (16 * 4)
-#define GDB_FR_E2               (17 * 4)
-#define GDB_FR_E3               (18 * 4)
-#define GDB_FR_E4               (19 * 4)
-#define GDB_FR_E5               (20 * 4)
-#define GDB_FR_E6               (21 * 4)
-#define GDB_FR_E7               (22 * 4)
-
-#define GDB_FR_SSP              (23 * 4)
-#define GDB_FR_MSP              (24 * 4)
-#define GDB_FR_USP              (25 * 4)
-#define GDB_FR_MCRH             (26 * 4)
-#define GDB_FR_MCRL             (27 * 4)
-#define GDB_FR_MCVF             (28 * 4)
-
-#define GDB_FR_FPCR             (29 * 4)
-#define GDB_FR_DUMMY0           (30 * 4)
-#define GDB_FR_DUMMY1           (31 * 4)
-
-#define GDB_FR_FS0              (32 * 4)
-
-#define GDB_FR_SIZE             (NUMREGS * 4)
-
-#ifndef __ASSEMBLY__
-
-/*
- * This is the same as above, but for the high-level
- * part of the GDB stub.
- */
-
-struct gdb_regs {
-        /* saved main processor registers */
-        u32     d0, d1, d2, d3, a0, a1, a2, a3;
-        u32     sp, pc, mdr, epsw, lir, lar, mdrq;
-        u32     e0, e1, e2, e3, e4, e5, e6, e7;
-        u32     ssp, msp, usp, mcrh, mcrl, mcvf;
-
-        /* saved floating point registers */
-        u32     fpcr, _dummy0, _dummy1;
-        u32     fs0,  fs1,  fs2,  fs3,  fs4,  fs5,  fs6,  fs7;
-        u32     fs8,  fs9,  fs10, fs11, fs12, fs13, fs14, fs15;
-        u32     fs16, fs17, fs18, fs19, fs20, fs21, fs22, fs23;
-        u32     fs24, fs25, fs26, fs27, fs28, fs29, fs30, fs31;
-};
-
-/*
- * Prototypes
- */
-extern void show_registers_only(struct pt_regs *regs);
-
-extern asmlinkage void gdbstub_init(void);
-extern asmlinkage void gdbstub_exit(int status);
-extern asmlinkage void gdbstub_io_init(void);
-extern asmlinkage void gdbstub_io_set_baud(unsigned baud);
-extern asmlinkage int  gdbstub_io_rx_char(unsigned char *_ch, int nonblock);
-extern asmlinkage void gdbstub_io_tx_char(unsigned char ch);
-extern asmlinkage void gdbstub_io_tx_flush(void);
-
-extern asmlinkage void gdbstub_io_rx_handler(void);
-extern asmlinkage void gdbstub_rx_irq(struct pt_regs *, enum exception_code);
-extern asmlinkage int  gdbstub_intercept(struct pt_regs *, enum exception_code);
-extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code);
-extern asmlinkage void __gdbstub_bug_trap(void);
-extern asmlinkage void __gdbstub_pause(void);
-extern asmlinkage void start_kernel(void);
-
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-extern asmlinkage void gdbstub_purge_cache(void);
-#else
-#define gdbstub_purge_cache()   do {} while (0)
-#endif
-
-/* Used to prevent crashes in memory access */
-extern asmlinkage int  gdbstub_read_byte(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_read_word(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_read_dword(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_write_byte(u32, u8 *);
-extern asmlinkage int  gdbstub_write_word(u32, u8 *);
-extern asmlinkage int  gdbstub_write_dword(u32, u8 *);
-
-extern asmlinkage void gdbstub_read_byte_guard(void);
-extern asmlinkage void gdbstub_read_byte_cont(void);
-extern asmlinkage void gdbstub_read_word_guard(void);
-extern asmlinkage void gdbstub_read_word_cont(void);
-extern asmlinkage void gdbstub_read_dword_guard(void);
-extern asmlinkage void gdbstub_read_dword_cont(void);
-extern asmlinkage void gdbstub_write_byte_guard(void);
-extern asmlinkage void gdbstub_write_byte_cont(void);
-extern asmlinkage void gdbstub_write_word_guard(void);
-extern asmlinkage void gdbstub_write_word_cont(void);
-extern asmlinkage void gdbstub_write_dword_guard(void);
-extern asmlinkage void gdbstub_write_dword_cont(void);
-
-extern u8       gdbstub_rx_buffer[PAGE_SIZE];
-extern u32      gdbstub_rx_inp;
-extern u32      gdbstub_rx_outp;
-extern u8       gdbstub_rx_overflow;
-extern u8       gdbstub_busy;
-extern u8       gdbstub_rx_unget;
-
-#ifdef CONFIG_GDBSTUB_DEBUGGING
-extern void gdbstub_printk(const char *fmt, ...)
-        __attribute__((format(printf, 1, 2)));
-#else
-static inline __attribute__((format(printf, 1, 2)))
-void gdbstub_printk(const char *fmt, ...)
-{
-}
-#endif
-
-#ifdef CONFIG_GDBSTUB_DEBUG_ENTRY
-#define gdbstub_entry(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_entry(FMT, ...) ({ 0; })
-#endif
-
-#ifdef CONFIG_GDBSTUB_DEBUG_PROTOCOL
-#define gdbstub_proto(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_proto(FMT, ...) ({ 0; })
-#endif
-
-#ifdef CONFIG_GDBSTUB_DEBUG_IO
-#define gdbstub_io(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_io(FMT, ...) ({ 0; })
-#endif
-
-#ifdef CONFIG_GDBSTUB_DEBUG_BREAKPOINT
-#define gdbstub_bkpt(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_bkpt(FMT, ...) ({ 0; })
-#endif
-
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_GDB_STUB_H */
diff --git a/include/asm-mn10300/hardirq.h b/include/asm-mn10300/hardirq.h
deleted file mode 100644
index 54d950117674..000000000000
--- a/include/asm-mn10300/hardirq.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* MN10300 Hardware IRQ statistics and management
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified 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_HARDIRQ_H
-#define _ASM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-#include <asm/exceptions.h>
-
-/* assembly code in softirq.h is sensitive to the offsets of these fields */
-typedef struct {
-        unsigned int    __softirq_pending;
-        unsigned long   idle_timestamp;
-        unsigned int    __nmi_count;    /* arch dependent */
-        unsigned int    __irq_count;    /* arch dependent */
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-
-extern void ack_bad_irq(int irq);
-
-/*
- * manipulate stubs in the MN10300 CPU Trap/Interrupt Vector table
- * - these should jump to __common_exception in entry.S unless there's a good
- *   reason to do otherwise (see trap_preinit() in traps.c)
- */
-typedef void (*intr_stub_fnx)(struct pt_regs *regs,
-                              enum exception_code intcode);
-
-/*
- * manipulate pointers in the Exception table (see entry.S)
- * - these are indexed by decoding the lower 24 bits of the TBR register
- * - note that the MN103E010 doesn't always trap through the correct vector,
- *   but does always set the TBR correctly
- */
-extern asmlinkage void set_excp_vector(enum exception_code code,
-                                       intr_stub_fnx handler);
-
-#endif /* _ASM_HARDIRQ_H */
diff --git a/include/asm-mn10300/highmem.h b/include/asm-mn10300/highmem.h
deleted file mode 100644
index 5256854c0453..000000000000
--- a/include/asm-mn10300/highmem.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* MN10300 Virtual kernel memory mappings for high memory
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/highmem.h
- *
- * 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_HIGHMEM_H
-#define _ASM_HIGHMEM_H
-
-#ifdef __KERNEL__
-
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <asm/kmap_types.h>
-#include <asm/pgtable.h>
-
-/* undef for production */
-#undef HIGHMEM_DEBUG
-
-/* declarations for highmem.c */
-extern unsigned long highstart_pfn, highend_pfn;
-
-extern pte_t *kmap_pte;
-extern pgprot_t kmap_prot;
-extern pte_t *pkmap_page_table;
-
-extern void __init kmap_init(void);
-
-/*
- * Right now we initialize only a single pte table. It can be extended
- * easily, subsequent pte tables have to be allocated in one physical
- * chunk of RAM.
- */
-#define PKMAP_BASE      0xfe000000UL
-#define LAST_PKMAP      1024
-#define LAST_PKMAP_MASK (LAST_PKMAP - 1)
-#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)
-#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
-
-extern unsigned long kmap_high(struct page *page);
-extern void kunmap_high(struct page *page);
-
-static inline unsigned long kmap(struct page *page)
-{
-        if (in_interrupt())
-                BUG();
-        if (page < highmem_start_page)
-                return page_address(page);
-        return kmap_high(page);
-}
-
-static inline void kunmap(struct page *page)
-{
-        if (in_interrupt())
-                BUG();
-        if (page < highmem_start_page)
-                return;
-        kunmap_high(page);
-}
-
-/*
- * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
- * gives a more generic (and caching) interface. But kmap_atomic can
- * be used in IRQ contexts, so in some (very limited) cases we need
- * it.
- */
-static inline unsigned long kmap_atomic(struct page *page, enum km_type type)
-{
-        enum fixed_addresses idx;
-        unsigned long vaddr;
-
-        if (page < highmem_start_page)
-                return page_address(page);
-
-        idx = type + KM_TYPE_NR * smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-#if HIGHMEM_DEBUG
-        if (!pte_none(*(kmap_pte - idx)))
-                BUG();
-#endif
-        set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));
-        __flush_tlb_one(vaddr);
-
-        return vaddr;
-}
-
-static inline void kunmap_atomic(unsigned long vaddr, enum km_type type)
-{
-#if HIGHMEM_DEBUG
-        enum fixed_addresses idx = type + KM_TYPE_NR * smp_processor_id();
-
-        if (vaddr < FIXADDR_START) /* FIXME */
-                return;
-
-        if (vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx))
-                BUG();
-
-        /*
-         * force other mappings to Oops if they'll try to access
-         * this pte without first remap it
-         */
-        pte_clear(kmap_pte - idx);
-        __flush_tlb_one(vaddr);
-#endif
-}
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_HIGHMEM_H */
diff --git a/include/asm-mn10300/hw_irq.h b/include/asm-mn10300/hw_irq.h
deleted file mode 100644
index 70619901098e..000000000000
--- a/include/asm-mn10300/hw_irq.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MN10300 Hardware interrupt definitions
- *
- * Copyright (C) 2007 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_HW_IRQ_H
-#define _ASM_HW_IRQ_H
-
-#endif /* _ASM_HW_IRQ_H */
diff --git a/include/asm-mn10300/ide.h b/include/asm-mn10300/ide.h
deleted file mode 100644
index 6adcdd92e83d..000000000000
--- a/include/asm-mn10300/ide.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* MN10300 Arch-specific IDE code
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/ide.h
- *
- * 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_IDE_H
-#define _ASM_IDE_H
-
-#ifdef __KERNEL__
-
-#include <asm/intctl-regs.h>
-
-#undef SUPPORT_SLOW_DATA_PORTS
-#define SUPPORT_SLOW_DATA_PORTS 0
-
-#undef SUPPORT_VLB_SYNC
-#define SUPPORT_VLB_SYNC 0
-
-/*
- * some bits needed for parts of the IDE subsystem to compile
- */
-#define __ide_mm_insw(port, addr, n) \
-        insw((unsigned long) (port), (addr), (n))
-#define __ide_mm_insl(port, addr, n) \
-        insl((unsigned long) (port), (addr), (n))
-#define __ide_mm_outsw(port, addr, n) \
-        outsw((unsigned long) (port), (addr), (n))
-#define __ide_mm_outsl(port, addr, n) \
-        outsl((unsigned long) (port), (addr), (n))
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_IDE_H */
diff --git a/include/asm-mn10300/intctl-regs.h b/include/asm-mn10300/intctl-regs.h
deleted file mode 100644
index ba544c796c5a..000000000000
--- a/include/asm-mn10300/intctl-regs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* MN10300 On-board interrupt controller registers
- *
- * Copyright (C) 2007 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_INTCTL_REGS_H
-#define _ASM_INTCTL_REGS_H
-
-#include <asm/cpu-regs.h>
-
-#ifdef __KERNEL__
-
-/* interrupt controller registers */
-#define GxICR(X)                __SYSREG(0xd4000000 + (X) * 4, u16)     /* group irq ctrl regs */
-
-#define IAGR                    __SYSREG(0xd4000100, u16)       /* intr acceptance group reg */
-#define IAGR_GN                 0x00fc          /* group number register
-                                                 * (documentation _has_ to be wrong)
-                                                 */
-
-#define EXTMD                   __SYSREG(0xd4000200, u16)       /* external pin intr spec reg */
-#define GET_XIRQ_TRIGGER(X) ((EXTMD >> ((X) * 2)) & 3)
-
-#define SET_XIRQ_TRIGGER(X,Y)                   \
-do {                                            \
-        u16 x = EXTMD;                          \
-        x &= ~(3 << ((X) * 2));                 \
-        x |= ((Y) & 3) << ((X) * 2);            \
-        EXTMD = x;                              \
-} while (0)
-
-#define XIRQ_TRIGGER_LOWLEVEL   0
-#define XIRQ_TRIGGER_HILEVEL    1
-#define XIRQ_TRIGGER_NEGEDGE    2
-#define XIRQ_TRIGGER_POSEDGE    3
-
-/* non-maskable interrupt control */
-#define NMIIRQ                  0
-#define NMICR                   GxICR(NMIIRQ)   /* NMI control register */
-#define NMICR_NMIF              0x0001          /* NMI pin interrupt flag */
-#define NMICR_WDIF              0x0002          /* watchdog timer overflow flag */
-#define NMICR_ABUSERR           0x0008          /* async bus error flag */
-
-/* maskable interrupt control */
-#define GxICR_DETECT            0x0001          /* interrupt detect flag */
-#define GxICR_REQUEST           0x0010          /* interrupt request flag */
-#define GxICR_ENABLE            0x0100          /* interrupt enable flag */
-#define GxICR_LEVEL             0x7000          /* interrupt priority level */
-#define GxICR_LEVEL_0           0x0000          /* - level 0 */
-#define GxICR_LEVEL_1           0x1000          /* - level 1 */
-#define GxICR_LEVEL_2           0x2000          /* - level 2 */
-#define GxICR_LEVEL_3           0x3000          /* - level 3 */
-#define GxICR_LEVEL_4           0x4000          /* - level 4 */
-#define GxICR_LEVEL_5           0x5000          /* - level 5 */
-#define GxICR_LEVEL_6           0x6000          /* - level 6 */
-#define GxICR_LEVEL_SHIFT       12
-
-#ifndef __ASSEMBLY__
-extern void set_intr_level(int irq, u16 level);
-extern void set_intr_postackable(int irq);
-#endif
-
-/* external interrupts */
-#define XIRQxICR(X)             GxICR((X))      /* external interrupt control regs */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_INTCTL_REGS_H */
diff --git a/include/asm-mn10300/io.h b/include/asm-mn10300/io.h
deleted file mode 100644
index c1a4119e6497..000000000000
--- a/include/asm-mn10300/io.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* MN10300 I/O port emulation and memory-mapped I/O
- *
- * Copyright (C) 2007 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_IO_H
-#define _ASM_IO_H
-
-#include <asm/page.h> /* I/O is all done through memory accesses */
-#include <asm/cpu-regs.h>
-#include <asm/cacheflush.h>
-
-#define mmiowb() do {} while (0)
-
-/*****************************************************************************/
-/*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the x86 architecture, we just read/write the
- * memory location directly.
- */
-static inline u8 readb(const volatile void __iomem *addr)
-{
-        return *(const volatile u8 *) addr;
-}
-
-static inline u16 readw(const volatile void __iomem *addr)
-{
-        return *(const volatile u16 *) addr;
-}
-
-static inline u32 readl(const volatile void __iomem *addr)
-{
-        return *(const volatile u32 *) addr;
-}
-
-#define __raw_readb readb
-#define __raw_readw readw
-#define __raw_readl readl
-
-#define readb_relaxed readb
-#define readw_relaxed readw
-#define readl_relaxed readl
-
-static inline void writeb(u8 b, volatile void __iomem *addr)
-{
-        *(volatile u8 *) addr = b;
-}
-
-static inline void writew(u16 b, volatile void __iomem *addr)
-{
-        *(volatile u16 *) addr = b;
-}
-
-static inline void writel(u32 b, volatile void __iomem *addr)
-{
-        *(volatile u32 *) addr = b;
-}
-
-#define __raw_writeb writeb
-#define __raw_writew writew
-#define __raw_writel writel
-
-/*****************************************************************************/
-/*
- * traditional input/output functions
- */
-static inline u8 inb_local(unsigned long addr)
-{
-        return readb((volatile void __iomem *) addr);
-}
-
-static inline void outb_local(u8 b, unsigned long addr)
-{
-        return writeb(b, (volatile void __iomem *) addr);
-}
-
-static inline u8 inb(unsigned long addr)
-{
-        return readb((volatile void __iomem *) addr);
-}
-
-static inline u16 inw(unsigned long addr)
-{
-        return readw((volatile void __iomem *) addr);
-}
-
-static inline u32 inl(unsigned long addr)
-{
-        return readl((volatile void __iomem *) addr);
-}
-
-static inline void outb(u8 b, unsigned long addr)
-{
-        return writeb(b, (volatile void __iomem *) addr);
-}
-
-static inline void outw(u16 b, unsigned long addr)
-{
-        return writew(b, (volatile void __iomem *) addr);
-}
-
-static inline void outl(u32 b, unsigned long addr)
-{
-        return writel(b, (volatile void __iomem *) addr);
-}
-
-#define inb_p(addr)     inb(addr)
-#define inw_p(addr)     inw(addr)
-#define inl_p(addr)     inl(addr)
-#define outb_p(x, addr) outb((x), (addr))
-#define outw_p(x, addr) outw((x), (addr))
-#define outl_p(x, addr) outl((x), (addr))
-
-static inline void insb(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u8 *buf = buffer;
-                do {
-                        u8 x = inb(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-
-static inline void insw(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u16 *buf = buffer;
-                do {
-                        u16 x = inw(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-
-static inline void insl(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u32 *buf = buffer;
-                do {
-                        u32 x = inl(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-
-static inline void outsb(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u8 *buf = buffer;
-                do {
-                        outb(*buf++, addr);
-                } while (--count);
-        }
-}
-
-static inline void outsw(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u16 *buf = buffer;
-                do {
-                        outw(*buf++, addr);
-                } while (--count);
-        }
-}
-
-extern void __outsl(unsigned long addr, const void *buffer, int count);
-static inline void outsl(unsigned long addr, const void *buffer, int count)
-{
-        if ((unsigned long) buffer & 0x3)
-                return __outsl(addr, buffer, count);
-
-        if (count) {
-                const u32 *buf = buffer;
-                do {
-                        outl(*buf++, addr);
-                } while (--count);
-        }
-}
-
-#define ioread8(addr)           readb(addr)
-#define ioread16(addr)          readw(addr)
-#define ioread32(addr)          readl(addr)
-
-#define iowrite8(v, addr)       writeb((v), (addr))
-#define iowrite16(v, addr)      writew((v), (addr))
-#define iowrite32(v, addr)      writel((v), (addr))
-
-#define ioread8_rep(p, dst, count) \
-        insb((unsigned long) (p), (dst), (count))
-#define ioread16_rep(p, dst, count) \
-        insw((unsigned long) (p), (dst), (count))
-#define ioread32_rep(p, dst, count) \
-        insl((unsigned long) (p), (dst), (count))
-
-#define iowrite8_rep(p, src, count) \
-        outsb((unsigned long) (p), (src), (count))
-#define iowrite16_rep(p, src, count) \
-        outsw((unsigned long) (p), (src), (count))
-#define iowrite32_rep(p, src, count) \
-        outsl((unsigned long) (p), (src), (count))
-
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#ifdef __KERNEL__
-
-#include <linux/vmalloc.h>
-#define __io_virt(x) ((void *) (x))
-
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
-static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
-{
-}
-
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are pretty trivial
- */
-static inline unsigned long virt_to_phys(volatile void *address)
-{
-        return __pa(address);
-}
-
-static inline void *phys_to_virt(unsigned long address)
-{
-        return __va(address);
-}
-
-/*
- * Change "struct page" to physical address.
- */
-static inline void *__ioremap(unsigned long offset, unsigned long size,
-                              unsigned long flags)
-{
-        return (void *) offset;
-}
-
-static inline void *ioremap(unsigned long offset, unsigned long size)
-{
-        return (void *) offset;
-}
-
-/*
- * This one maps high address device memory and turns off caching for that
- * area.  it's useful if some control registers are in such an area and write
- * combining or read caching is not desirable:
- */
-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
-{
-        return (void *) (offset | 0x20000000);
-}
-
-#define ioremap_wc ioremap_nocache
-
-static inline void iounmap(void *addr)
-{
-}
-
-static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-        return (void __iomem *) port;
-}
-
-static inline void ioport_unmap(void __iomem *p)
-{
-}
-
-#define xlate_dev_kmem_ptr(p)   ((void *) (p))
-#define xlate_dev_mem_ptr(p)    ((void *) (p))
-
-/*
- * PCI bus iomem addresses must be in the region 0x80000000-0x9fffffff
- */
-static inline unsigned long virt_to_bus(volatile void *address)
-{
-        return ((unsigned long) address) & ~0x20000000;
-}
-
-static inline void *bus_to_virt(unsigned long address)
-{
-        return (void *) address;
-}
-
-#define page_to_bus page_to_phys
-
-#define memset_io(a, b, c)      memset(__io_virt(a), (b), (c))
-#define memcpy_fromio(a, b, c)  memcpy((a), __io_virt(b), (c))
-#define memcpy_toio(a, b, c)    memcpy(__io_virt(a), (b), (c))
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_IO_H */
diff --git a/include/asm-mn10300/ioctl.h b/include/asm-mn10300/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-mn10300/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-mn10300/ioctls.h b/include/asm-mn10300/ioctls.h
deleted file mode 100644
index dcbfb452974f..000000000000
--- a/include/asm-mn10300/ioctls.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _ASM_IOCTLS_H
-#define _ASM_IOCTLS_H
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T', 0x2A, struct termios2)
-#define TCSETS2         _IOW('T', 0x2B, struct termios2)
-#define TCSETSW2        _IOW('T', 0x2C, struct termios2)
-#define TCSETSF2        _IOW('T', 0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T', 0x30, unsigned int) /* Get Pty Number
-                                                       * (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T', 0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX        0x5450
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
-#define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
-#define FIOQSIZE        0x5460
-
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#endif /* _ASM_IOCTLS_H */
diff --git a/include/asm-mn10300/ipc.h b/include/asm-mn10300/ipc.h
deleted file mode 100644
index a46e3d9c2a3f..000000000000
--- a/include/asm-mn10300/ipc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
diff --git a/include/asm-mn10300/ipcbuf.h b/include/asm-mn10300/ipcbuf.h
deleted file mode 100644
index f6f63d448272..000000000000
--- a/include/asm-mn10300/ipcbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASM_IPCBUF_H
-#define _ASM_IPCBUF_H
-
-/*
- * The ipc64_perm structure for MN10300 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* _ASM_IPCBUF_H */
diff --git a/include/asm-mn10300/irq.h b/include/asm-mn10300/irq.h
deleted file mode 100644
index 53b380116901..000000000000
--- a/include/asm-mn10300/irq.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MN10300 Hardware interrupt definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/irq.h:
- *   - (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
- *
- * 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_IRQ_H
-#define _ASM_IRQ_H
-
-#include <asm/intctl-regs.h>
-#include <asm/reset-regs.h>
-#include <asm/proc/irq.h>
-
-/* this number is used when no interrupt has been assigned */
-#define NO_IRQ          INT_MAX
-
-/* hardware irq numbers */
-#define NR_IRQS         GxICR_NUM_IRQS
-
-/* external hardware irq numbers */
-#define NR_XIRQS        GxICR_NUM_XIRQS
-
-#define irq_canonicalize(IRQ) (IRQ)
-
-#endif /* _ASM_IRQ_H */
diff --git a/include/asm-mn10300/irq_regs.h b/include/asm-mn10300/irq_regs.h
deleted file mode 100644
index a848cd232eb4..000000000000
--- a/include/asm-mn10300/irq_regs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* MN10300 IRQ registers pointer definition
- *
- * Copyright (C) 2007 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_IRQ_REGS_H
-#define _ASM_IRQ_REGS_H
-
-/*
- * Per-cpu current frame pointer - the location of the last exception frame on
- * the stack
- */
-#define ARCH_HAS_OWN_IRQ_REGS
-
-#ifndef __ASSEMBLY__
-#define get_irq_regs() (__frame)
-#endif
-
-#endif /* _ASM_IRQ_REGS_H */
diff --git a/include/asm-mn10300/kdebug.h b/include/asm-mn10300/kdebug.h
deleted file mode 100644
index 0f47e112190c..000000000000
--- a/include/asm-mn10300/kdebug.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MN10300 In-kernel death knells
- *
- * Copyright (C) 2007 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_KDEBUG_H
-#define _ASM_KDEBUG_H
-
-/* Grossly misnamed. */
-enum die_val {
-        DIE_OOPS = 1,
-        DIE_BREAKPOINT,
-        DIE_GPF,
-};
-
-#endif /* _ASM_KDEBUG_H */
diff --git a/include/asm-mn10300/kmap_types.h b/include/asm-mn10300/kmap_types.h
deleted file mode 100644
index 3398f9f35603..000000000000
--- a/include/asm-mn10300/kmap_types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* MN10300 kmap_atomic() slot IDs
- *
- * Copyright (C) 2007 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_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
-
-#endif /* _ASM_KMAP_TYPES_H */
diff --git a/include/asm-mn10300/kprobes.h b/include/asm-mn10300/kprobes.h
deleted file mode 100644
index c800b590183a..000000000000
--- a/include/asm-mn10300/kprobes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* MN10300 Kernel Probes support
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by Mark Salter (msalter@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.
- *
- * 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 Licence for more details.
- *
- * You should have received a copy of the GNU General Public Licence
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-#ifndef _ASM_KPROBES_H
-#define _ASM_KPROBES_H
-
-#include <linux/types.h>
-#include <linux/ptrace.h>
-
-struct kprobe;
-
-typedef unsigned char kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xff
-#define MAX_INSN_SIZE 8
-#define MAX_STACK_SIZE 128
-
-/* Architecture specific copy of original instruction */
-struct arch_specific_insn {
-        /*  copy of original instruction
-         */
-        kprobe_opcode_t insn[MAX_INSN_SIZE];
-};
-
-extern const int kretprobe_blacklist_size;
-
-extern int kprobe_exceptions_notify(struct notifier_block *self,
-                                    unsigned long val, void *data);
-
-#define flush_insn_slot(p)  do {} while (0)
-
-extern void arch_remove_kprobe(struct kprobe *p);
-
-#endif /* _ASM_KPROBES_H */
diff --git a/include/asm-mn10300/linkage.h b/include/asm-mn10300/linkage.h
deleted file mode 100644
index dda3002a5dfa..000000000000
--- a/include/asm-mn10300/linkage.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Linkage and calling-convention overrides
- *
- * Copyright (C) 2007 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_LINKAGE_H
-#define _ASM_LINKAGE_H
-
-/* don't override anything */
-#define asmlinkage
-
-#define __ALIGN         .align 4,0xcb
-#define __ALIGN_STR     ".align 4,0xcb"
-
-#endif
diff --git a/include/asm-mn10300/local.h b/include/asm-mn10300/local.h
deleted file mode 100644
index c11c530f74d0..000000000000
--- a/include/asm-mn10300/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/include/asm-mn10300/mc146818rtc.h b/include/asm-mn10300/mc146818rtc.h
deleted file mode 100644
index df6bc6e0e8c6..000000000000
--- a/include/asm-mn10300/mc146818rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/rtc-regs.h>
diff --git a/include/asm-mn10300/mman.h b/include/asm-mn10300/mman.h
deleted file mode 100644
index b7986b65addf..000000000000
--- a/include/asm-mn10300/mman.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* MN10300 Constants for mmap and co.
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * - Derived from asm-x86/mman.h
- *
- * 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_MMAN_H
-#define _ASM_MMAN_H
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MAP_LOCKED      0x2000          /* pages are locked */
-#define MAP_NORESERVE   0x4000          /* don't check for reservations */
-#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
-
-#endif /* _ASM_MMAN_H */
diff --git a/include/asm-mn10300/mmu.h b/include/asm-mn10300/mmu.h
deleted file mode 100644
index 2d2d097e7309..000000000000
--- a/include/asm-mn10300/mmu.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MN10300 Memory management context
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-frv/mmu.h
- */
-
-#ifndef _ASM_MMU_H
-#define _ASM_MMU_H
-
-/*
- * MMU context
- */
-typedef struct {
-        unsigned long   tlbpid[NR_CPUS];        /* TLB PID for this process on
-                                                 * each CPU */
-} mm_context_t;
-
-#endif /* _ASM_MMU_H */
diff --git a/include/asm-mn10300/mmu_context.h b/include/asm-mn10300/mmu_context.h
deleted file mode 100644
index a9e2e34f69b0..000000000000
--- a/include/asm-mn10300/mmu_context.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* MN10300 MMU context management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m32r/mmu_context.h
- *
- * 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.
- *
- *
- * This implements an algorithm to provide TLB PID mappings to provide
- * selective access to the TLB for processes, thus reducing the number of TLB
- * flushes required.
- *
- * Note, however, that the M32R algorithm is technically broken as it does not
- * handle version wrap-around, and could, theoretically, have a problem with a
- * very long lived program that sleeps long enough for the version number to
- * wrap all the way around so that its TLB mappings appear valid once again.
- */
-#ifndef _ASM_MMU_CONTEXT_H
-#define _ASM_MMU_CONTEXT_H
-
-#include <asm/atomic.h>
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-#include <asm-generic/mm_hooks.h>
-
-#define MMU_CONTEXT_TLBPID_MASK         0x000000ffUL
-#define MMU_CONTEXT_VERSION_MASK        0xffffff00UL
-#define MMU_CONTEXT_FIRST_VERSION       0x00000100UL
-#define MMU_NO_CONTEXT                  0x00000000UL
-
-extern unsigned long mmu_context_cache[NR_CPUS];
-#define mm_context(mm)  (mm->context.tlbpid[smp_processor_id()])
-
-#define enter_lazy_tlb(mm, tsk) do {} while (0)
-
-#ifdef CONFIG_SMP
-#define cpu_ran_vm(cpu, task) \
-        cpu_set((cpu), (task)->cpu_vm_mask)
-#define cpu_maybe_ran_vm(cpu, task) \
-        cpu_test_and_set((cpu), (task)->cpu_vm_mask)
-#else
-#define cpu_ran_vm(cpu, task)           do {} while (0)
-#define cpu_maybe_ran_vm(cpu, task)     true
-#endif /* CONFIG_SMP */
-
-/*
- * allocate an MMU context
- */
-static inline unsigned long allocate_mmu_context(struct mm_struct *mm)
-{
-        unsigned long *pmc = &mmu_context_cache[smp_processor_id()];
-        unsigned long mc = ++(*pmc);
-
-        if (!(mc & MMU_CONTEXT_TLBPID_MASK)) {
-                /* we exhausted the TLB PIDs of this version on this CPU, so we
-                 * flush this CPU's TLB in its entirety and start new cycle */
-                flush_tlb_all();
-
-                /* fix the TLB version if needed (we avoid version #0 so as to
-                 * distingush MMU_NO_CONTEXT) */
-                if (!mc)
-                        *pmc = mc = MMU_CONTEXT_FIRST_VERSION;
-        }
-        mm_context(mm) = mc;
-        return mc;
-}
-
-/*
- * get an MMU context if one is needed
- */
-static inline unsigned long get_mmu_context(struct mm_struct *mm)
-{
-        unsigned long mc = MMU_NO_CONTEXT, cache;
-
-        if (mm) {
-                cache = mmu_context_cache[smp_processor_id()];
-                mc = mm_context(mm);
-
-                /* if we have an old version of the context, replace it */
-                if ((mc ^ cache) & MMU_CONTEXT_VERSION_MASK)
-                        mc = allocate_mmu_context(mm);
-        }
-        return mc;
-}
-
-/*
- * initialise the context related info for a new mm_struct instance
- */
-static inline int init_new_context(struct task_struct *tsk,
-                                   struct mm_struct *mm)
-{
-        int num_cpus = NR_CPUS, i;
-
-        for (i = 0; i < num_cpus; i++)
-                mm->context.tlbpid[i] = MMU_NO_CONTEXT;
-        return 0;
-}
-
-/*
- * destroy context related info for an mm_struct that is about to be put to
- * rest
- */
-#define destroy_context(mm)     do { } while (0)
-
-/*
- * after we have set current->mm to a new value, this activates the context for
- * the new mm so we see the new mappings.
- */
-static inline void activate_context(struct mm_struct *mm, int cpu)
-{
-        PIDR = get_mmu_context(mm) & MMU_CONTEXT_TLBPID_MASK;
-}
-
-/*
- * change between virtual memory sets
- */
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
-                             struct task_struct *tsk)
-{
-        int cpu = smp_processor_id();
-
-        if (prev != next) {
-                cpu_ran_vm(cpu, next);
-                activate_context(next, cpu);
-                PTBR = (unsigned long) next->pgd;
-        } else if (!cpu_maybe_ran_vm(cpu, next)) {
-                activate_context(next, cpu);
-        }
-}
-
-#define deactivate_mm(tsk, mm)  do {} while (0)
-#define activate_mm(prev, next) switch_mm((prev), (next), NULL)
-
-#endif /* _ASM_MMU_CONTEXT_H */
diff --git a/include/asm-mn10300/module.h b/include/asm-mn10300/module.h
deleted file mode 100644
index 5d7057d01494..000000000000
--- a/include/asm-mn10300/module.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MN10300 Arch-specific module definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by Mark Salter (msalter@redhat.com)
- * Derived from include/asm-i386/module.h
- *
- * 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_MODULE_H
-#define _ASM_MODULE_H
-
-struct mod_arch_specific {
-};
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-
-/*
- * Include the MN10300 architecture version.
- */
-#define MODULE_ARCH_VERMAGIC __stringify(PROCESSOR_MODEL_NAME) " "
-
-#endif /* _ASM_MODULE_H */
diff --git a/include/asm-mn10300/msgbuf.h b/include/asm-mn10300/msgbuf.h
deleted file mode 100644
index 8b602450cc4a..000000000000
--- a/include/asm-mn10300/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _ASM_MSGBUF_H
-#define _ASM_MSGBUF_H
-
-/*
- * The msqid64_ds structure for MN10300 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm       msg_perm;
-        __kernel_time_t         msg_stime;      /* last msgsnd time */
-        unsigned long           __unused1;
-        __kernel_time_t         msg_rtime;      /* last msgrcv time */
-        unsigned long           __unused2;
-        __kernel_time_t         msg_ctime;      /* last change time */
-        unsigned long           __unused3;
-        unsigned long           msg_cbytes;     /* current number of bytes on queue */
-        unsigned long           msg_qnum;       /* number of messages in queue */
-        unsigned long           msg_qbytes;     /* max number of bytes on queue */
-        __kernel_pid_t          msg_lspid;      /* pid of last msgsnd */
-        __kernel_pid_t          msg_lrpid;      /* last receive pid */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-#endif /* _ASM_MSGBUF_H */
diff --git a/include/asm-mn10300/mutex.h b/include/asm-mn10300/mutex.h
deleted file mode 100644
index 84f5490c6fb4..000000000000
--- a/include/asm-mn10300/mutex.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 Mutex fastpath
- *
- * Copyright (C) 2007 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.
- *
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-#include <asm-generic/mutex-null.h>
diff --git a/include/asm-mn10300/nmi.h b/include/asm-mn10300/nmi.h
deleted file mode 100644
index f3671cbbc117..000000000000
--- a/include/asm-mn10300/nmi.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MN10300 NMI handling
- *
- * Copyright (C) 2007 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_NMI_H
-#define _ASM_NMI_H
-
-#endif /* _ASM_NMI_H */
diff --git a/include/asm-mn10300/page.h b/include/asm-mn10300/page.h
deleted file mode 100644
index 8288e124165b..000000000000
--- a/include/asm-mn10300/page.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* MN10300 Page table definitions
- *
- * Copyright (C) 2007 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_PAGE_H
-#define _ASM_PAGE_H
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
-
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-#define PAGE_MASK       (~(PAGE_SIZE - 1))
-#else
-#define PAGE_SIZE       +(1 << PAGE_SHIFT)      /* unary plus marks an
-                                                 * immediate val not an addr */
-#define PAGE_MASK       +(~(PAGE_SIZE - 1))
-#endif
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-#define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
-#define copy_page(to, from)     memcpy((void *)(to), (void *)(from), PAGE_SIZE)
-
-#define clear_user_page(addr, vaddr, page)      clear_page(addr)
-#define copy_user_page(vto, vfrom, vaddr, to)   copy_page(vto, vfrom)
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-
-#define PTE_MASK        PAGE_MASK
-#define HPAGE_SHIFT     22
-
-#ifdef CONFIG_HUGETLB_PAGE
-#define HPAGE_SIZE              ((1UL) << HPAGE_SHIFT)
-#define HPAGE_MASK              (~(HPAGE_SIZE - 1))
-#define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT - PAGE_SHIFT)
-#endif
-
-#define pte_val(x)      ((x).pte)
-#define pgd_val(x)      ((x).pgd)
-#define pgprot_val(x)   ((x).pgprot)
-
-#define __pte(x)        ((pte_t) { (x) })
-#define __pgd(x)        ((pgd_t) { (x) })
-#define __pgprot(x)     ((pgprot_t) { (x) })
-
-#include <asm-generic/pgtable-nopmd.h>
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * This handles the memory map.. We could make this a config
- * option, but too many people screw it up, and too few need
- * it.
- *
- * A __PAGE_OFFSET of 0xC0000000 means that the kernel has
- * a virtual address space of one gigabyte, which limits the
- * amount of physical memory you can use to about 950MB.
- */
-
-#ifndef __ASSEMBLY__
-
-/* Pure 2^n version of get_order */
-static inline int get_order(unsigned long size) __attribute__((const));
-static inline int get_order(unsigned long size)
-{
-        int order;
-
-        size = (size - 1) >> (PAGE_SHIFT - 1);
-        order = -1;
-        do {
-                size >>= 1;
-                order++;
-        } while (size);
-        return order;
-}
-
-#endif /* __ASSEMBLY__ */
-
-#include <asm/page_offset.h>
-
-#define __PAGE_OFFSET           (PAGE_OFFSET_RAW)
-#define PAGE_OFFSET             ((unsigned long) __PAGE_OFFSET)
-
-/*
- * main RAM and kernel working space are coincident at 0x90000000, but to make
- * life more interesting, there's also an uncached virtual shadow at 0xb0000000
- * - these mappings are fixed in the MMU
- */
-#define __pfn_disp              (CONFIG_KERNEL_RAM_BASE_ADDRESS >> PAGE_SHIFT)
-
-#define __pa(x)                 ((unsigned long)(x))
-#define __va(x)                 ((void *)(unsigned long)(x))
-#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
-#define pfn_to_page(pfn)        (mem_map + ((pfn) - __pfn_disp))
-#define page_to_pfn(page)       ((unsigned long)((page) - mem_map) + __pfn_disp)
-
-#define pfn_valid(pfn)                                  \
-({                                                      \
-        unsigned long __pfn = (pfn) - __pfn_disp;       \
-        __pfn < max_mapnr;                              \
-})
-
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-
-#define VM_DATA_DEFAULT_FLAGS \
-        (VM_READ | VM_WRITE | \
-        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_PAGE_H */
diff --git a/include/asm-mn10300/page_offset.h b/include/asm-mn10300/page_offset.h
deleted file mode 100644
index 8eb5b16ad86b..000000000000
--- a/include/asm-mn10300/page_offset.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MN10300 Kernel base address
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- */
-#ifndef _ASM_PAGE_OFFSET_H
-#define _ASM_PAGE_OFFSET_H
-
-#define PAGE_OFFSET_RAW CONFIG_KERNEL_RAM_BASE_ADDRESS
-
-#endif
diff --git a/include/asm-mn10300/param.h b/include/asm-mn10300/param.h
deleted file mode 100644
index 789b1df41fcb..000000000000
--- a/include/asm-mn10300/param.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN10300 Kernel parameters
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_PARAM_H
-#define _ASM_PARAM_H
-
-#ifdef __KERNEL__
-#define HZ              CONFIG_HZ       /* Internal kernel timer frequency */
-#define USER_HZ         100             /* .. some user interfaces are in
-                                         * "ticks" */
-#define CLOCKS_PER_SEC  (USER_HZ)       /* like times() */
-#endif
-
-#ifndef HZ
-#define HZ              100
-#endif
-
-#define EXEC_PAGESIZE   4096
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-#define COMMAND_LINE_SIZE 256
-
-#endif /* _ASM_PARAM_H */
diff --git a/include/asm-mn10300/pci.h b/include/asm-mn10300/pci.h
deleted file mode 100644
index cd9cc5c89cea..000000000000
--- a/include/asm-mn10300/pci.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* MN10300 PCI definitions
- *
- * Copyright (C) 2007 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_PCI_H
-#define _ASM_PCI_H
-
-#ifdef __KERNEL__
-#include <linux/mm.h>           /* for struct page */
-
-#if 0
-#define __pcbdebug(FMT, ADDR, ...) \
-        printk(KERN_DEBUG "PCIBRIDGE[%08x]: "FMT"\n", \
-               (u32)(ADDR), ##__VA_ARGS__)
-
-#define __pcidebug(FMT, BUS, DEVFN, WHERE,...)          \
-do {                                                    \
-        printk(KERN_DEBUG "PCI[%02x:%02x.%x + %02x]: "FMT"\n",  \
-               (BUS)->number,                                   \
-               PCI_SLOT(DEVFN),                                 \
-               PCI_FUNC(DEVFN),                                 \
-               (u32)(WHERE), ##__VA_ARGS__);                    \
-} while (0)
-
-#else
-#define __pcbdebug(FMT, ADDR, ...)              do {} while (0)
-#define __pcidebug(FMT, BUS, DEVFN, WHERE, ...) do {} while (0)
-#endif
-
-/* Can be used to override the logic in pci_scan_bus for skipping
- * already-configured bus numbers - to be used for buggy BIOSes or
- * architectures with incomplete PCI setup by the loader */
-
-#ifdef CONFIG_PCI
-#define pcibios_assign_all_busses()     1
-extern void unit_pci_init(void);
-#else
-#define pcibios_assign_all_busses()     0
-#endif
-
-extern unsigned long pci_mem_start;
-#define PCIBIOS_MIN_IO          0xBE000004
-#define PCIBIOS_MIN_MEM         0xB8000000
-
-void pcibios_set_master(struct pci_dev *dev);
-void pcibios_penalize_isa_irq(int irq);
-
-/* Dynamic DMA mapping stuff.
- * i386 has everything mapped statically.
- */
-
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/scatterlist.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-
-struct pci_dev;
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)    (0)
-
-/* Return the index of the PCI controller for device. */
-static inline int pci_controller_num(struct pci_dev *dev)
-{
-        return 0;
-}
-
-#define HAVE_PCI_MMAP
-extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                               enum pci_mmap_state mmap_state,
-                               int write_combine);
-
-#endif /* __KERNEL__ */
-
-/* implement the pci_ DMA API in terms of the generic device dma_ one */
-#include <asm-generic/pci-dma-compat.h>
-
-/**
- * pcibios_resource_to_bus - convert resource to PCI bus address
- * @dev: device which owns this resource
- * @region: converted bus-centric region (start,end)
- * @res: resource to convert
- *
- * Convert a resource to a PCI device bus address or bus window.
- */
-extern void pcibios_resource_to_bus(struct pci_dev *dev,
-                                    struct pci_bus_region *region,
-                                    struct resource *res);
-
-extern void pcibios_bus_to_resource(struct pci_dev *dev,
-                                    struct resource *res,
-                                    struct pci_bus_region *region);
-
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
-        struct resource *root = NULL;
-
-        if (res->flags & IORESOURCE_IO)
-                root = &ioport_resource;
-        if (res->flags & IORESOURCE_MEM)
-                root = &iomem_resource;
-
-        return root;
-}
-
-#define pcibios_scan_all_fns(a, b)      0
-
-#endif /* _ASM_PCI_H */
diff --git a/include/asm-mn10300/percpu.h b/include/asm-mn10300/percpu.h
deleted file mode 100644
index 06a959d67234..000000000000
--- a/include/asm-mn10300/percpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/percpu.h>
diff --git a/include/asm-mn10300/pgalloc.h b/include/asm-mn10300/pgalloc.h
deleted file mode 100644
index ec057e1bd4cf..000000000000
--- a/include/asm-mn10300/pgalloc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* MN10300 Page and page table/directory allocation
- *
- * Copyright (C) 2007 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_PGALLOC_H
-#define _ASM_PGALLOC_H
-
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <linux/threads.h>
-#include <linux/mm.h>           /* for struct page */
-
-struct mm_struct;
-struct page;
-
-/* attach a page table to a PMD entry */
-#define pmd_populate_kernel(mm, pmd, pte) \
-        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE))
-
-static inline
-void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
-{
-        set_pmd(pmd, __pmd((page_to_pfn(pte) << PAGE_SHIFT) | _PAGE_TABLE));
-}
-#define pmd_pgtable(pmd) pmd_page(pmd)
-
-/*
- * Allocate and free page tables.
- */
-
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(struct mm_struct *, pgd_t *);
-
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
-extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
-
-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
-{
-        free_page((unsigned long) pte);
-}
-
-static inline void pte_free(struct mm_struct *mm, struct page *pte)
-{
-        __free_page(pte);
-}
-
-
-#define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte))
-
-#endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-mn10300/pgtable.h b/include/asm-mn10300/pgtable.h
deleted file mode 100644
index 6dc30fc827c4..000000000000
--- a/include/asm-mn10300/pgtable.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/* MN10300 Page table manipulators and constants
- *
- * Copyright (C) 2007 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.
- *
- *
- * The Linux memory management assumes a three-level page table setup. On
- * the i386, we use that, but "fold" the mid level into the top-level page
- * table, so that we physically have the same two-level page table as the
- * i386 mmu expects.
- *
- * This file contains the functions and defines necessary to modify and use
- * the i386 page table tree for the purposes of the MN10300 TLB handler
- * functions.
- */
-#ifndef _ASM_PGTABLE_H
-#define _ASM_PGTABLE_H
-
-#include <asm/cpu-regs.h>
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <linux/threads.h>
-
-#include <asm/bitops.h>
-
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-extern unsigned long empty_zero_page[1024];
-extern spinlock_t pgd_lock;
-extern struct page *pgd_list;
-
-extern void pmd_ctor(void *, struct kmem_cache *, unsigned long);
-extern void pgtable_cache_init(void);
-extern void paging_init(void);
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * The Linux mn10300 paging architecture only implements both the traditional
- * 2-level page tables
- */
-#define PGDIR_SHIFT     22
-#define PTRS_PER_PGD    1024
-#define PTRS_PER_PUD    1       /* we don't really have any PUD physically */
-#define PTRS_PER_PMD    1       /* we don't really have any PMD physically */
-#define PTRS_PER_PTE    1024
-
-#define PGD_SIZE        PAGE_SIZE
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE - 1))
-
-#define USER_PTRS_PER_PGD       (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-
-#define USER_PGD_PTRS           (PAGE_OFFSET >> PGDIR_SHIFT)
-#define KERNEL_PGD_PTRS         (PTRS_PER_PGD - USER_PGD_PTRS)
-
-#define TWOLEVEL_PGDIR_SHIFT    22
-#define BOOT_USER_PGD_PTRS      (__PAGE_OFFSET >> TWOLEVEL_PGDIR_SHIFT)
-#define BOOT_KERNEL_PGD_PTRS    (1024 - BOOT_USER_PGD_PTRS)
-
-#ifndef __ASSEMBLY__
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-#endif
-
-/*
- * Unfortunately, due to the way the MMU works on the MN10300, the vmalloc VM
- * area has to be in the lower half of the virtual address range (the upper
- * half is not translated through the TLB).
- *
- * So in this case, the vmalloc area goes at the bottom of the address map
- * (leaving a hole at the very bottom to catch addressing errors), and
- * userspace starts immediately above.
- *
- * The vmalloc() routines also leaves a hole of 4kB between each vmalloced
- * area to catch addressing errors.
- */
-#define VMALLOC_OFFSET  (8 * 1024 * 1024)
-#define VMALLOC_START   (0x70000000)
-#define VMALLOC_END     (0x7C000000)
-
-#ifndef __ASSEMBLY__
-extern pte_t kernel_vmalloc_ptes[(VMALLOC_END - VMALLOC_START) / PAGE_SIZE];
-#endif
-
-/* IPTEL/DPTEL bit assignments */
-#define _PAGE_BIT_VALID         xPTEL_V_BIT
-#define _PAGE_BIT_ACCESSED      xPTEL_UNUSED1_BIT       /* mustn't be loaded into IPTEL/DPTEL */
-#define _PAGE_BIT_NX            xPTEL_UNUSED2_BIT       /* mustn't be loaded into IPTEL/DPTEL */
-#define _PAGE_BIT_CACHE         xPTEL_C_BIT
-#define _PAGE_BIT_PRESENT       xPTEL_PV_BIT
-#define _PAGE_BIT_DIRTY         xPTEL_D_BIT
-#define _PAGE_BIT_GLOBAL        xPTEL_G_BIT
-
-#define _PAGE_VALID             xPTEL_V
-#define _PAGE_ACCESSED          xPTEL_UNUSED1
-#define _PAGE_NX                xPTEL_UNUSED2           /* no-execute bit */
-#define _PAGE_CACHE             xPTEL_C
-#define _PAGE_PRESENT           xPTEL_PV
-#define _PAGE_DIRTY             xPTEL_D
-#define _PAGE_PROT              xPTEL_PR
-#define _PAGE_PROT_RKNU         xPTEL_PR_ROK
-#define _PAGE_PROT_WKNU         xPTEL_PR_RWK
-#define _PAGE_PROT_RKRU         xPTEL_PR_ROK_ROU
-#define _PAGE_PROT_WKRU         xPTEL_PR_RWK_ROU
-#define _PAGE_PROT_WKWU         xPTEL_PR_RWK_RWU
-#define _PAGE_GLOBAL            xPTEL_G
-#define _PAGE_PSE               xPTEL_PS_4Mb            /* 4MB page */
-
-#define _PAGE_FILE              xPTEL_UNUSED1_BIT       /* set:pagecache unset:swap */
-
-#define __PAGE_PROT_UWAUX       0x040
-#define __PAGE_PROT_USER        0x080
-#define __PAGE_PROT_WRITE       0x100
-
-#define _PAGE_PRESENTV          (_PAGE_PRESENT|_PAGE_VALID)
-#define _PAGE_PROTNONE          0x000   /* If not present */
-
-#ifndef __ASSEMBLY__
-
-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
-
-#define _PAGE_TABLE     (_PAGE_PRESENTV | _PAGE_PROT_WKNU | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-
-#define __PAGE_NONE     (_PAGE_PRESENTV | _PAGE_PROT_RKNU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_SHARED   (_PAGE_PRESENTV | _PAGE_PROT_WKWU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_COPY     (_PAGE_PRESENTV | _PAGE_PROT_RKRU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_READONLY (_PAGE_PRESENTV | _PAGE_PROT_RKRU | _PAGE_ACCESSED | _PAGE_CACHE)
-
-#define PAGE_NONE               __pgprot(__PAGE_NONE     | _PAGE_NX)
-#define PAGE_SHARED_NOEXEC      __pgprot(__PAGE_SHARED   | _PAGE_NX)
-#define PAGE_COPY_NOEXEC        __pgprot(__PAGE_COPY     | _PAGE_NX)
-#define PAGE_READONLY_NOEXEC    __pgprot(__PAGE_READONLY | _PAGE_NX)
-#define PAGE_SHARED_EXEC        __pgprot(__PAGE_SHARED)
-#define PAGE_COPY_EXEC          __pgprot(__PAGE_COPY)
-#define PAGE_READONLY_EXEC      __pgprot(__PAGE_READONLY)
-#define PAGE_COPY               PAGE_COPY_NOEXEC
-#define PAGE_READONLY           PAGE_READONLY_NOEXEC
-#define PAGE_SHARED             PAGE_SHARED_EXEC
-
-#define __PAGE_KERNEL_BASE (_PAGE_PRESENTV | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
-
-#define __PAGE_KERNEL           (__PAGE_KERNEL_BASE | _PAGE_PROT_WKNU | _PAGE_CACHE | _PAGE_NX)
-#define __PAGE_KERNEL_NOCACHE   (__PAGE_KERNEL_BASE | _PAGE_PROT_WKNU | _PAGE_NX)
-#define __PAGE_KERNEL_EXEC      (__PAGE_KERNEL & ~_PAGE_NX)
-#define __PAGE_KERNEL_RO        (__PAGE_KERNEL_BASE | _PAGE_PROT_RKNU | _PAGE_CACHE | _PAGE_NX)
-#define __PAGE_KERNEL_LARGE     (__PAGE_KERNEL | _PAGE_PSE)
-#define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
-
-#define PAGE_KERNEL             __pgprot(__PAGE_KERNEL)
-#define PAGE_KERNEL_RO          __pgprot(__PAGE_KERNEL_RO)
-#define PAGE_KERNEL_EXEC        __pgprot(__PAGE_KERNEL_EXEC)
-#define PAGE_KERNEL_NOCACHE     __pgprot(__PAGE_KERNEL_NOCACHE)
-#define PAGE_KERNEL_LARGE       __pgprot(__PAGE_KERNEL_LARGE)
-#define PAGE_KERNEL_LARGE_EXEC  __pgprot(__PAGE_KERNEL_LARGE_EXEC)
-
-/*
- * Whilst the MN10300 can do page protection for execute (given separate data
- * and insn TLBs), we are not supporting it at the moment. Write permission,
- * however, always implies read permission (but not execute permission).
- */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY_NOEXEC
-#define __P010  PAGE_COPY_NOEXEC
-#define __P011  PAGE_COPY_NOEXEC
-#define __P100  PAGE_READONLY_EXEC
-#define __P101  PAGE_READONLY_EXEC
-#define __P110  PAGE_COPY_EXEC
-#define __P111  PAGE_COPY_EXEC
-
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY_NOEXEC
-#define __S010  PAGE_SHARED_NOEXEC
-#define __S011  PAGE_SHARED_NOEXEC
-#define __S100  PAGE_READONLY_EXEC
-#define __S101  PAGE_READONLY_EXEC
-#define __S110  PAGE_SHARED_EXEC
-#define __S111  PAGE_SHARED_EXEC
-
-/*
- * Define this to warn about kernel memory accesses that are
- * done without a 'verify_area(VERIFY_WRITE,..)'
- */
-#undef TEST_VERIFY_AREA
-
-#define pte_present(x)  (pte_val(x) & _PAGE_VALID)
-#define pte_clear(mm, addr, xp)                         \
-do {                                                    \
-        set_pte_at((mm), (addr), (xp), __pte(0));       \
-} while (0)
-
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (!pmd_none(x))
-#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
-#define pmd_bad(x)      0
-
-
-#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT))
-
-#ifndef __ASSEMBLY__
-
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-static inline int pte_user(pte_t pte)   { return pte_val(pte) & __PAGE_PROT_USER; }
-static inline int pte_read(pte_t pte)   { return pte_val(pte) & __PAGE_PROT_USER; }
-static inline int pte_dirty(pte_t pte)  { return pte_val(pte) & _PAGE_DIRTY; }
-static inline int pte_young(pte_t pte)  { return pte_val(pte) & _PAGE_ACCESSED; }
-static inline int pte_write(pte_t pte)  { return pte_val(pte) & __PAGE_PROT_WRITE; }
-static inline int pte_special(pte_t pte){ return 0; }
-
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)   { return pte_val(pte) & _PAGE_FILE; }
-
-static inline pte_t pte_rdprotect(pte_t pte)
-{
-        pte_val(pte) &= ~(__PAGE_PROT_USER|__PAGE_PROT_UWAUX); return pte;
-}
-static inline pte_t pte_exprotect(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_NX; return pte;
-}
-
-static inline pte_t pte_wrprotect(pte_t pte)
-{
-        pte_val(pte) &= ~(__PAGE_PROT_WRITE|__PAGE_PROT_UWAUX); return pte;
-}
-
-static inline pte_t pte_mkclean(pte_t pte)      { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { pte_val(pte) |= _PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkexec(pte_t pte)       { pte_val(pte) &= ~_PAGE_NX; return pte; }
-
-static inline pte_t pte_mkread(pte_t pte)
-{
-        pte_val(pte) |= __PAGE_PROT_USER;
-        if (pte_write(pte))
-                pte_val(pte) |= __PAGE_PROT_UWAUX;
-        return pte;
-}
-static inline pte_t pte_mkwrite(pte_t pte)
-{
-        pte_val(pte) |= __PAGE_PROT_WRITE;
-        if (pte_val(pte) & __PAGE_PROT_USER)
-                pte_val(pte) |= __PAGE_PROT_UWAUX;
-        return pte;
-}
-
-static inline pte_t pte_mkspecial(pte_t pte)    { return pte; }
-
-#define pte_ERROR(e) \
-        printk(KERN_ERR "%s:%d: bad pte %08lx.\n", \
-               __FILE__, __LINE__, pte_val(e))
-#define pgd_ERROR(e) \
-        printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \
-               __FILE__, __LINE__, pgd_val(e))
-
-/*
- * The "pgd_xxx()" functions here are trivial for a folded two-level
- * setup: the pgd is never bad, and a pmd always exists (as it's folded
- * into the pgd entry)
- */
-#define pgd_clear(xp)                           do { } while (0)
-
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#define set_pte(pteptr, pteval)                 (*(pteptr) = pteval)
-#define set_pte_at(mm, addr, ptep, pteval)      set_pte((ptep), (pteval))
-#define set_pte_atomic(pteptr, pteval)          set_pte((pteptr), (pteval))
-
-/*
- * (pmds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
-
-#define ptep_get_and_clear(mm, addr, ptep) \
-        __pte(xchg(&(ptep)->pte, 0))
-#define pte_same(a, b)          (pte_val(a) == pte_val(b))
-#define pte_page(x)             pfn_to_page(pte_pfn(x))
-#define pte_none(x)             (!pte_val(x))
-#define pte_pfn(x)              ((unsigned long) (pte_val(x) >> PAGE_SHIFT))
-#define __pfn_addr(pfn)         ((pfn) << PAGE_SHIFT)
-#define pfn_pte(pfn, prot)      __pte(__pfn_addr(pfn) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)      __pmd(__pfn_addr(pfn) | pgprot_val(prot))
-
-/*
- * All present user pages are user-executable:
- */
-static inline int pte_exec(pte_t pte)
-{
-        return pte_user(pte);
-}
-
-/*
- * All present pages are kernel-executable:
- */
-static inline int pte_exec_kernel(pte_t pte)
-{
-        return 1;
-}
-
-/*
- * Bits 0 and 1 are taken, split up the 29 bits of offset
- * into this range:
- */
-#define PTE_FILE_MAX_BITS       29
-
-#define pte_to_pgoff(pte)       (pte_val(pte) >> 2)
-#define pgoff_to_pte(off)       __pte((off) << 2 | _PAGE_FILE)
-
-/* Encode and de-code a swap entry */
-#define __swp_type(x)                   (((x).val >> 2) & 0x3f)
-#define __swp_offset(x)                 ((x).val >> 8)
-#define __swp_entry(type, offset) \
-        ((swp_entry_t) { ((type) << 2) | ((offset) << 8) })
-#define __pte_to_swp_entry(pte)         ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)           __pte((x).val)
-
-static inline
-int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr,
-                              pte_t *ptep)
-{
-        if (!pte_dirty(*ptep))
-                return 0;
-        return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-}
-
-static inline
-int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr,
-                              pte_t *ptep)
-{
-        if (!pte_young(*ptep))
-                return 0;
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte);
-}
-
-static inline
-void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        pte_val(*ptep) &= ~(__PAGE_PROT_WRITE|__PAGE_PROT_UWAUX);
-}
-
-static inline void ptep_mkdirty(pte_t *ptep)
-{
-        set_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-}
-
-/*
- * Macro to mark a page protection value as "uncacheable".  On processors which
- * do not support it, this is a no-op.
- */
-#define pgprot_noncached(prot)  __pgprot(pgprot_val(prot) | _PAGE_CACHE)
-
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-#define mk_pte_huge(entry) \
-        ((entry).pte |= _PAGE_PRESENT | _PAGE_PSE | _PAGE_VALID)
-
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte_val(pte) &= _PAGE_CHG_MASK;
-        pte_val(pte) |= pgprot_val(newprot);
-        return pte;
-}
-
-#define page_pte(page)  page_pte_prot((page), __pgprot(0))
-
-#define pmd_page_kernel(pmd) \
-        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
-
-#define pmd_page(pmd)   pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
-
-#define pmd_large(pmd) \
-        ((pmd_val(pmd) & (_PAGE_PSE | _PAGE_PRESENT)) == \
-         (_PAGE_PSE | _PAGE_PRESENT))
-
-/*
- * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
- *
- * this macro returns the index of the entry in the pgd page which would
- * control the given virtual address
- */
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-
-/*
- * pgd_offset() returns a (pgd_t *)
- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
- */
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-
-/*
- * a shortcut which implies the use of the kernel's pgd, instead
- * of a process's
- */
-#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
-
-/*
- * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
- *
- * this macro returns the index of the entry in the pmd page which would
- * control the given virtual address
- */
-#define pmd_index(address) \
-        (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
-
-/*
- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
- *
- * this macro returns the index of the entry in the pte page which would
- * control the given virtual address
- */
-#define pte_index(address) \
-        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
-
-/*
- * Make a given kernel text page executable/non-executable.
- * Returns the previous executability setting of that page (which
- * is used to restore the previous state). Used by the SMP bootup code.
- * NOTE: this is an __init function for security reasons.
- */
-static inline int set_kernel_exec(unsigned long vaddr, int enable)
-{
-        return 0;
-}
-
-#define pte_offset_map(dir, address) \
-        ((pte_t *) page_address(pmd_page(*(dir))) + pte_index(address))
-#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
-#define pte_unmap(pte)          do {} while (0)
-#define pte_unmap_nested(pte)   do {} while (0)
-
-/*
- * The MN10300 has external MMU info in the form of a TLB: this is adapted from
- * the kernel page tables containing the necessary information by tlb-mn10300.S
- */
-extern void update_mmu_cache(struct vm_area_struct *vma,
-                             unsigned long address, pte_t pte);
-
-#endif /* !__ASSEMBLY__ */
-
-#define kern_addr_valid(addr)   (1)
-
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
-        remap_pfn_range((vma), (vaddr), (pfn), (size), (prot))
-
-#define MK_IOSPACE_PFN(space, pfn)      (pfn)
-#define GET_IOSPACE(pfn)                0
-#define GET_PFN(pfn)                    (pfn)
-
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTEP_MKDIRTY
-#define __HAVE_ARCH_PTE_SAME
-#include <asm-generic/pgtable.h>
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-mn10300/pio-regs.h b/include/asm-mn10300/pio-regs.h
deleted file mode 100644
index 96bc8182d0ba..000000000000
--- a/include/asm-mn10300/pio-regs.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* MN10300 On-board I/O port module registers
- *
- * Copyright (C) 2007 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_PIO_REGS_H
-#define _ASM_PIO_REGS_H
-
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-
-#ifdef __KERNEL__
-
-/* I/O port 0 */
-#define P0MD                    __SYSREG(0xdb000000, u16)       /* mode reg */
-#define P0MD_0                  0x0003  /* mask */
-#define P0MD_0_IN               0x0000  /* input mode */
-#define P0MD_0_OUT              0x0001  /* output mode */
-#define P0MD_0_TM0IO            0x0002  /* timer 0 I/O mode */
-#define P0MD_0_EYECLK           0x0003  /* test signal output (clock) */
-#define P0MD_1                  0x000c
-#define P0MD_1_IN               0x0000
-#define P0MD_1_OUT              0x0004
-#define P0MD_1_TM1IO            0x0008  /* timer 1 I/O mode */
-#define P0MD_1_EYED             0x000c  /* test signal output (data) */
-#define P0MD_2                  0x0030
-#define P0MD_2_IN               0x0000
-#define P0MD_2_OUT              0x0010
-#define P0MD_2_TM2IO            0x0020  /* timer 2 I/O mode */
-#define P0MD_3                  0x00c0
-#define P0MD_3_IN               0x0000
-#define P0MD_3_OUT              0x0040
-#define P0MD_3_TM3IO            0x0080  /* timer 3 I/O mode */
-#define P0MD_4                  0x0300
-#define P0MD_4_IN               0x0000
-#define P0MD_4_OUT              0x0100
-#define P0MD_4_TM4IO            0x0200  /* timer 4 I/O mode */
-#define P0MD_4_XCTS             0x0300  /* XCTS input for serial port 2 */
-#define P0MD_5                  0x0c00
-#define P0MD_5_IN               0x0000
-#define P0MD_5_OUT              0x0400
-#define P0MD_5_TM5IO            0x0800  /* timer 5 I/O mode */
-#define P0MD_6                  0x3000
-#define P0MD_6_IN               0x0000
-#define P0MD_6_OUT              0x1000
-#define P0MD_6_TM6IOA           0x2000  /* timer 6 I/O mode A */
-#define P0MD_7                  0xc000
-#define P0MD_7_IN               0x0000
-#define P0MD_7_OUT              0x4000
-#define P0MD_7_TM6IOB           0x8000  /* timer 6 I/O mode B */
-
-#define P0IN                    __SYSREG(0xdb000004, u8)        /* in reg */
-#define P0OUT                   __SYSREG(0xdb000008, u8)        /* out reg */
-
-#define P0TMIO                  __SYSREG(0xdb00000c, u8)        /* TM pin I/O control reg */
-#define P0TMIO_TM0_IN           0x00
-#define P0TMIO_TM0_OUT          0x01
-#define P0TMIO_TM1_IN           0x00
-#define P0TMIO_TM1_OUT          0x02
-#define P0TMIO_TM2_IN           0x00
-#define P0TMIO_TM2_OUT          0x04
-#define P0TMIO_TM3_IN           0x00
-#define P0TMIO_TM3_OUT          0x08
-#define P0TMIO_TM4_IN           0x00
-#define P0TMIO_TM4_OUT          0x10
-#define P0TMIO_TM5_IN           0x00
-#define P0TMIO_TM5_OUT          0x20
-#define P0TMIO_TM6A_IN          0x00
-#define P0TMIO_TM6A_OUT         0x40
-#define P0TMIO_TM6B_IN          0x00
-#define P0TMIO_TM6B_OUT         0x80
-
-/* I/O port 1 */
-#define P1MD                    __SYSREG(0xdb000100, u16)       /* mode reg */
-#define P1MD_0                  0x0003  /* mask */
-#define P1MD_0_IN               0x0000  /* input mode */
-#define P1MD_0_OUT              0x0001  /* output mode */
-#define P1MD_0_TM7IO            0x0002  /* timer 7 I/O mode */
-#define P1MD_0_ADTRG            0x0003  /* A/D converter trigger mode */
-#define P1MD_1                  0x000c
-#define P1MD_1_IN               0x0000
-#define P1MD_1_OUT              0x0004
-#define P1MD_1_TM8IO            0x0008  /* timer 8 I/O mode */
-#define P1MD_1_XDMR0            0x000c  /* DMA request input 0 mode */
-#define P1MD_2                  0x0030
-#define P1MD_2_IN               0x0000
-#define P1MD_2_OUT              0x0010
-#define P1MD_2_TM9IO            0x0020  /* timer 9 I/O mode */
-#define P1MD_2_XDMR1            0x0030  /* DMA request input 1 mode */
-#define P1MD_3                  0x00c0
-#define P1MD_3_IN               0x0000
-#define P1MD_3_OUT              0x0040
-#define P1MD_3_TM10IO           0x0080  /* timer 10 I/O mode */
-#define P1MD_3_FRQS0            0x00c0  /* CPU clock multiplier setting input 0 mode */
-#define P1MD_4                  0x0300
-#define P1MD_4_IN               0x0000
-#define P1MD_4_OUT              0x0100
-#define P1MD_4_TM11IO           0x0200  /* timer 11 I/O mode */
-#define P1MD_4_FRQS1            0x0300  /* CPU clock multiplier setting input 1 mode */
-
-#define P1IN                    __SYSREG(0xdb000104, u8)        /* in reg */
-#define P1OUT                   __SYSREG(0xdb000108, u8)        /* out reg */
-#define P1TMIO                  __SYSREG(0xdb00010c, u8)        /* TM pin I/O control reg */
-#define P1TMIO_TM11_IN          0x00
-#define P1TMIO_TM11_OUT         0x01
-#define P1TMIO_TM10_IN          0x00
-#define P1TMIO_TM10_OUT         0x02
-#define P1TMIO_TM9_IN           0x00
-#define P1TMIO_TM9_OUT          0x04
-#define P1TMIO_TM8_IN           0x00
-#define P1TMIO_TM8_OUT          0x08
-#define P1TMIO_TM7_IN           0x00
-#define P1TMIO_TM7_OUT          0x10
-
-/* I/O port 2 */
-#define P2MD                    __SYSREG(0xdb000200, u16)       /* mode reg */
-#define P2MD_0                  0x0003  /* mask */
-#define P2MD_0_IN               0x0000  /* input mode */
-#define P2MD_0_OUT              0x0001  /* output mode */
-#define P2MD_0_BOOTBW           0x0003  /* boot bus width selector mode */
-#define P2MD_1                  0x000c
-#define P2MD_1_IN               0x0000
-#define P2MD_1_OUT              0x0004
-#define P2MD_1_BOOTSEL          0x000c  /* boot device selector mode */
-#define P2MD_2                  0x0030
-#define P2MD_2_IN               0x0000
-#define P2MD_2_OUT              0x0010
-#define P2MD_3                  0x00c0
-#define P2MD_3_IN               0x0000
-#define P2MD_3_OUT              0x0040
-#define P2MD_3_CKIO             0x00c0  /* mode */
-#define P2MD_4                  0x0300
-#define P2MD_4_IN               0x0000
-#define P2MD_4_OUT              0x0100
-#define P2MD_4_CMOD             0x0300  /* mode */
-
-#define P2IN                    __SYSREG(0xdb000204, u8)        /* in reg */
-#define P2OUT                   __SYSREG(0xdb000208, u8)        /* out reg */
-#define P2TMIO                  __SYSREG(0xdb00020c, u8)        /* TM pin I/O control reg */
-
-/* I/O port 3 */
-#define P3MD                    __SYSREG(0xdb000300, u16)       /* mode reg */
-#define P3MD_0                  0x0003  /* mask */
-#define P3MD_0_IN               0x0000  /* input mode */
-#define P3MD_0_OUT              0x0001  /* output mode */
-#define P3MD_0_AFRXD            0x0002  /* AFR interface mode */
-#define P3MD_1                  0x000c
-#define P3MD_1_IN               0x0000
-#define P3MD_1_OUT              0x0004
-#define P3MD_1_AFTXD            0x0008  /* AFR interface mode */
-#define P3MD_2                  0x0030
-#define P3MD_2_IN               0x0000
-#define P3MD_2_OUT              0x0010
-#define P3MD_2_AFSCLK           0x0020  /* AFR interface mode */
-#define P3MD_3                  0x00c0
-#define P3MD_3_IN               0x0000
-#define P3MD_3_OUT              0x0040
-#define P3MD_3_AFFS             0x0080  /* AFR interface mode */
-#define P3MD_4                  0x0300
-#define P3MD_4_IN               0x0000
-#define P3MD_4_OUT              0x0100
-#define P3MD_4_AFEHC            0x0200  /* AFR interface mode */
-
-#define P3IN                    __SYSREG(0xdb000304, u8)        /* in reg */
-#define P3OUT                   __SYSREG(0xdb000308, u8)        /* out reg */
-
-/* I/O port 4 */
-#define P4MD                    __SYSREG(0xdb000400, u16)       /* mode reg */
-#define P4MD_0                  0x0003  /* mask */
-#define P4MD_0_IN               0x0000  /* input mode */
-#define P4MD_0_OUT              0x0001  /* output mode */
-#define P4MD_0_SCL0             0x0002  /* I2C/serial mode */
-#define P4MD_1                  0x000c
-#define P4MD_1_IN               0x0000
-#define P4MD_1_OUT              0x0004
-#define P4MD_1_SDA0             0x0008
-#define P4MD_2                  0x0030
-#define P4MD_2_IN               0x0000
-#define P4MD_2_OUT              0x0010
-#define P4MD_2_SCL1             0x0020
-#define P4MD_3                  0x00c0
-#define P4MD_3_IN               0x0000
-#define P4MD_3_OUT              0x0040
-#define P4MD_3_SDA1             0x0080
-#define P4MD_4                  0x0300
-#define P4MD_4_IN               0x0000
-#define P4MD_4_OUT              0x0100
-#define P4MD_4_SBO0             0x0200
-#define P4MD_5                  0x0c00
-#define P4MD_5_IN               0x0000
-#define P4MD_5_OUT              0x0400
-#define P4MD_5_SBO1             0x0800
-#define P4MD_6                  0x3000
-#define P4MD_6_IN               0x0000
-#define P4MD_6_OUT              0x1000
-#define P4MD_6_SBT0             0x2000
-#define P4MD_7                  0xc000
-#define P4MD_7_IN               0x0000
-#define P4MD_7_OUT              0x4000
-#define P4MD_7_SBT1             0x8000
-
-#define P4IN                    __SYSREG(0xdb000404, u8)        /* in reg */
-#define P4OUT                   __SYSREG(0xdb000408, u8)        /* out reg */
-
-/* I/O port 5 */
-#define P5MD                    __SYSREG(0xdb000500, u16)       /* mode reg */
-#define P5MD_0                  0x0003  /* mask */
-#define P5MD_0_IN               0x0000  /* input mode */
-#define P5MD_0_OUT              0x0001  /* output mode */
-#define P5MD_0_IRTXD            0x0002  /* IrDA mode */
-#define P5MD_0_SOUT             0x0004  /* serial mode */
-#define P5MD_1                  0x000c
-#define P5MD_1_IN               0x0000
-#define P5MD_1_OUT              0x0004
-#define P5MD_1_IRRXDS           0x0008  /* IrDA mode */
-#define P5MD_1_SIN              0x000c  /* serial mode */
-#define P5MD_2                  0x0030
-#define P5MD_2_IN               0x0000
-#define P5MD_2_OUT              0x0010
-#define P5MD_2_IRRXDF           0x0020  /* IrDA mode */
-
-#define P5IN                    __SYSREG(0xdb000504, u8)        /* in reg */
-#define P5OUT                   __SYSREG(0xdb000508, u8)        /* out reg */
-
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_PIO_REGS_H */
diff --git a/include/asm-mn10300/poll.h b/include/asm-mn10300/poll.h
deleted file mode 100644
index c98509d3149e..000000000000
--- a/include/asm-mn10300/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/include/asm-mn10300/posix_types.h b/include/asm-mn10300/posix_types.h
deleted file mode 100644
index 077567c37798..000000000000
--- a/include/asm-mn10300/posix_types.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* MN10300 POSIX types
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_POSIX_TYPES_H
-#define _ASM_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned long   __kernel_size_t;
-typedef long            __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
-
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
-typedef unsigned short  __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-        int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-        int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#undef  __FD_SET
-static inline void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
-}
-
-#undef  __FD_CLR
-static inline void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
-}
-
-
-#undef  __FD_ISSET
-static inline int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
-}
-
-/*
- * This will unroll the loop for the normal constant case (8 ints,
- * for a 256-bit fd_set)
- */
-#undef  __FD_ZERO
-static inline void __FD_ZERO(__kernel_fd_set *__p)
-{
-        unsigned long *__tmp = __p->fds_bits;
-        int __i;
-
-        if (__builtin_constant_p(__FDSET_LONGS)) {
-                switch (__FDSET_LONGS) {
-                case 16:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        __tmp[ 8] = 0; __tmp[ 9] = 0;
-                        __tmp[10] = 0; __tmp[11] = 0;
-                        __tmp[12] = 0; __tmp[13] = 0;
-                        __tmp[14] = 0; __tmp[15] = 0;
-                        return;
-
-                case 8:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        return;
-
-                case 4:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        return;
-                }
-        }
-        __i = __FDSET_LONGS;
-        while (__i) {
-                __i--;
-                *__tmp = 0;
-                __tmp++;
-        }
-}
-
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-
-#endif /* _ASM_POSIX_TYPES_H */
diff --git a/include/asm-mn10300/proc-mn103e010/cache.h b/include/asm-mn10300/proc-mn103e010/cache.h
deleted file mode 100644
index bdc1f9a59b4c..000000000000
--- a/include/asm-mn10300/proc-mn103e010/cache.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* MN103E010 Cache specification
- *
- * Copyright (C) 2007 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_PROC_CACHE_H
-#define _ASM_PROC_CACHE_H
-
-/* L1 cache */
-
-#define L1_CACHE_NWAYS          4       /* number of ways in caches */
-#define L1_CACHE_NENTRIES       256     /* number of entries in each way */
-#define L1_CACHE_BYTES          16      /* bytes per entry */
-#define L1_CACHE_SHIFT          4       /* shift for bytes per entry */
-#define L1_CACHE_WAYDISP        0x1000  /* displacement of one way from the next */
-
-#define L1_CACHE_TAG_VALID      0x00000001      /* cache tag valid bit */
-#define L1_CACHE_TAG_DIRTY      0x00000008      /* data cache tag dirty bit */
-#define L1_CACHE_TAG_ENTRY      0x00000ff0      /* cache tag entry address mask */
-#define L1_CACHE_TAG_ADDRESS    0xfffff000      /* cache tag line address mask */
-
-/*
- * specification of the interval between interrupt checking intervals whilst
- * managing the cache with the interrupts disabled
- */
-#define MN10300_DCACHE_INV_RANGE_INTR_LOG2_INTERVAL     4
-
-#endif /* _ASM_PROC_CACHE_H */
diff --git a/include/asm-mn10300/proc-mn103e010/clock.h b/include/asm-mn10300/proc-mn103e010/clock.h
deleted file mode 100644
index caf998350633..000000000000
--- a/include/asm-mn10300/proc-mn103e010/clock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN103E010-specific clocks
- *
- * Copyright (C) 2007 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_PROC_CLOCK_H
-#define _ASM_PROC_CLOCK_H
-
-#include <asm/unit/clock.h>
-
-#define MN10300_WDCLK           MN10300_IOCLK
-
-#endif /* _ASM_PROC_CLOCK_H */
diff --git a/include/asm-mn10300/proc-mn103e010/irq.h b/include/asm-mn10300/proc-mn103e010/irq.h
deleted file mode 100644
index aa6ee8f98b1b..000000000000
--- a/include/asm-mn10300/proc-mn103e010/irq.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN103E010 On-board interrupt controller numbers
- *
- * Copyright (C) 2007 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_PROC_IRQ_H
-#define _ASM_PROC_IRQ_H
-
-#ifdef __KERNEL__
-
-#define GxICR_NUM_IRQS          42
-
-#define GxICR_NUM_XIRQS         8
-
-#define XIRQ0           34
-#define XIRQ1           35
-#define XIRQ2           36
-#define XIRQ3           37
-#define XIRQ4           38
-#define XIRQ5           39
-#define XIRQ6           40
-#define XIRQ7           41
-
-#define XIRQ2IRQ(num)   (XIRQ0 + num)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_PROC_IRQ_H */
diff --git a/include/asm-mn10300/proc-mn103e010/proc.h b/include/asm-mn10300/proc-mn103e010/proc.h
deleted file mode 100644
index 22a2b93f70b7..000000000000
--- a/include/asm-mn10300/proc-mn103e010/proc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN103E010 Processor description
- *
- * Copyright (C) 2007 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_PROC_PROC_H
-#define _ASM_PROC_PROC_H
-
-#define PROCESSOR_VENDOR_NAME   "Matsushita"
-#define PROCESSOR_MODEL_NAME    "mn103e010"
-
-#endif /* _ASM_PROC_PROC_H */
diff --git a/include/asm-mn10300/processor.h b/include/asm-mn10300/processor.h
deleted file mode 100644
index 73239271873d..000000000000
--- a/include/asm-mn10300/processor.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* MN10300 Processor specifics
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 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_PROCESSOR_H
-#define _ASM_PROCESSOR_H
-
-#include <asm/page.h>
-#include <asm/ptrace.h>
-#include <asm/cpu-regs.h>
-#include <linux/threads.h>
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr()                     \
-({                                              \
-        void *__pc;                             \
-        asm("mov pc,%0" : "=a"(__pc));          \
-        __pc;                                   \
-})
-
-extern void show_registers(struct pt_regs *regs);
-
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- *  Members of this structure are referenced in head.S, so think twice
- *  before touching them. [mj]
- */
-
-struct mn10300_cpuinfo {
-        int             type;
-        unsigned long   loops_per_sec;
-        char            hard_math;
-        unsigned long   *pgd_quick;
-        unsigned long   *pte_quick;
-        unsigned long   pgtable_cache_sz;
-};
-
-extern struct mn10300_cpuinfo boot_cpu_data;
-
-#define cpu_data &boot_cpu_data
-#define current_cpu_data boot_cpu_data
-
-extern void identify_cpu(struct mn10300_cpuinfo *);
-extern void print_cpu_info(struct mn10300_cpuinfo *);
-extern void dodgy_tsc(void);
-#define cpu_relax() barrier()
-
-/*
- * User space process size: 1.75GB (default).
- */
-#define TASK_SIZE               0x70000000
-
-/*
- * Where to put the userspace stack by default
- */
-#define STACK_TOP               0x70000000
-#define STACK_TOP_MAX           STACK_TOP
-
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE      0x30000000
-
-typedef struct {
-        unsigned long   seg;
-} mm_segment_t;
-
-struct fpu_state_struct {
-        unsigned long   fs[32];         /* fpu registers */
-        unsigned long   fpcr;           /* fpu control register */
-};
-
-struct thread_struct {
-        struct pt_regs          *uregs;         /* userspace register frame */
-        unsigned long           pc;             /* kernel PC */
-        unsigned long           sp;             /* kernel SP */
-        unsigned long           a3;             /* kernel FP */
-        unsigned long           wchan;
-        unsigned long           usp;
-        struct pt_regs          *__frame;
-        unsigned long           fpu_flags;
-#define THREAD_USING_FPU        0x00000001      /* T if this task is using the FPU */
-        struct fpu_state_struct fpu_state;
-};
-
-#define INIT_THREAD                             \
-{                                               \
-        .uregs          = init_uregs,           \
-        .pc             = 0,                    \
-        .sp             = 0,                    \
-        .a3             = 0,                    \
-        .wchan          = 0,                    \
-        .__frame        = NULL,                 \
-}
-
-#define INIT_MMAP \
-{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, \
-  NULL, NULL }
-
-/*
- * do necessary setup to start up a newly executed thread
- * - need to discard the frame stacked by the kernel thread invoking the execve
- *   syscall (see RESTORE_ALL macro)
- */
-#define start_thread(regs, new_pc, new_sp) do {         \
-        set_fs(USER_DS);                                \
-        __frame = current->thread.uregs;                \
-        __frame->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;   \
-        __frame->pc = new_pc;                           \
-        __frame->sp = new_sp;                           \
-} while (0)
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-
-/* Prepare to copy thread state - unlazy all lazy status */
-extern void prepare_to_copy(struct task_struct *tsk);
-
-/*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
-
-/*
- * Return saved PC of a blocked thread.
- */
-extern unsigned long thread_saved_pc(struct task_struct *tsk);
-
-unsigned long get_wchan(struct task_struct *p);
-
-#define task_pt_regs(task)                                              \
-({                                                                      \
-       struct pt_regs *__regs__;                                        \
-       __regs__ = (struct pt_regs *) (KSTK_TOP(task_stack_page(task)) - 8); \
-       __regs__ - 1;                                                    \
-})
-
-#define KSTK_EIP(task) (task_pt_regs(task)->pc)
-#define KSTK_ESP(task) (task_pt_regs(task)->sp)
-
-#define KSTK_TOP(info)                          \
-({                                              \
-        (unsigned long)(info) + THREAD_SIZE;    \
-})
-
-#define ARCH_HAS_PREFETCH
-#define ARCH_HAS_PREFETCHW
-
-static inline void prefetch(const void *x)
-{
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-#ifdef CONFIG_MN10300_PROC_MN103E010
-        asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));
-#else
-        asm volatile ("dcpf (%0)" : : "r"(x));
-#endif
-#endif
-}
-
-static inline void prefetchw(const void *x)
-{
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-#ifdef CONFIG_MN10300_PROC_MN103E010
-        asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));
-#else
-        asm volatile ("dcpf (%0)" : : "r"(x));
-#endif
-#endif
-}
-
-#endif /* _ASM_PROCESSOR_H */
diff --git a/include/asm-mn10300/ptrace.h b/include/asm-mn10300/ptrace.h
deleted file mode 100644
index 7b06cc623d8b..000000000000
--- a/include/asm-mn10300/ptrace.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* MN10300 Exception frame layout and ptrace constants
- *
- * Copyright (C) 2007 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_PTRACE_H
-#define _ASM_PTRACE_H
-
-#define PT_A3           0
-#define PT_A2           1
-#define PT_D3           2
-#define PT_D2           3
-#define PT_MCVF         4
-#define PT_MCRL         5
-#define PT_MCRH         6
-#define PT_MDRQ         7
-#define PT_E1           8
-#define PT_E0           9
-#define PT_E7           10
-#define PT_E6           11
-#define PT_E5           12
-#define PT_E4           13
-#define PT_E3           14
-#define PT_E2           15
-#define PT_SP           16
-#define PT_LAR          17
-#define PT_LIR          18
-#define PT_MDR          19
-#define PT_A1           20
-#define PT_A0           21
-#define PT_D1           22
-#define PT_D0           23
-#define PT_ORIG_D0      24
-#define PT_EPSW         25
-#define PT_PC           26
-#define NR_PTREGS       27
-
-#ifndef __ASSEMBLY__
-/*
- * This defines the way registers are stored in the event of an exception
- * - the strange order is due to the MOVM instruction
- */
-struct pt_regs {
-        unsigned long           a3;             /* syscall arg 3 */
-        unsigned long           a2;             /* syscall arg 4 */
-        unsigned long           d3;             /* syscall arg 5 */
-        unsigned long           d2;             /* syscall arg 6 */
-        unsigned long           mcvf;
-        unsigned long           mcrl;
-        unsigned long           mcrh;
-        unsigned long           mdrq;
-        unsigned long           e1;
-        unsigned long           e0;
-        unsigned long           e7;
-        unsigned long           e6;
-        unsigned long           e5;
-        unsigned long           e4;
-        unsigned long           e3;
-        unsigned long           e2;
-        unsigned long           sp;
-        unsigned long           lar;
-        unsigned long           lir;
-        unsigned long           mdr;
-        unsigned long           a1;
-        unsigned long           a0;             /* syscall arg 1 */
-        unsigned long           d1;             /* syscall arg 2 */
-        unsigned long           d0;             /* syscall ret */
-        struct pt_regs          *next;          /* next frame pointer */
-        unsigned long           orig_d0;        /* syscall number */
-        unsigned long           epsw;
-        unsigned long           pc;
-};
-#endif
-
-extern struct pt_regs *__frame; /* current frame pointer */
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD     0x00000001
-
-#if defined(__KERNEL__)
-
-#if !defined(__ASSEMBLY__)
-#define user_mode(regs)                 (((regs)->epsw & EPSW_nSL) == EPSW_nSL)
-#define instruction_pointer(regs)       ((regs)->pc)
-extern void show_regs(struct pt_regs *);
-#endif  /*  !__ASSEMBLY  */
-
-#define profile_pc(regs) ((regs)->pc)
-
-#endif  /*  __KERNEL__  */
-
-#endif /* _ASM_PTRACE_H */
diff --git a/include/asm-mn10300/reset-regs.h b/include/asm-mn10300/reset-regs.h
deleted file mode 100644
index 174523d50132..000000000000
--- a/include/asm-mn10300/reset-regs.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* MN10300 Reset controller and watchdog timer definitions
- *
- * Copyright (C) 2007 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_RESET_REGS_H
-#define _ASM_RESET_REGS_H
-
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-
-#ifdef __KERNEL__
-
-#ifdef CONFIG_MN10300_WD_TIMER
-#define ARCH_HAS_NMI_WATCHDOG           /* See include/linux/nmi.h */
-#endif
-
-/*
- * watchdog timer registers
- */
-#define WDBC                    __SYSREGC(0xc0001000, u8) /* watchdog binary counter reg */
-
-#define WDCTR                   __SYSREG(0xc0001002, u8)  /* watchdog timer control reg */
-#define WDCTR_WDCK              0x07    /* clock source selection */
-#define WDCTR_WDCK_256th        0x00    /* - OSCI/256 */
-#define WDCTR_WDCK_1024th       0x01    /* - OSCI/1024 */
-#define WDCTR_WDCK_2048th       0x02    /* - OSCI/2048 */
-#define WDCTR_WDCK_16384th      0x03    /* - OSCI/16384 */
-#define WDCTR_WDCK_65536th      0x04    /* - OSCI/65536 */
-#define WDCTR_WDRST             0x40    /* binary counter reset */
-#define WDCTR_WDCNE             0x80    /* watchdog timer enable */
-
-#define RSTCTR                  __SYSREG(0xc0001004, u8) /* reset control reg */
-#define RSTCTR_CHIPRST          0x01    /* chip reset */
-#define RSTCTR_DBFRST           0x02    /* double fault reset flag */
-#define RSTCTR_WDTRST           0x04    /* watchdog timer reset flag */
-#define RSTCTR_WDREN            0x08    /* watchdog timer reset enable */
-
-#ifndef __ASSEMBLY__
-
-static inline void mn10300_proc_hard_reset(void)
-{
-        RSTCTR &= ~RSTCTR_CHIPRST;
-        RSTCTR |= RSTCTR_CHIPRST;
-}
-
-extern unsigned int watchdog_alert_counter;
-
-extern void watchdog_go(void);
-extern asmlinkage void watchdog_handler(void);
-extern asmlinkage
-void watchdog_interrupt(struct pt_regs *, enum exception_code);
-
-#endif
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_RESET_REGS_H */
diff --git a/include/asm-mn10300/resource.h b/include/asm-mn10300/resource.h
deleted file mode 100644
index 04bc4db8921b..000000000000
--- a/include/asm-mn10300/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/include/asm-mn10300/rtc-regs.h b/include/asm-mn10300/rtc-regs.h
deleted file mode 100644
index c42deefaec11..000000000000
--- a/include/asm-mn10300/rtc-regs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* MN10300 on-chip Real-Time Clock registers
- *
- * Copyright (C) 2007 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_RTC_REGS_H
-#define _ASM_RTC_REGS_H
-
-#include <asm/intctl-regs.h>
-
-#ifdef __KERNEL__
-
-#define RTSCR                   __SYSREG(0xd8600000, u8) /* RTC seconds count reg */
-#define RTSAR                   __SYSREG(0xd8600001, u8) /* RTC seconds alarm reg */
-#define RTMCR                   __SYSREG(0xd8600002, u8) /* RTC minutes count reg */
-#define RTMAR                   __SYSREG(0xd8600003, u8) /* RTC minutes alarm reg */
-#define RTHCR                   __SYSREG(0xd8600004, u8) /* RTC hours count reg */
-#define RTHAR                   __SYSREG(0xd8600005, u8) /* RTC hours alarm reg */
-#define RTDWCR                  __SYSREG(0xd8600006, u8) /* RTC day of the week count reg */
-#define RTDMCR                  __SYSREG(0xd8600007, u8) /* RTC days count reg */
-#define RTMTCR                  __SYSREG(0xd8600008, u8) /* RTC months count reg */
-#define RTYCR                   __SYSREG(0xd8600009, u8) /* RTC years count reg */
-
-#define RTCRA                   __SYSREG(0xd860000a, u8)/* RTC control reg A */
-#define RTCRA_RS                0x0f    /* periodic timer interrupt cycle setting */
-#define RTCRA_RS_NONE           0x00    /* - off */
-#define RTCRA_RS_3_90625ms      0x01    /* - 3.90625ms  (1/256s) */
-#define RTCRA_RS_7_8125ms       0x02    /* - 7.8125ms   (1/128s) */
-#define RTCRA_RS_122_070us      0x03    /* - 122.070us  (1/8192s) */
-#define RTCRA_RS_244_141us      0x04    /* - 244.141us  (1/4096s) */
-#define RTCRA_RS_488_281us      0x05    /* - 488.281us  (1/2048s) */
-#define RTCRA_RS_976_5625us     0x06    /* - 976.5625us (1/1024s) */
-#define RTCRA_RS_1_953125ms     0x07    /* - 1.953125ms (1/512s) */
-#define RTCRA_RS_3_90624ms      0x08    /* - 3.90624ms  (1/256s) */
-#define RTCRA_RS_7_8125ms_b     0x09    /* - 7.8125ms   (1/128s) */
-#define RTCRA_RS_15_625ms       0x0a    /* - 15.625ms   (1/64s) */
-#define RTCRA_RS_31_25ms        0x0b    /* - 31.25ms    (1/32s) */
-#define RTCRA_RS_62_5ms         0x0c    /* - 62.5ms     (1/16s) */
-#define RTCRA_RS_125ms          0x0d    /* - 125ms      (1/8s) */
-#define RTCRA_RS_250ms          0x0e    /* - 250ms      (1/4s) */
-#define RTCRA_RS_500ms          0x0f    /* - 500ms      (1/2s) */
-#define RTCRA_DVR               0x40    /* divider reset */
-#define RTCRA_UIP               0x80    /* clock update flag */
-
-#define RTCRB                   __SYSREG(0xd860000b, u8) /* RTC control reg B */
-#define RTCRB_DSE               0x01    /* daylight savings time enable */
-#define RTCRB_TM                0x02    /* time format */
-#define RTCRB_TM_12HR           0x00    /* - 12 hour format */
-#define RTCRB_TM_24HR           0x02    /* - 24 hour format */
-#define RTCRB_DM                0x04    /* numeric value format */
-#define RTCRB_DM_BCD            0x00    /* - BCD */
-#define RTCRB_DM_BINARY         0x04    /* - binary */
-#define RTCRB_UIE               0x10    /* update interrupt disable */
-#define RTCRB_AIE               0x20    /* alarm interrupt disable */
-#define RTCRB_PIE               0x40    /* periodic interrupt disable */
-#define RTCRB_SET               0x80    /* clock update enable */
-
-#define RTSRC                   __SYSREG(0xd860000c, u8) /* RTC status reg C */
-#define RTSRC_UF                0x10    /* update end interrupt flag */
-#define RTSRC_AF                0x20    /* alarm interrupt flag */
-#define RTSRC_PF                0x40    /* periodic interrupt flag */
-#define RTSRC_IRQF              0x80    /* interrupt flag */
-
-#define RTIRQ                   32
-#define RTICR                   GxICR(RTIRQ)
-
-/*
- * MC146818 RTC compatibility defs for the MN10300 on-chip RTC
- */
-#define RTC_PORT(x)             0xd8600000
-#define RTC_ALWAYS_BCD          1       /* RTC operates in binary mode */
-
-#define CMOS_READ(addr)         __SYSREG(0xd8600000 + (addr), u8)
-#define CMOS_WRITE(val, addr)   \
-        do { __SYSREG(0xd8600000 + (addr), u8) = val; } while (0)
-
-#define RTC_IRQ                 RTIRQ
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_RTC_REGS_H */
diff --git a/include/asm-mn10300/rtc.h b/include/asm-mn10300/rtc.h
deleted file mode 100644
index c295194cc703..000000000000
--- a/include/asm-mn10300/rtc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* MN10300 Real time clock definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_RTC_H
-#define _ASM_RTC_H
-
-#ifdef CONFIG_MN10300_RTC
-
-#include <linux/init.h>
-
-extern void check_rtc_time(void);
-extern void __init calibrate_clock(void);
-extern unsigned long __init get_initial_rtc_time(void);
-
-#else /* !CONFIG_MN10300_RTC */
-
-static inline void check_rtc_time(void)
-{
-}
-
-static inline void calibrate_clock(void)
-{
-}
-
-static inline unsigned long get_initial_rtc_time(void)
-{
-        return 0;
-}
-
-#endif /* !CONFIG_MN10300_RTC */
-
-#include <asm-generic/rtc.h>
-
-#endif /* _ASM_RTC_H */
diff --git a/include/asm-mn10300/scatterlist.h b/include/asm-mn10300/scatterlist.h
deleted file mode 100644
index 67535901b9ff..000000000000
--- a/include/asm-mn10300/scatterlist.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* MN10300 Scatterlist definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm/types.h>
-
-/*
- * Drivers must set either ->address or (preferred) page and ->offset
- * to indicate where data must be transferred to/from.
- *
- * Using page is recommended since it handles highmem data as well as
- * low mem. ->address is restricted to data which has a virtual mapping, and
- * it will go away in the future. Updating to page can be automated very
- * easily -- something like
- *
- * sg->address = some_ptr;
- *
- * can be rewritten as
- *
- * sg_set_page(virt_to_page(some_ptr));
- * sg->offset = (unsigned long) some_ptr & ~PAGE_MASK;
- *
- * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
- */
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;         /* for highmem, page offset */
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-
-#define ISA_DMA_THRESHOLD (0x00ffffff)
-
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#endif /* _ASM_SCATTERLIST_H */
diff --git a/include/asm-mn10300/sections.h b/include/asm-mn10300/sections.h
deleted file mode 100644
index 2b8c5160388f..000000000000
--- a/include/asm-mn10300/sections.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sections.h>
diff --git a/include/asm-mn10300/sembuf.h b/include/asm-mn10300/sembuf.h
deleted file mode 100644
index 301f3f9d8aa9..000000000000
--- a/include/asm-mn10300/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASM_SEMBUF_H
-#define _ASM_SEMBUF_H
-
-/*
- * The semid64_ds structure for MN10300 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        unsigned long   __unused1;
-        __kernel_time_t sem_ctime;              /* last change time */
-        unsigned long   __unused2;
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASM_SEMBUF_H */
diff --git a/include/asm-mn10300/serial-regs.h b/include/asm-mn10300/serial-regs.h
deleted file mode 100644
index 6498469e93ac..000000000000
--- a/include/asm-mn10300/serial-regs.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* MN10300 on-board serial port module registers
- *
- * Copyright (C) 2007 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_SERIAL_REGS_H
-#define _ASM_SERIAL_REGS_H
-
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-
-#ifdef __KERNEL__
-
-/* serial port 0 */
-#define SC0CTR                  __SYSREG(0xd4002000, u16)       /* control reg */
-#define SC01CTR_CK              0x0007  /* clock source select */
-#define SC0CTR_CK_TM8UFLOW_8    0x0000  /* - 1/8 timer 8 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM9UFLOW_8    0x0000  /* - 1/8 timer 9 underflow (serial port 1 only) */
-#define SC01CTR_CK_IOCLK_8      0x0001  /* - 1/8 IOCLK */
-#define SC01CTR_CK_IOCLK_32     0x0002  /* - 1/32 IOCLK */
-#define SC0CTR_CK_TM2UFLOW_2    0x0003  /* - 1/2 timer 2 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM3UFLOW_2    0x0003  /* - 1/2 timer 3 underflow (serial port 1 only) */
-#define SC0CTR_CK_TM0UFLOW_8    0x0004  /* - 1/8 timer 1 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM1UFLOW_8    0x0004  /* - 1/8 timer 2 underflow (serial port 1 only) */
-#define SC0CTR_CK_TM2UFLOW_8    0x0005  /* - 1/8 timer 2 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM3UFLOW_8    0x0005  /* - 1/8 timer 3 underflow (serial port 1 only) */
-#define SC01CTR_CK_EXTERN_8     0x0006  /* - 1/8 external closk */
-#define SC01CTR_CK_EXTERN       0x0007  /* - external closk */
-#define SC01CTR_STB             0x0008  /* stop bit select */
-#define SC01CTR_STB_1BIT        0x0000  /* - 1 stop bit */
-#define SC01CTR_STB_2BIT        0x0008  /* - 2 stop bits */
-#define SC01CTR_PB              0x0070  /* parity bit select */
-#define SC01CTR_PB_NONE         0x0000  /* - no parity */
-#define SC01CTR_PB_FIXED0       0x0040  /* - fixed at 0 */
-#define SC01CTR_PB_FIXED1       0x0050  /* - fixed at 1 */
-#define SC01CTR_PB_EVEN         0x0060  /* - even parity */
-#define SC01CTR_PB_ODD          0x0070  /* - odd parity */
-#define SC01CTR_CLN             0x0080  /* character length */
-#define SC01CTR_CLN_7BIT        0x0000  /* - 7 bit chars */
-#define SC01CTR_CLN_8BIT        0x0080  /* - 8 bit chars */
-#define SC01CTR_TOE             0x0100  /* T input output enable */
-#define SC01CTR_OD              0x0200  /* bit order select */
-#define SC01CTR_OD_LSBFIRST     0x0000  /* - LSB first */
-#define SC01CTR_OD_MSBFIRST     0x0200  /* - MSB first */
-#define SC01CTR_MD              0x0c00  /* mode select */
-#define SC01CTR_MD_STST_SYNC    0x0000  /* - start-stop synchronous */
-#define SC01CTR_MD_CLOCK_SYNC1  0x0400  /* - clock synchronous 1 */
-#define SC01CTR_MD_I2C          0x0800  /* - I2C mode */
-#define SC01CTR_MD_CLOCK_SYNC2  0x0c00  /* - clock synchronous 2 */
-#define SC01CTR_IIC             0x1000  /* I2C mode select */
-#define SC01CTR_BKE             0x2000  /* break transmit enable */
-#define SC01CTR_RXE             0x4000  /* receive enable */
-#define SC01CTR_TXE             0x8000  /* transmit enable */
-
-#define SC0ICR                  __SYSREG(0xd4002004, u8)        /* interrupt control reg */
-#define SC01ICR_DMD             0x80    /* output data mode */
-#define SC01ICR_TD              0x20    /* transmit DMA trigger cause */
-#define SC01ICR_TI              0x10    /* transmit interrupt cause */
-#define SC01ICR_RES             0x04    /* receive error select */
-#define SC01ICR_RI              0x01    /* receive interrupt cause */
-
-#define SC0TXB                  __SYSREG(0xd4002008, u8)        /* transmit buffer reg */
-#define SC0RXB                  __SYSREG(0xd4002009, u8)        /* receive buffer reg */
-
-#define SC0STR                  __SYSREG(0xd400200c, u16)       /* status reg */
-#define SC01STR_OEF             0x0001  /* overrun error found */
-#define SC01STR_PEF             0x0002  /* parity error found */
-#define SC01STR_FEF             0x0004  /* framing error found */
-#define SC01STR_RBF             0x0010  /* receive buffer status */
-#define SC01STR_TBF             0x0020  /* transmit buffer status */
-#define SC01STR_RXF             0x0040  /* receive status */
-#define SC01STR_TXF             0x0080  /* transmit status */
-#define SC01STR_STF             0x0100  /* I2C start sequence found */
-#define SC01STR_SPF             0x0200  /* I2C stop sequence found */
-
-#define SC0RXIRQ                20      /* timer 0 Receive IRQ */
-#define SC0TXIRQ                21      /* timer 0 Transmit IRQ */
-
-#define SC0RXICR                GxICR(SC0RXIRQ) /* serial 0 receive intr ctrl reg */
-#define SC0TXICR                GxICR(SC0TXIRQ) /* serial 0 transmit intr ctrl reg */
-
-/* serial port 1 */
-#define SC1CTR                  __SYSREG(0xd4002010, u16)       /* serial port 1 control */
-#define SC1ICR                  __SYSREG(0xd4002014, u8)        /* interrupt control reg */
-#define SC1TXB                  __SYSREG(0xd4002018, u8)        /* transmit buffer reg */
-#define SC1RXB                  __SYSREG(0xd4002019, u8)        /* receive buffer reg */
-#define SC1STR                  __SYSREG(0xd400201c, u16)       /* status reg */
-
-#define SC1RXIRQ                22      /* timer 1 Receive IRQ */
-#define SC1TXIRQ                23      /* timer 1 Transmit IRQ */
-
-#define SC1RXICR                GxICR(SC1RXIRQ) /* serial 1 receive intr ctrl reg */
-#define SC1TXICR                GxICR(SC1TXIRQ) /* serial 1 transmit intr ctrl reg */
-
-/* serial port 2 */
-#define SC2CTR                  __SYSREG(0xd4002020, u16)       /* control reg */
-#define SC2CTR_CK               0x0003  /* clock source select */
-#define SC2CTR_CK_TM10UFLOW     0x0000  /* - timer 10 underflow */
-#define SC2CTR_CK_TM2UFLOW      0x0001  /* - timer 2 underflow */
-#define SC2CTR_CK_EXTERN        0x0002  /* - external closk */
-#define SC2CTR_CK_TM3UFLOW      0x0003  /* - timer 3 underflow */
-#define SC2CTR_STB              0x0008  /* stop bit select */
-#define SC2CTR_STB_1BIT         0x0000  /* - 1 stop bit */
-#define SC2CTR_STB_2BIT         0x0008  /* - 2 stop bits */
-#define SC2CTR_PB               0x0070  /* parity bit select */
-#define SC2CTR_PB_NONE          0x0000  /* - no parity */
-#define SC2CTR_PB_FIXED0        0x0040  /* - fixed at 0 */
-#define SC2CTR_PB_FIXED1        0x0050  /* - fixed at 1 */
-#define SC2CTR_PB_EVEN          0x0060  /* - even parity */
-#define SC2CTR_PB_ODD           0x0070  /* - odd parity */
-#define SC2CTR_CLN              0x0080  /* character length */
-#define SC2CTR_CLN_7BIT         0x0000  /* - 7 bit chars */
-#define SC2CTR_CLN_8BIT         0x0080  /* - 8 bit chars */
-#define SC2CTR_TWE              0x0100  /* transmit wait enable (enable XCTS control) */
-#define SC2CTR_OD               0x0200  /* bit order select */
-#define SC2CTR_OD_LSBFIRST      0x0000  /* - LSB first */
-#define SC2CTR_OD_MSBFIRST      0x0200  /* - MSB first */
-#define SC2CTR_TWS              0x1000  /* transmit wait select */
-#define SC2CTR_TWS_XCTS_HIGH    0x0000  /* - interrupt TX when XCTS high */
-#define SC2CTR_TWS_XCTS_LOW     0x1000  /* - interrupt TX when XCTS low */
-#define SC2CTR_BKE              0x2000  /* break transmit enable */
-#define SC2CTR_RXE              0x4000  /* receive enable */
-#define SC2CTR_TXE              0x8000  /* transmit enable */
-
-#define SC2ICR                  __SYSREG(0xd4002024, u8)        /* interrupt control reg */
-#define SC2ICR_TD               0x20    /* transmit DMA trigger cause */
-#define SC2ICR_TI               0x10    /* transmit interrupt cause */
-#define SC2ICR_RES              0x04    /* receive error select */
-#define SC2ICR_RI               0x01    /* receive interrupt cause */
-
-#define SC2TXB                  __SYSREG(0xd4002018, u8)        /* transmit buffer reg */
-#define SC2RXB                  __SYSREG(0xd4002019, u8)        /* receive buffer reg */
-#define SC2STR                  __SYSREG(0xd400201c, u8)        /* status reg */
-#define SC2STR_OEF              0x0001  /* overrun error found */
-#define SC2STR_PEF              0x0002  /* parity error found */
-#define SC2STR_FEF              0x0004  /* framing error found */
-#define SC2STR_CTS              0x0008  /* XCTS input pin status (0 means high) */
-#define SC2STR_RBF              0x0010  /* receive buffer status */
-#define SC2STR_TBF              0x0020  /* transmit buffer status */
-#define SC2STR_RXF              0x0040  /* receive status */
-#define SC2STR_TXF              0x0080  /* transmit status */
-
-#define SC2TIM                  __SYSREG(0xd400202d, u8)        /* status reg */
-
-#define SC2RXIRQ                24      /* serial 2 Receive IRQ */
-#define SC2TXIRQ                25      /* serial 2 Transmit IRQ */
-
-#define SC2RXICR                GxICR(SC2RXIRQ) /* serial 2 receive intr ctrl reg */
-#define SC2TXICR                GxICR(SC2TXIRQ) /* serial 2 transmit intr ctrl reg */
-
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_SERIAL_REGS_H */
diff --git a/include/asm-mn10300/serial.h b/include/asm-mn10300/serial.h
deleted file mode 100644
index 99785a9deadb..000000000000
--- a/include/asm-mn10300/serial.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Standard UART definitions
- *
- * Copyright (C) 2007 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.
- */
-
-/*
- * The ASB2305 has an 18.432 MHz clock the UART
- */
-#define BASE_BAUD       (18432000 / 16)
-
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS   (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS  (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS   (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS  ASYNC_BOOT_AUTOCONF
-#endif
-
-#ifdef CONFIG_SERIAL_MANY_PORTS
-#define FOURPORT_FLAGS  ASYNC_FOURPORT
-#define ACCENT_FLAGS    0
-#define BOCA_FLAGS      0
-#define HUB6_FLAGS      0
-#define RS_TABLE_SIZE   64
-#else
-#define RS_TABLE_SIZE
-#endif
-
-#include <asm/unit/serial.h>
diff --git a/include/asm-mn10300/setup.h b/include/asm-mn10300/setup.h
deleted file mode 100644
index 08356c832283..000000000000
--- a/include/asm-mn10300/setup.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MN10300 Setup declarations
- *
- * Copyright (C) 2007 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_SETUP_H
-#define _ASM_SETUP_H
-
-extern void __init unit_setup(void);
-extern void __init unit_init_IRQ(void);
-
-#endif /* _ASM_SETUP_H */
diff --git a/include/asm-mn10300/shmbuf.h b/include/asm-mn10300/shmbuf.h
deleted file mode 100644
index 8f300cc35d6c..000000000000
--- a/include/asm-mn10300/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ASM_SHMBUF_H
-#define _ASM_SHMBUF_H
-
-/*
- * The shmid64_ds structure for MN10300 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _ASM_SHMBUF_H */
diff --git a/include/asm-mn10300/shmparam.h b/include/asm-mn10300/shmparam.h
deleted file mode 100644
index ab666ed1a070..000000000000
--- a/include/asm-mn10300/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SHMPARAM_H
-#define _ASM_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-
-#endif /* _ASM_SHMPARAM_H */
diff --git a/include/asm-mn10300/sigcontext.h b/include/asm-mn10300/sigcontext.h
deleted file mode 100644
index 4de3afff4ad7..000000000000
--- a/include/asm-mn10300/sigcontext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* MN10300 Userspace signal context
- *
- * Copyright (C) 2007 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_SIGCONTEXT_H
-#define _ASM_SIGCONTEXT_H
-
-struct fpucontext {
-        /* Regular FPU environment */
-        unsigned long   fs[32];         /* fpu registers */
-        unsigned long   fpcr;           /* fpu control register */
-};
-
-struct sigcontext {
-        unsigned long   d0;
-        unsigned long   d1;
-        unsigned long   d2;
-        unsigned long   d3;
-        unsigned long   a0;
-        unsigned long   a1;
-        unsigned long   a2;
-        unsigned long   a3;
-        unsigned long   e0;
-        unsigned long   e1;
-        unsigned long   e2;
-        unsigned long   e3;
-        unsigned long   e4;
-        unsigned long   e5;
-        unsigned long   e6;
-        unsigned long   e7;
-        unsigned long   lar;
-        unsigned long   lir;
-        unsigned long   mdr;
-        unsigned long   mcvf;
-        unsigned long   mcrl;
-        unsigned long   mcrh;
-        unsigned long   mdrq;
-        unsigned long   sp;
-        unsigned long   epsw;
-        unsigned long   pc;
-        struct fpucontext *fpucontext;
-        unsigned long   oldmask;
-};
-
-
-#endif /* _ASM_SIGCONTEXT_H */
diff --git a/include/asm-mn10300/siginfo.h b/include/asm-mn10300/siginfo.h
deleted file mode 100644
index 0815d29d82e5..000000000000
--- a/include/asm-mn10300/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/siginfo.h>
diff --git a/include/asm-mn10300/signal.h b/include/asm-mn10300/signal.h
deleted file mode 100644
index e98817cec5f7..000000000000
--- a/include/asm-mn10300/signal.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* MN10300 Signal definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_SIGNAL_H
-#define _ASM_SIGNAL_H
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long   sig[_NSIG_WORDS];
-} sigset_t;
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#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
-#define SIGRTMAX        (_NSIG-1)
-
-/*
- * 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    0x00000001U
-#define SA_NOCLDWAIT    0x00000002U
-#define SA_SIGINFO      0x00000004U
-#define SA_ONSTACK      0x08000000U
-#define SA_RESTART      0x10000000U
-#define SA_NODEFER      0x40000000U
-#define SA_RESETHAND    0x80000000U
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-#define SA_RESTORER     0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void __user     *ss_sp;
-        int             ss_flags;
-        size_t          ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-
-
-struct pt_regs;
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_SIGNAL_H */
diff --git a/include/asm-mn10300/smp.h b/include/asm-mn10300/smp.h
deleted file mode 100644
index 4eb8c61b7dab..000000000000
--- a/include/asm-mn10300/smp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN10300 SMP support
- *
- * Copyright (C) 2007 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_SMP_H
-#define _ASM_SMP_H
-
-#ifdef CONFIG_SMP
-#error SMP not yet supported for MN10300
-#endif
-
-#endif
diff --git a/include/asm-mn10300/socket.h b/include/asm-mn10300/socket.h
deleted file mode 100644
index 80af9c4ccad7..000000000000
--- a/include/asm-mn10300/socket.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET      1
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_ACCEPTCONN           30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#define SO_MARK                 36
-
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-mn10300/sockios.h b/include/asm-mn10300/sockios.h
deleted file mode 100644
index b03043a1c564..000000000000
--- a/include/asm-mn10300/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_SOCKIOS_H
-#define _ASM_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-
-#endif /* _ASM_SOCKIOS_H */
diff --git a/include/asm-mn10300/spinlock.h b/include/asm-mn10300/spinlock.h
deleted file mode 100644
index 4bf9c8b169e0..000000000000
--- a/include/asm-mn10300/spinlock.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 spinlock support
- *
- * Copyright (C) 2007 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_SPINLOCK_H
-#define _ASM_SPINLOCK_H
-
-#error SMP spinlocks not implemented for MN10300
-
-#endif /* _ASM_SPINLOCK_H */
diff --git a/include/asm-mn10300/stat.h b/include/asm-mn10300/stat.h
deleted file mode 100644
index 63ff8371cf2c..000000000000
--- a/include/asm-mn10300/stat.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _ASM_STAT_H
-#define _ASM_STAT_H
-
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-struct stat {
-        unsigned long  st_dev;
-        unsigned long  st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned long  st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_blksize;
-        unsigned long  st_blocks;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-        unsigned long long      st_dev;
-        unsigned char   __pad0[4];
-
-#define STAT64_HAS_BROKEN_ST_INO        1
-        unsigned long   __st_ino;
-
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-
-        unsigned long   st_uid;
-        unsigned long   st_gid;
-
-        unsigned long long      st_rdev;
-        unsigned char   __pad3[4];
-
-        long long       st_size;
-        unsigned long   st_blksize;
-
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-        unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-
-        unsigned long   st_mtime;
-        unsigned int    st_mtime_nsec;
-
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;
-
-        unsigned long long      st_ino;
-};
-
-#define STAT_HAVE_NSEC 1
-
-#endif /* _ASM_STAT_H */
diff --git a/include/asm-mn10300/statfs.h b/include/asm-mn10300/statfs.h
deleted file mode 100644
index 0b91fe198c20..000000000000
--- a/include/asm-mn10300/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/statfs.h>
diff --git a/include/asm-mn10300/string.h b/include/asm-mn10300/string.h
deleted file mode 100644
index 47dbd4346c32..000000000000
--- a/include/asm-mn10300/string.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MN10300 Optimised string functions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified 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_STRING_H
-#define _ASM_STRING_H
-
-#define __HAVE_ARCH_MEMSET
-#define __HAVE_ARCH_MEMCPY
-#define __HAVE_ARCH_MEMMOVE
-
-extern void *memset(void *dest, int ch, size_t count);
-extern void *memcpy(void *dest, const void *src, size_t count);
-extern void *memmove(void *dest, const void *src, size_t count);
-
-
-extern void __struct_cpy_bug(void);
-#define struct_cpy(x, y)                        \
-({                                              \
-        if (sizeof(*(x)) != sizeof(*(y)))       \
-                __struct_cpy_bug;               \
-        memcpy(x, y, sizeof(*(x)));             \
-})
-
-#endif /* _ASM_STRING_H */
diff --git a/include/asm-mn10300/swab.h b/include/asm-mn10300/swab.h
deleted file mode 100644
index 4504d1b4b477..000000000000
--- a/include/asm-mn10300/swab.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* MN10300 Byte-order primitive construction
- *
- * Copyright (C) 2007 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_SWAB_H
-#define _ASM_SWAB_H
-
-#include <asm/types.h>
-
-#ifdef __GNUC__
-
-static inline __attribute__((const))
-__u32 __arch_swab32(__u32 x)
-{
-        __u32 ret;
-        asm("swap %1,%0" : "=r" (ret) : "r" (x));
-        return ret;
-}
-#define __arch_swab32 __arch_swab32
-
-static inline __attribute__((const))
-__u16 __arch_swab16(__u16 x)
-{
-        __u16 ret;
-        asm("swaph %1,%0" : "=r" (ret) : "r" (x));
-        return ret;
-}
-#define __arch_swab32 __arch_swab32
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* __GNUC__ */
-
-#endif /* _ASM_SWAB_H */
diff --git a/include/asm-mn10300/system.h b/include/asm-mn10300/system.h
deleted file mode 100644
index 8214fb7e7fe4..000000000000
--- a/include/asm-mn10300/system.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* MN10300 System definitions
- *
- * Copyright (C) 2007 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_SYSTEM_H
-#define _ASM_SYSTEM_H
-
-#include <asm/cpu-regs.h>
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-#include <linux/kernel.h>
-
-struct task_struct;
-struct thread_struct;
-
-extern asmlinkage
-struct task_struct *__switch_to(struct thread_struct *prev,
-                                struct thread_struct *next,
-                                struct task_struct *prev_task);
-
-/* context switching is now performed out-of-line in switch_to.S */
-#define switch_to(prev, next, last)                                     \
-do {                                                                    \
-        current->thread.wchan = (u_long) __builtin_return_address(0);   \
-        (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
-        mb();                                                           \
-        current->thread.wchan = 0;                                      \
-} while (0)
-
-#define arch_align_stack(x) (x)
-
-#define nop() asm volatile ("nop")
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * Force strict CPU ordering.
- * And yes, this is required on UP too when we're talking
- * to devices.
- *
- * For now, "wmb()" doesn't actually do anything, as all
- * Intel CPU's follow what Intel calls a *Processor Order*,
- * in which all writes are seen in the program order even
- * outside the CPU.
- *
- * I expect future Intel CPU's to have a weaker ordering,
- * but I'd also expect them to finally get their act together
- * and add some real memory barriers if so.
- *
- * Some non intel clones support out of order store. wmb() ceases to be a
- * nop for these.
- */
-
-#define mb()    asm volatile ("": : :"memory")
-#define rmb()   mb()
-#define wmb()   asm volatile ("": : :"memory")
-
-#ifdef CONFIG_SMP
-#define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
-#else
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-#endif
-
-#define set_mb(var, value)  do { var = value;  mb(); } while (0)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
-
-#define read_barrier_depends()          do {} while (0)
-#define smp_read_barrier_depends()      do {} while (0)
-
-/*****************************************************************************/
-/*
- * interrupt control
- * - "disabled": run in IM1/2
- *   - level 0 - GDB stub
- *   - level 1 - virtual serial DMA (if present)
- *   - level 5 - normal interrupt priority
- *   - level 6 - timer interrupt
- * - "enabled":  run in IM7
- */
-#ifdef CONFIG_MN10300_TTYSM
-#define MN10300_CLI_LEVEL       EPSW_IM_2
-#else
-#define MN10300_CLI_LEVEL       EPSW_IM_1
-#endif
-
-#define local_save_flags(x)                     \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov epsw,%0     \n"     \
-                : "=d"(x)                       \
-                );                              \
-} while (0)
-
-#define local_irq_disable()                                             \
-do {                                                                    \
-        asm volatile(                                                   \
-                "       and %0,epsw     \n"                             \
-                "       or %1,epsw      \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                :                                                       \
-                : "i"(~EPSW_IM), "i"(EPSW_IE | MN10300_CLI_LEVEL)       \
-                );                                                      \
-} while (0)
-
-#define local_irq_save(x)                       \
-do {                                            \
-        local_save_flags(x);                    \
-        local_irq_disable();                    \
-} while (0)
-
-/*
- * we make sure local_irq_enable() doesn't cause priority inversion
- */
-#ifndef __ASSEMBLY__
-
-extern unsigned long __mn10300_irq_enabled_epsw;
-
-#endif
-
-#define local_irq_enable()                                              \
-do {                                                                    \
-        unsigned long tmp;                                              \
-                                                                        \
-        asm volatile(                                                   \
-                "       mov     epsw,%0         \n"                     \
-                "       and     %1,%0           \n"                     \
-                "       or      %2,%0           \n"                     \
-                "       mov     %0,epsw         \n"                     \
-                : "=&d"(tmp)                                            \
-                : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw)        \
-                );                                                      \
-} while (0)
-
-#define local_irq_restore(x)                    \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov %0,epsw     \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                :                               \
-                : "d"(x)                        \
-                : "memory", "cc"                \
-                );                              \
-} while (0)
-
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long flags;                    \
-        local_save_flags(flags);                \
-        (flags & EPSW_IM) <= MN10300_CLI_LEVEL; \
-})
-
-/* hook to save power by halting the CPU
- * - called from the idle loop
- * - must reenable interrupts (which takes three instruction cycles to complete)
- */
-#define safe_halt()                                                     \
-do {                                                                    \
-        asm volatile("  or      %0,epsw \n"                             \
-                     "  nop             \n"                             \
-                     "  nop             \n"                             \
-                     "  bset    %2,(%1) \n"                             \
-                     :                                                  \
-                     : "i"(EPSW_IE|EPSW_IM), "n"(&CPUM), "i"(CPUM_SLEEP)\
-                     : "cc"                                             \
-                     );                                                 \
-} while (0)
-
-#define STI     or EPSW_IE|EPSW_IM,epsw
-#define CLI     and ~EPSW_IM,epsw; or EPSW_IE|MN10300_CLI_LEVEL,epsw; nop; nop; nop
-
-/*****************************************************************************/
-/*
- * MN10300 doesn't actually have an exchange instruction
- */
-#ifndef __ASSEMBLY__
-
-struct __xchg_dummy { unsigned long a[100]; };
-#define __xg(x) ((struct __xchg_dummy *)(x))
-
-static inline
-unsigned long __xchg(volatile unsigned long *m, unsigned long val)
-{
-        unsigned long retval;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        retval = *m;
-        *m = val;
-        local_irq_restore(flags);
-        return retval;
-}
-
-#define xchg(ptr, v)                                            \
-        ((__typeof__(*(ptr))) __xchg((unsigned long *)(ptr),    \
-                                     (unsigned long)(v)))
-
-static inline unsigned long __cmpxchg(volatile unsigned long *m,
-                                      unsigned long old, unsigned long new)
-{
-        unsigned long retval;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        retval = *m;
-        if (retval == old)
-                *m = new;
-        local_irq_restore(flags);
-        return retval;
-}
-
-#define cmpxchg(ptr, o, n)                                      \
-        ((__typeof__(*(ptr))) __cmpxchg((unsigned long *)(ptr), \
-                                        (unsigned long)(o),     \
-                                        (unsigned long)(n)))
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_SYSTEM_H */
diff --git a/include/asm-mn10300/termbits.h b/include/asm-mn10300/termbits.h
deleted file mode 100644
index eb2b0dc1f696..000000000000
--- a/include/asm-mn10300/termbits.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef _ASM_TERMBITS_H
-#define _ASM_TERMBITS_H
-
-#include <linux/posix_types.h>
-
-typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
-
-#define NCCS 19
-struct termios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-};
-
-struct termios2 {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-struct ktermios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-
-/* c_iflag bits */
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-/* c_oflag bits */
-#define OPOST   0000001
-#define OLCUC   0000002
-#define ONLCR   0000004
-#define OCRNL   0000010
-#define ONOCR   0000020
-#define ONLRET  0000040
-#define OFILL   0000100
-#define OFDEL   0000200
-#define NLDLY   0000400
-#define   NL0   0000000
-#define   NL1   0000400
-#define CRDLY   0003000
-#define   CR0   0000000
-#define   CR1   0001000
-#define   CR2   0002000
-#define   CR3   0003000
-#define TABDLY  0014000
-#define   TAB0  0000000
-#define   TAB1  0004000
-#define   TAB2  0010000
-#define   TAB3  0014000
-#define   XTABS 0014000
-#define BSDLY   0020000
-#define   BS0   0000000
-#define   BS1   0020000
-#define VTDLY   0040000
-#define   VT0   0000000
-#define   VT1   0040000
-#define FFDLY   0100000
-#define   FF0   0000000
-#define   FF1   0100000
-
-/* c_cflag bit meaning */
-#define CBAUD   0010017
-#define  B0     0000000         /* hang up */
-#define  B50    0000001
-#define  B75    0000002
-#define  B110   0000003
-#define  B134   0000004
-#define  B150   0000005
-#define  B200   0000006
-#define  B300   0000007
-#define  B600   0000010
-#define  B1200  0000011
-#define  B1800  0000012
-#define  B2400  0000013
-#define  B4800  0000014
-#define  B9600  0000015
-#define  B19200 0000016
-#define  B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE   0000060
-#define   CS5   0000000
-#define   CS6   0000020
-#define   CS7   0000040
-#define   CS8   0000060
-#define CSTOPB  0000100
-#define CREAD   0000200
-#define PARENB  0000400
-#define PARODD  0001000
-#define HUPCL   0002000
-#define CLOCAL  0004000
-#define CBAUDEX 0010000
-#define   BOTHER  0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
-#define CTVB      004000000000          /* VisioBraille Terminal flow control */
-#define CMSPAR    010000000000          /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
-
-#define IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG    0000001
-#define ICANON  0000002
-#define XCASE   0000004
-#define ECHO    0000010
-#define ECHOE   0000020
-#define ECHOK   0000040
-#define ECHONL  0000100
-#define NOFLSH  0000200
-#define TOSTOP  0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE  0004000
-#define FLUSHO  0010000
-#define PENDIN  0040000
-#define IEXTEN  0100000
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF          0
-#define TCOON           1
-#define TCIOFF          2
-#define TCION           3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH        0
-#define TCOFLUSH        1
-#define TCIOFLUSH       2
-
-/* tcsetattr uses these */
-#define TCSANOW         0
-#define TCSADRAIN       1
-#define TCSAFLUSH       2
-
-#endif /* _ASM_TERMBITS_H */
diff --git a/include/asm-mn10300/termios.h b/include/asm-mn10300/termios.h
deleted file mode 100644
index dd7cf617e118..000000000000
--- a/include/asm-mn10300/termios.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _ASM_TERMIOS_H
-#define _ASM_TERMIOS_H
-
-#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 */
-};
-
-#ifdef __KERNEL__
-/*      intr=^C         quit=^|         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-
-/* 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
-
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-        unsigned short __tmp; \
-        get_user(__tmp, &(termio)->x); \
-        *(unsigned short *) &(termios)->x = __tmp; \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) \
-        copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) \
-        copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) \
-        copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) \
-        copy_to_user(u, k, sizeof(struct termios))
-
-#endif  /* _ASM_TERMIOS_H */
diff --git a/include/asm-mn10300/thread_info.h b/include/asm-mn10300/thread_info.h
deleted file mode 100644
index 78a3881f3c12..000000000000
--- a/include/asm-mn10300/thread_info.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* MN10300 Low-level thread information
- *
- * Copyright (C) 2007 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_THREAD_INFO_H
-#define _ASM_THREAD_INFO_H
-
-#ifdef __KERNEL__
-
-#include <asm/page.h>
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#endif
-
-#define PREEMPT_ACTIVE          0x10000000
-
-#ifdef CONFIG_4KSTACKS
-#define THREAD_SIZE             (4096)
-#else
-#define THREAD_SIZE             (8192)
-#endif
-
-#define STACK_WARN              (THREAD_SIZE / 8)
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants
- *   must also be changed
- */
-#ifndef __ASSEMBLY__
-
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        __u32                   cpu;            /* current CPU */
-        __s32                   preempt_count;  /* 0 => preemptable, <0 => BUG */
-
-        mm_segment_t            addr_limit;     /* thread address space:
-                                                   0-0xBFFFFFFF for user-thead
-                                                   0-0xFFFFFFFF for kernel-thread
-                                                */
-        struct restart_block    restart_block;
-
-        __u8                    supervisor_stack[0];
-};
-
-#else /* !__ASSEMBLY__ */
-
-#ifndef __ASM_OFFSETS_H__
-#include <asm/asm-offsets.h>
-#endif
-
-#endif
-
-/*
- * macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
- */
-#ifndef __ASSEMBLY__
-
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-#define init_uregs                                                      \
-        ((struct pt_regs *)                                             \
-         ((unsigned long) init_stack + THREAD_SIZE - sizeof(struct pt_regs)))
-
-extern struct thread_info *__current_ti;
-
-/* how to get the thread information struct from C */
-static inline __attribute__((const))
-struct thread_info *current_thread_info(void)
-{
-        struct thread_info *ti;
-        asm("mov sp,%0\n"
-            "and %1,%0\n"
-            : "=d" (ti)
-            : "i" (~(THREAD_SIZE - 1))
-            : "cc");
-        return ti;
-}
-
-/* how to get the current stack pointer from C */
-static inline unsigned long current_stack_pointer(void)
-{
-        unsigned long sp;
-        asm("mov sp,%0; ":"=r" (sp));
-        return sp;
-}
-
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
-#else
-#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-
-#define free_thread_info(ti)    kfree((ti))
-#define get_thread_info(ti)     get_task_struct((ti)->task)
-#define put_thread_info(ti)     put_task_struct((ti)->task)
-
-#else /* !__ASSEMBLY__ */
-
-#ifndef __VMLINUX_LDS__
-/* how to get the thread information struct from ASM */
-.macro GET_THREAD_INFO reg
-        mov     sp,\reg
-        and     -THREAD_SIZE,\reg
-.endm
-#endif
-#endif
-
-/*
- * thread information flags
- * - these are process state flags that various assembly files may need to
- *   access
- * - pending work-to-be-done flags are in LSW
- * - other flags in MSW
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_MEMDIE              17      /* OOM killer killed process */
-#define TIF_FREEZE              18      /* freezing for suspend */
-
-#define _TIF_SYSCALL_TRACE      +(1 << TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      +(1 << TIF_NOTIFY_RESUME)
-#define _TIF_SIGPENDING         +(1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       +(1 << TIF_NEED_RESCHED)
-#define _TIF_SINGLESTEP         +(1 << TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK    +(1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     +(1 << TIF_POLLING_NRFLAG)
-#define _TIF_FREEZE             +(1 << TIF_FREEZE)
-
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-mn10300/timer-regs.h b/include/asm-mn10300/timer-regs.h
deleted file mode 100644
index 1d883b7f94ab..000000000000
--- a/include/asm-mn10300/timer-regs.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/* AM33v2 on-board timer module registers
- *
- * Copyright (C) 2007 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_TIMER_REGS_H
-#define _ASM_TIMER_REGS_H
-
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-
-#ifdef __KERNEL__
-
-/* timer prescalar control */
-#define TMPSCNT                 __SYSREG(0xd4003071, u8) /* timer prescaler control */
-#define TMPSCNT_ENABLE          0x80    /* timer prescaler enable */
-#define TMPSCNT_DISABLE         0x00    /* timer prescaler disable */
-
-/* 8 bit timers */
-#define TM0MD                   __SYSREG(0xd4003000, u8) /* timer 0 mode register */
-#define TM0MD_SRC               0x07    /* timer source */
-#define TM0MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM0MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM0MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM0MD_SRC_TM2IO         0x03    /* - TM2IO pin input */
-#define TM0MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM0MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM0MD_SRC_TM0IO         0x07    /* - TM0IO pin input */
-#define TM0MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM0MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM1MD                   __SYSREG(0xd4003001, u8) /* timer 1 mode register */
-#define TM1MD_SRC               0x07    /* timer source */
-#define TM1MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM1MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM1MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM1MD_SRC_TM0CASCADE    0x03    /* - cascade with timer 0 */
-#define TM1MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM1MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM1MD_SRC_TM1IO         0x07    /* - TM1IO pin input */
-#define TM1MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM1MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM2MD                   __SYSREG(0xd4003002, u8) /* timer 2 mode register */
-#define TM2MD_SRC               0x07    /* timer source */
-#define TM2MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM2MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM2MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM2MD_SRC_TM1CASCADE    0x03    /* - cascade with timer 1 */
-#define TM2MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM2MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM2MD_SRC_TM2IO         0x07    /* - TM2IO pin input */
-#define TM2MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM2MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM3MD                   __SYSREG(0xd4003003, u8) /* timer 3 mode register */
-#define TM3MD_SRC               0x07    /* timer source */
-#define TM3MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM3MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM3MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM3MD_SRC_TM1CASCADE    0x03    /* - cascade with timer 2 */
-#define TM3MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM3MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM3MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM3MD_SRC_TM3IO         0x07    /* - TM3IO pin input */
-#define TM3MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM3MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM01MD                  __SYSREG(0xd4003000, u16)  /* timer 0:1 mode register */
-
-#define TM0BR                   __SYSREG(0xd4003010, u8)   /* timer 0 base register */
-#define TM1BR                   __SYSREG(0xd4003011, u8)   /* timer 1 base register */
-#define TM2BR                   __SYSREG(0xd4003012, u8)   /* timer 2 base register */
-#define TM3BR                   __SYSREG(0xd4003013, u8)   /* timer 3 base register */
-#define TM01BR                  __SYSREG(0xd4003010, u16)  /* timer 0:1 base register */
-
-#define TM0BC                   __SYSREGC(0xd4003020, u8)  /* timer 0 binary counter */
-#define TM1BC                   __SYSREGC(0xd4003021, u8)  /* timer 1 binary counter */
-#define TM2BC                   __SYSREGC(0xd4003022, u8)  /* timer 2 binary counter */
-#define TM3BC                   __SYSREGC(0xd4003023, u8)  /* timer 3 binary counter */
-#define TM01BC                  __SYSREGC(0xd4003020, u16) /* timer 0:1 binary counter */
-
-#define TM0IRQ                  2       /* timer 0 IRQ */
-#define TM1IRQ                  3       /* timer 1 IRQ */
-#define TM2IRQ                  4       /* timer 2 IRQ */
-#define TM3IRQ                  5       /* timer 3 IRQ */
-
-#define TM0ICR                  GxICR(TM0IRQ)   /* timer 0 uflow intr ctrl reg */
-#define TM1ICR                  GxICR(TM1IRQ)   /* timer 1 uflow intr ctrl reg */
-#define TM2ICR                  GxICR(TM2IRQ)   /* timer 2 uflow intr ctrl reg */
-#define TM3ICR                  GxICR(TM3IRQ)   /* timer 3 uflow intr ctrl reg */
-
-/* 16-bit timers 4,5 & 7-11 */
-#define TM4MD                   __SYSREG(0xd4003080, u8)   /* timer 4 mode register */
-#define TM4MD_SRC               0x07    /* timer source */
-#define TM4MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM4MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM4MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM4MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM4MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM4MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM4MD_SRC_TM4IO         0x07    /* - TM4IO pin input */
-#define TM4MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM4MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM5MD                   __SYSREG(0xd4003082, u8)   /* timer 5 mode register */
-#define TM5MD_SRC               0x07    /* timer source */
-#define TM5MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM5MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM5MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM5MD_SRC_TM4CASCADE    0x03    /* - cascade with timer 4 */
-#define TM5MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM5MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM5MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM5MD_SRC_TM5IO         0x07    /* - TM5IO pin input */
-#define TM5MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM5MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM7MD                   __SYSREG(0xd4003086, u8)   /* timer 7 mode register */
-#define TM7MD_SRC               0x07    /* timer source */
-#define TM7MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM7MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM7MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM7MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM7MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM7MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM7MD_SRC_TM7IO         0x07    /* - TM7IO pin input */
-#define TM7MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM7MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM8MD                   __SYSREG(0xd4003088, u8)   /* timer 8 mode register */
-#define TM8MD_SRC               0x07    /* timer source */
-#define TM8MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM8MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM8MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM8MD_SRC_TM7CASCADE    0x03    /* - cascade with timer 7 */
-#define TM8MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM8MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM8MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM8MD_SRC_TM8IO         0x07    /* - TM8IO pin input */
-#define TM8MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM8MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM9MD                   __SYSREG(0xd400308a, u8)   /* timer 9 mode register */
-#define TM9MD_SRC               0x07    /* timer source */
-#define TM9MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM9MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM9MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM9MD_SRC_TM8CASCADE    0x03    /* - cascade with timer 8 */
-#define TM9MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM9MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM9MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM9MD_SRC_TM9IO         0x07    /* - TM9IO pin input */
-#define TM9MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM9MD_COUNT_ENABLE      0x80    /* timer count enable */
-
-#define TM10MD                  __SYSREG(0xd400308c, u8)   /* timer 10 mode register */
-#define TM10MD_SRC              0x07    /* timer source */
-#define TM10MD_SRC_IOCLK        0x00    /* - IOCLK */
-#define TM10MD_SRC_IOCLK_8      0x01    /* - 1/8 IOCLK */
-#define TM10MD_SRC_IOCLK_32     0x02    /* - 1/32 IOCLK */
-#define TM10MD_SRC_TM9CASCADE   0x03    /* - cascade with timer 9 */
-#define TM10MD_SRC_TM0UFLOW     0x04    /* - timer 0 underflow */
-#define TM10MD_SRC_TM1UFLOW     0x05    /* - timer 1 underflow */
-#define TM10MD_SRC_TM2UFLOW     0x06    /* - timer 2 underflow */
-#define TM10MD_SRC_TM10IO       0x07    /* - TM10IO pin input */
-#define TM10MD_INIT_COUNTER     0x40    /* initialize TMnBC = TMnBR */
-#define TM10MD_COUNT_ENABLE     0x80    /* timer count enable */
-
-#define TM11MD                  __SYSREG(0xd400308e, u8)   /* timer 11 mode register */
-#define TM11MD_SRC              0x07    /* timer source */
-#define TM11MD_SRC_IOCLK        0x00    /* - IOCLK */
-#define TM11MD_SRC_IOCLK_8      0x01    /* - 1/8 IOCLK */
-#define TM11MD_SRC_IOCLK_32     0x02    /* - 1/32 IOCLK */
-#define TM11MD_SRC_TM7CASCADE   0x03    /* - cascade with timer 7 */
-#define TM11MD_SRC_TM0UFLOW     0x04    /* - timer 0 underflow */
-#define TM11MD_SRC_TM1UFLOW     0x05    /* - timer 1 underflow */
-#define TM11MD_SRC_TM2UFLOW     0x06    /* - timer 2 underflow */
-#define TM11MD_SRC_TM11IO       0x07    /* - TM11IO pin input */
-#define TM11MD_INIT_COUNTER     0x40    /* initialize TMnBC = TMnBR */
-#define TM11MD_COUNT_ENABLE     0x80    /* timer count enable */
-
-#define TM4BR                   __SYSREG(0xd4003090, u16)  /* timer 4 base register */
-#define TM5BR                   __SYSREG(0xd4003092, u16)  /* timer 5 base register */
-#define TM7BR                   __SYSREG(0xd4003096, u16)  /* timer 7 base register */
-#define TM8BR                   __SYSREG(0xd4003098, u16)  /* timer 8 base register */
-#define TM9BR                   __SYSREG(0xd400309a, u16)  /* timer 9 base register */
-#define TM10BR                  __SYSREG(0xd400309c, u16)  /* timer 10 base register */
-#define TM11BR                  __SYSREG(0xd400309e, u16)  /* timer 11 base register */
-#define TM45BR                  __SYSREG(0xd4003090, u32)  /* timer 4:5 base register */
-
-#define TM4BC                   __SYSREG(0xd40030a0, u16)  /* timer 4 binary counter */
-#define TM5BC                   __SYSREG(0xd40030a2, u16)  /* timer 5 binary counter */
-#define TM45BC                  __SYSREG(0xd40030a0, u32)  /* timer 4:5 binary counter */
-
-#define TM7BC                   __SYSREG(0xd40030a6, u16)  /* timer 7 binary counter */
-#define TM8BC                   __SYSREG(0xd40030a8, u16)  /* timer 8 binary counter */
-#define TM9BC                   __SYSREG(0xd40030aa, u16)  /* timer 9 binary counter */
-#define TM10BC                  __SYSREG(0xd40030ac, u16)  /* timer 10 binary counter */
-#define TM11BC                  __SYSREG(0xd40030ae, u16)  /* timer 11 binary counter */
-
-#define TM4IRQ                  6       /* timer 4 IRQ */
-#define TM5IRQ                  7       /* timer 5 IRQ */
-#define TM7IRQ                  11      /* timer 7 IRQ */
-#define TM8IRQ                  12      /* timer 8 IRQ */
-#define TM9IRQ                  13      /* timer 9 IRQ */
-#define TM10IRQ                 14      /* timer 10 IRQ */
-#define TM11IRQ                 15      /* timer 11 IRQ */
-
-#define TM4ICR                  GxICR(TM4IRQ)   /* timer 4 uflow intr ctrl reg */
-#define TM5ICR                  GxICR(TM5IRQ)   /* timer 5 uflow intr ctrl reg */
-#define TM7ICR                  GxICR(TM7IRQ)   /* timer 7 uflow intr ctrl reg */
-#define TM8ICR                  GxICR(TM8IRQ)   /* timer 8 uflow intr ctrl reg */
-#define TM9ICR                  GxICR(TM9IRQ)   /* timer 9 uflow intr ctrl reg */
-#define TM10ICR                 GxICR(TM10IRQ)  /* timer 10 uflow intr ctrl reg */
-#define TM11ICR                 GxICR(TM11IRQ)  /* timer 11 uflow intr ctrl reg */
-
-/* 16-bit timer 6 */
-#define TM6MD                   __SYSREG(0xd4003084, u16)  /* timer6 mode register */
-#define TM6MD_SRC               0x0007  /* timer source */
-#define TM6MD_SRC_IOCLK         0x0000  /* - IOCLK */
-#define TM6MD_SRC_IOCLK_8       0x0001  /* - 1/8 IOCLK */
-#define TM6MD_SRC_IOCLK_32      0x0002  /* - 1/32 IOCLK */
-#define TM6MD_SRC_TM0UFLOW      0x0004  /* - timer 0 underflow */
-#define TM6MD_SRC_TM1UFLOW      0x0005  /* - timer 1 underflow */
-#define TM6MD_SRC_TM6IOB_BOTH   0x0006  /* - TM6IOB pin input (both edges) */
-#define TM6MD_SRC_TM6IOB_SINGLE 0x0007  /* - TM6IOB pin input (single edge) */
-#define TM6MD_CLR_ENABLE        0x0010  /* clear count enable */
-#define TM6MD_ONESHOT_ENABLE    0x0040  /* oneshot count */
-#define TM6MD_TRIG_ENABLE       0x0080  /* TM6IOB pin trigger enable */
-#define TM6MD_PWM               0x3800  /* PWM output mode */
-#define TM6MD_PWM_DIS           0x0000  /* - disabled */
-#define TM6MD_PWM_10BIT         0x1000  /* - 10 bits mode */
-#define TM6MD_PWM_11BIT         0x1800  /* - 11 bits mode */
-#define TM6MD_PWM_12BIT         0x3000  /* - 12 bits mode */
-#define TM6MD_PWM_14BIT         0x3800  /* - 14 bits mode */
-#define TM6MD_INIT_COUNTER      0x4000  /* initialize TMnBC to zero */
-#define TM6MD_COUNT_ENABLE      0x8000  /* timer count enable */
-
-#define TM6MDA                  __SYSREG(0xd40030b4, u8)   /* timer6 cmp/cap A mode reg */
-#define TM6MDA_OUT              0x07    /* output select */
-#define TM6MDA_OUT_SETA_RESETB  0x00    /* - set at match A, reset at match B */
-#define TM6MDA_OUT_SETA_RESETOV 0x01    /* - set at match A, reset at overflow */
-#define TM6MDA_OUT_SETA         0x02    /* - set at match A */
-#define TM6MDA_OUT_RESETA       0x03    /* - reset at match A */
-#define TM6MDA_OUT_TOGGLE       0x04    /* - toggle on match A */
-#define TM6MDA_MODE             0xc0    /* compare A register mode */
-#define TM6MDA_MODE_CMP_SINGLE  0x00    /* - compare, single buffer mode */
-#define TM6MDA_MODE_CMP_DOUBLE  0x40    /* - compare, double buffer mode */
-#define TM6MDA_MODE_CAP_S_EDGE  0x80    /* - capture, single edge mode */
-#define TM6MDA_MODE_CAP_D_EDGE  0xc0    /* - capture, double edge mode */
-#define TM6MDA_EDGE             0x20    /* compare A edge select */
-#define TM6MDA_EDGE_FALLING     0x00    /* capture on falling edge */
-#define TM6MDA_EDGE_RISING      0x20    /* capture on rising edge */
-#define TM6MDA_CAPTURE_ENABLE   0x10    /* capture enable */
-
-#define TM6MDB                  __SYSREG(0xd40030b5, u8)   /* timer6 cmp/cap B mode reg */
-#define TM6MDB_OUT              0x07    /* output select */
-#define TM6MDB_OUT_SETB_RESETA  0x00    /* - set at match B, reset at match A */
-#define TM6MDB_OUT_SETB_RESETOV 0x01    /* - set at match B */
-#define TM6MDB_OUT_RESETB       0x03    /* - reset at match B */
-#define TM6MDB_OUT_TOGGLE       0x04    /* - toggle on match B */
-#define TM6MDB_MODE             0xc0    /* compare B register mode */
-#define TM6MDB_MODE_CMP_SINGLE  0x00    /* - compare, single buffer mode */
-#define TM6MDB_MODE_CMP_DOUBLE  0x40    /* - compare, double buffer mode */
-#define TM6MDB_MODE_CAP_S_EDGE  0x80    /* - capture, single edge mode */
-#define TM6MDB_MODE_CAP_D_EDGE  0xc0    /* - capture, double edge mode */
-#define TM6MDB_EDGE             0x20    /* compare B edge select */
-#define TM6MDB_EDGE_FALLING     0x00    /* capture on falling edge */
-#define TM6MDB_EDGE_RISING      0x20    /* capture on rising edge */
-#define TM6MDB_CAPTURE_ENABLE   0x10    /* capture enable */
-
-#define TM6CA                   __SYSREG(0xd40030c4, u16)   /* timer6 cmp/capture reg A */
-#define TM6CB                   __SYSREG(0xd40030d4, u16)   /* timer6 cmp/capture reg B */
-#define TM6BC                   __SYSREG(0xd40030a4, u16)   /* timer6 binary counter */
-
-#define TM6IRQ                  6       /* timer 6 IRQ */
-#define TM6AIRQ                 9       /* timer 6A IRQ */
-#define TM6BIRQ                 10      /* timer 6B IRQ */
-
-#define TM6ICR                  GxICR(TM6IRQ)   /* timer 6 uflow intr ctrl reg */
-#define TM6AICR                 GxICR(TM6AIRQ)  /* timer 6A intr control reg */
-#define TM6BICR                 GxICR(TM6BIRQ)  /* timer 6B intr control reg */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_TIMER_REGS_H */
diff --git a/include/asm-mn10300/timex.h b/include/asm-mn10300/timex.h
deleted file mode 100644
index 3944277dab67..000000000000
--- a/include/asm-mn10300/timex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* MN10300 Architecture time management specifications
- *
- * Copyright (C) 2007 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_TIMEX_H
-#define _ASM_TIMEX_H
-
-#include <asm/hardirq.h>
-#include <asm/unit/timex.h>
-
-#define TICK_SIZE (tick_nsec / 1000)
-
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ - this should probably be set
-                                 * to something appropriate, but what? */
-
-extern cycles_t cacheflush_time;
-
-#ifdef __KERNEL__
-
-static inline cycles_t get_cycles(void)
-{
-        return read_timestamp_counter();
-}
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_TIMEX_H */
diff --git a/include/asm-mn10300/tlb.h b/include/asm-mn10300/tlb.h
deleted file mode 100644
index 65d232b96613..000000000000
--- a/include/asm-mn10300/tlb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN10300 TLB definitions
- *
- * Copyright (C) 2007 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_TLB_H
-#define _ASM_TLB_H
-
-#include <asm/tlbflush.h>
-
-extern void check_pgt_cache(void);
-
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#define tlb_start_vma(tlb, vma)                         do { } while (0)
-#define tlb_end_vma(tlb, vma)                           do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)      do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)  flush_tlb_mm((tlb)->mm)
-
-/* for now, just use the generic stuff */
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_TLB_H */
diff --git a/include/asm-mn10300/tlbflush.h b/include/asm-mn10300/tlbflush.h
deleted file mode 100644
index e0239865abcb..000000000000
--- a/include/asm-mn10300/tlbflush.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* MN10300 TLB flushing functions
- *
- * Copyright (C) 2007 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_TLBFLUSH_H
-#define _ASM_TLBFLUSH_H
-
-#include <asm/processor.h>
-
-#define __flush_tlb()                                           \
-do {                                                            \
-        int w;                                                  \
-        __asm__ __volatile__                                    \
-                ("      mov %1,%0               \n"             \
-                 "      or %2,%0                \n"             \
-                 "      mov %0,%1               \n"             \
-                 : "=d"(w)                                      \
-                 : "m"(MMUCTR), "i"(MMUCTR_IIV|MMUCTR_DIV)      \
-                 : "memory"                                     \
-                 );                                             \
-} while (0)
-
-#define __flush_tlb_all() __flush_tlb()
-#define __flush_tlb_one(addr) __flush_tlb()
-
-
-/*
- * TLB flushing:
- *
- *  - flush_tlb() flushes the current mm struct TLBs
- *  - flush_tlb_all() flushes all processes TLBs
- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
- *  - flush_tlb_page(vma, vmaddr) flushes one page
- *  - flush_tlb_range(mm, start, end) flushes a range of pages
- *  - flush_tlb_pgtables(mm, start, end) flushes a range of page tables
- */
-#define flush_tlb_all()                         \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while (0)
-
-#define flush_tlb_mm(mm)                        \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while (0)
-
-#define flush_tlb_range(vma, start, end)                        \
-do {                                                            \
-        unsigned long __s __attribute__((unused)) = (start);    \
-        unsigned long __e __attribute__((unused)) = (end);      \
-        preempt_disable();                                      \
-        __flush_tlb_all();                                      \
-        preempt_enable();                                       \
-} while (0)
-
-
-#define __flush_tlb_global()                    flush_tlb_all()
-#define flush_tlb()                             flush_tlb_all()
-#define flush_tlb_kernel_range(start, end)                      \
-do {                                                            \
-        unsigned long __s __attribute__((unused)) = (start);    \
-        unsigned long __e __attribute__((unused)) = (end);      \
-        flush_tlb_all();                                        \
-} while (0)
-
-extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);
-
-#define flush_tlb_pgtables(mm, start, end)      do {} while (0)
-
-#endif /* _ASM_TLBFLUSH_H */
diff --git a/include/asm-mn10300/topology.h b/include/asm-mn10300/topology.h
deleted file mode 100644
index 5428f333a02c..000000000000
--- a/include/asm-mn10300/topology.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/topology.h>
diff --git a/include/asm-mn10300/types.h b/include/asm-mn10300/types.h
deleted file mode 100644
index 7b9f01042fd4..000000000000
--- a/include/asm-mn10300/types.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* MN10300 Basic type definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_TYPES_H
-#define _ASM_TYPES_H
-
-#include <asm-generic/int-ll64.h>
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#define BITS_PER_LONG 32
-
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_TYPES_H */
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h
deleted file mode 100644
index 8a3a4dd55763..000000000000
--- a/include/asm-mn10300/uaccess.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* MN10300 userspace access functions
- *
- * Copyright (C) 2007 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_UACCESS_H
-#define _ASM_UACCESS_H
-
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/errno.h>
-
-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons, these macros are grossly misnamed.
- */
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-
-#define KERNEL_XDS      MAKE_MM_SEG(0xBFFFFFFF)
-#define KERNEL_DS       MAKE_MM_SEG(0x9FFFFFFF)
-#define USER_DS         MAKE_MM_SEG(TASK_SIZE)
-
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-#define __kernel_ds_p() (current_thread_info()->addr_limit.seg == 0x9FFFFFFF)
-
-#define segment_eq(a, b) ((a).seg == (b).seg)
-
-#define __addr_ok(addr) \
-        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-/*
- * check that a range of addresses falls within the current address limit
- */
-static inline int ___range_ok(unsigned long addr, unsigned int size)
-{
-        int flag = 1, tmp;
-
-        asm("   add     %3,%1   \n"     /* set C-flag if addr + size > 4Gb */
-            "   bcs     0f      \n"
-            "   cmp     %4,%1   \n"     /* jump if addr+size>limit (error) */
-            "   bhi     0f      \n"
-            "   clr     %0      \n"     /* mark okay */
-            "0:                 \n"
-            : "=r"(flag), "=&r"(tmp)
-            : "1"(addr), "ir"(size),
-              "r"(current_thread_info()->addr_limit.seg), "0"(flag)
-            : "cc"
-            );
-
-        return flag;
-}
-
-#define __range_ok(addr, size) ___range_ok((unsigned long)(addr), (u32)(size))
-
-#define access_ok(type, addr, size) (__range_ok((addr), (size)) == 0)
-#define __access_ok(addr, size)     (__range_ok((addr), (size)) == 0)
-
-static inline int verify_area(int type, const void *addr, unsigned long size)
-{
-        return access_ok(type, addr, size) ? 0 : -EFAULT;
-}
-
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern int fixup_exception(struct pt_regs *regs);
-
-#define put_user(x, ptr) __put_user_check((x), (ptr), sizeof(*(ptr)))
-#define get_user(x, ptr) __get_user_check((x), (ptr), sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x, ptr) __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
-#define __get_user(x, ptr) __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
-
-/*
- * The "xxx_ret" versions return constant specified in third argument, if
- * something bad happens. These macros can be optimized for the
- * case of just returning from the function xxx_ret is used.
- */
-
-#define put_user_ret(x, ptr, ret) \
-        ({ if (put_user((x), (ptr)))    return (ret); })
-#define get_user_ret(x, ptr, ret) \
-        ({ if (get_user((x), (ptr)))    return (ret); })
-#define __put_user_ret(x, ptr, ret) \
-        ({ if (__put_user((x), (ptr)))  return (ret); })
-#define __get_user_ret(x, ptr, ret) \
-        ({ if (__get_user((x), (ptr)))  return (ret); })
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
-
-#define __get_user_nocheck(x, ptr, size)        \
-({                                              \
-        __typeof(*(ptr)) __gu_val;              \
-        unsigned long __gu_addr;                \
-        int __gu_err;                           \
-        __gu_addr = (unsigned long) (ptr);      \
-        switch (size) {                         \
-        case 1:  __get_user_asm("bu"); break;   \
-        case 2:  __get_user_asm("hu"); break;   \
-        case 4:  __get_user_asm(""  ); break;   \
-        default: __get_user_unknown(); break;   \
-        }                                       \
-        x = (__typeof__(*(ptr))) __gu_val;      \
-        __gu_err;                               \
-})
-
-#define __get_user_check(x, ptr, size)                  \
-({                                                      \
-        __typeof__(*(ptr)) __gu_val;                    \
-        unsigned long __gu_addr;                        \
-        int __gu_err;                                   \
-        __gu_addr = (unsigned long) (ptr);              \
-        if (likely(__access_ok(__gu_addr,size))) {      \
-                switch (size) {                         \
-                case 1:  __get_user_asm("bu"); break;   \
-                case 2:  __get_user_asm("hu"); break;   \
-                case 4:  __get_user_asm(""  ); break;   \
-                default: __get_user_unknown(); break;   \
-                }                                       \
-        }                                               \
-        else {                                          \
-                __gu_err = -EFAULT;                     \
-                __gu_val = 0;                           \
-        }                                               \
-        x = (__typeof__(*(ptr))) __gu_val;              \
-        __gu_err;                                       \
-})
-
-#define __get_user_asm(INSN)                                    \
-({                                                              \
-        asm volatile(                                   \
-                "1:\n"                                          \
-                "       mov"INSN"       %2,%1\n"                \
-                "       mov             0,%0\n"                 \
-                "2:\n"                                          \
-                "       .section        .fixup,\"ax\"\n"        \
-                "3:\n\t"                                        \
-                "       mov             %3,%0\n"                \
-                "       jmp             2b\n"                   \
-                "       .previous\n"                            \
-                "       .section        __ex_table,\"a\"\n"     \
-                "       .balign         4\n"                    \
-                "       .long           1b, 3b\n"               \
-                "       .previous"                              \
-                : "=&r" (__gu_err), "=&r" (__gu_val)            \
-                : "m" (__m(__gu_addr)), "i" (-EFAULT));         \
-})
-
-extern int __get_user_unknown(void);
-
-#define __put_user_nocheck(x, ptr, size)                        \
-({                                                              \
-        union {                                                 \
-                __typeof__(*(ptr)) val;                         \
-                u32 bits[2];                                    \
-        } __pu_val;                                             \
-        unsigned long __pu_addr;                                \
-        int __pu_err;                                           \
-        __pu_val.val = (x);                                     \
-        __pu_addr = (unsigned long) (ptr);                      \
-        switch (size) {                                         \
-        case 1:  __put_user_asm("bu"); break;                   \
-        case 2:  __put_user_asm("hu"); break;                   \
-        case 4:  __put_user_asm(""  ); break;                   \
-        case 8:  __put_user_asm8();    break;                   \
-        default: __pu_err = __put_user_unknown(); break;        \
-        }                                                       \
-        __pu_err;                                               \
-})
-
-#define __put_user_check(x, ptr, size)                                  \
-({                                                                      \
-        union {                                                         \
-                __typeof__(*(ptr)) val;                                 \
-                u32 bits[2];                                            \
-        } __pu_val;                                                     \
-        unsigned long __pu_addr;                                        \
-        int __pu_err;                                                   \
-        __pu_val.val = (x);                                             \
-        __pu_addr = (unsigned long) (ptr);                              \
-        if (likely(__access_ok(__pu_addr, size))) {                     \
-                switch (size) {                                         \
-                case 1:  __put_user_asm("bu"); break;                   \
-                case 2:  __put_user_asm("hu"); break;                   \
-                case 4:  __put_user_asm(""  ); break;                   \
-                case 8:  __put_user_asm8();    break;                   \
-                default: __pu_err = __put_user_unknown(); break;        \
-                }                                                       \
-        }                                                               \
-        else {                                                          \
-                __pu_err = -EFAULT;                                     \
-        }                                                               \
-        __pu_err;                                                       \
-})
-
-#define __put_user_asm(INSN)                                    \
-({                                                              \
-        asm volatile(                                           \
-                "1:\n"                                          \
-                "       mov"INSN"       %1,%2\n"                \
-                "       mov             0,%0\n"                 \
-                "2:\n"                                          \
-                "       .section        .fixup,\"ax\"\n"        \
-                "3:\n"                                          \
-                "       mov             %3,%0\n"                \
-                "       jmp             2b\n"                   \
-                "       .previous\n"                            \
-                "       .section        __ex_table,\"a\"\n"     \
-                "       .balign         4\n"                    \
-                "       .long           1b, 3b\n"               \
-                "       .previous"                              \
-                : "=&r" (__pu_err)                              \
-                : "r" (__pu_val.val), "m" (__m(__pu_addr)),     \
-                  "i" (-EFAULT)                                 \
-                );                                              \
-})
-
-#define __put_user_asm8()                                               \
-({                                                                      \
-        asm volatile(                                                   \
-                "1:     mov             %1,%3           \n"             \
-                "2:     mov             %2,%4           \n"             \
-                "       mov             0,%0            \n"             \
-                "3:                                     \n"             \
-                "       .section        .fixup,\"ax\"   \n"             \
-                "4:                                     \n"             \
-                "       mov             %5,%0           \n"             \
-                "       jmp             3b              \n"             \
-                "       .previous                       \n"             \
-                "       .section        __ex_table,\"a\"\n"             \
-                "       .balign         4               \n"             \
-                "       .long           1b, 4b          \n"             \
-                "       .long           2b, 4b          \n"             \
-                "       .previous                       \n"             \
-                : "=&r" (__pu_err)                                      \
-                : "r" (__pu_val.bits[0]), "r" (__pu_val.bits[1]),       \
-                  "m" (__m(__pu_addr)), "m" (__m(__pu_addr+4)),         \
-                  "i" (-EFAULT)                                         \
-                );                                                      \
-})
-
-extern int __put_user_unknown(void);
-
-
-/*
- * Copy To/From Userspace
- */
-/* Generic arbitrary sized copy.  */
-#define __copy_user(to, from, size)                                     \
-do {                                                                    \
-        if (size) {                                                     \
-                void *__to = to;                                        \
-                const void *__from = from;                              \
-                int w;                                                  \
-                asm volatile(                                           \
-                        "0:     movbu   (%0),%3;\n"                     \
-                        "1:     movbu   %3,(%1);\n"                     \
-                        "       inc     %0;\n"                          \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     0b;\n"                          \
-                        "2:\n"                                          \
-                        "       .section .fixup,\"ax\"\n"               \
-                        "3:     jmp     2b\n"                           \
-                        "       .previous\n"                            \
-                        "       .section __ex_table,\"a\"\n"            \
-                        "       .balign 4\n"                            \
-                        "       .long   0b,3b\n"                        \
-                        "       .long   1b,3b\n"                        \
-                        "       .previous\n"                            \
-                        : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
-                        : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
-        }                                                               \
-} while (0)
-
-#define __copy_user_zeroing(to, from, size)                             \
-do {                                                                    \
-        if (size) {                                                     \
-                void *__to = to;                                        \
-                const void *__from = from;                              \
-                int w;                                                  \
-                asm volatile(                                           \
-                        "0:     movbu   (%0),%3;\n"                     \
-                        "1:     movbu   %3,(%1);\n"                     \
-                        "       inc     %0;\n"                          \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     0b;\n"                          \
-                        "2:\n"                                          \
-                        "       .section .fixup,\"ax\"\n"               \
-                        "3:\n"                                          \
-                        "       mov     %2,%0\n"                        \
-                        "       clr     %3\n"                           \
-                        "4:     movbu   %3,(%1);\n"                     \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     4b;\n"                          \
-                        "       mov     %0,%2\n"                        \
-                        "       jmp     2b\n"                           \
-                        "       .previous\n"                            \
-                        "       .section __ex_table,\"a\"\n"            \
-                        "       .balign 4\n"                            \
-                        "       .long   0b,3b\n"                        \
-                        "       .long   1b,3b\n"                        \
-                        "       .previous\n"                            \
-                        : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
-                        : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
-        }                                                               \
-} while (0)
-
-/* We let the __ versions of copy_from/to_user inline, because they're often
- * used in fast paths and have only a small space overhead.
- */
-static inline
-unsigned long __generic_copy_from_user_nocheck(void *to, const void *from,
-                                               unsigned long n)
-{
-        __copy_user_zeroing(to, from, n);
-        return n;
-}
-
-static inline
-unsigned long __generic_copy_to_user_nocheck(void *to, const void *from,
-                                             unsigned long n)
-{
-        __copy_user(to, from, n);
-        return n;
-}
-
-
-#if 0
-#error don't use - these macros don't increment to & from pointers
-/* Optimize just a little bit when we know the size of the move. */
-#define __constant_copy_user(to, from, size)    \
-do {                                            \
-        asm volatile(                           \
-                "       mov %0,a0;\n"           \
-                "0:     movbu (%1),d3;\n"       \
-                "1:     movbu d3,(%2);\n"       \
-                "       add -1,a0;\n"           \
-                "       bne 0b;\n"              \
-                "2:;"                           \
-                ".section .fixup,\"ax\"\n"      \
-                "3:     jmp 2b\n"               \
-                ".previous\n"                   \
-                ".section __ex_table,\"a\"\n"   \
-                "       .balign 4\n"            \
-                "       .long 0b,3b\n"          \
-                "       .long 1b,3b\n"          \
-                ".previous"                     \
-                :                               \
-                : "d"(size), "d"(to), "d"(from) \
-                : "d3", "a0");                  \
-} while (0)
-
-/* Optimize just a little bit when we know the size of the move. */
-#define __constant_copy_user_zeroing(to, from, size)    \
-do {                                                    \
-        asm volatile(                                   \
-                "       mov %0,a0;\n"                   \
-                "0:     movbu (%1),d3;\n"               \
-                "1:     movbu d3,(%2);\n"               \
-                "       add -1,a0;\n"                   \
-                "       bne 0b;\n"                      \
-                "2:;"                                   \
-                ".section .fixup,\"ax\"\n"              \
-                "3:     jmp 2b\n"                       \
-                ".previous\n"                           \
-                ".section __ex_table,\"a\"\n"           \
-                "       .balign 4\n"                    \
-                "       .long 0b,3b\n"                  \
-                "       .long 1b,3b\n"                  \
-                ".previous"                             \
-                :                                       \
-                : "d"(size), "d"(to), "d"(from)         \
-                : "d3", "a0");                          \
-} while (0)
-
-static inline
-unsigned long __constant_copy_to_user(void *to, const void *from,
-                                      unsigned long n)
-{
-        if (access_ok(VERIFY_WRITE, to, n))
-                __constant_copy_user(to, from, n);
-        return n;
-}
-
-static inline
-unsigned long __constant_copy_from_user(void *to, const void *from,
-                                        unsigned long n)
-{
-        if (access_ok(VERIFY_READ, from, n))
-                __constant_copy_user_zeroing(to, from, n);
-        return n;
-}
-
-static inline
-unsigned long __constant_copy_to_user_nocheck(void *to, const void *from,
-                                              unsigned long n)
-{
-        __constant_copy_user(to, from, n);
-        return n;
-}
-
-static inline
-unsigned long __constant_copy_from_user_nocheck(void *to, const void *from,
-                                                unsigned long n)
-{
-        __constant_copy_user_zeroing(to, from, n);
-        return n;
-}
-#endif
-
-extern unsigned long __generic_copy_to_user(void __user *, const void *,
-                                            unsigned long);
-extern unsigned long __generic_copy_from_user(void *, const void __user *,
-                                              unsigned long);
-
-#define __copy_to_user_inatomic(to, from, n) \
-        __generic_copy_to_user_nocheck((to), (from), (n))
-#define __copy_from_user_inatomic(to, from, n) \
-        __generic_copy_from_user_nocheck((to), (from), (n))
-
-#define __copy_to_user(to, from, n)                     \
-({                                                      \
-        might_sleep();                                  \
-        __copy_to_user_inatomic((to), (from), (n));     \
-})
-
-#define __copy_from_user(to, from, n)                   \
-({                                                      \
-        might_sleep();                                  \
-        __copy_from_user_inatomic((to), (from), (n));   \
-})
-
-
-#define copy_to_user(to, from, n)   __generic_copy_to_user((to), (from), (n))
-#define copy_from_user(to, from, n) __generic_copy_from_user((to), (from), (n))
-
-extern long strncpy_from_user(char *dst, const char __user *src, long count);
-extern long __strncpy_from_user(char *dst, const char __user *src, long count);
-extern long strnlen_user(const char __user *str, long n);
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
-extern unsigned long clear_user(void __user *mem, unsigned long len);
-extern unsigned long __clear_user(void __user *mem, unsigned long len);
-
-#endif /* _ASM_UACCESS_H */
diff --git a/include/asm-mn10300/ucontext.h b/include/asm-mn10300/ucontext.h
deleted file mode 100644
index fcab5c1d8e18..000000000000
--- a/include/asm-mn10300/ucontext.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MN10300 User context
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_UCONTEXT_H
-#define _ASM_UCONTEXT_H
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct sigcontext uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* _ASM_UCONTEXT_H */
diff --git a/include/asm-mn10300/unaligned.h b/include/asm-mn10300/unaligned.h
deleted file mode 100644
index 0df671318ae4..000000000000
--- a/include/asm-mn10300/unaligned.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Unaligned memory access handling
- *
- * Copyright (C) 2007 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_MN10300_UNALIGNED_H
-#define _ASM_MN10300_UNALIGNED_H
-
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_le
-#define put_unaligned   __put_unaligned_le
-
-#endif /* _ASM_MN10300_UNALIGNED_H */
diff --git a/include/asm-mn10300/unistd.h b/include/asm-mn10300/unistd.h
deleted file mode 100644
index 543a4f98695d..000000000000
--- a/include/asm-mn10300/unistd.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* MN10300 System call number list
- *
- * Copyright (C) 2007 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_UNISTD_H
-#define _ASM_UNISTD_H
-
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_profil              98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_ioperm             101
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-#define __NR_olduname           109
-#define __NR_iopl               110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_vm86old            113
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-#define __NR_modify_ldt         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-#define __NR_vm86               166
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_madvise1           219     /* delete when C lib stub is removed */
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-/* 223 is unused */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_cacheflush         289
-#define __NR_ioprio_set         290
-#define __NR_ioprio_get         291
-#define __NR_inotify_init       292
-#define __NR_inotify_add_watch  293
-#define __NR_inotify_rm_watch   294
-#define __NR_migrate_pages      295
-#define __NR_openat             296
-#define __NR_mkdirat            297
-#define __NR_mknodat            298
-#define __NR_fchownat           299
-#define __NR_futimesat          300
-#define __NR_fstatat64          301
-#define __NR_unlinkat           302
-#define __NR_renameat           303
-#define __NR_linkat             304
-#define __NR_symlinkat          305
-#define __NR_readlinkat         306
-#define __NR_fchmodat           307
-#define __NR_faccessat          308
-#define __NR_pselect6           309
-#define __NR_ppoll              310
-#define __NR_unshare            311
-#define __NR_set_robust_list    312
-#define __NR_get_robust_list    313
-#define __NR_splice             314
-#define __NR_sync_file_range    315
-#define __NR_tee                316
-#define __NR_vmsplice           317
-#define __NR_move_pages         318
-#define __NR_getcpu             319
-#define __NR_epoll_pwait        320
-#define __NR_utimensat          321
-#define __NR_signalfd           322
-#define __NR_timerfd_create     323
-#define __NR_eventfd            324
-#define __NR_fallocate          325
-#define __NR_timerfd_settime    326
-#define __NR_timerfd_gettime    327
-#define __NR_signalfd4          328
-#define __NR_eventfd2           329
-#define __NR_epoll_create1      330
-#define __NR_dup3               331
-#define __NR_pipe2              332
-#define __NR_inotify_init1      333
-
-#ifdef __KERNEL__
-
-#define NR_syscalls 326
-
-/*
- * specify the deprecated syscalls we want to support on this arch
- */
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-#define __ARCH_WANT_SYS_RT_SIGSUSPEND
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-#endif
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_UNISTD_H */
diff --git a/include/asm-mn10300/unit-asb2303/clock.h b/include/asm-mn10300/unit-asb2303/clock.h
deleted file mode 100644
index 8b450e920af1..000000000000
--- a/include/asm-mn10300/unit-asb2303/clock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ASB2303-specific clocks
- *
- * Copyright (C) 2007 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_UNIT_CLOCK_H
-#define _ASM_UNIT_CLOCK_H
-
-#ifndef __ASSEMBLY__
-
-#ifdef CONFIG_MN10300_RTC
-
-extern unsigned long mn10300_ioclk;     /* IOCLK (crystal speed) in HZ */
-extern unsigned long mn10300_iobclk;
-extern unsigned long mn10300_tsc_per_HZ;
-
-#define MN10300_IOCLK           ((unsigned long)mn10300_ioclk)
-/* If this processors has a another clock, uncomment the below. */
-/* #define MN10300_IOBCLK       ((unsigned long)mn10300_iobclk) */
-
-#else /* !CONFIG_MN10300_RTC */
-
-#define MN10300_IOCLK           33333333UL
-/* #define MN10300_IOBCLK       66666666UL */
-
-#endif /* !CONFIG_MN10300_RTC */
-
-#define MN10300_JCCLK           MN10300_IOCLK
-#define MN10300_TSCCLK          MN10300_IOCLK
-
-#ifdef CONFIG_MN10300_RTC
-#define MN10300_TSC_PER_HZ      ((unsigned long)mn10300_tsc_per_HZ)
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_TSC_PER_HZ      (MN10300_TSCCLK/HZ)
-#endif /* !CONFIG_MN10300_RTC */
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_CLOCK_H */
diff --git a/include/asm-mn10300/unit-asb2303/leds.h b/include/asm-mn10300/unit-asb2303/leds.h
deleted file mode 100644
index 3a7543ea7b5c..000000000000
--- a/include/asm-mn10300/unit-asb2303/leds.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ASB2303-specific LEDs
- *
- * Copyright (C) 2007 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_UNIT_LEDS_H
-#define _ASM_UNIT_LEDS_H
-
-#include <asm/pio-regs.h>
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-
-#define ASB2303_GPIO0DEF        __SYSREG(0xDB000000, u32)
-#define ASB2303_7SEGLEDS        __SYSREG(0xDB000008, u32)
-
-/*
- * use the 7-segment LEDs to indicate states
- */
-
-/* flip the 7-segment LEDs between "G" and "-" */
-#define mn10300_set_gdbleds(ONOFF)                      \
-do {                                                    \
-        ASB2303_7SEGLEDS = (ONOFF) ? 0x85 : 0x7f;       \
-} while (0)
-
-/* indicate double-fault by displaying "d" on the LEDs */
-#define mn10300_set_dbfleds                     \
-        mov     0x43,d0                 ;       \
-        movbu   d0,(ASB2303_7SEGLEDS)
-
-#ifndef __ASSEMBLY__
-extern void peripheral_leds_display_exception(enum exception_code code);
-extern void peripheral_leds_led_chase(void);
-extern void debug_to_serial(const char *p, int n);
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_LEDS_H */
diff --git a/include/asm-mn10300/unit-asb2303/serial.h b/include/asm-mn10300/unit-asb2303/serial.h
deleted file mode 100644
index 0d55cf5896ac..000000000000
--- a/include/asm-mn10300/unit-asb2303/serial.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ASB2303-specific 8250 serial ports
- *
- * Copyright (C) 2007 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_UNIT_SERIAL_H
-#define _ASM_UNIT_SERIAL_H
-
-#include <asm/cpu-regs.h>
-#include <asm/proc/irq.h>
-#include <linux/serial_reg.h>
-
-#define SERIAL_PORT0_BASE_ADDRESS       0xA6FB0000
-#define SERIAL_PORT1_BASE_ADDRESS       0xA6FC0000
-
-#define SERIAL_IRQ      XIRQ0   /* Dual serial (PC16552)        (Hi) */
-
-/*
- * dispose of the /dev/ttyS0 and /dev/ttyS1 serial ports
- */
-#ifndef CONFIG_GDBSTUB_ON_TTYSx
-
-#define SERIAL_PORT_DFNS                                                \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT0_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },                                                              \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT1_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },
-
-#ifndef __ASSEMBLY__
-
-static inline void __debug_to_serial(const char *p, int n)
-{
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#else /* CONFIG_GDBSTUB_ON_TTYSx */
-
-#define SERIAL_PORT_DFNS /* both stolen by gdb-stub because they share an IRQ */
-
-#if defined(CONFIG_GDBSTUB_ON_TTYS0)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-
-#elif defined(CONFIG_GDBSTUB_ON_TTYS1)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-#endif
-
-#ifndef __ASSEMBLY__
-
-#define LSR_WAIT_FOR(STATE)                                     \
-do {                                                            \
-        while (!(GDBPORT_SERIAL_LSR & UART_LSR_##STATE)) {}     \
-} while (0)
-#define FLOWCTL_WAIT_FOR(LINE)                                  \
-do {                                                            \
-        while (!(GDBPORT_SERIAL_MSR & UART_MSR_##LINE)) {}      \
-} while (0)
-#define FLOWCTL_CLEAR(LINE)                     \
-do {                                            \
-        GDBPORT_SERIAL_MCR &= ~UART_MCR_##LINE; \
-} while (0)
-#define FLOWCTL_SET(LINE)                       \
-do {                                            \
-        GDBPORT_SERIAL_MCR |= UART_MCR_##LINE;  \
-} while (0)
-#define FLOWCTL_QUERY(LINE)     ({ GDBPORT_SERIAL_MSR & UART_MSR_##LINE; })
-
-static inline void __debug_to_serial(const char *p, int n)
-{
-        char ch;
-
-        FLOWCTL_SET(DTR);
-
-        for (; n > 0; n--) {
-                LSR_WAIT_FOR(THRE);
-                FLOWCTL_WAIT_FOR(CTS);
-
-                ch = *p++;
-                if (ch == 0x0a) {
-                        GDBPORT_SERIAL_TX = 0x0d;
-                        LSR_WAIT_FOR(THRE);
-                        FLOWCTL_WAIT_FOR(CTS);
-                }
-                GDBPORT_SERIAL_TX = ch;
-        }
-
-        FLOWCTL_CLEAR(DTR);
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* CONFIG_GDBSTUB_ON_TTYSx */
-
-#endif /* _ASM_UNIT_SERIAL_H */
diff --git a/include/asm-mn10300/unit-asb2303/smc91111.h b/include/asm-mn10300/unit-asb2303/smc91111.h
deleted file mode 100644
index dd456e9c513f..000000000000
--- a/include/asm-mn10300/unit-asb2303/smc91111.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Support for the SMC91C111 NIC on an ASB2303
- *
- * Copyright (C) 2007 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_UNIT_SMC91111_H
-#define _ASM_UNIT_SMC91111_H
-
-#include <asm/intctl-regs.h>
-
-#define SMC91111_BASE           0xAA000300UL
-#define SMC91111_BASE_END       0xAA000400UL
-#define SMC91111_IRQ            XIRQ3
-
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_NOWAIT              1
-#define SMC_IRQ_FLAGS           (0)
-
-#if SMC_CAN_USE_8BIT
-#define SMC_inb(a, r)           inb((unsigned long) ((a) + (r)))
-#define SMC_outb(v, a, r)       outb(v, (unsigned long) ((a) + (r)))
-#endif
-
-#if SMC_CAN_USE_16BIT
-#define SMC_inw(a, r)           inw((unsigned long) ((a) + (r)))
-#define SMC_outw(v, a, r)       outw(v, (unsigned long) ((a) + (r)))
-#define SMC_insw(a, r, p, l)    insw((unsigned long) ((a) + (r)), (p), (l))
-#define SMC_outsw(a, r, p, l)   outsw((unsigned long) ((a) + (r)), (p), (l))
-#endif
-
-#if SMC_CAN_USE_32BIT
-#define SMC_inl(a, r)           inl((unsigned long) ((a) + (r)))
-#define SMC_outl(v, a, r)       outl(v, (unsigned long) ((a) + (r)))
-#define SMC_insl(a, r, p, l)    insl((unsigned long) ((a) + (r)), (p), (l))
-#define SMC_outsl(a, r, p, l)   outsl((unsigned long) ((a) + (r)), (p), (l))
-#endif
-
-#define RPC_LSA_DEFAULT         RPC_LED_100_10
-#define RPC_LSB_DEFAULT         RPC_LED_TX_RX
-
-#define set_irq_type(irq, type)
-
-#endif /*  _ASM_UNIT_SMC91111_H */
diff --git a/include/asm-mn10300/unit-asb2303/timex.h b/include/asm-mn10300/unit-asb2303/timex.h
deleted file mode 100644
index 7e54b0cfdd03..000000000000
--- a/include/asm-mn10300/unit-asb2303/timex.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ASB2303-specific timer specifcations
- *
- * Copyright (C) 2007 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_UNIT_TIMEX_H
-#define _ASM_UNIT_TIMEX_H
-
-#ifndef __ASSEMBLY__
-#include <linux/irq.h>
-#endif /* __ASSEMBLY__ */
-
-#include <asm/timer-regs.h>
-#include <asm/unit/clock.h>
-
-/*
- * jiffies counter specifications
- */
-
-#define TMJCBR_MAX              0xffff
-#define TMJCBC                  TM01BC
-
-#define TMJCMD                  TM01MD
-#define TMJCBR                  TM01BR
-#define TMJCIRQ                 TM1IRQ
-#define TMJCICR                 TM1ICR
-#define TMJCICR_LEVEL           GxICR_LEVEL_5
-
-#ifndef __ASSEMBLY__
-
-static inline void startup_jiffies_counter(void)
-{
-        unsigned rate;
-        u16 md, t16;
-
-        /* use as little prescaling as possible to avoid losing accuracy */
-        md = TM0MD_SRC_IOCLK;
-        rate = MN10300_JCCLK / HZ;
-
-        if (rate > TMJCBR_MAX) {
-                md = TM0MD_SRC_IOCLK_8;
-                rate = MN10300_JCCLK / 8 / HZ;
-
-                if (rate > TMJCBR_MAX) {
-                        md = TM0MD_SRC_IOCLK_32;
-                        rate = MN10300_JCCLK / 32 / HZ;
-
-                        if (rate > TMJCBR_MAX)
-                                BUG();
-                }
-        }
-
-        TMJCBR = rate - 1;
-        t16 = TMJCBR;
-
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_INIT_COUNTER |
-                TM1MD_INIT_COUNTER << 8;
-
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_COUNT_ENABLE |
-                TM1MD_COUNT_ENABLE << 8;
-
-        t16 = TMJCMD;
-
-        TMJCICR |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;
-        t16 = TMJCICR;
-}
-
-static inline void shutdown_jiffies_counter(void)
-{
-}
-
-#endif /* !__ASSEMBLY__ */
-
-
-/*
- * timestamp counter specifications
- */
-
-#define TMTSCBR_MAX             0xffffffff
-#define TMTSCBC                 TM45BC
-
-#ifndef __ASSEMBLY__
-
-static inline void startup_timestamp_counter(void)
-{
-        /* set up timer 4 & 5 cascaded as a 32-bit counter to count real time
-         * - count down from 4Gig-1 to 0 and wrap at IOCLK rate
-         */
-        TM45BR = TMTSCBR_MAX;
-
-        TM4MD = TM4MD_SRC_IOCLK;
-        TM4MD |= TM4MD_INIT_COUNTER;
-        TM4MD &= ~TM4MD_INIT_COUNTER;
-        TM4ICR = 0;
-
-        TM5MD = TM5MD_SRC_TM4CASCADE;
-        TM5MD |= TM5MD_INIT_COUNTER;
-        TM5MD &= ~TM5MD_INIT_COUNTER;
-        TM5ICR = 0;
-
-        TM5MD |= TM5MD_COUNT_ENABLE;
-        TM4MD |= TM4MD_COUNT_ENABLE;
-}
-
-static inline void shutdown_timestamp_counter(void)
-{
-        TM4MD = 0;
-        TM5MD = 0;
-}
-
-/*
- * we use a cascaded pair of 16-bit down-counting timers to count I/O
- * clock cycles for the purposes of time keeping
- */
-typedef unsigned long cycles_t;
-
-static inline cycles_t read_timestamp_counter(void)
-{
-        return (cycles_t)TMTSCBC;
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_TIMEX_H */
diff --git a/include/asm-mn10300/unit-asb2305/clock.h b/include/asm-mn10300/unit-asb2305/clock.h
deleted file mode 100644
index 7d514841ffda..000000000000
--- a/include/asm-mn10300/unit-asb2305/clock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ASB2305-specific clocks
- *
- * Copyright (C) 2007 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_UNIT_CLOCK_H
-#define _ASM_UNIT_CLOCK_H
-
-#ifndef __ASSEMBLY__
-
-#ifdef CONFIG_MN10300_RTC
-
-extern unsigned long mn10300_ioclk;     /* IOCLK (crystal speed) in HZ */
-extern unsigned long mn10300_iobclk;
-extern unsigned long mn10300_tsc_per_HZ;
-
-#define MN10300_IOCLK           ((unsigned long)mn10300_ioclk)
-/* If this processors has a another clock, uncomment the below. */
-/* #define MN10300_IOBCLK       ((unsigned long)mn10300_iobclk) */
-
-#else /* !CONFIG_MN10300_RTC */
-
-#define MN10300_IOCLK           33333333UL
-/* #define MN10300_IOBCLK       66666666UL */
-
-#endif /* !CONFIG_MN10300_RTC */
-
-#define MN10300_JCCLK           MN10300_IOCLK
-#define MN10300_TSCCLK          MN10300_IOCLK
-
-#ifdef CONFIG_MN10300_RTC
-#define MN10300_TSC_PER_HZ      ((unsigned long)mn10300_tsc_per_HZ)
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_TSC_PER_HZ      (MN10300_TSCCLK/HZ)
-#endif /* !CONFIG_MN10300_RTC */
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_CLOCK_H */
diff --git a/include/asm-mn10300/unit-asb2305/leds.h b/include/asm-mn10300/unit-asb2305/leds.h
deleted file mode 100644
index bc471f617fd1..000000000000
--- a/include/asm-mn10300/unit-asb2305/leds.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ASB2305-specific LEDs
- *
- * Copyright (C) 2007 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_UNIT_LEDS_H
-#define _ASM_UNIT_LEDS_H
-
-#include <asm/pio-regs.h>
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-
-#define ASB2305_7SEGLEDS        __SYSREG(0xA6F90000, u32)
-
-/* perform a hard reset by driving PIO06 low */
-#define mn10300_unit_hard_reset()               \
-do {                                            \
-        P0OUT &= 0xbf;                          \
-        P0MD = (P0MD & P0MD_6) | P0MD_6_OUT;    \
-} while (0)
-
-/*
- * use the 7-segment LEDs to indicate states
- */
-/* indicate double-fault by displaying "db-f" on the LEDs */
-#define mn10300_set_dbfleds                     \
-        mov     0x43077f1d,d0           ;       \
-        mov     d0,(ASB2305_7SEGLEDS)
-
-/* flip the 7-segment LEDs between "Gdb-" and "----" */
-#define mn10300_set_gdbleds(ONOFF)                              \
-do {                                                            \
-        ASB2305_7SEGLEDS = (ONOFF) ? 0x8543077f : 0x7f7f7f7f;   \
-} while (0)
-
-#ifndef __ASSEMBLY__
-extern void peripheral_leds_display_exception(enum exception_code);
-extern void peripheral_leds_led_chase(void);
-extern void peripheral_leds7x4_display_dec(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_hex(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_minssecs(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_rtc(void);
-#endif /* __ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_LEDS_H */
diff --git a/include/asm-mn10300/unit-asb2305/serial.h b/include/asm-mn10300/unit-asb2305/serial.h
deleted file mode 100644
index 73d31d67bb71..000000000000
--- a/include/asm-mn10300/unit-asb2305/serial.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ASB2305-specific 8250 serial ports
- *
- * Copyright (C) 2007 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_UNIT_SERIAL_H
-#define _ASM_UNIT_SERIAL_H
-
-#include <asm/cpu/cpu-regs.h>
-#include <asm/proc/irq.h>
-#include <linux/serial_reg.h>
-
-#define SERIAL_PORT0_BASE_ADDRESS       0xA6FB0000
-#define ASB2305_DEBUG_MCR       __SYSREG(0xA6FB0000 + UART_MCR * 2, u8)
-
-#define SERIAL_IRQ      XIRQ0   /* Dual serial (PC16552)        (Hi) */
-
-/*
- * dispose of the /dev/ttyS0 serial port
- */
-#ifndef CONFIG_GDBSTUB_ON_TTYSx
-
-#define SERIAL_PORT_DFNS                                                \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT0_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },
-
-#ifndef __ASSEMBLY__
-
-static inline void __debug_to_serial(const char *p, int n)
-{
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#else /* CONFIG_GDBSTUB_ON_TTYSx */
-
-#define SERIAL_PORT_DFNS /* stolen by gdb-stub */
-
-#if defined(CONFIG_GDBSTUB_ON_TTYS0)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-
-#elif defined(CONFIG_GDBSTUB_ON_TTYS1)
-#error The ASB2305 doesnt have a /dev/ttyS1
-#endif
-
-#ifndef __ASSEMBLY__
-
-#define TTYS0_TX        __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define TTYS0_MCR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define TTYS0_LSR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define TTYS0_MSR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-
-#define LSR_WAIT_FOR(STATE)                             \
-do {                                                    \
-        while (!(TTYS0_LSR & UART_LSR_##STATE)) {}      \
-} while (0)
-#define FLOWCTL_WAIT_FOR(LINE)                          \
-do {                                                    \
-        while (!(TTYS0_MSR & UART_MSR_##LINE)) {}       \
-} while (0)
-#define FLOWCTL_CLEAR(LINE)                     \
-do {                                            \
-        TTYS0_MCR &= ~UART_MCR_##LINE;          \
-} while (0)
-#define FLOWCTL_SET(LINE)                       \
-do {                                            \
-        TTYS0_MCR |= UART_MCR_##LINE;           \
-} while (0)
-#define FLOWCTL_QUERY(LINE)     ({ TTYS0_MSR & UART_MSR_##LINE; })
-
-static inline void __debug_to_serial(const char *p, int n)
-{
-        char ch;
-
-        FLOWCTL_SET(DTR);
-
-        for (; n > 0; n--) {
-                LSR_WAIT_FOR(THRE);
-                FLOWCTL_WAIT_FOR(CTS);
-
-                ch = *p++;
-                if (ch == 0x0a) {
-                        TTYS0_TX = 0x0d;
-                        LSR_WAIT_FOR(THRE);
-                        FLOWCTL_WAIT_FOR(CTS);
-                }
-                TTYS0_TX = ch;
-        }
-
-        FLOWCTL_CLEAR(DTR);
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* CONFIG_GDBSTUB_ON_TTYSx */
-
-#endif /* _ASM_UNIT_SERIAL_H */
diff --git a/include/asm-mn10300/unit-asb2305/timex.h b/include/asm-mn10300/unit-asb2305/timex.h
deleted file mode 100644
index 10e1bfe34463..000000000000
--- a/include/asm-mn10300/unit-asb2305/timex.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ASB2305 timer specifcations
- *
- * Copyright (C) 2007 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_UNIT_TIMEX_H
-#define _ASM_UNIT_TIMEX_H
-
-#ifndef __ASSEMBLY__
-#include <linux/irq.h>
-#endif /* __ASSEMBLY__ */
-
-#include <asm/cpu/timer-regs.h>
-#include <asm/unit/clock.h>
-
-/*
- * jiffies counter specifications
- */
-
-#define TMJCBR_MAX              0xffff
-#define TMJCBC                  TM01BC
-
-#define TMJCMD                  TM01MD
-#define TMJCBR                  TM01BR
-#define TMJCIRQ                 TM1IRQ
-#define TMJCICR                 TM1ICR
-#define TMJCICR_LEVEL           GxICR_LEVEL_5
-
-#ifndef __ASSEMBLY__
-
-static inline void startup_jiffies_counter(void)
-{
-        unsigned rate;
-        u16 md, t16;
-
-        /* use as little prescaling as possible to avoid losing accuracy */
-        md = TM0MD_SRC_IOCLK;
-        rate = MN10300_JCCLK / HZ;
-
-        if (rate > TMJCBR_MAX) {
-                md = TM0MD_SRC_IOCLK_8;
-                rate = MN10300_JCCLK / 8 / HZ;
-
-                if (rate > TMJCBR_MAX) {
-                        md = TM0MD_SRC_IOCLK_32;
-                        rate = MN10300_JCCLK / 32 / HZ;
-
-                        if (rate > TMJCBR_MAX)
-                                BUG();
-                }
-        }
-
-        TMJCBR = rate - 1;
-        t16 = TMJCBR;
-
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_INIT_COUNTER |
-                TM1MD_INIT_COUNTER << 8;
-
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_COUNT_ENABLE |
-                TM1MD_COUNT_ENABLE << 8;
-
-        t16 = TMJCMD;
-
-        TMJCICR |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;
-        t16 = TMJCICR;
-}
-
-static inline void shutdown_jiffies_counter(void)
-{
-}
-
-#endif /* !__ASSEMBLY__ */
-
-
-/*
- * timestamp counter specifications
- */
-
-#define TMTSCBR_MAX             0xffffffff
-#define TMTSCBC                 TM45BC
-
-#ifndef __ASSEMBLY__
-
-static inline void startup_timestamp_counter(void)
-{
-        /* set up timer 4 & 5 cascaded as a 32-bit counter to count real time
-         * - count down from 4Gig-1 to 0 and wrap at IOCLK rate
-         */
-        TM45BR = TMTSCBR_MAX;
-
-        TM4MD = TM4MD_SRC_IOCLK;
-        TM4MD |= TM4MD_INIT_COUNTER;
-        TM4MD &= ~TM4MD_INIT_COUNTER;
-        TM4ICR = 0;
-
-        TM5MD = TM5MD_SRC_TM4CASCADE;
-        TM5MD |= TM5MD_INIT_COUNTER;
-        TM5MD &= ~TM5MD_INIT_COUNTER;
-        TM5ICR = 0;
-
-        TM5MD |= TM5MD_COUNT_ENABLE;
-        TM4MD |= TM4MD_COUNT_ENABLE;
-}
-
-static inline void shutdown_timestamp_counter(void)
-{
-        TM4MD = 0;
-        TM5MD = 0;
-}
-
-/*
- * we use a cascaded pair of 16-bit down-counting timers to count I/O
- * clock cycles for the purposes of time keeping
- */
-typedef unsigned long cycles_t;
-
-static inline cycles_t read_timestamp_counter(void)
-{
-        return (cycles_t) TMTSCBC;
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* _ASM_UNIT_TIMEX_H */
diff --git a/include/asm-mn10300/user.h b/include/asm-mn10300/user.h
deleted file mode 100644
index e1193908b78c..000000000000
--- a/include/asm-mn10300/user.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* MN10300 User process data
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * 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_USER_H
-#define _ASM_USER_H
-
-#include <asm/page.h>
-#include <linux/ptrace.h>
-
-#ifndef __ASSEMBLY__
-/*
- * When the kernel dumps core, it starts by dumping the user struct - this will
- * be used by gdb to figure out where the data and stack segments are within
- * the file, and what virtual addresses to use.
- */
-struct user {
-        /* We start with the registers, to mimic the way that "memory" is
-         * returned from the ptrace(3,...) function.
-         */
-        struct pt_regs regs;            /* Where the registers are actually stored */
-
-        /* The rest of this junk is to help gdb figure out what goes where */
-        unsigned long int u_tsize;      /* Text segment size (pages). */
-        unsigned long int u_dsize;      /* Data segment size (pages). */
-        unsigned long int u_ssize;      /* Stack segment size (pages). */
-        unsigned long start_code;       /* Starting virtual address of text. */
-        unsigned long start_stack;      /* Starting virtual address of stack area.
-                                           This is actually the bottom of the stack,
-                                           the top of the stack is always found in the
-                                           esp register.  */
-        long int signal;                /* Signal that caused the core dump. */
-        int reserved;                   /* No longer used */
-        struct user_pt_regs *u_ar0;     /* Used by gdb to help find the values for */
-
-        /* the registers */
-        unsigned long magic;            /* To uniquely identify a core file */
-        char u_comm[32];                /* User command that was responsible */
-};
-#endif
-
-#define NBPG PAGE_SIZE
-#define UPAGES 1
-#define HOST_TEXT_START_ADDR    +(u.start_code)
-#define HOST_STACK_END_ADDR     +(u.start_stack + u.u_ssize * NBPG)
-
-#endif /* _ASM_USER_H */
diff --git a/include/asm-mn10300/vga.h b/include/asm-mn10300/vga.h
deleted file mode 100644
index 0163e50a3459..000000000000
--- a/include/asm-mn10300/vga.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MN10300 VGA register definitions
- *
- * Copyright (C) 2007 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_VGA_H
-#define _ASM_VGA_H
-
-
-
-#endif /* _ASM_VGA_H */
diff --git a/include/asm-mn10300/xor.h b/include/asm-mn10300/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/include/asm-mn10300/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 656a4c66a568..7524ba3b6f3c 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -17,10 +17,14 @@
 #define AES_MAX_KEYLENGTH       (15 * 16)
 #define AES_MAX_KEYLENGTH_U32   (AES_MAX_KEYLENGTH / sizeof(u32))
 
+/*
+ * Please ensure that the first two fields are 16-byte aligned
+ * relative to the start of the structure, i.e., don't move them!
+ */
 struct crypto_aes_ctx {
-        u32 key_length;
         u32 key_enc[AES_MAX_KEYLENGTH_U32];
         u32 key_dec[AES_MAX_KEYLENGTH_U32];
+        u32 key_length;
 };
 
 extern const u32 crypto_ft_tab[4][256];
diff --git a/include/crypto/compress.h b/include/crypto/compress.h
new file mode 100644
index 000000000000..86163ef24219
--- /dev/null
+++ b/include/crypto/compress.h
@@ -0,0 +1,145 @@
+/*
+ * Compress: Compression algorithms under the cryptographic API.
+ *
+ * Copyright 2008 Sony Corporation
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _CRYPTO_COMPRESS_H
+#define _CRYPTO_COMPRESS_H
+
+#include <linux/crypto.h>
+
+
+struct comp_request {
+        const void *next_in;            /* next input byte */
+        void *next_out;                 /* next output byte */
+        unsigned int avail_in;          /* bytes available at next_in */
+        unsigned int avail_out;         /* bytes available at next_out */
+};
+
+enum zlib_comp_params {
+        ZLIB_COMP_LEVEL = 1,            /* e.g. Z_DEFAULT_COMPRESSION */
+        ZLIB_COMP_METHOD,               /* e.g. Z_DEFLATED */
+        ZLIB_COMP_WINDOWBITS,           /* e.g. MAX_WBITS */
+        ZLIB_COMP_MEMLEVEL,             /* e.g. DEF_MEM_LEVEL */
+        ZLIB_COMP_STRATEGY,             /* e.g. Z_DEFAULT_STRATEGY */
+        __ZLIB_COMP_MAX,
+};
+
+#define ZLIB_COMP_MAX   (__ZLIB_COMP_MAX - 1)
+
+
+enum zlib_decomp_params {
+        ZLIB_DECOMP_WINDOWBITS = 1,     /* e.g. DEF_WBITS */
+        __ZLIB_DECOMP_MAX,
+};
+
+#define ZLIB_DECOMP_MAX (__ZLIB_DECOMP_MAX - 1)
+
+
+struct crypto_pcomp {
+        struct crypto_tfm base;
+};
+
+struct pcomp_alg {
+        int (*compress_setup)(struct crypto_pcomp *tfm, void *params,
+                              unsigned int len);
+        int (*compress_init)(struct crypto_pcomp *tfm);
+        int (*compress_update)(struct crypto_pcomp *tfm,
+                               struct comp_request *req);
+        int (*compress_final)(struct crypto_pcomp *tfm,
+                              struct comp_request *req);
+        int (*decompress_setup)(struct crypto_pcomp *tfm, void *params,
+                                unsigned int len);
+        int (*decompress_init)(struct crypto_pcomp *tfm);
+        int (*decompress_update)(struct crypto_pcomp *tfm,
+                                 struct comp_request *req);
+        int (*decompress_final)(struct crypto_pcomp *tfm,
+                                struct comp_request *req);
+
+        struct crypto_alg base;
+};
+
+extern struct crypto_pcomp *crypto_alloc_pcomp(const char *alg_name, u32 type,
+                                               u32 mask);
+
+static inline struct crypto_tfm *crypto_pcomp_tfm(struct crypto_pcomp *tfm)
+{
+        return &tfm->base;
+}
+
+static inline void crypto_free_pcomp(struct crypto_pcomp *tfm)
+{
+        crypto_destroy_tfm(tfm, crypto_pcomp_tfm(tfm));
+}
+
+static inline struct pcomp_alg *__crypto_pcomp_alg(struct crypto_alg *alg)
+{
+        return container_of(alg, struct pcomp_alg, base);
+}
+
+static inline struct pcomp_alg *crypto_pcomp_alg(struct crypto_pcomp *tfm)
+{
+        return __crypto_pcomp_alg(crypto_pcomp_tfm(tfm)->__crt_alg);
+}
+
+static inline int crypto_compress_setup(struct crypto_pcomp *tfm,
+                                        void *params, unsigned int len)
+{
+        return crypto_pcomp_alg(tfm)->compress_setup(tfm, params, len);
+}
+
+static inline int crypto_compress_init(struct crypto_pcomp *tfm)
+{
+        return crypto_pcomp_alg(tfm)->compress_init(tfm);
+}
+
+static inline int crypto_compress_update(struct crypto_pcomp *tfm,
+                                         struct comp_request *req)
+{
+        return crypto_pcomp_alg(tfm)->compress_update(tfm, req);
+}
+
+static inline int crypto_compress_final(struct crypto_pcomp *tfm,
+                                        struct comp_request *req)
+{
+        return crypto_pcomp_alg(tfm)->compress_final(tfm, req);
+}
+
+static inline int crypto_decompress_setup(struct crypto_pcomp *tfm,
+                                          void *params, unsigned int len)
+{
+        return crypto_pcomp_alg(tfm)->decompress_setup(tfm, params, len);
+}
+
+static inline int crypto_decompress_init(struct crypto_pcomp *tfm)
+{
+        return crypto_pcomp_alg(tfm)->decompress_init(tfm);
+}
+
+static inline int crypto_decompress_update(struct crypto_pcomp *tfm,
+                                           struct comp_request *req)
+{
+        return crypto_pcomp_alg(tfm)->decompress_update(tfm, req);
+}
+
+static inline int crypto_decompress_final(struct crypto_pcomp *tfm,
+                                          struct comp_request *req)
+{
+        return crypto_pcomp_alg(tfm)->decompress_final(tfm, req);
+}
+
+#endif  /* _CRYPTO_COMPRESS_H */
diff --git a/include/crypto/cryptd.h b/include/crypto/cryptd.h
new file mode 100644
index 000000000000..55fa7bbdbc71
--- /dev/null
+++ b/include/crypto/cryptd.h
@@ -0,0 +1,27 @@
+/*
+ * Software async crypto daemon
+ */
+
+#ifndef _CRYPTO_CRYPT_H
+#define _CRYPTO_CRYPT_H
+
+#include <linux/crypto.h>
+#include <linux/kernel.h>
+
+struct cryptd_ablkcipher {
+        struct crypto_ablkcipher base;
+};
+
+static inline struct cryptd_ablkcipher *__cryptd_ablkcipher_cast(
+        struct crypto_ablkcipher *tfm)
+{
+        return (struct cryptd_ablkcipher *)tfm;
+}
+
+/* alg_name should be algorithm to be cryptd-ed */
+struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,
+                                                  u32 type, u32 mask);
+struct crypto_blkcipher *cryptd_ablkcipher_child(struct cryptd_ablkcipher *tfm);
+void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm);
+
+#endif
diff --git a/include/crypto/crypto_wq.h b/include/crypto/crypto_wq.h
new file mode 100644
index 000000000000..a7d252daf91b
--- /dev/null
+++ b/include/crypto/crypto_wq.h
@@ -0,0 +1,7 @@
+#ifndef CRYPTO_WQ_H
+#define CRYPTO_WQ_H
+
+#include <linux/workqueue.h>
+
+extern struct workqueue_struct *kcrypto_wq;
+#endif
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index d797e119e3d5..d56bb71617c3 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -231,6 +231,11 @@ static inline unsigned int crypto_shash_alignmask(
         return crypto_tfm_alg_alignmask(crypto_shash_tfm(tfm));
 }
 
+static inline unsigned int crypto_shash_blocksize(struct crypto_shash *tfm)
+{
+        return crypto_tfm_alg_blocksize(crypto_shash_tfm(tfm));
+}
+
 static inline struct shash_alg *__crypto_shash_alg(struct crypto_alg *alg)
 {
         return container_of(alg, struct shash_alg, base);
diff --git a/include/crypto/internal/compress.h b/include/crypto/internal/compress.h
new file mode 100644
index 000000000000..178a888d1d93
--- /dev/null
+++ b/include/crypto/internal/compress.h
@@ -0,0 +1,28 @@
+/*
+ * Compress: Compression algorithms under the cryptographic API.
+ *
+ * Copyright 2008 Sony Corporation
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _CRYPTO_INTERNAL_COMPRESS_H
+#define _CRYPTO_INTERNAL_COMPRESS_H
+
+#include <crypto/compress.h>
+
+extern int crypto_register_pcomp(struct pcomp_alg *alg);
+extern int crypto_unregister_pcomp(struct pcomp_alg *alg);
+
+#endif  /* _CRYPTO_INTERNAL_COMPRESS_H */
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 8e77357334ad..7cb50bdde46d 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -36,8 +36,7 @@
 #ifndef _DRM_H_
 #define _DRM_H_
 
-#if defined(__KERNEL__)
-#endif
+#include <linux/types.h>
 #include <asm/ioctl.h>          /* For _IO* macros */
 #define DRM_IOCTL_NR(n)         _IOC_NR(n)
 #define DRM_IOC_VOID            _IOC_NONE
@@ -497,8 +496,8 @@ union drm_wait_vblank {
  * \sa drmModesetCtl().
  */
 struct drm_modeset_ctl {
-        uint32_t crtc;
-        uint32_t cmd;
+        __u32 crtc;
+        __u32 cmd;
 };
 
 /**
@@ -574,29 +573,29 @@ struct drm_set_version {
 /** DRM_IOCTL_GEM_CLOSE ioctl argument type */
 struct drm_gem_close {
         /** Handle of the object to be closed. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
 };
 
 /** DRM_IOCTL_GEM_FLINK ioctl argument type */
 struct drm_gem_flink {
         /** Handle for the object being named */
-        uint32_t handle;
+        __u32 handle;
 
         /** Returned global name */
-        uint32_t name;
+        __u32 name;
 };
 
 /** DRM_IOCTL_GEM_OPEN ioctl argument type */
 struct drm_gem_open {
         /** Name of object being opened */
-        uint32_t name;
+        __u32 name;
 
         /** Returned handle for the object */
-        uint32_t handle;
+        __u32 handle;
 
         /** Returned size of the object */
-        uint64_t size;
+        __u64 size;
 };
 
 #include "drm_mode.h"
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e5f4ae989abf..c8c422151431 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -281,16 +281,16 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 
 struct drm_ioctl_desc {
         unsigned int cmd;
-        drm_ioctl_t *func;
         int flags;
+        drm_ioctl_t *func;
 };
 
 /**
  * Creates a driver or general drm_ioctl_desc array entry for the given
  * ioctl, for use by drm_ioctl().
  */
-#define DRM_IOCTL_DEF(ioctl, func, flags) \
-        [DRM_IOCTL_NR(ioctl)] = {ioctl, func, flags}
+#define DRM_IOCTL_DEF(ioctl, _func, _flags) \
+        [DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags}
 
 struct drm_magic_entry {
         struct list_head head;
@@ -523,19 +523,32 @@ struct drm_mm {
 
 
 /**
+ * Kernel side of a mapping
+ */
+struct drm_local_map {
+        resource_size_t offset;  /**< Requested physical address (0 for SAREA)*/
+        unsigned long size;      /**< Requested physical size (bytes) */
+        enum drm_map_type type;  /**< Type of memory to map */
+        enum drm_map_flags flags;        /**< Flags */
+        void *handle;            /**< User-space: "Handle" to pass to mmap() */
+                                 /**< Kernel-space: kernel-virtual address */
+        int mtrr;                /**< MTRR slot used */
+};
+
+typedef struct drm_local_map drm_local_map_t;
+
+/**
  * Mappings list
  */
 struct drm_map_list {
         struct list_head head;          /**< list head */
         struct drm_hash_item hash;
-        struct drm_map *map;                    /**< mapping */
+        struct drm_local_map *map;      /**< mapping */
         uint64_t user_token;
         struct drm_master *master;
         struct drm_mm_node *file_offset_node;   /**< fake offset */
 };
 
-typedef struct drm_map drm_local_map_t;
-
 /**
  * Context handle list
  */
@@ -560,7 +573,7 @@ struct drm_ati_pcigart_info {
         dma_addr_t bus_addr;
         dma_addr_t table_mask;
         struct drm_dma_handle *table_handle;
-        drm_local_map_t mapping;
+        struct drm_local_map mapping;
         int table_size;
 };
 
@@ -675,7 +688,6 @@ struct drm_driver {
         int (*kernel_context_switch) (struct drm_device *dev, int old,
                                       int new);
         void (*kernel_context_switch_unlock) (struct drm_device *dev);
-        int (*dri_library_name) (struct drm_device *dev, char *buf);
 
         /**
          * get_vblank_counter - get raw hardware vblank counter
@@ -747,8 +759,8 @@ struct drm_driver {
                                         struct drm_file *file_priv);
         void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
                                             struct drm_file *file_priv);
-        unsigned long (*get_map_ofs) (struct drm_map * map);
-        unsigned long (*get_reg_ofs) (struct drm_device *dev);
+        resource_size_t (*get_map_ofs) (struct drm_local_map * map);
+        resource_size_t (*get_reg_ofs) (struct drm_device *dev);
         void (*set_version) (struct drm_device *dev,
                              struct drm_set_version *sv);
 
@@ -758,6 +770,8 @@ struct drm_driver {
 
         int (*proc_init)(struct drm_minor *minor);
         void (*proc_cleanup)(struct drm_minor *minor);
+        int (*debugfs_init)(struct drm_minor *minor);
+        void (*debugfs_cleanup)(struct drm_minor *minor);
 
         /**
          * Driver-specific constructor for drm_gem_objects, to set up
@@ -793,6 +807,48 @@ struct drm_driver {
 #define DRM_MINOR_CONTROL 2
 #define DRM_MINOR_RENDER 3
 
+
+/**
+ * debugfs node list. This structure represents a debugfs file to
+ * be created by the drm core
+ */
+struct drm_debugfs_list {
+        const char *name; /** file name */
+        int (*show)(struct seq_file*, void*); /** show callback */
+        u32 driver_features; /**< Required driver features for this entry */
+};
+
+/**
+ * debugfs node structure. This structure represents a debugfs file.
+ */
+struct drm_debugfs_node {
+        struct list_head list;
+        struct drm_minor *minor;
+        struct drm_debugfs_list *debugfs_ent;
+        struct dentry *dent;
+};
+
+/**
+ * Info file list entry. This structure represents a debugfs or proc file to
+ * be created by the drm core
+ */
+struct drm_info_list {
+        const char *name; /** file name */
+        int (*show)(struct seq_file*, void*); /** show callback */
+        u32 driver_features; /**< Required driver features for this entry */
+        void *data;
+};
+
+/**
+ * debugfs node structure. This structure represents a debugfs file.
+ */
+struct drm_info_node {
+        struct list_head list;
+        struct drm_minor *minor;
+        struct drm_info_list *info_ent;
+        struct dentry *dent;
+};
+
 /**
  * DRM minor structure. This structure represents a drm minor number.
  */
@@ -802,7 +858,12 @@ struct drm_minor {
         dev_t device;                   /**< Device number for mknod */
         struct device kdev;             /**< Linux device */
         struct drm_device *dev;
-        struct proc_dir_entry *dev_root;  /**< proc directory entry */
+
+        struct proc_dir_entry *proc_root;  /**< proc directory entry */
+        struct drm_info_node proc_nodes;
+        struct dentry *debugfs_root;
+        struct drm_info_node debugfs_nodes;
+
         struct drm_master *master; /* currently active master for this node */
         struct list_head master_list;
         struct drm_mode_group mode_group;
@@ -932,7 +993,7 @@ struct drm_device {
         sigset_t sigmask;
 
         struct drm_driver *driver;
-        drm_local_map_t *agp_buffer_map;
+        struct drm_local_map *agp_buffer_map;
         unsigned int agp_buffer_token;
         struct drm_minor *control;              /**< Control node for card */
         struct drm_minor *primary;              /**< render type primary screen head */
@@ -1049,8 +1110,8 @@ extern int drm_release(struct inode *inode, struct file *filp);
 extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
 extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma);
 extern void drm_vm_open_locked(struct vm_area_struct *vma);
-extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
-extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
+extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map);
+extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 
                                 /* Memory management support (drm_memory.h) */
@@ -1153,13 +1214,13 @@ extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv
                                 /* Buffer management support (drm_bufs.h) */
 extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
 extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
-extern int drm_addmap(struct drm_device *dev, unsigned int offset,
+extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
                       unsigned int size, enum drm_map_type type,
-                      enum drm_map_flags flags, drm_local_map_t ** map_ptr);
+                      enum drm_map_flags flags, struct drm_local_map **map_ptr);
 extern int drm_addmap_ioctl(struct drm_device *dev, void *data,
                             struct drm_file *file_priv);
-extern int drm_rmmap(struct drm_device *dev, drm_local_map_t *map);
-extern int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map);
+extern int drm_rmmap(struct drm_device *dev, struct drm_local_map *map);
+extern int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map);
 extern int drm_rmmap_ioctl(struct drm_device *dev, void *data,
                            struct drm_file *file_priv);
 extern int drm_addbufs(struct drm_device *dev, void *data,
@@ -1173,10 +1234,10 @@ extern int drm_freebufs(struct drm_device *dev, void *data,
 extern int drm_mapbufs(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 extern int drm_order(unsigned long size);
-extern unsigned long drm_get_resource_start(struct drm_device *dev,
+extern resource_size_t drm_get_resource_start(struct drm_device *dev,
+                                              unsigned int resource);
+extern resource_size_t drm_get_resource_len(struct drm_device *dev,
                                             unsigned int resource);
-extern unsigned long drm_get_resource_len(struct drm_device *dev,
-                                          unsigned int resource);
 
                                 /* DMA support (drm_dma.h) */
 extern int drm_dma_setup(struct drm_device *dev);
@@ -1252,22 +1313,48 @@ extern struct drm_master *drm_master_get(struct drm_master *master);
 extern void drm_master_put(struct drm_master **master);
 extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
                        struct drm_driver *driver);
-extern int drm_put_dev(struct drm_device *dev);
+extern void drm_put_dev(struct drm_device *dev);
 extern int drm_put_minor(struct drm_minor **minor);
 extern unsigned int drm_debug;
 
 extern struct class *drm_class;
 extern struct proc_dir_entry *drm_proc_root;
+extern struct dentry *drm_debugfs_root;
 
 extern struct idr drm_minors_idr;
 
-extern drm_local_map_t *drm_getsarea(struct drm_device *dev);
+extern struct drm_local_map *drm_getsarea(struct drm_device *dev);
 
                                 /* Proc support (drm_proc.h) */
 extern int drm_proc_init(struct drm_minor *minor, int minor_id,
                          struct proc_dir_entry *root);
 extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);
 
+                                /* Debugfs support */
+#if defined(CONFIG_DEBUG_FS)
+extern int drm_debugfs_init(struct drm_minor *minor, int minor_id,
+                            struct dentry *root);
+extern int drm_debugfs_create_files(struct drm_info_list *files, int count,
+                                    struct dentry *root, struct drm_minor *minor);
+extern int drm_debugfs_remove_files(struct drm_info_list *files, int count,
+                                    struct drm_minor *minor);
+extern int drm_debugfs_cleanup(struct drm_minor *minor);
+#endif
+
+                                /* Info file support */
+extern int drm_name_info(struct seq_file *m, void *data);
+extern int drm_vm_info(struct seq_file *m, void *data);
+extern int drm_queues_info(struct seq_file *m, void *data);
+extern int drm_bufs_info(struct seq_file *m, void *data);
+extern int drm_vblank_info(struct seq_file *m, void *data);
+extern int drm_clients_info(struct seq_file *m, void* data);
+extern int drm_gem_name_info(struct seq_file *m, void *data);
+extern int drm_gem_object_info(struct seq_file *m, void* data);
+
+#if DRM_DEBUG_CODE
+extern int drm_vma_info(struct seq_file *m, void *data);
+#endif
+
                                 /* Scatter Gather Support (drm_scatter.h) */
 extern void drm_sg_cleanup(struct drm_sg_mem * entry);
 extern int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
@@ -1378,12 +1465,12 @@ int drm_gem_open_ioctl(struct drm_device *dev, void *data,
 void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
 void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
 
-extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
-extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);
-extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
+extern void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev);
+extern void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);
+extern void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev);
 
-static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
-                                                   unsigned int token)
+static __inline__ struct drm_local_map *drm_core_findmap(struct drm_device *dev,
+                                                         unsigned int token)
 {
         struct drm_map_list *_entry;
         list_for_each_entry(_entry, &dev->maplist, head)
@@ -1410,7 +1497,7 @@ static __inline__ int drm_device_is_pcie(struct drm_device *dev)
         return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
 }
 
-static __inline__ void drm_core_dropmap(struct drm_map *map)
+static __inline__ void drm_core_dropmap(struct drm_local_map *map)
 {
 }
 
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 5ded1acfb543..3c1924c010e8 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -550,7 +550,7 @@ struct drm_mode_config {
         int min_width, min_height;
         int max_width, max_height;
         struct drm_mode_config_funcs *funcs;
-        unsigned long fb_base;
+        resource_size_t fb_base;
 
         /* pointers to standard properties */
         struct list_head property_blob_list;
@@ -613,7 +613,8 @@ 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 struct edid *drm_get_edid(struct drm_connector *connector,
                                  struct i2c_adapter *adapter);
-extern unsigned char *drm_do_probe_ddc_edid(struct i2c_adapter *adapter);
+extern int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
+                                 unsigned char *buf, int len);
 extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
 extern void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode);
 extern void drm_mode_remove(struct drm_connector *connector, struct drm_display_mode *mode);
@@ -731,4 +732,5 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
                                     void *data, struct drm_file *file_priv);
 extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                                     void *data, struct drm_file *file_priv);
+extern bool drm_detect_hdmi_monitor(struct edid *edid);
 #endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index c7d4b2e606a5..ec073d8288d9 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -33,7 +33,6 @@
 #ifndef __DRM_CRTC_HELPER_H__
 #define __DRM_CRTC_HELPER_H__
 
-#include <linux/i2c.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/idr.h>
@@ -92,7 +91,7 @@ struct drm_connector_helper_funcs {
 extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
 extern void drm_helper_disable_unused_functions(struct drm_device *dev);
 extern int drm_helper_hotplug_stage_two(struct drm_device *dev);
-extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow);
+extern bool drm_helper_initial_config(struct drm_device *dev);
 extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
 extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                                      struct drm_display_mode *mode,
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index ff8d27af4786..a11cc9d32591 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -69,8 +69,8 @@ struct detailed_pixel_timing {
         u8 hborder;
         u8 vborder;
         u8 unknown0:1;
-        u8 vsync_positive:1;
         u8 hsync_positive:1;
+        u8 vsync_positive:1;
         u8 separate_sync:2;
         u8 stereo:1;
         u8 unknown6:1;
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 601d2bd839f6..ae304cc73c90 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -27,11 +27,8 @@
 #ifndef _DRM_MODE_H
 #define _DRM_MODE_H
 
-#if !defined(__KERNEL__) && !defined(_KERNEL)
-#include <stdint.h>
-#else
 #include <linux/kernel.h>
-#endif
+#include <linux/types.h>
 
 #define DRM_DISPLAY_INFO_LEN    32
 #define DRM_CONNECTOR_NAME_LEN  32
@@ -81,41 +78,41 @@
 #define DRM_MODE_DITHERING_ON   1
 
 struct drm_mode_modeinfo {
-        uint32_t clock;
-        uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew;
-        uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan;
+        __u32 clock;
+        __u16 hdisplay, hsync_start, hsync_end, htotal, hskew;
+        __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan;
 
-        uint32_t vrefresh; /* vertical refresh * 1000 */
+        __u32 vrefresh; /* vertical refresh * 1000 */
 
-        uint32_t flags;
-        uint32_t type;
+        __u32 flags;
+        __u32 type;
         char name[DRM_DISPLAY_MODE_LEN];
 };
 
 struct drm_mode_card_res {
-        uint64_t fb_id_ptr;
-        uint64_t crtc_id_ptr;
-        uint64_t connector_id_ptr;
-        uint64_t encoder_id_ptr;
-        uint32_t count_fbs;
-        uint32_t count_crtcs;
-        uint32_t count_connectors;
-        uint32_t count_encoders;
-        uint32_t min_width, max_width;
-        uint32_t min_height, max_height;
+        __u64 fb_id_ptr;
+        __u64 crtc_id_ptr;
+        __u64 connector_id_ptr;
+        __u64 encoder_id_ptr;
+        __u32 count_fbs;
+        __u32 count_crtcs;
+        __u32 count_connectors;
+        __u32 count_encoders;
+        __u32 min_width, max_width;
+        __u32 min_height, max_height;
 };
 
 struct drm_mode_crtc {
-        uint64_t set_connectors_ptr;
-        uint32_t count_connectors;
+        __u64 set_connectors_ptr;
+        __u32 count_connectors;
 
-        uint32_t crtc_id; /**< Id */
-        uint32_t fb_id; /**< Id of framebuffer */
+        __u32 crtc_id; /**< Id */
+        __u32 fb_id; /**< Id of framebuffer */
 
-        uint32_t x, y; /**< Position on the frameuffer */
+        __u32 x, y; /**< Position on the frameuffer */
 
-        uint32_t gamma_size;
-        uint32_t mode_valid;
+        __u32 gamma_size;
+        __u32 mode_valid;
         struct drm_mode_modeinfo mode;
 };
 
@@ -126,13 +123,13 @@ struct drm_mode_crtc {
 #define DRM_MODE_ENCODER_TVDAC  4
 
 struct drm_mode_get_encoder {
-        uint32_t encoder_id;
-        uint32_t encoder_type;
+        __u32 encoder_id;
+        __u32 encoder_type;
 
-        uint32_t crtc_id; /**< Id of crtc */
+        __u32 crtc_id; /**< Id of crtc */
 
-        uint32_t possible_crtcs;
-        uint32_t possible_clones;
+        __u32 possible_crtcs;
+        __u32 possible_clones;
 };
 
 /* This is for connectors with multiple signal types. */
@@ -161,23 +158,23 @@ struct drm_mode_get_encoder {
 
 struct drm_mode_get_connector {
 
-        uint64_t encoders_ptr;
-        uint64_t modes_ptr;
-        uint64_t props_ptr;
-        uint64_t prop_values_ptr;
+        __u64 encoders_ptr;
+        __u64 modes_ptr;
+        __u64 props_ptr;
+        __u64 prop_values_ptr;
 
-        uint32_t count_modes;
-        uint32_t count_props;
-        uint32_t count_encoders;
+        __u32 count_modes;
+        __u32 count_props;
+        __u32 count_encoders;
 
-        uint32_t encoder_id; /**< Current Encoder */
-        uint32_t connector_id; /**< Id */
-        uint32_t connector_type;
-        uint32_t connector_type_id;
+        __u32 encoder_id; /**< Current Encoder */
+        __u32 connector_id; /**< Id */
+        __u32 connector_type;
+        __u32 connector_type_id;
 
-        uint32_t connection;
-        uint32_t mm_width, mm_height; /**< HxW in millimeters */
-        uint32_t subpixel;
+        __u32 connection;
+        __u32 mm_width, mm_height; /**< HxW in millimeters */
+        __u32 subpixel;
 };
 
 #define DRM_MODE_PROP_PENDING   (1<<0)
@@ -187,46 +184,46 @@ struct drm_mode_get_connector {
 #define DRM_MODE_PROP_BLOB      (1<<4)
 
 struct drm_mode_property_enum {
-        uint64_t value;
+        __u64 value;
         char name[DRM_PROP_NAME_LEN];
 };
 
 struct drm_mode_get_property {
-        uint64_t values_ptr; /* values and blob lengths */
-        uint64_t enum_blob_ptr; /* enum and blob id ptrs */
+        __u64 values_ptr; /* values and blob lengths */
+        __u64 enum_blob_ptr; /* enum and blob id ptrs */
 
-        uint32_t prop_id;
-        uint32_t flags;
+        __u32 prop_id;
+        __u32 flags;
         char name[DRM_PROP_NAME_LEN];
 
-        uint32_t count_values;
-        uint32_t count_enum_blobs;
+        __u32 count_values;
+        __u32 count_enum_blobs;
 };
 
 struct drm_mode_connector_set_property {
-        uint64_t value;
-        uint32_t prop_id;
-        uint32_t connector_id;
+        __u64 value;
+        __u32 prop_id;
+        __u32 connector_id;
 };
 
 struct drm_mode_get_blob {
-        uint32_t blob_id;
-        uint32_t length;
-        uint64_t data;
+        __u32 blob_id;
+        __u32 length;
+        __u64 data;
 };
 
 struct drm_mode_fb_cmd {
-        uint32_t fb_id;
-        uint32_t width, height;
-        uint32_t pitch;
-        uint32_t bpp;
-        uint32_t depth;
+        __u32 fb_id;
+        __u32 width, height;
+        __u32 pitch;
+        __u32 bpp;
+        __u32 depth;
         /* driver specific handle */
-        uint32_t handle;
+        __u32 handle;
 };
 
 struct drm_mode_mode_cmd {
-        uint32_t connector_id;
+        __u32 connector_id;
         struct drm_mode_modeinfo mode;
 };
 
@@ -248,24 +245,24 @@ struct drm_mode_mode_cmd {
  *    y
  */
 struct drm_mode_cursor {
-        uint32_t flags;
-        uint32_t crtc_id;
-        int32_t x;
-        int32_t y;
-        uint32_t width;
-        uint32_t height;
+        __u32 flags;
+        __u32 crtc_id;
+        __s32 x;
+        __s32 y;
+        __u32 width;
+        __u32 height;
         /* driver specific handle */
-        uint32_t handle;
+        __u32 handle;
 };
 
 struct drm_mode_crtc_lut {
-        uint32_t crtc_id;
-        uint32_t gamma_size;
+        __u32 crtc_id;
+        __u32 gamma_size;
 
         /* pointers to arrays */
-        uint64_t red;
-        uint64_t green;
-        uint64_t blue;
+        __u64 red;
+        __u64 green;
+        __u64 blue;
 };
 
 #endif
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
index 8dbd2572b7c3..26641e95e0a4 100644
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
@@ -6,6 +6,19 @@
 #include <linux/interrupt.h>    /* For task queue support */
 #include <linux/delay.h>
 
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+        return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
+}
+
+static inline void writeq(u64 val, void __iomem *reg)
+{
+        writel(val & 0xffffffff, reg);
+        writel(val >> 32, reg + 0x4UL);
+}
+#endif
+
 /** Current process ID */
 #define DRM_CURRENTPID                  task_pid_nr(current)
 #define DRM_SUSER(p)                    capable(CAP_SYS_ADMIN)
@@ -23,6 +36,12 @@
 /** Write a dword into a MMIO region */
 #define DRM_WRITE32(map, offset, val)   writel(val, ((void __iomem *)(map)->handle) + (offset))
 /** Read memory barrier */
+
+/** Read a qword from a MMIO region - be careful using these unless you really understand them */
+#define DRM_READ64(map, offset)         readq(((void __iomem *)(map)->handle) + (offset))
+/** Write a qword into a MMIO region */
+#define DRM_WRITE64(map, offset, val)   writeq(val, ((void __iomem *)(map)->handle) + (offset))
+
 #define DRM_READMEMORYBARRIER()         rmb()
 /** Write memory barrier */
 #define DRM_WRITEMEMORYBARRIER()        wmb()
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 5165f240aa68..fc55db780199 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -239,10 +239,123 @@
         {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
+        {0x1002, 0x793f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7941, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7942, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS600|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x796c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0x1002, 0x796d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0x1002, 0x796e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0x1002, 0x796f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
+        {0x1002, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9402, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9403, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9405, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x940A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x940B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x940F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9441, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9442, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9444, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x944A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x944B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x944C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x944E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9450, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x947B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9480, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9487, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9488, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9489, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x948F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9490, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9491, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9498, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x949C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x949E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x949F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x94CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV610|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9504, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9505, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9506, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9507, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9508, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9509, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x950F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9515, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9517, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9519, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV670|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9540, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9541, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9542, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x954E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x954F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9552, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9553, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9555, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9580, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9581, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9583, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9586, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9587, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9588, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9589, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x958F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9590, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9593, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9595, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9596, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9597, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9599, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x959B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95CE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x95CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV620|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x9610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9612, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9615, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+        {0x1002, 0x9616, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
         {0, 0, 0}
 
 #define r128_PCI_IDS \
@@ -359,6 +472,7 @@
         {0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
 #define gamma_PCI_IDS \
@@ -418,4 +532,8 @@
         {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
         {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
         {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+        {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+        {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+        {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+        {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
         {0, 0, 0}
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 912cd52db965..95962fa8398a 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -30,7 +30,7 @@
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
  */
-
+#include <linux/types.h>
 #include "drm.h"
 
 /* Each region is a minimum of 16k, and there are at most 255 of them.
@@ -116,15 +116,15 @@ typedef struct _drm_i915_sarea {
 
         /* fill out some space for old userspace triple buffer */
         drm_handle_t unused_handle;
-        uint32_t unused1, unused2, unused3;
+        __u32 unused1, unused2, unused3;
 
         /* buffer object handles for static buffers. May change
          * over the lifetime of the client.
          */
-        uint32_t front_bo_handle;
-        uint32_t back_bo_handle;
-        uint32_t unused_bo_handle;
-        uint32_t depth_bo_handle;
+        __u32 front_bo_handle;
+        __u32 back_bo_handle;
+        __u32 unused_bo_handle;
+        __u32 depth_bo_handle;
 
 } drm_i915_sarea_t;
 
@@ -327,7 +327,7 @@ typedef struct drm_i915_vblank_swap {
 } drm_i915_vblank_swap_t;
 
 typedef struct drm_i915_hws_addr {
-        uint64_t addr;
+        __u64 addr;
 } drm_i915_hws_addr_t;
 
 struct drm_i915_gem_init {
@@ -335,12 +335,12 @@ struct drm_i915_gem_init {
          * Beginning offset in the GTT to be managed by the DRM memory
          * manager.
          */
-        uint64_t gtt_start;
+        __u64 gtt_start;
         /**
          * Ending offset in the GTT to be managed by the DRM memory
          * manager.
          */
-        uint64_t gtt_end;
+        __u64 gtt_end;
 };
 
 struct drm_i915_gem_create {
@@ -349,94 +349,94 @@ struct drm_i915_gem_create {
          *
          * The (page-aligned) allocated size for the object will be returned.
          */
-        uint64_t size;
+        __u64 size;
         /**
          * Returned handle for the object.
          *
          * Object handles are nonzero.
          */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
 };
 
 struct drm_i915_gem_pread {
         /** Handle for the object being read. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
         /** Offset into the object to read from */
-        uint64_t offset;
+        __u64 offset;
         /** Length of data to read */
-        uint64_t size;
+        __u64 size;
         /**
          * Pointer to write the data into.
          *
          * This is a fixed-size type for 32/64 compatibility.
          */
-        uint64_t data_ptr;
+        __u64 data_ptr;
 };
 
 struct drm_i915_gem_pwrite {
         /** Handle for the object being written to. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
         /** Offset into the object to write to */
-        uint64_t offset;
+        __u64 offset;
         /** Length of data to write */
-        uint64_t size;
+        __u64 size;
         /**
          * Pointer to read the data from.
          *
          * This is a fixed-size type for 32/64 compatibility.
          */
-        uint64_t data_ptr;
+        __u64 data_ptr;
 };
 
 struct drm_i915_gem_mmap {
         /** Handle for the object being mapped. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
         /** Offset in the object to map. */
-        uint64_t offset;
+        __u64 offset;
         /**
          * Length of data to map.
          *
          * The value will be page-aligned.
          */
-        uint64_t size;
+        __u64 size;
         /**
          * Returned pointer the data was mapped at.
          *
          * This is a fixed-size type for 32/64 compatibility.
          */
-        uint64_t addr_ptr;
+        __u64 addr_ptr;
 };
 
 struct drm_i915_gem_mmap_gtt {
         /** Handle for the object being mapped. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
         /**
          * Fake offset to use for subsequent mmap call
          *
          * This is a fixed-size type for 32/64 compatibility.
          */
-        uint64_t offset;
+        __u64 offset;
 };
 
 struct drm_i915_gem_set_domain {
         /** Handle for the object */
-        uint32_t handle;
+        __u32 handle;
 
         /** New read domains */
-        uint32_t read_domains;
+        __u32 read_domains;
 
         /** New write domain */
-        uint32_t write_domain;
+        __u32 write_domain;
 };
 
 struct drm_i915_gem_sw_finish {
         /** Handle for the object */
-        uint32_t handle;
+        __u32 handle;
 };
 
 struct drm_i915_gem_relocation_entry {
@@ -448,16 +448,16 @@ struct drm_i915_gem_relocation_entry {
          * a relocation list for state buffers and not re-write it per
          * exec using the buffer.
          */
-        uint32_t target_handle;
+        __u32 target_handle;
 
         /**
          * Value to be added to the offset of the target buffer to make up
          * the relocation entry.
          */
-        uint32_t delta;
+        __u32 delta;
 
         /** Offset in the buffer the relocation entry will be written into */
-        uint64_t offset;
+        __u64 offset;
 
         /**
          * Offset value of the target buffer that the relocation entry was last
@@ -467,12 +467,12 @@ struct drm_i915_gem_relocation_entry {
          * and writing the relocation.  This value is written back out by
          * the execbuffer ioctl when the relocation is written.
          */
-        uint64_t presumed_offset;
+        __u64 presumed_offset;
 
         /**
          * Target memory domains read by this operation.
          */
-        uint32_t read_domains;
+        __u32 read_domains;
 
         /**
          * Target memory domains written by this operation.
@@ -481,7 +481,7 @@ struct drm_i915_gem_relocation_entry {
          * execbuffer operation, so that where there are conflicts,
          * the application will get -EINVAL back.
          */
-        uint32_t write_domain;
+        __u32 write_domain;
 };
 
 /** @{
@@ -512,24 +512,24 @@ struct drm_i915_gem_exec_object {
          * User's handle for a buffer to be bound into the GTT for this
          * operation.
          */
-        uint32_t handle;
+        __u32 handle;
 
         /** Number of relocations to be performed on this buffer */
-        uint32_t relocation_count;
+        __u32 relocation_count;
         /**
          * Pointer to array of struct drm_i915_gem_relocation_entry containing
          * the relocations to be performed in this buffer.
          */
-        uint64_t relocs_ptr;
+        __u64 relocs_ptr;
 
         /** Required alignment in graphics aperture */
-        uint64_t alignment;
+        __u64 alignment;
 
         /**
          * Returned value of the updated offset of the object, for future
          * presumed_offset writes.
          */
-        uint64_t offset;
+        __u64 offset;
 };
 
 struct drm_i915_gem_execbuffer {
@@ -543,44 +543,44 @@ struct drm_i915_gem_execbuffer {
          * a buffer is performing refer to buffers that have already appeared
          * in the validate list.
          */
-        uint64_t buffers_ptr;
-        uint32_t buffer_count;
+        __u64 buffers_ptr;
+        __u32 buffer_count;
 
         /** Offset in the batchbuffer to start execution from. */
-        uint32_t batch_start_offset;
+        __u32 batch_start_offset;
         /** Bytes used in batchbuffer from batch_start_offset */
-        uint32_t batch_len;
-        uint32_t DR1;
-        uint32_t DR4;
-        uint32_t num_cliprects;
+        __u32 batch_len;
+        __u32 DR1;
+        __u32 DR4;
+        __u32 num_cliprects;
         /** This is a struct drm_clip_rect *cliprects */
-        uint64_t cliprects_ptr;
+        __u64 cliprects_ptr;
 };
 
 struct drm_i915_gem_pin {
         /** Handle of the buffer to be pinned. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
 
         /** alignment required within the aperture */
-        uint64_t alignment;
+        __u64 alignment;
 
         /** Returned GTT offset of the buffer. */
-        uint64_t offset;
+        __u64 offset;
 };
 
 struct drm_i915_gem_unpin {
         /** Handle of the buffer to be unpinned. */
-        uint32_t handle;
-        uint32_t pad;
+        __u32 handle;
+        __u32 pad;
 };
 
 struct drm_i915_gem_busy {
         /** Handle of the buffer to check for busy */
-        uint32_t handle;
+        __u32 handle;
 
         /** Return busy status (1 if busy, 0 if idle) */
-        uint32_t busy;
+        __u32 busy;
 };
 
 #define I915_TILING_NONE        0
@@ -594,10 +594,13 @@ struct drm_i915_gem_busy {
 #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 */
-        uint32_t handle;
+        __u32 handle;
 
         /**
          * Tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
@@ -611,47 +614,47 @@ struct drm_i915_gem_set_tiling {
          *
          * Buffer contents become undefined when changing tiling_mode.
          */
-        uint32_t tiling_mode;
+        __u32 tiling_mode;
 
         /**
          * Stride in bytes for the object when in I915_TILING_X or
          * I915_TILING_Y.
          */
-        uint32_t stride;
+        __u32 stride;
 
         /**
          * Returned address bit 6 swizzling required for CPU access through
          * mmap mapping.
          */
-        uint32_t swizzle_mode;
+        __u32 swizzle_mode;
 };
 
 struct drm_i915_gem_get_tiling {
         /** Handle of the buffer to get tiling state for. */
-        uint32_t handle;
+        __u32 handle;
 
         /**
          * Current tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
          * I915_TILING_Y).
          */
-        uint32_t tiling_mode;
+        __u32 tiling_mode;
 
         /**
          * Returned address bit 6 swizzling required for CPU access through
          * mmap mapping.
          */
-        uint32_t swizzle_mode;
+        __u32 swizzle_mode;
 };
 
 struct drm_i915_gem_get_aperture {
         /** Total size of the aperture used by i915_gem_execbuffer, in bytes */
-        uint64_t aper_size;
+        __u64 aper_size;
 
         /**
          * Available space in the aperture used by i915_gem_execbuffer, in
          * bytes
          */
-        uint64_t aper_available_size;
+        __u64 aper_available_size;
 };
 
 #endif                          /* _I915_DRM_H_ */
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index 944b50a5ff24..325fd6fb4a42 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -35,6 +35,8 @@
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
 
+#include <linux/types.h>
+
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the Xserver file (mga_sarea.h)
  */
@@ -255,8 +257,8 @@ typedef struct _drm_mga_sarea {
 #define DRM_IOCTL_MGA_ILOAD    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t)
 #define DRM_IOCTL_MGA_BLIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t)
 #define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t)
-#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, uint32_t)
-#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, uint32_t)
+#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, __u32)
+#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, __u32)
 #define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
 
 typedef struct _drm_mga_warp_index {
@@ -310,7 +312,7 @@ typedef struct drm_mga_dma_bootstrap {
          */
         /*@{ */
         unsigned long texture_handle; /**< Handle used to map AGP textures. */
-        uint32_t texture_size;        /**< Size of the AGP texture region. */
+        __u32 texture_size;           /**< Size of the AGP texture region. */
         /*@} */
 
         /**
@@ -319,7 +321,7 @@ typedef struct drm_mga_dma_bootstrap {
          * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
          * filled in with the actual AGP mode.  If AGP was not available
          */
-        uint32_t primary_size;
+        __u32 primary_size;
 
         /**
          * Requested number of secondary DMA buffers.
@@ -329,7 +331,7 @@ typedef struct drm_mga_dma_bootstrap {
          * allocated.  Particularly when PCI DMA is used, this may be
          * (subtantially) less than the number requested.
          */
-        uint32_t secondary_bin_count;
+        __u32 secondary_bin_count;
 
         /**
          * Requested size of each secondary DMA buffer.
@@ -338,7 +340,7 @@ typedef struct drm_mga_dma_bootstrap {
          * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
          * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
          */
-        uint32_t secondary_bin_size;
+        __u32 secondary_bin_size;
 
         /**
          * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
@@ -350,12 +352,12 @@ typedef struct drm_mga_dma_bootstrap {
          * filled in with the actual AGP mode.  If AGP was not available
          * (i.e., PCI DMA was used), this value will be zero.
          */
-        uint32_t agp_mode;
+        __u32 agp_mode;
 
         /**
          * Desired AGP GART size, measured in megabytes.
          */
-        uint8_t agp_size;
+        __u8 agp_size;
 } drm_mga_dma_bootstrap_t;
 
 typedef struct drm_mga_clear {
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 73ff51f12311..fe3e3a4b4aed 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -33,6 +33,8 @@
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
 
+#include <linux/types.h>
+
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the X server file (radeon_sarea.h)
  */
@@ -304,6 +306,8 @@ typedef union {
 
 #define RADEON_SCRATCH_REG_OFFSET       32
 
+#define R600_SCRATCH_REG_OFFSET         256
+
 #define RADEON_NR_SAREA_CLIPRECTS       12
 
 /* There are 2 heaps (local/GART).  Each region within a heap is a
@@ -526,7 +530,8 @@ typedef struct drm_radeon_init {
                 RADEON_INIT_CP = 0x01,
                 RADEON_CLEANUP_CP = 0x02,
                 RADEON_INIT_R200_CP = 0x03,
-                RADEON_INIT_R300_CP = 0x04
+                RADEON_INIT_R300_CP = 0x04,
+                RADEON_INIT_R600_CP = 0x05
         } func;
         unsigned long sarea_priv_offset;
         int is_pci;
@@ -722,7 +727,7 @@ typedef struct drm_radeon_irq_wait {
 
 typedef struct drm_radeon_setparam {
         unsigned int param;
-        int64_t value;
+        __s64 value;
 } drm_radeon_setparam_t;
 
 #define RADEON_SETPARAM_FB_LOCATION    1        /* determined framebuffer location */
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
index a3b5c102b067..170786e5c2ff 100644
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
@@ -24,6 +24,8 @@
 #ifndef _VIA_DRM_H_
 #define _VIA_DRM_H_
 
+#include <linux/types.h>
+
 /* WARNING: These defines must be the same as what the Xserver uses.
  * if you change them, you must change the defines in the Xserver.
  */
@@ -114,19 +116,19 @@
 #define VIA_MEM_UNKNOWN 4
 
 typedef struct {
-        uint32_t offset;
-        uint32_t size;
+        __u32 offset;
+        __u32 size;
 } drm_via_agp_t;
 
 typedef struct {
-        uint32_t offset;
-        uint32_t size;
+        __u32 offset;
+        __u32 size;
 } drm_via_fb_t;
 
 typedef struct {
-        uint32_t context;
-        uint32_t type;
-        uint32_t size;
+        __u32 context;
+        __u32 type;
+        __u32 size;
         unsigned long index;
         unsigned long offset;
 } drm_via_mem_t;
@@ -148,9 +150,9 @@ typedef struct _drm_via_futex {
                 VIA_FUTEX_WAIT = 0x00,
                 VIA_FUTEX_WAKE = 0X01
         } func;
-        uint32_t ms;
-        uint32_t lock;
-        uint32_t val;
+        __u32 ms;
+        __u32 lock;
+        __u32 val;
 } drm_via_futex_t;
 
 typedef struct _drm_via_dma_init {
@@ -211,7 +213,7 @@ typedef struct _drm_via_cmdbuf_size {
                 VIA_CMDBUF_LAG = 0x02
         } func;
         int wait;
-        uint32_t size;
+        __u32 size;
 } drm_via_cmdbuf_size_t;
 
 typedef enum {
@@ -236,8 +238,8 @@ enum drm_via_irqs {
 struct drm_via_wait_irq_request {
         unsigned irq;
         via_irq_seq_type_t type;
-        uint32_t sequence;
-        uint32_t signal;
+        __u32 sequence;
+        __u32 signal;
 };
 
 typedef union drm_via_irqwait {
@@ -246,7 +248,7 @@ typedef union drm_via_irqwait {
 } drm_via_irqwait_t;
 
 typedef struct drm_via_blitsync {
-        uint32_t sync_handle;
+        __u32 sync_handle;
         unsigned engine;
 } drm_via_blitsync_t;
 
@@ -257,16 +259,16 @@ typedef struct drm_via_blitsync {
  */
 
 typedef struct drm_via_dmablit {
-        uint32_t num_lines;
-        uint32_t line_length;
+        __u32 num_lines;
+        __u32 line_length;
 
-        uint32_t fb_addr;
-        uint32_t fb_stride;
+        __u32 fb_addr;
+        __u32 fb_stride;
 
         unsigned char *mem_addr;
-        uint32_t mem_stride;
+        __u32 mem_stride;
 
-        uint32_t flags;
+        __u32 flags;
         int to_fb;
 
         drm_via_blitsync_t sync;
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 106c3ba50844..ca9b9b9bd331 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -67,6 +67,7 @@ header-y += falloc.h
 header-y += fd.h
 header-y += fdreg.h
 header-y += fib_rules.h
+header-y += fiemap.h
 header-y += firewire-cdev.h
 header-y += firewire-constants.h
 header-y += fuse.h
@@ -115,6 +116,7 @@ header-y += mqueue.h
 header-y += mtio.h
 header-y += ncp_no.h
 header-y += neighbour.h
+header-y += net_dropmon.h
 header-y += netfilter_arp.h
 header-y += netrom.h
 header-y += nfs2.h
@@ -157,8 +159,6 @@ header-y += ultrasound.h
 header-y += un.h
 header-y += utime.h
 header-y += veth.h
-header-y += video_decoder.h
-header-y += video_encoder.h
 header-y += videotext.h
 header-y += x25.h
 
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6fce2fc2d124..88be890ee3c7 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -79,6 +79,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table);
 typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
 
 char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
+void __acpi_unmap_table(char *map, unsigned long size);
 int early_acpi_boot_init(void);
 int acpi_boot_init (void);
 int acpi_boot_table_init (void);
@@ -96,6 +97,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 /* the following four functions are architecture-dependent */
 void acpi_numa_slit_init (struct acpi_table_slit *slit);
 void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
+void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
 void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
 void acpi_numa_arch_fixup(void);
 
@@ -109,6 +111,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
 int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
 void acpi_irq_stats_init(void);
 extern u32 acpi_irq_handled;
+extern u32 acpi_irq_not_handled;
 
 extern struct acpi_mcfg_allocation *pci_mmcfg_config;
 extern int pci_mmcfg_config_num;
@@ -256,6 +259,40 @@ void __init acpi_no_s4_hw_signature(void);
 void __init acpi_old_suspend_ordering(void);
 void __init acpi_s4_no_nvs(void);
 #endif /* CONFIG_PM_SLEEP */
+
+#define OSC_QUERY_TYPE                  0
+#define OSC_SUPPORT_TYPE                1
+#define OSC_CONTROL_TYPE                2
+#define OSC_SUPPORT_MASKS               0x1f
+
+/* _OSC DW0 Definition */
+#define OSC_QUERY_ENABLE                1
+#define OSC_REQUEST_ERROR               2
+#define OSC_INVALID_UUID_ERROR          4
+#define OSC_INVALID_REVISION_ERROR      8
+#define OSC_CAPABILITIES_MASK_ERROR     16
+
+/* _OSC DW1 Definition (OS Support Fields) */
+#define OSC_EXT_PCI_CONFIG_SUPPORT              1
+#define OSC_ACTIVE_STATE_PWR_SUPPORT            2
+#define OSC_CLOCK_PWR_CAPABILITY_SUPPORT        4
+#define OSC_PCI_SEGMENT_GROUPS_SUPPORT          8
+#define OSC_MSI_SUPPORT                         16
+
+/* _OSC DW1 Definition (OS Control Fields) */
+#define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL       1
+#define OSC_SHPC_NATIVE_HP_CONTROL              2
+#define OSC_PCI_EXPRESS_PME_CONTROL             4
+#define OSC_PCI_EXPRESS_AER_CONTROL             8
+#define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL   16
+
+#define OSC_CONTROL_MASKS       (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |    \
+                                OSC_SHPC_NATIVE_HP_CONTROL |            \
+                                OSC_PCI_EXPRESS_PME_CONTROL |           \
+                                OSC_PCI_EXPRESS_AER_CONTROL |           \
+                                OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
+
+extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags);
 #else   /* CONFIG_ACPI */
 
 static inline int early_acpi_boot_init(void)
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index 110c600c885f..f6778eceb8f4 100644
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -77,20 +77,20 @@ typedef struct _agp_setup {
  * The "prot" down below needs still a "sleep" flag somehow ...
  */
 typedef struct _agp_segment {
-        off_t pg_start;         /* starting page to populate    */
-        size_t pg_count;        /* number of pages              */
-        int prot;               /* prot flags for mmap          */
+        __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 {
-        pid_t pid;              /* pid of process               */
-        size_t seg_count;       /* number of segments           */
+        __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            */
-        size_t pg_count;        /* number of pages              */
+        __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     
@@ -100,7 +100,7 @@ typedef struct _agp_allocate {
 
 typedef struct _agp_bind {
         int key;                /* tag of allocation            */
-        off_t pg_start;         /* starting page to populate    */
+        __kernel_off_t pg_start;/* starting page to populate    */
 } agp_bind;
 
 typedef struct _agp_unbind {
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index a1916078fd08..cd4bcb6989ce 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -235,8 +235,6 @@ struct Outgoing {
 
 
 struct arcnet_local {
-        struct net_device_stats stats;
-
         uint8_t config,         /* current value of CONFIG register */
                 timeout,        /* Extended timeout for COM20020 */
                 backplane,      /* Backplane flag for COM20020 */
@@ -335,7 +333,12 @@ void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
 
 void arcnet_unregister_proto(struct ArcProto *proto);
 irqreturn_t arcnet_interrupt(int irq, void *dev_id);
-struct net_device *alloc_arcdev(char *name);
+struct net_device *alloc_arcdev(const char *name);
+
+int arcnet_open(struct net_device *dev);
+int arcnet_close(struct net_device *dev);
+int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev);
+void arcnet_timeout(struct net_device *dev);
 
 #endif                          /* __KERNEL__ */
 #endif                          /* _LINUX_ARCDEVICE_H */
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index 45f6297821bd..5fc2ef8d97fa 100644
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -21,6 +21,15 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 
+/* on architectures without dma-mapping capabilities we need to ensure
+ * that the asynchronous path compiles away
+ */
+#ifdef CONFIG_HAS_DMA
+#define __async_inline
+#else
+#define __async_inline __always_inline
+#endif
+
 /**
  * dma_chan_ref - object used to manage dma channels received from the
  *   dmaengine core.
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 08a86d5cdf1b..cb79b7a208e1 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -29,6 +29,8 @@
 #ifndef __LINUX_ATA_H__
 #define __LINUX_ATA_H__
 
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
@@ -89,6 +91,9 @@ enum {
         ATA_ID_DLF              = 128,
         ATA_ID_CSFO             = 129,
         ATA_ID_CFA_POWER        = 160,
+        ATA_ID_CFA_KEY_MGMT     = 162,
+        ATA_ID_CFA_MODES        = 163,
+        ATA_ID_DATA_SET_MGMT    = 169,
         ATA_ID_ROT_SPEED        = 217,
         ATA_ID_PIO4             = (1 << 1),
 
@@ -106,6 +111,8 @@ enum {
         ATA_PIO5                = ATA_PIO4 | (1 << 5),
         ATA_PIO6                = ATA_PIO5 | (1 << 6),
 
+        ATA_PIO4_ONLY           = (1 << 4),
+
         ATA_SWDMA0              = (1 << 0),
         ATA_SWDMA1              = ATA_SWDMA0 | (1 << 1),
         ATA_SWDMA2              = ATA_SWDMA1 | (1 << 2),
@@ -115,6 +122,8 @@ enum {
         ATA_MWDMA0              = (1 << 0),
         ATA_MWDMA1              = ATA_MWDMA0 | (1 << 1),
         ATA_MWDMA2              = ATA_MWDMA1 | (1 << 2),
+        ATA_MWDMA3              = ATA_MWDMA2 | (1 << 3),
+        ATA_MWDMA4              = ATA_MWDMA3 | (1 << 4),
 
         ATA_MWDMA12_ONLY        = (1 << 1) | (1 << 2),
         ATA_MWDMA2_ONLY         = (1 << 2),
@@ -129,6 +138,8 @@ enum {
         ATA_UDMA7               = ATA_UDMA6 | (1 << 7),
         /* ATA_UDMA7 is just for completeness... doesn't exist (yet?).  */
 
+        ATA_UDMA24_ONLY         = (1 << 2) | (1 << 4),
+
         ATA_UDMA_MASK_40C       = ATA_UDMA2,    /* udma0-2 */
 
         /* DMA-related */
@@ -240,10 +251,9 @@ enum {
         ATA_CMD_SMART           = 0xB0,
         ATA_CMD_MEDIA_LOCK      = 0xDE,
         ATA_CMD_MEDIA_UNLOCK    = 0xDF,
+        ATA_CMD_DSM             = 0x06,
         /* marked obsolete in the ATA/ATAPI-7 spec */
         ATA_CMD_RESTORE         = 0x10,
-        /* EXABYTE specific */
-        ATA_EXABYTE_ENABLE_NEST = 0xF0,
 
         /* READ_LOG_EXT pages */
         ATA_LOG_SATA_NCQ        = 0x10,
@@ -315,6 +325,9 @@ enum {
         ATA_SMART_READ_VALUES   = 0xD0,
         ATA_SMART_READ_THRESHOLDS = 0xD1,
 
+        /* feature values for Data Set Management */
+        ATA_DSM_TRIM            = 0x01,
+
         /* password used in LBA Mid / LBA High for executing SMART commands */
         ATA_SMART_LBAM_PASS     = 0x4F,
         ATA_SMART_LBAH_PASS     = 0xC2,
@@ -717,6 +730,14 @@ static inline int ata_id_has_unload(const u16 *id)
         return 0;
 }
 
+static inline int ata_id_has_trim(const u16 *id)
+{
+        if (ata_id_major_version(id) >= 7 &&
+            (id[ATA_ID_DATA_SET_MGMT] & 1))
+                return 1;
+        return 0;
+}
+
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
         /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -857,6 +878,32 @@ static inline void ata_id_to_hd_driveid(u16 *id)
 #endif
 }
 
+/*
+ * Write up to 'max' LBA Range Entries to the buffer that will cover the
+ * extent from sector to sector + count.  This is used for TRIM and for
+ * ADD LBA(S) TO NV CACHE PINNED SET.
+ */
+static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
+                                                u64 sector, unsigned long count)
+{
+        __le64 *buffer = _buffer;
+        unsigned i = 0;
+
+        while (i < max) {
+                u64 entry = sector |
+                        ((u64)(count > 0xffff ? 0xffff : count) << 48);
+                buffer[i++] = __cpu_to_le64(entry);
+                if (count <= 0xffff)
+                        break;
+                count -= 0xffff;
+                sector += 0xffff;
+        }
+
+        max = ALIGN(i * 8, 512);
+        memset(buffer + i, 0, max - i * 8);
+        return max;
+}
+
 static inline int is_multi_taskfile(struct ata_taskfile *tf)
 {
         return (tf->command == ATA_CMD_READ_MULTI) ||
diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h
new file mode 100644
index 000000000000..b847fc7b93f9
--- /dev/null
+++ b/include/linux/ath9k_platform.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2008 Atheros Communications Inc.
+ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * 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 _LINUX_ATH9K_PLATFORM_H
+#define _LINUX_ATH9K_PLATFORM_H
+
+#define ATH9K_PLAT_EEP_MAX_WORDS        2048
+
+struct ath9k_platform_data {
+        u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];
+};
+
+#endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
index 6f5a1bab8f50..39c917fd1b96 100644
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
@@ -11,6 +11,7 @@
 #include <linux/atmioc.h>
 #include <linux/atm.h>
 #include <linux/if_ether.h>
+#include <linux/types.h>
 
 /* ATM lec daemon control socket */
 #define ATMLEC_CTRL     _IO('a', ATMIOC_LANE)
@@ -78,8 +79,8 @@ struct atmlec_msg {
                 } normal;
                 struct atmlec_config_msg config;
                 struct {
-                        uint16_t lec_id;                        /* requestor lec_id  */
-                        uint32_t tran_id;                       /* transaction id    */
+                        __u16 lec_id;                           /* requestor lec_id  */
+                        __u32 tran_id;                          /* transaction id    */
                         unsigned char mac_addr[ETH_ALEN];       /* dst mac addr      */
                         unsigned char atm_addr[ATM_ESA_LEN];    /* reqestor ATM addr */
                 } proxy;        /*
diff --git a/include/linux/atmmpc.h b/include/linux/atmmpc.h
index ea1650425a12..2aba5787fa63 100644
--- a/include/linux/atmmpc.h
+++ b/include/linux/atmmpc.h
@@ -4,6 +4,7 @@
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>
 #include <linux/atm.h>
+#include <linux/types.h>
 
 #define ATMMPC_CTRL _IO('a', ATMIOC_MPOA)
 #define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1)
@@ -18,39 +19,39 @@ struct atmmpc_ioc {
 };
 
 typedef struct in_ctrl_info {
-        uint8_t   Last_NHRP_CIE_code;
-        uint8_t   Last_Q2931_cause_value;     
-        uint8_t   eg_MPC_ATM_addr[ATM_ESA_LEN];
+        __u8   Last_NHRP_CIE_code;
+        __u8   Last_Q2931_cause_value;
+        __u8   eg_MPC_ATM_addr[ATM_ESA_LEN];
         __be32  tag;
         __be32  in_dst_ip;      /* IP address this ingress MPC sends packets to */
-        uint16_t  holding_time;
-        uint32_t  request_id;
+        __u16  holding_time;
+        __u32  request_id;
 } in_ctrl_info;
 
 typedef struct eg_ctrl_info {
-        uint8_t   DLL_header[256];
-        uint8_t   DH_length;
+        __u8   DLL_header[256];
+        __u8   DH_length;
         __be32  cache_id;
         __be32  tag;
         __be32  mps_ip;
         __be32  eg_dst_ip;      /* IP address to which ingress MPC sends packets */
-        uint8_t   in_MPC_data_ATM_addr[ATM_ESA_LEN];
-        uint16_t  holding_time;
+        __u8   in_MPC_data_ATM_addr[ATM_ESA_LEN];
+        __u16  holding_time;
 } eg_ctrl_info;
 
 struct mpc_parameters {
-        uint16_t mpc_p1;   /* Shortcut-Setup Frame Count    */
-        uint16_t mpc_p2;   /* Shortcut-Setup Frame Time     */
-        uint8_t mpc_p3[8]; /* Flow-detection Protocols      */
-        uint16_t mpc_p4;   /* MPC Initial Retry Time        */
-        uint16_t mpc_p5;   /* MPC Retry Time Maximum        */
-        uint16_t mpc_p6;   /* Hold Down Time                */      
+        __u16 mpc_p1;   /* Shortcut-Setup Frame Count    */
+        __u16 mpc_p2;   /* Shortcut-Setup Frame Time     */
+        __u8 mpc_p3[8]; /* Flow-detection Protocols      */
+        __u16 mpc_p4;   /* MPC Initial Retry Time        */
+        __u16 mpc_p5;   /* MPC Retry Time Maximum        */
+        __u16 mpc_p6;   /* Hold Down Time                */
 } ;
 
 struct k_message {
-        uint16_t type;
+        __u16 type;
         __be32 ip_mask;
-        uint8_t  MPS_ctrl[ATM_ESA_LEN];
+        __u8  MPS_ctrl[ATM_ESA_LEN];
         union {
                 in_ctrl_info in_info;
                 eg_ctrl_info eg_info;
@@ -61,11 +62,11 @@ struct k_message {
 
 struct llc_snap_hdr {
         /* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */
-        uint8_t  dsap;    /* Destination Service Access Point (0xAA)     */
-        uint8_t  ssap;    /* Source Service Access Point      (0xAA)     */
-        uint8_t  ui;      /* Unnumbered Information           (0x03)     */
-        uint8_t  org[3];  /* Organizational identification    (0x000000) */
-        uint8_t  type[2]; /* Ether type (for IP)              (0x0800)   */
+        __u8  dsap;    /* Destination Service Access Point (0xAA)     */
+        __u8  ssap;    /* Source Service Access Point      (0xAA)     */
+        __u8  ui;      /* Unnumbered Information           (0x03)     */
+        __u8  org[3];  /* Organizational identification    (0x000000) */
+        __u8  type[2]; /* Ether type (for IP)              (0x0800)   */
 };
 
 /* TLVs this MPC recognizes */
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 67e5dbfc2961..4fa2810b675e 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -36,7 +36,8 @@
  * 1500 - 1599 kernel LSPP events
  * 1600 - 1699 kernel crypto events
  * 1700 - 1799 kernel anomaly records
- * 1800 - 1999 future kernel use (maybe integrity labels and related events)
+ * 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
@@ -125,6 +126,12 @@
 #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_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. */
 
diff --git a/include/linux/auto_dev-ioctl.h b/include/linux/auto_dev-ioctl.h
index 91a773993a5c..850f39b33e74 100644
--- a/include/linux/auto_dev-ioctl.h
+++ b/include/linux/auto_dev-ioctl.h
@@ -10,8 +10,13 @@
 #ifndef _LINUX_AUTO_DEV_IOCTL_H
 #define _LINUX_AUTO_DEV_IOCTL_H
 
+#include <linux/auto_fs.h>
+
+#ifdef __KERNEL__
 #include <linux/string.h>
-#include <linux/types.h>
+#else
+#include <string.h>
+#endif /* __KERNEL__ */
 
 #define AUTOFS_DEVICE_NAME              "autofs"
 
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
index c21e5972a3e8..63265852b7d1 100644
--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -17,11 +17,13 @@
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/limits.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#else
 #include <asm/types.h>
+#include <sys/ioctl.h>
 #endif /* __KERNEL__ */
 
-#include <linux/ioctl.h>
-
 /* This file describes autofs v3 */
 #define AUTOFS_PROTO_VERSION    3
 
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index bee52abb8a4d..0ec2c594868e 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -24,8 +24,8 @@ struct dentry;
  */
 enum bdi_state {
         BDI_pdflush,            /* A pdflush thread is working this device */
-        BDI_write_congested,    /* The write queue is getting full */
-        BDI_read_congested,     /* The read queue is getting full */
+        BDI_async_congested,    /* The async (write) queue is getting full */
+        BDI_sync_congested,     /* The sync queue is getting full */
         BDI_unused,             /* Available bits start here */
 };
 
@@ -215,18 +215,18 @@ static inline int bdi_congested(struct backing_dev_info *bdi, int bdi_bits)
 
 static inline int bdi_read_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_read_congested);
+        return bdi_congested(bdi, 1 << BDI_sync_congested);
 }
 
 static inline int bdi_write_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_write_congested);
+        return bdi_congested(bdi, 1 << BDI_async_congested);
 }
 
 static inline int bdi_rw_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, (1 << BDI_read_congested)|
-                                  (1 << BDI_write_congested));
+        return bdi_congested(bdi, (1 << BDI_sync_congested) |
+                                  (1 << BDI_async_congested));
 }
 
 void clear_bdi_congested(struct backing_dev_info *bdi, int rw);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 77b4a9e46004..61ee18c1bdb4 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -35,8 +35,7 @@ struct linux_binprm{
 #endif
         struct mm_struct *mm;
         unsigned long p; /* current top of mem */
-        unsigned int sh_bang:1,
-                misc_bang:1,
+        unsigned int
                 cred_prepared:1,/* true if creds already prepared (multiple
                                  * preps happen for interpreters) */
                 cap_effective:1;/* true if has elevated effective capabilities,
@@ -83,7 +82,19 @@ struct linux_binfmt {
         int hasvdso;
 };
 
-extern int register_binfmt(struct linux_binfmt *);
+extern int __register_binfmt(struct linux_binfmt *fmt, int insert);
+
+/* Registration of default binfmt handlers */
+static inline int register_binfmt(struct linux_binfmt *fmt)
+{
+        return __register_binfmt(fmt, 0);
+}
+/* Same as above, but adds a new binfmt at the top of the list */
+static inline int insert_binfmt(struct linux_binfmt *fmt)
+{
+        return __register_binfmt(fmt, 1);
+}
+
 extern void unregister_binfmt(struct linux_binfmt *);
 
 extern int prepare_binprm(struct linux_binprm *);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1b16108a5417..7b214fd672a2 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -132,6 +132,7 @@ struct bio {
  * top 4 bits of bio flags indicate the pool this bio came from
  */
 #define BIO_POOL_BITS           (4)
+#define BIO_POOL_NONE           ((1UL << BIO_POOL_BITS) - 1)
 #define BIO_POOL_OFFSET         (BITS_PER_LONG - BIO_POOL_BITS)
 #define BIO_POOL_MASK           (1UL << BIO_POOL_OFFSET)
 #define BIO_POOL_IDX(bio)       ((bio)->bi_flags >> BIO_POOL_OFFSET)    
@@ -145,20 +146,21 @@ struct bio {
  * bit 2 -- barrier
  *      Insert a serialization point in the IO queue, forcing previously
  *      submitted IO to be completed before this one is issued.
- * bit 3 -- synchronous I/O hint: the block layer will unplug immediately
- *      Note that this does NOT indicate that the IO itself is sync, just
- *      that the block layer will not postpone issue of this IO by plugging.
- * bit 4 -- metadata request
+ * bit 3 -- synchronous I/O hint.
+ * bit 4 -- Unplug the device immediately after submitting this bio.
+ * bit 5 -- metadata request
  *      Used for tracing to differentiate metadata and data IO. May also
  *      get some preferential treatment in the IO scheduler
- * bit 5 -- discard sectors
+ * bit 6 -- discard sectors
  *      Informs the lower level device that this range of sectors is no longer
  *      used by the file system and may thus be freed by the device. Used
  *      for flash based storage.
- * bit 6 -- fail fast device errors
- * bit 7 -- fail fast transport errors
- * bit 8 -- fail fast driver errors
+ * bit 7 -- fail fast device errors
+ * bit 8 -- fail fast transport errors
+ * bit 9 -- fail fast driver errors
  *      Don't want driver retries for any fast fail whatever the reason.
+ * bit 10 -- Tell the IO scheduler not to wait for more requests after this
+        one has been submitted, even if it is a SYNC request.
  */
 #define BIO_RW          0       /* Must match RW in req flags (blkdev.h) */
 #define BIO_RW_AHEAD    1       /* Must match FAILFAST in req flags */
@@ -170,6 +172,7 @@ struct bio {
 #define BIO_RW_FAILFAST_DEV             7
 #define BIO_RW_FAILFAST_TRANSPORT       8
 #define BIO_RW_FAILFAST_DRIVER          9
+#define BIO_RW_NOIDLE   10
 
 #define bio_rw_flagged(bio, flag)       ((bio)->bi_rw & (1 << (flag)))
 
@@ -188,6 +191,7 @@ struct bio {
 #define bio_rw_ahead(bio)       bio_rw_flagged(bio, BIO_RW_AHEAD)
 #define bio_rw_meta(bio)        bio_rw_flagged(bio, BIO_RW_META)
 #define bio_discard(bio)        bio_rw_flagged(bio, BIO_RW_DISCARD)
+#define bio_noidle(bio)         bio_rw_flagged(bio, BIO_RW_NOIDLE)
 
 /*
  * upper 16 bits of bi_rw define the io priority of this bio
@@ -426,9 +430,6 @@ struct bio_set {
         unsigned int front_pad;
 
         mempool_t *bio_pool;
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
-        mempool_t *bio_integrity_pool;
-#endif
         mempool_t *bvec_pool;
 };
 
@@ -504,6 +505,115 @@ static inline int bio_has_data(struct bio *bio)
         return bio && bio->bi_io_vec != NULL;
 }
 
+/*
+ * BIO list managment for use by remapping drivers (e.g. DM or MD).
+ *
+ * A bio_list anchors a singly-linked list of bios chained through the bi_next
+ * member of the bio.  The bio_list also caches the last list member to allow
+ * fast access to the tail.
+ */
+struct bio_list {
+        struct bio *head;
+        struct bio *tail;
+};
+
+static inline int bio_list_empty(const struct bio_list *bl)
+{
+        return bl->head == NULL;
+}
+
+static inline void bio_list_init(struct bio_list *bl)
+{
+        bl->head = bl->tail = NULL;
+}
+
+#define bio_list_for_each(bio, bl) \
+        for (bio = (bl)->head; bio; bio = bio->bi_next)
+
+static inline unsigned bio_list_size(const struct bio_list *bl)
+{
+        unsigned sz = 0;
+        struct bio *bio;
+
+        bio_list_for_each(bio, bl)
+                sz++;
+
+        return sz;
+}
+
+static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
+{
+        bio->bi_next = NULL;
+
+        if (bl->tail)
+                bl->tail->bi_next = bio;
+        else
+                bl->head = bio;
+
+        bl->tail = bio;
+}
+
+static inline void bio_list_add_head(struct bio_list *bl, struct bio *bio)
+{
+        bio->bi_next = bl->head;
+
+        bl->head = bio;
+
+        if (!bl->tail)
+                bl->tail = bio;
+}
+
+static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
+{
+        if (!bl2->head)
+                return;
+
+        if (bl->tail)
+                bl->tail->bi_next = bl2->head;
+        else
+                bl->head = bl2->head;
+
+        bl->tail = bl2->tail;
+}
+
+static inline void bio_list_merge_head(struct bio_list *bl,
+                                       struct bio_list *bl2)
+{
+        if (!bl2->head)
+                return;
+
+        if (bl->head)
+                bl2->tail->bi_next = bl->head;
+        else
+                bl->tail = bl2->tail;
+
+        bl->head = bl2->head;
+}
+
+static inline struct bio *bio_list_pop(struct bio_list *bl)
+{
+        struct bio *bio = bl->head;
+
+        if (bio) {
+                bl->head = bl->head->bi_next;
+                if (!bl->head)
+                        bl->tail = NULL;
+
+                bio->bi_next = NULL;
+        }
+
+        return bio;
+}
+
+static inline struct bio *bio_list_get(struct bio_list *bl)
+{
+        struct bio *bio = bl->head;
+
+        bl->head = bl->tail = NULL;
+
+        return bio;
+}
+
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
 
 #define bip_vec_idx(bip, idx)   (&(bip->bip_vec[(idx)]))
@@ -519,9 +629,8 @@ static inline int bio_has_data(struct bio *bio)
 
 #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);
@@ -531,27 +640,21 @@ 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 *, struct bio_set *);
-extern int bioset_integrity_create(struct bio_set *, int);
-extern void bioset_integrity_free(struct bio_set *);
-extern void bio_integrity_init_slab(void);
+extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t);
 
 #else /* CONFIG_BLK_DEV_INTEGRITY */
 
 #define bio_integrity(a)                (0)
-#define bioset_integrity_create(a, b)   (0)
 #define bio_integrity_prep(a)           (0)
 #define bio_integrity_enabled(a)        (0)
 #define bio_integrity_clone(a, b, c)    (0)
-#define bioset_integrity_free(a)        do { } while (0)
-#define bio_integrity_free(a, b)        do { } while (0)
+#define bio_integrity_free(a)           do { } while (0)
 #define bio_integrity_endio(a, b)       do { } while (0)
 #define bio_integrity_advance(a, b)     do { } while (0)
 #define bio_integrity_trim(a, b, c)     do { } while (0)
 #define bio_integrity_split(a, b, c)    do { } while (0)
 #define bio_integrity_set_tag(a, b, c)  do { } while (0)
 #define bio_integrity_get_tag(a, b, c)  do { } while (0)
-#define bio_integrity_init_slab(a)      do { } while (0)
 
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
 
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 61829139795a..c05a29cb9bb2 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -112,6 +112,25 @@ static inline unsigned fls_long(unsigned long l)
         return fls64(l);
 }
 
+/**
+ * __ffs64 - find first set bit in a 64 bit word
+ * @word: The 64 bit word
+ *
+ * On 64 bit arches this is a synomyn for __ffs
+ * The result is not defined if no bits are set, so check that @word
+ * is non-zero before calling this.
+ */
+static inline unsigned long __ffs64(u64 word)
+{
+#if BITS_PER_LONG == 32
+        if (((u32)word) == 0UL)
+                return __ffs((u32)(word >> 32)) + 32;
+#elif BITS_PER_LONG != 64
+#error BITS_PER_LONG not 32 or 64
+#endif
+        return __ffs((unsigned long)word);
+}
+
 #ifdef __KERNEL__
 #ifdef CONFIG_GENERIC_FIND_FIRST_BIT
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 465d6babc847..b4f71f1a4af7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -38,6 +38,10 @@ struct request;
 typedef void (rq_end_io_fn)(struct request *, int);
 
 struct request_list {
+        /*
+         * count[], starved[], and wait[] are indexed by
+         * BLK_RW_SYNC/BLK_RW_ASYNC
+         */
         int count[2];
         int starved[2];
         int elvpriv;
@@ -66,6 +70,11 @@ enum rq_cmd_type_bits {
         REQ_TYPE_ATA_PC,
 };
 
+enum {
+        BLK_RW_ASYNC    = 0,
+        BLK_RW_SYNC     = 1,
+};
+
 /*
  * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
  * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
@@ -103,12 +112,13 @@ enum rq_flag_bits {
         __REQ_QUIET,            /* don't worry about errors */
         __REQ_PREEMPT,          /* set for "ide_preempt" requests */
         __REQ_ORDERED_COLOR,    /* is before or after barrier */
-        __REQ_RW_SYNC,          /* request is sync (O_DIRECT) */
+        __REQ_RW_SYNC,          /* request is sync (sync write or read) */
         __REQ_ALLOCED,          /* request came from our alloc pool */
         __REQ_RW_META,          /* metadata io request */
         __REQ_COPY_USER,        /* contains copies of user pages */
         __REQ_INTEGRITY,        /* integrity metadata has been remapped */
-        __REQ_UNPLUG,           /* unplug queue on submission */
+        __REQ_NOIDLE,           /* Don't anticipate more IO after this one */
+        __REQ_IO_STAT,          /* account I/O stat */
         __REQ_NR_BITS,          /* stops here */
 };
 
@@ -135,7 +145,8 @@ enum rq_flag_bits {
 #define REQ_RW_META     (1 << __REQ_RW_META)
 #define REQ_COPY_USER   (1 << __REQ_COPY_USER)
 #define REQ_INTEGRITY   (1 << __REQ_INTEGRITY)
-#define REQ_UNPLUG      (1 << __REQ_UNPLUG)
+#define REQ_NOIDLE      (1 << __REQ_NOIDLE)
+#define REQ_IO_STAT     (1 << __REQ_IO_STAT)
 
 #define BLK_MAX_CDB     16
 
@@ -438,8 +449,8 @@ struct request_queue
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */
-#define QUEUE_FLAG_READFULL     3       /* read queue has been filled */
-#define QUEUE_FLAG_WRITEFULL    4       /* write queue has been filled */
+#define QUEUE_FLAG_SYNCFULL     3       /* read queue has been filled */
+#define QUEUE_FLAG_ASYNCFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
 #define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
@@ -589,6 +600,8 @@ enum {
                                  blk_failfast_transport(rq) ||  \
                                  blk_failfast_driver(rq))
 #define blk_rq_started(rq)      ((rq)->cmd_flags & REQ_STARTED)
+#define blk_rq_io_stat(rq)      ((rq)->cmd_flags & REQ_IO_STAT)
+#define blk_rq_quiet(rq)        ((rq)->cmd_flags & REQ_QUIET)
 
 #define blk_account_rq(rq)      (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) 
 
@@ -611,32 +624,42 @@ enum {
 #define rq_data_dir(rq)         ((rq)->cmd_flags & 1)
 
 /*
- * We regard a request as sync, if it's a READ or a SYNC write.
+ * We regard a request as sync, if either a read or a sync write
  */
-#define rq_is_sync(rq)          (rq_data_dir((rq)) == READ || (rq)->cmd_flags & REQ_RW_SYNC)
+static inline bool rw_is_sync(unsigned int rw_flags)
+{
+        return !(rw_flags & REQ_RW) || (rw_flags & REQ_RW_SYNC);
+}
+
+static inline bool rq_is_sync(struct request *rq)
+{
+        return rw_is_sync(rq->cmd_flags);
+}
+
 #define rq_is_meta(rq)          ((rq)->cmd_flags & REQ_RW_META)
+#define rq_noidle(rq)           ((rq)->cmd_flags & REQ_NOIDLE)
 
-static inline int blk_queue_full(struct request_queue *q, int rw)
+static inline int blk_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
-                return test_bit(QUEUE_FLAG_READFULL, &q->queue_flags);
-        return test_bit(QUEUE_FLAG_WRITEFULL, &q->queue_flags);
+        if (sync)
+                return test_bit(QUEUE_FLAG_SYNCFULL, &q->queue_flags);
+        return test_bit(QUEUE_FLAG_ASYNCFULL, &q->queue_flags);
 }
 
-static inline void blk_set_queue_full(struct request_queue *q, int rw)
+static inline void blk_set_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
-                queue_flag_set(QUEUE_FLAG_READFULL, q);
+        if (sync)
+                queue_flag_set(QUEUE_FLAG_SYNCFULL, q);
         else
-                queue_flag_set(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_set(QUEUE_FLAG_ASYNCFULL, q);
 }
 
-static inline void blk_clear_queue_full(struct request_queue *q, int rw)
+static inline void blk_clear_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
-                queue_flag_clear(QUEUE_FLAG_READFULL, q);
+        if (sync)
+                queue_flag_clear(QUEUE_FLAG_SYNCFULL, q);
         else
-                queue_flag_clear(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_clear(QUEUE_FLAG_ASYNCFULL, q);
 }
 
 
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 6e915878e88c..d960889e92ef 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -144,6 +144,9 @@ struct blk_user_trace_setup {
 
 #ifdef __KERNEL__
 #if defined(CONFIG_BLK_DEV_IO_TRACE)
+
+#include <linux/sysfs.h>
+
 struct blk_trace {
         int trace_state;
         struct rchan *rchan;
@@ -194,6 +197,8 @@ extern int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
 extern int blk_trace_startstop(struct request_queue *q, int start);
 extern int blk_trace_remove(struct request_queue *q);
 
+extern struct attribute_group blk_trace_attr_group;
+
 #else /* !CONFIG_BLK_DEV_IO_TRACE */
 #define blk_trace_ioctl(bdev, cmd, arg)         (-ENOTTY)
 #define blk_trace_shutdown(q)                   do { } while (0)
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 95837bfb5256..bc3ab7073695 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -65,23 +65,20 @@ extern void free_bootmem(unsigned long addr, unsigned long size);
 #define BOOTMEM_DEFAULT         0
 #define BOOTMEM_EXCLUSIVE       (1<<0)
 
+extern int reserve_bootmem(unsigned long addr,
+                           unsigned long size,
+                           int flags);
 extern int reserve_bootmem_node(pg_data_t *pgdat,
-                                 unsigned long physaddr,
-                                 unsigned long size,
-                                 int flags);
-#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
-extern int reserve_bootmem(unsigned long addr, unsigned long size, int flags);
-#endif
+                                unsigned long physaddr,
+                                unsigned long size,
+                                int flags);
 
-extern void *__alloc_bootmem_nopanic(unsigned long size,
+extern void *__alloc_bootmem(unsigned long size,
                              unsigned long align,
                              unsigned long goal);
-extern void *__alloc_bootmem(unsigned long size,
+extern void *__alloc_bootmem_nopanic(unsigned long size,
                                      unsigned long align,
                                      unsigned long goal);
-extern void *__alloc_bootmem_low(unsigned long size,
-                                 unsigned long align,
-                                 unsigned long goal);
 extern void *__alloc_bootmem_node(pg_data_t *pgdat,
                                   unsigned long size,
                                   unsigned long align,
@@ -90,30 +87,35 @@ extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat,
                                   unsigned long size,
                                   unsigned long align,
                                   unsigned long goal);
+extern void *__alloc_bootmem_low(unsigned long size,
+                                 unsigned long align,
+                                 unsigned long goal);
 extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
                                       unsigned long size,
                                       unsigned long align,
                                       unsigned long goal);
-#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
+
 #define alloc_bootmem(x) \
         __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_nopanic(x) \
         __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
-#define alloc_bootmem_low(x) \
-        __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
 #define alloc_bootmem_pages(x) \
         __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages_nopanic(x) \
         __alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
-#define alloc_bootmem_low_pages(x) \
-        __alloc_bootmem_low(x, PAGE_SIZE, 0)
 #define alloc_bootmem_node(pgdat, x) \
         __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages_node(pgdat, x) \
         __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
+#define alloc_bootmem_pages_node_nopanic(pgdat, x) \
+        __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
+
+#define alloc_bootmem_low(x) \
+        __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
+#define alloc_bootmem_low_pages(x) \
+        __alloc_bootmem_low(x, PAGE_SIZE, 0)
 #define alloc_bootmem_low_pages_node(pgdat, x) \
         __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
-#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 
 extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
                                    int flags);
@@ -144,10 +146,10 @@ extern void *alloc_large_system_hash(const char *tablename,
 
 #define HASH_EARLY      0x00000001      /* Allocating during early boot? */
 
-/* Only NUMA needs hash distribution.
- * IA64 and x86_64 have sufficient vmalloc space.
+/* Only NUMA needs hash distribution. 64bit NUMA architectures have
+ * sufficient vmalloc space.
  */
-#if defined(CONFIG_NUMA) && (defined(CONFIG_IA64) || defined(CONFIG_X86_64))
+#if defined(CONFIG_NUMA) && defined(CONFIG_64BIT)
 #define HASHDIST_DEFAULT 1
 #else
 #define HASHDIST_DEFAULT 0
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index cf0303a60611..ecb4730d0868 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -1,12 +1,22 @@
 #ifndef BSG_H
 #define BSG_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 , .... */
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index bd7ac793be19..16ed0284d780 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -155,6 +155,7 @@ void create_empty_buffers(struct page *, unsigned long,
                         unsigned long b_state);
 void end_buffer_read_sync(struct buffer_head *bh, int uptodate);
 void end_buffer_write_sync(struct buffer_head *bh, int uptodate);
+void end_buffer_async_write(struct buffer_head *bh, int uptodate);
 
 /* Things to do with buffers at mapping->private_list */
 void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode);
@@ -165,15 +166,8 @@ int sync_mapping_buffers(struct address_space *mapping);
 void unmap_underlying_metadata(struct block_device *bdev, sector_t block);
 
 void mark_buffer_async_write(struct buffer_head *bh);
-void invalidate_bdev(struct block_device *);
-int sync_blockdev(struct block_device *bdev);
 void __wait_on_buffer(struct buffer_head *);
 wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
-int fsync_bdev(struct block_device *);
-struct super_block *freeze_bdev(struct block_device *);
-int thaw_bdev(struct block_device *, struct super_block *);
-int fsync_super(struct super_block *);
-int fsync_no_super(struct block_device *);
 struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block,
                         unsigned size);
 struct buffer_head *__getblk(struct block_device *bdev, sector_t block,
@@ -204,6 +198,8 @@ extern int buffer_heads_over_limit;
 void block_invalidatepage(struct page *page, unsigned long offset);
 int block_write_full_page(struct page *page, get_block_t *get_block,
                                 struct writeback_control *wbc);
+int block_write_full_page_endio(struct page *page, get_block_t *get_block,
+                        struct writeback_control *wbc, bh_end_io_t *handler);
 int block_read_full_page(struct page*, get_block_t*);
 int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
                                 unsigned long from);
@@ -223,7 +219,7 @@ int cont_write_begin(struct file *, struct address_space *, loff_t,
                         get_block_t *, loff_t *);
 int generic_cont_expand_simple(struct inode *inode, loff_t size);
 int block_commit_write(struct page *page, unsigned from, unsigned to);
-int block_page_mkwrite(struct vm_area_struct *vma, struct page *page,
+int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
                                 get_block_t get_block);
 void block_sync_page(struct page *);
 sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
@@ -339,22 +335,10 @@ extern int __set_page_dirty_buffers(struct page *page);
 
 static inline void buffer_init(void) {}
 static inline int try_to_free_buffers(struct page *page) { return 1; }
-static inline int sync_blockdev(struct block_device *bdev) { return 0; }
 static inline int inode_has_buffers(struct inode *inode) { return 0; }
 static inline void invalidate_inode_buffers(struct inode *inode) {}
 static inline int remove_inode_buffers(struct inode *inode) { return 1; }
 static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
-static inline void invalidate_bdev(struct block_device *bdev) {}
-
-static inline struct super_block *freeze_bdev(struct block_device *sb)
-{
-        return NULL;
-}
-
-static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)
-{
-        return 0;
-}
 
 #endif /* CONFIG_BLOCK */
 #endif /* _LINUX_BUFFER_HEAD_H */
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 1b9872556131..c3021105edc0 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -377,7 +377,21 @@ struct cpu_vfs_cap_data {
 #define CAP_FOR_EACH_U32(__capi)  \
         for (__capi = 0; __capi < _KERNEL_CAPABILITY_U32S; ++__capi)
 
+/*
+ * CAP_FS_MASK and CAP_NFSD_MASKS:
+ *
+ * The fs mask is all the privileges that fsuid==0 historically meant.
+ * At one time in the past, that included CAP_MKNOD and CAP_LINUX_IMMUTABLE.
+ *
+ * It has never meant setting security.* and trusted.* xattrs.
+ *
+ * We could also define fsmask as follows:
+ *   1. CAP_FS_MASK is the privilege to bypass all fs-related DAC permissions
+ *   2. The security.* and trusted.* xattrs are fs-related MAC permissions
+ */
+
 # define CAP_FS_MASK_B0     (CAP_TO_MASK(CAP_CHOWN)             \
+                            | CAP_TO_MASK(CAP_MKNOD)            \
                             | CAP_TO_MASK(CAP_DAC_OVERRIDE)     \
                             | CAP_TO_MASK(CAP_DAC_READ_SEARCH)  \
                             | CAP_TO_MASK(CAP_FOWNER)           \
@@ -392,9 +406,12 @@ struct cpu_vfs_cap_data {
 # define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
 # define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
 # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
-# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
-# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \
-                                        CAP_FS_MASK_B1 } })
+# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+                                    | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
+                                    CAP_FS_MASK_B1 } })
+# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+                                    | CAP_TO_MASK(CAP_SYS_RESOURCE), \
+                                    CAP_FS_MASK_B1 } })
 
 #endif /* _KERNEL_CAPABILITY_U32S != 2 */
 
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 499900d0cee7..665fa70e4094 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -15,6 +15,7 @@
 #include <linux/cgroupstats.h>
 #include <linux/prio_heap.h>
 #include <linux/rwsem.h>
+#include <linux/idr.h>
 
 #ifdef CONFIG_CGROUPS
 
@@ -22,6 +23,7 @@ struct cgroupfs_root;
 struct cgroup_subsys;
 struct inode;
 struct cgroup;
+struct css_id;
 
 extern int cgroup_init_early(void);
 extern int cgroup_init(void);
@@ -47,18 +49,24 @@ enum cgroup_subsys_id {
 
 /* Per-subsystem/per-cgroup state maintained by the system. */
 struct cgroup_subsys_state {
-        /* The cgroup that this subsystem is attached to. Useful
+        /*
+         * The cgroup that this subsystem is attached to. Useful
          * for subsystems that want to know about the cgroup
-         * hierarchy structure */
+         * hierarchy structure
+         */
         struct cgroup *cgroup;
 
-        /* State maintained by the cgroup system to allow subsystems
+        /*
+         * State maintained by the cgroup system to allow subsystems
          * to be "busy". Should be accessed via css_get(),
-         * css_tryget() and and css_put(). */
+         * css_tryget() and and css_put().
+         */
 
         atomic_t refcnt;
 
         unsigned long flags;
+        /* ID for this css, if possible */
+        struct css_id *id;
 };
 
 /* bits in struct cgroup_subsys_state flags field */
@@ -120,19 +128,26 @@ static inline void css_put(struct cgroup_subsys_state *css)
 enum {
         /* Control Group is dead */
         CGRP_REMOVED,
-        /* Control Group has previously had a child cgroup or a task,
-         * but no longer (only if CGRP_NOTIFY_ON_RELEASE is set) */
+        /*
+         * Control Group has previously had a child cgroup or a task,
+         * but no longer (only if CGRP_NOTIFY_ON_RELEASE is set)
+         */
         CGRP_RELEASABLE,
         /* Control Group requires release notifications to userspace */
         CGRP_NOTIFY_ON_RELEASE,
+        /*
+         * A thread in rmdir() is wating for this cgroup.
+         */
+        CGRP_WAIT_ON_RMDIR,
 };
 
 struct cgroup {
         unsigned long flags;            /* "unsigned long" so bitops work */
 
-        /* count users of this cgroup. >0 means busy, but doesn't
-         * necessarily indicate the number of tasks in the
-         * cgroup */
+        /*
+         * count users of this cgroup. >0 means busy, but doesn't
+         * necessarily indicate the number of tasks in the cgroup
+         */
         atomic_t count;
 
         /*
@@ -142,7 +157,7 @@ struct cgroup {
         struct list_head sibling;       /* my parent's children */
         struct list_head children;      /* my children */
 
-        struct cgroup *parent;  /* my parent */
+        struct cgroup *parent;          /* my parent */
         struct dentry *dentry;          /* cgroup fs entry, RCU protected */
 
         /* Private pointers for each registered subsystem */
@@ -177,11 +192,12 @@ struct cgroup {
         struct rcu_head rcu_head;
 };
 
-/* A css_set is a structure holding pointers to a set of
+/*
+ * A css_set is a structure holding pointers to a set of
  * cgroup_subsys_state objects. This saves space in the task struct
  * object and speeds up fork()/exit(), since a single inc/dec and a
- * list_add()/del() can bump the reference count on the entire
- * cgroup set for a task.
+ * list_add()/del() can bump the reference count on the entire cgroup
+ * set for a task.
  */
 
 struct css_set {
@@ -226,13 +242,8 @@ struct cgroup_map_cb {
         void *state;
 };
 
-/* struct cftype:
- *
- * The files in the cgroup filesystem mostly have a very simple read/write
- * handling, some common function will take care of it. Nevertheless some cases
- * (read tasks) are special and therefore I define this structure for every
- * kind of file.
- *
+/*
+ * struct cftype: handler definitions for cgroup control files
  *
  * When reading/writing to a file:
  *      - the cgroup to use is file->f_dentry->d_parent->d_fsdata
@@ -241,10 +252,17 @@ struct cgroup_map_cb {
 
 #define MAX_CFTYPE_NAME 64
 struct cftype {
-        /* By convention, the name should begin with the name of the
-         * subsystem, followed by a period */
+        /*
+         * By convention, the name should begin with the name of the
+         * subsystem, followed by a period
+         */
         char name[MAX_CFTYPE_NAME];
         int private;
+        /*
+         * If not 0, file mode is set to this value, otherwise it will
+         * be figured out automatically
+         */
+        mode_t mode;
 
         /*
          * If non-zero, defines the maximum length of string that can
@@ -319,15 +337,20 @@ struct cgroup_scanner {
         void (*process_task)(struct task_struct *p,
                         struct cgroup_scanner *scan);
         struct ptr_heap *heap;
+        void *data;
 };
 
-/* Add a new file to the given cgroup directory. Should only be
- * called by subsystems from within a populate() method */
+/*
+ * Add a new file to the given cgroup directory. Should only be
+ * called by subsystems from within a populate() method
+ */
 int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
                        const struct cftype *cft);
 
-/* Add a set of new files to the given cgroup directory. Should
- * only be called by subsystems from within a populate() method */
+/*
+ * Add a set of new files to the given cgroup directory. Should
+ * only be called by subsystems from within a populate() method
+ */
 int cgroup_add_files(struct cgroup *cgrp,
                         struct cgroup_subsys *subsys,
                         const struct cftype cft[],
@@ -339,15 +362,18 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
 
 int cgroup_task_count(const struct cgroup *cgrp);
 
-/* Return true if the cgroup is a descendant of the current cgroup */
-int cgroup_is_descendant(const struct cgroup *cgrp);
+/* Return true if cgrp is a descendant of the task's cgroup */
+int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task);
 
-/* Control Group subsystem type. See Documentation/cgroups.txt for details */
+/*
+ * Control Group subsystem type.
+ * See Documentation/cgroups/cgroups.txt for details
+ */
 
 struct cgroup_subsys {
         struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,
                                                   struct cgroup *cgrp);
-        void (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
+        int (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
         void (*destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
         int (*can_attach)(struct cgroup_subsys *ss,
                           struct cgroup *cgrp, struct task_struct *tsk);
@@ -364,6 +390,11 @@ struct cgroup_subsys {
         int active;
         int disabled;
         int early_init;
+        /*
+         * True if this subsys uses ID. ID is not available before cgroup_init()
+         * (not available in early_init time.)
+         */
+        bool use_id;
 #define MAX_CGROUP_TYPE_NAMELEN 32
         const char *name;
 
@@ -386,6 +417,9 @@ struct cgroup_subsys {
          */
         struct cgroupfs_root *root;
         struct list_head sibling;
+        /* used when use_id == true */
+        struct idr idr;
+        spinlock_t id_lock;
 };
 
 #define SUBSYS(_x) extern struct cgroup_subsys _x ## _subsys;
@@ -419,7 +453,8 @@ struct cgroup_iter {
         struct list_head *task;
 };
 
-/* To iterate across the tasks in a cgroup:
+/*
+ * To iterate across the tasks in a cgroup:
  *
  * 1) call cgroup_iter_start to intialize an iterator
  *
@@ -428,9 +463,10 @@ struct cgroup_iter {
  *
  * 3) call cgroup_iter_end() to destroy the iterator.
  *
- * Or, call cgroup_scan_tasks() to iterate through every task in a cpuset.
- *    - cgroup_scan_tasks() holds the css_set_lock when calling the test_task()
- *      callback, but not while calling the process_task() callback.
+ * Or, call cgroup_scan_tasks() to iterate through every task in a
+ * cgroup - cgroup_scan_tasks() holds the css_set_lock when calling
+ * the test_task() callback, but not while calling the process_task()
+ * callback.
  */
 void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it);
 struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
@@ -439,6 +475,44 @@ void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
 int cgroup_scan_tasks(struct cgroup_scanner *scan);
 int cgroup_attach_task(struct cgroup *, struct task_struct *);
 
+/*
+ * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works
+ * if cgroup_subsys.use_id == true. It can be used for looking up and scanning.
+ * CSS ID is assigned at cgroup allocation (create) automatically
+ * and removed when subsys calls free_css_id() function. This is because
+ * the lifetime of cgroup_subsys_state is subsys's matter.
+ *
+ * Looking up and scanning function should be called under rcu_read_lock().
+ * Taking cgroup_mutex()/hierarchy_mutex() is not necessary for following calls.
+ * But the css returned by this routine can be "not populated yet" or "being
+ * destroyed". The caller should check css and cgroup's status.
+ */
+
+/*
+ * Typically Called at ->destroy(), or somewhere the subsys frees
+ * cgroup_subsys_state.
+ */
+void free_css_id(struct cgroup_subsys *ss, struct cgroup_subsys_state *css);
+
+/* Find a cgroup_subsys_state which has given ID */
+
+struct cgroup_subsys_state *css_lookup(struct cgroup_subsys *ss, int id);
+
+/*
+ * Get a cgroup whose id is greater than or equal to id under tree of root.
+ * Returning a cgroup_subsys_state or NULL.
+ */
+struct cgroup_subsys_state *css_get_next(struct cgroup_subsys *ss, int id,
+                struct cgroup_subsys_state *root, int *foundid);
+
+/* Returns true if root is ancestor of cg */
+bool css_is_ancestor(struct cgroup_subsys_state *cg,
+                     const struct cgroup_subsys_state *root);
+
+/* Get id and depth of css */
+unsigned short css_id(struct cgroup_subsys_state *css);
+unsigned short css_depth(struct cgroup_subsys_state *css);
+
 #else /* !CONFIG_CGROUPS */
 
 static inline int cgroup_init_early(void) { return 0; }
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 778777316ea4..1db9bbf444a3 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -125,4 +125,21 @@ int clk_set_parent(struct clk *clk, struct clk *parent);
  */
 struct clk *clk_get_parent(struct clk *clk);
 
+/**
+ * clk_get_sys - get a clock based upon the device name
+ * @dev_id: device name
+ * @con_id: connection ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno.  The implementation
+ * uses @dev_id and @con_id to determine the clock consumer, and
+ * thereby the clock producer. In contrast to clk_get() this function
+ * takes the device name instead of the device itself for identification.
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * clk_get_sys should not be called from within interrupt context.
+ */
+struct clk *clk_get_sys(const char *dev_id, const char *con_id);
+
 #endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index f88d32f8ff7c..5a40d14daa9f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -22,8 +22,109 @@ typedef u64 cycle_t;
 struct clocksource;
 
 /**
+ * struct cyclecounter - hardware abstraction for a free running counter
+ *      Provides completely state-free accessors to the underlying hardware.
+ *      Depending on which hardware it reads, the cycle counter may wrap
+ *      around quickly. Locking rules (if necessary) have to be defined
+ *      by the implementor and user of specific instances of this API.
+ *
+ * @read:               returns the current cycle value
+ * @mask:               bitmask for two's complement
+ *                      subtraction of non 64 bit counters,
+ *                      see CLOCKSOURCE_MASK() helper macro
+ * @mult:               cycle to nanosecond multiplier
+ * @shift:              cycle to nanosecond divisor (power of two)
+ */
+struct cyclecounter {
+        cycle_t (*read)(const struct cyclecounter *cc);
+        cycle_t mask;
+        u32 mult;
+        u32 shift;
+};
+
+/**
+ * struct timecounter - layer above a %struct cyclecounter which counts nanoseconds
+ *      Contains the state needed by timecounter_read() to detect
+ *      cycle counter wrap around. Initialize with
+ *      timecounter_init(). Also used to convert cycle counts into the
+ *      corresponding nanosecond counts with timecounter_cyc2time(). Users
+ *      of this code are responsible for initializing the underlying
+ *      cycle counter hardware, locking issues and reading the time
+ *      more often than the cycle counter wraps around. The nanosecond
+ *      counter will only wrap around after ~585 years.
+ *
+ * @cc:                 the cycle counter used by this instance
+ * @cycle_last:         most recent cycle counter value seen by
+ *                      timecounter_read()
+ * @nsec:               continuously increasing count
+ */
+struct timecounter {
+        const struct cyclecounter *cc;
+        cycle_t cycle_last;
+        u64 nsec;
+};
+
+/**
+ * cyclecounter_cyc2ns - converts cycle counter cycles to nanoseconds
+ * @tc:         Pointer to cycle counter.
+ * @cycles:     Cycles
+ *
+ * XXX - This could use some mult_lxl_ll() asm optimization. Same code
+ * as in cyc2ns, but with unsigned result.
+ */
+static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,
+                                      cycle_t cycles)
+{
+        u64 ret = (u64)cycles;
+        ret = (ret * cc->mult) >> cc->shift;
+        return ret;
+}
+
+/**
+ * timecounter_init - initialize a time counter
+ * @tc:                 Pointer to time counter which is to be initialized/reset
+ * @cc:                 A cycle counter, ready to be used.
+ * @start_tstamp:       Arbitrary initial time stamp.
+ *
+ * After this call the current cycle register (roughly) corresponds to
+ * the initial time stamp. Every call to timecounter_read() increments
+ * the time stamp counter by the number of elapsed nanoseconds.
+ */
+extern void timecounter_init(struct timecounter *tc,
+                             const struct cyclecounter *cc,
+                             u64 start_tstamp);
+
+/**
+ * timecounter_read - return nanoseconds elapsed since timecounter_init()
+ *                    plus the initial time stamp
+ * @tc:          Pointer to time counter.
+ *
+ * In other words, keeps track of time since the same epoch as
+ * the function which generated the initial time stamp.
+ */
+extern u64 timecounter_read(struct timecounter *tc);
+
+/**
+ * timecounter_cyc2time - convert a cycle counter to same
+ *                        time base as values returned by
+ *                        timecounter_read()
+ * @tc:         Pointer to time counter.
+ * @cycle:      a value returned by tc->cc->read()
+ *
+ * Cycle counts that are converted correctly as long as they
+ * fall into the interval [-1/2 max cycle count, +1/2 max cycle count],
+ * with "max cycle count" == cs->mask+1.
+ *
+ * This allows conversion of cycle counter values which were generated
+ * in the past.
+ */
+extern u64 timecounter_cyc2time(struct timecounter *tc,
+                                cycle_t cycle_tstamp);
+
+/**
  * struct clocksource - hardware abstraction for a free running counter
  *      Provides mostly state-free accessors to the underlying hardware.
+ *      This is the structure used for system time.
  *
  * @name:               ptr to clocksource name
  * @list:               list head for registration
@@ -42,7 +143,9 @@ struct clocksource;
  *                      400-499: Perfect
  *                              The ideal clocksource. A must-use where
  *                              available.
- * @read:               returns a cycle value
+ * @read:               returns a cycle value, passes clocksource as argument
+ * @enable:             optional function to enable the clocksource
+ * @disable:            optional function to disable the clocksource
  * @mask:               bitmask for two's complement
  *                      subtraction of non 64 bit counters
  * @mult:               cycle to nanosecond multiplier (adjusted by NTP)
@@ -61,7 +164,9 @@ struct clocksource {
         char *name;
         struct list_head list;
         int rating;
-        cycle_t (*read)(void);
+        cycle_t (*read)(struct clocksource *cs);
+        int (*enable)(struct clocksource *cs);
+        void (*disable)(struct clocksource *cs);
         cycle_t mask;
         u32 mult;
         u32 mult_orig;
@@ -170,7 +275,34 @@ static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
  */
 static inline cycle_t clocksource_read(struct clocksource *cs)
 {
-        return cs->read();
+        return cs->read(cs);
+}
+
+/**
+ * clocksource_enable: - enable clocksource
+ * @cs:         pointer to clocksource
+ *
+ * Enables the specified clocksource. The clocksource callback
+ * function should start up the hardware and setup mult and field
+ * members of struct clocksource to reflect hardware capabilities.
+ */
+static inline int clocksource_enable(struct clocksource *cs)
+{
+        return cs->enable ? cs->enable(cs) : 0;
+}
+
+/**
+ * clocksource_disable: - disable clocksource
+ * @cs:         pointer to clocksource
+ *
+ * Disables the specified clocksource. The clocksource callback
+ * function should power down the now unused hardware block to
+ * save power.
+ */
+static inline void clocksource_disable(struct clocksource *cs)
+{
+        if (cs->disable)
+                cs->disable(cs);
 }
 
 /**
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 605ebe24bb2e..72bfefdbd767 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -1,6 +1,8 @@
 #ifndef _CM4000_H_
 #define _CM4000_H_
 
+#include <linux/types.h>
+
 #define MAX_ATR                 33
 
 #define CM4000_MAX_DEV          4
@@ -10,9 +12,9 @@
  * not to break compilation of userspace apps. -HW */
 
 typedef struct atreq {
-        int32_t atr_len;
+        __s32 atr_len;
         unsigned char atr[64];
-        int32_t power_act;
+        __s32 power_act;
         unsigned char bIFSD;
         unsigned char bIFSC;
 } atreq_t;
@@ -22,13 +24,13 @@ typedef struct atreq {
  * 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 "u_int32_t".
+ * 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 {
-        u_int32_t protocol; /*T=0: 2^0, T=1:  2^1*/
+        __u32 protocol; /*T=0: 2^0, T=1:  2^1*/
         unsigned char flags;
         unsigned char pts1;
         unsigned char pts2;
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index 1c86d65bc4b9..b8125b2eb665 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -65,20 +65,20 @@ struct proc_event {
                 } ack;
 
                 struct fork_proc_event {
-                        pid_t parent_pid;
-                        pid_t parent_tgid;
-                        pid_t child_pid;
-                        pid_t child_tgid;
+                        __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 {
-                        pid_t process_pid;
-                        pid_t process_tgid;
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
                 } exec;
 
                 struct id_proc_event {
-                        pid_t process_pid;
-                        pid_t process_tgid;
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
                         union {
                                 __u32 ruid; /* task uid */
                                 __u32 rgid; /* task gid */
@@ -90,8 +90,8 @@ struct proc_event {
                 } id;
 
                 struct exit_proc_event {
-                        pid_t process_pid;
-                        pid_t process_tgid;
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
                         __u32 exit_code, exit_signal;
                 } exit;
         } event_data;
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 07ae8f846055..5b5d4731f956 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -6,6 +6,7 @@
 #define CODA_PSDEV_MAJOR 67
 #define MAX_CODADEVS  5    /* how many do we allow */
 
+#ifdef __KERNEL__
 struct kstatfs;
 
 /* communication pending/processing queues */
@@ -24,7 +25,6 @@ static inline struct venus_comm *coda_vcp(struct super_block *sb)
         return (struct venus_comm *)((sb)->s_fs_info);
 }
 
-
 /* upcalls */
 int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);
 int venus_getattr(struct super_block *sb, struct CodaFid *fid,
@@ -64,6 +64,12 @@ int coda_downcall(int opcode, union outputArgs *out, struct super_block *sb);
 int venus_fsync(struct super_block *sb, struct CodaFid *fid);
 int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
 
+/*
+ * Statistics
+ */
+
+extern struct venus_comm coda_comms[];
+#endif /* __KERNEL__ */
 
 /* messages between coda filesystem in kernel and Venus */
 struct upc_req {
@@ -82,11 +88,4 @@ struct upc_req {
 #define REQ_WRITE  0x4
 #define REQ_ABORT  0x8
 
-
-/*
- * Statistics
- */
-
-extern struct venus_comm coda_comms[];
-
 #endif
diff --git a/include/linux/com20020.h b/include/linux/com20020.h
index ac6d9a43e085..5dcfb944b6ce 100644
--- a/include/linux/com20020.h
+++ b/include/linux/com20020.h
@@ -29,6 +29,7 @@
 
 int com20020_check(struct net_device *dev);
 int com20020_found(struct net_device *dev, int shared);
+extern const struct net_device_ops com20020_netdev_ops;
 
 /* The number of low I/O ports used by the card. */
 #define ARCNET_TOTAL_SIZE 8
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 3fd2194ff573..f2ded21f9a3c 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -125,6 +125,13 @@ struct compat_dirent {
         char            d_name[256];
 };
 
+struct compat_ustat {
+        compat_daddr_t          f_tfree;
+        compat_ino_t            f_tinode;
+        char                    f_fname[6];
+        char                    f_fpack[6];
+};
+
 typedef union compat_sigval {
         compat_int_t    sival_int;
         compat_uptr_t   sival_ptr;
@@ -178,11 +185,18 @@ long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
                 unsigned nsems, const struct compat_timespec __user *timeout);
 asmlinkage long compat_sys_keyctl(u32 option,
                               u32 arg2, u32 arg3, u32 arg4, u32 arg5);
+asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
 
 asmlinkage ssize_t compat_sys_readv(unsigned long fd,
                 const struct compat_iovec __user *vec, unsigned long vlen);
 asmlinkage ssize_t compat_sys_writev(unsigned long fd,
                 const struct compat_iovec __user *vec, unsigned long vlen);
+asmlinkage ssize_t compat_sys_preadv(unsigned long fd,
+                const struct compat_iovec __user *vec,
+                unsigned long vlen, u32 pos_low, u32 pos_high);
+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);
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 1514d534deeb..a3ed7cb8ca34 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -52,7 +52,15 @@
 #define __deprecated                    __attribute__((deprecated))
 #define __packed                        __attribute__((packed))
 #define __weak                          __attribute__((weak))
-#define __naked                         __attribute__((naked))
+
+/*
+ * it doesn't make sense on ARM (currently the only user of __naked) to trace
+ * naked functions because then mcount is called without stack and frame pointer
+ * being set up and there is no chance to restore the lr register to the value
+ * before mcount was called.
+ */
+#define __naked                         __attribute__((naked)) notrace
+
 #define __noreturn                      __attribute__((noreturn))
 
 /*
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 09992718f9e8..450fa597c94d 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -3,8 +3,10 @@
 #endif
 
 /* GCC 4.1.[01] miscompiles __weak */
-#if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
-# error Your version of gcc miscompiles the __weak directive
+#ifdef __KERNEL__
+# if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
+#  error Your version of gcc miscompiles the __weak directive
+# endif
 #endif
 
 #define __used                  __attribute__((__used__))
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index d95da1020f1c..37bcb50a4d7c 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -68,6 +68,7 @@ struct ftrace_branch_data {
                         unsigned long miss;
                         unsigned long hit;
                 };
+                unsigned long miss_hit[2];
         };
 };
 
@@ -75,7 +76,8 @@ struct ftrace_branch_data {
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
 void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
 #define likely_notrace(x)       __builtin_expect(!!(x), 1)
@@ -113,7 +115,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  * "Define 'is'", Bill Clinton
  * "Define 'if'", Steven Rostedt
  */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :          \
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+        if (__builtin_constant_p((cond)) ? !!(cond) :                   \
         ({                                                              \
                 int ______r;                                            \
                 static struct ftrace_branch_data                        \
@@ -125,10 +129,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
                                 .line = __LINE__,                       \
                         };                                              \
                 ______r = !!(cond);                                     \
-                if (______r)                                            \
-                        ______f.hit++;                                  \
-                else                                                    \
-                        ______f.miss++;                                 \
+                ______f.miss_hit[______r]++;                                    \
                 ______r;                                                \
         }))
 #endif /* CONFIG_PROFILE_ALL_BRANCHES */
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 34f2789d9b9b..b9966e64604e 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -39,8 +39,10 @@
 #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_NETLINK_USERS                6
+#define CN_NETLINK_USERS                7
 
 /*
  * Maximum connector's message size.
@@ -109,6 +111,12 @@ struct cn_queue_dev {
         unsigned char name[CN_CBQ_NAMELEN];
 
         struct workqueue_struct *cn_queue;
+        /* Sent to kevent to create cn_queue only when needed */
+        struct work_struct wq_creation;
+        /* Tell if the wq_creation job is pending/completed */
+        atomic_t wq_requested;
+        /* Wait for cn_queue to be created */
+        wait_queue_head_t wq_created;
 
         struct list_head queue_list;
         spinlock_t queue_lock;
@@ -164,6 +172,8 @@ int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
 
+int queue_cn_work(struct cn_callback_entry *cbq, struct work_struct *work);
+
 struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *);
 void cn_queue_free_dev(struct cn_queue_dev *dev);
 
diff --git a/include/linux/console.h b/include/linux/console.h
index a67a90cf8268..dcca5339ceb3 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -137,8 +137,8 @@ extern void resume_console(void);
 int mda_console_init(void);
 void prom_con_init(void);
 
-void vcs_make_sysfs(struct tty_struct *tty);
-void vcs_remove_sysfs(struct tty_struct *tty);
+void vcs_make_sysfs(int index);
+void vcs_remove_sysfs(int index);
 
 /* Some debug stub to catch some of the obvious races in the VT code */
 #if 1
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index c2747ac2ae43..2643d848df90 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -23,7 +23,6 @@
 #include <linux/node.h>
 #include <linux/compiler.h>
 #include <linux/cpumask.h>
-#include <linux/mutex.h>
 
 struct cpu {
         int node_id;            /* The node which contains the CPU */
@@ -103,16 +102,6 @@ extern struct sysdev_class cpu_sysdev_class;
 #ifdef CONFIG_HOTPLUG_CPU
 /* Stop CPUs going up and down. */
 
-static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
-{
-        mutex_lock(cpu_hp_mutex);
-}
-
-static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
-{
-        mutex_unlock(cpu_hp_mutex);
-}
-
 extern void get_online_cpus(void);
 extern void put_online_cpus(void);
 #define hotcpu_notifier(fn, pri) {                              \
@@ -126,11 +115,6 @@ int cpu_down(unsigned int cpu);
 
 #else           /* CONFIG_HOTPLUG_CPU */
 
-static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
-{ }
-static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
-{ }
-
 #define get_online_cpus()       do { } while (0)
 #define put_online_cpus()       do { } while (0)
 #define hotcpu_notifier(fn, pri)        do { (void)(fn); } while (0)
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 384b38d3e8e2..161042746afc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -234,7 +234,6 @@ struct cpufreq_driver {
         int     (*suspend)      (struct cpufreq_policy *policy, pm_message_t pmsg);
         int     (*resume)       (struct cpufreq_policy *policy);
         struct freq_attr        **attr;
-        bool                    hide_interface;
 };
 
 /* flags */
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 90c6074a36ca..05ea1dd7d681 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -12,6 +12,7 @@
 #include <linux/cpumask.h>
 #include <linux/nodemask.h>
 #include <linux/cgroup.h>
+#include <linux/mm.h>
 
 #ifdef CONFIG_CPUSETS
 
@@ -29,19 +30,29 @@ void cpuset_init_current_mems_allowed(void);
 void cpuset_update_task_memory_state(void);
 int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask);
 
-extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
-extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
+extern int __cpuset_node_allowed_softwall(int node, gfp_t gfp_mask);
+extern int __cpuset_node_allowed_hardwall(int node, gfp_t gfp_mask);
 
-static int inline cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+static inline int cpuset_node_allowed_softwall(int node, gfp_t gfp_mask)
 {
         return number_of_cpusets <= 1 ||
-                __cpuset_zone_allowed_softwall(z, gfp_mask);
+                __cpuset_node_allowed_softwall(node, gfp_mask);
 }
 
-static int inline cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
+static inline int cpuset_node_allowed_hardwall(int node, gfp_t gfp_mask)
 {
         return number_of_cpusets <= 1 ||
-                __cpuset_zone_allowed_hardwall(z, gfp_mask);
+                __cpuset_node_allowed_hardwall(node, gfp_mask);
+}
+
+static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+{
+        return cpuset_node_allowed_softwall(zone_to_nid(z), gfp_mask);
+}
+
+static inline int cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
+{
+        return cpuset_node_allowed_hardwall(zone_to_nid(z), gfp_mask);
 }
 
 extern int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,
@@ -90,12 +101,12 @@ static inline void cpuset_init_smp(void) {}
 static inline void cpuset_cpus_allowed(struct task_struct *p,
                                        struct cpumask *mask)
 {
-        *mask = cpu_possible_map;
+        cpumask_copy(mask, cpu_possible_mask);
 }
 static inline void cpuset_cpus_allowed_locked(struct task_struct *p,
                                               struct cpumask *mask)
 {
-        *mask = cpu_possible_map;
+        cpumask_copy(mask, cpu_possible_mask);
 }
 
 static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)
@@ -112,6 +123,16 @@ static inline int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask)
         return 1;
 }
 
+static inline int cpuset_node_allowed_softwall(int node, gfp_t gfp_mask)
+{
+        return 1;
+}
+
+static inline int cpuset_node_allowed_hardwall(int node, gfp_t gfp_mask)
+{
+        return 1;
+}
+
 static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
 {
         return 1;
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 1f2e9020acc6..ec29fa268b94 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -40,6 +40,7 @@
 #define CRYPTO_ALG_TYPE_SHASH           0x00000009
 #define CRYPTO_ALG_TYPE_AHASH           0x0000000a
 #define CRYPTO_ALG_TYPE_RNG             0x0000000c
+#define CRYPTO_ALG_TYPE_PCOMPRESS       0x0000000f
 
 #define CRYPTO_ALG_TYPE_HASH_MASK       0x0000000e
 #define CRYPTO_ALG_TYPE_AHASH_MASK      0x0000000c
@@ -548,9 +549,6 @@ struct crypto_attr_u32 {
  * Transform user interface.
  */
  
-struct crypto_tfm *crypto_alloc_tfm(const char *alg_name,
-                                    const struct crypto_type *frontend,
-                                    u32 type, u32 mask);
 struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask);
 void crypto_destroy_tfm(void *mem, struct crypto_tfm *tfm);
 
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index d06fbf286346..788850ba4e75 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -82,9 +82,9 @@ struct cyclades_monitor {
  * open)
  */
 struct cyclades_idle_stats {
-    time_t         in_use;      /* Time device has been in use (secs) */
-    time_t         recv_idle;   /* Time since last char received (secs) */
-    time_t         xmit_idle;   /* Time since last char transmitted (secs) */
+    __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 */
diff --git a/include/linux/dca.h b/include/linux/dca.h
index b00a753eda53..9c20c7e87d0a 100644
--- a/include/linux/dca.h
+++ b/include/linux/dca.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright(c) 2007 - 2009 Intel 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 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.
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
 #ifndef DCA_H
 #define DCA_H
 /* DCA Provider API */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index c66d22487bf8..15156364d196 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -112,7 +112,7 @@ struct dentry {
         struct list_head d_subdirs;     /* our children */
         struct list_head d_alias;       /* inode alias list */
         unsigned long d_time;           /* used by d_revalidate */
-        struct dentry_operations *d_op;
+        const struct dentry_operations *d_op;
         struct super_block *d_sb;       /* The root of the dentry tree */
         void *d_fsdata;                 /* fs-specific data */
 
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 61734e27abb7..7434a8353e23 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -355,46 +355,6 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
         return __dccp_hdr_len(dccp_hdr(skb));
 }
 
-
-/* initial values for each feature */
-#define DCCPF_INITIAL_SEQUENCE_WINDOW           100
-#define DCCPF_INITIAL_ACK_RATIO                 2
-#define DCCPF_INITIAL_CCID                      DCCPC_CCID2
-/* FIXME: for now we're default to 1 but it should really be 0 */
-#define DCCPF_INITIAL_SEND_NDP_COUNT            1
-
-/**
-  * struct dccp_minisock - Minimal DCCP connection representation
-  *
-  * Will be used to pass the state from dccp_request_sock to dccp_sock.
-  *
-  * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2)
-  * @dccpms_pending - List of features being negotiated
-  * @dccpms_conf -
-  */
-struct dccp_minisock {
-        __u64                   dccpms_sequence_window;
-        struct list_head        dccpms_pending;
-        struct list_head        dccpms_conf;
-};
-
-struct dccp_opt_conf {
-        __u8                    *dccpoc_val;
-        __u8                    dccpoc_len;
-};
-
-struct dccp_opt_pend {
-        struct list_head        dccpop_node;
-        __u8                    dccpop_type;
-        __u8                    dccpop_feat;
-        __u8                    *dccpop_val;
-        __u8                    dccpop_len;
-        int                     dccpop_conf;
-        struct dccp_opt_conf    *dccpop_sc;
-};
-
-extern void dccp_minisock_init(struct dccp_minisock *dmsk);
-
 /**
  * struct dccp_request_sock  -  represent DCCP-specific connection request
  * @dreq_inet_rsk: structure inherited from
@@ -483,13 +443,14 @@ struct dccp_ackvec;
  * @dccps_timestamp_time - time of receiving latest @dccps_timestamp_echo
  * @dccps_l_ack_ratio - feature-local Ack Ratio
  * @dccps_r_ack_ratio - feature-remote Ack Ratio
+ * @dccps_l_seq_win - local Sequence Window (influences ack number validity)
+ * @dccps_r_seq_win - remote Sequence Window (influences seq number validity)
  * @dccps_pcslen - sender   partial checksum coverage (via sockopt)
  * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)
  * @dccps_send_ndp_count - local Send NDP Count feature (7.7.2)
  * @dccps_ndp_count - number of Non Data Packets since last data packet
  * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)
  * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)
- * @dccps_minisock - associated minisock (accessed via dccp_msk)
  * @dccps_featneg - tracks feature-negotiation state (mostly during handshake)
  * @dccps_hc_rx_ackvec - rx half connection ack vector
  * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)
@@ -523,12 +484,13 @@ struct dccp_sock {
         __u32                           dccps_timestamp_time;
         __u16                           dccps_l_ack_ratio;
         __u16                           dccps_r_ack_ratio;
+        __u64                           dccps_l_seq_win:48;
+        __u64                           dccps_r_seq_win:48;
         __u8                            dccps_pcslen:4;
         __u8                            dccps_pcrlen:4;
         __u8                            dccps_send_ndp_count:1;
         __u64                           dccps_ndp_count:48;
         unsigned long                   dccps_rate_last;
-        struct dccp_minisock            dccps_minisock;
         struct list_head                dccps_featneg;
         struct dccp_ackvec              *dccps_hc_rx_ackvec;
         struct ccid                     *dccps_hc_rx_ccid;
@@ -546,11 +508,6 @@ static inline struct dccp_sock *dccp_sk(const struct sock *sk)
         return (struct dccp_sock *)sk;
 }
 
-static inline struct dccp_minisock *dccp_msk(const struct sock *sk)
-{
-        return (struct dccp_minisock *)&dccp_sk(sk)->dccps_minisock;
-}
-
 static inline const char *dccp_role(const struct sock *sk)
 {
         switch (dccp_sk(sk)->dccps_role) {
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 096476f1fb35..29b3ce3f2a1d 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,12 +2,20 @@
 #define __LINUX_DEBUG_LOCKING_H
 
 #include <linux/kernel.h>
+#include <asm/atomic.h>
+#include <asm/system.h>
 
 struct task_struct;
 
 extern int debug_locks;
 extern int debug_locks_silent;
 
+
+static inline int __debug_locks_off(void)
+{
+        return xchg(&debug_locks, 0);
+}
+
 /*
  * Generic 'turn off all lock debugging' function:
  */
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index af0e01d4c663..eb5c2ba2f81a 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -71,6 +71,9 @@ struct dentry *debugfs_create_bool(const char *name, mode_t mode,
 struct dentry *debugfs_create_blob(const char *name, mode_t mode,
                                   struct dentry *parent,
                                   struct debugfs_blob_wrapper *blob);
+
+bool debugfs_initialized(void);
+
 #else
 
 #include <linux/err.h>
@@ -183,6 +186,11 @@ static inline struct dentry *debugfs_create_blob(const char *name, mode_t mode,
         return ERR_PTR(-ENODEV);
 }
 
+static inline bool debugfs_initialized(void)
+{
+        return false;
+}
+
 #endif
 
 #endif
diff --git a/include/linux/decompress/bunzip2.h b/include/linux/decompress/bunzip2.h
new file mode 100644
index 000000000000..115272137a9c
--- /dev/null
+++ b/include/linux/decompress/bunzip2.h
@@ -0,0 +1,10 @@
+#ifndef DECOMPRESS_BUNZIP2_H
+#define DECOMPRESS_BUNZIP2_H
+
+int bunzip2(unsigned char *inbuf, int len,
+            int(*fill)(void*, unsigned int),
+            int(*flush)(void*, unsigned int),
+            unsigned char *output,
+            int *pos,
+            void(*error)(char *x));
+#endif
diff --git a/include/linux/decompress/generic.h b/include/linux/decompress/generic.h
new file mode 100644
index 000000000000..6dfb856327bb
--- /dev/null
+++ b/include/linux/decompress/generic.h
@@ -0,0 +1,33 @@
+#ifndef DECOMPRESS_GENERIC_H
+#define DECOMPRESS_GENERIC_H
+
+/* Minimal chunksize to be read.
+ *Bzip2 prefers at least 4096
+ *Lzma prefers 0x10000 */
+#define COMPR_IOBUF_SIZE        4096
+
+typedef int (*decompress_fn) (unsigned char *inbuf, int len,
+                              int(*fill)(void*, unsigned int),
+                              int(*writebb)(void*, unsigned int),
+                              unsigned char *output,
+                              int *posp,
+                              void(*error)(char *x));
+
+/* inbuf   - input buffer
+ *len     - len of pre-read data in inbuf
+ *fill    - function to fill inbuf if empty
+ *writebb - function to write out outbug
+ *posp    - if non-null, input position (number of bytes read) will be
+ *        returned here
+ *
+ *If len != 0, the inbuf is initialized (with as much data), and fill
+ *should not be called
+ *If len = 0, the inbuf is allocated, but empty. Its size is IOBUF_SIZE
+ *fill should be called (repeatedly...) to read data, at most IOBUF_SIZE
+ */
+
+/* Utility routine to detect the decompression method */
+decompress_fn decompress_method(const unsigned char *inbuf, int len,
+                                const char **name);
+
+#endif
diff --git a/include/linux/decompress/inflate.h b/include/linux/decompress/inflate.h
new file mode 100644
index 000000000000..f9b06ccc3e5c
--- /dev/null
+++ b/include/linux/decompress/inflate.h
@@ -0,0 +1,13 @@
+#ifndef INFLATE_H
+#define INFLATE_H
+
+/* Other housekeeping constants */
+#define INBUFSIZ 4096
+
+int gunzip(unsigned char *inbuf, int len,
+           int(*fill)(void*, unsigned int),
+           int(*flush)(void*, unsigned int),
+           unsigned char *output,
+           int *pos,
+           void(*error_fn)(char *x));
+#endif
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
new file mode 100644
index 000000000000..12ff8c3f1d05
--- /dev/null
+++ b/include/linux/decompress/mm.h
@@ -0,0 +1,87 @@
+/*
+ * linux/compr_mm.h
+ *
+ * Memory management for pre-boot and ramdisk uncompressors
+ *
+ * Authors: Alain Knaff <alain@knaff.lu>
+ *
+ */
+
+#ifndef DECOMPR_MM_H
+#define DECOMPR_MM_H
+
+#ifdef STATIC
+
+/* Code active when included from pre-boot environment: */
+
+/* A trivial malloc implementation, adapted from
+ *  malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
+ */
+static unsigned long malloc_ptr;
+static int malloc_count;
+
+static void *malloc(int size)
+{
+        void *p;
+
+        if (size < 0)
+                error("Malloc error");
+        if (!malloc_ptr)
+                malloc_ptr = free_mem_ptr;
+
+        malloc_ptr = (malloc_ptr + 3) & ~3;     /* Align */
+
+        p = (void *)malloc_ptr;
+        malloc_ptr += size;
+
+        if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)
+                error("Out of memory");
+
+        malloc_count++;
+        return p;
+}
+
+static void free(void *where)
+{
+        malloc_count--;
+        if (!malloc_count)
+                malloc_ptr = free_mem_ptr;
+}
+
+#define large_malloc(a) malloc(a)
+#define large_free(a) free(a)
+
+#define set_error_fn(x)
+
+#define INIT
+
+#else /* STATIC */
+
+/* Code active when compiled standalone for use when loading ramdisk: */
+
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/string.h>
+#include <linux/vmalloc.h>
+
+/* Use defines rather than static inline in order to avoid spurious
+ * warnings when not needed (indeed large_malloc / large_free are not
+ * needed by inflate */
+
+#define malloc(a) kmalloc(a, GFP_KERNEL)
+#define free(a) kfree(a)
+
+#define large_malloc(a) vmalloc(a)
+#define large_free(a) vfree(a)
+
+static void(*error)(char *m);
+#define set_error_fn(x) error = x;
+
+#define INIT __init
+#define STATIC
+
+#include <linux/init.h>
+
+#endif /* STATIC */
+
+#endif /* DECOMPR_MM_H */
diff --git a/include/linux/decompress/unlzma.h b/include/linux/decompress/unlzma.h
new file mode 100644
index 000000000000..7796538f1bf4
--- /dev/null
+++ b/include/linux/decompress/unlzma.h
@@ -0,0 +1,12 @@
+#ifndef DECOMPRESS_UNLZMA_H
+#define DECOMPRESS_UNLZMA_H
+
+int unlzma(unsigned char *, int,
+           int(*fill)(void*, unsigned int),
+           int(*flush)(void*, unsigned int),
+           unsigned char *output,
+           int *posp,
+           void(*error)(char *x)
+        );
+
+#endif
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 8209e08969f9..ded2d7c42668 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -116,7 +116,6 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d);
 /*
  * Target features
  */
-#define DM_TARGET_SUPPORTS_BARRIERS 0x00000001
 
 struct target_type {
         uint64_t features;
@@ -139,6 +138,9 @@ struct target_type {
         dm_ioctl_fn ioctl;
         dm_merge_fn merge;
         dm_busy_fn busy;
+
+        /* For internal device-mapper use. */
+        struct list_head list;
 };
 
 struct io_restrictions {
diff --git a/include/linux/device.h b/include/linux/device.h
index 47f343c7bdda..6a69caaac18a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -28,6 +28,7 @@
 #define BUS_ID_SIZE             20
 
 struct device;
+struct device_private;
 struct device_driver;
 struct driver_private;
 struct class;
@@ -147,7 +148,7 @@ extern void put_driver(struct device_driver *drv);
 extern struct device_driver *driver_find(const char *name,
                                          struct bus_type *bus);
 extern int driver_probe_done(void);
-extern int wait_for_device_probe(void);
+extern void wait_for_device_probe(void);
 
 
 /* sysfs interface for exporting driver attributes */
@@ -367,15 +368,11 @@ struct device_dma_parameters {
 };
 
 struct device {
-        struct klist            klist_children;
-        struct klist_node       knode_parent;   /* node in sibling list */
-        struct klist_node       knode_driver;
-        struct klist_node       knode_bus;
         struct device           *parent;
 
+        struct device_private   *p;
+
         struct kobject kobj;
-        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
-        unsigned                uevent_suppress:1;
         const char              *init_name; /* initial name of the device */
         struct device_type      *type;
 
@@ -387,8 +384,13 @@ struct device {
         struct device_driver *driver;   /* which driver has allocated this
                                            device */
         void            *driver_data;   /* data private to the driver */
-        void            *platform_data; /* Platform specific data, device
-                                           core doesn't touch it */
+
+        void            *platform_data; /* We will remove platform_data
+                                           field if all platform devices
+                                           pass its platform specific data
+                                           from platform_device->platform_data,
+                                           other kind of devices should not
+                                           use platform_data. */
         struct dev_pm_info      power;
 
 #ifdef CONFIG_NUMA
@@ -427,8 +429,7 @@ struct device {
 
 static inline const char *dev_name(const struct device *dev)
 {
-        /* will be changed into kobject_name(&dev->kobj) in the near future */
-        return dev->bus_id;
+        return kobject_name(&dev->kobj);
 }
 
 extern int dev_set_name(struct device *dev, const char *name, ...)
@@ -463,6 +464,16 @@ static inline void dev_set_drvdata(struct device *dev, void *data)
         dev->driver_data = data;
 }
 
+static inline unsigned int dev_get_uevent_suppress(const struct device *dev)
+{
+        return dev->kobj.uevent_suppress;
+}
+
+static inline void dev_set_uevent_suppress(struct device *dev, int val)
+{
+        dev->kobj.uevent_suppress = val;
+}
+
 static inline int device_is_registered(struct device *dev)
 {
         return dev->kobj.state_in_sysfs;
@@ -483,7 +494,8 @@ extern int device_for_each_child(struct device *dev, void *data,
 extern struct device *device_find_child(struct device *dev, void *data,
                                 int (*match)(struct device *dev, void *data));
 extern int device_rename(struct device *dev, char *new_name);
-extern int device_move(struct device *dev, struct device *new_parent);
+extern int device_move(struct device *dev, struct device *new_parent,
+                       enum dpm_order dpm_order);
 
 /*
  * Root device objects for grouping under /sys/devices
@@ -539,6 +551,7 @@ extern int (*platform_notify_remove)(struct device *dev);
 extern struct device *get_device(struct device *dev);
 extern void put_device(struct device *dev);
 
+extern void wait_for_device_probe(void);
 
 /* drivers/base/power/shutdown.c */
 extern void device_shutdown(void);
@@ -570,7 +583,7 @@ extern const char *dev_driver_string(const struct device *dev);
 #if defined(DEBUG)
 #define dev_dbg(dev, format, arg...)            \
         dev_printk(KERN_DEBUG , dev , format , ## arg)
-#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
+#elif defined(CONFIG_DYNAMIC_DEBUG)
 #define dev_dbg(dev, format, ...) do { \
         dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
         } while (0)
diff --git a/include/linux/dlm_netlink.h b/include/linux/dlm_netlink.h
index 19276332707a..647c8ef27227 100644
--- a/include/linux/dlm_netlink.h
+++ b/include/linux/dlm_netlink.h
@@ -9,6 +9,8 @@
 #ifndef _DLM_NETLINK_H
 #define _DLM_NETLINK_H
 
+#include <linux/types.h>
+
 enum {
         DLM_STATUS_WAITING = 1,
         DLM_STATUS_GRANTED = 2,
@@ -18,16 +20,16 @@ enum {
 #define DLM_LOCK_DATA_VERSION 1
 
 struct dlm_lock_data {
-        uint16_t version;
-        uint32_t lockspace_id;
+        __u16 version;
+        __u32 lockspace_id;
         int nodeid;
         int ownpid;
-        uint32_t id;
-        uint32_t remid;
-        uint64_t xid;
-        int8_t status;
-        int8_t grmode;
-        int8_t rqmode;
+        __u32 id;
+        __u32 remid;
+        __u64 xid;
+        __s8 status;
+        __s8 grmode;
+        __s8 rqmode;
         unsigned long timestamp;
         int resource_namelen;
         char resource_name[DLM_RESNAME_MAXLEN];
diff --git a/include/linux/dm-dirty-log.h b/include/linux/dm-dirty-log.h
index 600c5fb2daad..5e8b11d88f6f 100644
--- a/include/linux/dm-dirty-log.h
+++ b/include/linux/dm-dirty-log.h
@@ -28,6 +28,9 @@ struct dm_dirty_log_type {
         const char *name;
         struct module *module;
 
+        /* For internal device-mapper use */
+        struct list_head list;
+
         int (*ctr)(struct dm_dirty_log *log, struct dm_target *ti,
                    unsigned argc, char **argv);
         void (*dtr)(struct dm_dirty_log *log);
@@ -113,6 +116,16 @@ struct dm_dirty_log_type {
          */
         int (*status)(struct dm_dirty_log *log, status_type_t status_type,
                       char *result, unsigned maxlen);
+
+        /*
+         * is_remote_recovering is necessary for cluster mirroring. It provides
+         * a way to detect recovery on another node, so we aren't writing
+         * concurrently.  This function is likely to block (when a cluster log
+         * is used).
+         *
+         * Returns: 0, 1
+         */
+        int (*is_remote_recovering)(struct dm_dirty_log *log, region_t region);
 };
 
 int dm_dirty_log_type_register(struct dm_dirty_log_type *type);
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 28c2940eb30d..48e44ee2b466 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -113,20 +113,20 @@ struct dm_ioctl {
          * return -ENOTTY) fill out this field, even if the
          * command failed.
          */
-        uint32_t version[3];    /* in/out */
-        uint32_t data_size;     /* total size of data passed in
+        __u32 version[3];       /* in/out */
+        __u32 data_size;        /* total size of data passed in
                                  * including this struct */
 
-        uint32_t data_start;    /* offset to start of data
+        __u32 data_start;       /* offset to start of data
                                  * relative to start of this struct */
 
-        uint32_t target_count;  /* in/out */
-        int32_t open_count;     /* out */
-        uint32_t flags;         /* in/out */
-        uint32_t event_nr;              /* in/out */
-        uint32_t padding;
+        __u32 target_count;     /* in/out */
+        __s32 open_count;       /* out */
+        __u32 flags;            /* in/out */
+        __u32 event_nr;         /* in/out */
+        __u32 padding;
 
-        uint64_t dev;           /* in/out */
+        __u64 dev;              /* in/out */
 
         char name[DM_NAME_LEN]; /* device name */
         char uuid[DM_UUID_LEN]; /* unique identifier for
@@ -139,9 +139,9 @@ struct dm_ioctl {
  * dm_ioctl.
  */
 struct dm_target_spec {
-        uint64_t sector_start;
-        uint64_t length;
-        int32_t status;         /* used when reading from kernel only */
+        __u64 sector_start;
+        __u64 length;
+        __s32 status;           /* used when reading from kernel only */
 
         /*
          * Location of the next dm_target_spec.
@@ -153,7 +153,7 @@ struct dm_target_spec {
          *   (that follows the dm_ioctl struct) to the start of the "next"
          *   dm_target_spec.
          */
-        uint32_t next;
+        __u32 next;
 
         char target_type[DM_MAX_TYPE_NAME];
 
@@ -168,17 +168,17 @@ struct dm_target_spec {
  * Used to retrieve the target dependencies.
  */
 struct dm_target_deps {
-        uint32_t count; /* Array size */
-        uint32_t padding;       /* unused */
-        uint64_t dev[0];        /* out */
+        __u32 count;    /* Array size */
+        __u32 padding;  /* unused */
+        __u64 dev[0];   /* out */
 };
 
 /*
  * Used to get a list of all dm devices.
  */
 struct dm_name_list {
-        uint64_t dev;
-        uint32_t next;          /* offset to the next record from
+        __u64 dev;
+        __u32 next;             /* offset to the next record from
                                    the _start_ of this */
         char name[0];
 };
@@ -187,8 +187,8 @@ struct dm_name_list {
  * Used to retrieve the target versions
  */
 struct dm_target_versions {
-        uint32_t next;
-        uint32_t version[3];
+        __u32 next;
+        __u32 version[3];
 
         char name[0];
 };
@@ -197,7 +197,7 @@ struct dm_target_versions {
  * Used to pass message to a target
  */
 struct dm_target_msg {
-        uint64_t sector;        /* Device sector */
+        __u64 sector;   /* Device sector */
 
         char message[0];
 };
diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
new file mode 100644
index 000000000000..28d53cb7b5a2
--- /dev/null
+++ b/include/linux/dma-debug.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2008 Advanced Micro Devices, Inc.
+ *
+ * Author: Joerg Roedel <joerg.roedel@amd.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 __DMA_DEBUG_H
+#define __DMA_DEBUG_H
+
+#include <linux/types.h>
+
+struct device;
+struct scatterlist;
+struct bus_type;
+
+#ifdef CONFIG_DMA_API_DEBUG
+
+extern void dma_debug_add_bus(struct bus_type *bus);
+
+extern void dma_debug_init(u32 num_entries);
+
+extern void debug_dma_map_page(struct device *dev, struct page *page,
+                               size_t offset, size_t size,
+                               int direction, dma_addr_t dma_addr,
+                               bool map_single);
+
+extern void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
+                                 size_t size, int direction, bool map_single);
+
+extern void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
+                             int nents, int mapped_ents, int direction);
+
+extern void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
+                               int nelems, int dir);
+
+extern void debug_dma_alloc_coherent(struct device *dev, size_t size,
+                                     dma_addr_t dma_addr, void *virt);
+
+extern void debug_dma_free_coherent(struct device *dev, size_t size,
+                                    void *virt, dma_addr_t addr);
+
+extern void debug_dma_sync_single_for_cpu(struct device *dev,
+                                          dma_addr_t dma_handle, size_t size,
+                                          int direction);
+
+extern void debug_dma_sync_single_for_device(struct device *dev,
+                                             dma_addr_t dma_handle,
+                                             size_t size, int direction);
+
+extern void debug_dma_sync_single_range_for_cpu(struct device *dev,
+                                                dma_addr_t dma_handle,
+                                                unsigned long offset,
+                                                size_t size,
+                                                int direction);
+
+extern void debug_dma_sync_single_range_for_device(struct device *dev,
+                                                   dma_addr_t dma_handle,
+                                                   unsigned long offset,
+                                                   size_t size, int direction);
+
+extern void debug_dma_sync_sg_for_cpu(struct device *dev,
+                                      struct scatterlist *sg,
+                                      int nelems, int direction);
+
+extern void debug_dma_sync_sg_for_device(struct device *dev,
+                                         struct scatterlist *sg,
+                                         int nelems, int direction);
+
+extern void debug_dma_dump_mappings(struct device *dev);
+
+#else /* CONFIG_DMA_API_DEBUG */
+
+static inline void dma_debug_add_bus(struct bus_type *bus)
+{
+}
+
+static inline void dma_debug_init(u32 num_entries)
+{
+}
+
+static inline void debug_dma_map_page(struct device *dev, struct page *page,
+                                      size_t offset, size_t size,
+                                      int direction, dma_addr_t dma_addr,
+                                      bool map_single)
+{
+}
+
+static inline void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
+                                        size_t size, int direction,
+                                        bool map_single)
+{
+}
+
+static inline void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
+                                    int nents, int mapped_ents, int direction)
+{
+}
+
+static inline void debug_dma_unmap_sg(struct device *dev,
+                                      struct scatterlist *sglist,
+                                      int nelems, int dir)
+{
+}
+
+static inline void debug_dma_alloc_coherent(struct device *dev, size_t size,
+                                            dma_addr_t dma_addr, void *virt)
+{
+}
+
+static inline void debug_dma_free_coherent(struct device *dev, size_t size,
+                                           void *virt, dma_addr_t addr)
+{
+}
+
+static inline void debug_dma_sync_single_for_cpu(struct device *dev,
+                                                 dma_addr_t dma_handle,
+                                                 size_t size, int direction)
+{
+}
+
+static inline void debug_dma_sync_single_for_device(struct device *dev,
+                                                    dma_addr_t dma_handle,
+                                                    size_t size, int direction)
+{
+}
+
+static inline void debug_dma_sync_single_range_for_cpu(struct device *dev,
+                                                       dma_addr_t dma_handle,
+                                                       unsigned long offset,
+                                                       size_t size,
+                                                       int direction)
+{
+}
+
+static inline void debug_dma_sync_single_range_for_device(struct device *dev,
+                                                          dma_addr_t dma_handle,
+                                                          unsigned long offset,
+                                                          size_t size,
+                                                          int direction)
+{
+}
+
+static inline void debug_dma_sync_sg_for_cpu(struct device *dev,
+                                             struct scatterlist *sg,
+                                             int nelems, int direction)
+{
+}
+
+static inline void debug_dma_sync_sg_for_device(struct device *dev,
+                                                struct scatterlist *sg,
+                                                int nelems, int direction)
+{
+}
+
+static inline void debug_dma_dump_mappings(struct device *dev)
+{
+}
+
+#endif /* CONFIG_DMA_API_DEBUG */
+
+#endif /* __DMA_DEBUG_H */
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index ba9114ec5d3a..8083b6a36a38 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -3,6 +3,8 @@
 
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/dma-attrs.h>
+#include <linux/scatterlist.h>
 
 /* These definitions mirror those in pci.h, so they can be used
  * interchangeably with their PCI_ counterparts */
@@ -13,6 +15,52 @@ enum dma_data_direction {
         DMA_NONE = 3,
 };
 
+struct dma_map_ops {
+        void* (*alloc_coherent)(struct device *dev, size_t size,
+                                dma_addr_t *dma_handle, gfp_t gfp);
+        void (*free_coherent)(struct device *dev, size_t size,
+                              void *vaddr, dma_addr_t dma_handle);
+        dma_addr_t (*map_page)(struct device *dev, struct page *page,
+                               unsigned long offset, size_t size,
+                               enum dma_data_direction dir,
+                               struct dma_attrs *attrs);
+        void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
+                           size_t size, enum dma_data_direction dir,
+                           struct dma_attrs *attrs);
+        int (*map_sg)(struct device *dev, struct scatterlist *sg,
+                      int nents, enum dma_data_direction dir,
+                      struct dma_attrs *attrs);
+        void (*unmap_sg)(struct device *dev,
+                         struct scatterlist *sg, int nents,
+                         enum dma_data_direction dir,
+                         struct dma_attrs *attrs);
+        void (*sync_single_for_cpu)(struct device *dev,
+                                    dma_addr_t dma_handle, size_t size,
+                                    enum dma_data_direction dir);
+        void (*sync_single_for_device)(struct device *dev,
+                                       dma_addr_t dma_handle, size_t size,
+                                       enum dma_data_direction dir);
+        void (*sync_single_range_for_cpu)(struct device *dev,
+                                          dma_addr_t dma_handle,
+                                          unsigned long offset,
+                                          size_t size,
+                                          enum dma_data_direction dir);
+        void (*sync_single_range_for_device)(struct device *dev,
+                                             dma_addr_t dma_handle,
+                                             unsigned long offset,
+                                             size_t size,
+                                             enum dma_data_direction dir);
+        void (*sync_sg_for_cpu)(struct device *dev,
+                                struct scatterlist *sg, int nents,
+                                enum dma_data_direction dir);
+        void (*sync_sg_for_device)(struct device *dev,
+                                   struct scatterlist *sg, int nents,
+                                   enum dma_data_direction dir);
+        int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
+        int (*dma_supported)(struct device *dev, u64 mask);
+        int is_phys;
+};
+
 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
 /*
@@ -67,7 +115,7 @@ static inline u64 dma_get_mask(struct device *dev)
 {
         if (dev && dev->dma_mask && *dev->dma_mask)
                 return *dev->dma_mask;
-        return DMA_32BIT_MASK;
+        return DMA_BIT_MASK(32);
 }
 
 extern u64 dma_get_required_mask(struct device *dev);
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index af1dab41674b..1a455f1f86d7 100644
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
@@ -11,6 +11,7 @@
 
 #define DMA_PTE_READ (1)
 #define DMA_PTE_WRITE (2)
+#define DMA_PTE_SNP (1 << 11)
 
 struct intel_iommu;
 struct dmar_domain;
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index f0413845f20e..2e2aa3df170c 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -23,9 +23,6 @@
 
 #include <linux/device.h>
 #include <linux/uio.h>
-#include <linux/kref.h>
-#include <linux/completion.h>
-#include <linux/rcupdate.h>
 #include <linux/dma-mapping.h>
 
 /**
@@ -97,7 +94,6 @@ typedef struct { DECLARE_BITMAP(bits, DMA_TX_TYPE_END); } dma_cap_mask_t;
 
 /**
  * struct dma_chan_percpu - the per-CPU part of struct dma_chan
- * @refcount: local_t used for open-coded "bigref" counting
  * @memcpy_count: transaction counter
  * @bytes_transferred: byte counter
  */
@@ -114,9 +110,6 @@ struct dma_chan_percpu {
  * @cookie: last cookie value returned to client
  * @chan_id: channel ID for sysfs
  * @dev: class device for sysfs
- * @refcount: kref, used in "bigref" slow-mode
- * @slow_ref: indicates that the DMA channel is free
- * @rcu: the DMA channel's RCU head
  * @device_node: used to add this to the device chan list
  * @local: per-cpu pointer to a struct dma_chan_percpu
  * @client-count: how many clients are using this channel
@@ -209,12 +202,11 @@ struct dma_async_tx_descriptor {
 /**
  * struct dma_device - info on the entity supplying DMA services
  * @chancnt: how many DMA channels are supported
+ * @privatecnt: how many DMA channels are requested by dma_request_channel
  * @channels: the list of struct dma_chan
  * @global_node: list_head for global dma_device_list
  * @cap_mask: one or more dma_capability flags
  * @max_xor: maximum number of xor sources, 0 if no capability
- * @refcount: reference count
- * @done: IO completion struct
  * @dev_id: unique device ID
  * @dev: struct device reference for dma mapping api
  * @device_alloc_chan_resources: allocate resources and return the
@@ -227,11 +219,13 @@ struct dma_async_tx_descriptor {
  * @device_prep_dma_interrupt: prepares an end of chain interrupt operation
  * @device_prep_slave_sg: prepares a slave dma operation
  * @device_terminate_all: terminate all pending operations
+ * @device_is_tx_complete: poll for transaction completion
  * @device_issue_pending: push pending transactions to hardware
  */
 struct dma_device {
 
         unsigned int chancnt;
+        unsigned int privatecnt;
         struct list_head channels;
         struct list_head global_node;
         dma_cap_mask_t  cap_mask;
@@ -296,6 +290,24 @@ static inline void net_dmaengine_put(void)
 }
 #endif
 
+#ifdef CONFIG_ASYNC_TX_DMA
+#define async_dmaengine_get()   dmaengine_get()
+#define async_dmaengine_put()   dmaengine_put()
+#define async_dma_find_channel(type) dma_find_channel(type)
+#else
+static inline void async_dmaengine_get(void)
+{
+}
+static inline void async_dmaengine_put(void)
+{
+}
+static inline struct dma_chan *
+async_dma_find_channel(enum dma_transaction_type type)
+{
+        return NULL;
+}
+#endif
+
 dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan,
         void *dest, void *src, size_t len);
 dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan,
@@ -342,6 +354,13 @@ __dma_cap_set(enum dma_transaction_type tx_type, dma_cap_mask_t *dstp)
         set_bit(tx_type, dstp->bits);
 }
 
+#define dma_cap_clear(tx, mask) __dma_cap_clear((tx), &(mask))
+static inline void
+__dma_cap_clear(enum dma_transaction_type tx_type, dma_cap_mask_t *dstp)
+{
+        clear_bit(tx_type, dstp->bits);
+}
+
 #define dma_cap_zero(mask) __dma_cap_zero(&(mask))
 static inline void __dma_cap_zero(dma_cap_mask_t *dstp)
 {
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f28440784cf0..e397dc342cda 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -24,16 +24,17 @@
 #include <linux/acpi.h>
 #include <linux/types.h>
 #include <linux/msi.h>
+#include <linux/irqreturn.h>
 
-#if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
 struct intel_iommu;
-
+#if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
 struct dmar_drhd_unit {
         struct list_head list;          /* list of drhd units   */
         struct  acpi_dmar_header *hdr;  /* ACPI header          */
         u64     reg_base_addr;          /* register base address*/
         struct  pci_dev **devices;      /* target device array  */
         int     devices_cnt;            /* target device count  */
+        u16     segment;                /* PCI domain           */
         u8      ignored:1;              /* ignore drhd          */
         u8      include_all:1;
         struct intel_iommu *iommu;
@@ -44,12 +45,20 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
         list_for_each_entry(drhd, &dmar_drhd_units, list)
 
+#define for_each_active_iommu(i, drhd)                                  \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, drhd->ignored) {} else
+
+#define for_each_iommu(i, drhd)                                         \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, 0) {} else 
+
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
 
 /* Intel IOMMU detection */
 extern void detect_intel_iommu(void);
-
+extern int enable_drhd_fault_handling(void);
 
 extern int parse_ioapics_under_ir(void);
 extern int alloc_iommu(struct dmar_drhd_unit *);
@@ -63,12 +72,12 @@ static inline int dmar_table_init(void)
 {
         return -ENODEV;
 }
+static inline int enable_drhd_fault_handling(void)
+{
+        return -1;
+}
 #endif /* !CONFIG_DMAR && !CONFIG_INTR_REMAP */
 
-#ifdef CONFIG_INTR_REMAP
-extern int intr_remapping_enabled;
-extern int enable_intr_remapping(int);
-
 struct irte {
         union {
                 struct {
@@ -97,6 +106,12 @@ struct irte {
                 __u64 high;
         };
 };
+#ifdef CONFIG_INTR_REMAP
+extern int intr_remapping_enabled;
+extern int enable_intr_remapping(int);
+extern void disable_intr_remapping(void);
+extern int reenable_intr_remapping(int);
+
 extern int get_irte(int irq, struct irte *entry);
 extern int modify_irte(int irq, struct irte *irte_modified);
 extern int alloc_irte(struct intel_iommu *iommu, int irq, u16 count);
@@ -111,14 +126,40 @@ extern int irq_remapped(int irq);
 extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev);
 extern struct intel_iommu *map_ioapic_to_ir(int apic);
 #else
+static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
+{
+        return -1;
+}
+static inline int modify_irte(int irq, struct irte *irte_modified)
+{
+        return -1;
+}
+static inline int free_irte(int irq)
+{
+        return -1;
+}
+static inline int map_irq_to_irte_handle(int irq, u16 *sub_handle)
+{
+        return -1;
+}
+static inline int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index,
+                               u16 sub_handle)
+{
+        return -1;
+}
+static inline struct intel_iommu *map_dev_to_ir(struct pci_dev *dev)
+{
+        return NULL;
+}
+static inline struct intel_iommu *map_ioapic_to_ir(int apic)
+{
+        return NULL;
+}
 #define irq_remapped(irq)               (0)
 #define enable_intr_remapping(mode)     (-1)
 #define intr_remapping_enabled          (0)
 #endif
 
-#ifdef CONFIG_DMAR
-extern const char *dmar_get_fault_reason(u8 fault_reason);
-
 /* Can't use the common MSI interrupt functions
  * since DMAR is not a pci device
  */
@@ -127,8 +168,10 @@ extern void dmar_msi_mask(unsigned int irq);
 extern void dmar_msi_read(int irq, struct msi_msg *msg);
 extern void dmar_msi_write(int irq, struct msi_msg *msg);
 extern int dmar_set_interrupt(struct intel_iommu *iommu);
+extern irqreturn_t dmar_fault(int irq, void *dev_id);
 extern int arch_setup_dmar_msi(unsigned int irq);
 
+#ifdef CONFIG_DMAR
 extern int iommu_detected, no_iommu;
 extern struct list_head dmar_rmrr_units;
 struct dmar_rmrr_unit {
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index d741b9ceb0e0..bb5489c82c99 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -47,7 +47,8 @@ extern int dmi_get_year(int field);
 extern int dmi_name_in_vendors(const char *str);
 extern int dmi_name_in_serial(const char *str);
 extern int dmi_available;
-extern int dmi_walk(void (*decode)(const struct dmi_header *));
+extern int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+        void *private_data);
 extern bool dmi_match(enum dmi_field f, const char *str);
 
 #else
@@ -61,8 +62,8 @@ static inline int dmi_get_year(int year) { return 0; }
 static inline int dmi_name_in_vendors(const char *s) { return 0; }
 static inline int dmi_name_in_serial(const char *s) { return 0; }
 #define dmi_available 0
-static inline int dmi_walk(void (*decode)(const struct dmi_header *))
-        { return -1; }
+static inline int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+        void *private_data) { return -1; }
 static inline bool dmi_match(enum dmi_field f, const char *str)
         { return false; }
 static inline const struct dmi_system_id *
diff --git a/include/linux/ds1wm.h b/include/linux/ds1wm.h
deleted file mode 100644
index d3c65e48a2e7..000000000000
--- a/include/linux/ds1wm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* platform data for the DS1WM driver */
-
-struct ds1wm_platform_data {
-        int bus_shift;      /* number of shifts needed to calculate the
-                             * offset between DS1WM registers;
-                             * e.g. on h5xxx and h2200 this is 2
-                             * (registers aligned to 4-byte boundaries),
-                             * while on hx4700 this is 1 */
-        int active_high;
-        void (*enable)(struct platform_device *pdev);
-        void (*disable)(struct platform_device *pdev);
-};
diff --git a/include/linux/dst.h b/include/linux/dst.h
new file mode 100644
index 000000000000..e26fed84b1aa
--- /dev/null
+++ b/include/linux/dst.h
@@ -0,0 +1,587 @@
+/*
+ * 2007+ Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+ * 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.
+ */
+
+#ifndef __DST_H
+#define __DST_H
+
+#include <linux/types.h>
+#include <linux/connector.h>
+
+#define DST_NAMELEN             32
+#define DST_NAME                "dst"
+
+enum {
+        /* Remove node with given id from storage */
+        DST_DEL_NODE    = 0,
+        /* Add remote node with given id to the storage */
+        DST_ADD_REMOTE,
+        /* Add local node with given id to the storage to be exported and used by remote peers */
+        DST_ADD_EXPORT,
+        /* Crypto initialization command (hash/cipher used to protect the connection) */
+        DST_CRYPTO,
+        /* Security attributes for given connection (permissions for example) */
+        DST_SECURITY,
+        /* Register given node in the block layer subsystem */
+        DST_START,
+        DST_CMD_MAX
+};
+
+struct dst_ctl
+{
+        /* Storage name */
+        char                    name[DST_NAMELEN];
+        /* Command flags */
+        __u32                   flags;
+        /* Command itself (see above) */
+        __u32                   cmd;
+        /* Maximum number of pages per single request in this device */
+        __u32                   max_pages;
+        /* Stale/error transaction scanning timeout in milliseconds */
+        __u32                   trans_scan_timeout;
+        /* Maximum number of retry sends before completing transaction as broken */
+        __u32                   trans_max_retries;
+        /* Storage size */
+        __u64                   size;
+};
+
+/* Reply command carries completion status */
+struct dst_ctl_ack
+{
+        struct cn_msg           msg;
+        int                     error;
+        int                     unused[3];
+};
+
+/*
+ * Unfortunaltely socket address structure is not exported to userspace
+ * and is redefined there.
+ */
+#define SADDR_MAX_DATA  128
+
+struct saddr {
+        /* address family, AF_xxx       */
+        unsigned short          sa_family;
+        /* 14 bytes of protocol address */
+        char                    sa_data[SADDR_MAX_DATA];
+        /* Number of bytes used in sa_data */
+        unsigned short          sa_data_len;
+};
+
+/* Address structure */
+struct dst_network_ctl
+{
+        /* Socket type: datagram, stream...*/
+        unsigned int            type;
+        /* Let me guess, is it a Jupiter diameter? */
+        unsigned int            proto;
+        /* Peer's address */
+        struct saddr            addr;
+};
+
+struct dst_crypto_ctl
+{
+        /* Cipher and hash names */
+        char                    cipher_algo[DST_NAMELEN];
+        char                    hash_algo[DST_NAMELEN];
+
+        /* Key sizes. Can be zero for digest for example */
+        unsigned int            cipher_keysize, hash_keysize;
+        /* Alignment. Calculated by the DST itself. */
+        unsigned int            crypto_attached_size;
+        /* Number of threads to perform crypto operations */
+        int                     thread_num;
+};
+
+/* Export security attributes have this bits checked in when client connects */
+#define DST_PERM_READ           (1<<0)
+#define DST_PERM_WRITE          (1<<1)
+
+/*
+ * Right now it is simple model, where each remote address
+ * is assigned to set of permissions it is allowed to perform.
+ * In real world block device does not know anything but
+ * reading and writing, so it should be more than enough.
+ */
+struct dst_secure_user
+{
+        unsigned int            permissions;
+        struct saddr            addr;
+};
+
+/*
+ * Export control command: device to export and network address to accept
+ * clients to work with given device
+ */
+struct dst_export_ctl
+{
+        char                    device[DST_NAMELEN];
+        struct dst_network_ctl  ctl;
+};
+
+enum {
+        DST_CFG = 1,            /* Request remote configuration */
+        DST_IO,                 /* IO command */
+        DST_IO_RESPONSE,        /* IO response */
+        DST_PING,               /* Keepalive message */
+        DST_NCMD_MAX,
+};
+
+struct dst_cmd
+{
+        /* Network command itself, see above */
+        __u32                   cmd;
+        /*
+         * Size of the attached data
+         * (in most cases, for READ command it means how many bytes were requested)
+         */
+        __u32                   size;
+        /* Crypto size: number of attached bytes with digest/hmac */
+        __u32                   csize;
+        /* Here we can carry secret data */
+        __u32                   reserved;
+        /* Read/write bits, see how they are encoded in bio structure */
+        __u64                   rw;
+        /* BIO flags */
+        __u64                   flags;
+        /* Unique command id (like transaction ID) */
+        __u64                   id;
+        /* Sector to start IO from */
+        __u64                   sector;
+        /* Hash data is placed after this header */
+        __u8                    hash[0];
+};
+
+/*
+ * Convert command to/from network byte order.
+ * We do not use hton*() functions, since there is
+ * no 64-bit implementation.
+ */
+static inline void dst_convert_cmd(struct dst_cmd *c)
+{
+        c->cmd = __cpu_to_be32(c->cmd);
+        c->csize = __cpu_to_be32(c->csize);
+        c->size = __cpu_to_be32(c->size);
+        c->sector = __cpu_to_be64(c->sector);
+        c->id = __cpu_to_be64(c->id);
+        c->flags = __cpu_to_be64(c->flags);
+        c->rw = __cpu_to_be64(c->rw);
+}
+
+/* Transaction id */
+typedef __u64 dst_gen_t;
+
+#ifdef __KERNEL__
+
+#include <linux/blkdev.h>
+#include <linux/bio.h>
+#include <linux/device.h>
+#include <linux/mempool.h>
+#include <linux/net.h>
+#include <linux/poll.h>
+#include <linux/rbtree.h>
+
+#ifdef CONFIG_DST_DEBUG
+#define dprintk(f, a...) printk(KERN_NOTICE f, ##a)
+#else
+static inline void __attribute__ ((format (printf, 1, 2)))
+        dprintk(const char *fmt, ...) {}
+#endif
+
+struct dst_node;
+
+struct dst_trans
+{
+        /* DST node we are working with */
+        struct dst_node         *n;
+
+        /* Entry inside transaction tree */
+        struct rb_node          trans_entry;
+
+        /* Merlin kills this transaction when this memory cell equals zero */
+        atomic_t                refcnt;
+
+        /* How this transaction should be processed by crypto engine */
+        short                   enc;
+        /* How many times this transaction was resent */
+        short                   retries;
+        /* Completion status */
+        int                     error;
+
+        /* When did we send it to the remote peer */
+        long                    send_time;
+
+        /* My name is...
+         * Well, computers does not speak, they have unique id instead */
+        dst_gen_t               gen;
+
+        /* Block IO we are working with */
+        struct bio              *bio;
+
+        /* Network command for above block IO request */
+        struct dst_cmd          cmd;
+};
+
+struct dst_crypto_engine
+{
+        /* What should we do with all block requests */
+        struct crypto_hash      *hash;
+        struct crypto_ablkcipher        *cipher;
+
+        /* Pool of pages used to encrypt data into before sending */
+        int                     page_num;
+        struct page             **pages;
+
+        /* What to do with current request */
+        int                     enc;
+        /* Who we are and where do we go */
+        struct scatterlist      *src, *dst;
+
+        /* Maximum timeout waiting for encryption to be completed */
+        long                    timeout;
+        /* IV is a 64-bit sequential counter */
+        u64                     iv;
+
+        /* Secret data */
+        void                    *private;
+
+        /* Cached temporary data lives here */
+        int                     size;
+        void                    *data;
+};
+
+struct dst_state
+{
+        /* The main state protection */
+        struct mutex            state_lock;
+
+        /* Polling machinery for sockets */
+        wait_queue_t            wait;
+        wait_queue_head_t       *whead;
+        /* Most of events are being waited here */
+        wait_queue_head_t       thread_wait;
+
+        /* Who owns this? */
+        struct dst_node         *node;
+
+        /* Network address for this state */
+        struct dst_network_ctl  ctl;
+
+        /* Permissions to work with: read-only or rw connection */
+        u32                     permissions;
+
+        /* Called when we need to clean private data */
+        void                    (* cleanup)(struct dst_state *st);
+
+        /* Used by the server: BIO completion queues BIOs here */
+        struct list_head        request_list;
+        spinlock_t              request_lock;
+
+        /* Guess what? No, it is not number of planets */
+        atomic_t                refcnt;
+
+        /* This flags is set when connection should be dropped */
+        int                     need_exit;
+
+        /*
+         * Socket to work with. Second pointer is used for
+         * lockless check if socket was changed before performing
+         * next action (like working with cached polling result)
+         */
+        struct socket           *socket, *read_socket;
+
+        /* Cached preallocated data */
+        void                    *data;
+        unsigned int            size;
+
+        /* Currently processed command */
+        struct dst_cmd          cmd;
+};
+
+struct dst_info
+{
+        /* Device size */
+        u64                     size;
+
+        /* Local device name for export devices */
+        char                    local[DST_NAMELEN];
+
+        /* Network setup */
+        struct dst_network_ctl  net;
+
+        /* Sysfs bits use this */
+        struct device           device;
+};
+
+struct dst_node
+{
+        struct list_head        node_entry;
+
+        /* Hi, my name is stored here */
+        char                    name[DST_NAMELEN];
+        /* My cache name is stored here */
+        char                    cache_name[DST_NAMELEN];
+
+        /* Block device attached to given node.
+         * Only valid for exporting nodes */
+        struct block_device     *bdev;
+        /* Network state machine for given peer */
+        struct dst_state        *state;
+
+        /* Block IO machinery */
+        struct request_queue    *queue;
+        struct gendisk          *disk;
+
+        /* Number of threads in processing pool */
+        int                     thread_num;
+        /* Maximum number of pages in single IO */
+        int                     max_pages;
+
+        /* I'm that big in bytes */
+        loff_t                  size;
+
+        /* Exported to userspace node information */
+        struct dst_info         *info;
+
+        /*
+         * Security attribute list.
+         * Used only by exporting node currently.
+         */
+        struct list_head        security_list;
+        struct mutex            security_lock;
+
+        /*
+         * When this unerflows below zero, university collapses.
+         * But this will not happen, since node will be freed,
+         * when reference counter reaches zero.
+         */
+        atomic_t                refcnt;
+
+        /* How precisely should I be started? */
+        int                     (*start)(struct dst_node *);
+
+        /* Crypto capabilities */
+        struct dst_crypto_ctl   crypto;
+        u8                      *hash_key;
+        u8                      *cipher_key;
+
+        /* Pool of processing thread */
+        struct thread_pool      *pool;
+
+        /* Transaction IDs live here */
+        atomic_long_t           gen;
+
+        /*
+         * How frequently and how many times transaction
+         * tree should be scanned to drop stale objects.
+         */
+        long                    trans_scan_timeout;
+        int                     trans_max_retries;
+
+        /* Small gnomes live here */
+        struct rb_root          trans_root;
+        struct mutex            trans_lock;
+
+        /*
+         * Transaction cache/memory pool.
+         * It is big enough to contain not only transaction
+         * itself, but additional crypto data (digest/hmac).
+         */
+        struct kmem_cache       *trans_cache;
+        mempool_t               *trans_pool;
+
+        /* This entity scans transaction tree */
+        struct delayed_work     trans_work;
+
+        wait_queue_head_t       wait;
+};
+
+/* Kernel representation of the security attribute */
+struct dst_secure
+{
+        struct list_head        sec_entry;
+        struct dst_secure_user  sec;
+};
+
+int dst_process_bio(struct dst_node *n, struct bio *bio);
+
+int dst_node_init_connected(struct dst_node *n, struct dst_network_ctl *r);
+int dst_node_init_listened(struct dst_node *n, struct dst_export_ctl *le);
+
+static inline struct dst_state *dst_state_get(struct dst_state *st)
+{
+        BUG_ON(atomic_read(&st->refcnt) == 0);
+        atomic_inc(&st->refcnt);
+        return st;
+}
+
+void dst_state_put(struct dst_state *st);
+
+struct dst_state *dst_state_alloc(struct dst_node *n);
+int dst_state_socket_create(struct dst_state *st);
+void dst_state_socket_release(struct dst_state *st);
+
+void dst_state_exit_connected(struct dst_state *st);
+
+int dst_state_schedule_receiver(struct dst_state *st);
+
+void dst_dump_addr(struct socket *sk, struct sockaddr *sa, char *str);
+
+static inline void dst_state_lock(struct dst_state *st)
+{
+        mutex_lock(&st->state_lock);
+}
+
+static inline void dst_state_unlock(struct dst_state *st)
+{
+        mutex_unlock(&st->state_lock);
+}
+
+void dst_poll_exit(struct dst_state *st);
+int dst_poll_init(struct dst_state *st);
+
+static inline unsigned int dst_state_poll(struct dst_state *st)
+{
+        unsigned int revents = POLLHUP | POLLERR;
+
+        dst_state_lock(st);
+        if (st->socket)
+                revents = st->socket->ops->poll(NULL, st->socket, NULL);
+        dst_state_unlock(st);
+
+        return revents;
+}
+
+static inline int dst_thread_setup(void *private, void *data)
+{
+        return 0;
+}
+
+void dst_node_put(struct dst_node *n);
+
+static inline struct dst_node *dst_node_get(struct dst_node *n)
+{
+        atomic_inc(&n->refcnt);
+        return n;
+}
+
+int dst_data_recv(struct dst_state *st, void *data, unsigned int size);
+int dst_recv_cdata(struct dst_state *st, void *cdata);
+int dst_data_send_header(struct socket *sock,
+                void *data, unsigned int size, int more);
+
+int dst_send_bio(struct dst_state *st, struct dst_cmd *cmd, struct bio *bio);
+
+int dst_process_io(struct dst_state *st);
+int dst_export_crypto(struct dst_node *n, struct bio *bio);
+int dst_export_send_bio(struct bio *bio);
+int dst_start_export(struct dst_node *n);
+
+int __init dst_export_init(void);
+void dst_export_exit(void);
+
+/* Private structure for export block IO requests */
+struct dst_export_priv
+{
+        struct list_head                request_entry;
+        struct dst_state                *state;
+        struct bio                      *bio;
+        struct dst_cmd                  cmd;
+};
+
+static inline void dst_trans_get(struct dst_trans *t)
+{
+        atomic_inc(&t->refcnt);
+}
+
+struct dst_trans *dst_trans_search(struct dst_node *node, dst_gen_t gen);
+int dst_trans_remove(struct dst_trans *t);
+int dst_trans_remove_nolock(struct dst_trans *t);
+void dst_trans_put(struct dst_trans *t);
+
+/*
+ * Convert bio into network command.
+ */
+static inline void dst_bio_to_cmd(struct bio *bio, struct dst_cmd *cmd,
+                u32 command, u64 id)
+{
+        cmd->cmd = command;
+        cmd->flags = (bio->bi_flags << BIO_POOL_BITS) >> BIO_POOL_BITS;
+        cmd->rw = bio->bi_rw;
+        cmd->size = bio->bi_size;
+        cmd->csize = 0;
+        cmd->id = id;
+        cmd->sector = bio->bi_sector;
+};
+
+int dst_trans_send(struct dst_trans *t);
+int dst_trans_crypto(struct dst_trans *t);
+
+int dst_node_crypto_init(struct dst_node *n, struct dst_crypto_ctl *ctl);
+void dst_node_crypto_exit(struct dst_node *n);
+
+static inline int dst_need_crypto(struct dst_node *n)
+{
+        struct dst_crypto_ctl *c = &n->crypto;
+        /*
+         * Logical OR is appropriate here, but boolean one produces
+         * more optimal code, so it is used instead.
+         */
+        return (c->hash_algo[0] | c->cipher_algo[0]);
+}
+
+int dst_node_trans_init(struct dst_node *n, unsigned int size);
+void dst_node_trans_exit(struct dst_node *n);
+
+/*
+ * Pool of threads.
+ * Ready list contains threads currently free to be used,
+ * active one contains threads with some work scheduled for them.
+ * Caller can wait in given queue when thread is ready.
+ */
+struct thread_pool
+{
+        int                     thread_num;
+        struct mutex            thread_lock;
+        struct list_head        ready_list, active_list;
+
+        wait_queue_head_t       wait;
+};
+
+void thread_pool_del_worker(struct thread_pool *p);
+void thread_pool_del_worker_id(struct thread_pool *p, unsigned int id);
+int thread_pool_add_worker(struct thread_pool *p,
+                char *name,
+                unsigned int id,
+                void *(* init)(void *data),
+                void (* cleanup)(void *data),
+                void *data);
+
+void thread_pool_destroy(struct thread_pool *p);
+struct thread_pool *thread_pool_create(int num, char *name,
+                void *(* init)(void *data),
+                void (* cleanup)(void *data),
+                void *data);
+
+int thread_pool_schedule(struct thread_pool *p,
+                int (* setup)(void *stored_private, void *setup_data),
+                int (* action)(void *stored_private, void *setup_data),
+                void *setup_data, long timeout);
+int thread_pool_schedule_private(struct thread_pool *p,
+                int (* setup)(void *private, void *data),
+                int (* action)(void *private, void *data),
+                void *data, long timeout, void *id);
+
+#endif /* __KERNEL__ */
+#endif /* __DST_H */
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
index bb0df2aaebfa..fec66bd24f22 100644
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
 } audio_karaoke_t;     /* into left and right  */
 
 
-typedef uint16_t audio_attributes_t;
+typedef __u16 audio_attributes_t;
 /*   bits: descr. */
 /*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
 /*   12    multichannel extension */
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index bd49c3ebf916..1d750c0fd86e 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -132,12 +132,12 @@ struct video_command {
 #define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)
 
 struct video_event {
-        int32_t type;
+        __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
-        time_t timestamp;
+        __kernel_time_t timestamp;
         union {
                 video_size_t size;
                 unsigned int frame_rate;        /* in frames per 1000sec */
@@ -157,25 +157,25 @@ struct video_status {
 
 struct video_still_picture {
         char __user *iFrame;        /* pointer to a single iframe in memory */
-        int32_t size;
+        __s32 size;
 };
 
 
 typedef
 struct video_highlight {
         int     active;      /*    1=show highlight, 0=hide highlight */
-        uint8_t contrast1;   /*    7- 4  Pattern pixel contrast */
+        __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
                              /*    3- 0  Background pixel contrast */
-        uint8_t contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
+        __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
                              /*    3- 0  Emphasis pixel-1 contrast */
-        uint8_t color1;      /*    7- 4  Pattern pixel color */
+        __u8    color1;      /*    7- 4  Pattern pixel color */
                              /*    3- 0  Background pixel color */
-        uint8_t color2;      /*    7- 4  Emphasis pixel-2 color */
+        __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
                              /*    3- 0  Emphasis pixel-1 color */
-        uint32_t ypos;       /*   23-22  auto action mode */
+        __u32    ypos;       /*   23-22  auto action mode */
                              /*   21-12  start y */
                              /*    9- 0  end y */
-        uint32_t xpos;       /*   23-22  button color number */
+        __u32    xpos;       /*   23-22  button color number */
                              /*   21-12  start x */
                              /*    9- 0  end x */
 } video_highlight_t;
@@ -189,17 +189,17 @@ typedef struct video_spu {
 
 typedef struct video_spu_palette {      /* SPU Palette information */
         int length;
-        uint8_t __user *palette;
+        __u8 __user *palette;
 } video_spu_palette_t;
 
 
 typedef struct video_navi_pack {
         int length;          /* 0 ... 1024 */
-        uint8_t data[1024];
+        __u8 data[1024];
 } video_navi_pack_t;
 
 
-typedef uint16_t video_attributes_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) */
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index d797dde247f7..c8aad713a046 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -74,4 +74,23 @@ struct dw_dma_slave {
 #define DWC_CFGL_HS_DST_POL     (1 << 18)       /* dst handshake active low */
 #define DWC_CFGL_HS_SRC_POL     (1 << 19)       /* src handshake active low */
 
+/* DMA API extensions */
+struct dw_cyclic_desc {
+        struct dw_desc  **desc;
+        unsigned long   periods;
+        void            (*period_callback)(void *param);
+        void            *period_callback_param;
+};
+
+struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
+                dma_addr_t buf_addr, size_t buf_len, size_t period_len,
+                enum dma_data_direction direction);
+void dw_dma_cyclic_free(struct dma_chan *chan);
+int dw_dma_cyclic_start(struct dma_chan *chan);
+void dw_dma_cyclic_stop(struct dma_chan *chan);
+
+dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan);
+
+dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan);
+
 #endif /* DW_DMAC_H */
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
new file mode 100644
index 000000000000..a0d9422a1569
--- /dev/null
+++ b/include/linux/dynamic_debug.h
@@ -0,0 +1,88 @@
+#ifndef _DYNAMIC_DEBUG_H
+#define _DYNAMIC_DEBUG_H
+
+/* dynamic_printk_enabled, and dynamic_printk_enabled2 are bitmasks in which
+ * bit n is set to 1 if any modname hashes into the bucket n, 0 otherwise. They
+ * use independent hash functions, to reduce the chance of false positives.
+ */
+extern long long dynamic_debug_enabled;
+extern long long dynamic_debug_enabled2;
+
+/*
+ * An instance of this structure is created in a special
+ * ELF section at every dynamic debug callsite.  At runtime,
+ * the special section is treated as an array of these.
+ */
+struct _ddebug {
+        /*
+         * These fields are used to drive the user interface
+         * for selecting and displaying debug callsites.
+         */
+        const char *modname;
+        const char *function;
+        const char *filename;
+        const char *format;
+        char primary_hash;
+        char secondary_hash;
+        unsigned int lineno:24;
+        /*
+         * The flags field controls the behaviour at the callsite.
+         * The bits here are changed dynamically when the user
+         * writes commands to <debugfs>/dynamic_debug/ddebug
+         */
+#define _DPRINTK_FLAGS_PRINT   (1<<0)  /* printk() a message using the format */
+#define _DPRINTK_FLAGS_DEFAULT 0
+        unsigned int flags:8;
+} __attribute__((aligned(8)));
+
+
+int ddebug_add_module(struct _ddebug *tab, unsigned int n,
+                                const char *modname);
+
+#if defined(CONFIG_DYNAMIC_DEBUG)
+extern int ddebug_remove_module(char *mod_name);
+
+#define __dynamic_dbg_enabled(dd)  ({        \
+        int __ret = 0;                                                       \
+        if (unlikely((dynamic_debug_enabled & (1LL << DEBUG_HASH)) &&        \
+                        (dynamic_debug_enabled2 & (1LL << DEBUG_HASH2))))   \
+                                if (unlikely(dd.flags))                      \
+                                        __ret = 1;                           \
+        __ret; })
+
+#define dynamic_pr_debug(fmt, ...) do {                                 \
+        static struct _ddebug descriptor                                \
+        __used                                                          \
+        __attribute__((section("__verbose"), aligned(8))) =             \
+        { KBUILD_MODNAME, __func__, __FILE__, fmt, DEBUG_HASH,  \
+                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
+        if (__dynamic_dbg_enabled(descriptor))                          \
+                printk(KERN_DEBUG KBUILD_MODNAME ":" pr_fmt(fmt),       \
+                                ##__VA_ARGS__);                         \
+        } while (0)
+
+
+#define dynamic_dev_dbg(dev, fmt, ...) do {                             \
+        static struct _ddebug descriptor                                \
+        __used                                                          \
+        __attribute__((section("__verbose"), aligned(8))) =             \
+        { KBUILD_MODNAME, __func__, __FILE__, fmt, DEBUG_HASH,  \
+                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
+        if (__dynamic_dbg_enabled(descriptor))                          \
+                        dev_printk(KERN_DEBUG, dev,                     \
+                                        KBUILD_MODNAME ": " fmt,        \
+                                        ##__VA_ARGS__);                 \
+        } while (0)
+
+#else
+
+static inline int ddebug_remove_module(char *mod)
+{
+        return 0;
+}
+
+#define dynamic_pr_debug(fmt, ...)  do { } while (0)
+#define dynamic_dev_dbg(dev, format, ...)  do { } while (0)
+#endif
+
+#endif
diff --git a/include/linux/dynamic_printk.h b/include/linux/dynamic_printk.h
deleted file mode 100644
index 2d528d009074..000000000000
--- a/include/linux/dynamic_printk.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef _DYNAMIC_PRINTK_H
-#define _DYNAMIC_PRINTK_H
-
-#define DYNAMIC_DEBUG_HASH_BITS 6
-#define DEBUG_HASH_TABLE_SIZE (1 << DYNAMIC_DEBUG_HASH_BITS)
-
-#define TYPE_BOOLEAN 1
-
-#define DYNAMIC_ENABLED_ALL 0
-#define DYNAMIC_ENABLED_NONE 1
-#define DYNAMIC_ENABLED_SOME 2
-
-extern int dynamic_enabled;
-
-/* dynamic_printk_enabled, and dynamic_printk_enabled2 are bitmasks in which
- * bit n is set to 1 if any modname hashes into the bucket n, 0 otherwise. They
- * use independent hash functions, to reduce the chance of false positives.
- */
-extern long long dynamic_printk_enabled;
-extern long long dynamic_printk_enabled2;
-
-struct mod_debug {
-        char *modname;
-        char *logical_modname;
-        char *flag_names;
-        int type;
-        int hash;
-        int hash2;
-} __attribute__((aligned(8)));
-
-int register_dynamic_debug_module(char *mod_name, int type, char *share_name,
-                                        char *flags, int hash, int hash2);
-
-#if defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
-extern int unregister_dynamic_debug_module(char *mod_name);
-extern int __dynamic_dbg_enabled_helper(char *modname, int type,
-                                        int value, int hash);
-
-#define __dynamic_dbg_enabled(module, type, value, level, hash)  ({          \
-        int __ret = 0;                                                       \
-        if (unlikely((dynamic_printk_enabled & (1LL << DEBUG_HASH)) &&       \
-                        (dynamic_printk_enabled2 & (1LL << DEBUG_HASH2))))   \
-                        __ret = __dynamic_dbg_enabled_helper(module, type,   \
-                                                                value, hash);\
-        __ret; })
-
-#define dynamic_pr_debug(fmt, ...) do {                                     \
-        static char mod_name[]                                              \
-        __attribute__((section("__verbose_strings")))                       \
-         = KBUILD_MODNAME;                                                  \
-        static struct mod_debug descriptor                                  \
-        __used                                                              \
-        __attribute__((section("__verbose"), aligned(8))) =                 \
-        { mod_name, mod_name, NULL, TYPE_BOOLEAN, DEBUG_HASH, DEBUG_HASH2 };\
-        if (__dynamic_dbg_enabled(KBUILD_MODNAME, TYPE_BOOLEAN,             \
-                                                0, 0, DEBUG_HASH))          \
-                printk(KERN_DEBUG KBUILD_MODNAME ":" fmt,                   \
-                                ##__VA_ARGS__);                             \
-        } while (0)
-
-#define dynamic_dev_dbg(dev, format, ...) do {                              \
-        static char mod_name[]                                              \
-        __attribute__((section("__verbose_strings")))                       \
-         = KBUILD_MODNAME;                                                  \
-        static struct mod_debug descriptor                                  \
-        __used                                                              \
-        __attribute__((section("__verbose"), aligned(8))) =                 \
-        { mod_name, mod_name, NULL, TYPE_BOOLEAN, DEBUG_HASH, DEBUG_HASH2 };\
-        if (__dynamic_dbg_enabled(KBUILD_MODNAME, TYPE_BOOLEAN,             \
-                                                0, 0, DEBUG_HASH))          \
-                        dev_printk(KERN_DEBUG, dev,                         \
-                                        KBUILD_MODNAME ": " format,         \
-                                        ##__VA_ARGS__);                     \
-        } while (0)
-
-#else
-
-static inline int unregister_dynamic_debug_module(const char *mod_name)
-{
-        return 0;
-}
-static inline int __dynamic_dbg_enabled_helper(char *modname, int type,
-                                                int value, int hash)
-{
-        return 0;
-}
-
-#define __dynamic_dbg_enabled(module, type, value, level, hash)  ({ 0; })
-#define dynamic_pr_debug(fmt, ...)  do { } while (0)
-#define dynamic_dev_dbg(dev, format, ...)  do { } while (0)
-#endif
-
-#endif
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7a204256b155..c59b769f62b0 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -116,6 +116,7 @@ extern void elv_abort_queue(struct request_queue *);
 extern void elv_completed_request(struct request_queue *, struct request *);
 extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
 extern void elv_put_request(struct request_queue *, struct request *);
+extern void elv_drain_elevator(struct request_queue *);
 
 /*
  * io scheduler registration
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 5ca54d77079f..7605c5e9589f 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -111,6 +111,15 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re
 #endif
 }
 
+static inline void elf_core_copy_kernel_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
+{
+#ifdef ELF_CORE_COPY_KERNEL_REGS
+        ELF_CORE_COPY_KERNEL_REGS((*elfregs), regs);
+#else
+        elf_core_copy_regs(elfregs, regs);
+#endif
+}
+
 static inline int elf_core_copy_task_regs(struct task_struct *t, elf_gregset_t* elfregs)
 {
 #ifdef ELF_CORE_COPY_TASK_REGS
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index ceb1454b6977..ec12cc74366f 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -18,6 +18,7 @@ struct sock_extended_err
 #define SO_EE_ORIGIN_LOCAL      1
 #define SO_EE_ORIGIN_ICMP       2
 #define SO_EE_ORIGIN_ICMP6      3
+#define SO_EE_ORIGIN_TIMESTAMPING 4
 
 #define SO_EE_OFFENDER(ee)      ((struct sockaddr*)((ee)+1))
 
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 1cb0f0b90926..a1f17abba7dc 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -184,4 +184,25 @@ static inline unsigned compare_ether_addr_64bits(const u8 addr1[6+2],
 }
 #endif  /* __KERNEL__ */
 
+/**
+ * compare_ether_header - Compare two Ethernet headers
+ * @a: Pointer to Ethernet header
+ * @b: Pointer to Ethernet header
+ *
+ * Compare two ethernet headers, returns 0 if equal.
+ * This assumes that the network header (i.e., IP header) is 4-byte
+ * aligned OR the platform can handle unaligned access.  This is the
+ * case for all packets coming into netif_receive_skb or similar
+ * entry points.
+ */
+
+static inline int compare_ether_header(const void *a, const void *b)
+{
+        u32 *a32 = (u32 *)((u8 *)a + 2);
+        u32 *b32 = (u32 *)((u8 *)b + 2);
+
+        return (*(u16 *)a ^ *(u16 *)b) | (a32[0] ^ b32[0]) |
+               (a32[1] ^ b32[1]) | (a32[2] ^ b32[2]);
+}
+
 #endif  /* _LINUX_ETHERDEVICE_H */
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 27c67a542235..131b127b70f8 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -7,6 +7,7 @@
  * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
  *                                christopher.leech@intel.com,
  *                                scott.feldman@intel.com)
+ * Portions Copyright (C) Sun Microsystems 2008
  */
 
 #ifndef _LINUX_ETHTOOL_H
@@ -287,10 +288,75 @@ enum ethtool_flags {
         ETH_FLAG_LRO            = (1 << 15),    /* LRO is enabled */
 };
 
-struct ethtool_rxnfc {
-        __u32           cmd;
+/* The following structures are for supporting RX network flow
+ * classification 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 {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be16  psrc;
+        __be16  pdst;
+        __u8    tos;
+};
+
+struct ethtool_ah_espip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be32  spi;
+        __u8    tos;
+};
+
+struct ethtool_rawip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __u8    hdata[64];
+};
+
+struct ethtool_ether_spec {
+        __be16  ether_type;
+        __u8    frame_size;
+        __u8    eframe[16];
+};
+
+#define ETH_RX_NFC_IP4  1
+#define ETH_RX_NFC_IP6  2
+
+struct ethtool_usrip4_spec {
+        __be32  ip4src;
+        __be32  ip4dst;
+        __be32  l4_4_bytes;
+        __u8    tos;
+        __u8    ip_ver;
+        __u8    proto;
+};
+
+struct ethtool_rx_flow_spec {
         __u32           flow_type;
-        __u64           data;
+        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_rawip4_spec              raw_ip4_spec;
+                struct ethtool_ether_spec               ether_spec;
+                struct ethtool_usrip4_spec              usr_ip4_spec;
+                __u8                                    hdata[64];
+        } h_u, m_u; /* entry, mask */
+        __u64           ring_cookie;
+        __u32           location;
+};
+
+struct ethtool_rxnfc {
+        __u32                           cmd;
+        __u32                           flow_type;
+        /* The rx flow hash value or the rule DB size */
+        __u64                           data;
+        struct ethtool_rx_flow_spec     fs;
+        __u32                           rule_cnt;
+        __u32                           rule_locs[0];
 };
 
 #ifdef __KERNEL__
@@ -417,8 +483,8 @@ struct ethtool_ops {
         /* the following hooks are obsolete */
         int     (*self_test_count)(struct net_device *);/* use get_sset_count */
         int     (*get_stats_count)(struct net_device *);/* use get_sset_count */
-        int     (*get_rxhash)(struct net_device *, struct ethtool_rxnfc *);
-        int     (*set_rxhash)(struct net_device *, struct ethtool_rxnfc *);
+        int     (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *);
+        int     (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
 };
 #endif /* __KERNEL__ */
 
@@ -469,6 +535,12 @@ struct ethtool_ops {
 #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 */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -565,9 +637,13 @@ struct ethtool_ops {
 #define UDP_V6_FLOW     0x06
 #define SCTP_V6_FLOW    0x07
 #define AH_ESP_V6_FLOW  0x08
+#define AH_V4_FLOW      0x09
+#define ESP_V4_FLOW     0x0a
+#define AH_V6_FLOW      0x0b
+#define ESP_V6_FLOW     0x0c
+#define IP_USER_FLOW    0x0d
 
 /* L3-L4 network traffic flow hash options */
-#define RXH_DEV_PORT    (1 << 0)
 #define RXH_L2DA        (1 << 1)
 #define RXH_VLAN        (1 << 2)
 #define RXH_L3_PROTO    (1 << 3)
@@ -577,5 +653,6 @@ struct ethtool_ops {
 #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
 
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index a667637b54e3..f45a8ae5f828 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -13,10 +13,20 @@
 /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/fcntl.h>
 
-/* Flags for eventfd2.  */
+/*
+ * CAREFUL: Check include/asm-generic/fcntl.h when defining
+ * new flags, since they might collide with O_* ones. We want
+ * to re-use O_* flags that couldn't possibly have a meaning
+ * from eventfd, in order to leave a free define-space for
+ * shared O_* flags.
+ */
+#define EFD_SEMAPHORE (1 << 0)
 #define EFD_CLOEXEC O_CLOEXEC
 #define EFD_NONBLOCK O_NONBLOCK
 
+#define EFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK)
+#define EFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS | EFD_SEMAPHORE)
+
 struct file *eventfd_fget(int fd);
 int eventfd_signal(struct file *file, int n);
 
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f1e1d3c47125..f6856a5a1d4b 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -61,7 +61,6 @@ struct file;
 static inline void eventpoll_init_file(struct file *file)
 {
         INIT_LIST_HEAD(&file->f_ep_links);
-        spin_lock_init(&file->f_ep_lock);
 }
 
 
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index dd495b8c3091..634a5e5aba3e 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -208,6 +208,7 @@ static inline __u32 ext3_mask_flags(umode_t mode, __u32 flags)
 #define EXT3_STATE_JDATA                0x00000001 /* journaled data exists */
 #define EXT3_STATE_NEW                  0x00000002 /* inode is newly created */
 #define EXT3_STATE_XATTR                0x00000004 /* has in-inode xattrs */
+#define EXT3_STATE_FLUSH_ON_CLOSE       0x00000008
 
 /* Used to pass group descriptor data when online resize is done */
 struct ext3_new_group_input {
@@ -893,9 +894,8 @@ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                        u64 start, u64 len);
 
 /* ioctl.c */
-extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
-                       unsigned long);
-extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long);
+extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+extern long ext3_compat_ioctl(struct file *, unsigned int, unsigned long);
 
 /* namei.c */
 extern int ext3_orphan_add(handle_t *, struct inode *);
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 31527e17076b..330c4b1bfcaa 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -123,6 +123,7 @@ struct dentry;
 #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              */
@@ -172,8 +173,12 @@ struct fb_fix_screeninfo {
 /* 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. This implies
- * big-endian byte order if bits_per_pixel is greater than 8.
+ * 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        */
@@ -960,15 +965,7 @@ extern struct fb_info *registered_fb[FB_MAX];
 extern int num_registered_fb;
 extern struct class *fb_class;
 
-static inline int lock_fb_info(struct fb_info *info)
-{
-        mutex_lock(&info->lock);
-        if (!info->fbops) {
-                mutex_unlock(&info->lock);
-                return 0;
-        }
-        return 1;
-}
+extern int lock_fb_info(struct fb_info *info);
 
 static inline void unlock_fb_info(struct fb_info *info)
 {
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 09d6c5bbdddd..a2ec74bc4812 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -5,12 +5,14 @@
 #ifndef __LINUX_FDTABLE_H
 #define __LINUX_FDTABLE_H
 
-#include <asm/atomic.h>
 #include <linux/posix_types.h>
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
 #include <linux/types.h>
+#include <linux/init.h>
+
+#include <asm/atomic.h>
 
 /*
  * The default fd array needs to be at least BITS_PER_LONG,
diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h
index 671decbd2aeb..934e22d65801 100644
--- a/include/linux/fiemap.h
+++ b/include/linux/fiemap.h
@@ -11,6 +11,8 @@
 #ifndef _LINUX_FIEMAP_H
 #define _LINUX_FIEMAP_H
 
+#include <linux/types.h>
+
 struct fiemap_extent {
         __u64 fe_logical;  /* logical offset in bytes for the start of
                             * the extent from the beginning of the file */
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
index 4d078e99c017..c6b3ca3af6df 100644
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
@@ -25,10 +25,12 @@
 #include <linux/types.h>
 #include <linux/firewire-constants.h>
 
-#define FW_CDEV_EVENT_BUS_RESET         0x00
-#define FW_CDEV_EVENT_RESPONSE          0x01
-#define FW_CDEV_EVENT_REQUEST           0x02
-#define FW_CDEV_EVENT_ISO_INTERRUPT     0x03
+#define FW_CDEV_EVENT_BUS_RESET                 0x00
+#define FW_CDEV_EVENT_RESPONSE                  0x01
+#define FW_CDEV_EVENT_REQUEST                   0x02
+#define FW_CDEV_EVENT_ISO_INTERRUPT             0x03
+#define FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED    0x04
+#define FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED  0x05
 
 /**
  * struct fw_cdev_event_common - Common part of all fw_cdev_event_ types
@@ -136,7 +138,24 @@ struct fw_cdev_event_request {
  * This event is sent when the controller has completed an &fw_cdev_iso_packet
  * with the %FW_CDEV_ISO_INTERRUPT bit set.  In the receive case, the headers
  * stripped of all packets up until and including the interrupt packet are
- * returned in the @header field.
+ * returned in the @header field.  The amount of header data per packet is as
+ * specified at iso context creation by &fw_cdev_create_iso_context.header_size.
+ *
+ * In version 1 of this ABI, header data consisted of the 1394 isochronous
+ * packet header, followed by quadlets from the packet payload if
+ * &fw_cdev_create_iso_context.header_size > 4.
+ *
+ * In version 2 of this ABI, header data consist of the 1394 isochronous
+ * packet header, followed by a timestamp quadlet if
+ * &fw_cdev_create_iso_context.header_size > 4, followed by quadlets from the
+ * packet payload if &fw_cdev_create_iso_context.header_size > 8.
+ *
+ * Behaviour of ver. 1 of this ABI is no longer available since ABI ver. 2.
+ *
+ * Format of 1394 iso packet header: 16 bits len, 2 bits tag, 6 bits channel,
+ * 4 bits tcode, 4 bits sy, in big endian byte order.  Format of timestamp:
+ * 16 bits invalid, 3 bits cycleSeconds, 13 bits cycleCount, in big endian byte
+ * order.
  */
 struct fw_cdev_event_iso_interrupt {
         __u64 closure;
@@ -147,12 +166,44 @@ struct fw_cdev_event_iso_interrupt {
 };
 
 /**
+ * struct fw_cdev_event_iso_resource - Iso resources were allocated or freed
+ * @closure:    See &fw_cdev_event_common;
+ *              set by %FW_CDEV_IOC_(DE)ALLOCATE_ISO_RESOURCE(_ONCE) ioctl
+ * @type:       %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
+ *              %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
+ * @handle:     Reference by which an allocated resource can be deallocated
+ * @channel:    Isochronous channel which was (de)allocated, if any
+ * @bandwidth:  Bandwidth allocation units which were (de)allocated, if any
+ *
+ * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event is sent after an isochronous
+ * resource was allocated at the IRM.  The client has to check @channel and
+ * @bandwidth for whether the allocation actually succeeded.
+ *
+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event is sent after an isochronous
+ * resource was deallocated at the IRM.  It is also sent when automatic
+ * reallocation after a bus reset failed.
+ *
+ * @channel is <0 if no channel was (de)allocated or if reallocation failed.
+ * @bandwidth is 0 if no bandwidth was (de)allocated or if reallocation failed.
+ */
+struct fw_cdev_event_iso_resource {
+        __u64 closure;
+        __u32 type;
+        __u32 handle;
+        __s32 channel;
+        __s32 bandwidth;
+};
+
+/**
  * union fw_cdev_event - Convenience union of fw_cdev_event_ types
  * @common:        Valid for all types
  * @bus_reset:     Valid if @common.type == %FW_CDEV_EVENT_BUS_RESET
  * @response:      Valid if @common.type == %FW_CDEV_EVENT_RESPONSE
  * @request:       Valid if @common.type == %FW_CDEV_EVENT_REQUEST
  * @iso_interrupt: Valid if @common.type == %FW_CDEV_EVENT_ISO_INTERRUPT
+ * @iso_resource:  Valid if @common.type ==
+ *                              %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
+ *                              %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
  *
  * Convenience union for userspace use.  Events could be read(2) into an
  * appropriately aligned char buffer and then cast to this union for further
@@ -163,33 +214,47 @@ struct fw_cdev_event_iso_interrupt {
  * not fit will be discarded so that the next read(2) will return a new event.
  */
 union fw_cdev_event {
-        struct fw_cdev_event_common common;
-        struct fw_cdev_event_bus_reset bus_reset;
-        struct fw_cdev_event_response response;
-        struct fw_cdev_event_request request;
-        struct fw_cdev_event_iso_interrupt iso_interrupt;
+        struct fw_cdev_event_common             common;
+        struct fw_cdev_event_bus_reset          bus_reset;
+        struct fw_cdev_event_response           response;
+        struct fw_cdev_event_request            request;
+        struct fw_cdev_event_iso_interrupt      iso_interrupt;
+        struct fw_cdev_event_iso_resource       iso_resource;
 };
 
-#define FW_CDEV_IOC_GET_INFO            _IOWR('#', 0x00, struct fw_cdev_get_info)
-#define FW_CDEV_IOC_SEND_REQUEST        _IOW('#', 0x01, struct fw_cdev_send_request)
-#define FW_CDEV_IOC_ALLOCATE            _IOWR('#', 0x02, struct fw_cdev_allocate)
-#define FW_CDEV_IOC_DEALLOCATE          _IOW('#', 0x03, struct fw_cdev_deallocate)
-#define FW_CDEV_IOC_SEND_RESPONSE       _IOW('#', 0x04, struct fw_cdev_send_response)
-#define FW_CDEV_IOC_INITIATE_BUS_RESET  _IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
-#define FW_CDEV_IOC_ADD_DESCRIPTOR      _IOWR('#', 0x06, struct fw_cdev_add_descriptor)
-#define FW_CDEV_IOC_REMOVE_DESCRIPTOR   _IOW('#', 0x07, struct fw_cdev_remove_descriptor)
+/* available since kernel version 2.6.22 */
+#define FW_CDEV_IOC_GET_INFO           _IOWR('#', 0x00, struct fw_cdev_get_info)
+#define FW_CDEV_IOC_SEND_REQUEST        _IOW('#', 0x01, struct fw_cdev_send_request)
+#define FW_CDEV_IOC_ALLOCATE           _IOWR('#', 0x02, struct fw_cdev_allocate)
+#define FW_CDEV_IOC_DEALLOCATE          _IOW('#', 0x03, struct fw_cdev_deallocate)
+#define FW_CDEV_IOC_SEND_RESPONSE       _IOW('#', 0x04, struct fw_cdev_send_response)
+#define FW_CDEV_IOC_INITIATE_BUS_RESET  _IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
+#define FW_CDEV_IOC_ADD_DESCRIPTOR     _IOWR('#', 0x06, struct fw_cdev_add_descriptor)
+#define FW_CDEV_IOC_REMOVE_DESCRIPTOR   _IOW('#', 0x07, struct fw_cdev_remove_descriptor)
+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT _IOWR('#', 0x08, struct fw_cdev_create_iso_context)
+#define FW_CDEV_IOC_QUEUE_ISO          _IOWR('#', 0x09, struct fw_cdev_queue_iso)
+#define FW_CDEV_IOC_START_ISO           _IOW('#', 0x0a, struct fw_cdev_start_iso)
+#define FW_CDEV_IOC_STOP_ISO            _IOW('#', 0x0b, struct fw_cdev_stop_iso)
 
-#define FW_CDEV_IOC_CREATE_ISO_CONTEXT  _IOWR('#', 0x08, struct fw_cdev_create_iso_context)
-#define FW_CDEV_IOC_QUEUE_ISO           _IOWR('#', 0x09, struct fw_cdev_queue_iso)
-#define FW_CDEV_IOC_START_ISO           _IOW('#', 0x0a, struct fw_cdev_start_iso)
-#define FW_CDEV_IOC_STOP_ISO            _IOW('#', 0x0b, struct fw_cdev_stop_iso)
-#define FW_CDEV_IOC_GET_CYCLE_TIMER     _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
+/* available since kernel version 2.6.24 */
+#define FW_CDEV_IOC_GET_CYCLE_TIMER     _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
 
-/* FW_CDEV_VERSION History
- *
- * 1    Feb 18, 2007:  Initial version.
+/* available since kernel version 2.6.30 */
+#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE       _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource)
+#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE      _IOW('#', 0x0e, struct fw_cdev_deallocate)
+#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE   _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource)
+#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource)
+#define FW_CDEV_IOC_GET_SPEED                     _IO('#', 0x11) /* returns speed code */
+#define FW_CDEV_IOC_SEND_BROADCAST_REQUEST       _IOW('#', 0x12, struct fw_cdev_send_request)
+#define FW_CDEV_IOC_SEND_STREAM_PACKET           _IOW('#', 0x13, struct fw_cdev_send_stream_packet)
+
+/*
+ * FW_CDEV_VERSION History
+ *  1  (2.6.22)  - initial version
+ *  2  (2.6.30)  - changed &fw_cdev_event_iso_interrupt.header if
+ *                 &fw_cdev_create_iso_context.header_size is 8 or more
  */
-#define FW_CDEV_VERSION         1
+#define FW_CDEV_VERSION 2
 
 /**
  * struct fw_cdev_get_info - General purpose information ioctl
@@ -201,7 +266,7 @@ union fw_cdev_event {
  *              case, @rom_length is updated with the actual length of the
  *              configuration ROM.
  * @rom:        If non-zero, address of a buffer to be filled by a copy of the
- *              local node's configuration ROM
+ *              device's configuration ROM
  * @bus_reset:  If non-zero, address of a buffer to be filled by a
  *              &struct fw_cdev_event_bus_reset with the current state
  *              of the bus.  This does not cause a bus reset to happen.
@@ -229,7 +294,7 @@ struct fw_cdev_get_info {
  * Send a request to the device.  This ioctl implements all outgoing requests.
  * Both quadlet and block request specify the payload as a pointer to the data
  * in the @data field.  Once the transaction completes, the kernel writes an
- * &fw_cdev_event_request event back.  The @closure field is passed back to
+ * &fw_cdev_event_response event back.  The @closure field is passed back to
  * user space in the response event.
  */
 struct fw_cdev_send_request {
@@ -284,9 +349,9 @@ struct fw_cdev_allocate {
 };
 
 /**
- * struct fw_cdev_deallocate - Free an address range allocation
- * @handle:     Handle to the address range, as returned by the kernel when the
- *              range was allocated
+ * struct fw_cdev_deallocate - Free a CSR address range or isochronous resource
+ * @handle:     Handle to the address range or iso resource, as returned by the
+ *              kernel when the range or resource was allocated
  */
 struct fw_cdev_deallocate {
         __u32 handle;
@@ -329,6 +394,9 @@ struct fw_cdev_initiate_bus_reset {
  * If successful, the kernel adds the descriptor and writes back a handle to the
  * kernel-side object to be used for later removal of the descriptor block and
  * immediate key.
+ *
+ * This ioctl affects the configuration ROMs of all local nodes.
+ * The ioctl only succeeds on device files which represent a local node.
  */
 struct fw_cdev_add_descriptor {
         __u32 immediate;
@@ -344,7 +412,7 @@ struct fw_cdev_add_descriptor {
  *              descriptor was added
  *
  * Remove a descriptor block and accompanying immediate key from the local
- * node's configuration ROM.
+ * nodes' configuration ROMs.
  */
 struct fw_cdev_remove_descriptor {
         __u32 handle;
@@ -370,6 +438,9 @@ struct fw_cdev_remove_descriptor {
  *
  * If a context was successfully created, the kernel writes back a handle to the
  * context, which must be passed in for subsequent operations on that context.
+ *
+ * Note that the effect of a @header_size > 4 depends on
+ * &fw_cdev_get_info.version, as documented at &fw_cdev_event_iso_interrupt.
  */
 struct fw_cdev_create_iso_context {
         __u32 type;
@@ -473,10 +544,91 @@ struct fw_cdev_stop_iso {
  * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer
  * and also the system clock.  This allows to express the receive time of an
  * isochronous packet as a system time with microsecond accuracy.
+ *
+ * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and
+ * 12 bits cycleOffset, in host byte order.
  */
 struct fw_cdev_get_cycle_timer {
         __u64 local_time;
         __u32 cycle_timer;
 };
 
+/**
+ * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
+ * @closure:    Passed back to userspace in correponding iso resource events
+ * @channels:   Isochronous channels of which one is to be (de)allocated
+ * @bandwidth:  Isochronous bandwidth units to be (de)allocated
+ * @handle:     Handle to the allocation, written by the kernel (only valid in
+ *              case of %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctls)
+ *
+ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctl initiates allocation of an
+ * isochronous channel and/or of isochronous bandwidth at the isochronous
+ * resource manager (IRM).  Only one of the channels specified in @channels is
+ * allocated.  An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED is sent after
+ * communication with the IRM, indicating success or failure in the event data.
+ * The kernel will automatically reallocate the resources after bus resets.
+ * Should a reallocation fail, an %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event
+ * will be sent.  The kernel will also automatically deallocate the resources
+ * when the file descriptor is closed.
+ *
+ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE ioctl can be used to initiate
+ * deallocation of resources which were allocated as described above.
+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
+ *
+ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE ioctl is a variant of allocation
+ * without automatic re- or deallocation.
+ * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event concludes this operation,
+ * indicating success or failure in its data.
+ *
+ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like
+ * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed
+ * instead of allocated.
+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
+ *
+ * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources
+ * for the lifetime of the fd or handle.
+ * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources
+ * for the duration of a bus generation.
+ *
+ * @channels is a host-endian bitfield with the least significant bit
+ * representing channel 0 and the most significant bit representing channel 63:
+ * 1ULL << c for each channel c that is a candidate for (de)allocation.
+ *
+ * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send
+ * one quadlet of data (payload or header data) at speed S1600.
+ */
+struct fw_cdev_allocate_iso_resource {
+        __u64 closure;
+        __u64 channels;
+        __u32 bandwidth;
+        __u32 handle;
+};
+
+/**
+ * struct fw_cdev_send_stream_packet - send an asynchronous stream packet
+ * @length:     Length of outgoing payload, in bytes
+ * @tag:        Data format tag
+ * @channel:    Isochronous channel to transmit to
+ * @sy:         Synchronization code
+ * @closure:    Passed back to userspace in the response event
+ * @data:       Userspace pointer to payload
+ * @generation: The bus generation where packet is valid
+ * @speed:      Speed to transmit at
+ *
+ * The %FW_CDEV_IOC_SEND_STREAM_PACKET ioctl sends an asynchronous stream packet
+ * to every device which is listening to the specified channel.  The kernel
+ * writes an &fw_cdev_event_response event which indicates success or failure of
+ * the transmission.
+ */
+struct fw_cdev_send_stream_packet {
+        __u32 length;
+        __u32 tag;
+        __u32 channel;
+        __u32 sy;
+        __u64 closure;
+        __u64 data;
+        __u32 generation;
+        __u32 speed;
+};
+
 #endif /* _LINUX_FIREWIRE_CDEV_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 92734c0012e6..5bed436f4353 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -87,6 +87,60 @@ struct inodes_stat_t {
  */
 #define FMODE_NOCMTIME          ((__force fmode_t)2048)
 
+/*
+ * 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:
+ *
+ *      The block layer uses device plugging to defer IO a little bit, in
+ *      the hope that we will see more IO very shortly. This increases
+ *      coalescing of adjacent IO and thus reduces the number of IOs we
+ *      have to send to the device. It also allows for better queuing,
+ *      if the IO isn't mergeable. If the caller is going to be waiting
+ *      for the IO, then he must ensure that the device is unplugged so
+ *      that the IO is dispatched to the driver.
+ *
+ *      All IO is handled async in Linux. This is fine for background
+ *      writes, but for reads or writes that someone waits for completion
+ *      on, we want to notify the block layer and IO scheduler so that they
+ *      know about it. That allows them to make better scheduling
+ *      decisions. So when the below references 'sync' and 'async', it
+ *      is referencing this priority hint.
+ *
+ * With that in mind, the available types are:
+ *
+ * READ                 A normal read operation. Device will be plugged.
+ * READ_SYNC            A synchronous read. Device is not plugged, caller can
+ *                      immediately wait on this read without caring about
+ *                      unplugging.
+ * READA                Used for read-ahead operations. Lower priority, and the
+ *                       block layer could (in theory) choose to ignore this
+ *                      request if it runs into resource problems.
+ * WRITE                A normal async write. Device will be plugged.
+ * SWRITE               Like WRITE, but a special case for ll_rw_block() that
+ *                      tells it to lock the buffer first. Normally a buffer
+ *                      must be locked before doing IO.
+ * WRITE_SYNC_PLUG      Synchronous write. Identical to WRITE, but passes down
+ *                      the hint that someone will be waiting on this IO
+ *                      shortly. The device must still be unplugged explicitly,
+ *                      WRITE_SYNC_PLUG does not do this as we could be
+ *                      submitting more writes before we actually wait on any
+ *                      of them.
+ * WRITE_SYNC           Like WRITE_SYNC_PLUG, but also unplugs the device
+ *                      immediately after submission. The write equivalent
+ *                      of READ_SYNC.
+ * WRITE_ODIRECT        Special case write for O_DIRECT only.
+ * SWRITE_SYNC
+ * SWRITE_SYNC_PLUG     Like WRITE_SYNC/WRITE_SYNC_PLUG, but locks the buffer.
+ *                      See SWRITE.
+ * WRITE_BARRIER        Like WRITE, but tells the block layer that all
+ *                      previously submitted writes must be safely on storage
+ *                      before this one is started. Also guarantees that when
+ *                      this write is complete, it itself is also safely on
+ *                      storage. Prevents reordering of writes on both sides
+ *                      of this IO.
+ *
+ */
 #define RW_MASK         1
 #define RWA_MASK        2
 #define READ 0
@@ -95,9 +149,18 @@ struct inodes_stat_t {
 #define SWRITE 3        /* for ll_rw_block() - wait for buffer lock */
 #define READ_SYNC       (READ | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
 #define READ_META       (READ | (1 << BIO_RW_META))
-#define WRITE_SYNC      (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
-#define SWRITE_SYNC     (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
+#define WRITE_SYNC      (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
+#define WRITE_ODIRECT   (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define SWRITE_SYNC_PLUG        \
+                        (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
+#define SWRITE_SYNC     (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
 #define WRITE_BARRIER   (WRITE | (1 << BIO_RW_BARRIER))
+
+/*
+ * These aren't really reads or writes, they pass down information about
+ * parts of device that are now unused by the file system.
+ */
 #define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD)
 #define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER))
 
@@ -141,6 +204,7 @@ struct inodes_stat_t {
 #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_ACTIVE       (1<<30)
 #define MS_NOUSER       (1<<31)
 
@@ -733,9 +797,6 @@ enum inode_i_mutex_lock_class
         I_MUTEX_QUOTA
 };
 
-extern void inode_double_lock(struct inode *inode1, struct inode *inode2);
-extern void inode_double_unlock(struct inode *inode1, struct inode *inode2);
-
 /*
  * NOTE: in a 32bit arch with a preemptable kernel and
  * an UP compile the i_size_read/write must be atomic
@@ -848,6 +909,7 @@ struct file {
 #define f_dentry        f_path.dentry
 #define f_vfsmnt        f_path.mnt
         const struct file_operations    *f_op;
+        spinlock_t              f_lock;  /* f_ep_links, f_flags, no IRQ */
         atomic_long_t           f_count;
         unsigned int            f_flags;
         fmode_t                 f_mode;
@@ -866,7 +928,6 @@ struct file {
 #ifdef CONFIG_EPOLL
         /* Used by fs/eventpoll.c to link all the hooks to this file */
         struct list_head        f_ep_links;
-        spinlock_t              f_ep_lock;
 #endif /* #ifdef CONFIG_EPOLL */
         struct address_space    *f_mapping;
 #ifdef CONFIG_DEBUG_WRITECOUNT
@@ -1063,34 +1124,147 @@ extern int lease_modify(struct file_lock **, int);
 extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
 extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
 #else /* !CONFIG_FILE_LOCKING */
-#define fcntl_getlk(a, b) ({ -EINVAL; })
-#define fcntl_setlk(a, b, c, d) ({ -EACCES; })
+static inline int fcntl_getlk(struct file *file, struct flock __user *user)
+{
+        return -EINVAL;
+}
+
+static inline int fcntl_setlk(unsigned int fd, struct file *file,
+                              unsigned int cmd, struct flock __user *user)
+{
+        return -EACCES;
+}
+
 #if BITS_PER_LONG == 32
-#define fcntl_getlk64(a, b) ({ -EINVAL; })
-#define fcntl_setlk64(a, b, c, d) ({ -EACCES; })
+static inline int fcntl_getlk64(struct file *file, struct flock64 __user *user)
+{
+        return -EINVAL;
+}
+
+static inline int fcntl_setlk64(unsigned int fd, struct file *file,
+                                unsigned int cmd, struct flock64 __user *user)
+{
+        return -EACCES;
+}
 #endif
-#define fcntl_setlease(a, b, c) ({ 0; })
-#define fcntl_getlease(a) ({ 0; })
-#define locks_init_lock(a) ({ })
-#define __locks_copy_lock(a, b) ({ })
-#define locks_copy_lock(a, b) ({ })
-#define locks_remove_posix(a, b) ({ })
-#define locks_remove_flock(a) ({ })
-#define posix_test_lock(a, b) ({ 0; })
-#define posix_lock_file(a, b, c) ({ -ENOLCK; })
-#define posix_lock_file_wait(a, b) ({ -ENOLCK; })
-#define posix_unblock_lock(a, b) (-ENOENT)
-#define vfs_test_lock(a, b) ({ 0; })
-#define vfs_lock_file(a, b, c, d) (-ENOLCK)
-#define vfs_cancel_lock(a, b) ({ 0; })
-#define flock_lock_file_wait(a, b) ({ -ENOLCK; })
-#define __break_lease(a, b) ({ 0; })
-#define lease_get_mtime(a, b) ({ })
-#define generic_setlease(a, b, c) ({ -EINVAL; })
-#define vfs_setlease(a, b, c) ({ -EINVAL; })
-#define lease_modify(a, b) ({ -EINVAL; })
-#define lock_may_read(a, b, c) ({ 1; })
-#define lock_may_write(a, b, c) ({ 1; })
+static inline int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
+{
+        return 0;
+}
+
+static inline int fcntl_getlease(struct file *filp)
+{
+        return 0;
+}
+
+static inline void locks_init_lock(struct file_lock *fl)
+{
+        return;
+}
+
+static inline void __locks_copy_lock(struct file_lock *new, struct file_lock *fl)
+{
+        return;
+}
+
+static inline void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
+{
+        return;
+}
+
+static inline void locks_remove_posix(struct file *filp, fl_owner_t owner)
+{
+        return;
+}
+
+static inline void locks_remove_flock(struct file *filp)
+{
+        return;
+}
+
+static inline void posix_test_lock(struct file *filp, struct file_lock *fl)
+{
+        return;
+}
+
+static inline int posix_lock_file(struct file *filp, struct file_lock *fl,
+                                  struct file_lock *conflock)
+{
+        return -ENOLCK;
+}
+
+static inline int posix_lock_file_wait(struct file *filp, struct file_lock *fl)
+{
+        return -ENOLCK;
+}
+
+static inline int posix_unblock_lock(struct file *filp,
+                                     struct file_lock *waiter)
+{
+        return -ENOENT;
+}
+
+static inline int vfs_test_lock(struct file *filp, struct file_lock *fl)
+{
+        return 0;
+}
+
+static inline int vfs_lock_file(struct file *filp, unsigned int cmd,
+                                struct file_lock *fl, struct file_lock *conf)
+{
+        return -ENOLCK;
+}
+
+static inline int vfs_cancel_lock(struct file *filp, struct file_lock *fl)
+{
+        return 0;
+}
+
+static inline int flock_lock_file_wait(struct file *filp,
+                                       struct file_lock *request)
+{
+        return -ENOLCK;
+}
+
+static inline int __break_lease(struct inode *inode, unsigned int mode)
+{
+        return 0;
+}
+
+static inline void lease_get_mtime(struct inode *inode, struct timespec *time)
+{
+        return;
+}
+
+static inline int generic_setlease(struct file *filp, long arg,
+                                    struct file_lock **flp)
+{
+        return -EINVAL;
+}
+
+static inline int vfs_setlease(struct file *filp, long arg,
+                               struct file_lock **lease)
+{
+        return -EINVAL;
+}
+
+static inline int lease_modify(struct file_lock **before, int arg)
+{
+        return -EINVAL;
+}
+
+static inline int lock_may_read(struct inode *inode, loff_t start,
+                                unsigned long len)
+{
+        return 1;
+}
+
+static inline int lock_may_write(struct inode *inode, loff_t start,
+                                 unsigned long len)
+{
+        return 1;
+}
+
 #endif /* !CONFIG_FILE_LOCKING */
 
 
@@ -1581,6 +1755,9 @@ struct file_system_type {
         struct lock_class_key i_alloc_sem_key;
 };
 
+extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
+        int (*fill_super)(struct super_block *, void *, int),
+        struct vfsmount *mnt);
 extern int get_sb_bdev(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data,
         int (*fill_super)(struct super_block *, void *, int),
@@ -1606,7 +1783,7 @@ struct super_block *sget(struct file_system_type *type,
 extern int get_sb_pseudo(struct file_system_type *, char *,
         const struct super_operations *ops, unsigned long,
         struct vfsmount *mnt);
-extern int simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
+extern void simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
 int __put_super_and_need_restart(struct super_block *sb);
 
 /* Alas, no aliases. Too much hassle with bringing module.h everywhere */
@@ -1627,6 +1804,8 @@ extern void drop_collected_mounts(struct vfsmount *);
 
 extern int vfs_statfs(struct dentry *, struct kstatfs *);
 
+extern int current_umask(void);
+
 /* /sys/fs */
 extern struct kobject *fs_kobj;
 
@@ -1687,13 +1866,44 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
         return 0;
 }
 #else /* !CONFIG_FILE_LOCKING */
-#define locks_mandatory_locked(a) ({ 0; })
-#define locks_mandatory_area(a, b, c, d, e) ({ 0; })
-#define __mandatory_lock(a) ({ 0; })
-#define mandatory_lock(a) ({ 0; })
-#define locks_verify_locked(a) ({ 0; })
-#define locks_verify_truncate(a, b, c) ({ 0; })
-#define break_lease(a, b) ({ 0; })
+static inline int locks_mandatory_locked(struct inode *inode)
+{
+        return 0;
+}
+
+static inline int locks_mandatory_area(int rw, struct inode *inode,
+                                       struct file *filp, loff_t offset,
+                                       size_t count)
+{
+        return 0;
+}
+
+static inline int __mandatory_lock(struct inode *inode)
+{
+        return 0;
+}
+
+static inline int mandatory_lock(struct inode *inode)
+{
+        return 0;
+}
+
+static inline int locks_verify_locked(struct inode *inode)
+{
+        return 0;
+}
+
+static inline int locks_verify_truncate(struct inode *inode, struct file *filp,
+                                        size_t size)
+{
+        return 0;
+}
+
+static inline int break_lease(struct inode *inode, unsigned int mode)
+{
+        return 0;
+}
+
 #endif /* CONFIG_FILE_LOCKING */
 
 /* fs/open.c */
@@ -1730,8 +1940,28 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, fmode_t);
+extern void invalidate_bdev(struct block_device *);
+extern int sync_blockdev(struct block_device *bdev);
+extern struct super_block *freeze_bdev(struct block_device *);
+extern void emergency_thaw_all(void);
+extern int thaw_bdev(struct block_device *bdev, struct super_block *sb);
+extern int fsync_bdev(struct block_device *);
+extern int fsync_super(struct super_block *);
+extern int fsync_no_super(struct block_device *);
 #else
 static inline void bd_forget(struct inode *inode) {}
+static inline int sync_blockdev(struct block_device *bdev) { return 0; }
+static inline void invalidate_bdev(struct block_device *bdev) {}
+
+static inline struct super_block *freeze_bdev(struct block_device *sb)
+{
+        return NULL;
+}
+
+static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)
+{
+        return 0;
+}
 #endif
 extern const struct file_operations def_blk_fops;
 extern const struct file_operations def_chr_fops;
@@ -1881,7 +2111,6 @@ static inline void allow_write_access(struct file *file)
         if (file)
                 atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
 }
-extern int do_pipe(int *);
 extern int do_pipe_flags(int *, int);
 extern struct file *create_read_pipe(struct file *f, int flags);
 extern struct file *create_write_pipe(int flags);
@@ -1977,8 +2206,6 @@ extern ssize_t generic_file_splice_read(struct file *, loff_t *,
                 struct pipe_inode_info *, size_t, unsigned int);
 extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
                 struct file *, loff_t *, size_t, unsigned int);
-extern ssize_t generic_file_splice_write_nolock(struct pipe_inode_info *,
-                struct file *, loff_t *, size_t, unsigned int);
 extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
                 struct file *out, loff_t *, size_t len, unsigned int flags);
 extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
@@ -2072,9 +2299,8 @@ extern int vfs_readdir(struct file *, filldir_t, void *);
 
 extern int vfs_stat(char __user *, struct kstat *);
 extern int vfs_lstat(char __user *, struct kstat *);
-extern int vfs_stat_fd(int dfd, char __user *, struct kstat *);
-extern int vfs_lstat_fd(int dfd, char __user *, struct kstat *);
 extern int vfs_fstat(unsigned int, struct kstat *);
+extern int vfs_fstatat(int , char __user *, struct kstat *, int);
 
 extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
                     unsigned long arg);
@@ -2171,19 +2397,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf,
                                 size_t size, loff_t *pos);
 int simple_transaction_release(struct inode *inode, struct file *file);
 
-static inline void simple_transaction_set(struct file *file, size_t n)
-{
-        struct simple_transaction_argresp *ar = file->private_data;
-
-        BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);
-
-        /*
-         * The barrier ensures that ar->size will really remain zero until
-         * ar->data is ready for reading.
-         */
-        smp_mb();
-        ar->size = n;
-}
+void simple_transaction_set(struct file *file, size_t n);
 
 /*
  * simple attribute files
@@ -2230,32 +2444,11 @@ ssize_t simple_attr_read(struct file *file, char __user *buf,
 ssize_t simple_attr_write(struct file *file, const char __user *buf,
                           size_t len, loff_t *ppos);
 
-
-#ifdef CONFIG_SECURITY
-static inline char *alloc_secdata(void)
-{
-        return (char *)get_zeroed_page(GFP_KERNEL);
-}
-
-static inline void free_secdata(void *secdata)
-{
-        free_page((unsigned long)secdata);
-}
-#else
-static inline char *alloc_secdata(void)
-{
-        return (char *)1;
-}
-
-static inline void free_secdata(void *secdata)
-{ }
-#endif  /* CONFIG_SECURITY */
-
 struct ctl_table;
 int proc_nr_files(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos);
 
-int get_filesystem_list(char * buf);
+int __init get_filesystem_list(char *buf);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_FS_H */
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index a97c053d3a9a..78a05bfcd8eb 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -4,9 +4,10 @@
 #include <linux/path.h>
 
 struct fs_struct {
-        atomic_t count;
+        int users;
         rwlock_t lock;
         int umask;
+        int in_exec;
         struct path root, pwd;
 };
 
@@ -16,6 +17,8 @@ extern void exit_fs(struct task_struct *);
 extern void set_fs_root(struct fs_struct *, struct path *);
 extern void set_fs_pwd(struct fs_struct *, struct path *);
 extern struct fs_struct *copy_fs_struct(struct fs_struct *);
-extern void put_fs_struct(struct fs_struct *);
+extern void free_fs_struct(struct fs_struct *);
+extern void daemonize_fs_struct(void);
+extern int unshare_fs_struct(void);
 
 #endif /* _LINUX_FS_STRUCT_H */
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
new file mode 100644
index 000000000000..84d3532dd3ea
--- /dev/null
+++ b/include/linux/fscache-cache.h
@@ -0,0 +1,505 @@
+/* General filesystem caching backing cache interface
+ *
+ * Copyright (C) 2004-2007 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.
+ *
+ * NOTE!!! See:
+ *
+ *      Documentation/filesystems/caching/backend-api.txt
+ *
+ * for a description of the cache backend interface declared here.
+ */
+
+#ifndef _LINUX_FSCACHE_CACHE_H
+#define _LINUX_FSCACHE_CACHE_H
+
+#include <linux/fscache.h>
+#include <linux/sched.h>
+#include <linux/slow-work.h>
+
+#define NR_MAXCACHES BITS_PER_LONG
+
+struct fscache_cache;
+struct fscache_cache_ops;
+struct fscache_object;
+struct fscache_operation;
+
+/*
+ * cache tag definition
+ */
+struct fscache_cache_tag {
+        struct list_head        link;
+        struct fscache_cache    *cache;         /* cache referred to by this tag */
+        unsigned long           flags;
+#define FSCACHE_TAG_RESERVED    0               /* T if tag is reserved for a cache */
+        atomic_t                usage;
+        char                    name[0];        /* tag name */
+};
+
+/*
+ * cache definition
+ */
+struct fscache_cache {
+        const struct fscache_cache_ops *ops;
+        struct fscache_cache_tag *tag;          /* tag representing this cache */
+        struct kobject          *kobj;          /* system representation of this cache */
+        struct list_head        link;           /* link in list of caches */
+        size_t                  max_index_size; /* maximum size of index data */
+        char                    identifier[36]; /* cache label */
+
+        /* node management */
+        struct work_struct      op_gc;          /* operation garbage collector */
+        struct list_head        object_list;    /* list of data/index objects */
+        struct list_head        op_gc_list;     /* list of ops to be deleted */
+        spinlock_t              object_list_lock;
+        spinlock_t              op_gc_list_lock;
+        atomic_t                object_count;   /* no. of live objects in this cache */
+        struct fscache_object   *fsdef;         /* object for the fsdef index */
+        unsigned long           flags;
+#define FSCACHE_IOERROR         0       /* cache stopped on I/O error */
+#define FSCACHE_CACHE_WITHDRAWN 1       /* cache has been withdrawn */
+};
+
+extern wait_queue_head_t fscache_cache_cleared_wq;
+
+/*
+ * operation to be applied to a cache object
+ * - retrieval initiation operations are done in the context of the process
+ *   that issued them, and not in an async thread pool
+ */
+typedef void (*fscache_operation_release_t)(struct fscache_operation *op);
+typedef void (*fscache_operation_processor_t)(struct fscache_operation *op);
+
+struct fscache_operation {
+        union {
+                struct work_struct fast_work;   /* record for fast ops */
+                struct slow_work slow_work;     /* record for (very) slow ops */
+        };
+        struct list_head        pend_link;      /* link in object->pending_ops */
+        struct fscache_object   *object;        /* object to be operated upon */
+
+        unsigned long           flags;
+#define FSCACHE_OP_TYPE         0x000f  /* operation type */
+#define FSCACHE_OP_FAST         0x0001  /* - fast op, processor may not sleep for disk */
+#define FSCACHE_OP_SLOW         0x0002  /* - (very) slow op, processor may sleep for disk */
+#define FSCACHE_OP_MYTHREAD     0x0003  /* - processing is done be issuing thread, not pool */
+#define FSCACHE_OP_WAITING      4       /* cleared when op is woken */
+#define FSCACHE_OP_EXCLUSIVE    5       /* exclusive op, other ops must wait */
+#define FSCACHE_OP_DEAD         6       /* op is now dead */
+
+        atomic_t                usage;
+        unsigned                debug_id;       /* debugging ID */
+
+        /* operation processor callback
+         * - can be NULL if FSCACHE_OP_WAITING is going to be used to perform
+         *   the op in a non-pool thread */
+        fscache_operation_processor_t processor;
+
+        /* operation releaser */
+        fscache_operation_release_t release;
+};
+
+extern atomic_t fscache_op_debug_id;
+extern const struct slow_work_ops fscache_op_slow_work_ops;
+
+extern void fscache_enqueue_operation(struct fscache_operation *);
+extern void fscache_put_operation(struct fscache_operation *);
+
+/**
+ * fscache_operation_init - Do basic initialisation of an operation
+ * @op: The operation to initialise
+ * @release: The release function to assign
+ *
+ * Do basic initialisation of an operation.  The caller must still set flags,
+ * object, either fast_work or slow_work if necessary, and processor if needed.
+ */
+static inline void fscache_operation_init(struct fscache_operation *op,
+                                          fscache_operation_release_t release)
+{
+        atomic_set(&op->usage, 1);
+        op->debug_id = atomic_inc_return(&fscache_op_debug_id);
+        op->release = release;
+        INIT_LIST_HEAD(&op->pend_link);
+}
+
+/**
+ * fscache_operation_init_slow - Do additional initialisation of a slow op
+ * @op: The operation to initialise
+ * @processor: The processor function to assign
+ *
+ * Do additional initialisation of an operation as required for slow work.
+ */
+static inline
+void fscache_operation_init_slow(struct fscache_operation *op,
+                                 fscache_operation_processor_t processor)
+{
+        op->processor = processor;
+        slow_work_init(&op->slow_work, &fscache_op_slow_work_ops);
+}
+
+/*
+ * data read operation
+ */
+struct fscache_retrieval {
+        struct fscache_operation op;
+        struct address_space    *mapping;       /* netfs pages */
+        fscache_rw_complete_t   end_io_func;    /* function to call on I/O completion */
+        void                    *context;       /* netfs read context (pinned) */
+        struct list_head        to_do;          /* list of things to be done by the backend */
+        unsigned long           start_time;     /* time at which retrieval started */
+};
+
+typedef int (*fscache_page_retrieval_func_t)(struct fscache_retrieval *op,
+                                             struct page *page,
+                                             gfp_t gfp);
+
+typedef int (*fscache_pages_retrieval_func_t)(struct fscache_retrieval *op,
+                                              struct list_head *pages,
+                                              unsigned *nr_pages,
+                                              gfp_t gfp);
+
+/**
+ * fscache_get_retrieval - Get an extra reference on a retrieval operation
+ * @op: The retrieval operation to get a reference on
+ *
+ * Get an extra reference on a retrieval operation.
+ */
+static inline
+struct fscache_retrieval *fscache_get_retrieval(struct fscache_retrieval *op)
+{
+        atomic_inc(&op->op.usage);
+        return op;
+}
+
+/**
+ * fscache_enqueue_retrieval - Enqueue a retrieval operation for processing
+ * @op: The retrieval operation affected
+ *
+ * Enqueue a retrieval operation for processing by the FS-Cache thread pool.
+ */
+static inline void fscache_enqueue_retrieval(struct fscache_retrieval *op)
+{
+        fscache_enqueue_operation(&op->op);
+}
+
+/**
+ * fscache_put_retrieval - Drop a reference to a retrieval operation
+ * @op: The retrieval operation affected
+ *
+ * Drop a reference to a retrieval operation.
+ */
+static inline void fscache_put_retrieval(struct fscache_retrieval *op)
+{
+        fscache_put_operation(&op->op);
+}
+
+/*
+ * cached page storage work item
+ * - used to do three things:
+ *   - batch writes to the cache
+ *   - do cache writes asynchronously
+ *   - defer writes until cache object lookup completion
+ */
+struct fscache_storage {
+        struct fscache_operation op;
+        pgoff_t                 store_limit;    /* don't write more than this */
+};
+
+/*
+ * cache operations
+ */
+struct fscache_cache_ops {
+        /* name of cache provider */
+        const char *name;
+
+        /* allocate an object record for a cookie */
+        struct fscache_object *(*alloc_object)(struct fscache_cache *cache,
+                                               struct fscache_cookie *cookie);
+
+        /* look up the object for a cookie */
+        void (*lookup_object)(struct fscache_object *object);
+
+        /* finished looking up */
+        void (*lookup_complete)(struct fscache_object *object);
+
+        /* increment the usage count on this object (may fail if unmounting) */
+        struct fscache_object *(*grab_object)(struct fscache_object *object);
+
+        /* pin an object in the cache */
+        int (*pin_object)(struct fscache_object *object);
+
+        /* unpin an object in the cache */
+        void (*unpin_object)(struct fscache_object *object);
+
+        /* store the updated auxilliary data on an object */
+        void (*update_object)(struct fscache_object *object);
+
+        /* discard the resources pinned by an object and effect retirement if
+         * necessary */
+        void (*drop_object)(struct fscache_object *object);
+
+        /* dispose of a reference to an object */
+        void (*put_object)(struct fscache_object *object);
+
+        /* sync a cache */
+        void (*sync_cache)(struct fscache_cache *cache);
+
+        /* notification that the attributes of a non-index object (such as
+         * i_size) have changed */
+        int (*attr_changed)(struct fscache_object *object);
+
+        /* reserve space for an object's data and associated metadata */
+        int (*reserve_space)(struct fscache_object *object, loff_t i_size);
+
+        /* request a backing block for a page be read or allocated in the
+         * cache */
+        fscache_page_retrieval_func_t read_or_alloc_page;
+
+        /* request backing blocks for a list of pages be read or allocated in
+         * the cache */
+        fscache_pages_retrieval_func_t read_or_alloc_pages;
+
+        /* request a backing block for a page be allocated in the cache so that
+         * it can be written directly */
+        fscache_page_retrieval_func_t allocate_page;
+
+        /* request backing blocks for pages be allocated in the cache so that
+         * they can be written directly */
+        fscache_pages_retrieval_func_t allocate_pages;
+
+        /* write a page to its backing block in the cache */
+        int (*write_page)(struct fscache_storage *op, struct page *page);
+
+        /* detach backing block from a page (optional)
+         * - must release the cookie lock before returning
+         * - may sleep
+         */
+        void (*uncache_page)(struct fscache_object *object,
+                             struct page *page);
+
+        /* dissociate a cache from all the pages it was backing */
+        void (*dissociate_pages)(struct fscache_cache *cache);
+};
+
+/*
+ * data file or index object cookie
+ * - a file will only appear in one cache
+ * - a request to cache a file may or may not be honoured, subject to
+ *   constraints such as disk space
+ * - indices are created on disk just-in-time
+ */
+struct fscache_cookie {
+        atomic_t                        usage;          /* number of users of this cookie */
+        atomic_t                        n_children;     /* number of children of this cookie */
+        spinlock_t                      lock;
+        struct hlist_head               backing_objects; /* object(s) backing this file/index */
+        const struct fscache_cookie_def *def;           /* definition */
+        struct fscache_cookie           *parent;        /* parent of this entry */
+        void                            *netfs_data;    /* back pointer to netfs */
+        struct radix_tree_root          stores;         /* pages to be stored on this cookie */
+#define FSCACHE_COOKIE_PENDING_TAG      0               /* pages tag: pending write to cache */
+
+        unsigned long                   flags;
+#define FSCACHE_COOKIE_LOOKING_UP       0       /* T if non-index cookie being looked up still */
+#define FSCACHE_COOKIE_CREATING         1       /* T if non-index object being created still */
+#define FSCACHE_COOKIE_NO_DATA_YET      2       /* T if new object with no cached data yet */
+#define FSCACHE_COOKIE_PENDING_FILL     3       /* T if pending initial fill on object */
+#define FSCACHE_COOKIE_FILLING          4       /* T if filling object incrementally */
+#define FSCACHE_COOKIE_UNAVAILABLE      5       /* T if cookie is unavailable (error, etc) */
+};
+
+extern struct fscache_cookie fscache_fsdef_index;
+
+/*
+ * on-disk cache file or index handle
+ */
+struct fscache_object {
+        enum fscache_object_state {
+                FSCACHE_OBJECT_INIT,            /* object in initial unbound state */
+                FSCACHE_OBJECT_LOOKING_UP,      /* looking up object */
+                FSCACHE_OBJECT_CREATING,        /* creating object */
+
+                /* active states */
+                FSCACHE_OBJECT_AVAILABLE,       /* cleaning up object after creation */
+                FSCACHE_OBJECT_ACTIVE,          /* object is usable */
+                FSCACHE_OBJECT_UPDATING,        /* object is updating */
+
+                /* terminal states */
+                FSCACHE_OBJECT_DYING,           /* object waiting for accessors to finish */
+                FSCACHE_OBJECT_LC_DYING,        /* object cleaning up after lookup/create */
+                FSCACHE_OBJECT_ABORT_INIT,      /* abort the init state */
+                FSCACHE_OBJECT_RELEASING,       /* releasing object */
+                FSCACHE_OBJECT_RECYCLING,       /* retiring object */
+                FSCACHE_OBJECT_WITHDRAWING,     /* withdrawing object */
+                FSCACHE_OBJECT_DEAD,            /* object is now dead */
+        } state;
+
+        int                     debug_id;       /* debugging ID */
+        int                     n_children;     /* number of child objects */
+        int                     n_ops;          /* number of ops outstanding on object */
+        int                     n_obj_ops;      /* number of object ops outstanding on object */
+        int                     n_in_progress;  /* number of ops in progress */
+        int                     n_exclusive;    /* number of exclusive ops queued */
+        spinlock_t              lock;           /* state and operations lock */
+
+        unsigned long           lookup_jif;     /* time at which lookup started */
+        unsigned long           event_mask;     /* events this object is interested in */
+        unsigned long           events;         /* events to be processed by this object
+                                                 * (order is important - using fls) */
+#define FSCACHE_OBJECT_EV_REQUEUE       0       /* T if object should be requeued */
+#define FSCACHE_OBJECT_EV_UPDATE        1       /* T if object should be updated */
+#define FSCACHE_OBJECT_EV_CLEARED       2       /* T if accessors all gone */
+#define FSCACHE_OBJECT_EV_ERROR         3       /* T if fatal error occurred during processing */
+#define FSCACHE_OBJECT_EV_RELEASE       4       /* T if netfs requested object release */
+#define FSCACHE_OBJECT_EV_RETIRE        5       /* T if netfs requested object retirement */
+#define FSCACHE_OBJECT_EV_WITHDRAW      6       /* T if cache requested object withdrawal */
+
+        unsigned long           flags;
+#define FSCACHE_OBJECT_LOCK             0       /* T if object is busy being processed */
+#define FSCACHE_OBJECT_PENDING_WRITE    1       /* T if object has pending write */
+#define FSCACHE_OBJECT_WAITING          2       /* T if object is waiting on its parent */
+
+        struct list_head        cache_link;     /* link in cache->object_list */
+        struct hlist_node       cookie_link;    /* link in cookie->backing_objects */
+        struct fscache_cache    *cache;         /* cache that supplied this object */
+        struct fscache_cookie   *cookie;        /* netfs's file/index object */
+        struct fscache_object   *parent;        /* parent object */
+        struct slow_work        work;           /* attention scheduling record */
+        struct list_head        dependents;     /* FIFO of dependent objects */
+        struct list_head        dep_link;       /* link in parent's dependents list */
+        struct list_head        pending_ops;    /* unstarted operations on this object */
+        pgoff_t                 store_limit;    /* current storage limit */
+};
+
+extern const char *fscache_object_states[];
+
+#define fscache_object_is_active(obj)                         \
+        (!test_bit(FSCACHE_IOERROR, &(obj)->cache->flags) &&  \
+         (obj)->state >= FSCACHE_OBJECT_AVAILABLE &&          \
+         (obj)->state < FSCACHE_OBJECT_DYING)
+
+extern const struct slow_work_ops fscache_object_slow_work_ops;
+
+/**
+ * fscache_object_init - Initialise a cache object description
+ * @object: Object description
+ *
+ * Initialise a cache object description to its basic values.
+ *
+ * See Documentation/filesystems/caching/backend-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_object_init(struct fscache_object *object,
+                         struct fscache_cookie *cookie,
+                         struct fscache_cache *cache)
+{
+        atomic_inc(&cache->object_count);
+
+        object->state = FSCACHE_OBJECT_INIT;
+        spin_lock_init(&object->lock);
+        INIT_LIST_HEAD(&object->cache_link);
+        INIT_HLIST_NODE(&object->cookie_link);
+        vslow_work_init(&object->work, &fscache_object_slow_work_ops);
+        INIT_LIST_HEAD(&object->dependents);
+        INIT_LIST_HEAD(&object->dep_link);
+        INIT_LIST_HEAD(&object->pending_ops);
+        object->n_children = 0;
+        object->n_ops = object->n_in_progress = object->n_exclusive = 0;
+        object->events = object->event_mask = 0;
+        object->flags = 0;
+        object->store_limit = 0;
+        object->cache = cache;
+        object->cookie = cookie;
+        object->parent = NULL;
+}
+
+extern void fscache_object_lookup_negative(struct fscache_object *object);
+extern void fscache_obtained_object(struct fscache_object *object);
+
+/**
+ * fscache_object_destroyed - Note destruction of an object in a cache
+ * @cache: The cache from which the object came
+ *
+ * Note the destruction and deallocation of an object record in a cache.
+ */
+static inline void fscache_object_destroyed(struct fscache_cache *cache)
+{
+        if (atomic_dec_and_test(&cache->object_count))
+                wake_up_all(&fscache_cache_cleared_wq);
+}
+
+/**
+ * fscache_object_lookup_error - Note an object encountered an error
+ * @object: The object on which the error was encountered
+ *
+ * Note that an object encountered a fatal error (usually an I/O error) and
+ * that it should be withdrawn as soon as possible.
+ */
+static inline void fscache_object_lookup_error(struct fscache_object *object)
+{
+        set_bit(FSCACHE_OBJECT_EV_ERROR, &object->events);
+}
+
+/**
+ * fscache_set_store_limit - Set the maximum size to be stored in an object
+ * @object: The object to set the maximum on
+ * @i_size: The limit to set in bytes
+ *
+ * Set the maximum size an object is permitted to reach, implying the highest
+ * byte that may be written.  Intended to be called by the attr_changed() op.
+ *
+ * See Documentation/filesystems/caching/backend-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_set_store_limit(struct fscache_object *object, loff_t i_size)
+{
+        object->store_limit = i_size >> PAGE_SHIFT;
+        if (i_size & ~PAGE_MASK)
+                object->store_limit++;
+}
+
+/**
+ * fscache_end_io - End a retrieval operation on a page
+ * @op: The FS-Cache operation covering the retrieval
+ * @page: The page that was to be fetched
+ * @error: The error code (0 if successful)
+ *
+ * Note the end of an operation to retrieve a page, as covered by a particular
+ * operation record.
+ */
+static inline void fscache_end_io(struct fscache_retrieval *op,
+                                  struct page *page, int error)
+{
+        op->end_io_func(page, op->context, error);
+}
+
+/*
+ * out-of-line cache backend functions
+ */
+extern void fscache_init_cache(struct fscache_cache *cache,
+                               const struct fscache_cache_ops *ops,
+                               const char *idfmt,
+                               ...) __attribute__ ((format (printf, 3, 4)));
+
+extern int fscache_add_cache(struct fscache_cache *cache,
+                             struct fscache_object *fsdef,
+                             const char *tagname);
+extern void fscache_withdraw_cache(struct fscache_cache *cache);
+
+extern void fscache_io_error(struct fscache_cache *cache);
+
+extern void fscache_mark_pages_cached(struct fscache_retrieval *op,
+                                      struct pagevec *pagevec);
+
+extern enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+                                               const void *data,
+                                               uint16_t datalen);
+
+#endif /* _LINUX_FSCACHE_CACHE_H */
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
new file mode 100644
index 000000000000..6d8ee466e0a0
--- /dev/null
+++ b/include/linux/fscache.h
@@ -0,0 +1,618 @@
+/* General filesystem caching interface
+ *
+ * Copyright (C) 2004-2007 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.
+ *
+ * NOTE!!! See:
+ *
+ *      Documentation/filesystems/caching/netfs-api.txt
+ *
+ * for a description of the network filesystem interface declared here.
+ */
+
+#ifndef _LINUX_FSCACHE_H
+#define _LINUX_FSCACHE_H
+
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <linux/pagemap.h>
+#include <linux/pagevec.h>
+
+#if defined(CONFIG_FSCACHE) || defined(CONFIG_FSCACHE_MODULE)
+#define fscache_available() (1)
+#define fscache_cookie_valid(cookie) (cookie)
+#else
+#define fscache_available() (0)
+#define fscache_cookie_valid(cookie) (0)
+#endif
+
+
+/*
+ * overload PG_private_2 to give us PG_fscache - this is used to indicate that
+ * a page is currently backed by a local disk cache
+ */
+#define PageFsCache(page)               PagePrivate2((page))
+#define SetPageFsCache(page)            SetPagePrivate2((page))
+#define ClearPageFsCache(page)          ClearPagePrivate2((page))
+#define TestSetPageFsCache(page)        TestSetPagePrivate2((page))
+#define TestClearPageFsCache(page)      TestClearPagePrivate2((page))
+
+/* pattern used to fill dead space in an index entry */
+#define FSCACHE_INDEX_DEADFILL_PATTERN 0x79
+
+struct pagevec;
+struct fscache_cache_tag;
+struct fscache_cookie;
+struct fscache_netfs;
+
+typedef void (*fscache_rw_complete_t)(struct page *page,
+                                      void *context,
+                                      int error);
+
+/* result of index entry consultation */
+enum fscache_checkaux {
+        FSCACHE_CHECKAUX_OKAY,          /* entry okay as is */
+        FSCACHE_CHECKAUX_NEEDS_UPDATE,  /* entry requires update */
+        FSCACHE_CHECKAUX_OBSOLETE,      /* entry requires deletion */
+};
+
+/*
+ * fscache cookie definition
+ */
+struct fscache_cookie_def {
+        /* name of cookie type */
+        char name[16];
+
+        /* cookie type */
+        uint8_t type;
+#define FSCACHE_COOKIE_TYPE_INDEX       0
+#define FSCACHE_COOKIE_TYPE_DATAFILE    1
+
+        /* select the cache into which to insert an entry in this index
+         * - optional
+         * - should return a cache identifier or NULL to cause the cache to be
+         *   inherited from the parent if possible or the first cache picked
+         *   for a non-index file if not
+         */
+        struct fscache_cache_tag *(*select_cache)(
+                const void *parent_netfs_data,
+                const void *cookie_netfs_data);
+
+        /* get an index key
+         * - should store the key data in the buffer
+         * - should return the amount of amount stored
+         * - not permitted to return an error
+         * - the netfs data from the cookie being used as the source is
+         *   presented
+         */
+        uint16_t (*get_key)(const void *cookie_netfs_data,
+                            void *buffer,
+                            uint16_t bufmax);
+
+        /* get certain file attributes from the netfs data
+         * - this function can be absent for an index
+         * - not permitted to return an error
+         * - the netfs data from the cookie being used as the source is
+         *   presented
+         */
+        void (*get_attr)(const void *cookie_netfs_data, uint64_t *size);
+
+        /* get the auxilliary data from netfs data
+         * - this function can be absent if the index carries no state data
+         * - should store the auxilliary data in the buffer
+         * - should return the amount of amount stored
+         * - not permitted to return an error
+         * - the netfs data from the cookie being used as the source is
+         *   presented
+         */
+        uint16_t (*get_aux)(const void *cookie_netfs_data,
+                            void *buffer,
+                            uint16_t bufmax);
+
+        /* consult the netfs about the state of an object
+         * - this function can be absent if the index carries no state data
+         * - the netfs data from the cookie being used as the target is
+         *   presented, as is the auxilliary data
+         */
+        enum fscache_checkaux (*check_aux)(void *cookie_netfs_data,
+                                           const void *data,
+                                           uint16_t datalen);
+
+        /* get an extra reference on a read context
+         * - this function can be absent if the completion function doesn't
+         *   require a context
+         */
+        void (*get_context)(void *cookie_netfs_data, void *context);
+
+        /* release an extra reference on a read context
+         * - this function can be absent if the completion function doesn't
+         *   require a context
+         */
+        void (*put_context)(void *cookie_netfs_data, void *context);
+
+        /* indicate pages that now have cache metadata retained
+         * - this function should mark the specified pages as now being cached
+         * - the pages will have been marked with PG_fscache before this is
+         *   called, so this is optional
+         */
+        void (*mark_pages_cached)(void *cookie_netfs_data,
+                                  struct address_space *mapping,
+                                  struct pagevec *cached_pvec);
+
+        /* indicate the cookie is no longer cached
+         * - this function is called when the backing store currently caching
+         *   a cookie is removed
+         * - the netfs should use this to clean up any markers indicating
+         *   cached pages
+         * - this is mandatory for any object that may have data
+         */
+        void (*now_uncached)(void *cookie_netfs_data);
+};
+
+/*
+ * fscache cached network filesystem type
+ * - name, version and ops must be filled in before registration
+ * - all other fields will be set during registration
+ */
+struct fscache_netfs {
+        uint32_t                        version;        /* indexing version */
+        const char                      *name;          /* filesystem name */
+        struct fscache_cookie           *primary_index;
+        struct list_head                link;           /* internal link */
+};
+
+/*
+ * slow-path functions for when there is actually caching available, and the
+ * netfs does actually have a valid token
+ * - these are not to be called directly
+ * - these are undefined symbols when FS-Cache is not configured and the
+ *   optimiser takes care of not using them
+ */
+extern int __fscache_register_netfs(struct fscache_netfs *);
+extern void __fscache_unregister_netfs(struct fscache_netfs *);
+extern struct fscache_cache_tag *__fscache_lookup_cache_tag(const char *);
+extern void __fscache_release_cache_tag(struct fscache_cache_tag *);
+
+extern struct fscache_cookie *__fscache_acquire_cookie(
+        struct fscache_cookie *,
+        const struct fscache_cookie_def *,
+        void *);
+extern void __fscache_relinquish_cookie(struct fscache_cookie *, int);
+extern void __fscache_update_cookie(struct fscache_cookie *);
+extern int __fscache_attr_changed(struct fscache_cookie *);
+extern int __fscache_read_or_alloc_page(struct fscache_cookie *,
+                                        struct page *,
+                                        fscache_rw_complete_t,
+                                        void *,
+                                        gfp_t);
+extern int __fscache_read_or_alloc_pages(struct fscache_cookie *,
+                                         struct address_space *,
+                                         struct list_head *,
+                                         unsigned *,
+                                         fscache_rw_complete_t,
+                                         void *,
+                                         gfp_t);
+extern int __fscache_alloc_page(struct fscache_cookie *, struct page *, gfp_t);
+extern int __fscache_write_page(struct fscache_cookie *, struct page *, gfp_t);
+extern void __fscache_uncache_page(struct fscache_cookie *, struct page *);
+extern bool __fscache_check_page_write(struct fscache_cookie *, struct page *);
+extern void __fscache_wait_on_page_write(struct fscache_cookie *, struct page *);
+
+/**
+ * fscache_register_netfs - Register a filesystem as desiring caching services
+ * @netfs: The description of the filesystem
+ *
+ * Register a filesystem as desiring caching services if they're available.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_register_netfs(struct fscache_netfs *netfs)
+{
+        if (fscache_available())
+                return __fscache_register_netfs(netfs);
+        else
+                return 0;
+}
+
+/**
+ * fscache_unregister_netfs - Indicate that a filesystem no longer desires
+ * caching services
+ * @netfs: The description of the filesystem
+ *
+ * Indicate that a filesystem no longer desires caching services for the
+ * moment.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_unregister_netfs(struct fscache_netfs *netfs)
+{
+        if (fscache_available())
+                __fscache_unregister_netfs(netfs);
+}
+
+/**
+ * fscache_lookup_cache_tag - Look up a cache tag
+ * @name: The name of the tag to search for
+ *
+ * Acquire a specific cache referral tag that can be used to select a specific
+ * cache in which to cache an index.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+struct fscache_cache_tag *fscache_lookup_cache_tag(const char *name)
+{
+        if (fscache_available())
+                return __fscache_lookup_cache_tag(name);
+        else
+                return NULL;
+}
+
+/**
+ * fscache_release_cache_tag - Release a cache tag
+ * @tag: The tag to release
+ *
+ * Release a reference to a cache referral tag previously looked up.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_release_cache_tag(struct fscache_cache_tag *tag)
+{
+        if (fscache_available())
+                __fscache_release_cache_tag(tag);
+}
+
+/**
+ * fscache_acquire_cookie - Acquire a cookie to represent a cache object
+ * @parent: The cookie that's to be the parent of this one
+ * @def: A description of the cache object, including callback operations
+ * @netfs_data: An arbitrary piece of data to be kept in the cookie to
+ * represent the cache object to the netfs
+ *
+ * This function is used to inform FS-Cache about part of an index hierarchy
+ * that can be used to locate files.  This is done by requesting a cookie for
+ * each index in the path to the file.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+struct fscache_cookie *fscache_acquire_cookie(
+        struct fscache_cookie *parent,
+        const struct fscache_cookie_def *def,
+        void *netfs_data)
+{
+        if (fscache_cookie_valid(parent))
+                return __fscache_acquire_cookie(parent, def, netfs_data);
+        else
+                return NULL;
+}
+
+/**
+ * fscache_relinquish_cookie - Return the cookie to the cache, maybe discarding
+ * it
+ * @cookie: The cookie being returned
+ * @retire: True if the cache object the cookie represents is to be discarded
+ *
+ * This function returns a cookie to the cache, forcibly discarding the
+ * associated cache object if retire is set to true.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+{
+        if (fscache_cookie_valid(cookie))
+                __fscache_relinquish_cookie(cookie, retire);
+}
+
+/**
+ * fscache_update_cookie - Request that a cache object be updated
+ * @cookie: The cookie representing the cache object
+ *
+ * Request an update of the index data for the cache object associated with the
+ * cookie.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_update_cookie(struct fscache_cookie *cookie)
+{
+        if (fscache_cookie_valid(cookie))
+                __fscache_update_cookie(cookie);
+}
+
+/**
+ * fscache_pin_cookie - Pin a data-storage cache object in its cache
+ * @cookie: The cookie representing the cache object
+ *
+ * Permit data-storage cache objects to be pinned in the cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_pin_cookie(struct fscache_cookie *cookie)
+{
+        return -ENOBUFS;
+}
+
+/**
+ * fscache_pin_cookie - Unpin a data-storage cache object in its cache
+ * @cookie: The cookie representing the cache object
+ *
+ * Permit data-storage cache objects to be unpinned from the cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_unpin_cookie(struct fscache_cookie *cookie)
+{
+}
+
+/**
+ * fscache_attr_changed - Notify cache that an object's attributes changed
+ * @cookie: The cookie representing the cache object
+ *
+ * Send a notification to the cache indicating that an object's attributes have
+ * changed.  This includes the data size.  These attributes will be obtained
+ * through the get_attr() cookie definition op.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_attr_changed(struct fscache_cookie *cookie)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_attr_changed(cookie);
+        else
+                return -ENOBUFS;
+}
+
+/**
+ * fscache_reserve_space - Reserve data space for a cached object
+ * @cookie: The cookie representing the cache object
+ * @i_size: The amount of space to be reserved
+ *
+ * Reserve an amount of space in the cache for the cache object attached to a
+ * cookie so that a write to that object within the space can always be
+ * honoured.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_reserve_space(struct fscache_cookie *cookie, loff_t size)
+{
+        return -ENOBUFS;
+}
+
+/**
+ * fscache_read_or_alloc_page - Read a page from the cache or allocate a block
+ * in which to store it
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page to fill if possible
+ * @end_io_func: The callback to invoke when and if the page is filled
+ * @context: An arbitrary piece of data to pass on to end_io_func()
+ * @gfp: The conditions under which memory allocation should be made
+ *
+ * Read a page from the cache, or if that's not possible make a potential
+ * one-block reservation in the cache into which the page may be stored once
+ * fetched from the server.
+ *
+ * If the page is not backed by the cache object, or if it there's some reason
+ * it can't be, -ENOBUFS will be returned and nothing more will be done for
+ * that page.
+ *
+ * Else, if that page is backed by the cache, a read will be initiated directly
+ * to the netfs's page and 0 will be returned by this function.  The
+ * end_io_func() callback will be invoked when the operation terminates on a
+ * completion or failure.  Note that the callback may be invoked before the
+ * return.
+ *
+ * Else, if the page is unbacked, -ENODATA is returned and a block may have
+ * been allocated in the cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+                               struct page *page,
+                               fscache_rw_complete_t end_io_func,
+                               void *context,
+                               gfp_t gfp)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_read_or_alloc_page(cookie, page, end_io_func,
+                                                    context, gfp);
+        else
+                return -ENOBUFS;
+}
+
+/**
+ * fscache_read_or_alloc_pages - Read pages from the cache and/or allocate
+ * blocks in which to store them
+ * @cookie: The cookie representing the cache object
+ * @mapping: The netfs inode mapping to which the pages will be attached
+ * @pages: A list of potential netfs pages to be filled
+ * @end_io_func: The callback to invoke when and if each page is filled
+ * @context: An arbitrary piece of data to pass on to end_io_func()
+ * @gfp: The conditions under which memory allocation should be made
+ *
+ * Read a set of pages from the cache, or if that's not possible, attempt to
+ * make a potential one-block reservation for each page in the cache into which
+ * that page may be stored once fetched from the server.
+ *
+ * If some pages are not backed by the cache object, or if it there's some
+ * reason they can't be, -ENOBUFS will be returned and nothing more will be
+ * done for that pages.
+ *
+ * Else, if some of the pages are backed by the cache, a read will be initiated
+ * directly to the netfs's page and 0 will be returned by this function.  The
+ * end_io_func() callback will be invoked when the operation terminates on a
+ * completion or failure.  Note that the callback may be invoked before the
+ * return.
+ *
+ * Else, if a page is unbacked, -ENODATA is returned and a block may have
+ * been allocated in the cache.
+ *
+ * Because the function may want to return all of -ENOBUFS, -ENODATA and 0 in
+ * regard to different pages, the return values are prioritised in that order.
+ * Any pages submitted for reading are removed from the pages list.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+                                struct address_space *mapping,
+                                struct list_head *pages,
+                                unsigned *nr_pages,
+                                fscache_rw_complete_t end_io_func,
+                                void *context,
+                                gfp_t gfp)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_read_or_alloc_pages(cookie, mapping, pages,
+                                                     nr_pages, end_io_func,
+                                                     context, gfp);
+        else
+                return -ENOBUFS;
+}
+
+/**
+ * fscache_alloc_page - Allocate a block in which to store a page
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page to allocate a page for
+ * @gfp: The conditions under which memory allocation should be made
+ *
+ * Request Allocation a block in the cache in which to store a netfs page
+ * without retrieving any contents from the cache.
+ *
+ * If the page is not backed by a file then -ENOBUFS will be returned and
+ * nothing more will be done, and no reservation will be made.
+ *
+ * Else, a block will be allocated if one wasn't already, and 0 will be
+ * returned
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_alloc_page(struct fscache_cookie *cookie,
+                       struct page *page,
+                       gfp_t gfp)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_alloc_page(cookie, page, gfp);
+        else
+                return -ENOBUFS;
+}
+
+/**
+ * fscache_write_page - Request storage of a page in the cache
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page to store
+ * @gfp: The conditions under which memory allocation should be made
+ *
+ * Request the contents of the netfs page be written into the cache.  This
+ * request may be ignored if no cache block is currently allocated, in which
+ * case it will return -ENOBUFS.
+ *
+ * If a cache block was already allocated, a write will be initiated and 0 will
+ * be returned.  The PG_fscache_write page bit is set immediately and will then
+ * be cleared at the completion of the write to indicate the success or failure
+ * of the operation.  Note that the completion may happen before the return.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+int fscache_write_page(struct fscache_cookie *cookie,
+                       struct page *page,
+                       gfp_t gfp)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_write_page(cookie, page, gfp);
+        else
+                return -ENOBUFS;
+}
+
+/**
+ * fscache_uncache_page - Indicate that caching is no longer required on a page
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page that was being cached.
+ *
+ * Tell the cache that we no longer want a page to be cached and that it should
+ * remove any knowledge of the netfs page it may have.
+ *
+ * Note that this cannot cancel any outstanding I/O operations between this
+ * page and the cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_uncache_page(struct fscache_cookie *cookie,
+                          struct page *page)
+{
+        if (fscache_cookie_valid(cookie))
+                __fscache_uncache_page(cookie, page);
+}
+
+/**
+ * fscache_check_page_write - Ask if a page is being writing to the cache
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page that is being cached.
+ *
+ * Ask the cache if a page is being written to the cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+bool fscache_check_page_write(struct fscache_cookie *cookie,
+                              struct page *page)
+{
+        if (fscache_cookie_valid(cookie))
+                return __fscache_check_page_write(cookie, page);
+        return false;
+}
+
+/**
+ * fscache_wait_on_page_write - Wait for a page to complete writing to the cache
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page that is being cached.
+ *
+ * Ask the cache to wake us up when a page is no longer being written to the
+ * cache.
+ *
+ * See Documentation/filesystems/caching/netfs-api.txt for a complete
+ * description.
+ */
+static inline
+void fscache_wait_on_page_write(struct fscache_cookie *cookie,
+                                struct page *page)
+{
+        if (fscache_cookie_valid(cookie))
+                __fscache_wait_on_page_write(cookie, page);
+}
+
+#endif /* _LINUX_FSCACHE_H */
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index d9051d717d27..244677cc082b 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -18,7 +18,6 @@
 #define _FSL_DEVICE_H_
 
 #include <linux/types.h>
-#include <linux/phy.h>
 
 /*
  * Some conventions on how we handle peripherals on Freescale chips
@@ -44,31 +43,6 @@
  *
  */
 
-struct gianfar_platform_data {
-        /* device specific information */
-        u32     device_flags;
-        char    bus_id[BUS_ID_SIZE];
-        phy_interface_t interface;
-};
-
-struct gianfar_mdio_data {
-        /* board specific information */
-        int     irq[32];
-};
-
-/* Flags in gianfar_platform_data */
-#define FSL_GIANFAR_BRD_HAS_PHY_INTR    0x00000001 /* set or use a timer */
-#define FSL_GIANFAR_BRD_IS_REDUCED      0x00000002 /* Set if RGMII, RMII */
-
-struct fsl_i2c_platform_data {
-        /* device specific information */
-        u32     device_flags;
-};
-
-/* Flags related to I2C device features */
-#define FSL_I2C_DEV_SEPARATE_DFSRR      0x00000001
-#define FSL_I2C_DEV_CLOCK_5200          0x00000002
-
 enum fsl_usb2_operating_modes {
         FSL_USB2_MPH_HOST,
         FSL_USB2_DR_HOST,
@@ -95,15 +69,20 @@ struct fsl_usb2_platform_data {
 #define FSL_USB2_PORT0_ENABLED  0x00000001
 #define FSL_USB2_PORT1_ENABLED  0x00000002
 
+struct spi_device;
+
 struct fsl_spi_platform_data {
         u32     initial_spmode; /* initial SPMODE value */
-        u16     bus_num;
+        s16     bus_num;
         bool    qe_mode;
         /* board specific information */
         u16     max_chipselect;
+        void    (*cs_control)(struct spi_device *spi, bool on);
+        u32     sysclk;
+
+        /* Legacy hooks, used by mpc52xx_psc_spi driver. */
         void    (*activate_cs)(u8 cs, u8 polarity);
         void    (*deactivate_cs)(u8 cs, u8 polarity);
-        u32     sysclk;
 };
 
 struct mpc8xx_pcmcia_ops {
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 677432b9cb7e..8a0c2f221e6b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -1,15 +1,18 @@
 #ifndef _LINUX_FTRACE_H
 #define _LINUX_FTRACE_H
 
-#include <linux/linkage.h>
-#include <linux/fs.h>
-#include <linux/ktime.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/module.h>
+#include <linux/trace_clock.h>
 #include <linux/kallsyms.h>
+#include <linux/linkage.h>
 #include <linux/bitops.h>
+#include <linux/module.h>
+#include <linux/ktime.h>
 #include <linux/sched.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+
+#include <asm/ftrace.h>
 
 #ifdef CONFIG_FUNCTION_TRACER
 
@@ -95,9 +98,41 @@ stack_trace_sysctl(struct ctl_table *table, int write,
                    loff_t *ppos);
 #endif
 
+struct ftrace_func_command {
+        struct list_head        list;
+        char                    *name;
+        int                     (*func)(char *func, char *cmd,
+                                        char *params, int enable);
+};
+
 #ifdef CONFIG_DYNAMIC_FTRACE
-/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
-#include <asm/ftrace.h>
+
+int ftrace_arch_code_modify_prepare(void);
+int ftrace_arch_code_modify_post_process(void);
+
+struct seq_file;
+
+struct ftrace_probe_ops {
+        void                    (*func)(unsigned long ip,
+                                        unsigned long parent_ip,
+                                        void **data);
+        int                     (*callback)(unsigned long ip, void **data);
+        void                    (*free)(void **data);
+        int                     (*print)(struct seq_file *m,
+                                         unsigned long ip,
+                                         struct ftrace_probe_ops *ops,
+                                         void *data);
+};
+
+extern int
+register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
+                              void *data);
+extern void
+unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
+                                void *data);
+extern void
+unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops);
+extern void unregister_ftrace_function_probe_all(char *glob);
 
 enum {
         FTRACE_FL_FREE          = (1 << 0),
@@ -110,15 +145,23 @@ enum {
 };
 
 struct dyn_ftrace {
-        struct list_head        list;
-        unsigned long           ip; /* address of mcount call-site */
-        unsigned long           flags;
-        struct dyn_arch_ftrace  arch;
+        union {
+                unsigned long           ip; /* address of mcount call-site */
+                struct dyn_ftrace       *freelist;
+        };
+        union {
+                unsigned long           flags;
+                struct dyn_ftrace       *newlist;
+        };
+        struct dyn_arch_ftrace          arch;
 };
 
 int ftrace_force_update(void);
 void ftrace_set_filter(unsigned char *buf, int len, int reset);
 
+int register_ftrace_command(struct ftrace_func_command *cmd);
+int unregister_ftrace_command(struct ftrace_func_command *cmd);
+
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
 extern int ftrace_dyn_arch_init(void *data);
@@ -126,6 +169,10 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
+
+#ifndef FTRACE_ADDR
+#define FTRACE_ADDR ((unsigned long)ftrace_caller)
+#endif
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 extern void ftrace_graph_caller(void);
 extern int ftrace_enable_ftrace_graph_caller(void);
@@ -136,7 +183,7 @@ static inline int ftrace_disable_ftrace_graph_caller(void) { return 0; }
 #endif
 
 /**
- * ftrace_make_nop - convert code into top
+ * ftrace_make_nop - convert code into nop
  * @mod: module structure if called by module load initialization
  * @rec: the mcount call site record
  * @addr: the address that the call site should be calling
@@ -181,7 +228,6 @@ extern int ftrace_make_nop(struct module *mod,
  */
 extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr);
 
-
 /* May be defined in arch */
 extern int ftrace_arch_read_dyn_info(char *buf, int size);
 
@@ -198,6 +244,14 @@ extern void ftrace_enable_daemon(void);
 # define ftrace_disable_daemon()                do { } while (0)
 # define ftrace_enable_daemon()                 do { } while (0)
 static inline void ftrace_release(void *start, unsigned long size) { }
+static inline int register_ftrace_command(struct ftrace_func_command *cmd)
+{
+        return -EINVAL;
+}
+static inline int unregister_ftrace_command(char *cmd_name)
+{
+        return -EINVAL;
+}
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 /* totally disable ftrace - can not re-enable after this */
@@ -233,24 +287,25 @@ static inline void __ftrace_enabled_restore(int enabled)
 #endif
 }
 
-#ifdef CONFIG_FRAME_POINTER
-/* TODO: need to fix this for ARM */
-# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
-# define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
-# define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
-# define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3))
-# define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
-# define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
-# define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
-#else
-# define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
-# define CALLER_ADDR1 0UL
-# define CALLER_ADDR2 0UL
-# define CALLER_ADDR3 0UL
-# define CALLER_ADDR4 0UL
-# define CALLER_ADDR5 0UL
-# define CALLER_ADDR6 0UL
-#endif
+#ifndef HAVE_ARCH_CALLER_ADDR
+# ifdef CONFIG_FRAME_POINTER
+#  define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
+#  define CALLER_ADDR1 ((unsigned long)__builtin_return_address(1))
+#  define CALLER_ADDR2 ((unsigned long)__builtin_return_address(2))
+#  define CALLER_ADDR3 ((unsigned long)__builtin_return_address(3))
+#  define CALLER_ADDR4 ((unsigned long)__builtin_return_address(4))
+#  define CALLER_ADDR5 ((unsigned long)__builtin_return_address(5))
+#  define CALLER_ADDR6 ((unsigned long)__builtin_return_address(6))
+# else
+#  define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
+#  define CALLER_ADDR1 0UL
+#  define CALLER_ADDR2 0UL
+#  define CALLER_ADDR3 0UL
+#  define CALLER_ADDR4 0UL
+#  define CALLER_ADDR5 0UL
+#  define CALLER_ADDR6 0UL
+# endif
+#endif /* ifndef HAVE_ARCH_CALLER_ADDR */
 
 #ifdef CONFIG_IRQSOFF_TRACER
   extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
@@ -268,54 +323,6 @@ static inline void __ftrace_enabled_restore(int enabled)
 # define trace_preempt_off(a0, a1)              do { } while (0)
 #endif
 
-#ifdef CONFIG_TRACING
-extern int ftrace_dump_on_oops;
-
-extern void tracing_start(void);
-extern void tracing_stop(void);
-extern void ftrace_off_permanent(void);
-
-extern void
-ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
-
-/**
- * ftrace_printk - printf formatting in the ftrace buffer
- * @fmt: the printf format for printing
- *
- * Note: __ftrace_printk is an internal function for ftrace_printk and
- *       the @ip is passed in via the ftrace_printk macro.
- *
- * This function allows a kernel developer to debug fast path sections
- * that printk is not appropriate for. By scattering in various
- * printk like tracing in the code, a developer can quickly see
- * where problems are occurring.
- *
- * This is intended as a debugging tool for the developer only.
- * Please refrain from leaving ftrace_printks scattered around in
- * your code.
- */
-# define ftrace_printk(fmt...) __ftrace_printk(_THIS_IP_, fmt)
-extern int
-__ftrace_printk(unsigned long ip, const char *fmt, ...)
-        __attribute__ ((format (printf, 2, 3)));
-extern void ftrace_dump(void);
-#else
-static inline void
-ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
-static inline int
-ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-
-static inline void tracing_start(void) { }
-static inline void tracing_stop(void) { }
-static inline void ftrace_off_permanent(void) { }
-static inline int
-ftrace_printk(const char *fmt, ...)
-{
-        return 0;
-}
-static inline void ftrace_dump(void) { }
-#endif
-
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 extern void ftrace_init(void);
 extern void ftrace_init_module(struct module *mod,
@@ -327,36 +334,6 @@ ftrace_init_module(struct module *mod,
                    unsigned long *start, unsigned long *end) { }
 #endif
 
-enum {
-        POWER_NONE = 0,
-        POWER_CSTATE = 1,
-        POWER_PSTATE = 2,
-};
-
-struct power_trace {
-#ifdef CONFIG_POWER_TRACER
-        ktime_t                 stamp;
-        ktime_t                 end;
-        int                     type;
-        int                     state;
-#endif
-};
-
-#ifdef CONFIG_POWER_TRACER
-extern void trace_power_start(struct power_trace *it, unsigned int type,
-                                        unsigned int state);
-extern void trace_power_mark(struct power_trace *it, unsigned int type,
-                                        unsigned int state);
-extern void trace_power_end(struct power_trace *it);
-#else
-static inline void trace_power_start(struct power_trace *it, unsigned int type,
-                                        unsigned int state) { }
-static inline void trace_power_mark(struct power_trace *it, unsigned int type,
-                                        unsigned int state) { }
-static inline void trace_power_end(struct power_trace *it) { }
-#endif
-
-
 /*
  * Structure that defines an entry function trace.
  */
@@ -379,6 +356,32 @@ struct ftrace_graph_ret {
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
+/* for init task */
+#define INIT_FTRACE_GRAPH               .ret_stack = NULL,
+
+/*
+ * Stack of return addresses for functions
+ * of a thread.
+ * Used in struct thread_info
+ */
+struct ftrace_ret_stack {
+        unsigned long ret;
+        unsigned long func;
+        unsigned long long calltime;
+};
+
+/*
+ * Primary handler of a function return.
+ * It relays on ftrace_return_to_handler.
+ * Defined in entry_32/64.S
+ */
+extern void return_to_handler(void);
+
+extern int
+ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth);
+extern void
+ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret);
+
 /*
  * Sometimes we don't want to trace a function with the function
  * graph tracer but we want them to keep traced by the usual function
@@ -430,10 +433,11 @@ static inline void unpause_graph_tracing(void)
 {
         atomic_dec(&current->tracing_graph_pause);
 }
-#else
+#else /* !CONFIG_FUNCTION_GRAPH_TRACER */
 
 #define __notrace_funcgraph
 #define __irq_entry
+#define INIT_FTRACE_GRAPH
 
 static inline void ftrace_graph_init_task(struct task_struct *t) { }
 static inline void ftrace_graph_exit_task(struct task_struct *t) { }
@@ -445,7 +449,7 @@ static inline int task_curr_ret_stack(struct task_struct *tsk)
 
 static inline void pause_graph_tracing(void) { }
 static inline void unpause_graph_tracing(void) { }
-#endif
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
 #ifdef CONFIG_TRACING
 #include <linux/sched.h>
@@ -490,6 +494,21 @@ static inline int test_tsk_trace_graph(struct task_struct *tsk)
         return tsk->trace & TSK_TRACE_FL_GRAPH;
 }
 
+extern int ftrace_dump_on_oops;
+
 #endif /* CONFIG_TRACING */
 
+
+#ifdef CONFIG_HW_BRANCH_TRACER
+
+void trace_hw_branch(u64 from, u64 to);
+void trace_hw_branch_oops(void);
+
+#else /* CONFIG_HW_BRANCH_TRACER */
+
+static inline void trace_hw_branch(u64 from, u64 to) {}
+static inline void trace_hw_branch_oops(void) {}
+
+#endif /* CONFIG_HW_BRANCH_TRACER */
+
 #endif /* _LINUX_FTRACE_H */
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h
index 366a054d0b05..dca7bf8cffe2 100644
--- a/include/linux/ftrace_irq.h
+++ b/include/linux/ftrace_irq.h
@@ -2,7 +2,7 @@
 #define _LINUX_FTRACE_IRQ_H
 
 
-#if defined(CONFIG_DYNAMIC_FTRACE) || defined(CONFIG_FUNCTION_GRAPH_TRACER)
+#ifdef CONFIG_FTRACE_NMI_ENTER
 extern void ftrace_nmi_enter(void);
 extern void ftrace_nmi_exit(void);
 #else
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h
index 13f4e74609ac..0ffa41df0ee8 100644
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
@@ -22,7 +22,7 @@ struct gnet_stats_basic
 {
         __u64   bytes;
         __u32   packets;
-};
+} __attribute__ ((packed));
 
 /**
  * struct gnet_stats_rate_est - rate estimator
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 16948eaecae3..a1a28caed23d 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -214,6 +214,7 @@ static inline void disk_put_part(struct hd_struct *part)
 #define DISK_PITER_REVERSE      (1 << 0) /* iterate in the reverse direction */
 #define DISK_PITER_INCL_EMPTY   (1 << 1) /* include 0-sized parts */
 #define DISK_PITER_INCL_PART0   (1 << 2) /* include partition 0 */
+#define DISK_PITER_INCL_EMPTY_PART0 (1 << 3) /* include empty partition 0 */
 
 struct disk_part_iter {
         struct gendisk          *disk;
@@ -333,11 +334,10 @@ static inline void part_dec_in_flight(struct hd_struct *part)
                 part_to_disk(part)->part0.in_flight--;
 }
 
-/* drivers/block/ll_rw_blk.c */
+/* block/blk-core.c */
 extern void part_round_stats(int cpu, struct hd_struct *part);
 
-/* drivers/block/genhd.c */
-extern int get_blkdev_list(char *, int);
+/* block/genhd.c */
 extern void add_disk(struct gendisk *disk);
 extern void del_gendisk(struct gendisk *gp);
 extern void unlink_gendisk(struct gendisk *gp);
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index dd20cd78faa8..0bbc15f54536 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -4,6 +4,7 @@
 #include <linux/mmzone.h>
 #include <linux/stddef.h>
 #include <linux/linkage.h>
+#include <linux/topology.h>
 
 struct vm_area_struct;
 
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index f83288347dda..45257475623c 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -15,55 +15,61 @@
  * - bits 0-7 are the preemption count (max preemption depth: 256)
  * - bits 8-15 are the softirq count (max # of softirqs: 256)
  *
- * The hardirq count can be overridden per architecture, the default is:
+ * The hardirq count can in theory reach the same as NR_IRQS.
+ * In reality, the number of nested IRQS is limited to the stack
+ * size as well. For archs with over 1000 IRQS it is not practical
+ * to expect that they will all nest. We give a max of 10 bits for
+ * hardirq nesting. An arch may choose to give less than 10 bits.
+ * m68k expects it to be 8.
  *
- * - bits 16-27 are the hardirq count (max # of hardirqs: 4096)
- * - ( bit 28 is the PREEMPT_ACTIVE flag. )
+ * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
+ * - bit 26 is the NMI_MASK
+ * - bit 28 is the PREEMPT_ACTIVE flag
  *
  * PREEMPT_MASK: 0x000000ff
  * SOFTIRQ_MASK: 0x0000ff00
- * HARDIRQ_MASK: 0x0fff0000
+ * HARDIRQ_MASK: 0x03ff0000
+ *     NMI_MASK: 0x04000000
  */
 #define PREEMPT_BITS    8
 #define SOFTIRQ_BITS    8
+#define NMI_BITS        1
 
-#ifndef HARDIRQ_BITS
-#define HARDIRQ_BITS    12
+#define MAX_HARDIRQ_BITS 10
 
-#ifndef MAX_HARDIRQS_PER_CPU
-#define MAX_HARDIRQS_PER_CPU NR_IRQS
+#ifndef HARDIRQ_BITS
+# define HARDIRQ_BITS   MAX_HARDIRQ_BITS
 #endif
 
-/*
- * The hardirq mask has to be large enough to have space for potentially
- * all IRQ sources in the system nesting on a single CPU.
- */
-#if (1 << HARDIRQ_BITS) < MAX_HARDIRQS_PER_CPU
-# error HARDIRQ_BITS is too low!
-#endif
+#if HARDIRQ_BITS > MAX_HARDIRQ_BITS
+#error HARDIRQ_BITS too high!
 #endif
 
 #define PREEMPT_SHIFT   0
 #define SOFTIRQ_SHIFT   (PREEMPT_SHIFT + PREEMPT_BITS)
 #define HARDIRQ_SHIFT   (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
+#define NMI_SHIFT       (HARDIRQ_SHIFT + HARDIRQ_BITS)
 
 #define __IRQ_MASK(x)   ((1UL << (x))-1)
 
 #define PREEMPT_MASK    (__IRQ_MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
 #define SOFTIRQ_MASK    (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
 #define HARDIRQ_MASK    (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
+#define NMI_MASK        (__IRQ_MASK(NMI_BITS)     << NMI_SHIFT)
 
 #define PREEMPT_OFFSET  (1UL << PREEMPT_SHIFT)
 #define SOFTIRQ_OFFSET  (1UL << SOFTIRQ_SHIFT)
 #define HARDIRQ_OFFSET  (1UL << HARDIRQ_SHIFT)
+#define NMI_OFFSET      (1UL << NMI_SHIFT)
 
-#if PREEMPT_ACTIVE < (1 << (HARDIRQ_SHIFT + HARDIRQ_BITS))
+#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
 #error PREEMPT_ACTIVE is too low!
 #endif
 
 #define hardirq_count() (preempt_count() & HARDIRQ_MASK)
 #define softirq_count() (preempt_count() & SOFTIRQ_MASK)
-#define irq_count()     (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK))
+#define irq_count()     (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
+                                 | NMI_MASK))
 
 /*
  * Are we doing bottom half or hardware interrupt processing?
@@ -73,6 +79,11 @@
 #define in_softirq()            (softirq_count())
 #define in_interrupt()          (irq_count())
 
+/*
+ * Are we in NMI context?
+ */
+#define in_nmi()        (preempt_count() & NMI_MASK)
+
 #if defined(CONFIG_PREEMPT)
 # define PREEMPT_INATOMIC_BASE kernel_locked()
 # define PREEMPT_CHECK_OFFSET 1
@@ -105,7 +116,7 @@
 # define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
 #endif
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
 extern void synchronize_irq(unsigned int irq);
 #else
 # define synchronize_irq(irq)   barrier()
@@ -164,20 +175,24 @@ extern void irq_enter(void);
  */
 extern void irq_exit(void);
 
-#define nmi_enter()                             \
-        do {                                    \
-                ftrace_nmi_enter();             \
-                lockdep_off();                  \
-                rcu_nmi_enter();                \
-                __irq_enter();                  \
+#define nmi_enter()                                             \
+        do {                                                    \
+                ftrace_nmi_enter();                             \
+                BUG_ON(in_nmi());                               \
+                add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
+                lockdep_off();                                  \
+                rcu_nmi_enter();                                \
+                trace_hardirq_enter();                          \
         } while (0)
 
-#define nmi_exit()                              \
-        do {                                    \
-                __irq_exit();                   \
-                rcu_nmi_exit();                 \
-                lockdep_on();                   \
-                ftrace_nmi_exit();              \
+#define nmi_exit()                                              \
+        do {                                                    \
+                trace_hardirq_exit();                           \
+                rcu_nmi_exit();                                 \
+                lockdep_on();                                   \
+                BUG_ON(!in_nmi());                              \
+                sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \
+                ftrace_nmi_exit();                              \
         } while (0)
 
 #endif /* LINUX_HARDIRQ_H */
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index fd47a151665e..6a6e701f1631 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -38,6 +38,7 @@ struct hdlc_proto {
         int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
         __be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);
         int (*netif_rx)(struct sk_buff *skb);
+        int (*xmit)(struct sk_buff *skb, struct net_device *dev);
         struct module *module;
         struct hdlc_proto *next; /* next protocol in the list */
 };
@@ -102,6 +103,10 @@ static __inline__ void debug_frame(const struct sk_buff *skb)
 int hdlc_open(struct net_device *dev);
 /* Must be called by hardware driver when HDLC device is being closed */
 void hdlc_close(struct net_device *dev);
+/* May be used by hardware driver */
+int hdlc_change_mtu(struct net_device *dev, int new_mtu);
+/* Must be pointed to by hw driver's dev->netdev_ops->ndo_start_xmit */
+int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
 int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
                          size_t size);
diff --git a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h
index bf6302f6b5f8..c010b4a785b8 100644
--- a/include/linux/hdlcdrv.h
+++ b/include/linux/hdlcdrv.h
@@ -215,7 +215,7 @@ struct hdlcdrv_state {
 
         struct hdlcdrv_hdlctx {
                 struct hdlcdrv_hdlcbuffer hbuf;
-                long in_hdlc_tx;
+                unsigned long in_hdlc_tx;
                 /*
                  * 0 = send flags
                  * 1 = send txtail (flags)
@@ -241,7 +241,6 @@ struct hdlcdrv_state {
         struct hdlcdrv_bitbuffer bitbuf_hdlc;
 #endif /* HDLCDRV_DEBUG */
 
-        struct net_device_stats stats;
         int ptt_keyed;
 
         /* queued skb for transmission */
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index c37e9241fae7..29ee2873f4a8 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -1,68 +1,6 @@
 #ifndef _LINUX_HDREG_H
 #define _LINUX_HDREG_H
 
-#ifdef __KERNEL__
-#include <linux/ata.h>
-
-/*
- * This file contains some defines for the AT-hd-controller.
- * Various sources.
- */
-
-/* ide.c has its own port definitions in "ide.h" */
-
-#define HD_IRQ          14
-
-/* Hd controller regs. Ref: IBM AT Bios-listing */
-#define HD_DATA         0x1f0           /* _CTL when writing */
-#define HD_ERROR        0x1f1           /* see err-bits */
-#define HD_NSECTOR      0x1f2           /* nr of sectors to read/write */
-#define HD_SECTOR       0x1f3           /* starting sector */
-#define HD_LCYL         0x1f4           /* starting cylinder */
-#define HD_HCYL         0x1f5           /* high byte of starting cyl */
-#define HD_CURRENT      0x1f6           /* 101dhhhh , d=drive, hhhh=head */
-#define HD_STATUS       0x1f7           /* see status-bits */
-#define HD_FEATURE      HD_ERROR        /* same io address, read=error, write=feature */
-#define HD_PRECOMP      HD_FEATURE      /* obsolete use of this port - predates IDE */
-#define HD_COMMAND      HD_STATUS       /* same io address, read=status, write=cmd */
-
-#define HD_CMD          0x3f6           /* used for resets */
-#define HD_ALTSTATUS    0x3f6           /* same as HD_STATUS but doesn't clear irq */
-
-/* remainder is shared between hd.c, ide.c, ide-cd.c, and the hdparm utility */
-
-/* Bits of HD_STATUS */
-#define ERR_STAT                0x01
-#define INDEX_STAT              0x02
-#define ECC_STAT                0x04    /* Corrected error */
-#define DRQ_STAT                0x08
-#define SEEK_STAT               0x10
-#define SRV_STAT                0x10
-#define WRERR_STAT              0x20
-#define READY_STAT              0x40
-#define BUSY_STAT               0x80
-
-/* Bits for HD_ERROR */
-#define MARK_ERR                0x01    /* Bad address mark */
-#define ILI_ERR                 0x01    /* Illegal Length Indication (ATAPI) */
-#define TRK0_ERR                0x02    /* couldn't find track 0 */
-#define EOM_ERR                 0x02    /* End Of Media (ATAPI) */
-#define ABRT_ERR                0x04    /* Command aborted */
-#define MCR_ERR                 0x08    /* media change request */
-#define ID_ERR                  0x10    /* ID field not found */
-#define MC_ERR                  0x20    /* media changed */
-#define ECC_ERR                 0x40    /* Uncorrectable ECC error */
-#define BBD_ERR                 0x80    /* pre-EIDE meaning:  block marked bad */
-#define ICRC_ERR                0x80    /* new meaning:  CRC error during transfer */
-#define LFS_ERR                 0xf0    /* Last Failed Sense (ATAPI) */
-
-/* Bits of HD_NSECTOR */
-#define CD                      0x01
-#define IO                      0x02
-#define REL                     0x04
-#define TAG_MASK                0xf8
-#endif /* __KERNEL__ */
-
 #include <linux/types.h>
 
 /*
@@ -191,6 +129,7 @@ typedef struct hd_drive_hob_hdr {
 #define TASKFILE_INVALID                0x7fff
 #endif
 
+#ifndef __KERNEL__
 /* ATA/ATAPI Commands pre T13 Spec */
 #define WIN_NOP                         0x00
 /*
@@ -379,6 +318,7 @@ typedef struct hd_drive_hob_hdr {
 #define SECURITY_ERASE_UNIT             0xBD
 #define SECURITY_FREEZE_LOCK            0xBE
 #define SECURITY_DISABLE_PASSWORD       0xBF
+#endif /* __KERNEL__ */
 
 struct hd_geometry {
       unsigned char heads;
@@ -448,6 +388,7 @@ enum {
 
 #define __NEW_HD_DRIVE_ID
 
+#ifndef __KERNEL__
 /*
  * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec.
  *
@@ -511,7 +452,6 @@ struct hd_driveid {
         unsigned short  words69_70[2];  /* reserved words 69-70
                                          * future command overlap and queuing
                                          */
-        /* HDIO_GET_IDENTITY currently returns only words 0 through 70 */
         unsigned short  words71_74[4];  /* reserved words 71-74
                                          * for IDENTIFY PACKET DEVICE command
                                          */
@@ -700,6 +640,7 @@ struct hd_driveid {
                                          *  7:0 Signature
                                          */
 };
+#endif /* __KERNEL__ */
 
 /*
  * IDE "nice" flags. These are used on a per drive basis to determine
diff --git a/include/linux/hid.h b/include/linux/hid.h
index fa8ee9cef7be..a72876e43589 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -270,6 +270,7 @@ struct hid_item {
 
 #define HID_QUIRK_INVERT                        0x00000001
 #define HID_QUIRK_NOTOUCH                       0x00000002
+#define HID_QUIRK_IGNORE                        0x00000004
 #define HID_QUIRK_NOGET                         0x00000008
 #define HID_QUIRK_BADPAD                        0x00000020
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
@@ -603,12 +604,17 @@ struct hid_ll_driver {
         int (*open)(struct hid_device *hdev);
         void (*close)(struct hid_device *hdev);
 
+        int (*power)(struct hid_device *hdev, int level);
+
         int (*hidinput_input_event) (struct input_dev *idev, unsigned int type,
                         unsigned int code, int value);
 
         int (*parse)(struct hid_device *hdev);
 };
 
+#define PM_HINT_FULLON  1<<5
+#define PM_HINT_NORMAL  1<<1
+
 /* Applications from HID Usage Tables 4/8/99 Version 1.1 */
 /* We ignore a few input applications that are not widely used */
 #define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || (a == 0x000d0002))
@@ -641,6 +647,7 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int
 void hid_output_report(struct hid_report *report, __u8 *data);
 struct hid_device *hid_allocate_device(void);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
+int hid_check_keys_pressed(struct hid_device *hid);
 int hid_connect(struct hid_device *hid, unsigned int connect_mask);
 
 /**
@@ -791,21 +798,5 @@ dbg_hid(const char *fmt, ...)
                 __FILE__ , ## arg)
 #endif /* HID_FF */
 
-#ifdef __KERNEL__
-#ifdef CONFIG_HID_COMPAT
-#define HID_COMPAT_LOAD_DRIVER(name)    \
-/* prototype to avoid sparse warning */ \
-extern void hid_compat_##name(void);    \
-void hid_compat_##name(void) { }        \
-EXPORT_SYMBOL(hid_compat_##name)
-#else
-#define HID_COMPAT_LOAD_DRIVER(name)
-#endif /* HID_COMPAT */
-#define HID_COMPAT_CALL_DRIVER(name)    do {    \
-        extern void hid_compat_##name(void);    \
-        hid_compat_##name();                    \
-} while (0)
-#endif /* __KERNEL__ */
-
 #endif
 
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 13875ce9112a..1fcb7126a01f 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -19,8 +19,21 @@ static inline void flush_kernel_dcache_page(struct page *page)
 }
 #endif
 
-#ifdef CONFIG_HIGHMEM
+#include <asm/kmap_types.h>
+
+#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT)
+
+void debug_kmap_atomic(enum km_type type);
 
+#else
+
+static inline void debug_kmap_atomic(enum km_type type)
+{
+}
+
+#endif
+
+#ifdef CONFIG_HIGHMEM
 #include <asm/highmem.h>
 
 /* declarations for linux/mm/highmem.c */
@@ -44,8 +57,6 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#include <asm/kmap_types.h>
-
 static inline void *kmap_atomic(struct page *page, enum km_type idx)
 {
         pagefault_disable();
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index bd37078c2d7d..0d2f7c8a33d6 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -336,6 +336,11 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
                          const enum hrtimer_mode mode);
 extern int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
                         unsigned long range_ns, const enum hrtimer_mode mode);
+extern int
+__hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+                         unsigned long delta_ns,
+                         const enum hrtimer_mode mode, int wakeup);
+
 extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
 
diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h
index adcb3dc7ac26..1364d62e2fbe 100644
--- a/include/linux/i2c-algo-pca.h
+++ b/include/linux/i2c-algo-pca.h
@@ -1,7 +1,14 @@
 #ifndef _LINUX_I2C_ALGO_PCA_H
 #define _LINUX_I2C_ALGO_PCA_H
 
-/* Clock speeds for the bus */
+/* Chips known to the pca algo */
+#define I2C_PCA_CHIP_9564       0x00
+#define I2C_PCA_CHIP_9665       0x01
+
+/* Internal period for PCA9665 oscilator */
+#define I2C_PCA_OSC_PER         3 /* e10-8s */
+
+/* Clock speeds for the bus for PCA9564*/
 #define I2C_PCA_CON_330kHz      0x00
 #define I2C_PCA_CON_288kHz      0x01
 #define I2C_PCA_CON_217kHz      0x02
@@ -18,6 +25,26 @@
 #define I2C_PCA_ADR             0x02 /* OWN ADR Read/Write */
 #define I2C_PCA_CON             0x03 /* CONTROL Read/Write */
 
+/* PCA9665 registers */
+#define I2C_PCA_INDPTR          0x00 /* INDIRECT Pointer Write Only */
+#define I2C_PCA_IND             0x02 /* INDIRECT Read/Write */
+
+/* PCA9665 indirect registers */
+#define I2C_PCA_ICOUNT          0x00 /* Byte Count for buffered mode */
+#define I2C_PCA_IADR            0x01 /* OWN ADR */
+#define I2C_PCA_ISCLL           0x02 /* SCL LOW period */
+#define I2C_PCA_ISCLH           0x03 /* SCL HIGH period */
+#define I2C_PCA_ITO             0x04 /* TIMEOUT */
+#define I2C_PCA_IPRESET         0x05 /* Parallel bus reset */
+#define I2C_PCA_IMODE           0x06 /* I2C Bus mode */
+
+/* PCA9665 I2C bus mode */
+#define I2C_PCA_MODE_STD        0x00 /* Standard mode */
+#define I2C_PCA_MODE_FAST       0x01 /* Fast mode */
+#define I2C_PCA_MODE_FASTP      0x02 /* Fast Plus mode */
+#define I2C_PCA_MODE_TURBO      0x03 /* Turbo mode */
+
+
 #define I2C_PCA_CON_AA          0x80 /* Assert Acknowledge */
 #define I2C_PCA_CON_ENSIO       0x40 /* Enable */
 #define I2C_PCA_CON_STA         0x20 /* Start */
@@ -31,7 +58,9 @@ struct i2c_algo_pca_data {
         int  (*read_byte)               (void *data, int reg);
         int  (*wait_for_completion)     (void *data);
         void (*reset_chip)              (void *data);
-        /* i2c_clock values are defined in linux/i2c-algo-pca.h */
+        /* For PCA9564, use one of the predefined frequencies:
+         * 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000
+         * For PCA9665, use the frequency you want here. */
         unsigned int                    i2c_clock;
 };
 
diff --git a/include/linux/i2c-algo-sgi.h b/include/linux/i2c-algo-sgi.h
deleted file mode 100644
index 3b7715024e69..000000000000
--- a/include/linux/i2c-algo-sgi.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- */
-
-#ifndef I2C_ALGO_SGI_H
-#define I2C_ALGO_SGI_H 1
-
-#include <linux/i2c.h>
-
-struct i2c_algo_sgi_data {
-        void *data;     /* private data for lowlevel routines */
-        unsigned (*getctrl)(void *data);
-        void (*setctrl)(void *data, unsigned val);
-        unsigned (*rdata)(void *data);
-        void (*wdata)(void *data, unsigned val);
-
-        int xfer_timeout;
-        int ack_timeout;
-};
-
-int i2c_sgi_add_bus(struct i2c_adapter *);
-
-#endif /* I2C_ALGO_SGI_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 1ffc23bc5d1e..c9087de5c6c6 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -33,46 +33,10 @@
 
 #define I2C_DRIVERID_MSP3400     1
 #define I2C_DRIVERID_TUNER       2
-#define I2C_DRIVERID_TEA6420     5      /* audio matrix switch          */
-#define I2C_DRIVERID_TEA6415C    6      /* video matrix switch          */
-#define I2C_DRIVERID_TDA9840     7      /* stereo sound processor       */
-#define I2C_DRIVERID_SAA7111A    8      /* video input processor        */
-#define I2C_DRIVERID_SAA7185B   13      /* video encoder                */
-#define I2C_DRIVERID_SAA7110    22      /* video decoder                */
-#define I2C_DRIVERID_SAA5249    24      /* SAA5249 and compatibles      */
 #define I2C_DRIVERID_TDA7432    27      /* Stereo sound processor       */
 #define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_TDA9875    32      /* TV sound decoder chip        */
-#define I2C_DRIVERID_BT819      40     /* video decoder                 */
-#define I2C_DRIVERID_BT856      41     /* video encoder                 */
-#define I2C_DRIVERID_VPX3220    42     /* video decoder+vbi/vtxt        */
-#define I2C_DRIVERID_ADV7175    48     /* ADV 7175/7176 video encoder   */
-#define I2C_DRIVERID_SAA7114    49      /* video decoder                */
-#define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#define I2C_DRIVERID_SAA7191    57      /* video decoder                */
-#define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
-#define I2C_DRIVERID_OVCAMCHIP  61      /* OmniVision CMOS image sens.  */
-#define I2C_DRIVERID_SAA6752HS  67      /* MPEG2 encoder                */
-#define I2C_DRIVERID_TVEEPROM   68      /* TV EEPROM                    */
-#define I2C_DRIVERID_WM8775     69      /* wm8775 audio processor       */
-#define I2C_DRIVERID_CS53L32A   70      /* cs53l32a audio processor     */
-#define I2C_DRIVERID_CX25840    71      /* cx2584x video encoder        */
-#define I2C_DRIVERID_SAA7127    72      /* saa7127 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
-#define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
-#define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
-#define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
-#define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
-#define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
-#define I2C_DRIVERID_BT866      85      /* Conexant bt866 video encoder */
-#define I2C_DRIVERID_KS0127     86      /* Samsung ks0127 video decoder */
-#define I2C_DRIVERID_TLV320AIC23B 87    /* TI TLV320AIC23B audio codec  */
-#define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
-#define I2C_DRIVERID_M52790     95      /* Mitsubishi M52790SP/FP AV switch */
-#define I2C_DRIVERID_CS5345     96      /* cs5345 audio processor       */
-
-#define I2C_DRIVERID_OV7670 1048        /* Omnivision 7670 camera */
 
 /*
  * ---- Adapter types ----------------------------------------------------
@@ -87,6 +51,8 @@
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828         0x010023 /* auvitek au0828 usb bridge */
+#define I2C_HW_B_CX231XX        0x010024 /* Conexant CX231XX USB based cards */
+#define I2C_HW_B_HDPVR          0x010025 /* Hauppauge HD PVR */
 
 /* --- SGI adapters                                                     */
 #define I2C_HW_SGI_VINO         0x160000
diff --git a/include/linux/i2c-pca-platform.h b/include/linux/i2c-pca-platform.h
index 3d191873f2d1..aba33759dec4 100644
--- a/include/linux/i2c-pca-platform.h
+++ b/include/linux/i2c-pca-platform.h
@@ -6,7 +6,7 @@ struct i2c_pca9564_pf_platform_data {
                                  * not supplied (negative value), but it
                                  * cannot exit some error conditions then */
         int i2c_clock_speed;    /* values are defined in linux/i2c-algo-pca.h */
-        int timeout;            /* timeout = this value * 10us */
+        int timeout;            /* timeout in jiffies */
 };
 
 #endif /* I2C_PCA9564_PLATFORM_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index c86c3b07604c..ad2580596033 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -274,7 +274,7 @@ struct i2c_board_info {
  * are provided using conventional syntax.
  */
 #define I2C_BOARD_INFO(dev_type, dev_addr) \
-        .type = (dev_type), .addr = (dev_addr)
+        .type = dev_type, .addr = (dev_addr)
 
 
 /* Add-on boards should register/unregister their devices; e.g. a board
@@ -353,8 +353,8 @@ struct i2c_adapter {
         void *algo_data;
 
         /* --- administration stuff. */
-        int (*client_register)(struct i2c_client *);
-        int (*client_unregister)(struct i2c_client *);
+        int (*client_register)(struct i2c_client *) __deprecated;
+        int (*client_unregister)(struct i2c_client *) __deprecated;
 
         /* data fields that are valid for all devices   */
         u8 level;                       /* nesting level for lockdep */
diff --git a/include/linux/i2c/at24.h b/include/linux/i2c/at24.h
index f6edd522a929..8ace93024d60 100644
--- a/include/linux/i2c/at24.h
+++ b/include/linux/i2c/at24.h
@@ -2,6 +2,7 @@
 #define _LINUX_AT24_H
 
 #include <linux/types.h>
+#include <linux/memory.h>
 
 /*
  * As seen through Linux I2C, differences between the most common types of I2C
@@ -23,6 +24,9 @@ struct at24_platform_data {
 #define AT24_FLAG_READONLY      0x40    /* sysfs-entry will be read-only */
 #define AT24_FLAG_IRUGO         0x20    /* sysfs-entry will be world-readable */
 #define AT24_FLAG_TAKE8ADDR     0x10    /* take always 8 addresses (24c00) */
+
+        void            (*setup)(struct memory_accessor *, void *context);
+        void            *context;
 };
 
 #endif /* _LINUX_AT24_H */
diff --git a/include/linux/i2c/s6000.h b/include/linux/i2c/s6000.h
new file mode 100644
index 000000000000..d9b34bfdae76
--- /dev/null
+++ b/include/linux/i2c/s6000.h
@@ -0,0 +1,10 @@
+#ifndef __LINUX_I2C_S6000_H
+#define __LINUX_I2C_S6000_H
+
+struct s6_i2c_platform_data {
+        const char *clock; /* the clock to use */
+        int bus_num; /* the bus number to register */
+};
+
+#endif
+
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 8137f660a5cc..0dc80ef24975 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -218,6 +218,53 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 /*----------------------------------------------------------------------*/
 
+/* Power bus message definitions */
+
+#define DEV_GRP_NULL            0x0
+#define DEV_GRP_P1              0x1
+#define DEV_GRP_P2              0x2
+#define DEV_GRP_P3              0x4
+
+#define RES_GRP_RES             0x0
+#define RES_GRP_PP              0x1
+#define RES_GRP_RC              0x2
+#define RES_GRP_PP_RC           0x3
+#define RES_GRP_PR              0x4
+#define RES_GRP_PP_PR           0x5
+#define RES_GRP_RC_PR           0x6
+#define RES_GRP_ALL             0x7
+
+#define RES_TYPE2_R0            0x0
+
+#define RES_TYPE_ALL            0x7
+
+#define RES_STATE_WRST          0xF
+#define RES_STATE_ACTIVE        0xE
+#define RES_STATE_SLEEP         0x8
+#define RES_STATE_OFF           0x0
+
+/*
+ * Power Bus Message Format ... these can be sent individually by Linux,
+ * but are usually part of downloaded scripts that are run when various
+ * power events are triggered.
+ *
+ *  Broadcast Message (16 Bits):
+ *    DEV_GRP[15:13] MT[12]  RES_GRP[11:9]  RES_TYPE2[8:7] RES_TYPE[6:4]
+ *    RES_STATE[3:0]
+ *
+ *  Singular Message (16 Bits):
+ *    DEV_GRP[15:13] MT[12]  RES_ID[11:4]  RES_STATE[3:0]
+ */
+
+#define MSG_BROADCAST(devgrp, grp, type, type2, state) \
+        ( (devgrp) << 13 | 1 << 12 | (grp) << 9 | (type2) << 7 \
+        | (type) << 4 | (state))
+
+#define MSG_SINGULAR(devgrp, id, state) \
+        ((devgrp) << 13 | 0 << 12 | (id) << 4 | (state))
+
+/*----------------------------------------------------------------------*/
+
 struct twl4030_bci_platform_data {
         int *battery_tmp_tbl;
         unsigned int tblsize;
diff --git a/include/linux/ibmtr.h b/include/linux/ibmtr.h
index 1c7a0dd5536a..06695b74d405 100644
--- a/include/linux/ibmtr.h
+++ b/include/linux/ibmtr.h
@@ -207,7 +207,7 @@ struct tok_info {
         unsigned short exsap_station_id;
         unsigned short global_int_enable;
         struct sk_buff *current_skb;
-        struct net_device_stats tr_stats;
+
         unsigned char auto_speedsave;
         open_state                      open_status, sap_status;
         enum {MANUAL, AUTOMATIC}        open_mode;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index fe235b65207e..ff65fffb078f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -26,7 +26,7 @@
 #include <asm/io.h>
 #include <asm/mutex.h>
 
-#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)
 # define SUPPORT_VLB_SYNC 0
 #else
 # define SUPPORT_VLB_SYNC 1
@@ -40,6 +40,13 @@
 #define ERROR_RESET     3       /* Reset controller every 4th retry */
 #define ERROR_RECAL     1       /* Recalibrate every 2nd retry */
 
+/* Error codes returned in rq->errors to the higher part of the driver. */
+enum {
+        IDE_DRV_ERROR_GENERAL   = 101,
+        IDE_DRV_ERROR_FILEMARK  = 102,
+        IDE_DRV_ERROR_EOD       = 103,
+};
+
 /*
  * Definitions for accessing IDE controller registers
  */
@@ -193,42 +200,8 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
         hw->io_ports.ctl_addr = ctl_addr;
 }
 
-/* for IDE PCI controllers in legacy mode, temporary */
-static inline int __ide_default_irq(unsigned long base)
-{
-        switch (base) {
-#ifdef CONFIG_IA64
-        case 0x1f0: return isa_irq_to_vector(14);
-        case 0x170: return isa_irq_to_vector(15);
-#else
-        case 0x1f0: return 14;
-        case 0x170: return 15;
-#endif
-        }
-        return 0;
-}
-
-#if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
-    defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
-    || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
-#include <asm/ide.h>
-#else
-#include <asm-generic/ide_iops.h>
-#endif
-
 #define MAX_HWIFS       10
 
-/* Currently only m68k, apus and m8xx need it */
-#ifndef IDE_ARCH_ACK_INTR
-# define ide_ack_intr(hwif) (1)
-#endif
-
-/* Currently only Atari needs it */
-#ifndef IDE_ARCH_LOCK
-# define ide_release_lock()                     do {} while (0)
-# define ide_get_lock(hdlr, data)               do {} while (0)
-#endif /* IDE_ARCH_LOCK */
-
 /*
  * Now for the data we need to maintain per-drive:  ide_drive_t
  */
@@ -267,108 +240,92 @@ typedef enum {
 } ide_startstop_t;
 
 enum {
+        IDE_VALID_ERROR                 = (1 << 1),
+        IDE_VALID_FEATURE               = IDE_VALID_ERROR,
+        IDE_VALID_NSECT                 = (1 << 2),
+        IDE_VALID_LBAL                  = (1 << 3),
+        IDE_VALID_LBAM                  = (1 << 4),
+        IDE_VALID_LBAH                  = (1 << 5),
+        IDE_VALID_DEVICE                = (1 << 6),
+        IDE_VALID_LBA                   = IDE_VALID_LBAL |
+                                          IDE_VALID_LBAM |
+                                          IDE_VALID_LBAH,
+        IDE_VALID_OUT_TF                = IDE_VALID_FEATURE |
+                                          IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+        IDE_VALID_IN_TF                 = IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+        IDE_VALID_OUT_HOB               = IDE_VALID_OUT_TF,
+        IDE_VALID_IN_HOB                = IDE_VALID_ERROR |
+                                          IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+};
+
+enum {
         IDE_TFLAG_LBA48                 = (1 << 0),
-        IDE_TFLAG_FLAGGED               = (1 << 2),
-        IDE_TFLAG_OUT_DATA              = (1 << 3),
-        IDE_TFLAG_OUT_HOB_FEATURE       = (1 << 4),
-        IDE_TFLAG_OUT_HOB_NSECT         = (1 << 5),
-        IDE_TFLAG_OUT_HOB_LBAL          = (1 << 6),
-        IDE_TFLAG_OUT_HOB_LBAM          = (1 << 7),
-        IDE_TFLAG_OUT_HOB_LBAH          = (1 << 8),
-        IDE_TFLAG_OUT_HOB               = IDE_TFLAG_OUT_HOB_FEATURE |
-                                          IDE_TFLAG_OUT_HOB_NSECT |
-                                          IDE_TFLAG_OUT_HOB_LBAL |
-                                          IDE_TFLAG_OUT_HOB_LBAM |
-                                          IDE_TFLAG_OUT_HOB_LBAH,
-        IDE_TFLAG_OUT_FEATURE           = (1 << 9),
-        IDE_TFLAG_OUT_NSECT             = (1 << 10),
-        IDE_TFLAG_OUT_LBAL              = (1 << 11),
-        IDE_TFLAG_OUT_LBAM              = (1 << 12),
-        IDE_TFLAG_OUT_LBAH              = (1 << 13),
-        IDE_TFLAG_OUT_TF                = IDE_TFLAG_OUT_FEATURE |
-                                          IDE_TFLAG_OUT_NSECT |
-                                          IDE_TFLAG_OUT_LBAL |
-                                          IDE_TFLAG_OUT_LBAM |
-                                          IDE_TFLAG_OUT_LBAH,
-        IDE_TFLAG_OUT_DEVICE            = (1 << 14),
-        IDE_TFLAG_WRITE                 = (1 << 15),
-        IDE_TFLAG_FLAGGED_SET_IN_FLAGS  = (1 << 16),
-        IDE_TFLAG_IN_DATA               = (1 << 17),
-        IDE_TFLAG_CUSTOM_HANDLER        = (1 << 18),
-        IDE_TFLAG_DMA_PIO_FALLBACK      = (1 << 19),
-        IDE_TFLAG_IN_HOB_FEATURE        = (1 << 20),
-        IDE_TFLAG_IN_HOB_NSECT          = (1 << 21),
-        IDE_TFLAG_IN_HOB_LBAL           = (1 << 22),
-        IDE_TFLAG_IN_HOB_LBAM           = (1 << 23),
-        IDE_TFLAG_IN_HOB_LBAH           = (1 << 24),
-        IDE_TFLAG_IN_HOB_LBA            = IDE_TFLAG_IN_HOB_LBAL |
-                                          IDE_TFLAG_IN_HOB_LBAM |
-                                          IDE_TFLAG_IN_HOB_LBAH,
-        IDE_TFLAG_IN_HOB                = IDE_TFLAG_IN_HOB_FEATURE |
-                                          IDE_TFLAG_IN_HOB_NSECT |
-                                          IDE_TFLAG_IN_HOB_LBA,
-        IDE_TFLAG_IN_FEATURE            = (1 << 1),
-        IDE_TFLAG_IN_NSECT              = (1 << 25),
-        IDE_TFLAG_IN_LBAL               = (1 << 26),
-        IDE_TFLAG_IN_LBAM               = (1 << 27),
-        IDE_TFLAG_IN_LBAH               = (1 << 28),
-        IDE_TFLAG_IN_LBA                = IDE_TFLAG_IN_LBAL |
-                                          IDE_TFLAG_IN_LBAM |
-                                          IDE_TFLAG_IN_LBAH,
-        IDE_TFLAG_IN_TF                 = IDE_TFLAG_IN_NSECT |
-                                          IDE_TFLAG_IN_LBA,
-        IDE_TFLAG_IN_DEVICE             = (1 << 29),
-        IDE_TFLAG_HOB                   = IDE_TFLAG_OUT_HOB |
-                                          IDE_TFLAG_IN_HOB,
-        IDE_TFLAG_TF                    = IDE_TFLAG_OUT_TF |
-                                          IDE_TFLAG_IN_TF,
-        IDE_TFLAG_DEVICE                = IDE_TFLAG_OUT_DEVICE |
-                                          IDE_TFLAG_IN_DEVICE,
+        IDE_TFLAG_WRITE                 = (1 << 1),
+        IDE_TFLAG_CUSTOM_HANDLER        = (1 << 2),
+        IDE_TFLAG_DMA_PIO_FALLBACK      = (1 << 3),
         /* force 16-bit I/O operations */
-        IDE_TFLAG_IO_16BIT              = (1 << 30),
-        /* ide_task_t was allocated using kmalloc() */
-        IDE_TFLAG_DYN                   = (1 << 31),
+        IDE_TFLAG_IO_16BIT              = (1 << 4),
+        /* struct ide_cmd was allocated using kmalloc() */
+        IDE_TFLAG_DYN                   = (1 << 5),
+        IDE_TFLAG_FS                    = (1 << 6),
+        IDE_TFLAG_MULTI_PIO             = (1 << 7),
 };
 
-struct ide_taskfile {
-        u8      hob_data;       /*  0: high data byte (for TASKFILE IOCTL) */
+enum {
+        IDE_FTFLAG_FLAGGED              = (1 << 0),
+        IDE_FTFLAG_SET_IN_FLAGS         = (1 << 1),
+        IDE_FTFLAG_OUT_DATA             = (1 << 2),
+        IDE_FTFLAG_IN_DATA              = (1 << 3),
+};
 
-        u8      hob_feature;    /*  1-5: additional data to support LBA48 */
-        u8      hob_nsect;
-        u8      hob_lbal;
-        u8      hob_lbam;
-        u8      hob_lbah;
+struct ide_taskfile {
+        u8      data;           /* 0: data byte (for TASKFILE ioctl) */
+        union {                 /* 1: */
+                u8 error;       /*  read: error */
+                u8 feature;     /* write: feature */
+        };
+        u8      nsect;          /* 2: number of sectors */
+        u8      lbal;           /* 3: LBA low */
+        u8      lbam;           /* 4: LBA mid */
+        u8      lbah;           /* 5: LBA high */
+        u8      device;         /* 6: device select */
+        union {                 /* 7: */
+                u8 status;      /*  read: status */
+                u8 command;     /* write: command */
+        };
+};
 
-        u8      data;           /*  6: low data byte (for TASKFILE IOCTL) */
+struct ide_cmd {
+        struct ide_taskfile     tf;
+        struct ide_taskfile     hob;
+        struct {
+                struct {
+                        u8              tf;
+                        u8              hob;
+                } out, in;
+        } valid;
 
-        union {                 /*  7: */
-                u8 error;       /*   read:  error */
-                u8 feature;     /*  write: feature */
-        };
+        u8                      tf_flags;
+        u8                      ftf_flags;      /* for TASKFILE ioctl */
+        int                     protocol;
 
-        u8      nsect;          /*  8: number of sectors */
-        u8      lbal;           /*  9: LBA low */
-        u8      lbam;           /* 10: LBA mid */
-        u8      lbah;           /* 11: LBA high */
+        int                     sg_nents;         /* number of sg entries */
+        int                     orig_sg_nents;
+        int                     sg_dma_direction; /* DMA transfer direction */
 
-        u8      device;         /* 12: device select */
+        unsigned int            nbytes;
+        unsigned int            nleft;
+        unsigned int            last_xfer_len;
 
-        union {                 /* 13: */
-                u8 status;      /*  read: status  */
-                u8 command;     /* write: command */
-        };
-};
+        struct scatterlist      *cursg;
+        unsigned int            cursg_ofs;
 
-typedef struct ide_task_s {
-        union {
-                struct ide_taskfile     tf;
-                u8                      tf_array[14];
-        };
-        u32                     tf_flags;
-        int                     data_phase;
         struct request          *rq;            /* copy of request */
         void                    *special;       /* valid_t generally */
-} ide_task_t;
+};
 
 /* ATAPI packet command flags */
 enum {
@@ -380,15 +337,13 @@ enum {
         PC_FLAG_DMA_IN_PROGRESS         = (1 << 4),
         PC_FLAG_DMA_ERROR               = (1 << 5),
         PC_FLAG_WRITING                 = (1 << 6),
-        /* command timed out */
-        PC_FLAG_TIMEDOUT                = (1 << 7),
 };
 
 /*
  * With each packet command, we allocate a buffer of IDE_PC_BUFFER_SIZE bytes.
  * This is used for several packet commands (not for READ/WRITE commands).
  */
-#define IDE_PC_BUFFER_SIZE      256
+#define IDE_PC_BUFFER_SIZE      64
 #define ATAPI_WAIT_PC           (60 * HZ)
 
 struct ide_atapi_pc {
@@ -426,9 +381,6 @@ struct ide_atapi_pc {
         struct idetape_bh *bh;
         char *b_data;
 
-        struct scatterlist *sg;
-        unsigned int sg_cnt;
-
         unsigned long timeout;
 };
 
@@ -452,7 +404,6 @@ struct ide_disk_ops {
                                         int);
         ide_startstop_t (*do_request)(struct ide_drive_s *, struct request *,
                                       sector_t);
-        int             (*end_request)(struct ide_drive_s *, int, int);
         int             (*ioctl)(struct ide_drive_s *, struct block_device *,
                                  fmode_t, unsigned int, unsigned long);
 };
@@ -470,11 +421,6 @@ enum {
         IDE_AFLAG_TOCADDR_AS_BCD        = (1 << 3),
         /* TOC track numbers are in BCD. */
         IDE_AFLAG_TOCTRACKS_AS_BCD      = (1 << 4),
-        /*
-         * Drive does not provide data in multiples of SECTOR_SIZE
-         * when more than one interrupt is needed.
-         */
-        IDE_AFLAG_LIMIT_NFRAMES         = (1 << 5),
         /* Saved TOC information is current. */
         IDE_AFLAG_TOC_VALID             = (1 << 6),
         /* We think that the drive door is locked. */
@@ -528,8 +474,6 @@ enum {
         IDE_DFLAG_NICE1                 = (1 << 5),
         /* device is physically present */
         IDE_DFLAG_PRESENT               = (1 << 6),
-        /* device ejected hint */
-        IDE_DFLAG_DEAD                  = (1 << 7),
         /* id read from device (synthetic if not set) */
         IDE_DFLAG_ID_READ               = (1 << 8),
         IDE_DFLAG_NOPROBE               = (1 << 9),
@@ -621,7 +565,7 @@ struct ide_drive_s {
 
         unsigned int    bios_cyl;       /* BIOS/fdisk/LILO number of cyls */
         unsigned int    cyl;            /* "real" number of cyls */
-        unsigned int    drive_data;     /* used by set_pio_mode/selectproc */
+        unsigned int    drive_data;     /* used by set_pio_mode/dev_select() */
         unsigned int    failures;       /* current failure count */
         unsigned int    max_failures;   /* maximum allowed failure count */
         u64             probed_capacity;/* initial reported media capacity (ide-cd only currently) */
@@ -643,8 +587,11 @@ struct ide_drive_s {
         /* current packet command */
         struct ide_atapi_pc *pc;
 
+        /* last failed packet command */
+        struct ide_atapi_pc *failed_pc;
+
         /* callback for packet commands */
-        void (*pc_callback)(struct ide_drive_s *, int);
+        int  (*pc_callback)(struct ide_drive_s *, int);
 
         void (*pc_update_buffers)(struct ide_drive_s *, struct ide_atapi_pc *);
         int  (*pc_io_buffers)(struct ide_drive_s *, struct ide_atapi_pc *,
@@ -674,16 +621,16 @@ struct ide_tp_ops {
         void    (*exec_command)(struct hwif_s *, u8);
         u8      (*read_status)(struct hwif_s *);
         u8      (*read_altstatus)(struct hwif_s *);
+        void    (*write_devctl)(struct hwif_s *, u8);
 
-        void    (*set_irq)(struct hwif_s *, int);
-
-        void    (*tf_load)(ide_drive_t *, struct ide_task_s *);
-        void    (*tf_read)(ide_drive_t *, struct ide_task_s *);
+        void    (*dev_select)(ide_drive_t *);
+        void    (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
+        void    (*tf_read)(ide_drive_t *, struct ide_taskfile *, u8);
 
-        void    (*input_data)(ide_drive_t *, struct request *, void *,
-                              unsigned int);
-        void    (*output_data)(ide_drive_t *, struct request *, void *,
-                               unsigned int);
+        void    (*input_data)(ide_drive_t *, struct ide_cmd *,
+                              void *, unsigned int);
+        void    (*output_data)(ide_drive_t *, struct ide_cmd *,
+                               void *, unsigned int);
 };
 
 extern const struct ide_tp_ops default_tp_ops;
@@ -694,7 +641,6 @@ extern const struct ide_tp_ops default_tp_ops;
  * @init_dev:           host specific initialization of a device
  * @set_pio_mode:       routine to program host for PIO mode
  * @set_dma_mode:       routine to program host for DMA mode
- * @selectproc:         tweaks hardware to select drive
  * @reset_poll:         chipset polling based on hba specifics
  * @pre_reset:          chipset specific changes to default for device-hba resets
  * @resetproc:          routine to reset controller after a disk reset
@@ -711,7 +657,6 @@ struct ide_port_ops {
         void    (*init_dev)(ide_drive_t *);
         void    (*set_pio_mode)(ide_drive_t *, const u8);
         void    (*set_dma_mode)(ide_drive_t *, const u8);
-        void    (*selectproc)(ide_drive_t *);
         int     (*reset_poll)(ide_drive_t *);
         void    (*pre_reset)(ide_drive_t *);
         void    (*resetproc)(ide_drive_t *);
@@ -727,13 +672,15 @@ struct ide_port_ops {
 
 struct ide_dma_ops {
         void    (*dma_host_set)(struct ide_drive_s *, int);
-        int     (*dma_setup)(struct ide_drive_s *);
-        void    (*dma_exec_cmd)(struct ide_drive_s *, u8);
+        int     (*dma_setup)(struct ide_drive_s *, struct ide_cmd *);
         void    (*dma_start)(struct ide_drive_s *);
         int     (*dma_end)(struct ide_drive_s *);
         int     (*dma_test_irq)(struct ide_drive_s *);
         void    (*dma_lost_irq)(struct ide_drive_s *);
-        void    (*dma_timeout)(struct ide_drive_s *);
+        /* below ones are optional */
+        int     (*dma_check)(struct ide_drive_s *, struct ide_cmd *);
+        int     (*dma_timer_expiry)(struct ide_drive_s *);
+        void    (*dma_clear)(struct ide_drive_s *);
         /*
          * The following method is optional and only required to be
          * implemented for the SFF-8038i compatible controllers.
@@ -796,18 +743,8 @@ typedef struct hwif_s {
         /* Scatter-gather list used to build the above */
         struct scatterlist *sg_table;
         int sg_max_nents;               /* Maximum number of entries in it */
-        int sg_nents;                   /* Current number of entries in it */
-        int sg_dma_direction;           /* dma transfer direction */
 
-        /* data phase of the active command (currently only valid for PIO/DMA) */
-        int             data_phase;
-
-        struct ide_task_s task;         /* current command */
-
-        unsigned int nsect;
-        unsigned int nleft;
-        struct scatterlist *cursg;
-        unsigned int cursg_ofs;
+        struct ide_cmd cmd;             /* current command */
 
         int             rqsize;         /* max sectors per request */
         int             irq;            /* our irq number */
@@ -865,8 +802,18 @@ struct ide_host {
         ide_hwif_t      *ports[MAX_HOST_PORTS + 1];
         unsigned int    n_ports;
         struct device   *dev[2];
-        unsigned int    (*init_chipset)(struct pci_dev *);
+
+        int             (*init_chipset)(struct pci_dev *);
+
+        void            (*get_lock)(irq_handler_t, void *);
+        void            (*release_lock)(void);
+
+        irq_handler_t   irq_handler;
+
         unsigned long   host_flags;
+
+        int             irq_flags;
+
         void            *host_priv;
         ide_hwif_t      *cur_port;      /* for hosts requiring serialization */
 
@@ -883,7 +830,7 @@ typedef ide_startstop_t (ide_handler_t)(ide_drive_t *);
 typedef int (ide_expiry_t)(ide_drive_t *);
 
 /* used by ide-cd, ide-floppy, etc. */
-typedef void (xfer_func_t)(ide_drive_t *, struct request *rq, void *, unsigned);
+typedef void (xfer_func_t)(ide_drive_t *, struct ide_cmd *, void *, unsigned);
 
 extern struct mutex ide_setting_mtx;
 
@@ -1059,10 +1006,11 @@ enum {
 };
 
 /* DRV_NAME has to be defined in the driver before using the macro below */
-#define __ide_debug_log(lvl, fmt, args...)                      \
-{                                                               \
-        if (unlikely(drive->debug_mask & lvl))                  \
-                printk(KERN_INFO DRV_NAME ": " fmt, ## args);   \
+#define __ide_debug_log(lvl, fmt, args...)                              \
+{                                                                       \
+        if (unlikely(drive->debug_mask & lvl))                          \
+                printk(KERN_INFO DRV_NAME ": %s: " fmt "\n",            \
+                                          __func__, ## args);           \
 }
 
 /*
@@ -1101,7 +1049,7 @@ int generic_ide_resume(struct device *);
 
 void ide_complete_power_step(ide_drive_t *, struct request *);
 ide_startstop_t ide_start_power_step(ide_drive_t *, struct request *);
-void ide_complete_pm_request(ide_drive_t *, struct request *);
+void ide_complete_pm_rq(ide_drive_t *, struct request *);
 void ide_check_pm_state(ide_drive_t *, struct request *);
 
 /*
@@ -1113,7 +1061,6 @@ void ide_check_pm_state(ide_drive_t *, struct request *);
 struct ide_driver {
         const char                      *version;
         ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t);
-        int             (*end_request)(ide_drive_t *, int, int);
         struct device_driver    gen_driver;
         int             (*probe)(ide_drive_t *);
         void            (*remove)(ide_drive_t *);
@@ -1144,16 +1091,15 @@ int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned l
 extern int ide_vlb_clk;
 extern int ide_pci_clk;
 
-extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
-int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
-                             int uptodate, int nr_sectors);
+unsigned int ide_rq_bytes(struct request *);
+int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
+void ide_kill_rq(ide_drive_t *, struct request *);
 
-extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry);
+void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int);
+void ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int);
 
-void ide_execute_command(ide_drive_t *, u8, ide_handler_t *, unsigned int,
-                         ide_expiry_t *);
-
-void ide_execute_pkt_cmd(ide_drive_t *);
+void ide_execute_command(ide_drive_t *, struct ide_cmd *, ide_handler_t *,
+                         unsigned int);
 
 void ide_pad_transfer(ide_drive_t *, int, int);
 
@@ -1167,41 +1113,37 @@ int ide_busy_sleep(ide_hwif_t *, unsigned long, int);
 
 int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
 
+ide_startstop_t ide_do_park_unpark(ide_drive_t *, struct request *);
+ide_startstop_t ide_do_devset(ide_drive_t *, struct request *);
+
 extern ide_startstop_t ide_do_reset (ide_drive_t *);
 
 extern int ide_devset_execute(ide_drive_t *drive,
                               const struct ide_devset *setting, int arg);
 
-extern void ide_do_drive_cmd(ide_drive_t *, struct request *);
+void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
+int ide_complete_rq(ide_drive_t *, int, unsigned int);
 
-extern void ide_end_drive_cmd(ide_drive_t *, u8, u8);
-
-void ide_tf_dump(const char *, struct ide_taskfile *);
+void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd);
+void ide_tf_dump(const char *, struct ide_cmd *);
 
 void ide_exec_command(ide_hwif_t *, u8);
 u8 ide_read_status(ide_hwif_t *);
 u8 ide_read_altstatus(ide_hwif_t *);
+void ide_write_devctl(ide_hwif_t *, u8);
 
-void ide_set_irq(ide_hwif_t *, int);
-
-void ide_tf_load(ide_drive_t *, ide_task_t *);
-void ide_tf_read(ide_drive_t *, ide_task_t *);
+void ide_dev_select(ide_drive_t *);
+void ide_tf_load(ide_drive_t *, struct ide_taskfile *, u8);
+void ide_tf_read(ide_drive_t *, struct ide_taskfile *, u8);
 
-void ide_input_data(ide_drive_t *, struct request *, void *, unsigned int);
-void ide_output_data(ide_drive_t *, struct request *, void *, unsigned int);
+void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
+void ide_output_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
 
-int ide_io_buffers(ide_drive_t *, struct ide_atapi_pc *, unsigned int, int);
-
-extern void SELECT_DRIVE(ide_drive_t *);
 void SELECT_MASK(ide_drive_t *, int);
 
 u8 ide_read_error(ide_drive_t *);
 void ide_read_bcount_and_ireason(ide_drive_t *, u16 *, u8 *);
 
-extern int drive_is_ready(ide_drive_t *);
-
-void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
-
 int ide_check_atapi_device(ide_drive_t *, const char *);
 
 void ide_init_pc(struct ide_atapi_pc *);
@@ -1238,16 +1180,20 @@ int ide_cd_expiry(ide_drive_t *);
 
 int ide_cd_get_xferlen(struct request *);
 
-ide_startstop_t ide_issue_pc(ide_drive_t *);
+ide_startstop_t ide_issue_pc(ide_drive_t *, struct ide_cmd *);
+
+ide_startstop_t do_rw_taskfile(ide_drive_t *, struct ide_cmd *);
 
-ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
+void ide_pio_bytes(ide_drive_t *, struct ide_cmd *, unsigned int, unsigned int);
 
-void task_end_request(ide_drive_t *, struct request *, u8);
+void ide_finish_cmd(ide_drive_t *, struct ide_cmd *, u8);
 
-int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16);
-int ide_no_data_taskfile(ide_drive_t *, ide_task_t *);
+int ide_raw_taskfile(ide_drive_t *, struct ide_cmd *, u8 *, u16);
+int ide_no_data_taskfile(ide_drive_t *, struct ide_cmd *);
 
-int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long);
+int ide_taskfile_ioctl(ide_drive_t *, unsigned long);
+
+int ide_dev_read_id(ide_drive_t *, u8, u16 *);
 
 extern int ide_driveid_update(ide_drive_t *);
 extern int ide_config_drive_speed(ide_drive_t *, u8);
@@ -1278,7 +1224,7 @@ static inline int ide_pci_is_in_compatibility_mode(struct pci_dev *dev)
         return 0;
 }
 
-void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int,
+void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *,
                          hw_regs_t *, hw_regs_t **);
 void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);
 
@@ -1347,10 +1293,10 @@ enum {
         IDE_HFLAG_ERROR_STOPS_FIFO      = (1 << 19),
         /* serialize ports */
         IDE_HFLAG_SERIALIZE             = (1 << 20),
-        /* use legacy IRQs */
-        IDE_HFLAG_LEGACY_IRQS           = (1 << 21),
-        /* force use of legacy IRQs */
-        IDE_HFLAG_FORCE_LEGACY_IRQS     = (1 << 22),
+        /* host is DTC2278 */
+        IDE_HFLAG_DTC2278               = (1 << 21),
+        /* 4 devices on a single set of I/O ports */
+        IDE_HFLAG_4DRIVES               = (1 << 22),
         /* host is TRM290 */
         IDE_HFLAG_TRM290                = (1 << 23),
         /* use 32-bit I/O ops */
@@ -1378,7 +1324,12 @@ enum {
 
 struct ide_port_info {
         char                    *name;
-        unsigned int            (*init_chipset)(struct pci_dev *);
+
+        int                     (*init_chipset)(struct pci_dev *);
+
+        void                    (*get_lock)(irq_handler_t, void *);
+        void                    (*release_lock)(void);
+
         void                    (*init_iops)(ide_hwif_t *);
         void                    (*init_hwif)(ide_hwif_t *);
         int                     (*init_dma)(ide_hwif_t *,
@@ -1395,6 +1346,9 @@ struct ide_port_info {
         u16                     max_sectors;    /* if < than the default one */
 
         u32                     host_flags;
+
+        int                     irq_flags;
+
         u8                      pio_mask;
         u8                      swdma_mask;
         u8                      mwdma_mask;
@@ -1414,8 +1368,8 @@ int ide_pci_resume(struct pci_dev *);
 #define ide_pci_resume NULL
 #endif
 
-void ide_map_sg(ide_drive_t *, struct request *);
-void ide_init_sg_cmd(ide_drive_t *, struct request *);
+void ide_map_sg(ide_drive_t *, struct ide_cmd *);
+void ide_init_sg_cmd(struct ide_cmd *, unsigned int);
 
 #define BAD_DMA_DRIVE           0
 #define GOOD_DMA_DRIVE          1
@@ -1449,18 +1403,18 @@ ide_startstop_t ide_dma_intr(ide_drive_t *);
 int ide_allocate_dma_engine(ide_hwif_t *);
 void ide_release_dma_engine(ide_hwif_t *);
 
-int ide_build_sglist(ide_drive_t *, struct request *);
-void ide_destroy_dmatable(ide_drive_t *);
+int ide_dma_prepare(ide_drive_t *, struct ide_cmd *);
+void ide_dma_unmap_sg(ide_drive_t *, struct ide_cmd *);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_SFF
 int config_drive_for_dma(ide_drive_t *);
-extern int ide_build_dmatable(ide_drive_t *, struct request *);
+int ide_build_dmatable(ide_drive_t *, struct ide_cmd *);
 void ide_dma_host_set(ide_drive_t *, int);
-extern int ide_dma_setup(ide_drive_t *);
-void ide_dma_exec_cmd(ide_drive_t *, u8);
+int ide_dma_setup(ide_drive_t *, struct ide_cmd *);
 extern void ide_dma_start(ide_drive_t *);
 int ide_dma_end(ide_drive_t *);
 int ide_dma_test_irq(ide_drive_t *);
+int ide_dma_sff_timer_expiry(ide_drive_t *);
 u8 ide_dma_sff_read_status(ide_hwif_t *);
 extern const struct ide_dma_ops sff_dma_ops;
 #else
@@ -1468,7 +1422,7 @@ static inline int config_drive_for_dma(ide_drive_t *drive) { return 0; }
 #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
 
 void ide_dma_lost_irq(ide_drive_t *);
-void ide_dma_timeout(ide_drive_t *);
+ide_startstop_t ide_dma_timeout_retry(ide_drive_t *, int);
 
 #else
 static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }
@@ -1480,21 +1434,29 @@ static inline void ide_dma_on(ide_drive_t *drive) { ; }
 static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
 static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
 static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
+static inline ide_startstop_t ide_dma_intr(ide_drive_t *drive) { return ide_stopped; }
+static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; }
 static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
+static inline int ide_dma_prepare(ide_drive_t *drive,
+                                  struct ide_cmd *cmd) { return 1; }
+static inline void ide_dma_unmap_sg(ide_drive_t *drive,
+                                    struct ide_cmd *cmd) { ; }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
 #ifdef CONFIG_BLK_DEV_IDEACPI
+int ide_acpi_init(void);
 extern int ide_acpi_exec_tfs(ide_drive_t *drive);
 extern void ide_acpi_get_timing(ide_hwif_t *hwif);
 extern void ide_acpi_push_timing(ide_hwif_t *hwif);
-extern void ide_acpi_init(ide_hwif_t *hwif);
+void ide_acpi_init_port(ide_hwif_t *);
 void ide_acpi_port_init_devices(ide_hwif_t *);
 extern void ide_acpi_set_state(ide_hwif_t *hwif, int on);
 #else
+static inline int ide_acpi_init(void) { return 0; }
 static inline int ide_acpi_exec_tfs(ide_drive_t *drive) { return 0; }
 static inline void ide_acpi_get_timing(ide_hwif_t *hwif) { ; }
 static inline void ide_acpi_push_timing(ide_hwif_t *hwif) { ; }
-static inline void ide_acpi_init(ide_hwif_t *hwif) { ; }
+static inline void ide_acpi_init_port(ide_hwif_t *hwif) { ; }
 static inline void ide_acpi_port_init_devices(ide_hwif_t *hwif) { ; }
 static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
 #endif
@@ -1528,11 +1490,9 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
         hwif->hwif_data = data;
 }
 
-const char *ide_xfer_verbose(u8 mode);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
-extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
 
-u64 ide_get_lba_addr(struct ide_taskfile *, int);
+u64 ide_get_lba_addr(struct ide_cmd *, int);
 u8 ide_dump_status(ide_drive_t *, const char *, u8);
 
 struct ide_timing {
@@ -1569,14 +1529,18 @@ void ide_timing_merge(struct ide_timing *, struct ide_timing *,
                       struct ide_timing *, unsigned int);
 int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
 
+#ifdef CONFIG_IDE_XFER_MODE
 int ide_scan_pio_blacklist(char *);
-
+const char *ide_xfer_verbose(u8);
 u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
-
 int ide_set_pio_mode(ide_drive_t *, u8);
 int ide_set_dma_mode(ide_drive_t *, u8);
-
 void ide_set_pio(ide_drive_t *, u8);
+int ide_set_xfer_rate(ide_drive_t *, u8);
+#else
+static inline void ide_set_pio(ide_drive_t *drive, u8 pio) { ; }
+static inline int ide_set_xfer_rate(ide_drive_t *drive, u8 rate) { return -1; }
+#endif
 
 static inline void ide_set_max_pio(ide_drive_t *drive)
 {
@@ -1609,6 +1573,10 @@ static inline ide_drive_t *ide_get_pair_dev(ide_drive_t *drive)
 #define ide_port_for_each_dev(i, dev, port) \
         for ((i) = 0; ((dev) = (port)->devices[i]) || (i) < MAX_DRIVES; (i)++)
 
+#define ide_port_for_each_present_dev(i, dev, port) \
+        for ((i) = 0; ((dev) = (port)->devices[i]) || (i) < MAX_DRIVES; (i)++) \
+                if ((dev)->dev_flags & IDE_DFLAG_PRESENT)
+
 #define ide_host_for_each_port(i, port, host) \
         for ((i) = 0; ((port) = (host)->ports[i]) || (i) < MAX_HOST_PORTS; (i)++)
 
diff --git a/include/linux/idr.h b/include/linux/idr.h
index dd846df8cd32..e968db71e33a 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -106,6 +106,7 @@ int idr_get_new(struct idr *idp, void *ptr, int *id);
 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
 int idr_for_each(struct idr *idp,
                  int (*fn)(int id, void *p, void *data), void *data);
+void *idr_get_next(struct idr *idp, int *nextid);
 void *idr_replace(struct idr *idp, void *ptr, int id);
 void idr_remove(struct idr *idp, int id);
 void idr_remove_all(struct idr *idp);
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index c4e6ca1a6306..4b501b48ce86 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -18,6 +18,22 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
+/*
+ * DS bit usage
+ *
+ * TA = transmitter address
+ * RA = receiver address
+ * DA = destination address
+ * SA = source address
+ *
+ * ToDS    FromDS  A1(RA)  A2(TA)  A3      A4      Use
+ * -----------------------------------------------------------------
+ *  0       0       DA      SA      BSSID   -       IBSS/DLS
+ *  0       1       DA      BSSID   SA      -       AP -> STA
+ *  1       0       BSSID   SA      DA      -       AP <- STA
+ *  1       1       RA      TA      DA      SA      unspecified (WDS)
+ */
+
 #define FCS_LEN 4
 
 #define IEEE80211_FCTL_VERS             0x0003
@@ -527,6 +543,8 @@ struct ieee80211_tim_ie {
         u8 virtual_map[0];
 } __attribute__ ((packed));
 
+#define WLAN_SA_QUERY_TR_ID_LEN 16
+
 struct ieee80211_mgmt {
         __le16 frame_control;
         __le16 duration;
@@ -646,6 +664,10 @@ struct ieee80211_mgmt {
                                         u8 action_code;
                                         u8 variable[0];
                                 } __attribute__((packed)) mesh_action;
+                                struct {
+                                        u8 action;
+                                        u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
+                                } __attribute__ ((packed)) sa_query;
                         } u;
                 } __attribute__ ((packed)) action;
         } u;
@@ -655,6 +677,15 @@ struct ieee80211_mgmt {
 #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u)
 
 
+/* Management MIC information element (IEEE 802.11w) */
+struct ieee80211_mmie {
+        u8 element_id;
+        u8 length;
+        __le16 key_id;
+        u8 sequence_number[6];
+        u8 mic[8];
+} __attribute__ ((packed));
+
 /* Control frames */
 struct ieee80211_rts {
         __le16 frame_control;
@@ -836,6 +867,7 @@ struct ieee80211_ht_info {
 /* Authentication algorithms */
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
+#define WLAN_AUTH_FT 2
 #define WLAN_AUTH_LEAP 128
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
@@ -899,6 +931,9 @@ enum ieee80211_statuscode {
         /* 802.11g */
         WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
         WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
+        /* 802.11w */
+        WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY = 30,
+        WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION = 31,
         /* 802.11i */
         WLAN_STATUS_INVALID_IE = 40,
         WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
@@ -1018,6 +1053,8 @@ enum ieee80211_eid {
         WLAN_EID_HT_INFORMATION = 61,
         /* 802.11i */
         WLAN_EID_RSN = 48,
+        WLAN_EID_TIMEOUT_INTERVAL = 56,
+        WLAN_EID_MMIE = 76 /* 802.11w */,
         WLAN_EID_WPA = 221,
         WLAN_EID_GENERIC = 221,
         WLAN_EID_VENDOR_SPECIFIC = 221,
@@ -1030,6 +1067,8 @@ enum ieee80211_category {
         WLAN_CATEGORY_QOS = 1,
         WLAN_CATEGORY_DLS = 2,
         WLAN_CATEGORY_BACK = 3,
+        WLAN_CATEGORY_PUBLIC = 4,
+        WLAN_CATEGORY_SA_QUERY = 8,
         WLAN_CATEGORY_WMM = 17,
 };
 
@@ -1104,6 +1143,12 @@ struct ieee80211_country_ie_triplet {
         };
 } __attribute__ ((packed));
 
+enum ieee80211_timeout_interval_type {
+        WLAN_TIMEOUT_REASSOC_DEADLINE = 1 /* 802.11r */,
+        WLAN_TIMEOUT_KEY_LIFETIME = 2 /* 802.11r */,
+        WLAN_TIMEOUT_ASSOC_COMEBACK = 3 /* 802.11w */,
+};
+
 /* BACK action code */
 enum ieee80211_back_actioncode {
         WLAN_ACTION_ADDBA_REQ = 0,
@@ -1118,6 +1163,13 @@ enum ieee80211_back_parties {
         WLAN_BACK_TIMER = 2,
 };
 
+/* SA Query action */
+enum ieee80211_sa_query_action {
+        WLAN_ACTION_SA_QUERY_REQUEST = 0,
+        WLAN_ACTION_SA_QUERY_RESPONSE = 1,
+};
+
+
 /* A-MSDU 802.11n */
 #define IEEE80211_QOS_CONTROL_A_MSDU_PRESENT 0x0080
 
@@ -1128,6 +1180,7 @@ enum ieee80211_back_parties {
 /* reserved:                            0x000FAC03 */
 #define WLAN_CIPHER_SUITE_CCMP          0x000FAC04
 #define WLAN_CIPHER_SUITE_WEP104        0x000FAC05
+#define WLAN_CIPHER_SUITE_AES_CMAC      0x000FAC06
 
 #define WLAN_MAX_KEY_LEN                32
 
@@ -1185,4 +1238,149 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
                 return hdr->addr1;
 }
 
+/**
+ * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
+ * @hdr: the frame (buffer must include at least the first octet of payload)
+ */
+static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
+{
+        if (ieee80211_is_disassoc(hdr->frame_control) ||
+            ieee80211_is_deauth(hdr->frame_control))
+                return true;
+
+        if (ieee80211_is_action(hdr->frame_control)) {
+                u8 *category;
+
+                /*
+                 * Action frames, excluding Public Action frames, are Robust
+                 * Management Frames. However, if we are looking at a Protected
+                 * frame, skip the check since the data may be encrypted and
+                 * the frame has already been found to be a Robust Management
+                 * Frame (by the other end).
+                 */
+                if (ieee80211_has_protected(hdr->frame_control))
+                        return true;
+                category = ((u8 *) hdr) + 24;
+                return *category != WLAN_CATEGORY_PUBLIC;
+        }
+
+        return false;
+}
+
+/**
+ * ieee80211_fhss_chan_to_freq - get channel frequency
+ * @channel: the FHSS channel
+ *
+ * Convert IEEE802.11 FHSS channel to frequency (MHz)
+ * Ref IEEE 802.11-2007 section 14.6
+ */
+static inline int ieee80211_fhss_chan_to_freq(int channel)
+{
+        if ((channel > 1) && (channel < 96))
+                return channel + 2400;
+        else
+                return -1;
+}
+
+/**
+ * ieee80211_freq_to_fhss_chan - get channel
+ * @freq: the channels frequency
+ *
+ * Convert frequency (MHz) to IEEE802.11 FHSS channel
+ * Ref IEEE 802.11-2007 section 14.6
+ */
+static inline int ieee80211_freq_to_fhss_chan(int freq)
+{
+        if ((freq > 2401) && (freq < 2496))
+                return freq - 2400;
+        else
+                return -1;
+}
+
+/**
+ * ieee80211_dsss_chan_to_freq - get channel center frequency
+ * @channel: the DSSS channel
+ *
+ * Convert IEEE802.11 DSSS channel to the center frequency (MHz).
+ * Ref IEEE 802.11-2007 section 15.6
+ */
+static inline int ieee80211_dsss_chan_to_freq(int channel)
+{
+        if ((channel > 0) && (channel < 14))
+                return 2407 + (channel * 5);
+        else if (channel == 14)
+                return 2484;
+        else
+                return -1;
+}
+
+/**
+ * ieee80211_freq_to_dsss_chan - get channel
+ * @freq: the frequency
+ *
+ * Convert frequency (MHz) to IEEE802.11 DSSS channel
+ * Ref IEEE 802.11-2007 section 15.6
+ *
+ * This routine selects the channel with the closest center frequency.
+ */
+static inline int ieee80211_freq_to_dsss_chan(int freq)
+{
+        if ((freq >= 2410) && (freq < 2475))
+                return (freq - 2405) / 5;
+        else if ((freq >= 2482) && (freq < 2487))
+                return 14;
+        else
+                return -1;
+}
+
+/* Convert IEEE802.11 HR DSSS channel to frequency (MHz) and back
+ * Ref IEEE 802.11-2007 section 18.4.6.2
+ *
+ * The channels and frequencies are the same as those defined for DSSS
+ */
+#define ieee80211_hr_chan_to_freq(chan) ieee80211_dsss_chan_to_freq(chan)
+#define ieee80211_freq_to_hr_chan(freq) ieee80211_freq_to_dsss_chan(freq)
+
+/* Convert IEEE802.11 ERP channel to frequency (MHz) and back
+ * Ref IEEE 802.11-2007 section 19.4.2
+ */
+#define ieee80211_erp_chan_to_freq(chan) ieee80211_hr_chan_to_freq(chan)
+#define ieee80211_freq_to_erp_chan(freq) ieee80211_freq_to_hr_chan(freq)
+
+/**
+ * ieee80211_ofdm_chan_to_freq - get channel center frequency
+ * @s_freq: starting frequency == (dotChannelStartingFactor/2) MHz
+ * @channel: the OFDM channel
+ *
+ * Convert IEEE802.11 OFDM channel to center frequency (MHz)
+ * Ref IEEE 802.11-2007 section 17.3.8.3.2
+ */
+static inline int ieee80211_ofdm_chan_to_freq(int s_freq, int channel)
+{
+        if ((channel > 0) && (channel <= 200) &&
+            (s_freq >= 4000))
+                return s_freq + (channel * 5);
+        else
+                return -1;
+}
+
+/**
+ * ieee80211_freq_to_ofdm_channel - get channel
+ * @s_freq: starting frequency == (dotChannelStartingFactor/2) MHz
+ * @freq: the frequency
+ *
+ * Convert frequency (MHz) to IEEE802.11 OFDM channel
+ * Ref IEEE 802.11-2007 section 17.3.8.3.2
+ *
+ * This routine selects the channel with the closest center frequency.
+ */
+static inline int ieee80211_freq_to_ofdm_chan(int s_freq, int freq)
+{
+        if ((freq > (s_freq + 2)) && (freq <= (s_freq + 1202)) &&
+            (s_freq >= 4000))
+                return (freq + 2 - s_freq) / 5;
+        else
+                return -1;
+}
+
 #endif /* LINUX_IEEE80211_H */
diff --git a/include/linux/if.h b/include/linux/if.h
index 2a6e29620a96..1108f3e099e3 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -66,6 +66,7 @@
 #define IFF_SLAVE_NEEDARP 0x40          /* need ARPs for validation     */
 #define IFF_ISATAP      0x80            /* ISATAP interface (RFC4214)   */
 #define IFF_MASTER_ARPMON 0x100         /* bonding master, ARP mon in use */
+#define IFF_WAN_HDLC    0x200           /* WAN HDLC device              */
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index 27ea2ac445ad..0835debab115 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -16,6 +16,7 @@
 #ifndef _LINUX_IF_ARCNET_H
 #define _LINUX_IF_ARCNET_H
 
+#include <linux/types.h>
 #include <linux/if_ether.h>
 
 
@@ -57,10 +58,10 @@
  */
 struct arc_rfc1201
 {
-    uint8_t  proto;             /* protocol ID field - varies           */
-    uint8_t  split_flag;        /* for use with split packets           */
+    __u8  proto;                /* protocol ID field - varies           */
+    __u8  split_flag;   /* for use with split packets           */
     __be16   sequence;          /* sequence number                      */
-    uint8_t  payload[0];        /* space remaining in packet (504 bytes)*/
+    __u8  payload[0];   /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4
 
@@ -70,8 +71,8 @@ struct arc_rfc1201
  */
 struct arc_rfc1051
 {
-    uint8_t proto;              /* ARC_P_RFC1051_ARP/RFC1051_IP */
-    uint8_t payload[0];         /* 507 bytes                    */
+    __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
+    __u8 payload[0];            /* 507 bytes                    */
 };
 #define RFC1051_HDR_SIZE 1
 
@@ -82,20 +83,20 @@ struct arc_rfc1051
  */
 struct arc_eth_encap
 {
-    uint8_t proto;              /* Always ARC_P_ETHER                   */
+    __u8 proto;         /* Always ARC_P_ETHER                   */
     struct ethhdr eth;          /* standard ethernet header (yuck!)     */
-    uint8_t payload[0];         /* 493 bytes                            */
+    __u8 payload[0];            /* 493 bytes                            */
 };
 #define ETH_ENCAP_HDR_SIZE 14
 
 
 struct arc_cap
 {
-        uint8_t proto;
-        uint8_t cookie[sizeof(int)];   /* Actually NOT sent over the network */
+        __u8 proto;
+        __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
         union {
-                uint8_t ack;
-                uint8_t raw[0];         /* 507 bytes */
+                __u8 ack;
+                __u8 raw[0];            /* 507 bytes */
         } mes;
 };
 
@@ -109,7 +110,7 @@ struct arc_cap
  */
 struct arc_hardware
 {
-    uint8_t  source,            /* source ARCnet - filled in automagically */
+    __u8  source,               /* source ARCnet - filled in automagically */
              dest,              /* destination ARCnet - 0 for broadcast    */
              offset[2];         /* offset bytes (some weird semantics)     */
 };
@@ -130,7 +131,7 @@ struct archdr
         struct arc_rfc1051   rfc1051;
         struct arc_eth_encap eth_encap;
         struct arc_cap       cap;
-        uint8_t raw[0];         /* 508 bytes                            */
+        __u8 raw[0];            /* 508 bytes                            */
     } soft;
 };
 
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 7f3c735f422b..cfe4fe1b7132 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -17,7 +17,7 @@
  *              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
 
@@ -25,7 +25,7 @@
 
 /*
  *      IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
- *      and FCS/CRC (frame check sequence). 
+ *      and FCS/CRC (frame check sequence).
  */
 
 #define ETH_ALEN        6               /* Octets in one ethernet addr   */
@@ -78,12 +78,13 @@
 #define ETH_P_PAE       0x888E          /* Port Access Entity (IEEE 802.1X) */
 #define ETH_P_AOE       0x88A2          /* ATA over Ethernet            */
 #define ETH_P_TIPC      0x88CA          /* TIPC                         */
+#define ETH_P_FCOE      0x8906          /* Fibre Channel over Ethernet  */
 #define ETH_P_EDSA      0xDADA          /* Ethertype DSA [ 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!!!) */
@@ -109,7 +110,7 @@
 /*
  *      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    */
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 60e16a551dd6..673f2209453d 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -153,7 +153,6 @@ struct frhdr
 
 struct dlci_local
 {
-   struct net_device_stats stats;
    struct net_device      *master;
    struct net_device      *slave;
    struct dlci_conf       config;
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index c7a66882b6d0..3a14b088c8ec 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -26,7 +26,7 @@
  */
 struct pppol2tp_addr
 {
-        pid_t   pid;                    /* pid that owns the fd.
+        __kernel_pid_t  pid;            /* pid that owns the fd.
                                          * 0 => current */
         int     fd;                     /* FD of UDP socket to use */
 
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 30c88b2245ff..90b5fae5d714 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -95,16 +95,16 @@ struct pppoe_tag {
 } __attribute ((packed));
 
 /* Tag identifiers */
-#define PTT_EOL         __constant_htons(0x0000)
-#define PTT_SRV_NAME    __constant_htons(0x0101)
-#define PTT_AC_NAME     __constant_htons(0x0102)
-#define PTT_HOST_UNIQ   __constant_htons(0x0103)
-#define PTT_AC_COOKIE   __constant_htons(0x0104)
-#define PTT_VENDOR      __constant_htons(0x0105)
-#define PTT_RELAY_SID   __constant_htons(0x0110)
-#define PTT_SRV_ERR     __constant_htons(0x0201)
-#define PTT_SYS_ERR     __constant_htons(0x0202)
-#define PTT_GEN_ERR     __constant_htons(0x0203)
+#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)
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 8529f57ba263..049d6c9428db 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -46,6 +46,8 @@
 #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)
 
 /* TUNSETIFF ifr flags */
 #define IFF_TUN         0x0001
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 82c43624c067..5a9aae4adb44 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -16,14 +16,14 @@
 #define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
 #define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
 
-#define GRE_CSUM        __constant_htons(0x8000)
-#define GRE_ROUTING     __constant_htons(0x4000)
-#define GRE_KEY         __constant_htons(0x2000)
-#define GRE_SEQ         __constant_htons(0x1000)
-#define GRE_STRICT      __constant_htons(0x0800)
-#define GRE_REC         __constant_htons(0x0700)
-#define GRE_FLAGS       __constant_htons(0x00F8)
-#define GRE_VERSION     __constant_htons(0x0007)
+#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
 {
diff --git a/include/linux/ima.h b/include/linux/ima.h
new file mode 100644
index 000000000000..0e2aa45cb0ce
--- /dev/null
+++ b/include/linux/ima.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2008 IBM Corporation
+ * Author: Mimi Zohar <zohar@us.ibm.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 of the License.
+ */
+
+#ifndef _LINUX_IMA_H
+#define _LINUX_IMA_H
+
+#include <linux/fs.h>
+struct linux_binprm;
+
+#ifdef CONFIG_IMA
+extern int ima_bprm_check(struct linux_binprm *bprm);
+extern int ima_inode_alloc(struct inode *inode);
+extern void ima_inode_free(struct inode *inode);
+extern int ima_path_check(struct path *path, int mask);
+extern void ima_file_free(struct file *file);
+extern int ima_file_mmap(struct file *file, unsigned long prot);
+extern void ima_shm_check(struct file *file);
+
+#else
+static inline int ima_bprm_check(struct linux_binprm *bprm)
+{
+        return 0;
+}
+
+static inline int ima_inode_alloc(struct inode *inode)
+{
+        return 0;
+}
+
+static inline void ima_inode_free(struct inode *inode)
+{
+        return;
+}
+
+static inline int ima_path_check(struct path *path, int mask)
+{
+        return 0;
+}
+
+static inline void ima_file_free(struct file *file)
+{
+        return;
+}
+
+static inline int ima_file_mmap(struct file *file, unsigned long prot)
+{
+        return 0;
+}
+
+static inline void ima_shm_check(struct file *file)
+{
+        return;
+}
+#endif /* CONFIG_IMA_H */
+#endif /* _LINUX_IMA_H */
diff --git a/include/linux/in6.h b/include/linux/in6.h
index bc492048c349..718bf21c5754 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -44,11 +44,11 @@ struct in6_addr
  * 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;
 #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
-#ifdef __KERNEL__
 extern const struct in6_addr in6addr_linklocal_allnodes;
 #define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
                 { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 06fcdb45106b..acef2a770b6b 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -108,6 +108,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_ARPFILTER(in_dev)        IN_DEV_ORCONF((in_dev), ARPFILTER)
 #define IN_DEV_ARP_ANNOUNCE(in_dev)     IN_DEV_MAXCONF((in_dev), ARP_ANNOUNCE)
 #define IN_DEV_ARP_IGNORE(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_IGNORE)
+#define IN_DEV_ARP_NOTIFY(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
 
 struct in_ifaddr
 {
diff --git a/include/linux/init.h b/include/linux/init.h
index 68cb0265d009..0e06c176f185 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -2,6 +2,8 @@
 #define _LINUX_INIT_H
 
 #include <linux/compiler.h>
+#include <linux/section-names.h>
+#include <linux/stringify.h>
 
 /* These macros are used to mark some functions or 
  * initialized data (doesn't apply to uninitialized data)
@@ -60,14 +62,6 @@
 #define __refdata        __section(.ref.data)
 #define __refconst       __section(.ref.rodata)
 
-/* backward compatibility note
- *  A few places hardcode the old section names:
- *  .text.init.refok
- *  .data.init.refok
- *  .exit.text.refok
- *  They should be converted to use the defines from this file
- */
-
 /* compatibility defines */
 #define __init_refok     __ref
 #define __initdata_refok __refdata
@@ -107,7 +101,7 @@
 #define __memexitconst   __section(.memexit.rodata)
 
 /* For assembly routines */
-#define __HEAD          .section        ".head.text","ax"
+#define __HEAD          .section        __stringify(HEAD_TEXT_SECTION),"ax"
 #define __INIT          .section        ".init.text","ax"
 #define __FINIT         .previous
 
@@ -247,6 +241,7 @@ struct obs_kernel_param {
 
 /* Relies on boot_command_line being set */
 void __init parse_early_param(void);
+void __init parse_early_options(char *cmdline);
 #endif /* __ASSEMBLY__ */
 
 /**
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index e752d973fa21..d87247d2641f 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -5,6 +5,7 @@
 #include <linux/irqflags.h>
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
+#include <linux/ftrace.h>
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
@@ -14,19 +15,6 @@
 extern struct files_struct init_files;
 extern struct fs_struct init_fs;
 
-#define INIT_KIOCTX(name, which_mm) \
-{                                                       \
-        .users          = ATOMIC_INIT(1),               \
-        .dead           = 0,                            \
-        .mm             = &which_mm,                    \
-        .user_id        = 0,                            \
-        .next           = NULL,                         \
-        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \
-        .ctx_lock       = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \
-        .reqs_active    = 0U,                           \
-        .max_reqs       = ~0U,                          \
-}
-
 #define INIT_MM(name) \
 {                                                               \
         .mm_rb          = RB_ROOT,                              \
@@ -147,6 +135,7 @@ extern struct cred init_cred;
                 .nr_cpus_allowed = NR_CPUS,                             \
         },                                                              \
         .tasks          = LIST_HEAD_INIT(tsk.tasks),                    \
+        .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \
         .ptraced        = LIST_HEAD_INIT(tsk.ptraced),                  \
         .ptrace_entry   = LIST_HEAD_INIT(tsk.ptrace_entry),             \
         .real_parent    = &tsk,                                         \
@@ -184,6 +173,7 @@ extern struct cred init_cred;
         INIT_IDS                                                        \
         INIT_TRACE_IRQFLAGS                                             \
         INIT_LOCKDEP                                                    \
+        INIT_FTRACE_GRAPH                                               \
 }
 
 
diff --git a/include/linux/input.h b/include/linux/input.h
index 1249a0c20a38..0e6ff5de3588 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -106,6 +106,7 @@ struct input_absinfo {
 
 #define SYN_REPORT              0
 #define SYN_CONFIG              1
+#define SYN_MT_REPORT           2
 
 /*
  * Keys and buttons
@@ -445,6 +446,7 @@ struct input_absinfo {
 #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
@@ -644,6 +646,17 @@ struct input_absinfo {
 #define ABS_TOOL_WIDTH          0x1c
 #define ABS_VOLUME              0x20
 #define ABS_MISC                0x28
+
+#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 ellipse position */
+#define ABS_MT_POSITION_Y       0x36    /* Center Y ellipse 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_MAX                 0x3f
 #define ABS_CNT                 (ABS_MAX+1)
 
@@ -661,6 +674,7 @@ struct input_absinfo {
 #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_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)
 
@@ -742,6 +756,12 @@ struct input_absinfo {
 #define BUS_ATARI               0x1B
 
 /*
+ * MT_TOOL types
+ */
+#define MT_TOOL_FINGER          0
+#define MT_TOOL_PEN             1
+
+/*
  * Values describing the status of a force-feedback effect
  */
 #define FF_STATUS_STOPPED       0x00
@@ -1310,6 +1330,11 @@ static inline void input_sync(struct input_dev *dev)
         input_event(dev, EV_SYN, SYN_REPORT, 0);
 }
 
+static inline void input_mt_sync(struct input_dev *dev)
+{
+        input_event(dev, EV_SYN, SYN_MT_REPORT, 0);
+}
+
 void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code);
 
 static inline void input_set_abs_params(struct input_dev *dev, int axis, int min, int max, int fuzz, int flat)
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index d2e3cbfba14f..aa8c53171233 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -123,7 +123,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define ecap_eim_support(e)     ((e >> 4) & 0x1)
 #define ecap_ir_support(e)      ((e >> 3) & 0x1)
 #define ecap_max_handle_mask(e) ((e >> 20) & 0xf)
-
+#define ecap_sc_support(e)      ((e >> 7) & 0x1) /* Snooping Control */
 
 /* IOTLB_REG */
 #define DMA_TLB_FLUSH_GRANU_OFFSET  60
@@ -164,6 +164,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GCMD_QIE (((u32)1) << 26)
 #define DMA_GCMD_SIRTP (((u32)1) << 24)
 #define DMA_GCMD_IRE (((u32) 1) << 25)
+#define DMA_GCMD_CFI (((u32) 1) << 23)
 
 /* GSTS_REG */
 #define DMA_GSTS_TES (((u32)1) << 31)
@@ -174,6 +175,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GSTS_QIES (((u32)1) << 26)
 #define DMA_GSTS_IRTPS (((u32)1) << 24)
 #define DMA_GSTS_IRES (((u32)1) << 25)
+#define DMA_GSTS_CFIS (((u32)1) << 23)
 
 /* CCMD_REG */
 #define DMA_CCMD_ICC (((u64)1) << 63)
@@ -284,6 +286,14 @@ struct iommu_flush {
                 unsigned int size_order, u64 type, int non_present_entry_flush);
 };
 
+enum {
+        SR_DMAR_FECTL_REG,
+        SR_DMAR_FEDATA_REG,
+        SR_DMAR_FEADDR_REG,
+        SR_DMAR_FEUADDR_REG,
+        MAX_SR_DMAR_REGS
+};
+
 struct intel_iommu {
         void __iomem    *reg; /* Pointer to hardware regs, virtual addr */
         u64             cap;
@@ -292,6 +302,8 @@ struct intel_iommu {
         spinlock_t      register_lock; /* protect register handling */
         int             seq_id; /* sequence id of the iommu */
         int             agaw; /* agaw of this iommu */
+        unsigned int    irq;
+        unsigned char   name[13];    /* Device Name */
 
 #ifdef CONFIG_DMAR
         unsigned long   *domain_ids; /* bitmap of domains */
@@ -299,11 +311,11 @@ struct intel_iommu {
         spinlock_t      lock; /* protect context, domain ids */
         struct root_entry *root_entry; /* virtual address */
 
-        unsigned int irq;
-        unsigned char name[7];    /* Device Name */
         struct iommu_flush flush;
 #endif
         struct q_inval  *qi;            /* Queued invalidation info */
+        u32 *iommu_state; /* Store iommu states between suspend and resume.*/
+
 #ifdef CONFIG_INTR_REMAP
         struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
@@ -321,6 +333,8 @@ extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev);
 extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
+extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
@@ -331,11 +345,4 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
-extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t);
-extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t);
-extern dma_addr_t intel_map_single(struct device *, phys_addr_t, size_t, int);
-extern void intel_unmap_single(struct device *, dma_addr_t, size_t, int);
-extern int intel_map_sg(struct device *, struct scatterlist *, int, int);
-extern void intel_unmap_sg(struct device *, struct scatterlist *, int, int);
-
 #endif
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 9127f6b51a39..91bb76f44f14 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -59,8 +59,34 @@
 #define IRQF_NOBALANCING        0x00000800
 #define IRQF_IRQPOLL            0x00001000
 
+/*
+ * Bits used by threaded handlers:
+ * IRQTF_RUNTHREAD - signals that the interrupt handler thread should run
+ * IRQTF_DIED      - handler thread died
+ * IRQTF_WARNED    - warning "IRQ_WAKE_THREAD w/o thread_fn" has been printed
+ */
+enum {
+        IRQTF_RUNTHREAD,
+        IRQTF_DIED,
+        IRQTF_WARNED,
+};
+
 typedef irqreturn_t (*irq_handler_t)(int, void *);
 
+/**
+ * struct irqaction - per interrupt action descriptor
+ * @handler:    interrupt handler function
+ * @flags:      flags (see IRQF_* above)
+ * @mask:       no comment as it is useless and about to be removed
+ * @name:       name of the device
+ * @dev_id:     cookie to identify the device
+ * @next:       pointer to the next irqaction for shared interrupts
+ * @irq:        interrupt number
+ * @dir:        pointer to the proc/irq/NN/name entry
+ * @thread_fn:  interupt handler function for threaded interrupts
+ * @thread:     thread pointer for threaded interrupts
+ * @thread_flags:       flags related to @thread
+ */
 struct irqaction {
         irq_handler_t handler;
         unsigned long flags;
@@ -70,18 +96,68 @@ struct irqaction {
         struct irqaction *next;
         int irq;
         struct proc_dir_entry *dir;
+        irq_handler_t thread_fn;
+        struct task_struct *thread;
+        unsigned long thread_flags;
 };
 
 extern irqreturn_t no_action(int cpl, void *dev_id);
-extern int __must_check request_irq(unsigned int, irq_handler_t handler,
-                       unsigned long, const char *, void *);
+
+#ifdef CONFIG_GENERIC_HARDIRQS
+extern int __must_check
+request_threaded_irq(unsigned int irq, irq_handler_t handler,
+                     irq_handler_t thread_fn,
+                     unsigned long flags, const char *name, void *dev);
+
+static inline int __must_check
+request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
+            const char *name, void *dev)
+{
+        return request_threaded_irq(irq, handler, NULL, flags, name, dev);
+}
+
+extern void exit_irq_thread(void);
+#else
+
+extern int __must_check
+request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
+            const char *name, void *dev);
+
+/*
+ * Special function to avoid ifdeffery in kernel/irq/devres.c which
+ * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
+ * m68k). I really love these $@%#!* obvious Makefile references:
+ * ../../../kernel/irq/devres.o
+ */
+static inline int __must_check
+request_threaded_irq(unsigned int irq, irq_handler_t handler,
+                     irq_handler_t thread_fn,
+                     unsigned long flags, const char *name, void *dev)
+{
+        return request_irq(irq, handler, flags, name, dev);
+}
+
+static inline void exit_irq_thread(void) { }
+#endif
+
 extern void free_irq(unsigned int, void *);
 
 struct device;
 
-extern int __must_check devm_request_irq(struct device *dev, unsigned int irq,
-                            irq_handler_t handler, unsigned long irqflags,
-                            const char *devname, void *dev_id);
+extern int __must_check
+devm_request_threaded_irq(struct device *dev, unsigned int irq,
+                          irq_handler_t handler, irq_handler_t thread_fn,
+                          unsigned long irqflags, const char *devname,
+                          void *dev_id);
+
+static inline int __must_check
+devm_request_irq(struct device *dev, unsigned int irq, irq_handler_t handler,
+                 unsigned long irqflags, const char *devname, void *dev_id)
+{
+        return devm_request_threaded_irq(dev, irq, handler, NULL, irqflags,
+                                         devname, dev_id);
+}
+
 extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
 
 /*
@@ -106,6 +182,15 @@ extern void disable_irq_nosync(unsigned int irq);
 extern void disable_irq(unsigned int irq);
 extern void enable_irq(unsigned int irq);
 
+/* The following three functions are for the core kernel use only. */
+extern void suspend_device_irqs(void);
+extern void resume_device_irqs(void);
+#ifdef CONFIG_PM_SLEEP
+extern int check_wakeup_irqs(void);
+#else
+static inline int check_wakeup_irqs(void) { return 0; }
+#endif
+
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
 
 extern cpumask_var_t irq_default_affinity;
@@ -258,6 +343,11 @@ enum
         NR_SOFTIRQS
 };
 
+/* map softirq index to softirq name. update 'softirq_to_name' in
+ * kernel/softirq.c when adding a new softirq.
+ */
+extern char *softirq_to_name[NR_SOFTIRQS];
+
 /* softirq mask and active fields moved to irq_cpustat_t in
  * asm/hardirq.h to get better cache usage.  KAO
  */
@@ -274,6 +364,7 @@ extern void softirq_init(void);
 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
 extern void raise_softirq_irqoff(unsigned int nr);
 extern void raise_softirq(unsigned int nr);
+extern void wakeup_softirqd(void);
 
 /* This is the worklist that queues up per-cpu softirq work.
  *
@@ -462,11 +553,18 @@ static inline void init_irq_proc(void)
 }
 #endif
 
+#if defined(CONFIG_GENERIC_HARDIRQS) && defined(CONFIG_DEBUG_SHIRQ)
+extern void debug_poll_all_shared_irqs(void);
+#else
+static inline void debug_poll_all_shared_irqs(void) { }
+#endif
+
 int show_interrupts(struct seq_file *p, void *v);
 
 struct irq_desc;
 
 extern int early_irq_init(void);
+extern int arch_probe_nr_irqs(void);
 extern int arch_early_irq_init(void);
 extern int arch_init_chip_data(struct irq_desc *desc, int cpu);
 
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 8a7bfb1b6ca0..3af4ffd591b9 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -21,6 +21,7 @@
 
 #define IOMMU_READ      (1)
 #define IOMMU_WRITE     (2)
+#define IOMMU_CACHE     (4) /* DMA cache coherency */
 
 struct device;
 
@@ -28,6 +29,8 @@ struct iommu_domain {
         void *priv;
 };
 
+#define IOMMU_CAP_CACHE_COHERENCY       0x1
+
 struct iommu_ops {
         int (*domain_init)(struct iommu_domain *domain);
         void (*domain_destroy)(struct iommu_domain *domain);
@@ -39,6 +42,8 @@ struct iommu_ops {
                       size_t size);
         phys_addr_t (*iova_to_phys)(struct iommu_domain *domain,
                                     unsigned long iova);
+        int (*domain_has_cap)(struct iommu_domain *domain,
+                              unsigned long cap);
 };
 
 #ifdef CONFIG_IOMMU_API
@@ -57,6 +62,8 @@ extern void iommu_unmap_range(struct iommu_domain *domain, unsigned long iova,
                               size_t size);
 extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
                                       unsigned long iova);
+extern int iommu_domain_has_cap(struct iommu_domain *domain,
+                                unsigned long cap);
 
 #else /* CONFIG_IOMMU_API */
 
@@ -107,6 +114,12 @@ static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
         return 0;
 }
 
+static inline int domain_has_cap(struct iommu_domain *domain,
+                                 unsigned long cap)
+{
+        return 0;
+}
+
 #endif /* CONFIG_IOMMU_API */
 
 #endif /* __LINUX_IOMMU_H */
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 0f434a28fb58..148265e63e8d 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -96,10 +96,10 @@
  */
 struct ip_vs_service_user {
         /* virtual service addresses */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual ip address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* virtual service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -119,8 +119,8 @@ struct ip_vs_dest_user {
         int                     weight;         /* destination weight */
 
         /* thresholds for active connections */
-        u_int32_t               u_threshold;    /* upper threshold */
-        u_int32_t               l_threshold;    /* lower threshold */
+        __u32           u_threshold;    /* upper threshold */
+        __u32           l_threshold;    /* lower threshold */
 };
 
 
@@ -159,10 +159,10 @@ struct ip_vs_getinfo {
 /* The argument to IP_VS_SO_GET_SERVICE */
 struct ip_vs_service_entry {
         /* which service: user fills in these */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -184,12 +184,12 @@ struct ip_vs_dest_entry {
         unsigned                conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
-        u_int32_t               u_threshold;    /* upper threshold */
-        u_int32_t               l_threshold;    /* lower threshold */
+        __u32           u_threshold;    /* upper threshold */
+        __u32           l_threshold;    /* lower threshold */
 
-        u_int32_t               activeconns;    /* active connections */
-        u_int32_t               inactconns;     /* inactive connections */
-        u_int32_t               persistconns;   /* persistent connections */
+        __u32           activeconns;    /* active connections */
+        __u32           inactconns;     /* inactive connections */
+        __u32           persistconns;   /* persistent connections */
 
         /* statistics */
         struct ip_vs_stats_user stats;
@@ -199,10 +199,10 @@ struct ip_vs_dest_entry {
 /* The argument to IP_VS_SO_GET_DESTS */
 struct ip_vs_get_dests {
         /* which service: user fills in these */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* number of real servers */
         unsigned int            num_dests;
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ea330f9e7100..3bf40e246a80 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -25,7 +25,7 @@ struct ipc_ids {
 };
 
 struct ipc_namespace {
-        struct kref     kref;
+        atomic_t        count;
         struct ipc_ids  ids[3];
 
         int             sem_ctls[4];
@@ -44,25 +44,57 @@ struct ipc_namespace {
         int             shm_tot;
 
         struct notifier_block ipcns_nb;
+
+        /* The kern_mount of the mqueuefs sb.  We take a ref on it */
+        struct vfsmount *mq_mnt;
+
+        /* # queues in this ns, protected by mq_lock */
+        unsigned int    mq_queues_count;
+
+        /* next fields are set through sysctl */
+        unsigned int    mq_queues_max;   /* initialized to DFLT_QUEUESMAX */
+        unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
+        unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
+
 };
 
 extern struct ipc_namespace init_ipc_ns;
 extern atomic_t nr_ipc_ns;
 
-#ifdef CONFIG_SYSVIPC
+extern spinlock_t mq_lock;
+#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
 #define INIT_IPC_NS(ns)         .ns             = &init_ipc_ns,
+#else
+#define INIT_IPC_NS(ns)
+#endif
 
+#ifdef CONFIG_SYSVIPC
 extern int register_ipcns_notifier(struct ipc_namespace *);
 extern int cond_register_ipcns_notifier(struct ipc_namespace *);
 extern void unregister_ipcns_notifier(struct ipc_namespace *);
 extern int ipcns_notify(unsigned long);
-
 #else /* CONFIG_SYSVIPC */
-#define INIT_IPC_NS(ns)
+static inline int register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline int cond_register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline void unregister_ipcns_notifier(struct ipc_namespace *ns) { }
+static inline int ipcns_notify(unsigned long l) { return 0; }
 #endif /* CONFIG_SYSVIPC */
 
-#if defined(CONFIG_SYSVIPC) && defined(CONFIG_IPC_NS)
-extern void free_ipc_ns(struct kref *kref);
+#ifdef CONFIG_POSIX_MQUEUE
+extern int mq_init_ns(struct ipc_namespace *ns);
+/* default values */
+#define DFLT_QUEUESMAX 256     /* max number of message queues */
+#define DFLT_MSGMAX    10      /* max number of messages in each queue */
+#define HARD_MSGMAX    (131072/sizeof(void *))
+#define DFLT_MSGSIZEMAX 8192   /* max message size */
+#else
+static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
+#endif
+
+#if defined(CONFIG_IPC_NS)
+extern void free_ipc_ns(struct ipc_namespace *ns);
 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
                                        struct ipc_namespace *ns);
 extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
@@ -72,14 +104,11 @@ extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
 {
         if (ns)
-                kref_get(&ns->kref);
+                atomic_inc(&ns->count);
         return ns;
 }
 
-static inline void put_ipc_ns(struct ipc_namespace *ns)
-{
-        kref_put(&ns->kref, free_ipc_ns);
-}
+extern void put_ipc_ns(struct ipc_namespace *ns);
 #else
 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
                 struct ipc_namespace *ns)
@@ -99,4 +128,18 @@ static inline void put_ipc_ns(struct ipc_namespace *ns)
 {
 }
 #endif
+
+#ifdef CONFIG_POSIX_MQUEUE_SYSCTL
+
+struct ctl_table_header;
+extern struct ctl_table_header *mq_register_sysctl_table(void);
+
+#else /* CONFIG_POSIX_MQUEUE_SYSCTL */
+
+static inline struct ctl_table_header *mq_register_sysctl_table(void)
+{
+        return NULL;
+}
+
+#endif /* CONFIG_POSIX_MQUEUE_SYSCTL */
 #endif
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 7ebdb4fb4e54..65aae34759de 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -198,6 +198,8 @@ struct kernel_ipmi_msg {
                                               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. */
 
diff --git a/include/linux/ipmi_msgdefs.h b/include/linux/ipmi_msgdefs.h
index b56a158d587a..df97e6e31e87 100644
--- a/include/linux/ipmi_msgdefs.h
+++ b/include/linux/ipmi_msgdefs.h
@@ -58,6 +58,12 @@
 #define IPMI_READ_EVENT_MSG_BUFFER_CMD  0x35
 #define IPMI_GET_CHANNEL_INFO_CMD       0x42
 
+/* Bit for BMC global enables. */
+#define IPMI_BMC_RCV_MSG_INTR     0x01
+#define IPMI_BMC_EVT_MSG_INTR     0x02
+#define IPMI_BMC_EVT_MSG_BUFF     0x04
+#define IPMI_BMC_SYS_LOG          0x08
+
 #define IPMI_NETFN_STORAGE_REQUEST              0x0a
 #define IPMI_NETFN_STORAGE_RESPONSE             0x0b
 #define IPMI_ADD_SEL_ENTRY_CMD          0x44
@@ -109,5 +115,7 @@
 #define IPMI_CHANNEL_MEDIUM_USB1        10
 #define IPMI_CHANNEL_MEDIUM_USB2        11
 #define IPMI_CHANNEL_MEDIUM_SYSINTF     12
+#define IPMI_CHANNEL_MEDIUM_OEM_MIN     0x60
+#define IPMI_CHANNEL_MEDIUM_OEM_MAX     0x7f
 
 #endif /* __LINUX_IPMI_MSGDEFS_H */
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 62b73668b602..f7c9c75a2775 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -230,6 +230,6 @@ static inline void ipmi_free_smi_msg(struct ipmi_smi_msg *msg)
    automatically be dstroyed when the interface is destroyed. */
 int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
                             read_proc_t *read_proc,
-                            void *data, struct module *owner);
+                            void *data);
 
 #endif /* __LINUX_IPMI_SMI_H */
diff --git a/include/linux/irq.h b/include/linux/irq.h
index f899b502f186..b7cbeed972e4 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -17,9 +17,12 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/cpumask.h>
+#include <linux/gfp.h>
 #include <linux/irqreturn.h>
 #include <linux/irqnr.h>
 #include <linux/errno.h>
+#include <linux/topology.h>
+#include <linux/wait.h>
 
 #include <asm/irq.h>
 #include <asm/ptrace.h>
@@ -65,6 +68,7 @@ typedef	void (*irq_flow_handler_t)(unsigned int irq,
 #define IRQ_SPURIOUS_DISABLED   0x00800000      /* IRQ was disabled by the spurious trap */
 #define IRQ_MOVE_PCNTXT         0x01000000      /* IRQ migration from process context */
 #define IRQ_AFFINITY_SET        0x02000000      /* IRQ affinity was set from userspace*/
+#define IRQ_SUSPENDED           0x04000000      /* IRQ has gone through suspend sequence */
 
 #ifdef CONFIG_IRQ_PER_CPU
 # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)
@@ -155,17 +159,17 @@ struct irq_2_iommu;
  * @affinity:           IRQ affinity on SMP
  * @cpu:                cpu index useful for balancing
  * @pending_mask:       pending rebalanced interrupts
+ * @threads_active:     number of irqaction threads currently running
+ * @wait_for_threads:   wait queue for sync_irq to wait for threaded handlers
  * @dir:                /proc/irq/ procfs entry
  * @name:               flow handler name for /proc/interrupts output
  */
 struct irq_desc {
         unsigned int            irq;
-#ifdef CONFIG_SPARSE_IRQ
         struct timer_rand_state *timer_rand_state;
         unsigned int            *kstat_irqs;
-# ifdef CONFIG_INTR_REMAP
+#ifdef CONFIG_INTR_REMAP
         struct irq_2_iommu      *irq_2_iommu;
-# endif
 #endif
         irq_flow_handler_t      handle_irq;
         struct irq_chip         *chip;
@@ -182,12 +186,14 @@ struct irq_desc {
         unsigned int            irqs_unhandled;
         spinlock_t              lock;
 #ifdef CONFIG_SMP
-        cpumask_t               affinity;
+        cpumask_var_t           affinity;
         unsigned int            cpu;
-#endif
 #ifdef CONFIG_GENERIC_PENDING_IRQ
-        cpumask_t               pending_mask;
+        cpumask_var_t           pending_mask;
+#endif
 #endif
+        atomic_t                threads_active;
+        wait_queue_head_t       wait_for_threads;
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry   *dir;
 #endif
@@ -202,12 +208,6 @@ extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc
 extern struct irq_desc irq_desc[NR_IRQS];
 #else /* CONFIG_SPARSE_IRQ */
 extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
-
-#define kstat_irqs_this_cpu(DESC) \
-        ((DESC)->kstat_irqs[smp_processor_id()])
-#define kstat_incr_irqs_this_cpu(irqno, DESC) \
-        ((DESC)->kstat_irqs[smp_processor_id()]++)
-
 #endif /* CONFIG_SPARSE_IRQ */
 
 extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
@@ -226,7 +226,6 @@ irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)
  * Migration helpers for obsolete names, they will go away:
  */
 #define hw_interrupt_type       irq_chip
-typedef struct irq_chip         hw_irq_controller;
 #define no_irq_type             no_irq_chip
 typedef struct irq_desc         irq_desc_t;
 
@@ -236,6 +235,7 @@ typedef struct irq_desc		irq_desc_t;
 #include <asm/hw_irq.h>
 
 extern int setup_irq(unsigned int irq, struct irqaction *new);
+extern void remove_irq(unsigned int irq, struct irqaction *act);
 
 #ifdef CONFIG_GENERIC_HARDIRQS
 
@@ -280,7 +280,7 @@ static inline int irq_balancing_disabled(unsigned int irq)
 }
 
 /* Handle irq action chains: */
-extern int handle_IRQ_event(unsigned int irq, struct irqaction *action);
+extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
 
 /*
  * Built-in IRQ handlers for various IRQ types,
@@ -325,7 +325,7 @@ static inline void generic_handle_irq(unsigned int irq)
 
 /* Handling of unhandled and spurious interrupts: */
 extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
-                           int action_ret);
+                           irqreturn_t action_ret);
 
 /* Resending of interrupts :*/
 void check_irq_resend(struct irq_desc *desc, unsigned int irq);
@@ -422,4 +422,98 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
 
 #endif /* !CONFIG_S390 */
 
+#ifdef CONFIG_SMP
+/**
+ * init_alloc_desc_masks - allocate cpumasks for irq_desc
+ * @desc:       pointer to irq_desc struct
+ * @cpu:        cpu which will be handling the cpumasks
+ * @boot:       true if need bootmem
+ *
+ * Allocates affinity and pending_mask cpumask if required.
+ * Returns true if successful (or not required).
+ * Side effect: affinity has all bits set, pending_mask has all bits clear.
+ */
+static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu,
+                                                                bool boot)
+{
+        int node;
+
+        if (boot) {
+                alloc_bootmem_cpumask_var(&desc->affinity);
+                cpumask_setall(desc->affinity);
+
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+                alloc_bootmem_cpumask_var(&desc->pending_mask);
+                cpumask_clear(desc->pending_mask);
+#endif
+                return true;
+        }
+
+        node = cpu_to_node(cpu);
+
+        if (!alloc_cpumask_var_node(&desc->affinity, GFP_ATOMIC, node))
+                return false;
+        cpumask_setall(desc->affinity);
+
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+        if (!alloc_cpumask_var_node(&desc->pending_mask, GFP_ATOMIC, node)) {
+                free_cpumask_var(desc->affinity);
+                return false;
+        }
+        cpumask_clear(desc->pending_mask);
+#endif
+        return true;
+}
+
+/**
+ * init_copy_desc_masks - copy cpumasks for irq_desc
+ * @old_desc:   pointer to old irq_desc struct
+ * @new_desc:   pointer to new irq_desc struct
+ *
+ * Insures affinity and pending_masks are copied to new irq_desc.
+ * If !CONFIG_CPUMASKS_OFFSTACK the cpumasks are embedded in the
+ * irq_desc struct so the copy is redundant.
+ */
+
+static inline void init_copy_desc_masks(struct irq_desc *old_desc,
+                                        struct irq_desc *new_desc)
+{
+#ifdef CONFIG_CPUMASKS_OFFSTACK
+        cpumask_copy(new_desc->affinity, old_desc->affinity);
+
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+        cpumask_copy(new_desc->pending_mask, old_desc->pending_mask);
+#endif
+#endif
+}
+
+static inline void free_desc_masks(struct irq_desc *old_desc,
+                                   struct irq_desc *new_desc)
+{
+        free_cpumask_var(old_desc->affinity);
+
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+        free_cpumask_var(old_desc->pending_mask);
+#endif
+}
+
+#else /* !CONFIG_SMP */
+
+static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu,
+                                                                bool boot)
+{
+        return true;
+}
+
+static inline void init_copy_desc_masks(struct irq_desc *old_desc,
+                                        struct irq_desc *new_desc)
+{
+}
+
+static inline void free_desc_masks(struct irq_desc *old_desc,
+                                   struct irq_desc *new_desc)
+{
+}
+#endif  /* CONFIG_SMP */
+
 #endif /* _LINUX_IRQ_H */
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 74bde13224c9..b02a3f1d46a0 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -24,8 +24,8 @@
 # define trace_softirqs_enabled(p)      ((p)->softirqs_enabled)
 # define trace_hardirq_enter()  do { current->hardirq_context++; } while (0)
 # define trace_hardirq_exit()   do { current->hardirq_context--; } while (0)
-# define trace_softirq_enter()  do { current->softirq_context++; } while (0)
-# define trace_softirq_exit()   do { current->softirq_context--; } while (0)
+# define lockdep_softirq_enter()        do { current->softirq_context++; } while (0)
+# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
 # define INIT_TRACE_IRQFLAGS    .softirqs_enabled = 1,
 #else
 # define trace_hardirqs_on()            do { } while (0)
@@ -38,8 +38,8 @@
 # define trace_softirqs_enabled(p)      0
 # define trace_hardirq_enter()          do { } while (0)
 # define trace_hardirq_exit()           do { } while (0)
-# define trace_softirq_enter()          do { } while (0)
-# define trace_softirq_exit()           do { } while (0)
+# define lockdep_softirq_enter()        do { } while (0)
+# define lockdep_softirq_exit()         do { } while (0)
 # define INIT_TRACE_IRQFLAGS
 #endif
 
diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 86af92e9e84c..ec87b212ff7d 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -20,6 +20,7 @@
 
 # define for_each_irq_desc_reverse(irq, desc)                          \
         for (irq = nr_irqs - 1; irq >= 0; irq--)
+
 #else /* CONFIG_GENERIC_HARDIRQS */
 
 extern int nr_irqs;
@@ -28,13 +29,17 @@ extern struct irq_desc *irq_to_desc(unsigned int irq);
 # define for_each_irq_desc(irq, desc)                                   \
         for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs;           \
              irq++, desc = irq_to_desc(irq))                            \
-                if (desc)
+                if (!desc)                                              \
+                        ;                                               \
+                else
 
 
 # define for_each_irq_desc_reverse(irq, desc)                           \
         for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0;      \
              irq--, desc = irq_to_desc(irq))                            \
-                if (desc)
+                if (!desc)                                              \
+                        ;                                               \
+                else
 
 #endif /* CONFIG_GENERIC_HARDIRQS */
 
diff --git a/include/linux/irqreturn.h b/include/linux/irqreturn.h
index 881883c2009d..819acaaac3f5 100644
--- a/include/linux/irqreturn.h
+++ b/include/linux/irqreturn.h
@@ -1,25 +1,19 @@
-/* irqreturn.h */
 #ifndef _LINUX_IRQRETURN_H
 #define _LINUX_IRQRETURN_H
 
-/*
- * For 2.4.x compatibility, 2.4.x can use
- *
- *      typedef void irqreturn_t;
- *      #define IRQ_NONE
- *      #define IRQ_HANDLED
- *      #define IRQ_RETVAL(x)
- *
- * To mix old-style and new-style irq handler returns.
- *
- * IRQ_NONE means we didn't handle it.
- * IRQ_HANDLED means that we did have a valid interrupt and handled it.
- * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
+/**
+ * enum irqreturn
+ * @IRQ_NONE            interrupt was not from this device
+ * @IRQ_HANDLED         interrupt was handled by this device
+ * @IRQ_WAKE_THREAD     handler requests to wake the handler thread
  */
-typedef int irqreturn_t;
+enum irqreturn {
+        IRQ_NONE,
+        IRQ_HANDLED,
+        IRQ_WAKE_THREAD,
+};
 
-#define IRQ_NONE        (0)
-#define IRQ_HANDLED     (1)
-#define IRQ_RETVAL(x)   ((x) != 0)
+typedef enum irqreturn irqreturn_t;
+#define IRQ_RETVAL(x)   ((x) != IRQ_NONE)
 
 #endif
diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
index f2720280b9ec..062d20f74322 100644
--- a/include/linux/ivtv.h
+++ b/include/linux/ivtv.h
@@ -60,10 +60,10 @@ struct ivtv_dma_frame {
 
 #define IVTV_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
 
-/* These are the VBI types as they appear in the embedded VBI private packets. */
-#define IVTV_SLICED_TYPE_TELETEXT_B     (1)
-#define IVTV_SLICED_TYPE_CAPTION_525    (4)
-#define IVTV_SLICED_TYPE_WSS_625        (5)
-#define IVTV_SLICED_TYPE_VPS            (7)
+/* Deprecated defines: applications should use the defines from videodev2.h */
+#define IVTV_SLICED_TYPE_TELETEXT_B     V4L2_MPEG_VBI_IVTV_TELETEXT_B
+#define IVTV_SLICED_TYPE_CAPTION_525    V4L2_MPEG_VBI_IVTV_CAPTION_525
+#define IVTV_SLICED_TYPE_WSS_625        V4L2_MPEG_VBI_IVTV_WSS_625
+#define IVTV_SLICED_TYPE_VPS            V4L2_MPEG_VBI_IVTV_VPS
 
 #endif /* _LINUX_IVTV_H */
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
index e20af47b59ad..9d88b29ddf55 100644
--- a/include/linux/ivtvfb.h
+++ b/include/linux/ivtvfb.h
@@ -33,6 +33,6 @@ struct ivtvfb_dma_frame {
 };
 
 #define IVTVFB_IOC_DMA_FRAME    _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
-#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, u_int32_t)
+#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, __u32)
 
 #endif
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 64246dce5663..c2049a04fa0b 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -35,7 +35,7 @@
 #define journal_oom_retry 1
 
 /*
- * Define JBD_PARANIOD_IOFAIL to cause a kernel BUG() if ext3 finds
+ * Define JBD_PARANOID_IOFAIL to cause a kernel BUG() if ext3 finds
  * certain classes of error which can occur due to failed IOs.  Under
  * normal use we want ext3 to continue after such errors, because
  * hardware _can_ fail, but for debugging purposes when running tests on
@@ -552,6 +552,11 @@ struct transaction_s
          */
         int t_handle_count;
 
+        /*
+         * This transaction is being forced and some process is
+         * waiting for it to finish.
+         */
+        int t_synchronous_commit:1;
 };
 
 /**
@@ -973,7 +978,8 @@ extern void	   journal_destroy_revoke(journal_t *);
 extern int         journal_revoke (handle_t *,
                                 unsigned long, struct buffer_head *);
 extern int         journal_cancel_revoke(handle_t *, struct journal_head *);
-extern void        journal_write_revoke_records(journal_t *, transaction_t *);
+extern void        journal_write_revoke_records(journal_t *,
+                                                transaction_t *, int);
 
 /* Recovery revoke support */
 extern int      journal_set_revoke(journal_t *, unsigned long, tid_t);
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 4d248b3f1323..cc02393bfce8 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -649,6 +649,12 @@ struct transaction_s
         int t_handle_count;
 
         /*
+         * This transaction is being forced and some process is
+         * waiting for it to finish.
+         */
+        int t_synchronous_commit:1;
+
+        /*
          * For use by the filesystem to store fs-specific data
          * structures associated with the transaction
          */
@@ -1187,7 +1193,8 @@ extern int	   jbd2_journal_init_revoke_caches(void);
 extern void        jbd2_journal_destroy_revoke(journal_t *);
 extern int         jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);
 extern int         jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
-extern void        jbd2_journal_write_revoke_records(journal_t *, transaction_t *);
+extern void        jbd2_journal_write_revoke_records(journal_t *,
+                                                     transaction_t *, int);
 
 /* Recovery revoke support */
 extern int      jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index da720bc3eb15..2b32d638147d 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_JFFS2_H__
 #define __LINUX_JFFS2_H__
 
+#include <linux/types.h>
 #include <linux/magic.h>
 
 /* You must include something which defines the C99 uintXX_t types. 
@@ -91,15 +92,15 @@
    byteswapping */
 
 typedef struct {
-        uint32_t v32;
+        __u32 v32;
 } __attribute__((packed)) jint32_t;
 
 typedef struct {
-        uint32_t m;
+        __u32 m;
 } __attribute__((packed)) jmode_t;
 
 typedef struct {
-        uint16_t v16;
+        __u16 v16;
 } __attribute__((packed)) jint16_t;
 
 struct jffs2_unknown_node
@@ -121,12 +122,12 @@ struct jffs2_raw_dirent
         jint32_t version;
         jint32_t ino; /* == zero for unlink */
         jint32_t mctime;
-        uint8_t nsize;
-        uint8_t type;
-        uint8_t unused[2];
+        __u8 nsize;
+        __u8 type;
+        __u8 unused[2];
         jint32_t node_crc;
         jint32_t name_crc;
-        uint8_t name[0];
+        __u8 name[0];
 };
 
 /* The JFFS2 raw inode structure: Used for storage on physical media.  */
@@ -153,12 +154,12 @@ struct jffs2_raw_inode
         jint32_t offset;     /* Where to begin to write.  */
         jint32_t csize;      /* (Compressed) data size */
         jint32_t dsize;      /* Size of the node's data. (after decompression) */
-        uint8_t compr;       /* Compression algorithm used */
-        uint8_t usercompr;   /* Compression algorithm requested by the user */
+        __u8 compr;       /* Compression algorithm used */
+        __u8 usercompr;   /* Compression algorithm requested by the user */
         jint16_t flags;      /* See JFFS2_INO_FLAG_* */
         jint32_t data_crc;   /* CRC for the (compressed) data.  */
         jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */
-        uint8_t data[0];
+        __u8 data[0];
 };
 
 struct jffs2_raw_xattr {
@@ -168,12 +169,12 @@ struct jffs2_raw_xattr {
         jint32_t hdr_crc;
         jint32_t xid;           /* XATTR identifier number */
         jint32_t version;
-        uint8_t xprefix;
-        uint8_t name_len;
+        __u8 xprefix;
+        __u8 name_len;
         jint16_t value_len;
         jint32_t data_crc;
         jint32_t node_crc;
-        uint8_t data[0];
+        __u8 data[0];
 } __attribute__((packed));
 
 struct jffs2_raw_xref
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index f3fe34391d8e..792274269f2b 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -13,10 +13,17 @@
 #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
                          2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
 
+struct module;
+
 #ifdef CONFIG_KALLSYMS
 /* Lookup the address for a symbol. Returns 0 if not found. */
 unsigned long kallsyms_lookup_name(const char *name);
 
+/* Call a function on each kallsyms symbol in the core kernel */
+int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
+                                      unsigned long),
+                            void *data);
+
 extern int kallsyms_lookup_size_offset(unsigned long addr,
                                   unsigned long *symbolsize,
                                   unsigned long *offset);
@@ -43,6 +50,14 @@ static inline unsigned long kallsyms_lookup_name(const char *name)
         return 0;
 }
 
+static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *,
+                                                    struct module *,
+                                                    unsigned long),
+                                          void *data)
+{
+        return 0;
+}
+
 static inline int kallsyms_lookup_size_offset(unsigned long addr,
                                               unsigned long *symbolsize,
                                               unsigned long *offset)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7fa371898e3e..883cd44ff765 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -16,7 +16,7 @@
 #include <linux/log2.h>
 #include <linux/typecheck.h>
 #include <linux/ratelimit.h>
-#include <linux/dynamic_printk.h>
+#include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
 #include <asm/bug.h>
 
@@ -242,6 +242,20 @@ extern struct ratelimit_state printk_ratelimit_state;
 extern int printk_ratelimit(void);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
                                    unsigned int interval_msec);
+
+/*
+ * Print a one-time message (analogous to WARN_ONCE() et al):
+ */
+#define printk_once(x...) ({                    \
+        static int __print_once = 1;            \
+                                                \
+        if (__print_once) {                     \
+                __print_once = 0;               \
+                printk(x);                      \
+        }                                       \
+})
+
+void log_buf_kexec_setup(void);
 #else
 static inline int vprintk(const char *s, va_list args)
         __attribute__ ((format (printf, 1, 0)));
@@ -253,6 +267,13 @@ static inline int printk_ratelimit(void) { return 0; }
 static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
                                           unsigned int interval_msec)   \
                 { return false; }
+
+/* No effect, but we still get type checking even in the !PRINTK case: */
+#define printk_once(x...) printk(x)
+
+static inline void log_buf_kexec_setup(void)
+{
+}
 #endif
 
 extern int printk_needs_cpu(int cpu);
@@ -353,14 +374,26 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
         printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_info(fmt, ...) \
         printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_cont(fmt, ...) \
+        printk(KERN_CONT fmt, ##__VA_ARGS__)
+
+/* pr_devel() should produce zero code unless DEBUG is defined */
+#ifdef DEBUG
+#define pr_devel(fmt, ...) \
+        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_devel(fmt, ...) \
+        ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })
+#endif
 
 /* If you are writing a driver, please use dev_dbg instead */
 #if defined(DEBUG)
 #define pr_debug(fmt, ...) \
         printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
-#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
+#elif defined(CONFIG_DYNAMIC_DEBUG)
+/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
 #define pr_debug(fmt, ...) do { \
-        dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \
+        dynamic_pr_debug(fmt, ##__VA_ARGS__); \
         } while (0)
 #else
 #define pr_debug(fmt, ...) \
@@ -368,6 +401,139 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
 #endif
 
 /*
+ * General tracing related utility functions - trace_printk(),
+ * tracing_on/tracing_off and tracing_start()/tracing_stop
+ *
+ * Use tracing_on/tracing_off when you want to quickly turn on or off
+ * tracing. It simply enables or disables the recording of the trace events.
+ * This also corresponds to the user space debugfs/tracing/tracing_on
+ * file, which gives a means for the kernel and userspace to interact.
+ * Place a tracing_off() in the kernel where you want tracing to end.
+ * From user space, examine the trace, and then echo 1 > tracing_on
+ * to continue tracing.
+ *
+ * tracing_stop/tracing_start has slightly more overhead. It is used
+ * by things like suspend to ram where disabling the recording of the
+ * trace is not enough, but tracing must actually stop because things
+ * like calling smp_processor_id() may crash the system.
+ *
+ * Most likely, you want to use tracing_on/tracing_off.
+ */
+#ifdef CONFIG_RING_BUFFER
+void tracing_on(void);
+void tracing_off(void);
+/* trace_off_permanent stops recording with no way to bring it back */
+void tracing_off_permanent(void);
+int tracing_is_on(void);
+#else
+static inline void tracing_on(void) { }
+static inline void tracing_off(void) { }
+static inline void tracing_off_permanent(void) { }
+static inline int tracing_is_on(void) { return 0; }
+#endif
+#ifdef CONFIG_TRACING
+extern void tracing_start(void);
+extern void tracing_stop(void);
+extern void ftrace_off_permanent(void);
+
+extern void
+ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
+
+static inline void __attribute__ ((format (printf, 1, 2)))
+____trace_printk_check_format(const char *fmt, ...)
+{
+}
+#define __trace_printk_check_format(fmt, args...)                       \
+do {                                                                    \
+        if (0)                                                          \
+                ____trace_printk_check_format(fmt, ##args);             \
+} while (0)
+
+/**
+ * trace_printk - printf formatting in the ftrace buffer
+ * @fmt: the printf format for printing
+ *
+ * Note: __trace_printk is an internal function for trace_printk and
+ *       the @ip is passed in via the trace_printk macro.
+ *
+ * This function allows a kernel developer to debug fast path sections
+ * that printk is not appropriate for. By scattering in various
+ * printk like tracing in the code, a developer can quickly see
+ * where problems are occurring.
+ *
+ * This is intended as a debugging tool for the developer only.
+ * Please refrain from leaving trace_printks scattered around in
+ * your code.
+ */
+
+#define trace_printk(fmt, args...)                                      \
+do {                                                                    \
+        __trace_printk_check_format(fmt, ##args);                       \
+        if (__builtin_constant_p(fmt)) {                                \
+                static const char *trace_printk_fmt                     \
+                  __attribute__((section("__trace_printk_fmt"))) =      \
+                        __builtin_constant_p(fmt) ? fmt : NULL;         \
+                                                                        \
+                __trace_bprintk(_THIS_IP_, trace_printk_fmt, ##args);   \
+        } else                                                          \
+                __trace_printk(_THIS_IP_, fmt, ##args);         \
+} while (0)
+
+extern int
+__trace_bprintk(unsigned long ip, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+
+extern int
+__trace_printk(unsigned long ip, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+
+/*
+ * The double __builtin_constant_p is because gcc will give us an error
+ * if we try to allocate the static variable to fmt if it is not a
+ * constant. Even with the outer if statement.
+ */
+#define ftrace_vprintk(fmt, vargs)                                      \
+do {                                                                    \
+        if (__builtin_constant_p(fmt)) {                                \
+                static const char *trace_printk_fmt                     \
+                  __attribute__((section("__trace_printk_fmt"))) =      \
+                        __builtin_constant_p(fmt) ? fmt : NULL;         \
+                                                                        \
+                __ftrace_vbprintk(_THIS_IP_, trace_printk_fmt, vargs);  \
+        } else                                                          \
+                __ftrace_vprintk(_THIS_IP_, fmt, vargs);                \
+} while (0)
+
+extern int
+__ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
+
+extern int
+__ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
+
+extern void ftrace_dump(void);
+#else
+static inline void
+ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
+static inline int
+trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+
+static inline void tracing_start(void) { }
+static inline void tracing_stop(void) { }
+static inline void ftrace_off_permanent(void) { }
+static inline int
+trace_printk(const char *fmt, ...)
+{
+        return 0;
+}
+static inline int
+ftrace_vprintk(const char *fmt, va_list ap)
+{
+        return 0;
+}
+static inline void ftrace_dump(void) { }
+#endif /* CONFIG_TRACING */
+
+/*
  *      Display an IP address in readable format.
  */
 
@@ -378,18 +544,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
         ((unsigned char *)&addr)[3]
 #define NIPQUAD_FMT "%u.%u.%u.%u"
 
-#if defined(__LITTLE_ENDIAN)
-#define HIPQUAD(addr) \
-        ((unsigned char *)&addr)[3], \
-        ((unsigned char *)&addr)[2], \
-        ((unsigned char *)&addr)[1], \
-        ((unsigned char *)&addr)[0]
-#elif defined(__BIG_ENDIAN)
-#define HIPQUAD NIPQUAD
-#else
-#error "Please fix asm/byteorder.h"
-#endif /* __LITTLE_ENDIAN */
-
 /*
  * min()/max()/clamp() macros that also do
  * strict type-checking.. See the
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 570d20413119..0c8b89f28a95 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -28,7 +28,7 @@ struct cpu_usage_stat {
 
 struct kernel_stat {
         struct cpu_usage_stat   cpustat;
-#ifndef CONFIG_SPARSE_IRQ
+#ifndef CONFIG_GENERIC_HARDIRQS
        unsigned int irqs[NR_IRQS];
 #endif
 };
@@ -41,7 +41,7 @@ DECLARE_PER_CPU(struct kernel_stat, kstat);
 
 extern unsigned long long nr_context_switches(void);
 
-#ifndef CONFIG_SPARSE_IRQ
+#ifndef CONFIG_GENERIC_HARDIRQS
 #define kstat_irqs_this_cpu(irq) \
         (kstat_this_cpu.irqs[irq])
 
@@ -52,16 +52,19 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
 {
         kstat_this_cpu.irqs[irq]++;
 }
-#endif
-
 
-#ifndef CONFIG_SPARSE_IRQ
 static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
 {
        return kstat_cpu(cpu).irqs[irq];
 }
 #else
+#include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
+#define kstat_irqs_this_cpu(DESC) \
+        ((DESC)->kstat_irqs[smp_processor_id()])
+#define kstat_incr_irqs_this_cpu(irqno, DESC) \
+        ((DESC)->kstat_irqs[smp_processor_id()]++)
+
 #endif
 
 /*
diff --git a/include/linux/key.h b/include/linux/key.h
index 21d32a142c00..e544f466d69a 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -20,6 +20,7 @@
 #include <linux/rbtree.h>
 #include <linux/rcupdate.h>
 #include <linux/sysctl.h>
+#include <linux/rwsem.h>
 #include <asm/atomic.h>
 
 #ifdef __KERNEL__
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 92213a9194e1..384ca8bbf1ac 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -29,10 +29,15 @@
 #ifdef CONFIG_MODULES
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
-extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));
-#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
+extern int __request_module(bool wait, const char *name, ...) \
+        __attribute__((format(printf, 2, 3)));
+#define request_module(mod...) __request_module(true, mod)
+#define request_module_nowait(mod...) __request_module(false, mod)
+#define try_then_request_module(x, mod...) \
+        ((x) ?: (__request_module(true, mod), (x)))
 #else
-static inline int request_module(const char * name, ...) { return -ENOSYS; }
+static inline int request_module(const char *name, ...) { return -ENOSYS; }
+static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; }
 #define try_then_request_module(x, mod...) (x)
 #endif
 
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 5437ac0276e2..58ae8e00fcdd 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -68,10 +68,13 @@ struct kobject {
         unsigned int state_in_sysfs:1;
         unsigned int state_add_uevent_sent:1;
         unsigned int state_remove_uevent_sent:1;
+        unsigned int uevent_suppress:1;
 };
 
 extern int kobject_set_name(struct kobject *kobj, const char *name, ...)
                             __attribute__((format(printf, 2, 3)));
+extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
+                                  va_list vargs);
 
 static inline const char *kobject_name(const struct kobject *kobj)
 {
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 32851eef48f0..bcd9c07848be 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -94,12 +94,16 @@ struct kprobe {
         /* Called after addr is executed, unless... */
         kprobe_post_handler_t post_handler;
 
-        /* ... called if executing addr causes a fault (eg. page fault).
-         * Return 1 if it handled fault, otherwise kernel will see it. */
+        /*
+         * ... called if executing addr causes a fault (eg. page fault).
+         * Return 1 if it handled fault, otherwise kernel will see it.
+         */
         kprobe_fault_handler_t fault_handler;
 
-        /* ... called if breakpoint trap occurs in probe handler.
-         * Return 1 if it handled break, otherwise kernel will see it. */
+        /*
+         * ... called if breakpoint trap occurs in probe handler.
+         * Return 1 if it handled break, otherwise kernel will see it.
+         */
         kprobe_break_handler_t break_handler;
 
         /* Saved opcode (which has been replaced with breakpoint) */
@@ -108,18 +112,28 @@ struct kprobe {
         /* copy of the original instruction */
         struct arch_specific_insn ainsn;
 
-        /* Indicates various status flags.  Protected by kprobe_mutex. */
+        /*
+         * Indicates various status flags.
+         * Protected by kprobe_mutex after this kprobe is registered.
+         */
         u32 flags;
 };
 
 /* Kprobe status flags */
 #define KPROBE_FLAG_GONE        1 /* breakpoint has already gone */
+#define KPROBE_FLAG_DISABLED    2 /* probe is temporarily disabled */
 
+/* Has this kprobe gone ? */
 static inline int kprobe_gone(struct kprobe *p)
 {
         return p->flags & KPROBE_FLAG_GONE;
 }
 
+/* Is this kprobe disabled ? */
+static inline int kprobe_disabled(struct kprobe *p)
+{
+        return p->flags & (KPROBE_FLAG_DISABLED | KPROBE_FLAG_GONE);
+}
 /*
  * Special probe type that uses setjmp-longjmp type tricks to resume
  * execution at a specified entry with a matching prototype corresponding
@@ -182,6 +196,14 @@ struct kprobe_blackpoint {
 DECLARE_PER_CPU(struct kprobe *, current_kprobe);
 DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
+/*
+ * For #ifdef avoidance:
+ */
+static inline int kprobes_built_in(void)
+{
+        return 1;
+}
+
 #ifdef CONFIG_KRETPROBES
 extern void arch_prepare_kretprobe(struct kretprobe_instance *ri,
                                    struct pt_regs *regs);
@@ -271,8 +293,19 @@ void unregister_kretprobes(struct kretprobe **rps, int num);
 void kprobe_flush_task(struct task_struct *tk);
 void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
 
-#else /* CONFIG_KPROBES */
+int disable_kprobe(struct kprobe *kp);
+int enable_kprobe(struct kprobe *kp);
 
+#else /* !CONFIG_KPROBES: */
+
+static inline int kprobes_built_in(void)
+{
+        return 0;
+}
+static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+{
+        return 0;
+}
 static inline struct kprobe *get_kprobe(void *addr)
 {
         return NULL;
@@ -329,5 +362,30 @@ static inline void unregister_kretprobes(struct kretprobe **rps, int num)
 static inline void kprobe_flush_task(struct task_struct *tk)
 {
 }
-#endif                          /* CONFIG_KPROBES */
-#endif                          /* _LINUX_KPROBES_H */
+static inline int disable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
+static inline int enable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_KPROBES */
+static inline int disable_kretprobe(struct kretprobe *rp)
+{
+        return disable_kprobe(&rp->kp);
+}
+static inline int enable_kretprobe(struct kretprobe *rp)
+{
+        return enable_kprobe(&rp->kp);
+}
+static inline int disable_jprobe(struct jprobe *jp)
+{
+        return disable_kprobe(&jp->kp);
+}
+static inline int enable_jprobe(struct jprobe *jp)
+{
+        return enable_kprobe(&jp->kp);
+}
+
+#endif /* _LINUX_KPROBES_H */
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 0424326f1679..8cc137911b34 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -48,7 +48,10 @@ struct kvm_irq_level {
          * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
          * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
          */
-        __u32 irq;
+        union {
+                __u32 irq;
+                __s32 status;
+        };
         __u32 level;
 };
 
@@ -126,6 +129,7 @@ struct kvm_run {
                         __u64 data_offset; /* relative to kvm_run start */
                 } io;
                 struct {
+                        struct kvm_debug_exit_arch arch;
                 } debug;
                 /* KVM_EXIT_MMIO */
                 struct {
@@ -217,21 +221,6 @@ struct kvm_interrupt {
         __u32 irq;
 };
 
-struct kvm_breakpoint {
-        __u32 enabled;
-        __u32 padding;
-        __u64 address;
-};
-
-/* for KVM_DEBUG_GUEST */
-struct kvm_debug_guest {
-        /* int */
-        __u32 enabled;
-        __u32 pad;
-        struct kvm_breakpoint breakpoints[4];
-        __u32 singlestep;
-};
-
 /* for KVM_GET_DIRTY_LOG */
 struct kvm_dirty_log {
         __u32 slot;
@@ -292,6 +281,17 @@ struct kvm_s390_interrupt {
         __u64 parm64;
 };
 
+/* for KVM_SET_GUEST_DEBUG */
+
+#define KVM_GUESTDBG_ENABLE             0x00000001
+#define KVM_GUESTDBG_SINGLESTEP         0x00000002
+
+struct kvm_guest_debug {
+        __u32 control;
+        __u32 pad;
+        struct kvm_guest_debug_arch arch;
+};
+
 #define KVM_TRC_SHIFT           16
 /*
  * kvm trace categories
@@ -396,6 +396,59 @@ struct kvm_trace_rec {
 #ifdef __KVM_HAVE_USER_NMI
 #define KVM_CAP_USER_NMI 22
 #endif
+#ifdef __KVM_HAVE_GUEST_DEBUG
+#define KVM_CAP_SET_GUEST_DEBUG 23
+#endif
+#ifdef __KVM_HAVE_PIT
+#define KVM_CAP_REINJECT_CONTROL 24
+#endif
+#ifdef __KVM_HAVE_IOAPIC
+#define KVM_CAP_IRQ_ROUTING 25
+#endif
+#define KVM_CAP_IRQ_INJECT_STATUS 26
+#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
+#define KVM_CAP_DEVICE_DEASSIGNMENT 27
+#endif
+/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
+#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
+
+#ifdef KVM_CAP_IRQ_ROUTING
+
+struct kvm_irq_routing_irqchip {
+        __u32 irqchip;
+        __u32 pin;
+};
+
+struct kvm_irq_routing_msi {
+        __u32 address_lo;
+        __u32 address_hi;
+        __u32 data;
+        __u32 pad;
+};
+
+/* gsi routing entry types */
+#define KVM_IRQ_ROUTING_IRQCHIP 1
+#define KVM_IRQ_ROUTING_MSI 2
+
+struct kvm_irq_routing_entry {
+        __u32 gsi;
+        __u32 type;
+        __u32 flags;
+        __u32 pad;
+        union {
+                struct kvm_irq_routing_irqchip irqchip;
+                struct kvm_irq_routing_msi msi;
+                __u32 pad[8];
+        } u;
+};
+
+struct kvm_irq_routing {
+        __u32 nr;
+        __u32 flags;
+        struct kvm_irq_routing_entry entries[0];
+};
+
+#endif
 
 /*
  * ioctls for VM fds
@@ -421,14 +474,19 @@ struct kvm_trace_rec {
 #define KVM_CREATE_PIT            _IO(KVMIO,  0x64)
 #define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
 #define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
+#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
 #define KVM_REGISTER_COALESCED_MMIO \
                         _IOW(KVMIO,  0x67, struct kvm_coalesced_mmio_zone)
 #define KVM_UNREGISTER_COALESCED_MMIO \
                         _IOW(KVMIO,  0x68, struct kvm_coalesced_mmio_zone)
 #define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
                                    struct kvm_assigned_pci_dev)
+#define KVM_SET_GSI_ROUTING       _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
 #define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
                             struct kvm_assigned_irq)
+#define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
+#define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
+                                     struct kvm_assigned_pci_dev)
 
 /*
  * ioctls for vcpu fds
@@ -440,7 +498,8 @@ struct kvm_trace_rec {
 #define KVM_SET_SREGS             _IOW(KVMIO,  0x84, struct kvm_sregs)
 #define KVM_TRANSLATE             _IOWR(KVMIO, 0x85, struct kvm_translation)
 #define KVM_INTERRUPT             _IOW(KVMIO,  0x86, struct kvm_interrupt)
-#define KVM_DEBUG_GUEST           _IOW(KVMIO,  0x87, struct kvm_debug_guest)
+/* KVM_DEBUG_GUEST is no longer supported, use KVM_SET_GUEST_DEBUG instead */
+#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_DEBUG_GUEST
 #define KVM_GET_MSRS              _IOWR(KVMIO, 0x88, struct kvm_msrs)
 #define KVM_SET_MSRS              _IOW(KVMIO,  0x89, struct kvm_msrs)
 #define KVM_SET_CPUID             _IOW(KVMIO,  0x8a, struct kvm_cpuid)
@@ -469,6 +528,29 @@ struct kvm_trace_rec {
 #define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)
 /* Available with KVM_CAP_NMI */
 #define KVM_NMI                   _IO(KVMIO,  0x9a)
+/* Available with KVM_CAP_SET_GUEST_DEBUG */
+#define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
+
+/*
+ * Deprecated interfaces
+ */
+struct kvm_breakpoint {
+        __u32 enabled;
+        __u32 padding;
+        __u64 address;
+};
+
+struct kvm_debug_guest {
+        __u32 enabled;
+        __u32 pad;
+        struct kvm_breakpoint breakpoints[4];
+        __u32 singlestep;
+};
+
+#define __KVM_DEPRECATED_DEBUG_GUEST _IOW(KVMIO,  0x87, struct kvm_debug_guest)
+
+#define KVM_IA64_VCPU_GET_STACK   _IOR(KVMIO,  0x9a, void *)
+#define KVM_IA64_VCPU_SET_STACK   _IOW(KVMIO,  0x9b, void *)
 
 #define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
 #define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
@@ -522,6 +604,7 @@ struct kvm_assigned_irq {
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
 
+#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION   KVM_DEV_IRQ_ASSIGN_ENABLE_MSI
 #define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI   (1 << 0)
 
 #endif
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index bf6f703642fc..894a56e365e8 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -37,6 +37,7 @@
 #define KVM_REQ_PENDING_TIMER      5
 #define KVM_REQ_UNHALT             6
 #define KVM_REQ_MMU_SYNC           7
+#define KVM_REQ_KVMCLOCK_UPDATE    8
 
 #define KVM_USERSPACE_IRQ_SOURCE_ID     0
 
@@ -73,7 +74,7 @@ struct kvm_vcpu {
         struct kvm_run *run;
         int guest_mode;
         unsigned long requests;
-        struct kvm_guest_debug guest_debug;
+        unsigned long guest_debug;
         int fpu_active;
         int guest_fpu_loaded;
         wait_queue_head_t wq;
@@ -107,6 +108,20 @@ struct kvm_memory_slot {
         int user_alloc;
 };
 
+struct kvm_kernel_irq_routing_entry {
+        u32 gsi;
+        int (*set)(struct kvm_kernel_irq_routing_entry *e,
+                    struct kvm *kvm, int level);
+        union {
+                struct {
+                        unsigned irqchip;
+                        unsigned pin;
+                } irqchip;
+                struct msi_msg msi;
+        };
+        struct list_head link;
+};
+
 struct kvm {
         struct mutex lock; /* protects the vcpus array and APIC accesses */
         spinlock_t mmu_lock;
@@ -127,6 +142,11 @@ struct kvm {
         struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
 #endif
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+        struct list_head irq_routing; /* of kvm_kernel_irq_routing_entry */
+        struct hlist_head mask_notifier_list;
+#endif
+
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
         struct mmu_notifier mmu_notifier;
         unsigned long mmu_notifier_seq;
@@ -237,7 +257,6 @@ int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
                                    int user_alloc);
 long kvm_arch_vm_ioctl(struct file *filp,
                        unsigned int ioctl, unsigned long arg);
-void kvm_arch_destroy_vm(struct kvm *kvm);
 
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);
 int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);
@@ -255,8 +274,8 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state);
 int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state);
-int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,
-                                    struct kvm_debug_guest *dbg);
+int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+                                        struct kvm_guest_debug *dbg);
 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
 
 int kvm_arch_init(void *opaque);
@@ -310,7 +329,6 @@ struct kvm_assigned_dev_kernel {
         int host_irq;
         bool host_irq_disabled;
         int guest_irq;
-        struct msi_msg guest_msi;
 #define KVM_ASSIGNED_DEV_GUEST_INTX     (1 << 0)
 #define KVM_ASSIGNED_DEV_GUEST_MSI      (1 << 1)
 #define KVM_ASSIGNED_DEV_HOST_INTX      (1 << 8)
@@ -321,8 +339,21 @@ struct kvm_assigned_dev_kernel {
         struct pci_dev *dev;
         struct kvm *kvm;
 };
-void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
-void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);
+
+struct kvm_irq_mask_notifier {
+        void (*func)(struct kvm_irq_mask_notifier *kimn, bool masked);
+        int irq;
+        struct hlist_node link;
+};
+
+void kvm_register_irq_mask_notifier(struct kvm *kvm, int irq,
+                                    struct kvm_irq_mask_notifier *kimn);
+void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
+                                      struct kvm_irq_mask_notifier *kimn);
+void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
+
+int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
+void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                    struct kvm_irq_ack_notifier *kian);
 void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian);
@@ -464,4 +495,21 @@ static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_se
 }
 #endif
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+
+#define KVM_MAX_IRQ_ROUTES 1024
+
+int kvm_setup_default_irq_routing(struct kvm *kvm);
+int kvm_set_irq_routing(struct kvm *kvm,
+                        const struct kvm_irq_routing_entry *entries,
+                        unsigned nr,
+                        unsigned flags);
+void kvm_free_irq_routing(struct kvm *kvm);
+
+#else
+
+static inline void kvm_free_irq_routing(struct kvm *kvm) {}
+
+#endif
+
 #endif
diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index 9b6f395c9625..2b8318c83e53 100644
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -40,17 +40,4 @@ typedef unsigned long  hfn_t;
 
 typedef hfn_t pfn_t;
 
-struct kvm_pio_request {
-        unsigned long count;
-        int cur_count;
-        struct page *guest_pages[2];
-        unsigned guest_page_offset;
-        int in;
-        int port;
-        int size;
-        int string;
-        int down;
-        int rep;
-};
-
 #endif /* __KVM_TYPES_H__ */
diff --git a/include/linux/latencytop.h b/include/linux/latencytop.h
index 901c2d6377a8..b0e99898527c 100644
--- a/include/linux/latencytop.h
+++ b/include/linux/latencytop.h
@@ -9,6 +9,7 @@
 #ifndef _INCLUDE_GUARD_LATENCYTOP_H_
 #define _INCLUDE_GUARD_LATENCYTOP_H_
 
+#include <linux/compiler.h>
 #ifdef CONFIG_LATENCYTOP
 
 #define LT_SAVECOUNT            32
@@ -24,7 +25,14 @@ struct latency_record {
 
 struct task_struct;
 
-void account_scheduler_latency(struct task_struct *task, int usecs, int inter);
+extern int latencytop_enabled;
+void __account_scheduler_latency(struct task_struct *task, int usecs, int inter);
+static inline void
+account_scheduler_latency(struct task_struct *task, int usecs, int inter)
+{
+        if (unlikely(latencytop_enabled))
+                __account_scheduler_latency(task, usecs, inter);
+}
 
 void clear_all_latency_tracing(struct task_struct *p);
 
diff --git a/include/linux/leds-bd2802.h b/include/linux/leds-bd2802.h
new file mode 100644
index 000000000000..42f854a1a199
--- /dev/null
+++ b/include/linux/leds-bd2802.h
@@ -0,0 +1,26 @@
+/*
+ * leds-bd2802.h - RGB LED Driver
+ *
+ * Copyright (C) 2009 Samsung Electronics
+ * Kim Kyuwon <q1.kim@samsung.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.
+ *
+ * Datasheet: http://www.rohm.com/products/databook/driver/pdf/bd2802gu-e.pdf
+ *
+ */
+#ifndef _LEDS_BD2802_H_
+#define _LEDS_BD2802_H_
+
+struct bd2802_led_platform_data{
+        int     reset_gpio;
+        u8      rgb_time;
+};
+
+#define RGB_TIME(slopedown, slopeup, waveform) \
+        ((slopedown) << 6 | (slopeup) << 4 | (waveform))
+
+#endif /* _LEDS_BD2802_H_ */
+
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 24489da701e3..376fe07732ea 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -30,6 +30,7 @@ enum led_brightness {
 struct led_classdev {
         const char              *name;
         int                      brightness;
+        int                      max_brightness;
         int                      flags;
 
         /* Lower 16 bits reflect status */
@@ -140,7 +141,8 @@ struct gpio_led {
         const char *name;
         const char *default_trigger;
         unsigned        gpio;
-        u8              active_low;
+        u8              active_low : 1;
+        u8              retain_state_suspended : 1;
 };
 
 struct gpio_led_platform_data {
diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
new file mode 100644
index 000000000000..33a071167489
--- /dev/null
+++ b/include/linux/leds_pwm.h
@@ -0,0 +1,21 @@
+/*
+ * PWM LED driver data - see drivers/leds/leds-pwm.c
+ */
+#ifndef __LINUX_LEDS_PWM_H
+#define __LINUX_LEDS_PWM_H
+
+struct led_pwm {
+        const char      *name;
+        const char      *default_trigger;
+        unsigned        pwm_id;
+        u8              active_low;
+        unsigned        max_brightness;
+        unsigned        pwm_period_ns;
+};
+
+struct led_pwm_platform_data {
+        int                     num_leds;
+        struct led_pwm  *leds;
+};
+
+#endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5d87bc09a1f5..3d501db36a26 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -209,6 +209,7 @@ enum {
 
         /* bits 24:31 of ap->flags are reserved for LLD specific flags */
 
+
         /* struct ata_port pflags */
         ATA_PFLAG_EH_PENDING    = (1 << 0), /* EH pending */
         ATA_PFLAG_EH_IN_PROGRESS = (1 << 1), /* EH in progress */
@@ -225,6 +226,9 @@ enum {
         ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
         ATA_PFLAG_INIT_GTM_VALID = (1 << 19), /* initial gtm data valid */
 
+        ATA_PFLAG_PIO32         = (1 << 20),  /* 32bit PIO */
+        ATA_PFLAG_PIO32CHANGE   = (1 << 21),  /* 32bit PIO can be turned on/off */
+
         /* struct ata_queued_cmd flags */
         ATA_QCFLAG_ACTIVE       = (1 << 0), /* cmd not yet ack'd to scsi lyer */
         ATA_QCFLAG_DMAMAP       = (1 << 1), /* SG table is DMA mapped */
@@ -275,7 +279,7 @@ enum {
          * advised to wait only for the following duration before
          * doing SRST.
          */
-        ATA_TMOUT_PMP_SRST_WAIT = 1000,
+        ATA_TMOUT_PMP_SRST_WAIT = 5000,
 
         /* ATA bus states */
         BUS_UNKNOWN             = 0,
@@ -379,7 +383,7 @@ enum {
         ATA_HORKAGE_BRIDGE_OK   = (1 << 10),    /* no bridge limits */
         ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
                                                     not multiple of 16 bytes */
-        ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firwmare update warning */
+        ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firmware update warning */
         ATA_HORKAGE_1_5_GBPS    = (1 << 13),    /* force 1.5 Gbps */
 
          /* DMA mask for user DMA control: User visible values; DO NOT
@@ -530,6 +534,7 @@ struct ata_queued_cmd {
         unsigned long           flags;          /* ATA_QCFLAG_xxx */
         unsigned int            tag;
         unsigned int            n_elem;
+        unsigned int            orig_n_elem;
 
         int                     dma_dir;
 
@@ -688,7 +693,10 @@ struct ata_port {
         struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
         struct ata_port_operations *ops;
         spinlock_t              *lock;
+        /* Flags owned by the EH context. Only EH should touch these once the
+           port is active */
         unsigned long           flags;  /* ATA_FLAG_xxx */
+        /* Flags that change dynamically, protected by ap->lock */
         unsigned int            pflags; /* ATA_PFLAG_xxx */
         unsigned int            print_id; /* user visible unique port ID */
         unsigned int            port_no; /* 0 based port no. inside the host */
@@ -750,7 +758,8 @@ struct ata_port {
         acpi_handle             acpi_handle;
         struct ata_acpi_gtm     __acpi_init_gtm; /* use ata_acpi_init_gtm() */
 #endif
-        u8                      sector_buf[ATA_SECT_SIZE]; /* owned by EH */
+        /* owned by EH */
+        u8                      sector_buf[ATA_SECT_SIZE] ____cacheline_aligned;
 };
 
 /* The following initializer overrides a method to NULL whether one of
@@ -793,6 +802,7 @@ struct ata_port_operations {
         ata_reset_fn_t          pmp_hardreset;
         ata_postreset_fn_t      pmp_postreset;
         void (*error_handler)(struct ata_port *ap);
+        void (*lost_interrupt)(struct ata_port *ap);
         void (*post_internal_cmd)(struct ata_queued_cmd *qc);
 
         /*
@@ -834,6 +844,8 @@ struct ata_port_operations {
         void (*bmdma_start)(struct ata_queued_cmd *qc);
         void (*bmdma_stop)(struct ata_queued_cmd *qc);
         u8   (*bmdma_status)(struct ata_port *ap);
+
+        void (*drain_fifo)(struct ata_queued_cmd *qc);
 #endif /* CONFIG_ATA_SFF */
 
         ssize_t (*em_show)(struct ata_port *ap, char *buf);
@@ -1006,6 +1018,9 @@ extern int ata_cable_sata(struct ata_port *ap);
 extern int ata_cable_ignore(struct ata_port *ap);
 extern int ata_cable_unknown(struct ata_port *ap);
 
+extern void ata_pio_queue_task(struct ata_port *ap, void *data,
+                               unsigned long delay);
+
 /* Timing helpers */
 extern unsigned int ata_pio_need_iordy(const struct ata_device *);
 extern const struct ata_timing *ata_timing_find_mode(u8 xfer_mode);
@@ -1570,6 +1585,7 @@ extern bool ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc);
 extern unsigned int ata_sff_host_intr(struct ata_port *ap,
                                       struct ata_queued_cmd *qc);
 extern irqreturn_t ata_sff_interrupt(int irq, void *dev_instance);
+extern void ata_sff_lost_interrupt(struct ata_port *ap);
 extern void ata_sff_freeze(struct ata_port *ap);
 extern void ata_sff_thaw(struct ata_port *ap);
 extern int ata_sff_prereset(struct ata_link *link, unsigned long deadline);
@@ -1582,9 +1598,11 @@ extern int ata_sff_softreset(struct ata_link *link, unsigned int *classes,
 extern int sata_sff_hardreset(struct ata_link *link, unsigned int *class,
                                unsigned long deadline);
 extern void ata_sff_postreset(struct ata_link *link, unsigned int *classes);
+extern void ata_sff_drain_fifo(struct ata_queued_cmd *qc);
 extern void ata_sff_error_handler(struct ata_port *ap);
 extern void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc);
 extern int ata_sff_port_start(struct ata_port *ap);
+extern int ata_sff_port_start32(struct ata_port *ap);
 extern void ata_sff_std_ports(struct ata_ioports *ioaddr);
 extern unsigned long ata_bmdma_mode_filter(struct ata_device *dev,
                                            unsigned long xfer_mask);
diff --git a/include/linux/lm_interface.h b/include/linux/lm_interface.h
deleted file mode 100644
index 2ed8fa1b762b..000000000000
--- a/include/linux/lm_interface.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2006 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 version 2.
- */
-
-#ifndef __LM_INTERFACE_DOT_H__
-#define __LM_INTERFACE_DOT_H__
-
-
-typedef void (*lm_callback_t) (void *ptr, unsigned int type, void *data);
-
-/*
- * lm_mount() flags
- *
- * LM_MFLAG_SPECTATOR
- * GFS is asking to join the filesystem's lockspace, but it doesn't want to
- * modify the filesystem.  The lock module shouldn't assign a journal to the FS
- * mount.  It shouldn't send recovery callbacks to the FS mount.  If the node
- * dies or withdraws, all locks can be wiped immediately.
- *
- * LM_MFLAG_CONV_NODROP
- * Do not allow the dlm to internally resolve conversion deadlocks by demoting
- * the lock to unlocked and then reacquiring it in the requested mode. Instead,
- * it should cancel the request and return LM_OUT_CONV_DEADLK.
- */
-
-#define LM_MFLAG_SPECTATOR      0x00000001
-#define LM_MFLAG_CONV_NODROP    0x00000002
-
-/*
- * lm_lockstruct flags
- *
- * LM_LSFLAG_LOCAL
- * The lock_nolock module returns LM_LSFLAG_LOCAL to GFS, indicating that GFS
- * can make single-node optimizations.
- */
-
-#define LM_LSFLAG_LOCAL         0x00000001
-
-/*
- * lm_lockname types
- */
-
-#define LM_TYPE_RESERVED        0x00
-#define LM_TYPE_NONDISK         0x01
-#define LM_TYPE_INODE           0x02
-#define LM_TYPE_RGRP            0x03
-#define LM_TYPE_META            0x04
-#define LM_TYPE_IOPEN           0x05
-#define LM_TYPE_FLOCK           0x06
-#define LM_TYPE_PLOCK           0x07
-#define LM_TYPE_QUOTA           0x08
-#define LM_TYPE_JOURNAL         0x09
-
-/*
- * lm_lock() states
- *
- * SHARED is compatible with SHARED, not with DEFERRED or EX.
- * DEFERRED is compatible with DEFERRED, not with SHARED or EX.
- */
-
-#define LM_ST_UNLOCKED          0
-#define LM_ST_EXCLUSIVE         1
-#define LM_ST_DEFERRED          2
-#define LM_ST_SHARED            3
-
-/*
- * lm_lock() flags
- *
- * LM_FLAG_TRY
- * Don't wait to acquire the lock if it can't be granted immediately.
- *
- * LM_FLAG_TRY_1CB
- * Send one blocking callback if TRY is set and the lock is not granted.
- *
- * LM_FLAG_NOEXP
- * GFS sets this flag on lock requests it makes while doing journal recovery.
- * These special requests should not be blocked due to the recovery like
- * ordinary locks would be.
- *
- * LM_FLAG_ANY
- * A SHARED request may also be granted in DEFERRED, or a DEFERRED request may
- * also be granted in SHARED.  The preferred state is whichever is compatible
- * with other granted locks, or the specified state if no other locks exist.
- *
- * LM_FLAG_PRIORITY
- * Override fairness considerations.  Suppose a lock is held in a shared state
- * and there is a pending request for the deferred state.  A shared lock
- * request with the priority flag would be allowed to bypass the deferred
- * request and directly join the other shared lock.  A shared lock request
- * without the priority flag might be forced to wait until the deferred
- * requested had acquired and released the lock.
- */
-
-#define LM_FLAG_TRY             0x00000001
-#define LM_FLAG_TRY_1CB         0x00000002
-#define LM_FLAG_NOEXP           0x00000004
-#define LM_FLAG_ANY             0x00000008
-#define LM_FLAG_PRIORITY        0x00000010
-
-/*
- * lm_lock() and lm_async_cb return flags
- *
- * LM_OUT_ST_MASK
- * Masks the lower two bits of lock state in the returned value.
- *
- * LM_OUT_CACHEABLE
- * The lock hasn't been released so GFS can continue to cache data for it.
- *
- * LM_OUT_CANCELED
- * The lock request was canceled.
- *
- * LM_OUT_ASYNC
- * The result of the request will be returned in an LM_CB_ASYNC callback.
- *
- * LM_OUT_CONV_DEADLK
- * The lock request was canceled do to a conversion deadlock.
- */
-
-#define LM_OUT_ST_MASK          0x00000003
-#define LM_OUT_CANCELED         0x00000008
-#define LM_OUT_ASYNC            0x00000080
-#define LM_OUT_ERROR            0x00000100
-
-/*
- * lm_callback_t types
- *
- * LM_CB_NEED_E LM_CB_NEED_D LM_CB_NEED_S
- * Blocking callback, a remote node is requesting the given lock in
- * EXCLUSIVE, DEFERRED, or SHARED.
- *
- * LM_CB_NEED_RECOVERY
- * The given journal needs to be recovered.
- *
- * LM_CB_ASYNC
- * The given lock has been granted.
- */
-
-#define LM_CB_NEED_E            257
-#define LM_CB_NEED_D            258
-#define LM_CB_NEED_S            259
-#define LM_CB_NEED_RECOVERY     260
-#define LM_CB_ASYNC             262
-
-/*
- * lm_recovery_done() messages
- */
-
-#define LM_RD_GAVEUP            308
-#define LM_RD_SUCCESS           309
-
-
-struct lm_lockname {
-        u64 ln_number;
-        unsigned int ln_type;
-};
-
-#define lm_name_equal(name1, name2) \
-        (((name1)->ln_number == (name2)->ln_number) && \
-         ((name1)->ln_type == (name2)->ln_type)) \
-
-struct lm_async_cb {
-        struct lm_lockname lc_name;
-        int lc_ret;
-};
-
-struct lm_lockstruct;
-
-struct lm_lockops {
-        const char *lm_proto_name;
-
-        /*
-         * Mount/Unmount
-         */
-
-        int (*lm_mount) (char *table_name, char *host_data,
-                         lm_callback_t cb, void *cb_data,
-                         unsigned int min_lvb_size, int flags,
-                         struct lm_lockstruct *lockstruct,
-                         struct kobject *fskobj);
-
-        void (*lm_others_may_mount) (void *lockspace);
-
-        void (*lm_unmount) (void *lockspace);
-
-        void (*lm_withdraw) (void *lockspace);
-
-        /*
-         * Lock oriented operations
-         */
-
-        int (*lm_get_lock) (void *lockspace, struct lm_lockname *name, void **lockp);
-
-        void (*lm_put_lock) (void *lock);
-
-        unsigned int (*lm_lock) (void *lock, unsigned int cur_state,
-                                 unsigned int req_state, unsigned int flags);
-
-        unsigned int (*lm_unlock) (void *lock, unsigned int cur_state);
-
-        void (*lm_cancel) (void *lock);
-
-        int (*lm_hold_lvb) (void *lock, char **lvbp);
-        void (*lm_unhold_lvb) (void *lock, char *lvb);
-
-        /*
-         * Posix Lock oriented operations
-         */
-
-        int (*lm_plock_get) (void *lockspace, struct lm_lockname *name,
-                             struct file *file, struct file_lock *fl);
-
-        int (*lm_plock) (void *lockspace, struct lm_lockname *name,
-                         struct file *file, int cmd, struct file_lock *fl);
-
-        int (*lm_punlock) (void *lockspace, struct lm_lockname *name,
-                           struct file *file, struct file_lock *fl);
-
-        /*
-         * Client oriented operations
-         */
-
-        void (*lm_recovery_done) (void *lockspace, unsigned int jid,
-                                  unsigned int message);
-
-        struct module *lm_owner;
-};
-
-/*
- * lm_mount() return values
- *
- * ls_jid - the journal ID this node should use
- * ls_first - this node is the first to mount the file system
- * ls_lvb_size - size in bytes of lock value blocks
- * ls_lockspace - lock module's context for this file system
- * ls_ops - lock module's functions
- * ls_flags - lock module features
- */
-
-struct lm_lockstruct {
-        unsigned int ls_jid;
-        unsigned int ls_first;
-        unsigned int ls_lvb_size;
-        void *ls_lockspace;
-        const struct lm_lockops *ls_ops;
-        int ls_flags;
-};
-
-/*
- * Lock module bottom interface.  A lock module makes itself available to GFS
- * with these functions.
- */
-
-int gfs2_register_lockproto(const struct lm_lockops *proto);
-void gfs2_unregister_lockproto(const struct lm_lockops *proto);
-
-/*
- * Lock module top interface.  GFS calls these functions when mounting or
- * unmounting a file system.
- */
-
-int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data,
-                         lm_callback_t cb, void *cb_data,
-                         unsigned int min_lvb_size, int flags,
-                         struct lm_lockstruct *lockstruct,
-                         struct kobject *fskobj);
-
-void gfs2_unmount_lockproto(struct lm_lockstruct *lockstruct);
-
-void gfs2_withdraw_lockproto(struct lm_lockstruct *lockstruct);
-
-#endif /* __LM_INTERFACE_DOT_H__ */
-
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index aa6fe7026de7..51855dfd8adb 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -346,6 +346,7 @@ static inline int __nlm_cmp_addr4(const struct sockaddr *sap1,
         return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
 }
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
                                   const struct sockaddr *sap2)
 {
@@ -353,6 +354,13 @@ static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
         const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
         return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
 }
+#else   /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
+                                  const struct sockaddr *sap2)
+{
+        return 0;
+}
+#endif  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
 
 /*
  * Compare two host addresses
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 7dc5b6cb44cd..d39ed1cc5fbf 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -25,13 +25,13 @@ struct svc_rqst;
 #define NLM_MAXCOOKIELEN        32
 #define NLM_MAXSTRLEN           1024
 
-#define nlm_granted             __constant_htonl(NLM_LCK_GRANTED)
-#define nlm_lck_denied          __constant_htonl(NLM_LCK_DENIED)
-#define nlm_lck_denied_nolocks  __constant_htonl(NLM_LCK_DENIED_NOLOCKS)
-#define nlm_lck_blocked         __constant_htonl(NLM_LCK_BLOCKED)
-#define nlm_lck_denied_grace_period     __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
+#define nlm_granted             cpu_to_be32(NLM_LCK_GRANTED)
+#define nlm_lck_denied          cpu_to_be32(NLM_LCK_DENIED)
+#define nlm_lck_denied_nolocks  cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
+#define nlm_lck_blocked         cpu_to_be32(NLM_LCK_BLOCKED)
+#define nlm_lck_denied_grace_period     cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
 
-#define nlm_drop_reply          __constant_htonl(30000)
+#define nlm_drop_reply          cpu_to_be32(30000)
 
 /* Lock info passed via NLM */
 struct nlm_lock {
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 12bfe09de2b1..7353821341ed 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -15,11 +15,11 @@
 #include <linux/lockd/xdr.h>
 
 /* error codes new to NLMv4 */
-#define nlm4_deadlock           __constant_htonl(NLM_DEADLCK)
-#define nlm4_rofs               __constant_htonl(NLM_ROFS)
-#define nlm4_stale_fh           __constant_htonl(NLM_STALE_FH)
-#define nlm4_fbig               __constant_htonl(NLM_FBIG)
-#define nlm4_failed             __constant_htonl(NLM_FAILED)
+#define nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
+#define nlm4_rofs               cpu_to_be32(NLM_ROFS)
+#define nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
+#define nlm4_fbig               cpu_to_be32(NLM_FBIG)
+#define nlm4_failed             cpu_to_be32(NLM_FAILED)
 
 
 
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 23bf02fb124f..da5a5a1f4cd2 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -20,43 +20,10 @@ struct lockdep_map;
 #include <linux/stacktrace.h>
 
 /*
- * Lock-class usage-state bits:
+ * We'd rather not expose kernel/lockdep_states.h this wide, but we do need
+ * the total number of states... :-(
  */
-enum lock_usage_bit
-{
-        LOCK_USED = 0,
-        LOCK_USED_IN_HARDIRQ,
-        LOCK_USED_IN_SOFTIRQ,
-        LOCK_ENABLED_SOFTIRQS,
-        LOCK_ENABLED_HARDIRQS,
-        LOCK_USED_IN_HARDIRQ_READ,
-        LOCK_USED_IN_SOFTIRQ_READ,
-        LOCK_ENABLED_SOFTIRQS_READ,
-        LOCK_ENABLED_HARDIRQS_READ,
-        LOCK_USAGE_STATES
-};
-
-/*
- * Usage-state bitmasks:
- */
-#define LOCKF_USED                      (1 << LOCK_USED)
-#define LOCKF_USED_IN_HARDIRQ           (1 << LOCK_USED_IN_HARDIRQ)
-#define LOCKF_USED_IN_SOFTIRQ           (1 << LOCK_USED_IN_SOFTIRQ)
-#define LOCKF_ENABLED_HARDIRQS          (1 << LOCK_ENABLED_HARDIRQS)
-#define LOCKF_ENABLED_SOFTIRQS          (1 << LOCK_ENABLED_SOFTIRQS)
-
-#define LOCKF_ENABLED_IRQS (LOCKF_ENABLED_HARDIRQS | LOCKF_ENABLED_SOFTIRQS)
-#define LOCKF_USED_IN_IRQ (LOCKF_USED_IN_HARDIRQ | LOCKF_USED_IN_SOFTIRQ)
-
-#define LOCKF_USED_IN_HARDIRQ_READ      (1 << LOCK_USED_IN_HARDIRQ_READ)
-#define LOCKF_USED_IN_SOFTIRQ_READ      (1 << LOCK_USED_IN_SOFTIRQ_READ)
-#define LOCKF_ENABLED_HARDIRQS_READ     (1 << LOCK_ENABLED_HARDIRQS_READ)
-#define LOCKF_ENABLED_SOFTIRQS_READ     (1 << LOCK_ENABLED_SOFTIRQS_READ)
-
-#define LOCKF_ENABLED_IRQS_READ \
-                (LOCKF_ENABLED_HARDIRQS_READ | LOCKF_ENABLED_SOFTIRQS_READ)
-#define LOCKF_USED_IN_IRQ_READ \
-                (LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)
+#define XXX_LOCK_USAGE_STATES           (1+3*4)
 
 #define MAX_LOCKDEP_SUBCLASSES          8UL
 
@@ -97,7 +64,7 @@ struct lock_class {
          * IRQ/softirq usage tracking bits:
          */
         unsigned long                   usage_mask;
-        struct stack_trace              usage_traces[LOCK_USAGE_STATES];
+        struct stack_trace              usage_traces[XXX_LOCK_USAGE_STATES];
 
         /*
          * These fields represent a directed graph of lock dependencies,
@@ -324,7 +291,11 @@ static inline void lock_set_subclass(struct lockdep_map *lock,
         lock_set_class(lock, lock->name, lock->key, subclass, ip);
 }
 
-# define INIT_LOCKDEP                           .lockdep_recursion = 0,
+extern void lockdep_set_current_reclaim_state(gfp_t gfp_mask);
+extern void lockdep_clear_current_reclaim_state(void);
+extern void lockdep_trace_alloc(gfp_t mask);
+
+# define INIT_LOCKDEP                           .lockdep_recursion = 0, .lockdep_reclaim_gfp = 0,
 
 #define lockdep_depth(tsk)      (debug_locks ? (tsk)->lockdep_depth : 0)
 
@@ -342,6 +313,9 @@ static inline void lockdep_on(void)
 # define lock_release(l, n, i)                  do { } while (0)
 # define lock_set_class(l, n, k, s, i)          do { } while (0)
 # define lock_set_subclass(l, s, i)             do { } while (0)
+# define lockdep_set_current_reclaim_state(g)   do { } while (0)
+# define lockdep_clear_current_reclaim_state()  do { } while (0)
+# define lockdep_trace_alloc(g)                 do { } while (0)
 # define lockdep_init()                         do { } while (0)
 # define lockdep_info()                         do { } while (0)
 # define lockdep_init_map(lock, name, key, sub) \
@@ -390,6 +364,23 @@ do {								\
 
 #endif /* CONFIG_LOCK_STAT */
 
+#ifdef CONFIG_LOCKDEP
+
+/*
+ * On lockdep we dont want the hand-coded irq-enable of
+ * _raw_*_lock_flags() code, because lockdep assumes
+ * that interrupts are not re-enabled during lock-acquire:
+ */
+#define LOCK_CONTENDED_FLAGS(_lock, try, lock, lockfl, flags) \
+        LOCK_CONTENDED((_lock), (try), (lock))
+
+#else /* CONFIG_LOCKDEP */
+
+#define LOCK_CONTENDED_FLAGS(_lock, try, lock, lockfl, flags) \
+        lockfl((_lock), (flags))
+
+#endif /* CONFIG_LOCKDEP */
+
 #ifdef CONFIG_GENERIC_HARDIRQS
 extern void early_init_irq_lock_class(void);
 #else
diff --git a/include/linux/loop.h b/include/linux/loop.h
index 6ffd6db5bb0d..40725447f5e0 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -160,5 +160,6 @@ int loop_unregister_transfer(int number);
 #define LOOP_SET_STATUS64       0x4C04
 #define LOOP_GET_STATUS64       0x4C05
 #define LOOP_CHANGE_FD          0x4C06
+#define LOOP_SET_CAPACITY       0x4C07
 
 #endif
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 0b4df7eba852..5b4e28bcb788 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -49,4 +49,5 @@
 #define FUTEXFS_SUPER_MAGIC     0xBAD1DEA
 #define INOTIFYFS_SUPER_MAGIC   0x2BAD1DEA
 
+#define STACK_END_MAGIC         0x57AC6E9D
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/include/linux/major.h b/include/linux/major.h
index 88249452b935..058ec15dd060 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -171,5 +171,6 @@
 #define VIOTAPE_MAJOR           230
 
 #define BLOCK_EXT_MAJOR         259
+#define SCSI_OSD_MAJOR          260     /* open-osd's OSD scsi device */
 
 #endif
diff --git a/include/linux/maple.h b/include/linux/maple.h
index c23d3f51ba40..d9a51b9b3300 100644
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
@@ -8,33 +8,49 @@ extern struct bus_type maple_bus_type;
 
 /* Maple Bus command and response codes */
 enum maple_code {
-        MAPLE_RESPONSE_FILEERR = -5,
-        MAPLE_RESPONSE_AGAIN = -4,      /* request should be retransmitted */
-        MAPLE_RESPONSE_BADCMD = -3,
-        MAPLE_RESPONSE_BADFUNC = -2,
-        MAPLE_RESPONSE_NONE = -1,       /* unit didn't respond at all */
-        MAPLE_COMMAND_DEVINFO = 1,
-        MAPLE_COMMAND_ALLINFO = 2,
-        MAPLE_COMMAND_RESET = 3,
-        MAPLE_COMMAND_KILL = 4,
-        MAPLE_RESPONSE_DEVINFO = 5,
-        MAPLE_RESPONSE_ALLINFO = 6,
-        MAPLE_RESPONSE_OK = 7,
-        MAPLE_RESPONSE_DATATRF = 8,
-        MAPLE_COMMAND_GETCOND = 9,
-        MAPLE_COMMAND_GETMINFO = 10,
-        MAPLE_COMMAND_BREAD = 11,
-        MAPLE_COMMAND_BWRITE = 12,
-        MAPLE_COMMAND_SETCOND = 14
+        MAPLE_RESPONSE_FILEERR =        -5,
+        MAPLE_RESPONSE_AGAIN,   /* retransmit */
+        MAPLE_RESPONSE_BADCMD,
+        MAPLE_RESPONSE_BADFUNC,
+        MAPLE_RESPONSE_NONE,    /* unit didn't respond*/
+        MAPLE_COMMAND_DEVINFO =         1,
+        MAPLE_COMMAND_ALLINFO,
+        MAPLE_COMMAND_RESET,
+        MAPLE_COMMAND_KILL,
+        MAPLE_RESPONSE_DEVINFO,
+        MAPLE_RESPONSE_ALLINFO,
+        MAPLE_RESPONSE_OK,
+        MAPLE_RESPONSE_DATATRF,
+        MAPLE_COMMAND_GETCOND,
+        MAPLE_COMMAND_GETMINFO,
+        MAPLE_COMMAND_BREAD,
+        MAPLE_COMMAND_BWRITE,
+        MAPLE_COMMAND_BSYNC,
+        MAPLE_COMMAND_SETCOND,
+        MAPLE_COMMAND_MICCONTROL
+};
+
+enum maple_file_errors {
+        MAPLE_FILEERR_INVALID_PARTITION =       0x01000000,
+        MAPLE_FILEERR_PHASE_ERROR =             0x02000000,
+        MAPLE_FILEERR_INVALID_BLOCK =           0x04000000,
+        MAPLE_FILEERR_WRITE_ERROR =             0x08000000,
+        MAPLE_FILEERR_INVALID_WRITE_LENGTH =    0x10000000,
+        MAPLE_FILEERR_BAD_CRC =                 0x20000000
+};
+
+struct maple_buffer {
+        char bufx[0x400];
+        void *buf;
 };
 
 struct mapleq {
         struct list_head list;
         struct maple_device *dev;
-        void *sendbuf, *recvbuf, *recvbufdcsp;
+        struct maple_buffer *recvbuf;
+        void *sendbuf, *recvbuf_p2;
         unsigned char length;
         enum maple_code command;
-        struct mutex mutex;
 };
 
 struct maple_devinfo {
@@ -52,11 +68,15 @@ struct maple_device {
         struct maple_driver *driver;
         struct mapleq *mq;
         void (*callback) (struct mapleq * mq);
+        void (*fileerr_handler)(struct maple_device *mdev, void *recvbuf);
+        int (*can_unload)(struct maple_device *mdev);
         unsigned long when, interval, function;
         struct maple_devinfo devinfo;
         unsigned char port, unit;
         char product_name[32];
         char product_licence[64];
+        atomic_t busy;
+        wait_queue_head_t maple_wait;
         struct device dev;
 };
 
@@ -72,7 +92,7 @@ void maple_getcond_callback(struct maple_device *dev,
 int maple_driver_register(struct maple_driver *);
 void maple_driver_unregister(struct maple_driver *);
 
-int maple_add_packet_sleeps(struct maple_device *mdev, u32 function,
+int maple_add_packet(struct maple_device *mdev, u32 function,
         u32 command, u32 length, void *data);
 void maple_clear_dev(struct maple_device *mdev);
 
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h
index 404f678e734b..2203121a43e9 100644
--- a/include/linux/matroxfb.h
+++ b/include/linux/matroxfb.h
@@ -37,7 +37,7 @@ enum matroxfb_ctrl_id {
   MATROXFB_CID_LAST
 };
 
-#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, u_int32_t)
+#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, __u32)
 
 #endif
 
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 326f45c86530..25b9ca93d232 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -56,7 +56,7 @@ extern void mem_cgroup_move_lists(struct page *page,
                                   enum lru_list from, enum lru_list to);
 extern void mem_cgroup_uncharge_page(struct page *page);
 extern void mem_cgroup_uncharge_cache_page(struct page *page);
-extern int mem_cgroup_shrink_usage(struct page *page,
+extern int mem_cgroup_shmem_charge_fallback(struct page *page,
                         struct mm_struct *mm, gfp_t gfp_mask);
 
 extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
@@ -75,7 +75,7 @@ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
 {
         struct mem_cgroup *mem;
         rcu_read_lock();
-        mem = mem_cgroup_from_task((mm)->owner);
+        mem = mem_cgroup_from_task(rcu_dereference((mm)->owner));
         rcu_read_unlock();
         return cgroup == mem;
 }
@@ -88,9 +88,6 @@ extern void mem_cgroup_end_migration(struct mem_cgroup *mem,
 /*
  * For memory reclaim.
  */
-extern int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem);
-extern long mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem);
-
 extern int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem);
 extern void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem,
                                                         int priority);
@@ -104,6 +101,8 @@ struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
                                                       struct zone *zone);
 struct zone_reclaim_stat*
 mem_cgroup_get_reclaim_stat_from_page(struct page *page);
+extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
+                                        struct task_struct *p);
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 extern int do_swap_account;
@@ -156,7 +155,7 @@ static inline void mem_cgroup_uncharge_cache_page(struct page *page)
 {
 }
 
-static inline int mem_cgroup_shrink_usage(struct page *page,
+static inline int mem_cgroup_shmem_charge_fallback(struct page *page,
                         struct mm_struct *mm, gfp_t gfp_mask)
 {
         return 0;
@@ -209,16 +208,6 @@ static inline void mem_cgroup_end_migration(struct mem_cgroup *mem,
 {
 }
 
-static inline int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem)
-{
-        return 0;
-}
-
-static inline int mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem)
-{
-        return 0;
-}
-
 static inline int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem)
 {
         return 0;
@@ -270,6 +259,11 @@ mem_cgroup_get_reclaim_stat_from_page(struct page *page)
         return NULL;
 }
 
+static inline void
+mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
+{
+}
+
 #endif /* CONFIG_CGROUP_MEM_CONT */
 
 #endif /* _LINUX_MEMCONTROL_H */
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 3fdc10806d31..37fa19b34ef5 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -99,4 +99,21 @@ enum mem_add_context { BOOT, HOTPLUG };
 #define hotplug_memory_notifier(fn, pri) do { } while (0)
 #endif
 
+/*
+ * 'struct memory_accessor' is a generic interface to provide
+ * in-kernel access to persistent memory such as i2c or SPI EEPROMs
+ */
+struct memory_accessor {
+        ssize_t (*read)(struct memory_accessor *, char *buf, off_t offset,
+                        size_t count);
+        ssize_t (*write)(struct memory_accessor *, const char *buf,
+                         off_t offset, size_t count);
+};
+
+/*
+ * Kernel text modification mutex, used for code patching. Users of this lock
+ * can sleep.
+ */
+extern struct mutex text_mutex;
+
 #endif /* _LINUX_MEMORY_H_ */
diff --git a/include/linux/mfd/ds1wm.h b/include/linux/mfd/ds1wm.h
new file mode 100644
index 000000000000..be469a357cbb
--- /dev/null
+++ b/include/linux/mfd/ds1wm.h
@@ -0,0 +1,6 @@
+/* MFD cell driver data for the DS1WM driver */
+
+struct ds1wm_driver_data {
+        int active_high;
+        int clock_rate;
+};
diff --git a/include/linux/mfd/htc-pasic3.h b/include/linux/mfd/htc-pasic3.h
index b4294f12c4f8..3d3ed67bd969 100644
--- a/include/linux/mfd/htc-pasic3.h
+++ b/include/linux/mfd/htc-pasic3.h
@@ -48,7 +48,6 @@ struct pasic3_leds_machinfo {
 
 struct pasic3_platform_data {
         struct pasic3_leds_machinfo *led_pdata;
-        unsigned int                 bus_shift;
         unsigned int                 clock_rate;
 };
 
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index 4455b212d75a..c8f51c3c0a72 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -29,6 +29,8 @@ struct pcf50633_platform_data {
         char **batteries;
         int num_batteries;
 
+        int charging_restart_interval;
+
         /* Callbacks */
         void (*probe_done)(struct pcf50633 *);
         void (*mbc_event_callback)(struct pcf50633 *, int);
diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h
index 6e17619b773a..4119579acf2c 100644
--- a/include/linux/mfd/pcf50633/mbc.h
+++ b/include/linux/mfd/pcf50633/mbc.h
@@ -128,7 +128,6 @@ enum pcf50633_reg_mbcs3 {
 int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);
 
 int pcf50633_mbc_get_status(struct pcf50633 *);
-void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status);
 
 #endif
 
diff --git a/include/linux/mfd/wm8350/audio.h b/include/linux/mfd/wm8350/audio.h
index af95a1d2f3a1..d899dc0223ba 100644
--- a/include/linux/mfd/wm8350/audio.h
+++ b/include/linux/mfd/wm8350/audio.h
@@ -490,6 +490,7 @@
 /*
  * R231 (0xE7) - Jack Status
  */
+#define WM8350_JACK_L_LVL                       0x0800
 #define WM8350_JACK_R_LVL                       0x0400
 
 /*
diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
index 980669d50dca..42cca672f340 100644
--- a/include/linux/mfd/wm8350/core.h
+++ b/include/linux/mfd/wm8350/core.h
@@ -640,9 +640,11 @@ struct wm8350 {
  *
  * @init: Function called during driver initialisation.  Should be
  *        used by the platform to configure GPIO functions and similar.
+ * @irq_high: Set if WM8350 IRQ is active high.
  */
 struct wm8350_platform_data {
         int (*init)(struct wm8350 *wm8350);
+        int irq_high;
 };
 
 
diff --git a/include/linux/mfd/wm8400-audio.h b/include/linux/mfd/wm8400-audio.h
index b6640e018046..e06ed3eb1d0a 100644
--- a/include/linux/mfd/wm8400-audio.h
+++ b/include/linux/mfd/wm8400-audio.h
@@ -1181,6 +1181,7 @@
 #define WM8400_FLL_OUTDIV_SHIFT                      0  /* FLL_OUTDIV - [2:0] */
 #define WM8400_FLL_OUTDIV_WIDTH                      3  /* FLL_OUTDIV - [2:0] */
 
+struct wm8400;
 void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400);
 
 #endif
diff --git a/include/linux/mg_disk.h b/include/linux/mg_disk.h
new file mode 100644
index 000000000000..1f76b1ebf627
--- /dev/null
+++ b/include/linux/mg_disk.h
@@ -0,0 +1,206 @@
+/*
+ *  include/linux/mg_disk.c
+ *
+ *  Support for the mGine m[g]flash IO mode.
+ *  Based on legacy hd.c
+ *
+ * (c) 2008 mGine Co.,LTD
+ * (c) 2008 unsik Kim <donari75@gmail.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 __MG_DISK_H__
+#define __MG_DISK_H__
+
+#include <linux/blkdev.h>
+#include <linux/ata.h>
+
+/* name for block device */
+#define MG_DISK_NAME "mgd"
+/* name for platform device */
+#define MG_DEV_NAME "mg_disk"
+
+#define MG_DISK_MAJ 0
+#define MG_DISK_MAX_PART 16
+#define MG_SECTOR_SIZE 512
+#define MG_MAX_SECTS 256
+
+/* Register offsets */
+#define MG_BUFF_OFFSET                  0x8000
+#define MG_STORAGE_BUFFER_SIZE          0x200
+#define MG_REG_OFFSET                   0xC000
+#define MG_REG_FEATURE                  (MG_REG_OFFSET + 2)     /* write case */
+#define MG_REG_ERROR                    (MG_REG_OFFSET + 2)     /* read case */
+#define MG_REG_SECT_CNT                 (MG_REG_OFFSET + 4)
+#define MG_REG_SECT_NUM                 (MG_REG_OFFSET + 6)
+#define MG_REG_CYL_LOW                  (MG_REG_OFFSET + 8)
+#define MG_REG_CYL_HIGH                 (MG_REG_OFFSET + 0xA)
+#define MG_REG_DRV_HEAD                 (MG_REG_OFFSET + 0xC)
+#define MG_REG_COMMAND                  (MG_REG_OFFSET + 0xE)   /* write case */
+#define MG_REG_STATUS                   (MG_REG_OFFSET + 0xE)   /* read  case */
+#define MG_REG_DRV_CTRL                 (MG_REG_OFFSET + 0x10)
+#define MG_REG_BURST_CTRL               (MG_REG_OFFSET + 0x12)
+
+/* "Drive Select/Head Register" bit values */
+#define MG_REG_HEAD_MUST_BE_ON          0xA0 /* These 2 bits are always on */
+#define MG_REG_HEAD_DRIVE_MASTER        (0x00 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_DRIVE_SLAVE         (0x10 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_LBA_MODE            (0x40 | MG_REG_HEAD_MUST_BE_ON)
+
+
+/* "Device Control Register" bit values */
+#define MG_REG_CTRL_INTR_ENABLE                 0x0
+#define MG_REG_CTRL_INTR_DISABLE                (0x1<<1)
+#define MG_REG_CTRL_RESET                       (0x1<<2)
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_HIGH       0x0
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_LOW        (0x1<<4)
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_LOW         0x0
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_HIGH        (0x1<<5)
+#define MG_REG_CTRL_DPD_DISABLE                 0x0
+#define MG_REG_CTRL_DPD_ENABLE                  (0x1<<6)
+
+/* Status register bit */
+/* error bit in status register */
+#define MG_REG_STATUS_BIT_ERROR                 0x01
+/* corrected error in status register */
+#define MG_REG_STATUS_BIT_CORRECTED_ERROR       0x04
+/* data request bit in status register */
+#define MG_REG_STATUS_BIT_DATA_REQ              0x08
+/* DSC - Drive Seek Complete */
+#define MG_REG_STATUS_BIT_SEEK_DONE             0x10
+/* DWF - Drive Write Fault */
+#define MG_REG_STATUS_BIT_WRITE_FAULT           0x20
+#define MG_REG_STATUS_BIT_READY                 0x40
+#define MG_REG_STATUS_BIT_BUSY                  0x80
+
+/* handy status */
+#define MG_STAT_READY   (MG_REG_STATUS_BIT_READY | MG_REG_STATUS_BIT_SEEK_DONE)
+#define MG_READY_OK(s)  (((s) & (MG_STAT_READY | \
+                                (MG_REG_STATUS_BIT_BUSY | \
+                                 MG_REG_STATUS_BIT_WRITE_FAULT | \
+                                 MG_REG_STATUS_BIT_ERROR))) == MG_STAT_READY)
+
+/* Error register */
+#define MG_REG_ERR_AMNF         0x01
+#define MG_REG_ERR_ABRT         0x04
+#define MG_REG_ERR_IDNF         0x10
+#define MG_REG_ERR_UNC          0x40
+#define MG_REG_ERR_BBK          0x80
+
+/* error code for others */
+#define MG_ERR_NONE             0
+#define MG_ERR_TIMEOUT          0x100
+#define MG_ERR_INIT_STAT        0x101
+#define MG_ERR_TRANSLATION      0x102
+#define MG_ERR_CTRL_RST         0x103
+#define MG_ERR_INV_STAT         0x104
+#define MG_ERR_RSTOUT           0x105
+
+#define MG_MAX_ERRORS   6       /* Max read/write errors */
+
+/* command */
+#define MG_CMD_RD 0x20
+#define MG_CMD_WR 0x30
+#define MG_CMD_SLEEP 0x99
+#define MG_CMD_WAKEUP 0xC3
+#define MG_CMD_ID 0xEC
+#define MG_CMD_WR_CONF 0x3C
+#define MG_CMD_RD_CONF 0x40
+
+/* operation mode */
+#define MG_OP_CASCADE (1 << 0)
+#define MG_OP_CASCADE_SYNC_RD (1 << 1)
+#define MG_OP_CASCADE_SYNC_WR (1 << 2)
+#define MG_OP_INTERLEAVE (1 << 3)
+
+/* synchronous */
+#define MG_BURST_LAT_4 (3 << 4)
+#define MG_BURST_LAT_5 (4 << 4)
+#define MG_BURST_LAT_6 (5 << 4)
+#define MG_BURST_LAT_7 (6 << 4)
+#define MG_BURST_LAT_8 (7 << 4)
+#define MG_BURST_LEN_4 (1 << 1)
+#define MG_BURST_LEN_8 (2 << 1)
+#define MG_BURST_LEN_16 (3 << 1)
+#define MG_BURST_LEN_32 (4 << 1)
+#define MG_BURST_LEN_CONT (0 << 1)
+
+/* timeout value (unit: ms) */
+#define MG_TMAX_CONF_TO_CMD     1
+#define MG_TMAX_WAIT_RD_DRQ     10
+#define MG_TMAX_WAIT_WR_DRQ     500
+#define MG_TMAX_RST_TO_BUSY     10
+#define MG_TMAX_HDRST_TO_RDY    500
+#define MG_TMAX_SWRST_TO_RDY    500
+#define MG_TMAX_RSTOUT          3000
+
+/* device attribution */
+/* use mflash as boot device */
+#define MG_BOOT_DEV             (1 << 0)
+/* use mflash as storage device */
+#define MG_STORAGE_DEV          (1 << 1)
+/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
+#define MG_STORAGE_DEV_SKIP_RST (1 << 2)
+
+#define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST)
+
+/* names of GPIO resource */
+#define MG_RST_PIN      "mg_rst"
+/* except MG_BOOT_DEV, reset-out pin should be assigned */
+#define MG_RSTOUT_PIN   "mg_rstout"
+
+/* private driver data */
+struct mg_drv_data {
+        /* disk resource */
+        u32 use_polling;
+
+        /* device attribution */
+        u32 dev_attr;
+
+        /* internally used */
+        struct mg_host *host;
+};
+
+/* main structure for mflash driver */
+struct mg_host {
+        struct device *dev;
+
+        struct request_queue *breq;
+        spinlock_t lock;
+        struct gendisk *gd;
+
+        struct timer_list timer;
+        void (*mg_do_intr) (struct mg_host *);
+
+        u16 id[ATA_ID_WORDS];
+
+        u16 cyls;
+        u16 heads;
+        u16 sectors;
+        u32 n_sectors;
+        u32 nres_sectors;
+
+        void __iomem *dev_base;
+        unsigned int irq;
+        unsigned int rst;
+        unsigned int rstout;
+
+        u32 major;
+        u32 error;
+};
+
+/*
+ * Debugging macro and defines
+ */
+#undef DO_MG_DEBUG
+#ifdef DO_MG_DEBUG
+#  define MG_DBG(fmt, args...) \
+        printk(KERN_DEBUG "%s:%d "fmt, __func__, __LINE__, ##args)
+#else /* CONFIG_MG_DEBUG */
+#  define MG_DBG(fmt, args...) do { } while (0)
+#endif /* CONFIG_MG_DEBUG */
+
+#endif
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index a820f816a49e..beb6ec99cfef 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -26,6 +26,7 @@
 #define TUN_MINOR               200
 #define MWAVE_MINOR             219     /* ACP/Mwave Modem */
 #define MPT_MINOR               220
+#define MPT2SAS_MINOR           221
 #define HPET_MINOR              228
 #define FUSE_MINOR              229
 #define KVM_MINOR               232
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index cf9c679ab38b..0f82293a82ed 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -55,6 +55,7 @@ enum {
         MLX4_CMD_CLOSE_PORT      = 0xa,
         MLX4_CMD_QUERY_HCA       = 0xb,
         MLX4_CMD_QUERY_PORT      = 0x43,
+        MLX4_CMD_SENSE_PORT      = 0x4d,
         MLX4_CMD_SET_PORT        = 0xc,
         MLX4_CMD_ACCESS_DDR      = 0x2e,
         MLX4_CMD_MAP_ICM         = 0xffa,
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 8f659cc29960..3aff8a6a389e 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -155,8 +155,9 @@ enum mlx4_qp_region {
 };
 
 enum mlx4_port_type {
-        MLX4_PORT_TYPE_IB       = 1 << 0,
-        MLX4_PORT_TYPE_ETH      = 1 << 1,
+        MLX4_PORT_TYPE_IB       = 1,
+        MLX4_PORT_TYPE_ETH      = 2,
+        MLX4_PORT_TYPE_AUTO     = 3
 };
 
 enum mlx4_special_vlan_idx {
@@ -237,6 +238,7 @@ struct mlx4_caps {
         enum mlx4_port_type     port_type[MLX4_MAX_PORTS + 1];
         u8                      supported_type[MLX4_MAX_PORTS + 1];
         u32                     port_mask;
+        enum mlx4_port_type     possible_type[MLX4_MAX_PORTS + 1];
 };
 
 struct mlx4_buf_list {
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 065cdf8c09fb..bff1f0d475c7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -104,6 +104,7 @@ extern unsigned int kobjsize(const void *objp);
 #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 */
 
 #ifndef VM_STACK_DEFAULT_FLAGS          /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
@@ -134,6 +135,7 @@ extern pgprot_t protection_map[16];
 
 #define FAULT_FLAG_WRITE        0x01    /* Fault was a write access */
 #define FAULT_FLAG_NONLINEAR    0x02    /* Fault was via a nonlinear mapping */
+#define FAULT_FLAG_MKWRITE      0x04    /* Fault was mkwrite of existing pte */
 
 /*
  * This interface is used by x86 PAT code to identify a pfn mapping that is
@@ -145,7 +147,7 @@ extern pgprot_t protection_map[16];
  */
 static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)
 {
-        return ((vma->vm_flags & VM_PFNMAP) && vma->vm_pgoff);
+        return (vma->vm_flags & VM_PFN_AT_MMAP);
 }
 
 static inline int is_pfn_mapping(struct vm_area_struct *vma)
@@ -186,7 +188,7 @@ struct vm_operations_struct {
 
         /* notification that a previously read-only page is about to become
          * writable, if an error is returned it will cause a SIGBUS */
-        int (*page_mkwrite)(struct vm_area_struct *vma, struct page *page);
+        int (*page_mkwrite)(struct vm_area_struct *vma, struct vm_fault *vmf);
 
         /* called by access_process_vm when get_user_pages() fails, typically
          * for use by special VMAs that can switch between memory and hardware
@@ -833,6 +835,7 @@ int __set_page_dirty_nobuffers(struct page *page);
 int __set_page_dirty_no_writeback(struct page *page);
 int redirty_page_for_writepage(struct writeback_control *wbc,
                                 struct page *page);
+void account_page_dirtied(struct page *page, struct address_space *mapping);
 int set_page_dirty(struct page *page);
 int set_page_dirty_lock(struct page *page);
 int clear_page_dirty_for_io(struct page *page);
@@ -1076,7 +1079,7 @@ static inline void setup_per_cpu_pageset(void) {}
 #endif
 
 /* nommu.c */
-extern atomic_t mmap_pages_allocated;
+extern atomic_long_t mmap_pages_allocated;
 
 /* prio_tree.c */
 void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 92915e81443f..0e80e26ecf21 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -11,6 +11,7 @@
 #include <linux/rwsem.h>
 #include <linux/completion.h>
 #include <linux/cpumask.h>
+#include <linux/page-debug-flags.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 
@@ -94,6 +95,9 @@ struct page {
         void *virtual;                  /* Kernel virtual address (NULL if
                                            not kmapped, ie. highmem) */
 #endif /* WANT_PAGE_VIRTUAL */
+#ifdef CONFIG_WANT_PAGE_DEBUG_FLAGS
+        unsigned long debug_flags;      /* Use atomic bitops on this */
+#endif
 };
 
 /*
@@ -276,4 +280,7 @@ struct mm_struct {
 #endif
 };
 
+/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
+#define mm_cpumask(mm) (&(mm)->cpu_vm_mask)
+
 #endif /* _LINUX_MM_TYPES_H */
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 30d1073bac3b..9872d6ca58ae 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -12,21 +12,18 @@
 
 #ifdef __KERNEL__
 #include <linux/mm.h>
+#include <linux/percpu_counter.h>
 
 #include <asm/atomic.h>
 
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
-extern atomic_long_t vm_committed_space;
+extern struct percpu_counter vm_committed_as;
 
-#ifdef CONFIG_SMP
-extern void vm_acct_memory(long pages);
-#else
 static inline void vm_acct_memory(long pages)
 {
-        atomic_long_add(pages, &vm_committed_space);
+        percpu_counter_add(&vm_committed_as, pages);
 }
-#endif
 
 static inline void vm_unacct_memory(long pages)
 {
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 4e457256bd33..3e7615e9087e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -192,5 +192,10 @@ static inline void mmc_signal_sdio_irq(struct mmc_host *host)
         wake_up_process(host->sdio_irq_thread);
 }
 
+struct regulator;
+
+int mmc_regulator_get_ocrmask(struct regulator *supply);
+int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit);
+
 #endif
 
diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index 139d7c88d9c9..3d1b7bde1283 100644
--- a/include/linux/mmiotrace.h
+++ b/include/linux/mmiotrace.h
@@ -1,5 +1,5 @@
-#ifndef MMIOTRACE_H
-#define MMIOTRACE_H
+#ifndef _LINUX_MMIOTRACE_H
+#define _LINUX_MMIOTRACE_H
 
 #include <linux/types.h>
 #include <linux/list.h>
@@ -13,28 +13,34 @@ typedef void (*kmmio_post_handler_t)(struct kmmio_probe *,
                                 unsigned long condition, struct pt_regs *);
 
 struct kmmio_probe {
-        struct list_head list; /* kmmio internal list */
-        unsigned long addr; /* start location of the probe point */
-        unsigned long len; /* length of the probe region */
-        kmmio_pre_handler_t pre_handler; /* Called before addr is executed. */
-        kmmio_post_handler_t post_handler; /* Called after addr is executed */
-        void *private;
+        /* kmmio internal list: */
+        struct list_head        list;
+        /* start location of the probe point: */
+        unsigned long           addr;
+        /* length of the probe region: */
+        unsigned long           len;
+        /* Called before addr is executed: */
+        kmmio_pre_handler_t     pre_handler;
+        /* Called after addr is executed: */
+        kmmio_post_handler_t    post_handler;
+        void                    *private;
 };
 
+extern unsigned int kmmio_count;
+
+extern int register_kmmio_probe(struct kmmio_probe *p);
+extern void unregister_kmmio_probe(struct kmmio_probe *p);
+
+#ifdef CONFIG_MMIOTRACE
 /* kmmio is active by some kmmio_probes? */
 static inline int is_kmmio_active(void)
 {
-        extern unsigned int kmmio_count;
         return kmmio_count;
 }
 
-extern int register_kmmio_probe(struct kmmio_probe *p);
-extern void unregister_kmmio_probe(struct kmmio_probe *p);
-
 /* Called from page fault handler. */
 extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
 
-#ifdef CONFIG_MMIOTRACE
 /* Called from ioremap.c */
 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
                                                         void __iomem *addr);
@@ -43,7 +49,17 @@ extern void mmiotrace_iounmap(volatile void __iomem *addr);
 /* For anyone to insert markers. Remember trailing newline. */
 extern int mmiotrace_printk(const char *fmt, ...)
                                 __attribute__ ((format (printf, 1, 2)));
-#else
+#else /* !CONFIG_MMIOTRACE: */
+static inline int is_kmmio_active(void)
+{
+        return 0;
+}
+
+static inline int kmmio_handler(struct pt_regs *regs, unsigned long addr)
+{
+        return 0;
+}
+
 static inline void mmiotrace_ioremap(resource_size_t offset,
                                         unsigned long size, void __iomem *addr)
 {
@@ -63,28 +79,28 @@ static inline int mmiotrace_printk(const char *fmt, ...)
 #endif /* CONFIG_MMIOTRACE */
 
 enum mm_io_opcode {
-        MMIO_READ = 0x1,     /* struct mmiotrace_rw */
-        MMIO_WRITE = 0x2,    /* struct mmiotrace_rw */
-        MMIO_PROBE = 0x3,    /* struct mmiotrace_map */
-        MMIO_UNPROBE = 0x4,  /* struct mmiotrace_map */
-        MMIO_UNKNOWN_OP = 0x5, /* struct mmiotrace_rw */
+        MMIO_READ       = 0x1,  /* struct mmiotrace_rw */
+        MMIO_WRITE      = 0x2,  /* struct mmiotrace_rw */
+        MMIO_PROBE      = 0x3,  /* struct mmiotrace_map */
+        MMIO_UNPROBE    = 0x4,  /* struct mmiotrace_map */
+        MMIO_UNKNOWN_OP = 0x5,  /* struct mmiotrace_rw */
 };
 
 struct mmiotrace_rw {
-        resource_size_t phys;   /* PCI address of register */
-        unsigned long value;
-        unsigned long pc;       /* optional program counter */
-        int map_id;
-        unsigned char opcode;   /* one of MMIO_{READ,WRITE,UNKNOWN_OP} */
-        unsigned char width;    /* size of register access in bytes */
+        resource_size_t phys;   /* PCI address of register */
+        unsigned long   value;
+        unsigned long   pc;     /* optional program counter */
+        int             map_id;
+        unsigned char   opcode; /* one of MMIO_{READ,WRITE,UNKNOWN_OP} */
+        unsigned char   width;  /* size of register access in bytes */
 };
 
 struct mmiotrace_map {
-        resource_size_t phys;   /* base address in PCI space */
-        unsigned long virt;     /* base virtual address */
-        unsigned long len;      /* mapping size */
-        int map_id;
-        unsigned char opcode;   /* MMIO_PROBE or MMIO_UNPROBE */
+        resource_size_t phys;   /* base address in PCI space */
+        unsigned long   virt;   /* base virtual address */
+        unsigned long   len;    /* mapping size */
+        int             map_id;
+        unsigned char   opcode; /* MMIO_PROBE or MMIO_UNPROBE */
 };
 
 /* in kernel/trace/trace_mmiotrace.c */
@@ -94,4 +110,4 @@ extern void mmio_trace_rw(struct mmiotrace_rw *rw);
 extern void mmio_trace_mapping(struct mmiotrace_map *map);
 extern int mmio_trace_printk(const char *fmt, va_list args);
 
-#endif /* MMIOTRACE_H */
+#endif /* _LINUX_MMIOTRACE_H */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 1aca6cebbb78..186ec6ab334d 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -764,12 +764,6 @@ extern int numa_zonelist_order_handler(struct ctl_table *, int,
 extern char numa_zonelist_order[];
 #define NUMA_ZONELIST_ORDER_LEN 16      /* string buffer size */
 
-#include <linux/topology.h>
-/* Returns the number of the current Node. */
-#ifndef numa_node_id
-#define numa_node_id()          (cpu_to_node(raw_smp_processor_id()))
-#endif
-
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 
 extern struct pglist_data contig_page_data;
@@ -806,6 +800,14 @@ extern struct zone *next_zone(struct zone *zone);
              zone;                                      \
              zone = next_zone(zone))
 
+#define for_each_populated_zone(zone)                   \
+        for (zone = (first_online_pgdat())->node_zones; \
+             zone;                                      \
+             zone = next_zone(zone))                    \
+                if (!populated_zone(zone))              \
+                        ; /* do nothing */              \
+                else
+
 static inline struct zone *zonelist_zone(struct zoneref *zoneref)
 {
         return zoneref->zone;
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index 830bbcd449d6..3a059298cc19 100644
--- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h
@@ -22,6 +22,8 @@ struct proc_mounts {
         int event;
 };
 
+struct fs_struct;
+
 extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
                 struct fs_struct *);
 extern void __put_mnt_ns(struct mnt_namespace *ns);
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index fde86671f48f..1bf5900ffe43 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -454,4 +454,13 @@ struct dmi_system_id {
 
 #define DMI_MATCH(a, b) { a, b }
 
+#define PLATFORM_NAME_SIZE      20
+#define PLATFORM_MODULE_PREFIX  "platform:"
+
+struct platform_device_id {
+        char name[PLATFORM_NAME_SIZE];
+        kernel_ulong_t driver_data
+                        __attribute__((aligned(sizeof(kernel_ulong_t))));
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/module.h b/include/linux/module.h
index 145a75528cc1..627ac082e2a6 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -248,6 +248,10 @@ struct module
         const unsigned long *crcs;
         unsigned int num_syms;
 
+        /* Kernel parameters. */
+        struct kernel_param *kp;
+        unsigned int num_kp;
+
         /* GPL-only exported symbols. */
         unsigned int num_gpl_syms;
         const struct kernel_symbol *gpl_syms;
@@ -329,6 +333,11 @@ struct module
         unsigned int num_tracepoints;
 #endif
 
+#ifdef CONFIG_TRACING
+        const char **trace_bprintk_fmt_start;
+        unsigned int num_trace_bprintk_fmt;
+#endif
+
 #ifdef CONFIG_MODULE_UNLOAD
         /* What modules depend on me? */
         struct list_head modules_which_use_me;
@@ -350,6 +359,8 @@ struct module
 #define MODULE_ARCH_INIT {}
 #endif
 
+extern struct mutex module_mutex;
+
 /* FIXME: It'd be nice to isolate modules during init, too, so they
    aren't used before they (may) fail.  But presently too much code
    (IDE & SCSI) require entry into the module during init.*/
@@ -358,10 +369,10 @@ static inline int module_is_live(struct module *mod)
         return mod->state != MODULE_STATE_GOING;
 }
 
-/* Is this address in a module? (second is with no locks, for oops) */
-struct module *module_text_address(unsigned long addr);
 struct module *__module_text_address(unsigned long addr);
-int is_module_address(unsigned long addr);
+struct module *__module_address(unsigned long addr);
+bool is_module_address(unsigned long addr);
+bool is_module_text_address(unsigned long addr);
 
 static inline int within_module_core(unsigned long addr, struct module *mod)
 {
@@ -375,6 +386,31 @@ static inline int within_module_init(unsigned long addr, struct module *mod)
                addr < (unsigned long)mod->module_init + mod->init_size;
 }
 
+/* Search for module by name: must hold module_mutex. */
+struct module *find_module(const char *name);
+
+struct symsearch {
+        const struct kernel_symbol *start, *stop;
+        const unsigned long *crcs;
+        enum {
+                NOT_GPL_ONLY,
+                GPL_ONLY,
+                WILL_BE_GPL_ONLY,
+        } licence;
+        bool unused;
+};
+
+/* Search for an exported symbol by name. */
+const struct kernel_symbol *find_symbol(const char *name,
+                                        struct module **owner,
+                                        const unsigned long **crc,
+                                        bool gplok,
+                                        bool warn);
+
+/* Walk the exported symbol table */
+bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
+                            unsigned int symnum, void *data), void *data);
+
 /* Returns 0 and fills in value, defined and namebuf, or -ERANGE if
    symnum out of range. */
 int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
@@ -383,6 +419,10 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
 /* Look for this name: can be of form module:name. */
 unsigned long module_kallsyms_lookup_name(const char *name);
 
+int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
+                                             struct module *, unsigned long),
+                                   void *data);
+
 extern void __module_put_and_exit(struct module *mod, long code)
         __attribute__((noreturn));
 #define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code);
@@ -444,6 +484,7 @@ static inline void __module_get(struct module *module)
 #define symbol_put_addr(p) do { } while(0)
 
 #endif /* CONFIG_MODULE_UNLOAD */
+int use_module(struct module *a, struct module *b);
 
 /* This is a #define so the string doesn't get put in every .o file */
 #define module_name(mod)                        \
@@ -490,21 +531,24 @@ search_module_extables(unsigned long addr)
         return NULL;
 }
 
-/* Is this address in a module? */
-static inline struct module *module_text_address(unsigned long addr)
+static inline struct module *__module_address(unsigned long addr)
 {
         return NULL;
 }
 
-/* Is this address in a module? (don't take a lock, we're oopsing) */
 static inline struct module *__module_text_address(unsigned long addr)
 {
         return NULL;
 }
 
-static inline int is_module_address(unsigned long addr)
+static inline bool is_module_address(unsigned long addr)
 {
-        return 0;
+        return false;
+}
+
+static inline bool is_module_text_address(unsigned long addr)
+{
+        return false;
 }
 
 /* Get/put a kernel symbol (calls should be symmetric) */
@@ -559,6 +603,14 @@ static inline unsigned long module_kallsyms_lookup_name(const char *name)
         return 0;
 }
 
+static inline int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
+                                                           struct module *,
+                                                           unsigned long),
+                                                 void *data)
+{
+        return 0;
+}
+
 static inline int register_module_notifier(struct notifier_block * nb)
 {
         /* no events will happen anyway, so this can always succeed */
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index e4af3399ef48..a4f0b931846c 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -138,6 +138,16 @@ extern int parse_args(const char *name,
                       unsigned num,
                       int (*unknown)(char *param, char *val));
 
+/* Called by module remove. */
+#ifdef CONFIG_SYSFS
+extern void destroy_params(const struct kernel_param *params, unsigned num);
+#else
+static inline void destroy_params(const struct kernel_param *params,
+                                  unsigned num)
+{
+}
+#endif /* !CONFIG_SYSFS */
+
 /* All the helper functions */
 /* The macros to do compile-time type checking stolen from Jakub
    Jelinek, who IIRC came up with this idea for the 2.4 module init code. */
diff --git a/include/linux/mount.h b/include/linux/mount.h
index cab2a85e2ee8..51f55f903aff 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -27,6 +27,7 @@ struct mnt_namespace;
 #define MNT_NODIRATIME  0x10
 #define MNT_RELATIME    0x20
 #define MNT_READONLY    0x40    /* does the user want this to be r/o? */
+#define MNT_STRICTATIME 0x80
 
 #define MNT_SHRINKABLE  0x100
 #define MNT_IMBALANCED_WRITE_COUNT      0x200 /* just for debugging */
diff --git a/include/linux/mpage.h b/include/linux/mpage.h
index 5c42821da2d1..068a0c9946af 100644
--- a/include/linux/mpage.h
+++ b/include/linux/mpage.h
@@ -11,21 +11,11 @@
  */
 #ifdef CONFIG_BLOCK
 
-struct mpage_data {
-        struct bio *bio;
-        sector_t last_block_in_bio;
-        get_block_t *get_block;
-        unsigned use_writepage;
-};
-
 struct writeback_control;
 
-struct bio *mpage_bio_submit(int rw, struct bio *bio);
 int mpage_readpages(struct address_space *mapping, struct list_head *pages,
                                 unsigned nr_pages, get_block_t get_block);
 int mpage_readpage(struct page *page, get_block_t get_block);
-int __mpage_writepage(struct page *page, struct writeback_control *wbc,
-                      void *data);
 int mpage_writepages(struct address_space *mapping,
                 struct writeback_control *wbc, get_block_t get_block);
 int mpage_writepage(struct page *page, get_block_t *get_block,
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 8a455694d682..0d45b4e8d367 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -193,6 +193,9 @@ struct vif_device
 struct mfc_cache 
 {
         struct mfc_cache *next;                 /* Next entry on cache line     */
+#ifdef CONFIG_NET_NS
+        struct net *mfc_net;
+#endif
         __be32 mfc_mcastgrp;                    /* Group the entry belongs to   */
         __be32 mfc_origin;                      /* Source of packet             */
         vifi_t mfc_parent;                      /* Source interface             */
@@ -215,6 +218,18 @@ struct mfc_cache
         } mfc_un;
 };
 
+static inline
+struct net *mfc_net(const struct mfc_cache *mfc)
+{
+        return read_pnet(&mfc->mfc_net);
+}
+
+static inline
+void mfc_net_set(struct mfc_cache *mfc, struct net *net)
+{
+        write_pnet(&mfc->mfc_net, hold_net(net));
+}
+
 #define MFC_STATIC              1
 #define MFC_NOTIFY              2
 
@@ -241,7 +256,8 @@ struct mfc_cache
 
 #ifdef __KERNEL__
 struct rtmsg;
-extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
+extern int ipmr_get_route(struct net *net, struct sk_buff *skb,
+                          struct rtmsg *rtm, int nowait);
 #endif
 
 #endif
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 5375faca1f72..43dc97e32183 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -65,7 +65,7 @@ struct mif6ctl {
         mifi_t  mif6c_mifi;             /* Index of MIF */
         unsigned char mif6c_flags;      /* MIFF_ flags */
         unsigned char vifc_threshold;   /* ttl limit */
-        u_short  mif6c_pifi;            /* the index of the physical IF */
+        __u16    mif6c_pifi;            /* the index of the physical IF */
         unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
 };
 
diff --git a/include/linux/msi.h b/include/linux/msi.h
index d2b8a1e8ca11..6991ab5b24d1 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -20,20 +20,23 @@ extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 
 struct msi_desc {
         struct {
-                __u8    type    : 5;    /* {0: unused, 5h:MSI, 11h:MSI-X} */
+                __u8    is_msix : 1;
+                __u8    multiple: 3;    /* log2 number of messages */
                 __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-                __u8    masked  : 1;
                 __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
                 __u8    pos;            /* Location of the msi capability */
-                __u32   maskbits_mask;  /* mask bits mask */
                 __u16   entry_nr;       /* specific enabled entry         */
                 unsigned default_irq;   /* default pre-assigned irq       */
-        }msi_attrib;
+        } msi_attrib;
 
+        u32 masked;                     /* mask bits */
         unsigned int irq;
         struct list_head list;
 
-        void __iomem *mask_base;
+        union {
+                void __iomem *mask_base;
+                u8 mask_pos;
+        };
         struct pci_dev *dev;
 
         /* Last set MSI message */
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 3aa5d77c2cdb..5675b63a0631 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/notifier.h>
+#include <linux/device.h>
 
 #include <linux/mtd/compatmac.h>
 #include <mtd/mtd-abi.h>
@@ -162,6 +163,20 @@ struct mtd_info {
         /* We probably shouldn't allow XIP if the unpoint isn't a NULL */
         void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
 
+        /* Allow NOMMU mmap() to directly map the device (if not NULL)
+         * - return the address to which the offset maps
+         * - return -ENOSYS to indicate refusal to do the mapping
+         */
+        unsigned long (*get_unmapped_area) (struct mtd_info *mtd,
+                                            unsigned long len,
+                                            unsigned long offset,
+                                            unsigned long flags);
+
+        /* Backing device capabilities for this device
+         * - provides mmap capabilities
+         */
+        struct backing_dev_info *backing_dev_info;
+
 
         int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
         int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
@@ -223,6 +238,7 @@ struct mtd_info {
         void *priv;
 
         struct module *owner;
+        struct device dev;
         int usecount;
 
         /* If the driver is something smart, like UBI, it may need to maintain
@@ -233,6 +249,11 @@ struct mtd_info {
         void (*put_device) (struct mtd_info *mtd);
 };
 
+static inline struct mtd_info *dev_to_mtd(struct device *dev)
+{
+        return dev ? container_of(dev, struct mtd_info, dev) : NULL;
+}
+
 static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
 {
         if (mtd->erasesize_shift)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index db5b63da2a7e..7efb9be34662 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -43,8 +43,8 @@ extern void nand_wait_ready(struct mtd_info *mtd);
  * is supported now. If you add a chip with bigger oobsize/page
  * adjust this accordingly.
  */
-#define NAND_MAX_OOBSIZE        64
-#define NAND_MAX_PAGESIZE       2048
+#define NAND_MAX_OOBSIZE        128
+#define NAND_MAX_PAGESIZE       4096
 
 /*
  * Constants for hardware specific CLE/ALE/NCE function
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index a45dd831b3f8..7535a74083b9 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -76,4 +76,16 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                                       struct device_node *node,
                                       struct mtd_partition **pparts);
 
+#ifdef CONFIG_MTD_PARTITIONS
+static inline int mtd_has_partitions(void) { return 1; }
+#else
+static inline int mtd_has_partitions(void) { return 0; }
+#endif
+
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+static inline int mtd_has_cmdlinepart(void) { return 1; }
+#else
+static inline int mtd_has_cmdlinepart(void) { return 0; }
+#endif
+
 #endif
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 7a0e5c4f8072..3069ec7e0ab8 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -50,8 +50,10 @@ struct mutex {
         atomic_t                count;
         spinlock_t              wait_lock;
         struct list_head        wait_list;
-#ifdef CONFIG_DEBUG_MUTEXES
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
         struct thread_info      *owner;
+#endif
+#ifdef CONFIG_DEBUG_MUTEXES
         const char              *name;
         void                    *magic;
 #endif
@@ -68,7 +70,6 @@ struct mutex_waiter {
         struct list_head        list;
         struct task_struct      *task;
 #ifdef CONFIG_DEBUG_MUTEXES
-        struct mutex            *lock;
         void                    *magic;
 #endif
 };
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index f69e66d151cc..30b06c893944 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -204,7 +204,7 @@ void ncp_update_inode2(struct inode *, struct ncp_entry_info *);
 /* linux/fs/ncpfs/dir.c */
 extern const struct inode_operations ncp_dir_inode_operations;
 extern const struct file_operations ncp_dir_operations;
-extern struct dentry_operations ncp_root_dentry_operations;
+extern const struct dentry_operations ncp_root_dentry_operations;
 int ncp_conn_logged_in(struct super_block *);
 int ncp_date_dos2unix(__le16 time, __le16 date);
 void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date);
diff --git a/include/linux/ncp_no.h b/include/linux/ncp_no.h
index f56a696a7cc6..cddaa48fb182 100644
--- a/include/linux/ncp_no.h
+++ b/include/linux/ncp_no.h
@@ -2,18 +2,18 @@
 #define _NCP_NO
 
 /* these define the attribute byte as seen by NCP */
-#define aRONLY                  (__constant_cpu_to_le32(1))
-#define aHIDDEN                 (__constant_cpu_to_le32(2))
-#define aSYSTEM                 (__constant_cpu_to_le32(4))
-#define aEXECUTE                (__constant_cpu_to_le32(8))
-#define aDIR                    (__constant_cpu_to_le32(0x10))
-#define aARCH                   (__constant_cpu_to_le32(0x20))
-#define aSHARED                 (__constant_cpu_to_le32(0x80))
-#define aDONTSUBALLOCATE        (__constant_cpu_to_le32(1L<<11))
-#define aTRANSACTIONAL          (__constant_cpu_to_le32(1L<<12))
-#define aPURGE                  (__constant_cpu_to_le32(1L<<16))
-#define aRENAMEINHIBIT          (__constant_cpu_to_le32(1L<<17))
-#define aDELETEINHIBIT          (__constant_cpu_to_le32(1L<<18))
-#define aDONTCOMPRESS           (__constant_cpu_to_le32(1L<<27))
+#define aRONLY                  (__cpu_to_le32(1))
+#define aHIDDEN                 (__cpu_to_le32(2))
+#define aSYSTEM                 (__cpu_to_le32(4))
+#define aEXECUTE                (__cpu_to_le32(8))
+#define aDIR                    (__cpu_to_le32(0x10))
+#define aARCH                   (__cpu_to_le32(0x20))
+#define aSHARED                 (__cpu_to_le32(0x80))
+#define aDONTSUBALLOCATE        (__cpu_to_le32(1L<<11))
+#define aTRANSACTIONAL          (__cpu_to_le32(1L<<12))
+#define aPURGE                  (__cpu_to_le32(1L<<16))
+#define aRENAMEINHIBIT          (__cpu_to_le32(1L<<17))
+#define aDELETEINHIBIT          (__cpu_to_le32(1L<<18))
+#define aDONTCOMPRESS           (__cpu_to_le32(1L<<27))
 
 #endif /* _NCP_NO */
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 8730d5dae1bc..12c9de138451 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -31,6 +31,7 @@ enum
  *      Neighbor Cache Entry Flags
  */
 
+#define NTF_USE         0x01
 #define NTF_PROXY       0x08    /* == ATF_PUBL */
 #define NTF_ROUTER      0x80
 
diff --git a/include/linux/net.h b/include/linux/net.h
index 4515efae4c39..4fc2ffd527f9 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -129,11 +129,15 @@ struct socket {
         socket_state            state;
         short                   type;
         unsigned long           flags;
-        const struct proto_ops  *ops;
+        /*
+         * Please keep fasync_list & wait fields in the same cache line
+         */
         struct fasync_struct    *fasync_list;
+        wait_queue_head_t       wait;
+
         struct file             *file;
         struct sock             *sk;
-        wait_queue_head_t       wait;
+        const struct proto_ops  *ops;
 };
 
 struct vm_area_struct;
diff --git a/include/linux/net_dropmon.h b/include/linux/net_dropmon.h
new file mode 100644
index 000000000000..0217fb81a630
--- /dev/null
+++ b/include/linux/net_dropmon.h
@@ -0,0 +1,56 @@
+#ifndef __NET_DROPMON_H
+#define __NET_DROPMON_H
+
+#include <linux/netlink.h>
+
+struct net_dm_drop_point {
+        __u8 pc[8];
+        __u32 count;
+};
+
+#define NET_DM_CFG_VERSION  0
+#define NET_DM_CFG_ALERT_COUNT  1
+#define NET_DM_CFG_ALERT_DELAY 2
+#define NET_DM_CFG_MAX 3
+
+struct net_dm_config_entry {
+        __u32 type;
+        __u64 data __attribute__((aligned(8)));
+};
+
+struct net_dm_config_msg {
+        __u32 entries;
+        struct net_dm_config_entry options[0];
+};
+
+struct net_dm_alert_msg {
+        __u32 entries;
+        struct net_dm_drop_point points[0];
+};
+
+struct net_dm_user_msg {
+        union {
+                struct net_dm_config_msg user;
+                struct net_dm_alert_msg alert;
+        } u;
+};
+
+
+/* These are the netlink message types for this protocol */
+
+enum {
+        NET_DM_CMD_UNSPEC = 0,
+        NET_DM_CMD_ALERT,
+        NET_DM_CMD_CONFIG,
+        NET_DM_CMD_START,
+        NET_DM_CMD_STOP,
+        _NET_DM_CMD_MAX,
+};
+
+#define NET_DM_CMD_MAX (_NET_DM_CMD_MAX - 1)
+
+/*
+ * Our group identifiers
+ */
+#define NET_DM_GRP_ALERT 1
+#endif
diff --git a/include/linux/net_tstamp.h b/include/linux/net_tstamp.h
new file mode 100644
index 000000000000..a3b8546354ac
--- /dev/null
+++ b/include/linux/net_tstamp.h
@@ -0,0 +1,104 @@
+/*
+ * Userspace API for hardware time stamping of network packets
+ *
+ * Copyright (C) 2008,2009 Intel Corporation
+ * Author: Patrick Ohly <patrick.ohly@intel.com>
+ *
+ */
+
+#ifndef _NET_TIMESTAMPING_H
+#define _NET_TIMESTAMPING_H
+
+#include <linux/socket.h>   /* for SO_TIMESTAMPING */
+
+/* SO_TIMESTAMPING gets an integer bit field comprised of these values */
+enum {
+        SOF_TIMESTAMPING_TX_HARDWARE = (1<<0),
+        SOF_TIMESTAMPING_TX_SOFTWARE = (1<<1),
+        SOF_TIMESTAMPING_RX_HARDWARE = (1<<2),
+        SOF_TIMESTAMPING_RX_SOFTWARE = (1<<3),
+        SOF_TIMESTAMPING_SOFTWARE = (1<<4),
+        SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5),
+        SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6),
+        SOF_TIMESTAMPING_MASK =
+        (SOF_TIMESTAMPING_RAW_HARDWARE - 1) |
+        SOF_TIMESTAMPING_RAW_HARDWARE
+};
+
+/**
+ * struct hwtstamp_config - %SIOCSHWTSTAMP parameter
+ *
+ * @flags:      no flags defined right now, must be zero
+ * @tx_type:    one of HWTSTAMP_TX_*
+ * @rx_type:    one of one of HWTSTAMP_FILTER_*
+ *
+ * %SIOCSHWTSTAMP expects a &struct ifreq with a ifr_data pointer to
+ * this structure. dev_ifsioc() in the kernel takes care of the
+ * translation between 32 bit userspace and 64 bit kernel. The
+ * structure is intentionally chosen so that it has the same layout on
+ * 32 and 64 bit systems, don't break this!
+ */
+struct hwtstamp_config {
+        int flags;
+        int tx_type;
+        int rx_filter;
+};
+
+/* possible values for hwtstamp_config->tx_type */
+enum {
+        /*
+         * No outgoing packet will need hardware time stamping;
+         * should a packet arrive which asks for it, no hardware
+         * time stamping will be done.
+         */
+        HWTSTAMP_TX_OFF,
+
+        /*
+         * Enables hardware time stamping for outgoing packets;
+         * the sender of the packet decides which are to be
+         * time stamped by setting %SOF_TIMESTAMPING_TX_SOFTWARE
+         * before sending the packet.
+         */
+        HWTSTAMP_TX_ON,
+};
+
+/* possible values for hwtstamp_config->rx_filter */
+enum {
+        /* time stamp no incoming packet at all */
+        HWTSTAMP_FILTER_NONE,
+
+        /* time stamp any incoming packet */
+        HWTSTAMP_FILTER_ALL,
+
+        /* return value: time stamp all packets requested plus some others */
+        HWTSTAMP_FILTER_SOME,
+
+        /* PTP v1, UDP, any kind of event packet */
+        HWTSTAMP_FILTER_PTP_V1_L4_EVENT,
+        /* PTP v1, UDP, Sync packet */
+        HWTSTAMP_FILTER_PTP_V1_L4_SYNC,
+        /* PTP v1, UDP, Delay_req packet */
+        HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ,
+        /* PTP v2, UDP, any kind of event packet */
+        HWTSTAMP_FILTER_PTP_V2_L4_EVENT,
+        /* PTP v2, UDP, Sync packet */
+        HWTSTAMP_FILTER_PTP_V2_L4_SYNC,
+        /* PTP v2, UDP, Delay_req packet */
+        HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ,
+
+        /* 802.AS1, Ethernet, any kind of event packet */
+        HWTSTAMP_FILTER_PTP_V2_L2_EVENT,
+        /* 802.AS1, Ethernet, Sync packet */
+        HWTSTAMP_FILTER_PTP_V2_L2_SYNC,
+        /* 802.AS1, Ethernet, Delay_req packet */
+        HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ,
+
+        /* PTP v2/802.AS1, any layer, any kind of event packet */
+        HWTSTAMP_FILTER_PTP_V2_EVENT,
+        /* PTP v2/802.AS1, any layer, Sync packet */
+        HWTSTAMP_FILTER_PTP_V2_SYNC,
+        /* PTP v2/802.AS1, any layer, Delay_req packet */
+        HWTSTAMP_FILTER_PTP_V2_DELAY_REQ,
+};
+
+#endif /* _NET_TIMESTAMPING_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ec54785d34f9..5a96a1a406e9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -32,6 +32,7 @@
 #ifdef __KERNEL__
 #include <linux/timer.h>
 #include <linux/delay.h>
+#include <linux/mm.h>
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
@@ -96,14 +97,14 @@ struct wireless_dev;
  *      Compute the worst case header length according to the protocols
  *      used.
  */
- 
+
 #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 # if defined(CONFIG_MAC80211_MESH)
 #  define LL_MAX_HEADER 128
 # else
 #  define LL_MAX_HEADER 96
 # endif
-#elif defined(CONFIG_TR)
+#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
 # define LL_MAX_HEADER 48
 #else
 # define LL_MAX_HEADER 32
@@ -124,7 +125,7 @@ struct wireless_dev;
  *      Network device statistics. Akin to the 2.0 ether stats but
  *      with byte counters.
  */
- 
+
 struct net_device_stats
 {
         unsigned long   rx_packets;             /* total packets received       */
@@ -285,7 +286,7 @@ enum netdev_state_t
 
 /*
  * This structure holds at boot time configured netdevice settings. They
- * are then used in the device probing. 
+ * are then used in the device probing.
  */
 struct netdev_boot_setup {
         char name[IFNAMSIZ];
@@ -314,6 +315,9 @@ struct napi_struct {
         spinlock_t              poll_lock;
         int                     poll_owner;
 #endif
+
+        unsigned int            gro_count;
+
         struct net_device       *dev;
         struct list_head        dev_list;
         struct sk_buff          *gro_list;
@@ -327,6 +331,14 @@ enum
         NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
 };
 
+enum {
+        GRO_MERGED,
+        GRO_MERGED_FREE,
+        GRO_HELD,
+        GRO_NORMAL,
+        GRO_DROP,
+};
+
 extern void __napi_schedule(struct napi_struct *n);
 
 static inline int napi_disable_pending(struct napi_struct *n)
@@ -488,7 +500,7 @@ struct netdev_queue {
  *
  * int (*ndo_set_mac_address)(struct net_device *dev, void *addr);
  *      This function  is called when the Media Access Control address
- *      needs to be changed. If not this interface is not defined, the
+ *      needs to be changed. If this interface is not defined, the
  *      mac address can not be changed.
  *
  * int (*ndo_validate_addr)(struct net_device *dev);
@@ -582,6 +594,14 @@ struct net_device_ops {
 #define HAVE_NETDEV_POLL
         void                    (*ndo_poll_controller)(struct net_device *dev);
 #endif
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+        int                     (*ndo_fcoe_ddp_setup)(struct net_device *dev,
+                                                      u16 xid,
+                                                      struct scatterlist *sgl,
+                                                      unsigned int sgc);
+        int                     (*ndo_fcoe_ddp_done)(struct net_device *dev,
+                                                     u16 xid);
+#endif
 };
 
 /*
@@ -650,14 +670,17 @@ struct net_device
 #define NETIF_F_GRO             16384   /* Generic receive offload */
 #define NETIF_F_LRO             32768   /* large receive offload */
 
+#define NETIF_F_FCOE_CRC        (1 << 24) /* FCoE CRC32 */
+
         /* Segmentation offload features */
 #define NETIF_F_GSO_SHIFT       16
-#define NETIF_F_GSO_MASK        0xffff0000
+#define NETIF_F_GSO_MASK        0x00ff0000
 #define NETIF_F_TSO             (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
 #define NETIF_F_UFO             (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
 #define NETIF_F_GSO_ROBUST      (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
 #define NETIF_F_TSO_ECN         (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT)
 #define NETIF_F_TSO6            (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT)
+#define NETIF_F_FSO             (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
 
         /* List of features with software fallbacks. */
 #define NETIF_F_GSO_SOFTWARE    (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
@@ -740,7 +763,7 @@ struct net_device
         void                    *dsa_ptr;       /* dsa specific data */
 #endif
         void                    *atalk_ptr;     /* AppleTalk link       */
-        void                    *ip_ptr;        /* IPv4 specific data   */  
+        void                    *ip_ptr;        /* IPv4 specific data   */
         void                    *dn_ptr;        /* DECnet specific data */
         void                    *ip6_ptr;       /* IPv6 specific data */
         void                    *ec_ptr;        /* Econet specific data */
@@ -753,7 +776,7 @@ struct net_device
  */
         unsigned long           last_rx;        /* Time of last Rx      */
         /* Interface address info used in eth_type_trans() */
-        unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast 
+        unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast
                                                            because most packets are unicast) */
 
         unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
@@ -840,6 +863,11 @@ struct net_device
         struct dcbnl_rtnl_ops *dcbnl_ops;
 #endif
 
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+        /* max exchange id for FCoE LRO by ddp */
+        unsigned int            fcoe_ddp_xid;
+#endif
+
 #ifdef CONFIG_COMPAT_NET_DEV_OPS
         struct {
                 int                     (*init)(struct net_device *dev);
@@ -984,6 +1012,9 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
 void netif_napi_del(struct napi_struct *napi);
 
 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;
 
@@ -1079,6 +1110,7 @@ extern void		synchronize_net(void);
 extern int              register_netdevice_notifier(struct notifier_block *nb);
 extern int              unregister_netdevice_notifier(struct notifier_block *nb);
 extern int              init_dummy_netdev(struct net_device *dev);
+extern void             netdev_resync_ops(struct net_device *dev);
 
 extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
@@ -1087,6 +1119,36 @@ extern int		dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
 #endif
+extern void           *skb_gro_header(struct sk_buff *skb, unsigned int hlen);
+extern int             skb_gro_receive(struct sk_buff **head,
+                                       struct sk_buff *skb);
+
+static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
+{
+        return NAPI_GRO_CB(skb)->data_offset;
+}
+
+static inline unsigned int skb_gro_len(const struct sk_buff *skb)
+{
+        return skb->len - NAPI_GRO_CB(skb)->data_offset;
+}
+
+static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
+{
+        NAPI_GRO_CB(skb)->data_offset += len;
+}
+
+static inline void skb_gro_reset_offset(struct sk_buff *skb)
+{
+        NAPI_GRO_CB(skb)->data_offset = 0;
+}
+
+static inline void *skb_gro_mac_header(struct sk_buff *skb)
+{
+        return skb_mac_header(skb) < skb->data ? skb_mac_header(skb) :
+               page_address(skb_shinfo(skb)->frags[0].page) +
+               skb_shinfo(skb)->frags[0].page_offset;
+}
 
 static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                                   unsigned short type,
@@ -1375,12 +1437,15 @@ extern int		netif_receive_skb(struct sk_buff *skb);
 extern void             napi_gro_flush(struct napi_struct *napi);
 extern int              dev_gro_receive(struct napi_struct *napi,
                                         struct sk_buff *skb);
+extern int              napi_skb_finish(int ret, struct sk_buff *skb);
 extern int              napi_gro_receive(struct napi_struct *napi,
                                          struct sk_buff *skb);
 extern void             napi_reuse_skb(struct napi_struct *napi,
                                        struct sk_buff *skb);
 extern struct sk_buff * napi_fraginfo_skb(struct napi_struct *napi,
                                           struct napi_gro_fraginfo *info);
+extern int              napi_frags_finish(struct napi_struct *napi,
+                                          struct sk_buff *skb, int ret);
 extern int              napi_gro_frags(struct napi_struct *napi,
                                        struct napi_gro_fraginfo *info);
 extern void             netif_nit_deliver(struct sk_buff *skb);
@@ -1574,56 +1639,6 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
         return (1 << debug_value) - 1;
 }
 
-/* Test if receive needs to be scheduled but only if up */
-static inline int netif_rx_schedule_prep(struct napi_struct *napi)
-{
-        return napi_schedule_prep(napi);
-}
-
-/* Add interface to tail of rx poll list. This assumes that _prep has
- * already been called and returned 1.
- */
-static inline void __netif_rx_schedule(struct napi_struct *napi)
-{
-        __napi_schedule(napi);
-}
-
-/* Try to reschedule poll. Called by irq handler. */
-
-static inline void netif_rx_schedule(struct napi_struct *napi)
-{
-        if (netif_rx_schedule_prep(napi))
-                __netif_rx_schedule(napi);
-}
-
-/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().  */
-static inline int netif_rx_reschedule(struct napi_struct *napi)
-{
-        if (napi_schedule_prep(napi)) {
-                __netif_rx_schedule(napi);
-                return 1;
-        }
-        return 0;
-}
-
-/* same as netif_rx_complete, except that local_irq_save(flags)
- * has already been issued
- */
-static inline void __netif_rx_complete(struct napi_struct *napi)
-{
-        __napi_complete(napi);
-}
-
-/* Remove interface from poll list: it must be in the poll list
- * on current cpu. This primitive is called by dev->poll(), when
- * it completes the work. The device cannot be out of poll list at this
- * moment, it is BUG().
- */
-static inline void netif_rx_complete(struct napi_struct *napi)
-{
-        napi_complete(napi);
-}
-
 static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
 {
         spin_lock(&txq->_xmit_lock);
@@ -1874,7 +1889,7 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
 
                 if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
                         if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
-                            skb->protocol == __constant_htons(ETH_P_ARP))
+                            skb->protocol == __cpu_to_be16(ETH_P_ARP))
                                 return 0;
 
                         if (master->priv_flags & IFF_MASTER_ALB) {
@@ -1883,7 +1898,7 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
                                         return 0;
                         }
                         if (master->priv_flags & IFF_MASTER_8023AD &&
-                            skb->protocol == __constant_htons(ETH_P_SLOW))
+                            skb->protocol == __cpu_to_be16(ETH_P_SLOW))
                                 return 0;
 
                         return 1;
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 5a8af875bce2..af9d2fb97212 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -7,16 +7,21 @@ header-y += xt_CLASSIFY.h
 header-y += xt_CONNMARK.h
 header-y += xt_CONNSECMARK.h
 header-y += xt_DSCP.h
+header-y += xt_LED.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_TPROXY.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_cluster.h
 header-y += xt_dccp.h
 header-y += xt_dscp.h
 header-y += xt_esp.h
@@ -30,6 +35,7 @@ header-y += xt_mark.h
 header-y += xt_multiport.h
 header-y += xt_owner.h
 header-y += xt_pkttype.h
+header-y += xt_quota.h
 header-y += xt_rateest.h
 header-y += xt_realm.h
 header-y += xt_recent.h
@@ -39,6 +45,8 @@ 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
 
 unifdef-y += nf_conntrack_common.h
 unifdef-y += nf_conntrack_ftp.h
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index a049df4f2236..3066789b972a 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -2,6 +2,8 @@
 #define _NF_CONNTRACK_TCP_H
 /* TCP tracking. */
 
+#include <linux/types.h>
+
 /* This is exposed to userspace (ctnetlink) */
 enum tcp_conntrack {
         TCP_CONNTRACK_NONE,
@@ -34,8 +36,8 @@ enum tcp_conntrack {
 #define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED      0x10
 
 struct nf_ct_tcp_flags {
-        u_int8_t flags;
-        u_int8_t mask;
+        __u8 flags;
+        __u8 mask;
 };
 
 #ifdef __KERNEL__
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 7d8e0455ccac..c600083cbdf5 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -25,8 +25,8 @@ enum nfnetlink_groups {
 /* General form of address family dependent message.
  */
 struct nfgenmsg {
-        u_int8_t  nfgen_family;         /* AF_xxx */
-        u_int8_t  version;              /* nfnetlink version */
+        __u8  nfgen_family;             /* AF_xxx */
+        __u8  version;          /* nfnetlink version */
         __be16    res_id;               /* resource id */
 };
 
@@ -76,6 +76,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
 extern int nfnetlink_has_listeners(unsigned int group);
 extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 
                           int echo);
+extern void nfnetlink_set_err(u32 pid, u32 group, int error);
 extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
 
 extern void nfnl_lock(void);
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/linux/netfilter/nfnetlink_compat.h
index e1451760c9cd..eda55cabceec 100644
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
@@ -1,5 +1,8 @@
 #ifndef _NFNETLINK_COMPAT_H
 #define _NFNETLINK_COMPAT_H
+
+#include <linux/types.h>
+
 #ifndef __KERNEL__
 /* Old nfnetlink macros for userspace */
 
@@ -20,8 +23,8 @@
 
 struct nfattr
 {
-        u_int16_t nfa_len;
-        u_int16_t nfa_type;     /* we use 15 bits for the type, and the highest
+        __u16 nfa_len;
+        __u16 nfa_type; /* we use 15 bits for the type, and the highest
                                  * bit to indicate whether the payload is nested */
 };
 
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index 29fe9ea1d346..1a865e48b8eb 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -100,6 +100,7 @@ enum ctattr_protoinfo_tcp {
 enum ctattr_protoinfo_dccp {
         CTA_PROTOINFO_DCCP_UNSPEC,
         CTA_PROTOINFO_DCCP_STATE,
+        CTA_PROTOINFO_DCCP_ROLE,
         __CTA_PROTOINFO_DCCP_MAX,
 };
 #define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index f661731f3cb1..d3bab7a2c9b7 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -17,14 +17,14 @@ enum nfulnl_msg_types {
 
 struct nfulnl_msg_packet_hdr {
         __be16          hw_protocol;    /* hw protocol (network order) */
-        u_int8_t        hook;           /* netfilter hook */
-        u_int8_t        _pad;
+        __u8    hook;           /* netfilter hook */
+        __u8    _pad;
 };
 
 struct nfulnl_msg_packet_hw {
         __be16          hw_addrlen;
-        u_int16_t       _pad;
-        u_int8_t        hw_addr[8];
+        __u16   _pad;
+        __u8    hw_addr[8];
 };
 
 struct nfulnl_msg_packet_timestamp {
@@ -35,12 +35,12 @@ struct nfulnl_msg_packet_timestamp {
 enum nfulnl_attr_type {
         NFULA_UNSPEC,
         NFULA_PACKET_HDR,
-        NFULA_MARK,                     /* u_int32_t nfmark */
+        NFULA_MARK,                     /* __u32 nfmark */
         NFULA_TIMESTAMP,                /* nfulnl_msg_packet_timestamp */
-        NFULA_IFINDEX_INDEV,            /* u_int32_t ifindex */
-        NFULA_IFINDEX_OUTDEV,           /* u_int32_t ifindex */
-        NFULA_IFINDEX_PHYSINDEV,        /* u_int32_t ifindex */
-        NFULA_IFINDEX_PHYSOUTDEV,       /* u_int32_t ifindex */
+        NFULA_IFINDEX_INDEV,            /* __u32 ifindex */
+        NFULA_IFINDEX_OUTDEV,           /* __u32 ifindex */
+        NFULA_IFINDEX_PHYSINDEV,        /* __u32 ifindex */
+        NFULA_IFINDEX_PHYSOUTDEV,       /* __u32 ifindex */
         NFULA_HWADDR,                   /* nfulnl_msg_packet_hw */
         NFULA_PAYLOAD,                  /* opaque data payload */
         NFULA_PREFIX,                   /* string prefix */
@@ -65,23 +65,23 @@ enum nfulnl_msg_config_cmds {
 };
 
 struct nfulnl_msg_config_cmd {
-        u_int8_t        command;        /* nfulnl_msg_config_cmds */
+        __u8    command;        /* nfulnl_msg_config_cmds */
 } __attribute__ ((packed));
 
 struct nfulnl_msg_config_mode {
         __be32          copy_range;
-        u_int8_t        copy_mode;
-        u_int8_t        _pad;
+        __u8    copy_mode;
+        __u8    _pad;
 } __attribute__ ((packed));
 
 enum nfulnl_attr_config {
         NFULA_CFG_UNSPEC,
         NFULA_CFG_CMD,                  /* nfulnl_msg_config_cmd */
         NFULA_CFG_MODE,                 /* nfulnl_msg_config_mode */
-        NFULA_CFG_NLBUFSIZ,             /* u_int32_t buffer size */
-        NFULA_CFG_TIMEOUT,              /* u_int32_t in 1/100 s */
-        NFULA_CFG_QTHRESH,              /* u_int32_t */
-        NFULA_CFG_FLAGS,                /* u_int16_t */
+        NFULA_CFG_NLBUFSIZ,             /* __u32 buffer size */
+        NFULA_CFG_TIMEOUT,              /* __u32 in 1/100 s */
+        NFULA_CFG_QTHRESH,              /* __u32 */
+        NFULA_CFG_FLAGS,                /* __u16 */
         __NFULA_CFG_MAX
 };
 #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 83e789633e35..2455fe5f4e01 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -15,13 +15,13 @@ enum nfqnl_msg_types {
 struct nfqnl_msg_packet_hdr {
         __be32          packet_id;      /* unique ID of packet in queue */
         __be16          hw_protocol;    /* hw protocol (network order) */
-        u_int8_t        hook;           /* netfilter hook */
+        __u8    hook;           /* netfilter hook */
 } __attribute__ ((packed));
 
 struct nfqnl_msg_packet_hw {
         __be16          hw_addrlen;
-        u_int16_t       _pad;
-        u_int8_t        hw_addr[8];
+        __u16   _pad;
+        __u8    hw_addr[8];
 };
 
 struct nfqnl_msg_packet_timestamp {
@@ -33,12 +33,12 @@ enum nfqnl_attr_type {
         NFQA_UNSPEC,
         NFQA_PACKET_HDR,
         NFQA_VERDICT_HDR,               /* nfqnl_msg_verdict_hrd */
-        NFQA_MARK,                      /* u_int32_t nfmark */
+        NFQA_MARK,                      /* __u32 nfmark */
         NFQA_TIMESTAMP,                 /* nfqnl_msg_packet_timestamp */
-        NFQA_IFINDEX_INDEV,             /* u_int32_t ifindex */
-        NFQA_IFINDEX_OUTDEV,            /* u_int32_t ifindex */
-        NFQA_IFINDEX_PHYSINDEV,         /* u_int32_t ifindex */
-        NFQA_IFINDEX_PHYSOUTDEV,        /* u_int32_t ifindex */
+        NFQA_IFINDEX_INDEV,             /* __u32 ifindex */
+        NFQA_IFINDEX_OUTDEV,            /* __u32 ifindex */
+        NFQA_IFINDEX_PHYSINDEV,         /* __u32 ifindex */
+        NFQA_IFINDEX_PHYSOUTDEV,        /* __u32 ifindex */
         NFQA_HWADDR,                    /* nfqnl_msg_packet_hw */
         NFQA_PAYLOAD,                   /* opaque data payload */
 
@@ -61,8 +61,8 @@ enum nfqnl_msg_config_cmds {
 };
 
 struct nfqnl_msg_config_cmd {
-        u_int8_t        command;        /* nfqnl_msg_config_cmds */
-        u_int8_t        _pad;
+        __u8    command;        /* nfqnl_msg_config_cmds */
+        __u8    _pad;
         __be16          pf;             /* AF_xxx for PF_[UN]BIND */
 };
 
@@ -74,7 +74,7 @@ enum nfqnl_config_mode {
 
 struct nfqnl_msg_config_params {
         __be32          copy_range;
-        u_int8_t        copy_mode;      /* enum nfqnl_config_mode */
+        __u8    copy_mode;      /* enum nfqnl_config_mode */
 } __attribute__ ((packed));
 
 
@@ -82,7 +82,7 @@ enum nfqnl_attr_config {
         NFQA_CFG_UNSPEC,
         NFQA_CFG_CMD,                   /* nfqnl_msg_config_cmd */
         NFQA_CFG_PARAMS,                /* nfqnl_msg_config_params */
-        NFQA_CFG_QUEUE_MAXLEN,          /* u_int32_t */
+        NFQA_CFG_QUEUE_MAXLEN,          /* __u32 */
         __NFQA_CFG_MAX
 };
 #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index c7ee8744d26b..c9efe039dc57 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -1,6 +1,8 @@
 #ifndef _X_TABLES_H
 #define _X_TABLES_H
 
+#include <linux/types.h>
+
 #define XT_FUNCTION_MAXNAMELEN 30
 #define XT_TABLE_MAXNAMELEN 32
 
@@ -8,22 +10,22 @@ struct xt_entry_match
 {
         union {
                 struct {
-                        u_int16_t match_size;
+                        __u16 match_size;
 
                         /* Used by userspace */
                         char name[XT_FUNCTION_MAXNAMELEN-1];
 
-                        u_int8_t revision;
+                        __u8 revision;
                 } user;
                 struct {
-                        u_int16_t match_size;
+                        __u16 match_size;
 
                         /* Used inside the kernel */
                         struct xt_match *match;
                 } kernel;
 
                 /* Total length */
-                u_int16_t match_size;
+                __u16 match_size;
         } u;
 
         unsigned char data[0];
@@ -33,22 +35,22 @@ struct xt_entry_target
 {
         union {
                 struct {
-                        u_int16_t target_size;
+                        __u16 target_size;
 
                         /* Used by userspace */
                         char name[XT_FUNCTION_MAXNAMELEN-1];
 
-                        u_int8_t revision;
+                        __u8 revision;
                 } user;
                 struct {
-                        u_int16_t target_size;
+                        __u16 target_size;
 
                         /* Used inside the kernel */
                         struct xt_target *target;
                 } kernel;
 
                 /* Total length */
-                u_int16_t target_size;
+                __u16 target_size;
         } u;
 
         unsigned char data[0];
@@ -74,7 +76,7 @@ struct xt_get_revision
 {
         char name[XT_FUNCTION_MAXNAMELEN-1];
 
-        u_int8_t revision;
+        __u8 revision;
 };
 
 /* CONTINUE verdict for targets */
@@ -90,10 +92,10 @@ struct xt_get_revision
  */
 struct _xt_align
 {
-        u_int8_t u8;
-        u_int16_t u16;
-        u_int32_t u32;
-        u_int64_t u64;
+        __u8 u8;
+        __u16 u16;
+        __u32 u32;
+        __u64 u64;
 };
 
 #define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1))  \
@@ -109,7 +111,7 @@ struct _xt_align
 
 struct xt_counters
 {
-        u_int64_t pcnt, bcnt;                   /* Packet and byte counters */
+        __u64 pcnt, bcnt;                       /* Packet and byte counters */
 };
 
 /* The argument to IPT_SO_ADD_COUNTERS. */
@@ -349,23 +351,19 @@ struct xt_table
 {
         struct list_head list;
 
-        /* A unique name... */
-        const char name[XT_TABLE_MAXNAMELEN];
-
         /* What hooks you will enter on */
         unsigned int valid_hooks;
 
-        /* Lock for the curtain */
-        rwlock_t lock;
-
         /* Man behind the curtain... */
-        //struct ip6t_table_info *private;
-        void *private;
+        struct xt_table_info *private;
 
         /* Set this to THIS_MODULE if you are a module, otherwise NULL */
         struct module *me;
 
         u_int8_t af;            /* address/protocol family */
+
+        /* A unique name... */
+        const char name[XT_TABLE_MAXNAMELEN];
 };
 
 #include <linux/netfilter_ipv4.h>
@@ -386,7 +384,7 @@ struct xt_table_info
 
         /* ipt_entry tables: one per CPU */
         /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */
-        char *entries[1];
+        void *entries[1];
 };
 
 #define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \
@@ -434,6 +432,97 @@ extern void xt_proto_fini(struct net *net, u_int8_t af);
 extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
 extern void xt_free_table_info(struct xt_table_info *info);
 
+/*
+ * Per-CPU spinlock associated with per-cpu table entries, and
+ * with a counter for the "reading" side that allows a recursive
+ * reader to avoid taking the lock and deadlocking.
+ *
+ * "reading" is used by ip/arp/ip6 tables rule processing which runs per-cpu.
+ * It needs to ensure that the rules are not being changed while the packet
+ * is being processed. In some cases, the read lock will be acquired
+ * twice on the same CPU; this is okay because of the count.
+ *
+ * "writing" is used when reading counters.
+ *  During replace any readers that are using the old tables have to complete
+ *  before freeing the old table. This is handled by the write locking
+ *  necessary for reading the counters.
+ */
+struct xt_info_lock {
+        spinlock_t lock;
+        unsigned char readers;
+};
+DECLARE_PER_CPU(struct xt_info_lock, xt_info_locks);
+
+/*
+ * Note: we need to ensure that preemption is disabled before acquiring
+ * the per-cpu-variable, so we do it as a two step process rather than
+ * using "spin_lock_bh()".
+ *
+ * We _also_ need to disable bottom half processing before updating our
+ * nesting count, to make sure that the only kind of re-entrancy is this
+ * code being called by itself: since the count+lock is not an atomic
+ * operation, we can allow no races.
+ *
+ * _Only_ that special combination of being per-cpu and never getting
+ * re-entered asynchronously means that the count is safe.
+ */
+static inline void xt_info_rdlock_bh(void)
+{
+        struct xt_info_lock *lock;
+
+        local_bh_disable();
+        lock = &__get_cpu_var(xt_info_locks);
+        if (likely(!lock->readers++))
+                spin_lock(&lock->lock);
+}
+
+static inline void xt_info_rdunlock_bh(void)
+{
+        struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks);
+
+        if (likely(!--lock->readers))
+                spin_unlock(&lock->lock);
+        local_bh_enable();
+}
+
+/*
+ * The "writer" side needs to get exclusive access to the lock,
+ * regardless of readers.  This must be called with bottom half
+ * processing (and thus also preemption) disabled.
+ */
+static inline void xt_info_wrlock(unsigned int cpu)
+{
+        spin_lock(&per_cpu(xt_info_locks, cpu).lock);
+}
+
+static inline void xt_info_wrunlock(unsigned int cpu)
+{
+        spin_unlock(&per_cpu(xt_info_locks, cpu).lock);
+}
+
+/*
+ * This helper is performance critical and must be inlined
+ */
+static inline unsigned long ifname_compare_aligned(const char *_a,
+                                                   const char *_b,
+                                                   const char *_mask)
+{
+        const unsigned long *a = (const unsigned long *)_a;
+        const unsigned long *b = (const unsigned long *)_b;
+        const unsigned long *mask = (const unsigned long *)_mask;
+        unsigned long ret;
+
+        ret = (a[0] ^ b[0]) & mask[0];
+        if (IFNAMSIZ > sizeof(unsigned long))
+                ret |= (a[1] ^ b[1]) & mask[1];
+        if (IFNAMSIZ > 2 * sizeof(unsigned long))
+                ret |= (a[2] ^ b[2]) & mask[2];
+        if (IFNAMSIZ > 3 * sizeof(unsigned long))
+                ret |= (a[3] ^ b[3]) & mask[3];
+        BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
+        return ret;
+}
+
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
 
diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/linux/netfilter/xt_CLASSIFY.h
index 58111355255d..a813bf14dd63 100644
--- a/include/linux/netfilter/xt_CLASSIFY.h
+++ b/include/linux/netfilter/xt_CLASSIFY.h
@@ -1,8 +1,10 @@
 #ifndef _XT_CLASSIFY_H
 #define _XT_CLASSIFY_H
 
+#include <linux/types.h>
+
 struct xt_classify_target_info {
-        u_int32_t priority;
+        __u32 priority;
 };
 
 #endif /*_XT_CLASSIFY_H */
diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h
index 4e58ba43c289..7635c8ffdadb 100644
--- a/include/linux/netfilter/xt_CONNMARK.h
+++ b/include/linux/netfilter/xt_CONNMARK.h
@@ -1,6 +1,8 @@
 #ifndef _XT_CONNMARK_H_target
 #define _XT_CONNMARK_H_target
 
+#include <linux/types.h>
+
 /* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
  * by Henrik Nordstrom <hno@marasystems.com>
  *
@@ -19,12 +21,12 @@ enum {
 struct xt_connmark_target_info {
         unsigned long mark;
         unsigned long mask;
-        u_int8_t mode;
+        __u8 mode;
 };
 
 struct xt_connmark_tginfo1 {
-        u_int32_t ctmark, ctmask, nfmask;
-        u_int8_t mode;
+        __u32 ctmark, ctmask, nfmask;
+        __u8 mode;
 };
 
 #endif /*_XT_CONNMARK_H_target*/
diff --git a/include/linux/netfilter/xt_CONNSECMARK.h b/include/linux/netfilter/xt_CONNSECMARK.h
index c6bd75469ba2..b973ff80fa1e 100644
--- a/include/linux/netfilter/xt_CONNSECMARK.h
+++ b/include/linux/netfilter/xt_CONNSECMARK.h
@@ -1,13 +1,15 @@
 #ifndef _XT_CONNSECMARK_H_target
 #define _XT_CONNSECMARK_H_target
 
+#include <linux/types.h>
+
 enum {
         CONNSECMARK_SAVE = 1,
         CONNSECMARK_RESTORE,
 };
 
 struct xt_connsecmark_target_info {
-        u_int8_t mode;
+        __u8 mode;
 };
 
 #endif /*_XT_CONNSECMARK_H_target */
diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h
index 14da1968e2c6..648e0b3bed29 100644
--- a/include/linux/netfilter/xt_DSCP.h
+++ b/include/linux/netfilter/xt_DSCP.h
@@ -11,15 +11,16 @@
 #ifndef _XT_DSCP_TARGET_H
 #define _XT_DSCP_TARGET_H
 #include <linux/netfilter/xt_dscp.h>
+#include <linux/types.h>
 
 /* target info */
 struct xt_DSCP_info {
-        u_int8_t dscp;
+        __u8 dscp;
 };
 
 struct xt_tos_target_info {
-        u_int8_t tos_value;
-        u_int8_t tos_mask;
+        __u8 tos_value;
+        __u8 tos_mask;
 };
 
 #endif /* _XT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter/xt_LED.h b/include/linux/netfilter/xt_LED.h
new file mode 100644
index 000000000000..4c91a0d770d0
--- /dev/null
+++ b/include/linux/netfilter/xt_LED.h
@@ -0,0 +1,13 @@
+#ifndef _XT_LED_H
+#define _XT_LED_H
+
+struct xt_led_info {
+        char id[27];        /* Unique ID for this trigger in the LED class */
+        __u8 always_blink;  /* Blink even if the LED is already on */
+        __u32 delay;        /* Delay until LED is switched off after trigger */
+
+        /* Kernel data used in the module */
+        void *internal_data __attribute__((aligned(8)));
+};
+
+#endif /* _XT_LED_H */
diff --git a/include/linux/netfilter/xt_MARK.h b/include/linux/netfilter/xt_MARK.h
index 778b278fd9f2..028304bcc0b1 100644
--- a/include/linux/netfilter/xt_MARK.h
+++ b/include/linux/netfilter/xt_MARK.h
@@ -1,6 +1,8 @@
 #ifndef _XT_MARK_H_target
 #define _XT_MARK_H_target
 
+#include <linux/types.h>
+
 /* Version 0 */
 struct xt_mark_target_info {
         unsigned long mark;
@@ -15,11 +17,11 @@ enum {
 
 struct xt_mark_target_info_v1 {
         unsigned long mark;
-        u_int8_t mode;
+        __u8 mode;
 };
 
 struct xt_mark_tginfo2 {
-        u_int32_t mark, mask;
+        __u32 mark, mask;
 };
 
 #endif /*_XT_MARK_H_target */
diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_NFLOG.h
index 4b36aeb46a10..87b58311ce6b 100644
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
@@ -1,17 +1,19 @@
 #ifndef _XT_NFLOG_TARGET
 #define _XT_NFLOG_TARGET
 
+#include <linux/types.h>
+
 #define XT_NFLOG_DEFAULT_GROUP          0x1
 #define XT_NFLOG_DEFAULT_THRESHOLD      0
 
 #define XT_NFLOG_MASK                   0x0
 
 struct xt_nflog_info {
-        u_int32_t       len;
-        u_int16_t       group;
-        u_int16_t       threshold;
-        u_int16_t       flags;
-        u_int16_t       pad;
+        __u32   len;
+        __u16   group;
+        __u16   threshold;
+        __u16   flags;
+        __u16   pad;
         char            prefix[64];
 };
 
diff --git a/include/linux/netfilter/xt_NFQUEUE.h b/include/linux/netfilter/xt_NFQUEUE.h
index 9a9af79f74d2..982a89f78272 100644
--- a/include/linux/netfilter/xt_NFQUEUE.h
+++ b/include/linux/netfilter/xt_NFQUEUE.h
@@ -8,9 +8,11 @@
 #ifndef _XT_NFQ_TARGET_H
 #define _XT_NFQ_TARGET_H
 
+#include <linux/types.h>
+
 /* target info */
 struct xt_NFQ_info {
-        u_int16_t queuenum;
+        __u16 queuenum;
 };
 
 #endif /* _XT_NFQ_TARGET_H */
diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/linux/netfilter/xt_RATEEST.h
index f79e3133cbea..6605e20ad8cf 100644
--- a/include/linux/netfilter/xt_RATEEST.h
+++ b/include/linux/netfilter/xt_RATEEST.h
@@ -1,10 +1,12 @@
 #ifndef _XT_RATEEST_TARGET_H
 #define _XT_RATEEST_TARGET_H
 
+#include <linux/types.h>
+
 struct xt_rateest_target_info {
         char                    name[IFNAMSIZ];
-        int8_t                  interval;
-        u_int8_t                ewma_log;
+        __s8                    interval;
+        __u8            ewma_log;
 
         /* Used internally by the kernel */
         struct xt_rateest       *est __attribute__((aligned(8)));
diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/linux/netfilter/xt_SECMARK.h
index c53fbffa997d..6fcd3448b186 100644
--- a/include/linux/netfilter/xt_SECMARK.h
+++ b/include/linux/netfilter/xt_SECMARK.h
@@ -1,6 +1,8 @@
 #ifndef _XT_SECMARK_H_target
 #define _XT_SECMARK_H_target
 
+#include <linux/types.h>
+
 /*
  * This is intended for use by various security subsystems (but not
  * at the same time).
@@ -12,12 +14,12 @@
 #define SECMARK_SELCTX_MAX      256
 
 struct xt_secmark_target_selinux_info {
-        u_int32_t selsid;
+        __u32 selsid;
         char selctx[SECMARK_SELCTX_MAX];
 };
 
 struct xt_secmark_target_info {
-        u_int8_t mode;
+        __u8 mode;
         union {
                 struct xt_secmark_target_selinux_info sel;
         } u;
diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/linux/netfilter/xt_TCPMSS.h
index 53a292cd47f3..9a6960afc134 100644
--- a/include/linux/netfilter/xt_TCPMSS.h
+++ b/include/linux/netfilter/xt_TCPMSS.h
@@ -1,8 +1,10 @@
 #ifndef _XT_TCPMSS_H
 #define _XT_TCPMSS_H
 
+#include <linux/types.h>
+
 struct xt_tcpmss_info {
-        u_int16_t mss;
+        __u16 mss;
 };
 
 #define XT_TCPMSS_CLAMP_PMTU 0xffff
diff --git a/include/linux/netfilter/xt_cluster.h b/include/linux/netfilter/xt_cluster.h
new file mode 100644
index 000000000000..5e0a0d07b526
--- /dev/null
+++ b/include/linux/netfilter/xt_cluster.h
@@ -0,0 +1,15 @@
+#ifndef _XT_CLUSTER_MATCH_H
+#define _XT_CLUSTER_MATCH_H
+
+enum xt_cluster_flags {
+        XT_CLUSTER_F_INV        = (1 << 0)
+};
+
+struct xt_cluster_match_info {
+        u_int32_t               total_nodes;
+        u_int32_t               node_mask;
+        u_int32_t               hash_seed;
+        u_int32_t               flags;
+};
+
+#endif /* _XT_CLUSTER_MATCH_H */
diff --git a/include/linux/netfilter/xt_connbytes.h b/include/linux/netfilter/xt_connbytes.h
index c022c989754d..52bd6153b996 100644
--- a/include/linux/netfilter/xt_connbytes.h
+++ b/include/linux/netfilter/xt_connbytes.h
@@ -1,6 +1,8 @@
 #ifndef _XT_CONNBYTES_H
 #define _XT_CONNBYTES_H
 
+#include <linux/types.h>
+
 enum xt_connbytes_what {
         XT_CONNBYTES_PKTS,
         XT_CONNBYTES_BYTES,
@@ -19,7 +21,7 @@ struct xt_connbytes_info
                 aligned_u64 from;       /* count to be matched */
                 aligned_u64 to;         /* count to be matched */
         } count;
-        u_int8_t what;          /* ipt_connbytes_what */
-        u_int8_t direction;     /* ipt_connbytes_direction */
+        __u8 what;              /* ipt_connbytes_what */
+        __u8 direction; /* ipt_connbytes_direction */
 };
 #endif
diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h
index 359ef86918dc..571e266d004c 100644
--- a/include/linux/netfilter/xt_connmark.h
+++ b/include/linux/netfilter/xt_connmark.h
@@ -1,6 +1,8 @@
 #ifndef _XT_CONNMARK_H
 #define _XT_CONNMARK_H
 
+#include <linux/types.h>
+
 /* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
  * by Henrik Nordstrom <hno@marasystems.com>
  *
@@ -12,12 +14,12 @@
 
 struct xt_connmark_info {
         unsigned long mark, mask;
-        u_int8_t invert;
+        __u8 invert;
 };
 
 struct xt_connmark_mtinfo1 {
-        u_int32_t mark, mask;
-        u_int8_t invert;
+        __u32 mark, mask;
+        __u8 invert;
 };
 
 #endif /*_XT_CONNMARK_H*/
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 8f5345275393..3430c7751948 100644
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -63,9 +63,9 @@ struct xt_conntrack_info
         unsigned long expires_min, expires_max;
 
         /* Flags word */
-        u_int8_t flags;
+        __u8 flags;
         /* Inverse flags */
-        u_int8_t invflags;
+        __u8 invflags;
 };
 
 struct xt_conntrack_mtinfo1 {
@@ -73,12 +73,12 @@ struct xt_conntrack_mtinfo1 {
         union nf_inet_addr origdst_addr, origdst_mask;
         union nf_inet_addr replsrc_addr, replsrc_mask;
         union nf_inet_addr repldst_addr, repldst_mask;
-        u_int32_t expires_min, expires_max;
-        u_int16_t l4proto;
+        __u32 expires_min, expires_max;
+        __u16 l4proto;
         __be16 origsrc_port, origdst_port;
         __be16 replsrc_port, repldst_port;
-        u_int16_t match_flags, invert_flags;
-        u_int8_t state_mask, status_mask;
+        __u16 match_flags, invert_flags;
+        __u8 state_mask, status_mask;
 };
 
 #endif /*_XT_CONNTRACK_H*/
diff --git a/include/linux/netfilter/xt_dccp.h b/include/linux/netfilter/xt_dccp.h
index e0221b9d32cb..a579e1b6f040 100644
--- a/include/linux/netfilter/xt_dccp.h
+++ b/include/linux/netfilter/xt_dccp.h
@@ -1,6 +1,8 @@
 #ifndef _XT_DCCP_H_
 #define _XT_DCCP_H_
 
+#include <linux/types.h>
+
 #define XT_DCCP_SRC_PORTS               0x01
 #define XT_DCCP_DEST_PORTS              0x02
 #define XT_DCCP_TYPE                    0x04
@@ -9,14 +11,14 @@
 #define XT_DCCP_VALID_FLAGS             0x0f
 
 struct xt_dccp_info {
-        u_int16_t dpts[2];  /* Min, Max */
-        u_int16_t spts[2];  /* Min, Max */
+        __u16 dpts[2];  /* Min, Max */
+        __u16 spts[2];  /* Min, Max */
 
-        u_int16_t flags;
-        u_int16_t invflags;
+        __u16 flags;
+        __u16 invflags;
 
-        u_int16_t typemask;
-        u_int8_t option;
+        __u16 typemask;
+        __u8 option;
 };
 
 #endif /* _XT_DCCP_H_ */
diff --git a/include/linux/netfilter/xt_dscp.h b/include/linux/netfilter/xt_dscp.h
index f49bc1a648dc..15f8932ad5ce 100644
--- a/include/linux/netfilter/xt_dscp.h
+++ b/include/linux/netfilter/xt_dscp.h
@@ -10,20 +10,22 @@
 #ifndef _XT_DSCP_H
 #define _XT_DSCP_H
 
+#include <linux/types.h>
+
 #define XT_DSCP_MASK    0xfc    /* 11111100 */
 #define XT_DSCP_SHIFT   2
 #define XT_DSCP_MAX     0x3f    /* 00111111 */
 
 /* match info */
 struct xt_dscp_info {
-        u_int8_t dscp;
-        u_int8_t invert;
+        __u8 dscp;
+        __u8 invert;
 };
 
 struct xt_tos_match_info {
-        u_int8_t tos_mask;
-        u_int8_t tos_value;
-        u_int8_t invert;
+        __u8 tos_mask;
+        __u8 tos_value;
+        __u8 invert;
 };
 
 #endif /* _XT_DSCP_H */
diff --git a/include/linux/netfilter/xt_esp.h b/include/linux/netfilter/xt_esp.h
index 9380fb1c27da..ef6fa4747d0a 100644
--- a/include/linux/netfilter/xt_esp.h
+++ b/include/linux/netfilter/xt_esp.h
@@ -1,10 +1,12 @@
 #ifndef _XT_ESP_H
 #define _XT_ESP_H
 
+#include <linux/types.h>
+
 struct xt_esp
 {
-        u_int32_t spis[2];      /* Security Parameter Index */
-        u_int8_t  invflags;     /* Inverse flags */
+        __u32 spis[2];  /* Security Parameter Index */
+        __u8  invflags; /* Inverse flags */
 };
 
 /* Values for "invflags" field in struct xt_esp. */
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
index 51b18d83b477..b1925b5925e9 100644
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -1,6 +1,8 @@
 #ifndef _XT_HASHLIMIT_H
 #define _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
@@ -18,15 +20,15 @@ enum {
 };
 
 struct hashlimit_cfg {
-        u_int32_t mode;   /* bitmask of XT_HASHLIMIT_HASH_* */
-        u_int32_t avg;    /* Average secs between packets * scale */
-        u_int32_t burst;  /* Period multiplier for upper limit. */
+        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
+        __u32 avg;    /* Average secs between packets * scale */
+        __u32 burst;  /* Period multiplier for upper limit. */
 
         /* user specified */
-        u_int32_t size;         /* how many buckets */
-        u_int32_t max;          /* max number of entries */
-        u_int32_t gc_interval;  /* gc interval */
-        u_int32_t expire;       /* when do entries expire? */
+        __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 {
@@ -42,17 +44,17 @@ struct xt_hashlimit_info {
 };
 
 struct hashlimit_cfg1 {
-        u_int32_t mode;   /* bitmask of XT_HASHLIMIT_HASH_* */
-        u_int32_t avg;    /* Average secs between packets * scale */
-        u_int32_t burst;  /* Period multiplier for upper limit. */
+        __u32 mode;       /* bitmask of XT_HASHLIMIT_HASH_* */
+        __u32 avg;    /* Average secs between packets * scale */
+        __u32 burst;  /* Period multiplier for upper limit. */
 
         /* user specified */
-        u_int32_t size;         /* how many buckets */
-        u_int32_t max;          /* max number of entries */
-        u_int32_t gc_interval;  /* gc interval */
-        u_int32_t expire;       /* when do entries expire? */
+        __u32 size;             /* how many buckets */
+        __u32 max;              /* max number of entries */
+        __u32 gc_interval;      /* gc interval */
+        __u32 expire;   /* when do entries expire? */
 
-        u_int8_t srcmask, dstmask;
+        __u8 srcmask, dstmask;
 };
 
 struct xt_hashlimit_mtinfo1 {
diff --git a/include/linux/netfilter/xt_iprange.h b/include/linux/netfilter/xt_iprange.h
index a4299c7d3680..c1f21a779a45 100644
--- a/include/linux/netfilter/xt_iprange.h
+++ b/include/linux/netfilter/xt_iprange.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_NETFILTER_XT_IPRANGE_H
 #define _LINUX_NETFILTER_XT_IPRANGE_H 1
 
+#include <linux/types.h>
+
 enum {
         IPRANGE_SRC     = 1 << 0,       /* match source IP address */
         IPRANGE_DST     = 1 << 1,       /* match destination IP address */
@@ -11,7 +13,7 @@ enum {
 struct xt_iprange_mtinfo {
         union nf_inet_addr src_min, src_max;
         union nf_inet_addr dst_min, dst_max;
-        u_int8_t flags;
+        __u8 flags;
 };
 
 #endif /* _LINUX_NETFILTER_XT_IPRANGE_H */
diff --git a/include/linux/netfilter/xt_length.h b/include/linux/netfilter/xt_length.h
index 7c2b439f73fe..b82ed7c4b1e0 100644
--- a/include/linux/netfilter/xt_length.h
+++ b/include/linux/netfilter/xt_length.h
@@ -1,9 +1,11 @@
 #ifndef _XT_LENGTH_H
 #define _XT_LENGTH_H
 
+#include <linux/types.h>
+
 struct xt_length_info {
-    u_int16_t   min, max;
-    u_int8_t    invert;
+    __u16       min, max;
+    __u8        invert;
 };
 
 #endif /*_XT_LENGTH_H*/
diff --git a/include/linux/netfilter/xt_limit.h b/include/linux/netfilter/xt_limit.h
index b3ce65375ecb..bb47fc4d2ade 100644
--- a/include/linux/netfilter/xt_limit.h
+++ b/include/linux/netfilter/xt_limit.h
@@ -1,21 +1,24 @@
 #ifndef _XT_RATE_H
 #define _XT_RATE_H
 
+#include <linux/types.h>
+
 /* timings are in milliseconds. */
 #define XT_LIMIT_SCALE 10000
 
+struct xt_limit_priv;
+
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
    seconds, or one every 59 hours. */
 struct xt_rateinfo {
-        u_int32_t avg;    /* Average secs between packets * scale */
-        u_int32_t burst;  /* Period multiplier for upper limit. */
+        __u32 avg;    /* Average secs between packets * scale */
+        __u32 burst;  /* Period multiplier for upper limit. */
 
         /* Used internally by the kernel */
-        unsigned long prev;
-        u_int32_t credit;
-        u_int32_t credit_cap, cost;
+        unsigned long prev; /* moved to xt_limit_priv */
+        __u32 credit; /* moved to xt_limit_priv */
+        __u32 credit_cap, cost;
 
-        /* Ugly, ugly fucker. */
-        struct xt_rateinfo *master;
+        struct xt_limit_priv *master;
 };
 #endif /*_XT_RATE_H*/
diff --git a/include/linux/netfilter/xt_mark.h b/include/linux/netfilter/xt_mark.h
index fae74bc3f34e..6fa460a3cc29 100644
--- a/include/linux/netfilter/xt_mark.h
+++ b/include/linux/netfilter/xt_mark.h
@@ -1,14 +1,16 @@
 #ifndef _XT_MARK_H
 #define _XT_MARK_H
 
+#include <linux/types.h>
+
 struct xt_mark_info {
     unsigned long mark, mask;
-    u_int8_t invert;
+    __u8 invert;
 };
 
 struct xt_mark_mtinfo1 {
-        u_int32_t mark, mask;
-        u_int8_t invert;
+        __u32 mark, mask;
+        __u8 invert;
 };
 
 #endif /*_XT_MARK_H*/
diff --git a/include/linux/netfilter/xt_multiport.h b/include/linux/netfilter/xt_multiport.h
index d49ee4183710..185db499fcbc 100644
--- a/include/linux/netfilter/xt_multiport.h
+++ b/include/linux/netfilter/xt_multiport.h
@@ -1,6 +1,8 @@
 #ifndef _XT_MULTIPORT_H
 #define _XT_MULTIPORT_H
 
+#include <linux/types.h>
+
 enum xt_multiport_flags
 {
         XT_MULTIPORT_SOURCE,
@@ -13,18 +15,18 @@ enum xt_multiport_flags
 /* Must fit inside union xt_matchinfo: 16 bytes */
 struct xt_multiport
 {
-        u_int8_t flags;                         /* Type of comparison */
-        u_int8_t count;                         /* Number of ports */
-        u_int16_t ports[XT_MULTI_PORTS];        /* Ports */
+        __u8 flags;                             /* Type of comparison */
+        __u8 count;                             /* Number of ports */
+        __u16 ports[XT_MULTI_PORTS];    /* Ports */
 };
 
 struct xt_multiport_v1
 {
-        u_int8_t flags;                         /* Type of comparison */
-        u_int8_t count;                         /* Number of ports */
-        u_int16_t ports[XT_MULTI_PORTS];        /* Ports */
-        u_int8_t pflags[XT_MULTI_PORTS];        /* Port flags */
-        u_int8_t invert;                        /* Invert flag */
+        __u8 flags;                             /* Type of comparison */
+        __u8 count;                             /* Number of ports */
+        __u16 ports[XT_MULTI_PORTS];    /* Ports */
+        __u8 pflags[XT_MULTI_PORTS];    /* Port flags */
+        __u8 invert;                    /* Invert flag */
 };
 
 #endif /*_XT_MULTIPORT_H*/
diff --git a/include/linux/netfilter/xt_owner.h b/include/linux/netfilter/xt_owner.h
index c84e52cfe415..2081761714b5 100644
--- a/include/linux/netfilter/xt_owner.h
+++ b/include/linux/netfilter/xt_owner.h
@@ -1,6 +1,8 @@
 #ifndef _XT_OWNER_MATCH_H
 #define _XT_OWNER_MATCH_H
 
+#include <linux/types.h>
+
 enum {
         XT_OWNER_UID    = 1 << 0,
         XT_OWNER_GID    = 1 << 1,
@@ -8,9 +10,9 @@ enum {
 };
 
 struct xt_owner_match_info {
-        u_int32_t uid_min, uid_max;
-        u_int32_t gid_min, gid_max;
-        u_int8_t match, invert;
+        __u32 uid_min, uid_max;
+        __u32 gid_min, gid_max;
+        __u8 match, invert;
 };
 
 #endif /* _XT_OWNER_MATCH_H */
diff --git a/include/linux/netfilter/xt_physdev.h b/include/linux/netfilter/xt_physdev.h
index 25a7a1815b5b..8555e399886d 100644
--- a/include/linux/netfilter/xt_physdev.h
+++ b/include/linux/netfilter/xt_physdev.h
@@ -1,6 +1,8 @@
 #ifndef _XT_PHYSDEV_H
 #define _XT_PHYSDEV_H
 
+#include <linux/types.h>
+
 #ifdef __KERNEL__
 #include <linux/if.h>
 #endif
@@ -17,8 +19,8 @@ struct xt_physdev_info {
         char in_mask[IFNAMSIZ];
         char physoutdev[IFNAMSIZ];
         char out_mask[IFNAMSIZ];
-        u_int8_t invert;
-        u_int8_t bitmask;
+        __u8 invert;
+        __u8 bitmask;
 };
 
 #endif /*_XT_PHYSDEV_H*/
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index 053d8cc65464..7bb64e7c853d 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -1,6 +1,8 @@
 #ifndef _XT_POLICY_H
 #define _XT_POLICY_H
 
+#include <linux/types.h>
+
 #define XT_POLICY_MAX_ELEM      4
 
 enum xt_policy_flags
@@ -19,7 +21,7 @@ enum xt_policy_modes
 
 struct xt_policy_spec
 {
-        u_int8_t        saddr:1,
+        __u8    saddr:1,
                         daddr:1,
                         proto:1,
                         mode:1,
@@ -55,9 +57,9 @@ struct xt_policy_elem
 #endif
         };
         __be32                  spi;
-        u_int32_t               reqid;
-        u_int8_t                proto;
-        u_int8_t                mode;
+        __u32           reqid;
+        __u8            proto;
+        __u8            mode;
 
         struct xt_policy_spec   match;
         struct xt_policy_spec   invert;
@@ -66,8 +68,8 @@ struct xt_policy_elem
 struct xt_policy_info
 {
         struct xt_policy_elem pol[XT_POLICY_MAX_ELEM];
-        u_int16_t flags;
-        u_int16_t len;
+        __u16 flags;
+        __u16 len;
 };
 
 #endif /* _XT_POLICY_H */
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h
index 4c8368d781e5..8dc89dfc1361 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/include/linux/netfilter/xt_quota.h
@@ -6,13 +6,15 @@ enum xt_quota_flags {
 };
 #define XT_QUOTA_MASK           0x1
 
+struct xt_quota_priv;
+
 struct xt_quota_info {
         u_int32_t               flags;
         u_int32_t               pad;
 
         /* Used internally by the kernel */
         aligned_u64             quota;
-        struct xt_quota_info    *master;
+        struct xt_quota_priv    *master;
 };
 
 #endif /* _XT_QUOTA_H */
diff --git a/include/linux/netfilter/xt_rateest.h b/include/linux/netfilter/xt_rateest.h
index 2010cb74250f..d40a6196842a 100644
--- a/include/linux/netfilter/xt_rateest.h
+++ b/include/linux/netfilter/xt_rateest.h
@@ -1,6 +1,8 @@
 #ifndef _XT_RATEEST_MATCH_H
 #define _XT_RATEEST_MATCH_H
 
+#include <linux/types.h>
+
 enum xt_rateest_match_flags {
         XT_RATEEST_MATCH_INVERT = 1<<0,
         XT_RATEEST_MATCH_ABS    = 1<<1,
@@ -20,12 +22,12 @@ enum xt_rateest_match_mode {
 struct xt_rateest_match_info {
         char                    name1[IFNAMSIZ];
         char                    name2[IFNAMSIZ];
-        u_int16_t               flags;
-        u_int16_t               mode;
-        u_int32_t               bps1;
-        u_int32_t               pps1;
-        u_int32_t               bps2;
-        u_int32_t               pps2;
+        __u16           flags;
+        __u16           mode;
+        __u32           bps1;
+        __u32           pps1;
+        __u32           bps2;
+        __u32           pps2;
 
         /* Used internally by the kernel */
         struct xt_rateest       *est1 __attribute__((aligned(8)));
diff --git a/include/linux/netfilter/xt_realm.h b/include/linux/netfilter/xt_realm.h
index 220e87245716..d4a82ee56a02 100644
--- a/include/linux/netfilter/xt_realm.h
+++ b/include/linux/netfilter/xt_realm.h
@@ -1,10 +1,12 @@
 #ifndef _XT_REALM_H
 #define _XT_REALM_H
 
+#include <linux/types.h>
+
 struct xt_realm_info {
-        u_int32_t id;
-        u_int32_t mask;
-        u_int8_t invert;
+        __u32 id;
+        __u32 mask;
+        __u8 invert;
 };
 
 #endif /* _XT_REALM_H */
diff --git a/include/linux/netfilter/xt_recent.h b/include/linux/netfilter/xt_recent.h
index 5cfeb81c6794..d2c276609925 100644
--- a/include/linux/netfilter/xt_recent.h
+++ b/include/linux/netfilter/xt_recent.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_NETFILTER_XT_RECENT_H
 #define _LINUX_NETFILTER_XT_RECENT_H 1
 
+#include <linux/types.h>
+
 enum {
         XT_RECENT_CHECK    = 1 << 0,
         XT_RECENT_SET      = 1 << 1,
@@ -15,12 +17,12 @@ enum {
 };
 
 struct xt_recent_mtinfo {
-        u_int32_t seconds;
-        u_int32_t hit_count;
-        u_int8_t check_set;
-        u_int8_t invert;
+        __u32 seconds;
+        __u32 hit_count;
+        __u8 check_set;
+        __u8 invert;
         char name[XT_RECENT_NAME_LEN];
-        u_int8_t side;
+        __u8 side;
 };
 
 #endif /* _LINUX_NETFILTER_XT_RECENT_H */
diff --git a/include/linux/netfilter/xt_sctp.h b/include/linux/netfilter/xt_sctp.h
index 32000ba6ecef..29287be696a2 100644
--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/linux/netfilter/xt_sctp.h
@@ -1,6 +1,8 @@
 #ifndef _XT_SCTP_H_
 #define _XT_SCTP_H_
 
+#include <linux/types.h>
+
 #define XT_SCTP_SRC_PORTS               0x01
 #define XT_SCTP_DEST_PORTS              0x02
 #define XT_SCTP_CHUNK_TYPES             0x04
@@ -8,49 +10,49 @@
 #define XT_SCTP_VALID_FLAGS             0x07
 
 struct xt_sctp_flag_info {
-        u_int8_t chunktype;
-        u_int8_t flag;
-        u_int8_t flag_mask;
+        __u8 chunktype;
+        __u8 flag;
+        __u8 flag_mask;
 };
 
 #define XT_NUM_SCTP_FLAGS       4
 
 struct xt_sctp_info {
-        u_int16_t dpts[2];  /* Min, Max */
-        u_int16_t spts[2];  /* Min, Max */
+        __u16 dpts[2];  /* Min, Max */
+        __u16 spts[2];  /* Min, Max */
 
-        u_int32_t chunkmap[256 / sizeof (u_int32_t)];  /* Bit mask of chunks to be matched according to RFC 2960 */
+        __u32 chunkmap[256 / sizeof (__u32)];  /* Bit mask of chunks to be matched according to RFC 2960 */
 
 #define SCTP_CHUNK_MATCH_ANY   0x01  /* Match if any of the chunk types are present */
 #define SCTP_CHUNK_MATCH_ALL   0x02  /* Match if all of the chunk types are present */
 #define SCTP_CHUNK_MATCH_ONLY  0x04  /* Match if these are the only chunk types present */
 
-        u_int32_t chunk_match_type;
+        __u32 chunk_match_type;
         struct xt_sctp_flag_info flag_info[XT_NUM_SCTP_FLAGS];
         int flag_count;
 
-        u_int32_t flags;
-        u_int32_t invflags;
+        __u32 flags;
+        __u32 invflags;
 };
 
 #define bytes(type) (sizeof(type) * 8)
 
 #define SCTP_CHUNKMAP_SET(chunkmap, type)               \
         do {                                            \
-                (chunkmap)[type / bytes(u_int32_t)] |=  \
-                        1 << (type % bytes(u_int32_t)); \
+                (chunkmap)[type / bytes(__u32)] |=      \
+                        1 << (type % bytes(__u32));     \
         } while (0)
 
 #define SCTP_CHUNKMAP_CLEAR(chunkmap, type)                     \
         do {                                                    \
-                (chunkmap)[type / bytes(u_int32_t)] &=          \
-                        ~(1 << (type % bytes(u_int32_t)));      \
+                (chunkmap)[type / bytes(__u32)] &=              \
+                        ~(1 << (type % bytes(__u32)));  \
         } while (0)
 
 #define SCTP_CHUNKMAP_IS_SET(chunkmap, type)                    \
 ({                                                              \
-        ((chunkmap)[type / bytes (u_int32_t)] &                 \
-                (1 << (type % bytes (u_int32_t)))) ? 1: 0;      \
+        ((chunkmap)[type / bytes (__u32)] &             \
+                (1 << (type % bytes (__u32)))) ? 1: 0;  \
 })
 
 #define SCTP_CHUNKMAP_RESET(chunkmap) \
@@ -65,7 +67,7 @@ struct xt_sctp_info {
 #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
         __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
 static inline bool
-__sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
+__sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)
 {
         unsigned int i;
         for (i = 0; i < n; ++i)
@@ -77,7 +79,7 @@ __sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
 #define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
         __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
 static inline bool
-__sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n)
+__sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)
 {
         unsigned int i;
         for (i = 0; i < n; ++i)
diff --git a/include/linux/netfilter/xt_statistic.h b/include/linux/netfilter/xt_statistic.h
index 3d38bc975048..4e983ef0c968 100644
--- a/include/linux/netfilter/xt_statistic.h
+++ b/include/linux/netfilter/xt_statistic.h
@@ -1,6 +1,8 @@
 #ifndef _XT_STATISTIC_H
 #define _XT_STATISTIC_H
 
+#include <linux/types.h>
+
 enum xt_statistic_mode {
         XT_STATISTIC_MODE_RANDOM,
         XT_STATISTIC_MODE_NTH,
@@ -13,21 +15,22 @@ enum xt_statistic_flags {
 };
 #define XT_STATISTIC_MASK               0x1
 
+struct xt_statistic_priv;
+
 struct xt_statistic_info {
-        u_int16_t                       mode;
-        u_int16_t                       flags;
+        __u16                   mode;
+        __u16                   flags;
         union {
                 struct {
-                        u_int32_t       probability;
+                        __u32   probability;
                 } random;
                 struct {
-                        u_int32_t       every;
-                        u_int32_t       packet;
-                        /* Used internally by the kernel */
-                        u_int32_t       count;
+                        __u32   every;
+                        __u32   packet;
+                        __u32   count; /* unused */
                 } nth;
         } u;
-        struct xt_statistic_info        *master __attribute__((aligned(8)));
+        struct xt_statistic_priv *master __attribute__((aligned(8)));
 };
 
 #endif /* _XT_STATISTIC_H */
diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h
index 8a6ba7bbef9f..ecbb95fc89ed 100644
--- a/include/linux/netfilter/xt_string.h
+++ b/include/linux/netfilter/xt_string.h
@@ -1,6 +1,8 @@
 #ifndef _XT_STRING_H
 #define _XT_STRING_H
 
+#include <linux/types.h>
+
 #define XT_STRING_MAX_PATTERN_SIZE 128
 #define XT_STRING_MAX_ALGO_NAME_SIZE 16
 
@@ -11,18 +13,18 @@ enum {
 
 struct xt_string_info
 {
-        u_int16_t from_offset;
-        u_int16_t to_offset;
+        __u16 from_offset;
+        __u16 to_offset;
         char      algo[XT_STRING_MAX_ALGO_NAME_SIZE];
         char      pattern[XT_STRING_MAX_PATTERN_SIZE];
-        u_int8_t  patlen;
+        __u8  patlen;
         union {
                 struct {
-                        u_int8_t  invert;
+                        __u8  invert;
                 } v0;
 
                 struct {
-                        u_int8_t  flags;
+                        __u8  flags;
                 } v1;
         } u;
 
diff --git a/include/linux/netfilter/xt_tcpmss.h b/include/linux/netfilter/xt_tcpmss.h
index e03274c4c790..fbac56b9e667 100644
--- a/include/linux/netfilter/xt_tcpmss.h
+++ b/include/linux/netfilter/xt_tcpmss.h
@@ -1,9 +1,11 @@
 #ifndef _XT_TCPMSS_MATCH_H
 #define _XT_TCPMSS_MATCH_H
 
+#include <linux/types.h>
+
 struct xt_tcpmss_match_info {
-    u_int16_t mss_min, mss_max;
-    u_int8_t invert;
+    __u16 mss_min, mss_max;
+    __u8 invert;
 };
 
 #endif /*_XT_TCPMSS_MATCH_H*/
diff --git a/include/linux/netfilter/xt_tcpudp.h b/include/linux/netfilter/xt_tcpudp.h
index 78bc65f11adf..a490a0bc1d29 100644
--- a/include/linux/netfilter/xt_tcpudp.h
+++ b/include/linux/netfilter/xt_tcpudp.h
@@ -1,15 +1,17 @@
 #ifndef _XT_TCPUDP_H
 #define _XT_TCPUDP_H
 
+#include <linux/types.h>
+
 /* TCP matching stuff */
 struct xt_tcp
 {
-        u_int16_t spts[2];                      /* Source port range. */
-        u_int16_t dpts[2];                      /* Destination port range. */
-        u_int8_t option;                        /* TCP Option iff non-zero*/
-        u_int8_t flg_mask;                      /* TCP flags mask byte */
-        u_int8_t flg_cmp;                       /* TCP flags compare byte */
-        u_int8_t invflags;                      /* Inverse flags */
+        __u16 spts[2];                  /* Source port range. */
+        __u16 dpts[2];                  /* Destination port range. */
+        __u8 option;                    /* TCP Option iff non-zero*/
+        __u8 flg_mask;                  /* TCP flags mask byte */
+        __u8 flg_cmp;                   /* TCP flags compare byte */
+        __u8 invflags;                  /* Inverse flags */
 };
 
 /* Values for "inv" field in struct ipt_tcp. */
@@ -22,9 +24,9 @@ struct xt_tcp
 /* UDP matching stuff */
 struct xt_udp
 {
-        u_int16_t spts[2];                      /* Source port range. */
-        u_int16_t dpts[2];                      /* Destination port range. */
-        u_int8_t invflags;                      /* Inverse flags */
+        __u16 spts[2];                  /* Source port range. */
+        __u16 dpts[2];                  /* Destination port range. */
+        __u8 invflags;                  /* Inverse flags */
 };
 
 /* Values for "invflags" field in struct ipt_udp. */
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 499aa9375901..f8105e54716a 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -59,9 +59,9 @@ static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
 static inline unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)
 {
         switch (skb->protocol) {
-        case __constant_htons(ETH_P_8021Q):
+        case __cpu_to_be16(ETH_P_8021Q):
                 return VLAN_HLEN;
-        case __constant_htons(ETH_P_PPP_SES):
+        case __cpu_to_be16(ETH_P_PPP_SES):
                 return PPPOE_SES_HLEN;
         default:
                 return 0;
diff --git a/include/linux/netfilter_ipv4/ipt_owner.h b/include/linux/netfilter_ipv4/ipt_owner.h
index 92f4bdac54ef..a78445be9992 100644
--- a/include/linux/netfilter_ipv4/ipt_owner.h
+++ b/include/linux/netfilter_ipv4/ipt_owner.h
@@ -9,10 +9,10 @@
 #define IPT_OWNER_COMM  0x10
 
 struct ipt_owner_info {
-    uid_t uid;
-    gid_t gid;
-    pid_t pid;
-    pid_t sid;
+    __kernel_uid32_t uid;
+    __kernel_gid32_t gid;
+    __kernel_pid_t pid;
+    __kernel_pid_t sid;
     char comm[16];
     u_int8_t match, invert;     /* flags */
 };
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index 8887a5fcd1d0..aca4bd1f6d7c 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -11,6 +11,7 @@ header-y += ip6t_length.h
 header-y += ip6t_limit.h
 header-y += ip6t_mac.h
 header-y += ip6t_mark.h
+header-y += ip6t_mh.h
 header-y += ip6t_multiport.h
 header-y += ip6t_opts.h
 header-y += ip6t_owner.h
diff --git a/include/linux/netfilter_ipv6/ip6t_owner.h b/include/linux/netfilter_ipv6/ip6t_owner.h
index 19937da3d101..ec5cc7a38c42 100644
--- a/include/linux/netfilter_ipv6/ip6t_owner.h
+++ b/include/linux/netfilter_ipv6/ip6t_owner.h
@@ -8,10 +8,10 @@
 #define IP6T_OWNER_SID  0x08
 
 struct ip6t_owner_info {
-    uid_t uid;
-    gid_t gid;
-    pid_t pid;
-    pid_t sid;
+    __kernel_uid32_t uid;
+    __kernel_gid32_t gid;
+    __kernel_pid_t pid;
+    __kernel_pid_t sid;
     u_int8_t match, invert;     /* flags */
 };
 
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 51b09a1f46c3..5ba398e90304 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -103,6 +103,8 @@ struct nlmsgerr
 #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
 {
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index e38d3c9dccda..2524267210d3 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -18,7 +18,7 @@ struct netpoll {
         const char *name;
         void (*rx_hook)(struct netpoll *, int, char *, int);
 
-        u32 local_ip, remote_ip;
+        __be32 local_ip, remote_ip;
         u16 local_port, remote_port;
         u8 remote_mac[ETH_ALEN];
 };
@@ -63,6 +63,13 @@ static inline int netpoll_rx(struct sk_buff *skb)
         return ret;
 }
 
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+        struct netpoll_info *npinfo = skb->dev->npinfo;
+
+        return npinfo && (npinfo->rx_np || npinfo->rx_flags);
+}
+
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
         if (!list_empty(&skb->dev->napi_list))
@@ -99,6 +106,10 @@ static inline int netpoll_rx(struct sk_buff *skb)
 {
         return 0;
 }
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+        return 0;
+}
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
         return 0;
diff --git a/include/linux/nfs.h b/include/linux/nfs.h
index 54af92c1c70b..214d499718f7 100644
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
@@ -109,7 +109,6 @@
         NFSERR_FILE_OPEN = 10046,      /*       v4 */
         NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
         NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-        NFSERR_REPLAY_ME = 10049        /*       v4 */
 };
 
 /* NFSv2 file types - beware, these are not the same in NFSv3 */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index b912311a56b1..e3f0cbcbd0db 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -21,6 +21,7 @@
 #define NFS4_FHSIZE             128
 #define NFS4_MAXPATHLEN         PATH_MAX
 #define NFS4_MAXNAMLEN          NAME_MAX
+#define NFS4_MAX_SESSIONID_LEN  16
 
 #define NFS4_ACCESS_READ        0x0001
 #define NFS4_ACCESS_LOOKUP      0x0002
@@ -38,6 +39,7 @@
 #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
@@ -45,6 +47,19 @@
 #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_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
 
@@ -88,6 +103,31 @@
 #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_USE_NON_PNFS              0x00010000
+#define EXCHGID4_FLAG_USE_PNFS_MDS              0x00020000
+#define EXCHGID4_FLAG_USE_PNFS_DS               0x00040000
+#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                    0x40070003
+#define EXCHGID4_FLAG_MASK_R                    0x80070003
+
+#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 NFS4_MAX_UINT64 (~(u64)0)
 
 enum nfs4_acl_whotype {
@@ -154,6 +194,28 @@ enum nfs_opnum4 {
         OP_VERIFY = 37,
         OP_WRITE = 38,
         OP_RELEASE_LOCKOWNER = 39,
+
+        /* nfs41 */
+        OP_BACKCHANNEL_CTL = 40,
+        OP_BIND_CONN_TO_SESSION = 41,
+        OP_EXCHANGE_ID = 42,
+        OP_CREATE_SESSION = 43,
+        OP_DESTROY_SESSION = 44,
+        OP_FREE_STATEID = 45,
+        OP_GET_DIR_DELEGATION = 46,
+        OP_GETDEVICEINFO = 47,
+        OP_GETDEVICELIST = 48,
+        OP_LAYOUTCOMMIT = 49,
+        OP_LAYOUTGET = 50,
+        OP_LAYOUTRETURN = 51,
+        OP_SECINFO_NO_NAME = 52,
+        OP_SEQUENCE = 53,
+        OP_SET_SSV = 54,
+        OP_TEST_STATEID = 55,
+        OP_WANT_DELEGATION = 56,
+        OP_DESTROY_CLIENTID = 57,
+        OP_RECLAIM_COMPLETE = 58,
+
         OP_ILLEGAL = 10044,
 };
 
@@ -230,7 +292,48 @@ enum nfsstat4 {
         NFS4ERR_DEADLOCK = 10045,
         NFS4ERR_FILE_OPEN = 10046,
         NFS4ERR_ADMIN_REVOKED = 10047,
-        NFS4ERR_CB_PATH_DOWN = 10048
+        NFS4ERR_CB_PATH_DOWN = 10048,
+
+        /* nfs41 */
+        NFS4ERR_BADIOMODE       = 10049,
+        NFS4ERR_BADLAYOUT       = 10050,
+        NFS4ERR_BAD_SESSION_DIGEST = 10051,
+        NFS4ERR_BADSESSION      = 10052,
+        NFS4ERR_BADSLOT         = 10053,
+        NFS4ERR_COMPLETE_ALREADY = 10054,
+        NFS4ERR_CONN_NOT_BOUND_TO_SESSION = 10055,
+        NFS4ERR_DELEG_ALREADY_WANTED = 10056,
+        NFS4ERR_BACK_CHAN_BUSY  = 10057,        /* backchan reqs outstanding */
+        NFS4ERR_LAYOUTTRYLATER  = 10058,
+        NFS4ERR_LAYOUTUNAVAILABLE = 10059,
+        NFS4ERR_NOMATCHING_LAYOUT = 10060,
+        NFS4ERR_RECALLCONFLICT  = 10061,
+        NFS4ERR_UNKNOWN_LAYOUTTYPE = 10062,
+        NFS4ERR_SEQ_MISORDERED = 10063,         /* unexpected seq.id in req */
+        NFS4ERR_SEQUENCE_POS    = 10064,        /* [CB_]SEQ. op not 1st op */
+        NFS4ERR_REQ_TOO_BIG     = 10065,        /* request too big */
+        NFS4ERR_REP_TOO_BIG     = 10066,        /* reply too big */
+        NFS4ERR_REP_TOO_BIG_TO_CACHE = 10067,   /* rep. not all cached */
+        NFS4ERR_RETRY_UNCACHED_REP = 10068,     /* retry & rep. uncached */
+        NFS4ERR_UNSAFE_COMPOUND = 10069,        /* retry/recovery too hard */
+        NFS4ERR_TOO_MANY_OPS    = 10070,        /* too many ops in [CB_]COMP */
+        NFS4ERR_OP_NOT_IN_SESSION = 10071,      /* op needs [CB_]SEQ. op */
+        NFS4ERR_HASH_ALG_UNSUPP = 10072,        /* hash alg. not supp. */
+                                                /* Error 10073 is unused. */
+        NFS4ERR_CLIENTID_BUSY   = 10074,        /* clientid has state */
+        NFS4ERR_PNFS_IO_HOLE    = 10075,        /* IO to _SPARSE file hole */
+        NFS4ERR_SEQ_FALSE_RETRY = 10076,        /* retry not origional */
+        NFS4ERR_BAD_HIGH_SLOT   = 10077,        /* sequence arg bad */
+        NFS4ERR_DEADSESSION     = 10078,        /* persistent session dead */
+        NFS4ERR_ENCR_ALG_UNSUPP = 10079,        /* SSV alg mismatch */
+        NFS4ERR_PNFS_NO_LAYOUT  = 10080,        /* direct I/O with no layout */
+        NFS4ERR_NOT_ONLY_OP     = 10081,        /* bad compound */
+        NFS4ERR_WRONG_CRED      = 10082,        /* permissions:state change */
+        NFS4ERR_WRONG_TYPE      = 10083,        /* current operation mismatch */
+        NFS4ERR_DIRDELEG_UNAVAIL = 10084,       /* no directory delegation */
+        NFS4ERR_REJECT_DELEG    = 10085,        /* on callback */
+        NFS4ERR_RETURNCONFLICT  = 10086,        /* outstanding layoutreturn */
+        NFS4ERR_DELEG_REVOKED   = 10087,        /* deleg./layout revoked */
 };
 
 /*
@@ -265,7 +368,13 @@ enum opentype4 {
 enum createmode4 {
         NFS4_CREATE_UNCHECKED = 0,
         NFS4_CREATE_GUARDED = 1,
-        NFS4_CREATE_EXCLUSIVE = 2
+        NFS4_CREATE_EXCLUSIVE = 2,
+        /*
+         * New to NFSv4.1. If session is persistent,
+         * GUARDED4 MUST be used. Otherwise, use
+         * EXCLUSIVE4_1 instead of EXCLUSIVE4.
+         */
+        NFS4_CREATE_EXCLUSIVE4_1 = 3
 };
 
 enum limit_by4 {
@@ -301,6 +410,8 @@ enum lock_type4 {
 #define FATTR4_WORD0_UNIQUE_HANDLES     (1UL << 9)
 #define FATTR4_WORD0_LEASE_TIME         (1UL << 10)
 #define FATTR4_WORD0_RDATTR_ERROR       (1UL << 11)
+/* Mandatory in NFSv4.1 */
+#define FATTR4_WORD2_SUPPATTR_EXCLCREAT (1UL << 11)
 
 /* Recommended Attributes */
 #define FATTR4_WORD0_ACL                (1UL << 12)
@@ -391,6 +502,29 @@ enum {
         NFSPROC4_CLNT_GETACL,
         NFSPROC4_CLNT_SETACL,
         NFSPROC4_CLNT_FS_LOCATIONS,
+
+        /* nfs41 */
+        NFSPROC4_CLNT_EXCHANGE_ID,
+        NFSPROC4_CLNT_CREATE_SESSION,
+        NFSPROC4_CLNT_DESTROY_SESSION,
+        NFSPROC4_CLNT_SEQUENCE,
+        NFSPROC4_CLNT_GET_LEASE_TIME,
+};
+
+/* nfs41 types */
+struct nfs4_sessionid {
+        unsigned char data[NFS4_MAX_SESSIONID_LEN];
+};
+
+/* Create Session Flags */
+#define SESSION4_PERSIST         0x001
+#define SESSION4_BACK_CHAN       0x002
+#define SESSION4_RDMA            0x004
+
+enum state_protect_how4 {
+        SP4_NONE        = 0,
+        SP4_MACH_CRED   = 1,
+        SP4_SSV         = 2
 };
 
 #endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index db867b04ac3c..fdffb413b192 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -166,8 +166,7 @@ struct nfs_inode {
          */
         struct radix_tree_root  nfs_page_tree;
 
-        unsigned long           ncommit,
-                                npages;
+        unsigned long           npages;
 
         /* Open contexts for shared mmap writes */
         struct list_head        open_files;
@@ -186,6 +185,9 @@ struct nfs_inode {
         fmode_t                  delegation_state;
         struct rw_semaphore     rwsem;
 #endif /* CONFIG_NFS_V4*/
+#ifdef CONFIG_NFS_FSCACHE
+        struct fscache_cookie   *fscache;
+#endif
         struct inode            vfs_inode;
 };
 
@@ -207,6 +209,9 @@ struct nfs_inode {
 #define NFS_INO_STALE           (1)             /* possible stale inode */
 #define NFS_INO_ACL_LRU_SET     (2)             /* Inode is on the LRU list */
 #define NFS_INO_MOUNTPOINT      (3)             /* inode is remote mountpoint */
+#define NFS_INO_FLUSHING        (4)             /* inode is flushing out data */
+#define NFS_INO_FSCACHE         (5)             /* inode can be cached by FS-Cache */
+#define NFS_INO_FSCACHE_LOCK    (6)             /* FS-Cache cookie management lock */
 
 static inline struct nfs_inode *NFS_I(const struct inode *inode)
 {
@@ -260,6 +265,11 @@ static inline int NFS_STALE(const struct inode *inode)
         return test_bit(NFS_INO_STALE, &NFS_I(inode)->flags);
 }
 
+static inline int NFS_FSCACHE(const struct inode *inode)
+{
+        return test_bit(NFS_INO_FSCACHE, &NFS_I(inode)->flags);
+}
+
 static inline __u64 NFS_FILEID(const struct inode *inode)
 {
         return NFS_I(inode)->fileid;
@@ -415,7 +425,7 @@ extern const struct inode_operations nfs_dir_inode_operations;
 extern const struct inode_operations nfs3_dir_inode_operations;
 #endif /* CONFIG_NFS_V3 */
 extern const struct file_operations nfs_dir_operations;
-extern struct dentry_operations nfs_dentry_operations;
+extern const struct dentry_operations nfs_dentry_operations;
 
 extern void nfs_force_lookup_revalidate(struct inode *dir);
 extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr);
@@ -506,6 +516,8 @@ extern int  nfs_readpages(struct file *, struct address_space *,
                 struct list_head *, unsigned);
 extern int  nfs_readpage_result(struct rpc_task *, struct nfs_read_data *);
 extern void nfs_readdata_release(void *data);
+extern int  nfs_readpage_async(struct nfs_open_context *, struct inode *,
+                               struct page *);
 
 /*
  * Allocate nfs_read_data structures
@@ -583,6 +595,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_CALLBACK         0x0100
 #define NFSDBG_CLIENT           0x0200
 #define NFSDBG_MOUNT            0x0400
+#define NFSDBG_FSCACHE          0x0800
 #define NFSDBG_ALL              0xFFFF
 
 #ifdef __KERNEL__
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 9bb81aec91cf..6ad75948cbf7 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -64,6 +64,10 @@ struct nfs_client {
         char                    cl_ipaddr[48];
         unsigned char           cl_id_uniquifier;
 #endif
+
+#ifdef CONFIG_NFS_FSCACHE
+        struct fscache_cookie   *fscache;       /* client index cache cookie */
+#endif
 };
 
 /*
@@ -96,16 +100,28 @@ struct nfs_server {
         unsigned int            acdirmin;
         unsigned int            acdirmax;
         unsigned int            namelen;
+        unsigned int            options;        /* extra options enabled by mount */
+#define NFS_OPTION_FSCACHE      0x00000001      /* - local caching enabled */
 
         struct nfs_fsid         fsid;
         __u64                   maxfilesize;    /* maximum file size */
         unsigned long           mount_time;     /* when this fs was mounted */
         dev_t                   s_dev;          /* superblock dev numbers */
 
+#ifdef CONFIG_NFS_FSCACHE
+        struct nfs_fscache_key  *fscache_key;   /* unique key for superblock */
+        struct fscache_cookie   *fscache;       /* superblock cookie */
+#endif
+
 #ifdef CONFIG_NFS_V4
         u32                     attr_bitmask[2];/* V4 bitmask representing the set
                                                    of attributes supported on this
                                                    filesystem */
+        u32                     cache_consistency_bitmask[2];
+                                                /* V4 bitmask representing the subset
+                                                   of change attribute, size, ctime
+                                                   and mtime attributes supported by
+                                                   the server */
         u32                     acl_bitmask;    /* V4 bitmask representing the ACEs
                                                    that are supported on this
                                                    filesystem */
diff --git a/include/linux/nfs_iostat.h b/include/linux/nfs_iostat.h
index 1cb9a3fed2b3..68b10f5f8907 100644
--- a/include/linux/nfs_iostat.h
+++ b/include/linux/nfs_iostat.h
@@ -116,4 +116,16 @@ enum nfs_stat_eventcounters {
         __NFSIOS_COUNTSMAX,
 };
 
+/*
+ * NFS local caching servicing counters
+ */
+enum nfs_stat_fscachecounters {
+        NFSIOS_FSCACHE_PAGES_READ_OK,
+        NFSIOS_FSCACHE_PAGES_READ_FAIL,
+        NFSIOS_FSCACHE_PAGES_WRITTEN_OK,
+        NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL,
+        NFSIOS_FSCACHE_PAGES_UNCACHED,
+        __NFSIOS_FSCACHEMAX,
+};
+
 #endif  /* _LINUX_NFS_IOSTAT */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a550b528319f..b89c34e40bc2 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -27,12 +27,8 @@ static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid
 }
 
 struct nfs_fattr {
-        unsigned short          valid;          /* which fields are valid */
-        __u64                   pre_size;       /* pre_op_attr.size       */
-        struct timespec         pre_mtime;      /* pre_op_attr.mtime      */
-        struct timespec         pre_ctime;      /* pre_op_attr.ctime      */
-        enum nfs_ftype          type;           /* always use NFSv2 types */
-        __u32                   mode;
+        unsigned int            valid;          /* which fields are valid */
+        umode_t                 mode;
         __u32                   nlink;
         __u32                   uid;
         __u32                   gid;
@@ -52,19 +48,55 @@ struct nfs_fattr {
         struct timespec         atime;
         struct timespec         mtime;
         struct timespec         ctime;
-        __u32                   bitmap[2];      /* NFSv4 returned attribute bitmap */
         __u64                   change_attr;    /* NFSv4 change attribute */
         __u64                   pre_change_attr;/* pre-op NFSv4 change attribute */
+        __u64                   pre_size;       /* pre_op_attr.size       */
+        struct timespec         pre_mtime;      /* pre_op_attr.mtime      */
+        struct timespec         pre_ctime;      /* pre_op_attr.ctime      */
         unsigned long           time_start;
         unsigned long           gencount;
 };
 
-#define NFS_ATTR_WCC            0x0001          /* pre-op WCC data    */
-#define NFS_ATTR_FATTR          0x0002          /* post-op attributes */
-#define NFS_ATTR_FATTR_V3       0x0004          /* NFSv3 attributes */
-#define NFS_ATTR_FATTR_V4       0x0008          /* NFSv4 change attribute */
-#define NFS_ATTR_WCC_V4         0x0010          /* pre-op change attribute */
-#define NFS_ATTR_FATTR_V4_REFERRAL      0x0020          /* NFSv4 referral */
+#define NFS_ATTR_FATTR_TYPE             (1U << 0)
+#define NFS_ATTR_FATTR_MODE             (1U << 1)
+#define NFS_ATTR_FATTR_NLINK            (1U << 2)
+#define NFS_ATTR_FATTR_OWNER            (1U << 3)
+#define NFS_ATTR_FATTR_GROUP            (1U << 4)
+#define NFS_ATTR_FATTR_RDEV             (1U << 5)
+#define NFS_ATTR_FATTR_SIZE             (1U << 6)
+#define NFS_ATTR_FATTR_PRESIZE          (1U << 7)
+#define NFS_ATTR_FATTR_BLOCKS_USED      (1U << 8)
+#define NFS_ATTR_FATTR_SPACE_USED       (1U << 9)
+#define NFS_ATTR_FATTR_FSID             (1U << 10)
+#define NFS_ATTR_FATTR_FILEID           (1U << 11)
+#define NFS_ATTR_FATTR_ATIME            (1U << 12)
+#define NFS_ATTR_FATTR_MTIME            (1U << 13)
+#define NFS_ATTR_FATTR_CTIME            (1U << 14)
+#define NFS_ATTR_FATTR_PREMTIME         (1U << 15)
+#define NFS_ATTR_FATTR_PRECTIME         (1U << 16)
+#define NFS_ATTR_FATTR_CHANGE           (1U << 17)
+#define NFS_ATTR_FATTR_PRECHANGE        (1U << 18)
+#define NFS_ATTR_FATTR_V4_REFERRAL      (1U << 19)      /* NFSv4 referral */
+
+#define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
+                | NFS_ATTR_FATTR_MODE \
+                | NFS_ATTR_FATTR_NLINK \
+                | NFS_ATTR_FATTR_OWNER \
+                | NFS_ATTR_FATTR_GROUP \
+                | NFS_ATTR_FATTR_RDEV \
+                | NFS_ATTR_FATTR_SIZE \
+                | NFS_ATTR_FATTR_FSID \
+                | NFS_ATTR_FATTR_FILEID \
+                | NFS_ATTR_FATTR_ATIME \
+                | NFS_ATTR_FATTR_MTIME \
+                | NFS_ATTR_FATTR_CTIME)
+#define NFS_ATTR_FATTR_V2 (NFS_ATTR_FATTR \
+                | NFS_ATTR_FATTR_BLOCKS_USED)
+#define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \
+                | NFS_ATTR_FATTR_SPACE_USED)
+#define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
+                | NFS_ATTR_FATTR_SPACE_USED \
+                | NFS_ATTR_FATTR_CHANGE)
 
 /*
  * Info on the file system
@@ -406,6 +438,8 @@ struct nfs3_setaclargs {
         int                     mask;
         struct posix_acl *      acl_access;
         struct posix_acl *      acl_default;
+        size_t                  len;
+        unsigned int            npages;
         struct page **          pages;
 };
 
@@ -783,7 +817,7 @@ struct nfs_access_entry;
  */
 struct nfs_rpc_ops {
         u32     version;                /* Protocol version */
-        struct dentry_operations *dentry_ops;
+        const struct dentry_operations *dentry_ops;
         const struct inode_operations *dir_inode_ops;
         const struct inode_operations *file_inode_ops;
 
@@ -834,6 +868,7 @@ struct nfs_rpc_ops {
         int     (*lock)(struct file *, int, struct file_lock *);
         int     (*lock_check_bounds)(const struct file_lock *);
         void    (*clear_acl_cache)(struct inode *);
+        void    (*close_context)(struct nfs_open_context *ctx, int);
 };
 
 /*
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index 54487a99beb8..43011b69297c 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -37,6 +37,9 @@
 #define NFSACL_MAXPAGES         ((2*(8+12*NFS_ACL_MAX_ENTRIES) + PAGE_SIZE-1) \
                                  >> PAGE_SHIFT)
 
+#define NFS_ACL_MAX_ENTRIES_INLINE      (5)
+#define NFS_ACL_INLINE_BUFSIZE  ((2*(2+3*NFS_ACL_MAX_ENTRIES_INLINE)) << 2)
+
 static inline unsigned int
 nfsacl_size(struct posix_acl *acl_access, struct posix_acl *acl_default)
 {
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index 04b355c801d8..5bccaab81056 100644
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -76,4 +76,12 @@ void	nfsd_reply_cache_shutdown(void);
 int     nfsd_cache_lookup(struct svc_rqst *, int);
 void    nfsd_cache_update(struct svc_rqst *, int, __be32 *);
 
+#ifdef CONFIG_NFSD_V4
+void    nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
+#else  /* CONFIG_NFSD_V4 */
+static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
+{
+}
+#endif /* CONFIG_NFSD_V4 */
+
 #endif /* NFSCACHE_H */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index e19f45991b2e..2b49d676d0c9 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -23,7 +23,7 @@
 /*
  * nfsd version
  */
-#define NFSD_SUPPORTED_MINOR_VERSION    0
+#define NFSD_SUPPORTED_MINOR_VERSION    1
 
 /*
  * Flags for nfsd_permission
@@ -53,6 +53,7 @@ typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
 extern struct svc_program       nfsd_program;
 extern struct svc_version       nfsd_version2, nfsd_version3,
                                 nfsd_version4;
+extern u32                      nfsd_supported_minorversion;
 extern struct mutex             nfsd_mutex;
 extern struct svc_serv          *nfsd_serv;
 
@@ -105,7 +106,7 @@ void		nfsd_close(struct file *);
 __be32          nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
                                 loff_t, struct kvec *, int, unsigned long *);
 __be32          nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
-                                loff_t, struct kvec *,int, unsigned long, int *);
+                                loff_t, struct kvec *,int, unsigned long *, int *);
 __be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
                                 char *, int *);
 __be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
@@ -149,6 +150,7 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
 
 enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
 int nfsd_vers(int vers, enum vers_op change);
+int nfsd_minorversion(u32 minorversion, enum vers_op change);
 void nfsd_reset_versions(void);
 int nfsd_create_serv(void);
 
@@ -186,78 +188,119 @@ void		nfsd_lockd_shutdown(void);
 /*
  * These macros provide pre-xdr'ed values for faster operation.
  */
-#define nfs_ok                  __constant_htonl(NFS_OK)
-#define nfserr_perm             __constant_htonl(NFSERR_PERM)
-#define nfserr_noent            __constant_htonl(NFSERR_NOENT)
-#define nfserr_io               __constant_htonl(NFSERR_IO)
-#define nfserr_nxio             __constant_htonl(NFSERR_NXIO)
-#define nfserr_eagain           __constant_htonl(NFSERR_EAGAIN)
-#define nfserr_acces            __constant_htonl(NFSERR_ACCES)
-#define nfserr_exist            __constant_htonl(NFSERR_EXIST)
-#define nfserr_xdev             __constant_htonl(NFSERR_XDEV)
-#define nfserr_nodev            __constant_htonl(NFSERR_NODEV)
-#define nfserr_notdir           __constant_htonl(NFSERR_NOTDIR)
-#define nfserr_isdir            __constant_htonl(NFSERR_ISDIR)
-#define nfserr_inval            __constant_htonl(NFSERR_INVAL)
-#define nfserr_fbig             __constant_htonl(NFSERR_FBIG)
-#define nfserr_nospc            __constant_htonl(NFSERR_NOSPC)
-#define nfserr_rofs             __constant_htonl(NFSERR_ROFS)
-#define nfserr_mlink            __constant_htonl(NFSERR_MLINK)
-#define nfserr_opnotsupp        __constant_htonl(NFSERR_OPNOTSUPP)
-#define nfserr_nametoolong      __constant_htonl(NFSERR_NAMETOOLONG)
-#define nfserr_notempty         __constant_htonl(NFSERR_NOTEMPTY)
-#define nfserr_dquot            __constant_htonl(NFSERR_DQUOT)
-#define nfserr_stale            __constant_htonl(NFSERR_STALE)
-#define nfserr_remote           __constant_htonl(NFSERR_REMOTE)
-#define nfserr_wflush           __constant_htonl(NFSERR_WFLUSH)
-#define nfserr_badhandle        __constant_htonl(NFSERR_BADHANDLE)
-#define nfserr_notsync          __constant_htonl(NFSERR_NOT_SYNC)
-#define nfserr_badcookie        __constant_htonl(NFSERR_BAD_COOKIE)
-#define nfserr_notsupp          __constant_htonl(NFSERR_NOTSUPP)
-#define nfserr_toosmall         __constant_htonl(NFSERR_TOOSMALL)
-#define nfserr_serverfault      __constant_htonl(NFSERR_SERVERFAULT)
-#define nfserr_badtype          __constant_htonl(NFSERR_BADTYPE)
-#define nfserr_jukebox          __constant_htonl(NFSERR_JUKEBOX)
-#define nfserr_denied           __constant_htonl(NFSERR_DENIED)
-#define nfserr_deadlock         __constant_htonl(NFSERR_DEADLOCK)
-#define nfserr_expired          __constant_htonl(NFSERR_EXPIRED)
-#define nfserr_bad_cookie       __constant_htonl(NFSERR_BAD_COOKIE)
-#define nfserr_same             __constant_htonl(NFSERR_SAME)
-#define nfserr_clid_inuse       __constant_htonl(NFSERR_CLID_INUSE)
-#define nfserr_stale_clientid   __constant_htonl(NFSERR_STALE_CLIENTID)
-#define nfserr_resource         __constant_htonl(NFSERR_RESOURCE)
-#define nfserr_moved            __constant_htonl(NFSERR_MOVED)
-#define nfserr_nofilehandle     __constant_htonl(NFSERR_NOFILEHANDLE)
-#define nfserr_minor_vers_mismatch      __constant_htonl(NFSERR_MINOR_VERS_MISMATCH)
-#define nfserr_share_denied     __constant_htonl(NFSERR_SHARE_DENIED)
-#define nfserr_stale_stateid    __constant_htonl(NFSERR_STALE_STATEID)
-#define nfserr_old_stateid      __constant_htonl(NFSERR_OLD_STATEID)
-#define nfserr_bad_stateid      __constant_htonl(NFSERR_BAD_STATEID)
-#define nfserr_bad_seqid        __constant_htonl(NFSERR_BAD_SEQID)
-#define nfserr_symlink          __constant_htonl(NFSERR_SYMLINK)
-#define nfserr_not_same         __constant_htonl(NFSERR_NOT_SAME)
-#define nfserr_restorefh        __constant_htonl(NFSERR_RESTOREFH)
-#define nfserr_attrnotsupp      __constant_htonl(NFSERR_ATTRNOTSUPP)
-#define nfserr_bad_xdr          __constant_htonl(NFSERR_BAD_XDR)
-#define nfserr_openmode         __constant_htonl(NFSERR_OPENMODE)
-#define nfserr_locks_held       __constant_htonl(NFSERR_LOCKS_HELD)
-#define nfserr_op_illegal       __constant_htonl(NFSERR_OP_ILLEGAL)
-#define nfserr_grace            __constant_htonl(NFSERR_GRACE)
-#define nfserr_no_grace         __constant_htonl(NFSERR_NO_GRACE)
-#define nfserr_reclaim_bad      __constant_htonl(NFSERR_RECLAIM_BAD)
-#define nfserr_badname          __constant_htonl(NFSERR_BADNAME)
-#define nfserr_cb_path_down     __constant_htonl(NFSERR_CB_PATH_DOWN)
-#define nfserr_locked           __constant_htonl(NFSERR_LOCKED)
-#define nfserr_wrongsec         __constant_htonl(NFSERR_WRONGSEC)
-#define nfserr_replay_me        __constant_htonl(NFSERR_REPLAY_ME)
+#define nfs_ok                  cpu_to_be32(NFS_OK)
+#define nfserr_perm             cpu_to_be32(NFSERR_PERM)
+#define nfserr_noent            cpu_to_be32(NFSERR_NOENT)
+#define nfserr_io               cpu_to_be32(NFSERR_IO)
+#define nfserr_nxio             cpu_to_be32(NFSERR_NXIO)
+#define nfserr_eagain           cpu_to_be32(NFSERR_EAGAIN)
+#define nfserr_acces            cpu_to_be32(NFSERR_ACCES)
+#define nfserr_exist            cpu_to_be32(NFSERR_EXIST)
+#define nfserr_xdev             cpu_to_be32(NFSERR_XDEV)
+#define nfserr_nodev            cpu_to_be32(NFSERR_NODEV)
+#define nfserr_notdir           cpu_to_be32(NFSERR_NOTDIR)
+#define nfserr_isdir            cpu_to_be32(NFSERR_ISDIR)
+#define nfserr_inval            cpu_to_be32(NFSERR_INVAL)
+#define nfserr_fbig             cpu_to_be32(NFSERR_FBIG)
+#define nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
+#define nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
+#define nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
+#define nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
+#define nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
+#define nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
+#define nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)
+#define nfserr_stale            cpu_to_be32(NFSERR_STALE)
+#define nfserr_remote           cpu_to_be32(NFSERR_REMOTE)
+#define nfserr_wflush           cpu_to_be32(NFSERR_WFLUSH)
+#define nfserr_badhandle        cpu_to_be32(NFSERR_BADHANDLE)
+#define nfserr_notsync          cpu_to_be32(NFSERR_NOT_SYNC)
+#define nfserr_badcookie        cpu_to_be32(NFSERR_BAD_COOKIE)
+#define nfserr_notsupp          cpu_to_be32(NFSERR_NOTSUPP)
+#define nfserr_toosmall         cpu_to_be32(NFSERR_TOOSMALL)
+#define nfserr_serverfault      cpu_to_be32(NFSERR_SERVERFAULT)
+#define nfserr_badtype          cpu_to_be32(NFSERR_BADTYPE)
+#define nfserr_jukebox          cpu_to_be32(NFSERR_JUKEBOX)
+#define nfserr_denied           cpu_to_be32(NFSERR_DENIED)
+#define nfserr_deadlock         cpu_to_be32(NFSERR_DEADLOCK)
+#define nfserr_expired          cpu_to_be32(NFSERR_EXPIRED)
+#define nfserr_bad_cookie       cpu_to_be32(NFSERR_BAD_COOKIE)
+#define nfserr_same             cpu_to_be32(NFSERR_SAME)
+#define nfserr_clid_inuse       cpu_to_be32(NFSERR_CLID_INUSE)
+#define nfserr_stale_clientid   cpu_to_be32(NFSERR_STALE_CLIENTID)
+#define nfserr_resource         cpu_to_be32(NFSERR_RESOURCE)
+#define nfserr_moved            cpu_to_be32(NFSERR_MOVED)
+#define nfserr_nofilehandle     cpu_to_be32(NFSERR_NOFILEHANDLE)
+#define nfserr_minor_vers_mismatch      cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
+#define nfserr_share_denied     cpu_to_be32(NFSERR_SHARE_DENIED)
+#define nfserr_stale_stateid    cpu_to_be32(NFSERR_STALE_STATEID)
+#define nfserr_old_stateid      cpu_to_be32(NFSERR_OLD_STATEID)
+#define nfserr_bad_stateid      cpu_to_be32(NFSERR_BAD_STATEID)
+#define nfserr_bad_seqid        cpu_to_be32(NFSERR_BAD_SEQID)
+#define nfserr_symlink          cpu_to_be32(NFSERR_SYMLINK)
+#define nfserr_not_same         cpu_to_be32(NFSERR_NOT_SAME)
+#define nfserr_restorefh        cpu_to_be32(NFSERR_RESTOREFH)
+#define nfserr_attrnotsupp      cpu_to_be32(NFSERR_ATTRNOTSUPP)
+#define nfserr_bad_xdr          cpu_to_be32(NFSERR_BAD_XDR)
+#define nfserr_openmode         cpu_to_be32(NFSERR_OPENMODE)
+#define nfserr_locks_held       cpu_to_be32(NFSERR_LOCKS_HELD)
+#define nfserr_op_illegal       cpu_to_be32(NFSERR_OP_ILLEGAL)
+#define nfserr_grace            cpu_to_be32(NFSERR_GRACE)
+#define nfserr_no_grace         cpu_to_be32(NFSERR_NO_GRACE)
+#define nfserr_reclaim_bad      cpu_to_be32(NFSERR_RECLAIM_BAD)
+#define nfserr_badname          cpu_to_be32(NFSERR_BADNAME)
+#define nfserr_cb_path_down     cpu_to_be32(NFSERR_CB_PATH_DOWN)
+#define nfserr_locked           cpu_to_be32(NFSERR_LOCKED)
+#define nfserr_wrongsec         cpu_to_be32(NFSERR_WRONGSEC)
+#define nfserr_badiomode                cpu_to_be32(NFS4ERR_BADIOMODE)
+#define nfserr_badlayout                cpu_to_be32(NFS4ERR_BADLAYOUT)
+#define nfserr_bad_session_digest       cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)
+#define nfserr_badsession               cpu_to_be32(NFS4ERR_BADSESSION)
+#define nfserr_badslot                  cpu_to_be32(NFS4ERR_BADSLOT)
+#define nfserr_complete_already         cpu_to_be32(NFS4ERR_COMPLETE_ALREADY)
+#define nfserr_conn_not_bound_to_session cpu_to_be32(NFS4ERR_CONN_NOT_BOUND_TO_SESSION)
+#define nfserr_deleg_already_wanted     cpu_to_be32(NFS4ERR_DELEG_ALREADY_WANTED)
+#define nfserr_back_chan_busy           cpu_to_be32(NFS4ERR_BACK_CHAN_BUSY)
+#define nfserr_layouttrylater           cpu_to_be32(NFS4ERR_LAYOUTTRYLATER)
+#define nfserr_layoutunavailable        cpu_to_be32(NFS4ERR_LAYOUTUNAVAILABLE)
+#define nfserr_nomatching_layout        cpu_to_be32(NFS4ERR_NOMATCHING_LAYOUT)
+#define nfserr_recallconflict           cpu_to_be32(NFS4ERR_RECALLCONFLICT)
+#define nfserr_unknown_layouttype       cpu_to_be32(NFS4ERR_UNKNOWN_LAYOUTTYPE)
+#define nfserr_seq_misordered           cpu_to_be32(NFS4ERR_SEQ_MISORDERED)
+#define nfserr_sequence_pos             cpu_to_be32(NFS4ERR_SEQUENCE_POS)
+#define nfserr_req_too_big              cpu_to_be32(NFS4ERR_REQ_TOO_BIG)
+#define nfserr_rep_too_big              cpu_to_be32(NFS4ERR_REP_TOO_BIG)
+#define nfserr_rep_too_big_to_cache     cpu_to_be32(NFS4ERR_REP_TOO_BIG_TO_CACHE)
+#define nfserr_retry_uncached_rep       cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP)
+#define nfserr_unsafe_compound          cpu_to_be32(NFS4ERR_UNSAFE_COMPOUND)
+#define nfserr_too_many_ops             cpu_to_be32(NFS4ERR_TOO_MANY_OPS)
+#define nfserr_op_not_in_session        cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION)
+#define nfserr_hash_alg_unsupp          cpu_to_be32(NFS4ERR_HASH_ALG_UNSUPP)
+#define nfserr_clientid_busy            cpu_to_be32(NFS4ERR_CLIENTID_BUSY)
+#define nfserr_pnfs_io_hole             cpu_to_be32(NFS4ERR_PNFS_IO_HOLE)
+#define nfserr_seq_false_retry          cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY)
+#define nfserr_bad_high_slot            cpu_to_be32(NFS4ERR_BAD_HIGH_SLOT)
+#define nfserr_deadsession              cpu_to_be32(NFS4ERR_DEADSESSION)
+#define nfserr_encr_alg_unsupp          cpu_to_be32(NFS4ERR_ENCR_ALG_UNSUPP)
+#define nfserr_pnfs_no_layout           cpu_to_be32(NFS4ERR_PNFS_NO_LAYOUT)
+#define nfserr_not_only_op              cpu_to_be32(NFS4ERR_NOT_ONLY_OP)
+#define nfserr_wrong_cred               cpu_to_be32(NFS4ERR_WRONG_CRED)
+#define nfserr_wrong_type               cpu_to_be32(NFS4ERR_WRONG_TYPE)
+#define nfserr_dirdeleg_unavail         cpu_to_be32(NFS4ERR_DIRDELEG_UNAVAIL)
+#define nfserr_reject_deleg             cpu_to_be32(NFS4ERR_REJECT_DELEG)
+#define nfserr_returnconflict           cpu_to_be32(NFS4ERR_RETURNCONFLICT)
+#define nfserr_deleg_revoked            cpu_to_be32(NFS4ERR_DELEG_REVOKED)
 
 /* error codes for internal use */
 /* if a request fails due to kmalloc failure, it gets dropped.
  *  Client should resend eventually
  */
-#define nfserr_dropit           __constant_htonl(30000)
+#define nfserr_dropit           cpu_to_be32(30000)
 /* end-of-file indicator in readdir */
-#define nfserr_eof              __constant_htonl(30001)
+#define nfserr_eof              cpu_to_be32(30001)
+/* replay detected */
+#define nfserr_replay_me        cpu_to_be32(11001)
+/* nfs41 replay detected */
+#define nfserr_replay_cache     cpu_to_be32(11002)
 
 /* Check for dir entries '.' and '..' */
 #define isdotent(n, l)  (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
@@ -300,7 +343,7 @@ extern struct timeval	nfssvc_boot;
  *    TIME_BACKUP   (unlikely to be supported any time soon)
  *    TIME_CREATE   (unlikely to be supported any time soon)
  */
-#define NFSD_SUPPORTED_ATTRS_WORD0                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD0                                                         \
 (FATTR4_WORD0_SUPPORTED_ATTRS   | FATTR4_WORD0_TYPE         | FATTR4_WORD0_FH_EXPIRE_TYPE   \
  | FATTR4_WORD0_CHANGE          | FATTR4_WORD0_SIZE         | FATTR4_WORD0_LINK_SUPPORT     \
  | FATTR4_WORD0_SYMLINK_SUPPORT | FATTR4_WORD0_NAMED_ATTR   | FATTR4_WORD0_FSID             \
@@ -312,7 +355,7 @@ extern struct timeval	nfssvc_boot;
  | FATTR4_WORD0_MAXFILESIZE     | FATTR4_WORD0_MAXLINK      | FATTR4_WORD0_MAXNAME          \
  | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE     | FATTR4_WORD0_ACL)
 
-#define NFSD_SUPPORTED_ATTRS_WORD1                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD1                                                         \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_NO_TRUNC     | FATTR4_WORD1_NUMLINKS         \
  | FATTR4_WORD1_OWNER           | FATTR4_WORD1_OWNER_GROUP  | FATTR4_WORD1_RAWDEV           \
  | FATTR4_WORD1_SPACE_AVAIL     | FATTR4_WORD1_SPACE_FREE   | FATTR4_WORD1_SPACE_TOTAL      \
@@ -320,6 +363,35 @@ extern struct timeval	nfssvc_boot;
  | FATTR4_WORD1_TIME_DELTA   | FATTR4_WORD1_TIME_METADATA    \
  | FATTR4_WORD1_TIME_MODIFY     | FATTR4_WORD1_TIME_MODIFY_SET | FATTR4_WORD1_MOUNTED_ON_FILEID)
 
+#define NFSD4_SUPPORTED_ATTRS_WORD2 0
+
+#define NFSD4_1_SUPPORTED_ATTRS_WORD0 \
+        NFSD4_SUPPORTED_ATTRS_WORD0
+
+#define NFSD4_1_SUPPORTED_ATTRS_WORD1 \
+        NFSD4_SUPPORTED_ATTRS_WORD1
+
+#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \
+        (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)
+
+static inline u32 nfsd_suppattrs0(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
+                            : NFSD4_SUPPORTED_ATTRS_WORD0;
+}
+
+static inline u32 nfsd_suppattrs1(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD1
+                            : NFSD4_SUPPORTED_ATTRS_WORD1;
+}
+
+static inline u32 nfsd_suppattrs2(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
+                            : NFSD4_SUPPORTED_ATTRS_WORD2;
+}
+
 /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
 #define NFSD_WRITEONLY_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_TIME_ACCESS_SET   | FATTR4_WORD1_TIME_MODIFY_SET)
@@ -330,6 +402,19 @@ extern struct timeval	nfssvc_boot;
 #define NFSD_WRITEABLE_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_OWNER         | FATTR4_WORD1_OWNER_GROUP     \
  | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)
+#define NFSD_WRITEABLE_ATTRS_WORD2 0
+
+#define NFSD_SUPPATTR_EXCLCREAT_WORD0 \
+        NFSD_WRITEABLE_ATTRS_WORD0
+/*
+ * we currently store the exclusive create verifier in the v_{a,m}time
+ * attributes so the client can't set these at create time using EXCLUSIVE4_1
+ */
+#define NFSD_SUPPATTR_EXCLCREAT_WORD1 \
+        (NFSD_WRITEABLE_ATTRS_WORD1 & \
+         ~(FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET))
+#define NFSD_SUPPATTR_EXCLCREAT_WORD2 \
+        NFSD_WRITEABLE_ATTRS_WORD2
 
 #endif /* CONFIG_NFSD_V4 */
 
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index fa317f6c154b..afa19016c4a8 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -269,6 +269,13 @@ fh_copy(struct svc_fh *dst, struct svc_fh *src)
         return dst;
 }
 
+static inline void
+fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
+{
+        dst->fh_size = src->fh_size;
+        memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
+}
+
 static __inline__ struct svc_fh *
 fh_init(struct svc_fh *fhp, int maxsize)
 {
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 128298c0362d..4d61c873feed 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -66,8 +66,7 @@ struct nfs4_cb_recall {
         u32                     cbr_ident;
         int                     cbr_trunc;
         stateid_t               cbr_stateid;
-        u32                     cbr_fhlen;
-        char                    cbr_fhval[NFS4_FHSIZE];
+        struct knfsd_fh         cbr_fh;
         struct nfs4_delegation  *cbr_dp;
 };
 
@@ -86,8 +85,7 @@ struct nfs4_delegation {
 };
 
 #define dl_stateid      dl_recall.cbr_stateid
-#define dl_fhlen        dl_recall.cbr_fhlen
-#define dl_fhval        dl_recall.cbr_fhval
+#define dl_fh           dl_recall.cbr_fh
 
 /* client delegation callback info */
 struct nfs4_callback {
@@ -101,6 +99,64 @@ struct nfs4_callback {
         struct rpc_clnt *       cb_client;
 };
 
+/* Maximum number of slots per session. 128 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION      128
+/* Maximum number of pages per slot cache entry */
+#define NFSD_PAGES_PER_SLOT     1
+/* Maximum number of operations per session compound */
+#define NFSD_MAX_OPS_PER_COMPOUND       16
+
+struct nfsd4_cache_entry {
+        __be32          ce_status;
+        struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
+        struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
+        int             ce_cachethis;
+        short           ce_resused;
+        int             ce_opcnt;
+        int             ce_rpchdrlen;
+};
+
+struct nfsd4_slot {
+        bool                            sl_inuse;
+        u32                             sl_seqid;
+        struct nfsd4_cache_entry        sl_cache_entry;
+};
+
+struct nfsd4_session {
+        struct kref             se_ref;
+        struct list_head        se_hash;        /* hash by sessionid */
+        struct list_head        se_perclnt;
+        u32                     se_flags;
+        struct nfs4_client      *se_client;     /* for expire_client */
+        struct nfs4_sessionid   se_sessionid;
+        u32                     se_fmaxreq_sz;
+        u32                     se_fmaxresp_sz;
+        u32                     se_fmaxresp_cached;
+        u32                     se_fmaxops;
+        u32                     se_fnumslots;
+        struct nfsd4_slot       se_slots[];     /* forward channel slots */
+};
+
+static inline void
+nfsd4_put_session(struct nfsd4_session *ses)
+{
+        extern void free_session(struct kref *kref);
+        kref_put(&ses->se_ref, free_session);
+}
+
+static inline void
+nfsd4_get_session(struct nfsd4_session *ses)
+{
+        kref_get(&ses->se_ref);
+}
+
+/* formatted contents of nfs4_sessionid */
+struct nfsd4_sessionid {
+        clientid_t      clientid;
+        u32             sequence;
+        u32             reserved;
+};
+
 #define HEXDIR_LEN     33 /* hex version of 16 byte md5 of cl_name plus '\0' */
 
 /*
@@ -132,6 +188,12 @@ struct nfs4_client {
         struct nfs4_callback    cl_callback;    /* callback info */
         atomic_t                cl_count;       /* ref count */
         u32                     cl_firststate;  /* recovery dir creation */
+
+        /* for nfs41 */
+        struct list_head        cl_sessions;
+        struct nfsd4_slot       cl_slot;        /* create_session slot */
+        u32                     cl_exchange_flags;
+        struct nfs4_sessionid   cl_sessionid;
 };
 
 /* struct nfs4_client_reset
@@ -168,8 +230,7 @@ struct nfs4_replay {
         unsigned int            rp_buflen;
         char                    *rp_buf;
         unsigned                intrp_allocated;
-        int                     rp_openfh_len;
-        char                    rp_openfh[NFS4_FHSIZE];
+        struct knfsd_fh         rp_openfh;
         char                    rp_ibuf[NFSD4_REPLAY_ISIZE];
 };
 
@@ -217,7 +278,7 @@ struct nfs4_stateowner {
 *      share_acces, share_deny on the file.
 */
 struct nfs4_file {
-        struct kref             fi_ref;
+        atomic_t                fi_ref;
         struct list_head        fi_hash;    /* hash by "struct inode *" */
         struct list_head        fi_stateids;
         struct list_head        fi_delegations;
@@ -259,14 +320,13 @@ struct nfs4_stateid {
 };
 
 /* flags for preprocess_seqid_op() */
-#define CHECK_FH                0x00000001
+#define HAS_SESSION             0x00000001
 #define CONFIRM                 0x00000002
 #define OPEN_STATE              0x00000004
 #define LOCK_STATE              0x00000008
 #define RD_STATE                0x00000010
 #define WR_STATE                0x00000020
 #define CLOSE_STATE             0x00000040
-#define DELEG_RET               0x00000080
 
 #define seqid_mutating_err(err)                       \
         (((err) != nfserr_stale_clientid) &&    \
@@ -274,7 +334,9 @@ struct nfs4_stateid {
         ((err) != nfserr_stale_stateid) &&      \
         ((err) != nfserr_bad_stateid))
 
-extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
+struct nfsd4_compound_state;
+
+extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
                 stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
 extern void nfs4_unlock_state(void);
@@ -290,7 +352,7 @@ extern void nfsd4_init_recdir(char *recdir_name);
 extern int nfsd4_recdir_load(void);
 extern void nfsd4_shutdown_recdir(void);
 extern int nfs4_client_to_reclaim(const char *name);
-extern int nfs4_has_reclaimed_state(const char *name);
+extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
 extern void nfsd4_recdir_purge_old(void);
 extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
 extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h
index 7678cfbe9960..2693ef647df6 100644
--- a/include/linux/nfsd/stats.h
+++ b/include/linux/nfsd/stats.h
@@ -11,6 +11,11 @@
 
 #include <linux/nfs4.h>
 
+/* thread usage wraps very million seconds (approx one fortnight) */
+#define NFSD_USAGE_WRAP (HZ*1000000)
+
+#ifdef __KERNEL__
+
 struct nfsd_stats {
         unsigned int    rchits;         /* repcache hits */
         unsigned int    rcmisses;       /* repcache hits */
@@ -35,10 +40,6 @@ struct nfsd_stats {
 
 };
 
-/* thread usage wraps very million seconds (approx one fortnight) */
-#define NFSD_USAGE_WRAP (HZ*1000000)
-
-#ifdef __KERNEL__
 
 extern struct nfsd_stats        nfsdstats;
 extern struct svc_stat          nfsd_svcstats;
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 27bd3e38ec5a..f80d6013fdc3 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -45,10 +45,22 @@
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 
 struct nfsd4_compound_state {
-        struct svc_fh current_fh;
-        struct svc_fh save_fh;
-        struct nfs4_stateowner *replay_owner;
-};
+        struct svc_fh           current_fh;
+        struct svc_fh           save_fh;
+        struct nfs4_stateowner  *replay_owner;
+        /* For sessions DRC */
+        struct nfsd4_session    *session;
+        struct nfsd4_slot       *slot;
+        __be32                  *statp;
+        size_t                  iovlen;
+        u32                     minorversion;
+        u32                     status;
+};
+
+static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)
+{
+        return cs->slot != NULL;
+}
 
 struct nfsd4_change_info {
         u32             atomic;
@@ -90,7 +102,7 @@ struct nfsd4_create {
                         u32 specdata2;
                 } dev;    /* NF4BLK, NF4CHR */
         } u;
-        u32             cr_bmval[2];        /* request */
+        u32             cr_bmval[3];        /* request */
         struct iattr    cr_iattr;           /* request */
         struct nfsd4_change_info  cr_cinfo; /* response */
         struct nfs4_acl *cr_acl;
@@ -105,7 +117,7 @@ struct nfsd4_delegreturn {
 };
 
 struct nfsd4_getattr {
-        u32             ga_bmval[2];        /* request */
+        u32             ga_bmval[3];        /* request */
         struct svc_fh   *ga_fhp;            /* response */
 };
 
@@ -206,11 +218,9 @@ struct nfsd4_open {
         stateid_t       op_delegate_stateid; /* request - response */
         u32             op_create;          /* request */
         u32             op_createmode;      /* request */
-        u32             op_bmval[2];        /* request */
-        union {                             /* request */
-                struct iattr    iattr;                      /* UNCHECKED4,GUARDED4 */
-                nfs4_verifier   verf;                                /* EXCLUSIVE4 */
-        } u;
+        u32             op_bmval[3];        /* request */
+        struct iattr    iattr;              /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
+        nfs4_verifier   verf;               /* EXCLUSIVE4 */
         clientid_t      op_clientid;        /* request */
         struct xdr_netobj op_owner;           /* request */
         u32             op_seqid;           /* request */
@@ -224,8 +234,8 @@ struct nfsd4_open {
         struct nfs4_stateowner *op_stateowner; /* used during processing */
         struct nfs4_acl *op_acl;
 };
-#define op_iattr        u.iattr
-#define op_verf         u.verf
+#define op_iattr        iattr
+#define op_verf         verf
 
 struct nfsd4_open_confirm {
         stateid_t       oc_req_stateid          /* request */;
@@ -259,7 +269,7 @@ struct nfsd4_readdir {
         nfs4_verifier   rd_verf;            /* request */
         u32             rd_dircount;        /* request */
         u32             rd_maxcount;        /* request */
-        u32             rd_bmval[2];        /* request */
+        u32             rd_bmval[3];        /* request */
         struct svc_rqst *rd_rqstp;          /* response */
         struct svc_fh * rd_fhp;             /* response */
 
@@ -301,7 +311,7 @@ struct nfsd4_secinfo {
 
 struct nfsd4_setattr {
         stateid_t       sa_stateid;         /* request */
-        u32             sa_bmval[2];        /* request */
+        u32             sa_bmval[3];        /* request */
         struct iattr    sa_iattr;           /* request */
         struct nfs4_acl *sa_acl;
 };
@@ -327,7 +337,7 @@ struct nfsd4_setclientid_confirm {
 
 /* also used for NVERIFY */
 struct nfsd4_verify {
-        u32             ve_bmval[2];        /* request */
+        u32             ve_bmval[3];        /* request */
         u32             ve_attrlen;         /* request */
         char *          ve_attrval;         /* request */
 };
@@ -344,6 +354,54 @@ struct nfsd4_write {
         nfs4_verifier   wr_verifier;        /* response */
 };
 
+struct nfsd4_exchange_id {
+        nfs4_verifier   verifier;
+        struct xdr_netobj clname;
+        u32             flags;
+        clientid_t      clientid;
+        u32             seqid;
+        int             spa_how;
+};
+
+struct nfsd4_channel_attrs {
+        u32             headerpadsz;
+        u32             maxreq_sz;
+        u32             maxresp_sz;
+        u32             maxresp_cached;
+        u32             maxops;
+        u32             maxreqs;
+        u32             nr_rdma_attrs;
+        u32             rdma_attrs;
+};
+
+struct nfsd4_create_session {
+        clientid_t              clientid;
+        struct nfs4_sessionid   sessionid;
+        u32                     seqid;
+        u32                     flags;
+        struct nfsd4_channel_attrs fore_channel;
+        struct nfsd4_channel_attrs back_channel;
+        u32                     callback_prog;
+        u32                     uid;
+        u32                     gid;
+};
+
+struct nfsd4_sequence {
+        struct nfs4_sessionid   sessionid;              /* request/response */
+        u32                     seqid;                  /* request/response */
+        u32                     slotid;                 /* request/response */
+        u32                     maxslots;               /* request/response */
+        u32                     cachethis;              /* request */
+#if 0
+        u32                     target_maxslots;        /* response */
+        u32                     status_flags;           /* response */
+#endif /* not yet */
+};
+
+struct nfsd4_destroy_session {
+        struct nfs4_sessionid   sessionid;
+};
+
 struct nfsd4_op {
         int                                     opnum;
         __be32                                  status;
@@ -378,6 +436,12 @@ struct nfsd4_op {
                 struct nfsd4_verify             verify;
                 struct nfsd4_write              write;
                 struct nfsd4_release_lockowner  release_lockowner;
+
+                /* NFSv4.1 */
+                struct nfsd4_exchange_id        exchange_id;
+                struct nfsd4_create_session     create_session;
+                struct nfsd4_destroy_session    destroy_session;
+                struct nfsd4_sequence           sequence;
         } u;
         struct nfs4_replay *                    replay;
 };
@@ -416,9 +480,22 @@ struct nfsd4_compoundres {
         u32                             taglen;
         char *                          tag;
         u32                             opcnt;
-        __be32 *                        tagp; /* where to encode tag and  opcount */
+        __be32 *                        tagp; /* tag, opcount encode location */
+        struct nfsd4_compound_state     cstate;
 };
 
+static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
+{
+        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
+        return args->opcnt == 1;
+}
+
+static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
+{
+        return !resp->cstate.slot->sl_cache_entry.ce_cachethis ||
+                        nfsd4_is_solo_sequence(resp);
+}
+
 #define NFS4_SVC_XDRSIZE                sizeof(struct nfsd4_compoundargs)
 
 static inline void
@@ -448,7 +525,23 @@ extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
 extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                 struct nfsd4_compound_state *,
                 struct nfsd4_setclientid_confirm *setclientid_confirm);
-extern __be32 nfsd4_process_open1(struct nfsd4_open *open);
+extern void nfsd4_store_cache_entry(struct nfsd4_compoundres *resp);
+extern __be32 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
+                struct nfsd4_sequence *seq);
+extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+struct nfsd4_exchange_id *);
+                extern __be32 nfsd4_create_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_create_session *);
+extern __be32 nfsd4_sequence(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_sequence *);
+extern __be32 nfsd4_destroy_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_destroy_session *);
+extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *,
+                struct nfsd4_open *open);
 extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
                 struct svc_fh *current_fh, struct nfsd4_open *open);
 extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
new file mode 100644
index 000000000000..79fec6af3f9f
--- /dev/null
+++ b/include/linux/nilfs2_fs.h
@@ -0,0 +1,801 @@
+/*
+ * nilfs2_fs.h - NILFS2 on-disk structures and common declarations.
+ *
+ * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
+ *
+ * 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Written by Koji Sato <koji@osrg.net>
+ *            Ryusuke Konishi <ryusuke@osrg.net>
+ */
+/*
+ *  linux/include/linux/ext2_fs.h
+ *
+ * Copyright (C) 1992, 1993, 1994, 1995
+ * Remy Card (card@masi.ibp.fr)
+ * Laboratoire MASI - Institut Blaise Pascal
+ * Universite Pierre et Marie Curie (Paris VI)
+ *
+ *  from
+ *
+ *  linux/include/linux/minix_fs.h
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#ifndef _LINUX_NILFS_FS_H
+#define _LINUX_NILFS_FS_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+/*
+ * Inode flags stored in nilfs_inode and on-memory nilfs inode
+ *
+ * We define these flags based on ext2-fs because of the
+ * compatibility reason; to avoid problems in chattr(1)
+ */
+#define NILFS_SECRM_FL          0x00000001 /* Secure deletion */
+#define NILFS_UNRM_FL           0x00000002 /* Undelete */
+#define NILFS_SYNC_FL           0x00000008 /* Synchronous updates */
+#define NILFS_IMMUTABLE_FL      0x00000010 /* Immutable file */
+#define NILFS_APPEND_FL         0x00000020 /* writes to file may only append */
+#define NILFS_NODUMP_FL         0x00000040 /* do not dump file */
+#define NILFS_NOATIME_FL        0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define NILFS_NOTAIL_FL         0x00008000 /* file tail should not be merged */
+#define NILFS_DIRSYNC_FL        0x00010000 /* dirsync behaviour */
+
+#define NILFS_FL_USER_VISIBLE   0x0003DFFF /* User visible flags */
+#define NILFS_FL_USER_MODIFIABLE        0x000380FF /* User modifiable flags */
+
+
+#define NILFS_INODE_BMAP_SIZE   7
+/**
+ * struct nilfs_inode - structure of an inode on disk
+ * @i_blocks: blocks count
+ * @i_size: size in bytes
+ * @i_ctime: creation time (seconds)
+ * @i_mtime: modification time (seconds)
+ * @i_ctime_nsec: creation time (nano seconds)
+ * @i_mtime_nsec: modification time (nano seconds)
+ * @i_uid: user id
+ * @i_gid: group id
+ * @i_mode: file mode
+ * @i_links_count: links count
+ * @i_flags: file flags
+ * @i_bmap: block mapping
+ * @i_xattr: extended attributes
+ * @i_generation: file generation (for NFS)
+ * @i_pad:      padding
+ */
+struct nilfs_inode {
+        __le64  i_blocks;
+        __le64  i_size;
+        __le64  i_ctime;
+        __le64  i_mtime;
+        __le32  i_ctime_nsec;
+        __le32  i_mtime_nsec;
+        __le32  i_uid;
+        __le32  i_gid;
+        __le16  i_mode;
+        __le16  i_links_count;
+        __le32  i_flags;
+        __le64  i_bmap[NILFS_INODE_BMAP_SIZE];
+#define i_device_code   i_bmap[0]
+        __le64  i_xattr;
+        __le32  i_generation;
+        __le32  i_pad;
+};
+
+/**
+ * struct nilfs_super_root - structure of super root
+ * @sr_sum: check sum
+ * @sr_bytes: byte count of the structure
+ * @sr_flags: flags (reserved)
+ * @sr_nongc_ctime: write time of the last segment not for cleaner operation
+ * @sr_dat: DAT file inode
+ * @sr_cpfile: checkpoint file inode
+ * @sr_sufile: segment usage file inode
+ */
+struct nilfs_super_root {
+        __le32 sr_sum;
+        __le16 sr_bytes;
+        __le16 sr_flags;
+        __le64 sr_nongc_ctime;
+        struct nilfs_inode sr_dat;
+        struct nilfs_inode sr_cpfile;
+        struct nilfs_inode sr_sufile;
+};
+
+#define NILFS_SR_MDT_OFFSET(inode_size, i)  \
+        ((unsigned long)&((struct nilfs_super_root *)0)->sr_dat + \
+                        (inode_size) * (i))
+#define NILFS_SR_DAT_OFFSET(inode_size)     NILFS_SR_MDT_OFFSET(inode_size, 0)
+#define NILFS_SR_CPFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 1)
+#define NILFS_SR_SUFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 2)
+#define NILFS_SR_BYTES                  (sizeof(struct nilfs_super_root))
+
+/*
+ * Maximal mount counts
+ */
+#define NILFS_DFL_MAX_MNT_COUNT         50      /* 50 mounts */
+
+/*
+ * File system states (sbp->s_state, nilfs->ns_mount_state)
+ */
+#define NILFS_VALID_FS                  0x0001  /* Unmounted cleanly */
+#define NILFS_ERROR_FS                  0x0002  /* Errors detected */
+#define NILFS_RESIZE_FS                 0x0004  /* Resize required */
+
+/*
+ * Mount flags (sbi->s_mount_opt)
+ */
+#define NILFS_MOUNT_ERROR_MODE          0x0070  /* Error mode mask */
+#define NILFS_MOUNT_ERRORS_CONT         0x0010  /* Continue on errors */
+#define NILFS_MOUNT_ERRORS_RO           0x0020  /* Remount fs ro on errors */
+#define NILFS_MOUNT_ERRORS_PANIC        0x0040  /* Panic on errors */
+#define NILFS_MOUNT_SNAPSHOT            0x0080  /* Snapshot flag */
+#define NILFS_MOUNT_BARRIER             0x1000  /* Use block barriers */
+#define NILFS_MOUNT_STRICT_ORDER        0x2000  /* Apply strict in-order
+                                                   semantics also for data */
+
+
+/**
+ * struct nilfs_super_block - structure of super block on disk
+ */
+struct nilfs_super_block {
+        __le32  s_rev_level;            /* Revision level */
+        __le16  s_minor_rev_level;      /* minor revision level */
+        __le16  s_magic;                /* Magic signature */
+
+        __le16  s_bytes;                /* Bytes count of CRC calculation
+                                           for this structure. s_reserved
+                                           is excluded. */
+        __le16  s_flags;                /* flags */
+        __le32  s_crc_seed;             /* Seed value of CRC calculation */
+        __le32  s_sum;                  /* Check sum of super block */
+
+        __le32  s_log_block_size;       /* Block size represented as follows
+                                           blocksize =
+                                               1 << (s_log_block_size + 10) */
+        __le64  s_nsegments;            /* Number of segments in filesystem */
+        __le64  s_dev_size;             /* block device size in bytes */
+        __le64  s_first_data_block;     /* 1st seg disk block number */
+        __le32  s_blocks_per_segment;   /* number of blocks per full segment */
+        __le32  s_r_segments_percentage; /* Reserved segments percentage */
+
+        __le64  s_last_cno;             /* Last checkpoint number */
+        __le64  s_last_pseg;            /* disk block addr pseg written last */
+        __le64  s_last_seq;             /* seq. number of seg written last */
+        __le64  s_free_blocks_count;    /* Free blocks count */
+
+        __le64  s_ctime;                /* Creation time (execution time of
+                                           newfs) */
+        __le64  s_mtime;                /* Mount time */
+        __le64  s_wtime;                /* Write time */
+        __le16  s_mnt_count;            /* Mount count */
+        __le16  s_max_mnt_count;        /* Maximal mount count */
+        __le16  s_state;                /* File system state */
+        __le16  s_errors;               /* Behaviour when detecting errors */
+        __le64  s_lastcheck;            /* time of last check */
+
+        __le32  s_checkinterval;        /* max. time between checks */
+        __le32  s_creator_os;           /* OS */
+        __le16  s_def_resuid;           /* Default uid for reserved blocks */
+        __le16  s_def_resgid;           /* Default gid for reserved blocks */
+        __le32  s_first_ino;            /* First non-reserved inode */
+
+        __le16  s_inode_size;           /* Size of an inode */
+        __le16  s_dat_entry_size;       /* Size of a dat entry */
+        __le16  s_checkpoint_size;      /* Size of a checkpoint */
+        __le16  s_segment_usage_size;   /* Size of a segment usage */
+
+        __u8    s_uuid[16];             /* 128-bit uuid for volume */
+        char    s_volume_name[16];      /* volume name */
+        char    s_last_mounted[64];     /* directory where last mounted */
+
+        __le32  s_c_interval;           /* Commit interval of segment */
+        __le32  s_c_block_max;          /* Threshold of data amount for
+                                           the segment construction */
+        __u32   s_reserved[192];        /* padding to the end of the block */
+};
+
+/*
+ * Codes for operating systems
+ */
+#define NILFS_OS_LINUX          0
+/* Codes from 1 to 4 are reserved to keep compatibility with ext2 creator-OS */
+
+/*
+ * Revision levels
+ */
+#define NILFS_CURRENT_REV       2       /* current major revision */
+#define NILFS_MINOR_REV         0       /* minor revision */
+
+/*
+ * Bytes count of super_block for CRC-calculation
+ */
+#define NILFS_SB_BYTES  \
+        ((long)&((struct nilfs_super_block *)0)->s_reserved)
+
+/*
+ * Special inode number
+ */
+#define NILFS_ROOT_INO          2       /* Root file inode */
+#define NILFS_DAT_INO           3       /* DAT file */
+#define NILFS_CPFILE_INO        4       /* checkpoint file */
+#define NILFS_SUFILE_INO        5       /* segment usage file */
+#define NILFS_IFILE_INO         6       /* ifile */
+#define NILFS_ATIME_INO         7       /* Atime file (reserved) */
+#define NILFS_XATTR_INO         8       /* Xattribute file (reserved) */
+#define NILFS_SKETCH_INO        10      /* Sketch file */
+#define NILFS_USER_INO          11      /* Fisrt user's file inode number */
+
+#define NILFS_SB_OFFSET_BYTES   1024    /* byte offset of nilfs superblock */
+#define NILFS_SUPER_MAGIC       0x3434  /* NILFS filesystem  magic number */
+
+#define NILFS_SEG_MIN_BLOCKS    16      /* Minimum number of blocks in
+                                           a full segment */
+#define NILFS_PSEG_MIN_BLOCKS   2       /* Minimum number of blocks in
+                                           a partial segment */
+#define NILFS_MIN_NRSVSEGS      8       /* Minimum number of reserved
+                                           segments */
+
+/*
+ * bytes offset of secondary super block
+ */
+#define NILFS_SB2_OFFSET_BYTES(devsize) ((((devsize) >> 12) - 1) << 12)
+
+/*
+ * Maximal count of links to a file
+ */
+#define NILFS_LINK_MAX          32000
+
+/*
+ * Structure of a directory entry
+ *  (Same as ext2)
+ */
+
+#define NILFS_NAME_LEN 255
+
+/*
+ * The new version of the directory entry.  Since V0 structures are
+ * stored in intel byte order, and the name_len field could never be
+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
+ * file_type field.
+ */
+struct nilfs_dir_entry {
+        __le64  inode;                  /* Inode number */
+        __le16  rec_len;                /* Directory entry length */
+        __u8    name_len;               /* Name length */
+        __u8    file_type;
+        char    name[NILFS_NAME_LEN];   /* File name */
+        char    pad;
+};
+
+/*
+ * NILFS directory file types.  Only the low 3 bits are used.  The
+ * other bits are reserved for now.
+ */
+enum {
+        NILFS_FT_UNKNOWN,
+        NILFS_FT_REG_FILE,
+        NILFS_FT_DIR,
+        NILFS_FT_CHRDEV,
+        NILFS_FT_BLKDEV,
+        NILFS_FT_FIFO,
+        NILFS_FT_SOCK,
+        NILFS_FT_SYMLINK,
+        NILFS_FT_MAX
+};
+
+/*
+ * NILFS_DIR_PAD defines the directory entries boundaries
+ *
+ * NOTE: It must be a multiple of 8
+ */
+#define NILFS_DIR_PAD                   8
+#define NILFS_DIR_ROUND                 (NILFS_DIR_PAD - 1)
+#define NILFS_DIR_REC_LEN(name_len)     (((name_len) + 12 + NILFS_DIR_ROUND) & \
+                                        ~NILFS_DIR_ROUND)
+
+
+/**
+ * struct nilfs_finfo - file information
+ * @fi_ino: inode number
+ * @fi_cno: checkpoint number
+ * @fi_nblocks: number of blocks (including intermediate blocks)
+ * @fi_ndatablk: number of file data blocks
+ */
+struct nilfs_finfo {
+        __le64 fi_ino;
+        __le64 fi_cno;
+        __le32 fi_nblocks;
+        __le32 fi_ndatablk;
+        /* array of virtual block numbers */
+};
+
+/**
+ * struct nilfs_binfo_v - information for the block to which a virtual block number is assigned
+ * @bi_vblocknr: virtual block number
+ * @bi_blkoff: block offset
+ */
+struct nilfs_binfo_v {
+        __le64 bi_vblocknr;
+        __le64 bi_blkoff;
+};
+
+/**
+ * struct nilfs_binfo_dat - information for the block which belongs to the DAT file
+ * @bi_blkoff: block offset
+ * @bi_level: level
+ * @bi_pad: padding
+ */
+struct nilfs_binfo_dat {
+        __le64 bi_blkoff;
+        __u8 bi_level;
+        __u8 bi_pad[7];
+};
+
+/**
+ * union nilfs_binfo: block information
+ * @bi_v: nilfs_binfo_v structure
+ * @bi_dat: nilfs_binfo_dat structure
+ */
+union nilfs_binfo {
+        struct nilfs_binfo_v bi_v;
+        struct nilfs_binfo_dat bi_dat;
+};
+
+/**
+ * struct nilfs_segment_summary - segment summary
+ * @ss_datasum: checksum of data
+ * @ss_sumsum: checksum of segment summary
+ * @ss_magic: magic number
+ * @ss_bytes: size of this structure in bytes
+ * @ss_flags: flags
+ * @ss_seq: sequence number
+ * @ss_create: creation timestamp
+ * @ss_next: next segment
+ * @ss_nblocks: number of blocks
+ * @ss_nfinfo: number of finfo structures
+ * @ss_sumbytes: total size of segment summary in bytes
+ * @ss_pad: padding
+ */
+struct nilfs_segment_summary {
+        __le32 ss_datasum;
+        __le32 ss_sumsum;
+        __le32 ss_magic;
+        __le16 ss_bytes;
+        __le16 ss_flags;
+        __le64 ss_seq;
+        __le64 ss_create;
+        __le64 ss_next;
+        __le32 ss_nblocks;
+        __le32 ss_nfinfo;
+        __le32 ss_sumbytes;
+        __le32 ss_pad;
+        /* array of finfo structures */
+};
+
+#define NILFS_SEGSUM_MAGIC      0x1eaffa11  /* segment summary magic number */
+
+/*
+ * Segment summary flags
+ */
+#define NILFS_SS_LOGBGN 0x0001  /* begins a logical segment */
+#define NILFS_SS_LOGEND 0x0002  /* ends a logical segment */
+#define NILFS_SS_SR     0x0004  /* has super root */
+#define NILFS_SS_SYNDT  0x0008  /* includes data only updates */
+#define NILFS_SS_GC     0x0010  /* segment written for cleaner operation */
+
+/**
+ * struct nilfs_palloc_group_desc - block group descriptor
+ * @pg_nfrees: number of free entries in block group
+ */
+struct nilfs_palloc_group_desc {
+        __le32 pg_nfrees;
+};
+
+/**
+ * struct nilfs_dat_entry - disk address translation entry
+ * @dt_blocknr: block number
+ * @dt_start: start checkpoint number
+ * @dt_end: end checkpoint number
+ * @dt_rsv: reserved for future use
+ */
+struct nilfs_dat_entry {
+        __le64 de_blocknr;
+        __le64 de_start;
+        __le64 de_end;
+        __le64 de_rsv;
+};
+
+/**
+ * struct nilfs_dat_group_desc - block group descriptor
+ * @dg_nfrees: number of free virtual block numbers in block group
+ */
+struct nilfs_dat_group_desc {
+        __le32 dg_nfrees;
+};
+
+
+/**
+ * struct nilfs_snapshot_list - snapshot list
+ * @ssl_next: next checkpoint number on snapshot list
+ * @ssl_prev: previous checkpoint number on snapshot list
+ */
+struct nilfs_snapshot_list {
+        __le64 ssl_next;
+        __le64 ssl_prev;
+};
+
+/**
+ * struct nilfs_checkpoint - checkpoint structure
+ * @cp_flags: flags
+ * @cp_checkpoints_count: checkpoints count in a block
+ * @cp_snapshot_list: snapshot list
+ * @cp_cno: checkpoint number
+ * @cp_create: creation timestamp
+ * @cp_nblk_inc: number of blocks incremented by this checkpoint
+ * @cp_inodes_count: inodes count
+ * @cp_blocks_count: blocks count
+ * @cp_ifile_inode: inode of ifile
+ */
+struct nilfs_checkpoint {
+        __le32 cp_flags;
+        __le32 cp_checkpoints_count;
+        struct nilfs_snapshot_list cp_snapshot_list;
+        __le64 cp_cno;
+        __le64 cp_create;
+        __le64 cp_nblk_inc;
+        __le64 cp_inodes_count;
+        __le64 cp_blocks_count;         /* Reserved (might be deleted) */
+
+        /* Do not change the byte offset of ifile inode.
+           To keep the compatibility of the disk format,
+           additional fields should be added behind cp_ifile_inode. */
+        struct nilfs_inode cp_ifile_inode;
+};
+
+/* checkpoint flags */
+enum {
+        NILFS_CHECKPOINT_SNAPSHOT,
+        NILFS_CHECKPOINT_INVALID,
+        NILFS_CHECKPOINT_SKETCH,
+        NILFS_CHECKPOINT_MINOR,
+};
+
+#define NILFS_CHECKPOINT_FNS(flag, name)                                \
+static inline void                                                      \
+nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp)                \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) |          \
+                                   (1UL << NILFS_CHECKPOINT_##flag));   \
+}                                                                       \
+static inline void                                                      \
+nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) &          \
+                                   ~(1UL << NILFS_CHECKPOINT_##flag));  \
+}                                                                       \
+static inline int                                                       \
+nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        return !!(le32_to_cpu(cp->cp_flags) &                           \
+                  (1UL << NILFS_CHECKPOINT_##flag));                    \
+}
+
+NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
+NILFS_CHECKPOINT_FNS(INVALID, invalid)
+NILFS_CHECKPOINT_FNS(MINOR, minor)
+
+/**
+ * struct nilfs_cpinfo - checkpoint information
+ * @ci_flags: flags
+ * @ci_pad: padding
+ * @ci_cno: checkpoint number
+ * @ci_create: creation timestamp
+ * @ci_nblk_inc: number of blocks incremented by this checkpoint
+ * @ci_inodes_count: inodes count
+ * @ci_blocks_count: blocks count
+ * @ci_next: next checkpoint number in snapshot list
+ */
+struct nilfs_cpinfo {
+        __u32 ci_flags;
+        __u32 ci_pad;
+        __u64 ci_cno;
+        __u64 ci_create;
+        __u64 ci_nblk_inc;
+        __u64 ci_inodes_count;
+        __u64 ci_blocks_count;
+        __u64 ci_next;
+};
+
+#define NILFS_CPINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_cpinfo_##name(const struct nilfs_cpinfo *cpinfo)                  \
+{                                                                       \
+        return !!(cpinfo->ci_flags & (1UL << NILFS_CHECKPOINT_##flag)); \
+}
+
+NILFS_CPINFO_FNS(SNAPSHOT, snapshot)
+NILFS_CPINFO_FNS(INVALID, invalid)
+NILFS_CPINFO_FNS(MINOR, minor)
+
+
+/**
+ * struct nilfs_cpfile_header - checkpoint file header
+ * @ch_ncheckpoints: number of checkpoints
+ * @ch_nsnapshots: number of snapshots
+ * @ch_snapshot_list: snapshot list
+ */
+struct nilfs_cpfile_header {
+        __le64 ch_ncheckpoints;
+        __le64 ch_nsnapshots;
+        struct nilfs_snapshot_list ch_snapshot_list;
+};
+
+#define NILFS_CPFILE_FIRST_CHECKPOINT_OFFSET    \
+        ((sizeof(struct nilfs_cpfile_header) +                          \
+          sizeof(struct nilfs_checkpoint) - 1) /                        \
+                        sizeof(struct nilfs_checkpoint))
+
+/**
+ * struct nilfs_segment_usage - segment usage
+ * @su_lastmod: last modified timestamp
+ * @su_nblocks: number of blocks in segment
+ * @su_flags: flags
+ */
+struct nilfs_segment_usage {
+        __le64 su_lastmod;
+        __le32 su_nblocks;
+        __le32 su_flags;
+};
+
+/* segment usage flag */
+enum {
+        NILFS_SEGMENT_USAGE_ACTIVE,
+        NILFS_SEGMENT_USAGE_DIRTY,
+        NILFS_SEGMENT_USAGE_ERROR,
+
+        /* ... */
+};
+
+#define NILFS_SEGMENT_USAGE_FNS(flag, name)                             \
+static inline void                                                      \
+nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su)          \
+{                                                                       \
+        su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) |          \
+                                   (1UL << NILFS_SEGMENT_USAGE_##flag));\
+}                                                                       \
+static inline void                                                      \
+nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su)        \
+{                                                                       \
+        su->su_flags =                                                  \
+                cpu_to_le32(le32_to_cpu(su->su_flags) &                 \
+                            ~(1UL << NILFS_SEGMENT_USAGE_##flag));      \
+}                                                                       \
+static inline int                                                       \
+nilfs_segment_usage_##name(const struct nilfs_segment_usage *su)        \
+{                                                                       \
+        return !!(le32_to_cpu(su->su_flags) &                           \
+                  (1UL << NILFS_SEGMENT_USAGE_##flag));                 \
+}
+
+NILFS_SEGMENT_USAGE_FNS(ACTIVE, active)
+NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty)
+NILFS_SEGMENT_USAGE_FNS(ERROR, error)
+
+static inline void
+nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
+{
+        su->su_lastmod = cpu_to_le64(0);
+        su->su_nblocks = cpu_to_le32(0);
+        su->su_flags = cpu_to_le32(0);
+}
+
+static inline int
+nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
+{
+        return !le32_to_cpu(su->su_flags);
+}
+
+/**
+ * struct nilfs_sufile_header - segment usage file header
+ * @sh_ncleansegs: number of clean segments
+ * @sh_ndirtysegs: number of dirty segments
+ * @sh_last_alloc: last allocated segment number
+ */
+struct nilfs_sufile_header {
+        __le64 sh_ncleansegs;
+        __le64 sh_ndirtysegs;
+        __le64 sh_last_alloc;
+        /* ... */
+};
+
+#define NILFS_SUFILE_FIRST_SEGMENT_USAGE_OFFSET \
+        ((sizeof(struct nilfs_sufile_header) +                          \
+          sizeof(struct nilfs_segment_usage) - 1) /                     \
+                         sizeof(struct nilfs_segment_usage))
+
+/**
+ * nilfs_suinfo - segment usage information
+ * @sui_lastmod:
+ * @sui_nblocks:
+ * @sui_flags:
+ */
+struct nilfs_suinfo {
+        __u64 sui_lastmod;
+        __u32 sui_nblocks;
+        __u32 sui_flags;
+};
+
+#define NILFS_SUINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_suinfo_##name(const struct nilfs_suinfo *si)                      \
+{                                                                       \
+        return si->sui_flags & (1UL << NILFS_SEGMENT_USAGE_##flag);     \
+}
+
+NILFS_SUINFO_FNS(ACTIVE, active)
+NILFS_SUINFO_FNS(DIRTY, dirty)
+NILFS_SUINFO_FNS(ERROR, error)
+
+static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si)
+{
+        return !si->sui_flags;
+}
+
+/* ioctl */
+enum {
+        NILFS_CHECKPOINT,
+        NILFS_SNAPSHOT,
+};
+
+/**
+ * struct nilfs_cpmode -
+ * @cc_cno:
+ * @cc_mode:
+ */
+struct nilfs_cpmode {
+        __u64 cm_cno;
+        __u32 cm_mode;
+        __u32 cm_pad;
+};
+
+/**
+ * struct nilfs_argv - argument vector
+ * @v_base:
+ * @v_nmembs:
+ * @v_size:
+ * @v_flags:
+ * @v_index:
+ */
+struct nilfs_argv {
+        __u64 v_base;
+        __u32 v_nmembs; /* number of members */
+        __u16 v_size;   /* size of members */
+        __u16 v_flags;
+        __u64 v_index;
+};
+
+/**
+ * struct nilfs_period -
+ * @p_start:
+ * @p_end:
+ */
+struct nilfs_period {
+        __u64 p_start;
+        __u64 p_end;
+};
+
+/**
+ * struct nilfs_cpstat -
+ * @cs_cno: checkpoint number
+ * @cs_ncps: number of checkpoints
+ * @cs_nsss: number of snapshots
+ */
+struct nilfs_cpstat {
+        __u64 cs_cno;
+        __u64 cs_ncps;
+        __u64 cs_nsss;
+};
+
+/**
+ * struct nilfs_sustat -
+ * @ss_nsegs: number of segments
+ * @ss_ncleansegs: number of clean segments
+ * @ss_ndirtysegs: number of dirty segments
+ * @ss_ctime: creation time of the last segment
+ * @ss_nongc_ctime: creation time of the last segment not for GC
+ * @ss_prot_seq: least sequence number of segments which must not be reclaimed
+ */
+struct nilfs_sustat {
+        __u64 ss_nsegs;
+        __u64 ss_ncleansegs;
+        __u64 ss_ndirtysegs;
+        __u64 ss_ctime;
+        __u64 ss_nongc_ctime;
+        __u64 ss_prot_seq;
+};
+
+/**
+ * struct nilfs_vinfo - virtual block number information
+ * @vi_vblocknr:
+ * @vi_start:
+ * @vi_end:
+ * @vi_blocknr:
+ */
+struct nilfs_vinfo {
+        __u64 vi_vblocknr;
+        __u64 vi_start;
+        __u64 vi_end;
+        __u64 vi_blocknr;
+};
+
+/**
+ * struct nilfs_vdesc -
+ */
+struct nilfs_vdesc {
+        __u64 vd_ino;
+        __u64 vd_cno;
+        __u64 vd_vblocknr;
+        struct nilfs_period vd_period;
+        __u64 vd_blocknr;
+        __u64 vd_offset;
+        __u32 vd_flags;
+        __u32 vd_pad;
+};
+
+/**
+ * struct nilfs_bdesc -
+ */
+struct nilfs_bdesc {
+        __u64 bd_ino;
+        __u64 bd_oblocknr;
+        __u64 bd_blocknr;
+        __u64 bd_offset;
+        __u32 bd_level;
+        __u32 bd_pad;
+};
+
+#define NILFS_IOCTL_IDENT               'n'
+
+#define NILFS_IOCTL_CHANGE_CPMODE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode)
+#define NILFS_IOCTL_DELETE_CHECKPOINT  \
+        _IOW(NILFS_IOCTL_IDENT, 0x81, __u64)
+#define NILFS_IOCTL_GET_CPINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x82, struct nilfs_argv)
+#define NILFS_IOCTL_GET_CPSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x83, struct nilfs_cpstat)
+#define NILFS_IOCTL_GET_SUINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x84, struct nilfs_argv)
+#define NILFS_IOCTL_GET_SUSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x85, struct nilfs_sustat)
+#define NILFS_IOCTL_GET_VINFO  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x86, struct nilfs_argv)
+#define NILFS_IOCTL_GET_BDESCS  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
+#define NILFS_IOCTL_CLEAN_SEGMENTS  \
+        _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
+#define NILFS_IOCTL_SYNC  \
+        _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
+#define NILFS_IOCTL_RESIZE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x8B, __u64)
+
+#endif  /* _LINUX_NILFS_FS_H */
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index e86ed59f9ad5..cbe8ce3bf486 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -47,7 +47,7 @@
  * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
  *      %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
  *      %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, and/or
- *      %NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET.
+ *      %NL80211_ATTR_WIPHY_CHANNEL_TYPE.
  * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
  *      or rename notification. Has attributes %NL80211_ATTR_WIPHY and
  *      %NL80211_ATTR_WIPHY_NAME.
@@ -72,8 +72,8 @@
  *
  * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
  *      by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
- * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or
- *      %NL80211_ATTR_KEY_THRESHOLD.
+ * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,
+ *      %NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.
  * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
  *      %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER
  *      attributes.
@@ -84,7 +84,7 @@
  *      %NL80222_CMD_NEW_BEACON message)
  * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
  *      using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
- *      %NL80211_BEACON_HEAD and %NL80211_BEACON_TAIL attributes.
+ *      %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes.
  * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
  *      parameters are like for %NL80211_CMD_SET_BEACON.
  * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
@@ -113,6 +113,8 @@
  * @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by
  *      %NL80211_ATTR_IFINDEX.
  *
+ * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
+ *      regulatory domain.
  * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
  *      after being queried by the kernel. CRDA replies by sending a regulatory
  *      domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
@@ -133,6 +135,70 @@
  * @NL80211_CMD_SET_MESH_PARAMS: Set mesh networking properties for the
  *      interface identified by %NL80211_ATTR_IFINDEX
  *
+ * @NL80211_CMD_SET_MGMT_EXTRA_IE: Set extra IEs for management frames. The
+ *      interface is identified with %NL80211_ATTR_IFINDEX and the management
+ *      frame subtype with %NL80211_ATTR_MGMT_SUBTYPE. The extra IE data to be
+ *      added to the end of the specified management frame is specified with
+ *      %NL80211_ATTR_IE. If the command succeeds, the requested data will be
+ *      added to all specified management frames generated by
+ *      kernel/firmware/driver.
+ *      Note: This command has been removed and it is only reserved at this
+ *      point to avoid re-using existing command number. The functionality this
+ *      command was planned for has been provided with cleaner design with the
+ *      option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
+ *      NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
+ *      NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
+ *
+ * @NL80211_CMD_GET_SCAN: get scan results
+ * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
+ * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
+ *      NL80211_CMD_GET_SCAN and on the "scan" multicast group)
+ * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
+ *      partial scan results may be available
+ *
+ * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
+ *      has been changed and provides details of the request information
+ *      that caused the change such as who initiated the regulatory request
+ *      (%NL80211_ATTR_REG_INITIATOR), the wiphy_idx
+ *      (%NL80211_ATTR_REG_ALPHA2) on which the request was made from if
+ *      the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or
+ *      %NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain
+ *      set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
+ *      %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
+ *      to (%NL80211_ATTR_REG_ALPHA2).
+ *
+ * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
+ *      This command is used both as a command (request to authenticate) and
+ *      as an event on the "mlme" multicast group indicating completion of the
+ *      authentication process.
+ *      When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
+ *      interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
+ *      BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
+ *      the SSID (mainly for association, but is included in authentication
+ *      request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
+ *      to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
+ *      is used to specify the authentication type. %NL80211_ATTR_IE is used to
+ *      define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
+ *      to be added to the frame.
+ *      When used as an event, this reports reception of an Authentication
+ *      frame in station and IBSS modes when the local MLME processed the
+ *      frame, i.e., it was for the local STA and was received in correct
+ *      state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
+ *      MLME SAP interface (kernel providing MLME, userspace SME). The
+ *      included NL80211_ATTR_FRAME attribute contains the management frame
+ *      (including both the header and frame body, but not FCS).
+ * @NL80211_CMD_ASSOCIATE: association request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Association and Reassociation
+ *      (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
+ *      MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
+ * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
+ *      MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
+ *      primitives).
+ * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
+ *      MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -178,6 +244,22 @@ enum nl80211_commands {
         NL80211_CMD_GET_MESH_PARAMS,
         NL80211_CMD_SET_MESH_PARAMS,
 
+        NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
+
+        NL80211_CMD_GET_REG,
+
+        NL80211_CMD_GET_SCAN,
+        NL80211_CMD_TRIGGER_SCAN,
+        NL80211_CMD_NEW_SCAN_RESULTS,
+        NL80211_CMD_SCAN_ABORTED,
+
+        NL80211_CMD_REG_CHANGE,
+
+        NL80211_CMD_AUTHENTICATE,
+        NL80211_CMD_ASSOCIATE,
+        NL80211_CMD_DEAUTHENTICATE,
+        NL80211_CMD_DISASSOCIATE,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -190,6 +272,12 @@ enum nl80211_commands {
  * here
  */
 #define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
+#define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
+#define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
+#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
+#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
+#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
+#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
 
 /**
  * enum nl80211_attrs - nl80211 netlink attributes
@@ -284,6 +372,42 @@ enum nl80211_commands {
  *      supported interface types, each a flag attribute with the number
  *      of the interface mode.
  *
+ * @NL80211_ATTR_MGMT_SUBTYPE: Management frame subtype for
+ *      %NL80211_CMD_SET_MGMT_EXTRA_IE.
+ *
+ * @NL80211_ATTR_IE: Information element(s) data (used, e.g., with
+ *      %NL80211_CMD_SET_MGMT_EXTRA_IE).
+ *
+ * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
+ *      a single scan request, a wiphy attribute.
+ *
+ * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
+ * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
+ *      scanning and include a zero-length SSID (wildcard) for wildcard scan
+ * @NL80211_ATTR_SCAN_GENERATION: the scan generation increases whenever the
+ *      scan result list changes (BSS expired or added) so that applications
+ *      can verify that they got a single, consistent snapshot (when all dump
+ *      messages carried the same generation number)
+ * @NL80211_ATTR_BSS: scan result BSS
+ *
+ * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
+ *      currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_*
+ * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
+ *      set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
+ *
+ * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
+ *      an array of command numbers (i.e. a mapping index to command number)
+ *      that the driver for the given wiphy supports.
+ *
+ * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
+ *      and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
+ *      NL80211_CMD_ASSOCIATE events
+ * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
+ * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
+ *      represented as a u32
+ * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
+ *      %NL80211_CMD_DISASSOCIATE, u16
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -346,6 +470,28 @@ enum nl80211_attrs {
         NL80211_ATTR_WIPHY_FREQ,
         NL80211_ATTR_WIPHY_CHANNEL_TYPE,
 
+        NL80211_ATTR_KEY_DEFAULT_MGMT,
+
+        NL80211_ATTR_MGMT_SUBTYPE,
+        NL80211_ATTR_IE,
+
+        NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
+
+        NL80211_ATTR_SCAN_FREQUENCIES,
+        NL80211_ATTR_SCAN_SSIDS,
+        NL80211_ATTR_SCAN_GENERATION,
+        NL80211_ATTR_BSS,
+
+        NL80211_ATTR_REG_INITIATOR,
+        NL80211_ATTR_REG_TYPE,
+
+        NL80211_ATTR_SUPPORTED_COMMANDS,
+
+        NL80211_ATTR_FRAME,
+        NL80211_ATTR_SSID,
+        NL80211_ATTR_AUTH_TYPE,
+        NL80211_ATTR_REASON_CODE,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -360,7 +506,15 @@ enum nl80211_attrs {
 #define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
 #define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
 #define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
-#define NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET
+#define NL80211_ATTR_WIPHY_CHANNEL_TYPE NL80211_ATTR_WIPHY_CHANNEL_TYPE
+#define NL80211_ATTR_MGMT_SUBTYPE NL80211_ATTR_MGMT_SUBTYPE
+#define NL80211_ATTR_IE NL80211_ATTR_IE
+#define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
+#define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
+#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
+#define NL80211_ATTR_SSID NL80211_ATTR_SSID
+#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
+#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
 
 #define NL80211_MAX_SUPP_RATES                  32
 #define NL80211_MAX_SUPP_REG_RULES              32
@@ -412,12 +566,14 @@ enum nl80211_iftype {
  * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
  *      with short barker preamble
  * @NL80211_STA_FLAG_WME: station is WME/QoS capable
+ * @NL80211_STA_FLAG_MFP: station uses management frame protection
  */
 enum nl80211_sta_flags {
         __NL80211_STA_FLAG_INVALID,
         NL80211_STA_FLAG_AUTHORIZED,
         NL80211_STA_FLAG_SHORT_PREAMBLE,
         NL80211_STA_FLAG_WME,
+        NL80211_STA_FLAG_MFP,
 
         /* keep last */
         __NL80211_STA_FLAG_AFTER_LAST,
@@ -465,6 +621,9 @@ enum nl80211_rate_info {
  * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
  * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
  *      containing info as possible, see &enum nl80211_sta_info_txrate.
+ * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
+ * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
+ *      station)
  */
 enum nl80211_sta_info {
         __NL80211_STA_INFO_INVALID,
@@ -476,6 +635,8 @@ enum nl80211_sta_info {
         NL80211_STA_INFO_PLINK_STATE,
         NL80211_STA_INFO_SIGNAL,
         NL80211_STA_INFO_TX_BITRATE,
+        NL80211_STA_INFO_RX_PACKETS,
+        NL80211_STA_INFO_TX_PACKETS,
 
         /* keep last */
         __NL80211_STA_INFO_AFTER_LAST,
@@ -607,6 +768,48 @@ enum nl80211_bitrate_attr {
 };
 
 /**
+ * enum nl80211_initiator - Indicates the initiator of a reg domain request
+ * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world
+ *      regulatory domain.
+ * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the
+ *      regulatory domain.
+ * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the
+ *      wireless core it thinks its knows the regulatory domain we should be in.
+ * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
+ *      802.11 country information element with regulatory information it
+ *      thinks we should consider.
+ */
+enum nl80211_reg_initiator {
+        NL80211_REGDOM_SET_BY_CORE,
+        NL80211_REGDOM_SET_BY_USER,
+        NL80211_REGDOM_SET_BY_DRIVER,
+        NL80211_REGDOM_SET_BY_COUNTRY_IE,
+};
+
+/**
+ * enum nl80211_reg_type - specifies the type of regulatory domain
+ * @NL80211_REGDOM_TYPE_COUNTRY: the regulatory domain set is one that pertains
+ *      to a specific country. When this is set you can count on the
+ *      ISO / IEC 3166 alpha2 country code being valid.
+ * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory
+ *      domain.
+ * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom
+ *      driver specific world regulatory domain. These do not apply system-wide
+ *      and are only applicable to the individual devices which have requested
+ *      them to be applied.
+ * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product
+ *      of an intersection between two regulatory domains -- the previously
+ *      set regulatory domain on the system and the last accepted regulatory
+ *      domain request to be processed.
+ */
+enum nl80211_reg_type {
+        NL80211_REGDOM_TYPE_COUNTRY,
+        NL80211_REGDOM_TYPE_WORLD,
+        NL80211_REGDOM_TYPE_CUSTOM_WORLD,
+        NL80211_REGDOM_TYPE_INTERSECTION,
+};
+
+/**
  * enum nl80211_reg_rule_attr - regulatory rule attributes
  * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional
  *      considerations for a given frequency range. These are the
@@ -811,4 +1014,52 @@ enum nl80211_channel_type {
         NL80211_CHAN_HT40MINUS,
         NL80211_CHAN_HT40PLUS
 };
+
+/**
+ * enum nl80211_bss - netlink attributes for a BSS
+ *
+ * @__NL80211_BSS_INVALID: invalid
+ * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
+ * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
+ * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16)
+ * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16)
+ * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the
+ *      raw information elements from the probe response/beacon (bin)
+ * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon
+ *      in mBm (100 * dBm) (s32)
+ * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
+ *      in unspecified units, scaled to 0..100 (u8)
+ * @__NL80211_BSS_AFTER_LAST: internal
+ * @NL80211_BSS_MAX: highest BSS attribute
+ */
+enum nl80211_bss {
+        __NL80211_BSS_INVALID,
+        NL80211_BSS_BSSID,
+        NL80211_BSS_FREQUENCY,
+        NL80211_BSS_TSF,
+        NL80211_BSS_BEACON_INTERVAL,
+        NL80211_BSS_CAPABILITY,
+        NL80211_BSS_INFORMATION_ELEMENTS,
+        NL80211_BSS_SIGNAL_MBM,
+        NL80211_BSS_SIGNAL_UNSPEC,
+
+        /* keep last */
+        __NL80211_BSS_AFTER_LAST,
+        NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
+};
+
+/**
+ * enum nl80211_auth_type - AuthenticationType
+ *
+ * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
+ * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
+ * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
+ * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
+ */
+enum nl80211_auth_type {
+        NL80211_AUTHTYPE_OPEN_SYSTEM,
+        NL80211_AUTHTYPE_SHARED_KEY,
+        NL80211_AUTHTYPE_FT,
+        NL80211_AUTHTYPE_NETWORK_EAP,
+};
 #endif /* __LINUX_NL80211_H */
diff --git a/include/linux/nls.h b/include/linux/nls.h
index 6a882208301a..52b1a76c1b43 100644
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -58,6 +58,25 @@ static inline int nls_strnicmp(struct nls_table *t, const unsigned char *s1,
         return 0;
 }
 
+/*
+ * nls_nullsize - return length of null character for codepage
+ * @codepage - codepage for which to return length of NULL terminator
+ *
+ * Since we can't guarantee that the null terminator will be a particular
+ * length, we have to check against the codepage. If there's a problem
+ * determining it, assume a single-byte NULL terminator.
+ */
+static inline int
+nls_nullsize(const struct nls_table *codepage)
+{
+        int charlen;
+        char tmp[NLS_MAX_CHARSET_SIZE];
+
+        charlen = codepage->uni2char(0, tmp, NLS_MAX_CHARSET_SIZE);
+
+        return charlen > 0 ? charlen : 1;
+}
+
 #define MODULE_ALIAS_NLS(name)  MODULE_ALIAS("nls_" __stringify(name))
 
 #endif /* _LINUX_NLS_H */
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index afad7dec1b36..7b370c7cfeff 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -8,6 +8,7 @@ struct mnt_namespace;
 struct uts_namespace;
 struct ipc_namespace;
 struct pid_namespace;
+struct fs_struct;
 
 /*
  * A structure to contain pointers to all per-process
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index 7382af374731..e137b3c486a7 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -237,6 +237,7 @@ struct nubus_dirent
         int mask;
 };
 
+#ifdef __KERNEL__
 struct nubus_board {
         struct nubus_board* next;
         struct nubus_dev* first_dev;
@@ -351,6 +352,7 @@ 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)
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 3d327b67d7e2..908406651330 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -51,6 +51,16 @@ extern int of_register_driver(struct of_platform_driver *drv,
                               struct bus_type *bus);
 extern void of_unregister_driver(struct of_platform_driver *drv);
 
+/* Platform drivers register/unregister */
+static inline int of_register_platform_driver(struct of_platform_driver *drv)
+{
+        return of_register_driver(drv, &of_platform_bus_type);
+}
+static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
+{
+        of_unregister_driver(drv);
+}
+
 #include <asm/of_platform.h>
 
 extern struct of_device *of_find_device_by_node(struct device_node *np);
diff --git a/include/linux/page-debug-flags.h b/include/linux/page-debug-flags.h
new file mode 100644
index 000000000000..b0638fd91e92
--- /dev/null
+++ b/include/linux/page-debug-flags.h
@@ -0,0 +1,30 @@
+#ifndef LINUX_PAGE_DEBUG_FLAGS_H
+#define  LINUX_PAGE_DEBUG_FLAGS_H
+
+/*
+ * page->debug_flags bits:
+ *
+ * PAGE_DEBUG_FLAG_POISON is set for poisoned pages. This is used to
+ * implement generic debug pagealloc feature. The pages are filled with
+ * poison patterns and set this flag after free_pages(). The poisoned
+ * pages are verified whether the patterns are not corrupted and clear
+ * the flag before alloc_pages().
+ */
+
+enum page_debug_flags {
+        PAGE_DEBUG_FLAG_POISON,         /* Page is poisoned */
+};
+
+/*
+ * Ensure that CONFIG_WANT_PAGE_DEBUG_FLAGS reliably
+ * gets turned off when no debug features are enabling it!
+ */
+
+#ifdef CONFIG_WANT_PAGE_DEBUG_FLAGS
+#if !defined(CONFIG_PAGE_POISONING) \
+/* && !defined(CONFIG_PAGE_DEBUG_SOMETHING_ELSE) && ... */
+#error WANT_PAGE_DEBUG_FLAGS is turned on with no debug features!
+#endif
+#endif /* CONFIG_WANT_PAGE_DEBUG_FLAGS */
+
+#endif /* LINUX_PAGE_DEBUG_FLAGS_H */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 219a523ecdb0..62214c7d2d93 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -82,6 +82,7 @@ enum pageflags {
         PG_arch_1,
         PG_reserved,
         PG_private,             /* If pagecache, has fs-private data */
+        PG_private_2,           /* If pagecache, has fs aux data */
         PG_writeback,           /* Page is under writeback */
 #ifdef CONFIG_PAGEFLAGS_EXTENDED
         PG_head,                /* A head page */
@@ -96,6 +97,8 @@ enum pageflags {
         PG_swapbacked,          /* Page is backed by RAM/swap */
 #ifdef CONFIG_UNEVICTABLE_LRU
         PG_unevictable,         /* Page is "unevictable"  */
+#endif
+#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
         PG_mlocked,             /* Page is vma mlocked */
 #endif
 #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
@@ -106,6 +109,12 @@ enum pageflags {
         /* Filesystems */
         PG_checked = PG_owner_priv_1,
 
+        /* Two page bits are conscripted by FS-Cache to maintain local caching
+         * state.  These bits are set on pages belonging to the netfs's inodes
+         * when those inodes are being locally cached.
+         */
+        PG_fscache = PG_private_2,      /* page backed by cache */
+
         /* XEN */
         PG_pinned = PG_owner_priv_1,
         PG_savepinned = PG_dirty,
@@ -180,7 +189,7 @@ static inline int TestClearPage##uname(struct page *page) { return 0; }
 
 struct page;    /* forward declaration */
 
-TESTPAGEFLAG(Locked, locked)
+TESTPAGEFLAG(Locked, locked) TESTSETFLAG(Locked, locked)
 PAGEFLAG(Error, error)
 PAGEFLAG(Referenced, referenced) TESTCLEARFLAG(Referenced, referenced)
 PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, dirty) __CLEARPAGEFLAG(Dirty, dirty)
@@ -192,8 +201,6 @@ PAGEFLAG(Checked, checked)		/* Used by some filesystems */
 PAGEFLAG(Pinned, pinned) TESTSCFLAG(Pinned, pinned)     /* Xen */
 PAGEFLAG(SavePinned, savepinned);                       /* Xen */
 PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
-PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private)
-        __SETPAGEFLAG(Private, private)
 PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
 
 __PAGEFLAG(SlobPage, slob_page)
@@ -203,6 +210,16 @@ __PAGEFLAG(SlubFrozen, slub_frozen)
 __PAGEFLAG(SlubDebug, slub_debug)
 
 /*
+ * Private page markings that may be used by the filesystem that owns the page
+ * for its own purposes.
+ * - PG_private and PG_private_2 cause releasepage() and co to be invoked
+ */
+PAGEFLAG(Private, private) __SETPAGEFLAG(Private, private)
+        __CLEARPAGEFLAG(Private, private)
+PAGEFLAG(Private2, private_2) TESTSCFLAG(Private2, private_2)
+PAGEFLAG(OwnerPriv1, owner_priv_1) TESTCLEARFLAG(OwnerPriv1, owner_priv_1)
+
+/*
  * Only test-and-set exist for PG_writeback.  The unconditional operators are
  * risky: they bypass page accounting.
  */
@@ -234,20 +251,20 @@ PAGEFLAG_FALSE(SwapCache)
 #ifdef CONFIG_UNEVICTABLE_LRU
 PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)
         TESTCLEARFLAG(Unevictable, unevictable)
+#else
+PAGEFLAG_FALSE(Unevictable) TESTCLEARFLAG_FALSE(Unevictable)
+        SETPAGEFLAG_NOOP(Unevictable) CLEARPAGEFLAG_NOOP(Unevictable)
+        __CLEARPAGEFLAG_NOOP(Unevictable)
+#endif
 
+#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
 #define MLOCK_PAGES 1
 PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)
         TESTSCFLAG(Mlocked, mlocked)
-
 #else
-
 #define MLOCK_PAGES 0
 PAGEFLAG_FALSE(Mlocked)
         SETPAGEFLAG_NOOP(Mlocked) TESTCLEARFLAG_FALSE(Mlocked)
-
-PAGEFLAG_FALSE(Unevictable) TESTCLEARFLAG_FALSE(Unevictable)
-        SETPAGEFLAG_NOOP(Unevictable) CLEARPAGEFLAG_NOOP(Unevictable)
-        __CLEARPAGEFLAG_NOOP(Unevictable)
 #endif
 
 #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
@@ -367,9 +384,13 @@ static inline void __ClearPageTail(struct page *page)
 
 #ifdef CONFIG_UNEVICTABLE_LRU
 #define __PG_UNEVICTABLE        (1 << PG_unevictable)
-#define __PG_MLOCKED            (1 << PG_mlocked)
 #else
 #define __PG_UNEVICTABLE        0
+#endif
+
+#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
+#define __PG_MLOCKED            (1 << PG_mlocked)
+#else
 #define __PG_MLOCKED            0
 #endif
 
@@ -378,9 +399,10 @@ static inline void __ClearPageTail(struct page *page)
  * these flags set.  It they are, there is a problem.
  */
 #define PAGE_FLAGS_CHECK_AT_FREE \
-        (1 << PG_lru   | 1 << PG_private   | 1 << PG_locked | \
-         1 << PG_buddy | 1 << PG_writeback | 1 << PG_reserved | \
-         1 << PG_slab  | 1 << PG_swapcache | 1 << PG_active | \
+        (1 << PG_lru     | 1 << PG_locked    | \
+         1 << PG_private | 1 << PG_private_2 | \
+         1 << PG_buddy   | 1 << PG_writeback | 1 << PG_reserved | \
+         1 << PG_slab    | 1 << PG_swapcache | 1 << PG_active | \
          __PG_UNEVICTABLE | __PG_MLOCKED)
 
 /*
@@ -391,4 +413,16 @@ static inline void __ClearPageTail(struct page *page)
 #define PAGE_FLAGS_CHECK_AT_PREP        ((1 << NR_PAGEFLAGS) - 1)
 
 #endif /* !__GENERATING_BOUNDS_H */
+
+/**
+ * page_has_private - Determine if page has private stuff
+ * @page: The page to be checked
+ *
+ * Determine if a page has private stuff, indicating that release routines
+ * should be invoked upon it.
+ */
+#define page_has_private(page)                  \
+        ((page)->flags & ((1 << PG_private) |   \
+                          (1 << PG_private_2)))
+
 #endif  /* PAGE_FLAGS_H */
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 602cc1fdee90..7339c7bf7331 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -91,24 +91,23 @@ static inline void page_cgroup_init(void)
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 #include <linux/swap.h>
-extern struct mem_cgroup *
-swap_cgroup_record(swp_entry_t ent, struct mem_cgroup *mem);
-extern struct mem_cgroup *lookup_swap_cgroup(swp_entry_t ent);
+extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
+extern unsigned short lookup_swap_cgroup(swp_entry_t ent);
 extern int swap_cgroup_swapon(int type, unsigned long max_pages);
 extern void swap_cgroup_swapoff(int type);
 #else
 #include <linux/swap.h>
 
 static inline
-struct mem_cgroup *swap_cgroup_record(swp_entry_t ent, struct mem_cgroup *mem)
+unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
 {
-        return NULL;
+        return 0;
 }
 
 static inline
-struct mem_cgroup *lookup_swap_cgroup(swp_entry_t ent)
+unsigned short lookup_swap_cgroup(swp_entry_t ent)
 {
-        return NULL;
+        return 0;
 }
 
 static inline int
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 01ca0856caff..34da5230faab 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -18,9 +18,14 @@
  * Bits in mapping->flags.  The lower __GFP_BITS_SHIFT bits are the page
  * allocation mode flags.
  */
-#define AS_EIO          (__GFP_BITS_SHIFT + 0)  /* IO error on async write */
-#define AS_ENOSPC       (__GFP_BITS_SHIFT + 1)  /* ENOSPC on async write */
-#define AS_MM_ALL_LOCKS (__GFP_BITS_SHIFT + 2)  /* under mm_take_all_locks() */
+enum mapping_flags {
+        AS_EIO          = __GFP_BITS_SHIFT + 0, /* IO error on async write */
+        AS_ENOSPC       = __GFP_BITS_SHIFT + 1, /* ENOSPC on async write */
+        AS_MM_ALL_LOCKS = __GFP_BITS_SHIFT + 2, /* under mm_take_all_locks() */
+#ifdef CONFIG_UNEVICTABLE_LRU
+        AS_UNEVICTABLE  = __GFP_BITS_SHIFT + 3, /* e.g., ramdisk, SHM_LOCK */
+#endif
+};
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
@@ -33,7 +38,6 @@ static inline void mapping_set_error(struct address_space *mapping, int error)
 }
 
 #ifdef CONFIG_UNEVICTABLE_LRU
-#define AS_UNEVICTABLE  (__GFP_BITS_SHIFT + 2)  /* e.g., ramdisk, SHM_LOCK */
 
 static inline void mapping_set_unevictable(struct address_space *mapping)
 {
@@ -380,6 +384,11 @@ static inline void wait_on_page_writeback(struct page *page)
 extern void end_page_writeback(struct page *page);
 
 /*
+ * Add an arbitrary waiter to a page's wait queue
+ */
+extern void add_page_wait_queue(struct page *page, wait_queue_t *waiter);
+
+/*
  * Fault a userspace page into pagetables.  Return non-zero on a fault.
  *
  * This assumes that two userspace pages are always sufficient.  That's
diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index 7b2886fa7fdc..bab82f4c571c 100644
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -24,7 +24,6 @@ void __pagevec_release(struct pagevec *pvec);
 void __pagevec_free(struct pagevec *pvec);
 void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru);
 void pagevec_strip(struct pagevec *pvec);
-void pagevec_swap_free(struct pagevec *pvec);
 unsigned pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
                 pgoff_t start, unsigned nr_pages);
 unsigned pagevec_lookup_tag(struct pagevec *pvec,
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index ea8c6d84996d..cc1767f5cca8 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -228,10 +228,11 @@ extern void parport_pc_release_resources(struct parport *p);
 extern int parport_pc_claim_resources(struct parport *p);
 
 /* PCMCIA code will want to get us to look at a port.  Provide a mechanism. */
-extern struct parport *parport_pc_probe_port (unsigned long base,
-                                              unsigned long base_hi,
-                                              int irq, int dma,
-                                              struct device *dev);
-extern void parport_pc_unregister_port (struct parport *p);
+extern struct parport *parport_pc_probe_port(unsigned long base,
+                                             unsigned long base_hi,
+                                             int irq, int dma,
+                                             struct device *dev,
+                                             int irqflags);
+extern void parport_pc_unregister_port(struct parport *p);
 
 #endif
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 042c166f65d5..092e82e0048c 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -10,72 +10,25 @@
 
 #include <linux/acpi.h>
 
-#define OSC_QUERY_TYPE                  0
-#define OSC_SUPPORT_TYPE                1
-#define OSC_CONTROL_TYPE                2
-#define OSC_SUPPORT_MASKS               0x1f
-
-/*
- * _OSC DW0 Definition 
- */
-#define OSC_QUERY_ENABLE                1
-#define OSC_REQUEST_ERROR               2
-#define OSC_INVALID_UUID_ERROR          4
-#define OSC_INVALID_REVISION_ERROR      8
-#define OSC_CAPABILITIES_MASK_ERROR     16
-
-/*
- * _OSC DW1 Definition (OS Support Fields)
- */
-#define OSC_EXT_PCI_CONFIG_SUPPORT              1
-#define OSC_ACTIVE_STATE_PWR_SUPPORT            2
-#define OSC_CLOCK_PWR_CAPABILITY_SUPPORT        4
-#define OSC_PCI_SEGMENT_GROUPS_SUPPORT          8
-#define OSC_MSI_SUPPORT                         16
-
-/*
- * _OSC DW1 Definition (OS Control Fields)
- */
-#define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL       1
-#define OSC_SHPC_NATIVE_HP_CONTROL              2
-#define OSC_PCI_EXPRESS_PME_CONTROL             4
-#define OSC_PCI_EXPRESS_AER_CONTROL             8
-#define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL   16
-
-#define OSC_CONTROL_MASKS       (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |    \
-                                OSC_SHPC_NATIVE_HP_CONTROL |            \
-                                OSC_PCI_EXPRESS_PME_CONTROL |           \
-                                OSC_PCI_EXPRESS_AER_CONTROL |           \
-                                OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
-
 #ifdef CONFIG_ACPI
-extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
-int pci_acpi_osc_support(acpi_handle handle, u32 flags);
 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 {
-        /* Find root host bridge */
-        while (pdev->bus->self)
-                pdev = pdev->bus->self;
-
-        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus),
-                        pdev->bus->number);
+        struct pci_bus *pbus = pdev->bus;
+        /* Find a PCI root bus */
+        while (pbus->parent)
+                pbus = pbus->parent;
+        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
+                                              pbus->number);
 }
 
 static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
 {
-        int seg = pci_domain_nr(pbus), busnr = pbus->number;
-        struct pci_dev *bridge = pbus->self;
-        if (bridge)
-                return DEVICE_ACPI_HANDLE(&(bridge->dev));
-        return acpi_get_pci_rootbridge_handle(seg, busnr);
+        if (pbus->parent)
+                return DEVICE_ACPI_HANDLE(&(pbus->self->dev));
+        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
+                                              pbus->number);
 }
 #else
-#if !defined(AE_ERROR)
-typedef u32             acpi_status;
-#define AE_ERROR        (acpi_status) (0x0001)
-#endif    
-static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
-{return AE_ERROR;}
 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 { return NULL; }
 #endif
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7bd624bfdcfd..72698d89e767 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -52,6 +52,7 @@
 #include <asm/atomic.h>
 #include <linux/device.h>
 #include <linux/io.h>
+#include <linux/irqreturn.h>
 
 /* Include the ID list */
 #include <linux/pci_ids.h>
@@ -93,6 +94,12 @@ enum {
         /* #6: expansion ROM resource */
         PCI_ROM_RESOURCE,
 
+        /* device specific resources */
+#ifdef CONFIG_PCI_IOV
+        PCI_IOV_RESOURCES,
+        PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,
+#endif
+
         /* resources assigned to buses behind the bridge */
 #define PCI_BRIDGE_RESOURCE_NUM 4
 
@@ -180,6 +187,7 @@ struct pci_cap_saved_state {
 
 struct pcie_link_state;
 struct pci_vpd;
+struct pci_sriov;
 
 /*
  * The pci_dev structure is used to describe PCI devices.
@@ -257,6 +265,8 @@ struct pci_dev {
         unsigned int    is_managed:1;
         unsigned int    is_pcie:1;
         unsigned int    state_saved:1;
+        unsigned int    is_physfn:1;
+        unsigned int    is_virtfn:1;
         pci_dev_flags_t dev_flags;
         atomic_t        enable_cnt;     /* pci_enable_device has been called */
 
@@ -270,6 +280,12 @@ struct pci_dev {
         struct list_head msi_list;
 #endif
         struct pci_vpd *vpd;
+#ifdef CONFIG_PCI_IOV
+        union {
+                struct pci_sriov *sriov;        /* SR-IOV capability related */
+                struct pci_dev *physfn; /* the PF this VF is associated with */
+        };
+#endif
 };
 
 extern struct pci_dev *alloc_pci_dev(void);
@@ -341,6 +357,15 @@ struct pci_bus {
 #define pci_bus_b(n)    list_entry(n, struct pci_bus, node)
 #define to_pci_bus(n)   container_of(n, struct pci_bus, dev)
 
+/*
+ * Returns true if the pci bus is root (behind host-pci bridge),
+ * false otherwise
+ */
+static inline bool pci_is_root_bus(struct pci_bus *pbus)
+{
+        return !(pbus->parent);
+}
+
 #ifdef CONFIG_PCI_MSI
 static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)
 {
@@ -528,7 +553,7 @@ void pcibios_update_irq(struct pci_dev *, int irq);
 /* Generic PCI functions used internally */
 
 extern struct pci_bus *pci_find_bus(int domain, int busnr);
-void pci_bus_add_devices(struct pci_bus *bus);
+void pci_bus_add_devices(const struct pci_bus *bus);
 struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
                                       struct pci_ops *ops, void *sysdata);
 static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,
@@ -649,6 +674,11 @@ int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
 
+static inline int pci_is_enabled(struct pci_dev *pdev)
+{
+        return (atomic_read(&pdev->enable_cnt) > 0);
+}
+
 static inline int pci_is_managed(struct pci_dev *pdev)
 {
         return pdev->is_managed;
@@ -689,6 +719,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size);
 /* Power management related routines */
 int pci_save_state(struct pci_dev *dev);
 int pci_restore_state(struct pci_dev *dev);
+int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state);
 int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
 pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
 bool pci_pme_capable(struct pci_dev *dev, pci_power_t state);
@@ -701,6 +732,9 @@ int pci_back_from_sleep(struct pci_dev *dev);
 
 /* Functions for PCI Hotplug drivers to use */
 int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
+#ifdef CONFIG_HOTPLUG
+unsigned int pci_rescan_bus(struct pci_bus *bus);
+#endif
 
 /* Vital product data routines */
 ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
@@ -708,7 +742,7 @@ ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void
 int pci_vpd_truncate(struct pci_dev *dev, size_t size);
 
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
-void pci_bus_assign_resources(struct pci_bus *bus);
+void pci_bus_assign_resources(const struct pci_bus *bus);
 void pci_bus_size_bridges(struct pci_bus *bus);
 int pci_claim_resource(struct pci_dev *, int);
 void pci_assign_unassigned_resources(void);
@@ -789,7 +823,7 @@ struct msix_entry {
 
 
 #ifndef CONFIG_PCI_MSI
-static inline int pci_enable_msi(struct pci_dev *dev)
+static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
 {
         return -1;
 }
@@ -799,6 +833,10 @@ static inline void pci_msi_shutdown(struct pci_dev *dev)
 static inline void pci_disable_msi(struct pci_dev *dev)
 { }
 
+static inline int pci_msix_table_size(struct pci_dev *dev)
+{
+        return 0;
+}
 static inline int pci_enable_msix(struct pci_dev *dev,
                                   struct msix_entry *entries, int nvec)
 {
@@ -820,9 +858,10 @@ static inline int pci_msi_enabled(void)
         return 0;
 }
 #else
-extern int pci_enable_msi(struct pci_dev *dev);
+extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
 extern void pci_msi_shutdown(struct pci_dev *dev);
 extern void pci_disable_msi(struct pci_dev *dev);
+extern int pci_msix_table_size(struct pci_dev *dev);
 extern int pci_enable_msix(struct pci_dev *dev,
         struct msix_entry *entries, int nvec);
 extern void pci_msix_shutdown(struct pci_dev *dev);
@@ -841,6 +880,8 @@ static inline int pcie_aspm_enabled(void)
 extern int pcie_aspm_enabled(void);
 #endif
 
+#define pci_enable_msi(pdev)    pci_enable_msi_block(pdev, 1)
+
 #ifdef CONFIG_HT_IRQ
 /* The functions a driver should call */
 int  ht_create_irq(struct pci_dev *dev, int idx);
@@ -1194,5 +1235,23 @@ int pci_ext_cfg_avail(struct pci_dev *dev);
 
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 
+#ifdef CONFIG_PCI_IOV
+extern int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
+extern void pci_disable_sriov(struct pci_dev *dev);
+extern irqreturn_t pci_sriov_migration(struct pci_dev *dev);
+#else
+static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
+{
+        return -ENODEV;
+}
+static inline void pci_disable_sriov(struct pci_dev *dev)
+{
+}
+static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev)
+{
+        return IRQ_NONE;
+}
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index aca8c458aa8a..06ba90c211a5 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -526,6 +526,7 @@
 #define PCI_DEVICE_ID_AMD_OPUS_7443     0x7443
 #define PCI_DEVICE_ID_AMD_VIPER_7443    0x7443
 #define PCI_DEVICE_ID_AMD_OPUS_7445     0x7445
+#define PCI_DEVICE_ID_AMD_8111_PCI      0x7460
 #define PCI_DEVICE_ID_AMD_8111_LPC      0x7468
 #define PCI_DEVICE_ID_AMD_8111_IDE      0x7469
 #define PCI_DEVICE_ID_AMD_8111_SMBUS2   0x746a
@@ -834,6 +835,8 @@
 #define PCI_DEVICE_ID_PROMISE_20276     0x5275
 #define PCI_DEVICE_ID_PROMISE_20277     0x7275
 
+#define PCI_VENDOR_ID_FOXCONN           0x105b
+
 #define PCI_VENDOR_ID_UMC               0x1060
 #define PCI_DEVICE_ID_UMC_UM8673F       0x0101
 #define PCI_DEVICE_ID_UMC_UM8886BF      0x673a
@@ -941,6 +944,32 @@
 #define PCI_DEVICE_ID_SUN_TOMATILLO     0xa801
 #define PCI_DEVICE_ID_SUN_CASSINI       0xabba
 
+#define PCI_VENDOR_ID_NI                0x1093
+#define PCI_DEVICE_ID_NI_PCI2322        0xd130
+#define PCI_DEVICE_ID_NI_PCI2324        0xd140
+#define PCI_DEVICE_ID_NI_PCI2328        0xd150
+#define PCI_DEVICE_ID_NI_PXI8422_2322   0xd190
+#define PCI_DEVICE_ID_NI_PXI8422_2324   0xd1a0
+#define PCI_DEVICE_ID_NI_PXI8420_2322   0xd1d0
+#define PCI_DEVICE_ID_NI_PXI8420_2324   0xd1e0
+#define PCI_DEVICE_ID_NI_PXI8420_2328   0xd1f0
+#define PCI_DEVICE_ID_NI_PXI8420_23216  0xd1f1
+#define PCI_DEVICE_ID_NI_PCI2322I       0xd250
+#define PCI_DEVICE_ID_NI_PCI2324I       0xd270
+#define PCI_DEVICE_ID_NI_PCI23216       0xd2b0
+#define PCI_DEVICE_ID_NI_PXI8430_2322   0x7080
+#define PCI_DEVICE_ID_NI_PCI8430_2322   0x70db
+#define PCI_DEVICE_ID_NI_PXI8430_2324   0x70dd
+#define PCI_DEVICE_ID_NI_PCI8430_2324   0x70df
+#define PCI_DEVICE_ID_NI_PXI8430_2328   0x70e2
+#define PCI_DEVICE_ID_NI_PCI8430_2328   0x70e4
+#define PCI_DEVICE_ID_NI_PXI8430_23216  0x70e6
+#define PCI_DEVICE_ID_NI_PCI8430_23216  0x70e7
+#define PCI_DEVICE_ID_NI_PXI8432_2322   0x70e8
+#define PCI_DEVICE_ID_NI_PCI8432_2322   0x70ea
+#define PCI_DEVICE_ID_NI_PXI8432_2324   0x70ec
+#define PCI_DEVICE_ID_NI_PCI8432_2324   0x70ee
+
 #define PCI_VENDOR_ID_CMD               0x1095
 #define PCI_DEVICE_ID_CMD_643           0x0643
 #define PCI_DEVICE_ID_CMD_646           0x0646
@@ -1235,6 +1264,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NVENET_21              0x0451
 #define PCI_DEVICE_ID_NVIDIA_NVENET_22              0x0452
 #define PCI_DEVICE_ID_NVIDIA_NVENET_23              0x0453
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_SMBUS     0x0542
 #define PCI_DEVICE_ID_NVIDIA_NVENET_24              0x054C
 #define PCI_DEVICE_ID_NVIDIA_NVENET_25              0x054D
 #define PCI_DEVICE_ID_NVIDIA_NVENET_26              0x054E
@@ -1245,11 +1275,14 @@
 #define PCI_DEVICE_ID_NVIDIA_NVENET_31              0x07DF
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE       0x0560
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE       0x056C
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS    0x0752
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE       0x0759
 #define PCI_DEVICE_ID_NVIDIA_NVENET_32              0x0760
 #define PCI_DEVICE_ID_NVIDIA_NVENET_33              0x0761
 #define PCI_DEVICE_ID_NVIDIA_NVENET_34              0x0762
 #define PCI_DEVICE_ID_NVIDIA_NVENET_35              0x0763
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS     0x07D8
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS     0x0AA2
 #define PCI_DEVICE_ID_NVIDIA_NVENET_36              0x0AB0
 #define PCI_DEVICE_ID_NVIDIA_NVENET_37              0x0AB1
 #define PCI_DEVICE_ID_NVIDIA_NVENET_38              0x0AB2
@@ -1473,6 +1506,7 @@
 #define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
+#define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408
 
 #define PCI_VENDOR_ID_SBE               0x1176
 #define PCI_DEVICE_ID_SBE_WANXL100      0x0301
@@ -1971,6 +2005,8 @@
 
 #define PCI_VENDOR_ID_SAMSUNG           0x144d
 
+#define PCI_VENDOR_ID_AMBIT             0x1468
+
 #define PCI_VENDOR_ID_MYRICOM           0x14c1
 
 #define PCI_VENDOR_ID_TITAN             0x14D2
@@ -2112,6 +2148,8 @@
 #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c
 #define PCI_DEVICE_ID_MELLANOX_SINAI    0x6274
 
+#define PCI_VENDOR_ID_DFI               0x15bd
+
 #define PCI_VENDOR_ID_QUICKNET          0x15e2
 #define PCI_DEVICE_ID_QUICKNET_XJ       0x0500
 
@@ -2215,10 +2253,20 @@
 
 #define PCI_VENDOR_ID_TOPSPIN           0x1867
 
+#define PCI_VENDOR_ID_SILAN             0x1904
+
 #define PCI_VENDOR_ID_TDI               0x192E
 #define PCI_DEVICE_ID_TDI_EHCI          0x0101
 
 #define PCI_VENDOR_ID_FREESCALE         0x1957
+#define PCI_DEVICE_ID_MPC8315E          0x00b4
+#define PCI_DEVICE_ID_MPC8315           0x00b5
+#define PCI_DEVICE_ID_MPC8314E          0x00b6
+#define PCI_DEVICE_ID_MPC8314           0x00b7
+#define PCI_DEVICE_ID_MPC8378E          0x00c4
+#define PCI_DEVICE_ID_MPC8378           0x00c5
+#define PCI_DEVICE_ID_MPC8377E          0x00c6
+#define PCI_DEVICE_ID_MPC8377           0x00c7
 #define PCI_DEVICE_ID_MPC8548E          0x0012
 #define PCI_DEVICE_ID_MPC8548           0x0013
 #define PCI_DEVICE_ID_MPC8543E          0x0014
@@ -2263,6 +2311,8 @@
 #define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
 #define PCI_DEVICE_ID_KORENIX_JETCARDF1 0x16ff
 
+#define PCI_VENDOR_ID_QMI               0x1a32
+
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
 
@@ -2373,6 +2423,7 @@
 #define PCI_DEVICE_ID_INTEL_82801CA_12  0x248c
 #define PCI_DEVICE_ID_INTEL_82801DB_0   0x24c0
 #define PCI_DEVICE_ID_INTEL_82801DB_1   0x24c1
+#define PCI_DEVICE_ID_INTEL_82801DB_2   0x24c2
 #define PCI_DEVICE_ID_INTEL_82801DB_3   0x24c3
 #define PCI_DEVICE_ID_INTEL_82801DB_5   0x24c5
 #define PCI_DEVICE_ID_INTEL_82801DB_6   0x24c6
@@ -2463,6 +2514,8 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3   0x3433
 #define PCI_DEVICE_ID_INTEL_82830_HB    0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC   0x3577
+#define PCI_DEVICE_ID_INTEL_82854_HB    0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG    0x358e
 #define PCI_DEVICE_ID_INTEL_82855GM_HB  0x3580
 #define PCI_DEVICE_ID_INTEL_82855GM_IG  0x3582
 #define PCI_DEVICE_ID_INTEL_E7520_MCH   0x3590
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 027815b4635e..616bf8b3c8b5 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -235,7 +235,7 @@
 #define  PCI_PM_CAP_PME_SHIFT   11      /* Start of the PME Mask in PMC */
 #define PCI_PM_CTRL             4       /* PM control and status register */
 #define  PCI_PM_CTRL_STATE_MASK 0x0003  /* Current power state (D0 to D3) */
-#define  PCI_PM_CTRL_NO_SOFT_RESET      0x0004  /* No reset for D3hot->D0 */
+#define  PCI_PM_CTRL_NO_SOFT_RESET      0x0008  /* No reset for D3hot->D0 */
 #define  PCI_PM_CTRL_PME_ENABLE 0x0100  /* PME pin enable */
 #define  PCI_PM_CTRL_DATA_SEL_MASK      0x1e00  /* Data select (??) */
 #define  PCI_PM_CTRL_DATA_SCALE_MASK    0x6000  /* Data scale (??) */
@@ -375,6 +375,8 @@
 #define  PCI_EXP_TYPE_UPSTREAM  0x5     /* Upstream Port */
 #define  PCI_EXP_TYPE_DOWNSTREAM 0x6    /* Downstream Port */
 #define  PCI_EXP_TYPE_PCI_BRIDGE 0x7    /* PCI/PCI-X Bridge */
+#define  PCI_EXP_TYPE_RC_END    0x9     /* Root Complex Integrated Endpoint */
+#define  PCI_EXP_TYPE_RC_EC     0x10    /* Root Complex Event Collector */
 #define PCI_EXP_FLAGS_SLOT      0x0100  /* Slot implemented */
 #define PCI_EXP_FLAGS_IRQ       0x3e00  /* Interrupt message number */
 #define PCI_EXP_DEVCAP          4       /* Device capabilities */
@@ -487,6 +489,8 @@
 #define  PCI_EXP_DEVCAP2_ARI    0x20    /* Alternative Routing-ID */
 #define PCI_EXP_DEVCTL2         40      /* Device Control 2 */
 #define  PCI_EXP_DEVCTL2_ARI    0x20    /* Alternative Routing-ID */
+#define PCI_EXP_LNKCTL2         48      /* Link Control 2 */
+#define PCI_EXP_SLTCTL2         56      /* Slot Control 2 */
 
 /* Extended Capabilities (PCI-X 2.0 and Express) */
 #define PCI_EXT_CAP_ID(header)          (header & 0x0000ffff)
@@ -498,6 +502,7 @@
 #define PCI_EXT_CAP_ID_DSN      3
 #define PCI_EXT_CAP_ID_PWR      4
 #define PCI_EXT_CAP_ID_ARI      14
+#define PCI_EXT_CAP_ID_SRIOV    16
 
 /* Advanced Error Reporting */
 #define PCI_ERR_UNCOR_STATUS    4       /* Uncorrectable Error Status */
@@ -615,4 +620,35 @@
 #define  PCI_ARI_CTRL_ACS       0x0002  /* ACS Function Groups Enable */
 #define  PCI_ARI_CTRL_FG(x)     (((x) >> 4) & 7) /* Function Group */
 
+/* Single Root I/O Virtualization */
+#define PCI_SRIOV_CAP           0x04    /* SR-IOV Capabilities */
+#define  PCI_SRIOV_CAP_VFM      0x01    /* VF Migration Capable */
+#define  PCI_SRIOV_CAP_INTR(x)  ((x) >> 21) /* Interrupt Message Number */
+#define PCI_SRIOV_CTRL          0x08    /* SR-IOV Control */
+#define  PCI_SRIOV_CTRL_VFE     0x01    /* VF Enable */
+#define  PCI_SRIOV_CTRL_VFM     0x02    /* VF Migration Enable */
+#define  PCI_SRIOV_CTRL_INTR    0x04    /* VF Migration Interrupt Enable */
+#define  PCI_SRIOV_CTRL_MSE     0x08    /* VF Memory Space Enable */
+#define  PCI_SRIOV_CTRL_ARI     0x10    /* ARI Capable Hierarchy */
+#define PCI_SRIOV_STATUS        0x0a    /* SR-IOV Status */
+#define  PCI_SRIOV_STATUS_VFM   0x01    /* VF Migration Status */
+#define PCI_SRIOV_INITIAL_VF    0x0c    /* Initial VFs */
+#define PCI_SRIOV_TOTAL_VF      0x0e    /* Total VFs */
+#define PCI_SRIOV_NUM_VF        0x10    /* Number of VFs */
+#define PCI_SRIOV_FUNC_LINK     0x12    /* Function Dependency Link */
+#define PCI_SRIOV_VF_OFFSET     0x14    /* First VF Offset */
+#define PCI_SRIOV_VF_STRIDE     0x16    /* Following VF Stride */
+#define PCI_SRIOV_VF_DID        0x1a    /* VF Device ID */
+#define PCI_SRIOV_SUP_PGSIZE    0x1c    /* Supported Page Sizes */
+#define PCI_SRIOV_SYS_PGSIZE    0x20    /* System Page Size */
+#define PCI_SRIOV_BAR           0x24    /* VF BAR0 */
+#define  PCI_SRIOV_NUM_BARS     6       /* Number of VF BARs */
+#define PCI_SRIOV_VFM           0x3c    /* VF Migration State Array Offset*/
+#define  PCI_SRIOV_VFM_BIR(x)   ((x) & 7)       /* State BIR */
+#define  PCI_SRIOV_VFM_OFFSET(x) ((x) & ~7)     /* State Offset */
+#define  PCI_SRIOV_VFM_UA       0x0     /* Inactive.Unavailable */
+#define  PCI_SRIOV_VFM_MI       0x1     /* Dormant.MigrateIn */
+#define  PCI_SRIOV_VFM_MO       0x2     /* Active.MigrateOut */
+#define  PCI_SRIOV_VFM_AV       0x3     /* Active.Available */
+
 #endif /* LINUX_PCI_REGS_H */
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index 6cd91e3f9820..b4c79545330b 100644
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -16,29 +16,30 @@
 #define PCIE_ANY_PORT                   7
 
 /* Service Type */
-#define PCIE_PORT_SERVICE_PME           1       /* Power Management Event */
-#define PCIE_PORT_SERVICE_AER           2       /* Advanced Error Reporting */
-#define PCIE_PORT_SERVICE_HP            4       /* Native Hotplug */
-#define PCIE_PORT_SERVICE_VC            8       /* Virtual Channel */
+#define PCIE_PORT_SERVICE_PME_SHIFT     0       /* Power Management Event */
+#define PCIE_PORT_SERVICE_PME           (1 << PCIE_PORT_SERVICE_PME_SHIFT)
+#define PCIE_PORT_SERVICE_AER_SHIFT     1       /* Advanced Error Reporting */
+#define PCIE_PORT_SERVICE_AER           (1 << PCIE_PORT_SERVICE_AER_SHIFT)
+#define PCIE_PORT_SERVICE_HP_SHIFT      2       /* Native Hotplug */
+#define PCIE_PORT_SERVICE_HP            (1 << PCIE_PORT_SERVICE_HP_SHIFT)
+#define PCIE_PORT_SERVICE_VC_SHIFT      3       /* Virtual Channel */
+#define PCIE_PORT_SERVICE_VC            (1 << PCIE_PORT_SERVICE_VC_SHIFT)
 
 /* Root/Upstream/Downstream Port's Interrupt Mode */
+#define PCIE_PORT_NO_IRQ                (-1)
 #define PCIE_PORT_INTx_MODE             0
 #define PCIE_PORT_MSI_MODE              1
 #define PCIE_PORT_MSIX_MODE             2
 
-struct pcie_port_service_id {
-        __u32 vendor, device;           /* Vendor and device ID or PCI_ANY_ID*/
-        __u32 subvendor, subdevice;     /* Subsystem ID's or PCI_ANY_ID */
-        __u32 class, class_mask;        /* (class,subclass,prog-if) triplet */
-        __u32 port_type, service_type;  /* Port Entity */
-        kernel_ulong_t driver_data;
+struct pcie_port_data {
+        int port_type;          /* Type of the port */
+        int port_irq_mode;      /* [0:INTx | 1:MSI | 2:MSI-X] */
 };
 
 struct pcie_device {
         int             irq;        /* Service IRQ/MSI/MSI-X Vector */
-        int             interrupt_mode; /* [0:INTx | 1:MSI | 2:MSI-X] */        
-        struct pcie_port_service_id id; /* Service ID */
-        struct pci_dev  *port;      /* Root/Upstream/Downstream Port */
+        struct pci_dev *port;       /* Root/Upstream/Downstream Port */
+        u32             service;    /* Port service this device represents */
         void            *priv_data; /* Service Private Data */
         struct device   device;     /* Generic Device Interface */
 };
@@ -56,10 +57,9 @@ static inline void* get_service_data(struct pcie_device *dev)
 
 struct pcie_port_service_driver {
         const char *name;
-        int (*probe) (struct pcie_device *dev, 
-                const struct pcie_port_service_id *id);
+        int (*probe) (struct pcie_device *dev);
         void (*remove) (struct pcie_device *dev);
-        int (*suspend) (struct pcie_device *dev, pm_message_t state);
+        int (*suspend) (struct pcie_device *dev);
         int (*resume) (struct pcie_device *dev);
 
         /* Service Error Recovery Handler */
@@ -68,7 +68,9 @@ struct pcie_port_service_driver {
         /* Link Reset Capability - AER service driver specific */
         pci_ers_result_t (*reset_link) (struct pci_dev *dev);
 
-        const struct pcie_port_service_id *id_table;
+        int port_type;  /* Type of the port this driver can handle */
+        u32 service;    /* Port service this device represents */
+
         struct device_driver driver;
 };
 #define to_service_driver(d) \
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index cb7d10f30763..d4cf7a2ceb3e 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -31,6 +31,8 @@ struct pda_power_pdata {
         unsigned int wait_for_status; /* msecs, default is 500 */
         unsigned int wait_for_charger; /* msecs, default is 500 */
         unsigned int polling_interval; /* msecs, default is 2000 */
+
+        unsigned long ac_max_uA; /* current to draw when on AC */
 };
 
 #endif /* __PDA_POWER_H__ */
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
new file mode 100644
index 000000000000..8f921d74f49f
--- /dev/null
+++ b/include/linux/percpu-defs.h
@@ -0,0 +1,84 @@
+#ifndef _LINUX_PERCPU_DEFS_H
+#define _LINUX_PERCPU_DEFS_H
+
+/*
+ * Determine the real variable name from the name visible in the
+ * kernel sources.
+ */
+#define per_cpu_var(var) per_cpu__##var
+
+/*
+ * Base implementations of per-CPU variable declarations and definitions, where
+ * the section in which the variable is to be placed is provided by the
+ * 'section' argument.  This may be used to affect the parameters governing the
+ * variable's storage.
+ *
+ * NOTE!  The sections for the DECLARE and for the DEFINE must match, lest
+ * linkage errors occur due the compiler generating the wrong code to access
+ * that section.
+ */
+#define DECLARE_PER_CPU_SECTION(type, name, section)                    \
+        extern                                                          \
+        __attribute__((__section__(PER_CPU_BASE_SECTION section)))      \
+        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
+
+#define DEFINE_PER_CPU_SECTION(type, name, section)                     \
+        __attribute__((__section__(PER_CPU_BASE_SECTION section)))      \
+        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
+
+/*
+ * Variant on the per-CPU variable declaration/definition theme used for
+ * ordinary per-CPU variables.
+ */
+#define DECLARE_PER_CPU(type, name)                                     \
+        DECLARE_PER_CPU_SECTION(type, name, "")
+
+#define DEFINE_PER_CPU(type, name)                                      \
+        DEFINE_PER_CPU_SECTION(type, name, "")
+
+/*
+ * Declaration/definition used for per-CPU variables that must come first in
+ * the set of variables.
+ */
+#define DECLARE_PER_CPU_FIRST(type, name)                               \
+        DECLARE_PER_CPU_SECTION(type, name, PER_CPU_FIRST_SECTION)
+
+#define DEFINE_PER_CPU_FIRST(type, name)                                \
+        DEFINE_PER_CPU_SECTION(type, name, PER_CPU_FIRST_SECTION)
+
+/*
+ * Declaration/definition used for per-CPU variables that must be cacheline
+ * aligned under SMP conditions so that, whilst a particular instance of the
+ * data corresponds to a particular CPU, inefficiencies due to direct access by
+ * other CPUs are reduced by preventing the data from unnecessarily spanning
+ * cachelines.
+ *
+ * An example of this would be statistical data, where each CPU's set of data
+ * is updated by that CPU alone, but the data from across all CPUs is collated
+ * by a CPU processing a read from a proc file.
+ */
+#define DECLARE_PER_CPU_SHARED_ALIGNED(type, name)                      \
+        DECLARE_PER_CPU_SECTION(type, name, PER_CPU_SHARED_ALIGNED_SECTION) \
+        ____cacheline_aligned_in_smp
+
+#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)                       \
+        DEFINE_PER_CPU_SECTION(type, name, PER_CPU_SHARED_ALIGNED_SECTION) \
+        ____cacheline_aligned_in_smp
+
+/*
+ * Declaration/definition used for per-CPU variables that must be page aligned.
+ */
+#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name)                                \
+        DECLARE_PER_CPU_SECTION(type, name, ".page_aligned")
+
+#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)                         \
+        DEFINE_PER_CPU_SECTION(type, name, ".page_aligned")
+
+/*
+ * Intermodule exports for per-CPU variables.
+ */
+#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)
+#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
+
+
+#endif /* _LINUX_PERCPU_DEFS_H */
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 9f2a3751873a..1581ff235c7e 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -5,53 +5,22 @@
 #include <linux/slab.h> /* For kmalloc() */
 #include <linux/smp.h>
 #include <linux/cpumask.h>
+#include <linux/pfn.h>
 
 #include <asm/percpu.h>
 
-#ifdef CONFIG_SMP
-#define DEFINE_PER_CPU(type, name)                                      \
-        __attribute__((__section__(".data.percpu")))                    \
-        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
-
-#ifdef MODULE
-#define SHARED_ALIGNED_SECTION ".data.percpu"
-#else
-#define SHARED_ALIGNED_SECTION ".data.percpu.shared_aligned"
-#endif
-
-#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)                       \
-        __attribute__((__section__(SHARED_ALIGNED_SECTION)))            \
-        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name             \
-        ____cacheline_aligned_in_smp
-
-#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)                 \
-        __attribute__((__section__(".data.percpu.page_aligned")))       \
-        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
-#else
-#define DEFINE_PER_CPU(type, name)                                      \
-        PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
-
-#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)                     \
-        DEFINE_PER_CPU(type, name)
-
-#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)               \
-        DEFINE_PER_CPU(type, name)
-#endif
-
-#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)
-#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
-
-/* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
-#ifndef PERCPU_ENOUGH_ROOM
+/* enough to cover all DEFINE_PER_CPUs in modules */
 #ifdef CONFIG_MODULES
-#define PERCPU_MODULE_RESERVE   8192
+#define PERCPU_MODULE_RESERVE           (8 << 10)
 #else
-#define PERCPU_MODULE_RESERVE   0
+#define PERCPU_MODULE_RESERVE           0
 #endif
 
+#ifndef PERCPU_ENOUGH_ROOM
 #define PERCPU_ENOUGH_ROOM                                              \
-        (__per_cpu_end - __per_cpu_start + PERCPU_MODULE_RESERVE)
-#endif  /* PERCPU_ENOUGH_ROOM */
+        (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) +      \
+         PERCPU_MODULE_RESERVE)
+#endif
 
 /*
  * Must be an lvalue. Since @var must be a simple identifier,
@@ -65,52 +34,146 @@
 
 #ifdef CONFIG_SMP
 
+#ifdef CONFIG_HAVE_DYNAMIC_PER_CPU_AREA
+
+/* minimum unit size, also is the maximum supported allocation size */
+#define PCPU_MIN_UNIT_SIZE              PFN_ALIGN(64 << 10)
+
+/*
+ * PERCPU_DYNAMIC_RESERVE indicates the amount of free area to piggy
+ * back on the first chunk for dynamic percpu allocation if arch is
+ * manually allocating and mapping it for faster access (as a part of
+ * large page mapping for example).
+ *
+ * The following values give between one and two pages of free space
+ * after typical minimal boot (2-way SMP, single disk and NIC) with
+ * both defconfig and a distro config on x86_64 and 32.  More
+ * intelligent way to determine this would be nice.
+ */
+#if BITS_PER_LONG > 32
+#define PERCPU_DYNAMIC_RESERVE          (20 << 10)
+#else
+#define PERCPU_DYNAMIC_RESERVE          (12 << 10)
+#endif
+
+extern void *pcpu_base_addr;
+
+typedef struct page * (*pcpu_get_page_fn_t)(unsigned int cpu, int pageno);
+typedef void (*pcpu_populate_pte_fn_t)(unsigned long addr);
+
+extern size_t __init pcpu_setup_first_chunk(pcpu_get_page_fn_t get_page_fn,
+                                size_t static_size, size_t reserved_size,
+                                ssize_t dyn_size, ssize_t unit_size,
+                                void *base_addr,
+                                pcpu_populate_pte_fn_t populate_pte_fn);
+
+extern ssize_t __init pcpu_embed_first_chunk(
+                                size_t static_size, size_t reserved_size,
+                                ssize_t dyn_size, ssize_t unit_size);
+
+/*
+ * Use this to get to a cpu's version of the per-cpu object
+ * dynamically allocated. Non-atomic access to the current CPU's
+ * version should probably be combined with get_cpu()/put_cpu().
+ */
+#define per_cpu_ptr(ptr, cpu)   SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))
+
+extern void *__alloc_reserved_percpu(size_t size, size_t align);
+
+#else /* CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */
+
 struct percpu_data {
         void *ptrs[1];
 };
 
 #define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)
-/* 
- * Use this to get to a cpu's version of the per-cpu object dynamically
- * allocated. Non-atomic access to the current CPU's version should
- * probably be combined with get_cpu()/put_cpu().
- */ 
-#define percpu_ptr(ptr, cpu)                              \
-({                                                        \
-        struct percpu_data *__p = __percpu_disguise(ptr); \
-        (__typeof__(ptr))__p->ptrs[(cpu)];                \
+
+#define per_cpu_ptr(ptr, cpu)                                           \
+({                                                                      \
+        struct percpu_data *__p = __percpu_disguise(ptr);               \
+        (__typeof__(ptr))__p->ptrs[(cpu)];                              \
 })
 
-extern void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask);
-extern void percpu_free(void *__pdata);
+#endif /* CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */
+
+extern void *__alloc_percpu(size_t size, size_t align);
+extern void free_percpu(void *__pdata);
 
 #else /* CONFIG_SMP */
 
-#define percpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
+#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
 
-static __always_inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
+static inline void *__alloc_percpu(size_t size, size_t align)
 {
-        return kzalloc(size, gfp);
+        /*
+         * Can't easily make larger alignment work with kmalloc.  WARN
+         * on it.  Larger alignment should only be used for module
+         * percpu sections on SMP for which this path isn't used.
+         */
+        WARN_ON_ONCE(align > SMP_CACHE_BYTES);
+        return kzalloc(size, GFP_KERNEL);
 }
 
-static inline void percpu_free(void *__pdata)
+static inline void free_percpu(void *p)
 {
-        kfree(__pdata);
+        kfree(p);
 }
 
 #endif /* CONFIG_SMP */
 
-#define percpu_alloc_mask(size, gfp, mask) \
-        __percpu_alloc_mask((size), (gfp), &(mask))
+#define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type), \
+                                                       __alignof__(type))
 
-#define percpu_alloc(size, gfp) percpu_alloc_mask((size), (gfp), cpu_online_map)
+/*
+ * Optional methods for optimized non-lvalue per-cpu variable access.
+ *
+ * @var can be a percpu variable or a field of it and its size should
+ * equal char, int or long.  percpu_read() evaluates to a lvalue and
+ * all others to void.
+ *
+ * These operations are guaranteed to be atomic w.r.t. preemption.
+ * The generic versions use plain get/put_cpu_var().  Archs are
+ * encouraged to implement single-instruction alternatives which don't
+ * require preemption protection.
+ */
+#ifndef percpu_read
+# define percpu_read(var)                                               \
+  ({                                                                    \
+        typeof(per_cpu_var(var)) __tmp_var__;                           \
+        __tmp_var__ = get_cpu_var(var);                                 \
+        put_cpu_var(var);                                               \
+        __tmp_var__;                                                    \
+  })
+#endif
 
-/* (legacy) interface for use without CPU hotplug handling */
+#define __percpu_generic_to_op(var, val, op)                            \
+do {                                                                    \
+        get_cpu_var(var) op val;                                        \
+        put_cpu_var(var);                                               \
+} while (0)
 
-#define __alloc_percpu(size)    percpu_alloc_mask((size), GFP_KERNEL, \
-                                                  cpu_possible_map)
-#define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type))
-#define free_percpu(ptr)        percpu_free((ptr))
-#define per_cpu_ptr(ptr, cpu)   percpu_ptr((ptr), (cpu))
+#ifndef percpu_write
+# define percpu_write(var, val)         __percpu_generic_to_op(var, (val), =)
+#endif
+
+#ifndef percpu_add
+# define percpu_add(var, val)           __percpu_generic_to_op(var, (val), +=)
+#endif
+
+#ifndef percpu_sub
+# define percpu_sub(var, val)           __percpu_generic_to_op(var, (val), -=)
+#endif
+
+#ifndef percpu_and
+# define percpu_and(var, val)           __percpu_generic_to_op(var, (val), &=)
+#endif
+
+#ifndef percpu_or
+# define percpu_or(var, val)            __percpu_generic_to_op(var, (val), |=)
+#endif
+
+#ifndef percpu_xor
+# define percpu_xor(var, val)           __percpu_generic_to_op(var, (val), ^=)
+#endif
 
 #endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index 01b262959f2e..228b0b6306b0 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -12,187 +12,187 @@
 #define PFKEYV2_REVISION        199806L
 
 struct sadb_msg {
-        uint8_t         sadb_msg_version;
-        uint8_t         sadb_msg_type;
-        uint8_t         sadb_msg_errno;
-        uint8_t         sadb_msg_satype;
-        uint16_t        sadb_msg_len;
-        uint16_t        sadb_msg_reserved;
-        uint32_t        sadb_msg_seq;
-        uint32_t        sadb_msg_pid;
+        __u8            sadb_msg_version;
+        __u8            sadb_msg_type;
+        __u8            sadb_msg_errno;
+        __u8            sadb_msg_satype;
+        __u16   sadb_msg_len;
+        __u16   sadb_msg_reserved;
+        __u32   sadb_msg_seq;
+        __u32   sadb_msg_pid;
 } __attribute__((packed));
 /* sizeof(struct sadb_msg) == 16 */
 
 struct sadb_ext {
-        uint16_t        sadb_ext_len;
-        uint16_t        sadb_ext_type;
+        __u16   sadb_ext_len;
+        __u16   sadb_ext_type;
 } __attribute__((packed));
 /* sizeof(struct sadb_ext) == 4 */
 
 struct sadb_sa {
-        uint16_t        sadb_sa_len;
-        uint16_t        sadb_sa_exttype;
+        __u16   sadb_sa_len;
+        __u16   sadb_sa_exttype;
         __be32          sadb_sa_spi;
-        uint8_t         sadb_sa_replay;
-        uint8_t         sadb_sa_state;
-        uint8_t         sadb_sa_auth;
-        uint8_t         sadb_sa_encrypt;
-        uint32_t        sadb_sa_flags;
+        __u8            sadb_sa_replay;
+        __u8            sadb_sa_state;
+        __u8            sadb_sa_auth;
+        __u8            sadb_sa_encrypt;
+        __u32   sadb_sa_flags;
 } __attribute__((packed));
 /* sizeof(struct sadb_sa) == 16 */
 
 struct sadb_lifetime {
-        uint16_t        sadb_lifetime_len;
-        uint16_t        sadb_lifetime_exttype;
-        uint32_t        sadb_lifetime_allocations;
-        uint64_t        sadb_lifetime_bytes;
-        uint64_t        sadb_lifetime_addtime;
-        uint64_t        sadb_lifetime_usetime;
+        __u16   sadb_lifetime_len;
+        __u16   sadb_lifetime_exttype;
+        __u32   sadb_lifetime_allocations;
+        __u64   sadb_lifetime_bytes;
+        __u64   sadb_lifetime_addtime;
+        __u64   sadb_lifetime_usetime;
 } __attribute__((packed));
 /* sizeof(struct sadb_lifetime) == 32 */
 
 struct sadb_address {
-        uint16_t        sadb_address_len;
-        uint16_t        sadb_address_exttype;
-        uint8_t         sadb_address_proto;
-        uint8_t         sadb_address_prefixlen;
-        uint16_t        sadb_address_reserved;
+        __u16   sadb_address_len;
+        __u16   sadb_address_exttype;
+        __u8            sadb_address_proto;
+        __u8            sadb_address_prefixlen;
+        __u16   sadb_address_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_address) == 8 */
 
 struct sadb_key {
-        uint16_t        sadb_key_len;
-        uint16_t        sadb_key_exttype;
-        uint16_t        sadb_key_bits;
-        uint16_t        sadb_key_reserved;
+        __u16   sadb_key_len;
+        __u16   sadb_key_exttype;
+        __u16   sadb_key_bits;
+        __u16   sadb_key_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_key) == 8 */
 
 struct sadb_ident {
-        uint16_t        sadb_ident_len;
-        uint16_t        sadb_ident_exttype;
-        uint16_t        sadb_ident_type;
-        uint16_t        sadb_ident_reserved;
-        uint64_t        sadb_ident_id;
+        __u16   sadb_ident_len;
+        __u16   sadb_ident_exttype;
+        __u16   sadb_ident_type;
+        __u16   sadb_ident_reserved;
+        __u64   sadb_ident_id;
 } __attribute__((packed));
 /* sizeof(struct sadb_ident) == 16 */
 
 struct sadb_sens {
-        uint16_t        sadb_sens_len;
-        uint16_t        sadb_sens_exttype;
-        uint32_t        sadb_sens_dpd;
-        uint8_t         sadb_sens_sens_level;
-        uint8_t         sadb_sens_sens_len;
-        uint8_t         sadb_sens_integ_level;
-        uint8_t         sadb_sens_integ_len;
-        uint32_t        sadb_sens_reserved;
+        __u16   sadb_sens_len;
+        __u16   sadb_sens_exttype;
+        __u32   sadb_sens_dpd;
+        __u8            sadb_sens_sens_level;
+        __u8            sadb_sens_sens_len;
+        __u8            sadb_sens_integ_level;
+        __u8            sadb_sens_integ_len;
+        __u32   sadb_sens_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_sens) == 16 */
 
 /* followed by:
-        uint64_t        sadb_sens_bitmap[sens_len];
-        uint64_t        sadb_integ_bitmap[integ_len];  */
+        __u64   sadb_sens_bitmap[sens_len];
+        __u64   sadb_integ_bitmap[integ_len];  */
 
 struct sadb_prop {
-        uint16_t        sadb_prop_len;
-        uint16_t        sadb_prop_exttype;
-        uint8_t         sadb_prop_replay;
-        uint8_t         sadb_prop_reserved[3];
+        __u16   sadb_prop_len;
+        __u16   sadb_prop_exttype;
+        __u8            sadb_prop_replay;
+        __u8            sadb_prop_reserved[3];
 } __attribute__((packed));
 /* sizeof(struct sadb_prop) == 8 */
 
 /* followed by:
         struct sadb_comb sadb_combs[(sadb_prop_len +
-                sizeof(uint64_t) - sizeof(struct sadb_prop)) /
+                sizeof(__u64) - sizeof(struct sadb_prop)) /
                 sizeof(struct sadb_comb)]; */
 
 struct sadb_comb {
-        uint8_t         sadb_comb_auth;
-        uint8_t         sadb_comb_encrypt;
-        uint16_t        sadb_comb_flags;
-        uint16_t        sadb_comb_auth_minbits;
-        uint16_t        sadb_comb_auth_maxbits;
-        uint16_t        sadb_comb_encrypt_minbits;
-        uint16_t        sadb_comb_encrypt_maxbits;
-        uint32_t        sadb_comb_reserved;
-        uint32_t        sadb_comb_soft_allocations;
-        uint32_t        sadb_comb_hard_allocations;
-        uint64_t        sadb_comb_soft_bytes;
-        uint64_t        sadb_comb_hard_bytes;
-        uint64_t        sadb_comb_soft_addtime;
-        uint64_t        sadb_comb_hard_addtime;
-        uint64_t        sadb_comb_soft_usetime;
-        uint64_t        sadb_comb_hard_usetime;
+        __u8            sadb_comb_auth;
+        __u8            sadb_comb_encrypt;
+        __u16   sadb_comb_flags;
+        __u16   sadb_comb_auth_minbits;
+        __u16   sadb_comb_auth_maxbits;
+        __u16   sadb_comb_encrypt_minbits;
+        __u16   sadb_comb_encrypt_maxbits;
+        __u32   sadb_comb_reserved;
+        __u32   sadb_comb_soft_allocations;
+        __u32   sadb_comb_hard_allocations;
+        __u64   sadb_comb_soft_bytes;
+        __u64   sadb_comb_hard_bytes;
+        __u64   sadb_comb_soft_addtime;
+        __u64   sadb_comb_hard_addtime;
+        __u64   sadb_comb_soft_usetime;
+        __u64   sadb_comb_hard_usetime;
 } __attribute__((packed));
 /* sizeof(struct sadb_comb) == 72 */
 
 struct sadb_supported {
-        uint16_t        sadb_supported_len;
-        uint16_t        sadb_supported_exttype;
-        uint32_t        sadb_supported_reserved;
+        __u16   sadb_supported_len;
+        __u16   sadb_supported_exttype;
+        __u32   sadb_supported_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_supported) == 8 */
 
 /* followed by:
         struct sadb_alg sadb_algs[(sadb_supported_len +
-                sizeof(uint64_t) - sizeof(struct sadb_supported)) /
+                sizeof(__u64) - sizeof(struct sadb_supported)) /
                 sizeof(struct sadb_alg)]; */
 
 struct sadb_alg {
-        uint8_t         sadb_alg_id;
-        uint8_t         sadb_alg_ivlen;
-        uint16_t        sadb_alg_minbits;
-        uint16_t        sadb_alg_maxbits;
-        uint16_t        sadb_alg_reserved;
+        __u8            sadb_alg_id;
+        __u8            sadb_alg_ivlen;
+        __u16   sadb_alg_minbits;
+        __u16   sadb_alg_maxbits;
+        __u16   sadb_alg_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_alg) == 8 */
 
 struct sadb_spirange {
-        uint16_t        sadb_spirange_len;
-        uint16_t        sadb_spirange_exttype;
-        uint32_t        sadb_spirange_min;
-        uint32_t        sadb_spirange_max;
-        uint32_t        sadb_spirange_reserved;
+        __u16   sadb_spirange_len;
+        __u16   sadb_spirange_exttype;
+        __u32   sadb_spirange_min;
+        __u32   sadb_spirange_max;
+        __u32   sadb_spirange_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_spirange) == 16 */
 
 struct sadb_x_kmprivate {
-        uint16_t        sadb_x_kmprivate_len;
-        uint16_t        sadb_x_kmprivate_exttype;
-        uint32_t        sadb_x_kmprivate_reserved;
+        __u16   sadb_x_kmprivate_len;
+        __u16   sadb_x_kmprivate_exttype;
+        __u32   sadb_x_kmprivate_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_kmprivate) == 8 */
 
 struct sadb_x_sa2 {
-        uint16_t        sadb_x_sa2_len;
-        uint16_t        sadb_x_sa2_exttype;
-        uint8_t         sadb_x_sa2_mode;
-        uint8_t         sadb_x_sa2_reserved1;
-        uint16_t        sadb_x_sa2_reserved2;
-        uint32_t        sadb_x_sa2_sequence;
-        uint32_t        sadb_x_sa2_reqid;
+        __u16   sadb_x_sa2_len;
+        __u16   sadb_x_sa2_exttype;
+        __u8            sadb_x_sa2_mode;
+        __u8            sadb_x_sa2_reserved1;
+        __u16   sadb_x_sa2_reserved2;
+        __u32   sadb_x_sa2_sequence;
+        __u32   sadb_x_sa2_reqid;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_sa2) == 16 */
 
 struct sadb_x_policy {
-        uint16_t        sadb_x_policy_len;
-        uint16_t        sadb_x_policy_exttype;
-        uint16_t        sadb_x_policy_type;
-        uint8_t         sadb_x_policy_dir;
-        uint8_t         sadb_x_policy_reserved;
-        uint32_t        sadb_x_policy_id;
-        uint32_t        sadb_x_policy_priority;
+        __u16   sadb_x_policy_len;
+        __u16   sadb_x_policy_exttype;
+        __u16   sadb_x_policy_type;
+        __u8            sadb_x_policy_dir;
+        __u8            sadb_x_policy_reserved;
+        __u32   sadb_x_policy_id;
+        __u32   sadb_x_policy_priority;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_policy) == 16 */
 
 struct sadb_x_ipsecrequest {
-        uint16_t        sadb_x_ipsecrequest_len;
-        uint16_t        sadb_x_ipsecrequest_proto;
-        uint8_t         sadb_x_ipsecrequest_mode;
-        uint8_t         sadb_x_ipsecrequest_level;
-        uint16_t        sadb_x_ipsecrequest_reserved1;
-        uint32_t        sadb_x_ipsecrequest_reqid;
-        uint32_t        sadb_x_ipsecrequest_reserved2;
+        __u16   sadb_x_ipsecrequest_len;
+        __u16   sadb_x_ipsecrequest_proto;
+        __u8            sadb_x_ipsecrequest_mode;
+        __u8            sadb_x_ipsecrequest_level;
+        __u16   sadb_x_ipsecrequest_reserved1;
+        __u32   sadb_x_ipsecrequest_reqid;
+        __u32   sadb_x_ipsecrequest_reserved2;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_ipsecrequest) == 16 */
 
@@ -200,38 +200,38 @@ struct sadb_x_ipsecrequest {
  * type of NAT-T is supported, draft-ietf-ipsec-udp-encaps-06
  */
 struct sadb_x_nat_t_type {
-        uint16_t        sadb_x_nat_t_type_len;
-        uint16_t        sadb_x_nat_t_type_exttype;
-        uint8_t         sadb_x_nat_t_type_type;
-        uint8_t         sadb_x_nat_t_type_reserved[3];
+        __u16   sadb_x_nat_t_type_len;
+        __u16   sadb_x_nat_t_type_exttype;
+        __u8            sadb_x_nat_t_type_type;
+        __u8            sadb_x_nat_t_type_reserved[3];
 } __attribute__((packed));
 /* sizeof(struct sadb_x_nat_t_type) == 8 */
 
 /* Pass a NAT Traversal port (Source or Dest port) */
 struct sadb_x_nat_t_port {
-        uint16_t        sadb_x_nat_t_port_len;
-        uint16_t        sadb_x_nat_t_port_exttype;
+        __u16   sadb_x_nat_t_port_len;
+        __u16   sadb_x_nat_t_port_exttype;
         __be16          sadb_x_nat_t_port_port;
-        uint16_t        sadb_x_nat_t_port_reserved;
+        __u16   sadb_x_nat_t_port_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_nat_t_port) == 8 */
 
 /* Generic LSM security context */
 struct sadb_x_sec_ctx {
-        uint16_t        sadb_x_sec_len;
-        uint16_t        sadb_x_sec_exttype;
-        uint8_t         sadb_x_ctx_alg;  /* LSMs: e.g., selinux == 1 */
-        uint8_t         sadb_x_ctx_doi;
-        uint16_t        sadb_x_ctx_len;
+        __u16   sadb_x_sec_len;
+        __u16   sadb_x_sec_exttype;
+        __u8            sadb_x_ctx_alg;  /* LSMs: e.g., selinux == 1 */
+        __u8            sadb_x_ctx_doi;
+        __u16   sadb_x_ctx_len;
 } __attribute__((packed));
 /* sizeof(struct sadb_sec_ctx) = 8 */
 
 /* Used by MIGRATE to pass addresses IKE will use to perform
  * negotiation with the peer */
 struct sadb_x_kmaddress {
-        uint16_t        sadb_x_kmaddress_len;
-        uint16_t        sadb_x_kmaddress_exttype;
-        uint32_t        sadb_x_kmaddress_reserved;
+        __u16   sadb_x_kmaddress_len;
+        __u16   sadb_x_kmaddress_exttype;
+        __u32   sadb_x_kmaddress_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_kmaddress) == 8 */
 
diff --git a/include/linux/phy.h b/include/linux/phy.h
index d7e54d98869f..97e40cb6b588 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -315,8 +315,7 @@ struct phy_device {
 
         /* Interrupt and Polling infrastructure */
         struct work_struct phy_queue;
-        struct work_struct state_queue;
-        struct timer_list phy_timer;
+        struct delayed_work state_queue;
         atomic_t irq_disable;
 
         struct mutex lock;
@@ -389,6 +388,12 @@ struct phy_driver {
         /* Enables or disables interrupts */
         int (*config_intr)(struct phy_device *phydev);
 
+        /*
+         * Checks if the PHY generated an interrupt.
+         * For multi-PHY devices with shared PHY interrupt pin
+         */
+        int (*did_interrupt)(struct phy_device *phydev);
+
         /* Clears up any memory if needed */
         void (*remove)(struct phy_device *phydev);
 
diff --git a/include/linux/pim.h b/include/linux/pim.h
index 1ba0661561a4..252bf6644c51 100644
--- a/include/linux/pim.h
+++ b/include/linux/pim.h
@@ -4,14 +4,14 @@
 #include <asm/byteorder.h>
 
 /* Message types - V1 */
-#define PIM_V1_VERSION          __constant_htonl(0x10000000)
+#define PIM_V1_VERSION          cpu_to_be32(0x10000000)
 #define PIM_V1_REGISTER         1
 
 /* Message types - V2 */
 #define PIM_VERSION             2
 #define PIM_REGISTER            1
 
-#define PIM_NULL_REGISTER       __constant_htonl(0x40000000)
+#define PIM_NULL_REGISTER       cpu_to_be32(0x40000000)
 
 /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
 struct pimreghdr
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 8e4120285f72..c8f038554e80 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -134,6 +134,11 @@ struct pipe_buf_operations {
    memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */
 #define PIPE_SIZE               PAGE_SIZE
 
+/* Pipe lock and unlock operations */
+void pipe_lock(struct pipe_inode_info *);
+void pipe_unlock(struct pipe_inode_info *);
+void pipe_double_lock(struct pipe_inode_info *, struct pipe_inode_info *);
+
 /* Drop the inode semaphore and wait for a pipe event, atomically */
 void pipe_wait(struct pipe_inode_info *pipe);
 
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index 04b4d7330e6d..d745f5b6c7b0 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -113,6 +113,7 @@ struct pkt_ctrl_command {
 #include <linux/cdrom.h>
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
+#include <linux/mempool.h>
 
 /* default bio write queue congestion marks */
 #define PKT_WRITE_CONGESTION_ON    10000
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 9a342699c607..72736fd8223c 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -12,6 +12,7 @@
 #define _PLATFORM_DEVICE_H_
 
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 
 struct platform_device {
         const char      * name;
@@ -19,8 +20,13 @@ struct platform_device {
         struct device   dev;
         u32             num_resources;
         struct resource * resource;
+        void            *platform_data;
+
+        struct platform_device_id       *id_entry;
 };
 
+#define platform_get_device_id(pdev)    ((pdev)->id_entry)
+
 #define to_platform_device(x) container_of((x), struct platform_device, dev)
 
 extern int platform_device_register(struct platform_device *);
@@ -56,6 +62,7 @@ struct platform_driver {
         int (*resume_early)(struct platform_device *);
         int (*resume)(struct platform_device *);
         struct device_driver driver;
+        struct platform_device_id *id_table;
 };
 
 extern int platform_driver_register(struct platform_driver *);
@@ -70,4 +77,46 @@ extern int platform_driver_probe(struct platform_driver *driver,
 #define platform_get_drvdata(_dev)      dev_get_drvdata(&(_dev)->dev)
 #define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data))
 
+/* early platform driver interface */
+struct early_platform_driver {
+        const char *class_str;
+        struct platform_driver *pdrv;
+        struct list_head list;
+        int requested_id;
+};
+
+#define EARLY_PLATFORM_ID_UNSET -2
+#define EARLY_PLATFORM_ID_ERROR -3
+
+extern int early_platform_driver_register(struct early_platform_driver *epdrv,
+                                          char *buf);
+extern void early_platform_add_devices(struct platform_device **devs, int num);
+
+static inline int is_early_platform_device(struct platform_device *pdev)
+{
+        return !pdev->dev.driver;
+}
+
+extern void early_platform_driver_register_all(char *class_str);
+extern int early_platform_driver_probe(char *class_str,
+                                       int nr_probe, int user_only);
+extern void early_platform_cleanup(void);
+
+
+#ifndef MODULE
+#define early_platform_init(class_string, platform_driver)              \
+static __initdata struct early_platform_driver early_driver = {         \
+        .class_str = class_string,                                      \
+        .pdrv = platform_driver,                                        \
+        .requested_id = EARLY_PLATFORM_ID_UNSET,                        \
+};                                                                      \
+static int __init early_platform_driver_setup_func(char *buf)           \
+{                                                                       \
+        return early_platform_driver_register(&early_driver, buf);      \
+}                                                                       \
+early_param(class_string, early_platform_driver_setup_func)
+#else /* MODULE */
+#define early_platform_init(class_string, platform_driver)
+#endif /* MODULE */
+
 #endif /* _PLATFORM_DEVICE_H_ */
diff --git a/include/linux/plist.h b/include/linux/plist.h
index 85de2f055874..45926d77d6ac 100644
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -96,6 +96,10 @@ struct plist_node {
 # define PLIST_HEAD_LOCK_INIT(_lock)
 #endif
 
+#define _PLIST_HEAD_INIT(head)                          \
+        .prio_list = LIST_HEAD_INIT((head).prio_list),  \
+        .node_list = LIST_HEAD_INIT((head).node_list)
+
 /**
  * PLIST_HEAD_INIT - static struct plist_head initializer
  * @head:       struct plist_head variable name
@@ -103,8 +107,7 @@ struct plist_node {
  */
 #define PLIST_HEAD_INIT(head, _lock)                    \
 {                                                       \
-        .prio_list = LIST_HEAD_INIT((head).prio_list),  \
-        .node_list = LIST_HEAD_INIT((head).node_list),  \
+        _PLIST_HEAD_INIT(head),                         \
         PLIST_HEAD_LOCK_INIT(&(_lock))                  \
 }
 
@@ -116,7 +119,7 @@ struct plist_node {
 #define PLIST_NODE_INIT(node, __prio)                   \
 {                                                       \
         .prio  = (__prio),                              \
-        .plist = PLIST_HEAD_INIT((node).plist, NULL),   \
+        .plist = { _PLIST_HEAD_INIT((node).plist) },    \
 }
 
 /**
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 24ba5f67b3a3..1d4e2d289821 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -400,6 +400,9 @@ extern void __suspend_report_result(const char *function, void *fn, int ret);
 
 #else /* !CONFIG_PM_SLEEP */
 
+#define device_pm_lock() do {} while (0)
+#define device_pm_unlock() do {} while (0)
+
 static inline int device_suspend(pm_message_t state)
 {
         return 0;
@@ -409,6 +412,14 @@ static inline int device_suspend(pm_message_t state)
 
 #endif /* !CONFIG_PM_SLEEP */
 
+/* How to reorder dpm_list after device_move() */
+enum dpm_order {
+        DPM_ORDER_NONE,
+        DPM_ORDER_DEV_AFTER_PARENT,
+        DPM_ORDER_PARENT_BEFORE_DEV,
+        DPM_ORDER_DEV_LAST,
+};
+
 /*
  * Global Power Management flags
  * Used to keep APM and ACPI from both being active
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 9f31683728fd..6729f7dcd60e 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -17,6 +17,9 @@
  */
 #define TIMER_ENTRY_STATIC      ((void *) 0x74737461)
 
+/********** mm/debug-pagealloc.c **********/
+#define PAGE_POISON 0xaa
+
 /********** mm/slab.c **********/
 /*
  * Magic nums for obj red zoning.
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 8ff25e0e7f7a..594c494ac3f0 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -73,6 +73,8 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
         POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_POWER_NOW,
+        POWER_SUPPLY_PROP_POWER_AVG,
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN,
         POWER_SUPPLY_PROP_CHARGE_FULL,
diff --git a/include/linux/ppp_channel.h b/include/linux/ppp_channel.h
index a942892d6dfe..0d3fa63e90ea 100644
--- a/include/linux/ppp_channel.h
+++ b/include/linux/ppp_channel.h
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/poll.h>
+#include <net/net_namespace.h>
 
 struct ppp_channel;
 
@@ -39,8 +40,8 @@ struct ppp_channel {
         int             mtu;            /* max transmit packet size */
         int             hdrlen;         /* amount of headroom channel needs */
         void            *ppp;           /* opaque to channel */
-        /* the following are not used at present */
         int             speed;          /* transfer rate (bytes/second) */
+        /* the following is not used at present */
         int             latency;        /* overhead time in milliseconds */
 };
 
@@ -56,6 +57,9 @@ extern void ppp_input(struct ppp_channel *, struct sk_buff *);
    that we may have missed a packet. */
 extern void ppp_input_error(struct ppp_channel *, int code);
 
+/* Attach a channel to a given PPP unit in specified net. */
+extern int ppp_register_net_channel(struct net *, struct ppp_channel *);
+
 /* Attach a channel to a given PPP unit. */
 extern int ppp_register_channel(struct ppp_channel *);
 
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 1c866bda2018..0f93ed6b4a88 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -177,8 +177,8 @@ struct ppp_comp_stats {
  * the last NP packet was sent or received.
  */
 struct ppp_idle {
-    time_t xmit_idle;           /* time since last NP packet sent */
-    time_t recv_idle;           /* time since last NP packet received */
+    __kernel_time_t xmit_idle;  /* time since last NP packet sent */
+    __kernel_time_t recv_idle;  /* time since last NP packet received */
 };
 
 #endif /* _PPP_DEFS_H_ */
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index b8bdb96eff78..fbfa3d44d33d 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -41,9 +41,6 @@ enum {
  * while parent/subdir create the directory structure (every
  * /proc file has a parent, but "subdir" is NULL for all
  * non-directory entries).
- *
- * "owner" is used to protect module
- * from unloading while proc_dir_entry is in use
  */
 
 typedef int (read_proc_t)(char *page, char **start, off_t off,
@@ -70,7 +67,6 @@ struct proc_dir_entry {
          * somewhere.
          */
         const struct file_operations *proc_fops;
-        struct module *owner;
         struct proc_dir_entry *next, *parent, *subdir;
         void *data;
         read_proc_t *read_proc;
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 98b93ca4db06..67c15653fc23 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -94,6 +94,7 @@ extern void ptrace_notify(int exit_code);
 extern void __ptrace_link(struct task_struct *child,
                           struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
+extern void exit_ptrace(struct task_struct *tracer);
 extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags);
 #define PTRACE_MODE_READ   1
 #define PTRACE_MODE_ATTACH 2
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 3945f803d514..7c775751392c 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -28,4 +28,4 @@ int pwm_enable(struct pwm_device *pwm);
  */
 void pwm_disable(struct pwm_device *pwm);
 
-#endif /* __ASM_ARCH_PWM_H */
+#endif /* __LINUX_PWM_H */
diff --git a/include/linux/quota.h b/include/linux/quota.h
index d72d5d84fde5..78c48895b12a 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -198,6 +198,7 @@ struct mem_dqblk {
         qsize_t dqb_bhardlimit; /* absolute limit on disk blks alloc */
         qsize_t dqb_bsoftlimit; /* preferred limit on disk blks */
         qsize_t dqb_curspace;   /* current used space */
+        qsize_t dqb_rsvspace;   /* current reserved space for delalloc*/
         qsize_t dqb_ihardlimit; /* absolute limit on allocated inodes */
         qsize_t dqb_isoftlimit; /* preferred inode limit */
         qsize_t dqb_curinodes;  /* current # allocated inodes */
@@ -276,8 +277,6 @@ struct dquot {
         struct mem_dqblk dq_dqb;        /* Diskquota usage */
 };
 
-#define NODQUOT (struct dquot *)NULL
-
 #define QUOTA_OK          0
 #define NO_QUOTA          1
 
@@ -308,6 +307,14 @@ struct dquot_operations {
         int (*release_dquot) (struct dquot *);          /* Quota is going to be deleted from disk */
         int (*mark_dirty) (struct dquot *);             /* Dquot is marked dirty */
         int (*write_info) (struct super_block *, int);  /* Write of quota "superblock" */
+        /* reserve quota for delayed block allocation */
+        int (*reserve_space) (struct inode *, qsize_t, int);
+        /* claim reserved quota for delayed alloc */
+        int (*claim_space) (struct inode *, qsize_t);
+        /* release rsved quota for delayed alloc */
+        void (*release_rsv) (struct inode *, qsize_t);
+        /* get reserved quota for delayed alloc */
+        qsize_t (*get_reserved_space) (struct inode *);
 };
 
 /* Operations handling requests from userspace */
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 0b35b3a1be05..36353d95c8db 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -35,6 +35,11 @@ void dquot_destroy(struct dquot *dquot);
 int dquot_alloc_space(struct inode *inode, qsize_t number, int prealloc);
 int dquot_alloc_inode(const struct inode *inode, qsize_t number);
 
+int dquot_reserve_space(struct inode *inode, qsize_t number, int prealloc);
+int dquot_claim_space(struct inode *inode, qsize_t number);
+void dquot_release_reserved_space(struct inode *inode, qsize_t number);
+qsize_t dquot_get_reserved_space(struct inode *inode);
+
 int dquot_free_space(struct inode *inode, qsize_t number);
 int dquot_free_inode(const struct inode *inode, qsize_t number);
 
@@ -183,6 +188,16 @@ static inline int vfs_dq_alloc_space(struct inode *inode, qsize_t nr)
         return ret;
 }
 
+static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)
+{
+        if (sb_any_quota_active(inode->i_sb)) {
+                /* Used space is updated in alloc_space() */
+                if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA)
+                        return 1;
+        }
+        return 0;
+}
+
 static inline int vfs_dq_alloc_inode(struct inode *inode)
 {
         if (sb_any_quota_active(inode->i_sb)) {
@@ -193,6 +208,31 @@ static inline int vfs_dq_alloc_inode(struct inode *inode)
         return 0;
 }
 
+/*
+ * Convert in-memory reserved quotas to real consumed quotas
+ */
+static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
+{
+        if (sb_any_quota_active(inode->i_sb)) {
+                if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA)
+                        return 1;
+        } else
+                inode_add_bytes(inode, nr);
+
+        mark_inode_dirty(inode);
+        return 0;
+}
+
+/*
+ * Release reserved (in-memory) quotas
+ */
+static inline
+void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
+{
+        if (sb_any_quota_active(inode->i_sb))
+                inode->i_sb->dq_op->release_rsv(inode, nr);
+}
+
 static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)
 {
         if (sb_any_quota_active(inode->i_sb))
@@ -339,6 +379,22 @@ static inline int vfs_dq_alloc_space(struct inode *inode, qsize_t nr)
         return 0;
 }
 
+static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)
+{
+        return 0;
+}
+
+static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
+{
+        return vfs_dq_alloc_space(inode, nr);
+}
+
+static inline
+int vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
+{
+        return 0;
+}
+
 static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)
 {
         inode_sub_bytes(inode, nr);
@@ -354,67 +410,48 @@ static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr)
 
 static inline int vfs_dq_prealloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
-        return vfs_dq_prealloc_space_nodirty(inode,
-                        nr << inode->i_sb->s_blocksize_bits);
+        return vfs_dq_prealloc_space_nodirty(inode, nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_prealloc_block(struct inode *inode, qsize_t nr)
 {
-        return vfs_dq_prealloc_space(inode,
-                        nr << inode->i_sb->s_blocksize_bits);
+        return vfs_dq_prealloc_space(inode, nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_alloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
-        return vfs_dq_alloc_space_nodirty(inode,
-                        nr << inode->i_sb->s_blocksize_bits);
+        return vfs_dq_alloc_space_nodirty(inode, nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_alloc_block(struct inode *inode, qsize_t nr)
 {
-        return vfs_dq_alloc_space(inode,
-                        nr << inode->i_sb->s_blocksize_bits);
+        return vfs_dq_alloc_space(inode, nr << inode->i_blkbits);
+}
+
+static inline int vfs_dq_reserve_block(struct inode *inode, qsize_t nr)
+{
+        return vfs_dq_reserve_space(inode, nr << inode->i_blkbits);
+}
+
+static inline int vfs_dq_claim_block(struct inode *inode, qsize_t nr)
+{
+        return vfs_dq_claim_space(inode, nr << inode->i_blkbits);
+}
+
+static inline
+void vfs_dq_release_reservation_block(struct inode *inode, qsize_t nr)
+{
+        vfs_dq_release_reservation_space(inode, nr << inode->i_blkbits);
 }
 
 static inline void vfs_dq_free_block_nodirty(struct inode *inode, qsize_t nr)
 {
-        vfs_dq_free_space_nodirty(inode, nr << inode->i_sb->s_blocksize_bits);
+        vfs_dq_free_space_nodirty(inode, nr << inode->i_blkbits);
 }
 
 static inline void vfs_dq_free_block(struct inode *inode, qsize_t nr)
 {
-        vfs_dq_free_space(inode, nr << inode->i_sb->s_blocksize_bits);
+        vfs_dq_free_space(inode, nr << inode->i_blkbits);
 }
 
-/*
- * Define uppercase equivalents for compatibility with old function names
- * Can go away when we think all users have been converted (15/04/2008)
- */
-#define DQUOT_INIT(inode) vfs_dq_init(inode)
-#define DQUOT_DROP(inode) vfs_dq_drop(inode)
-#define DQUOT_PREALLOC_SPACE_NODIRTY(inode, nr) \
-                                vfs_dq_prealloc_space_nodirty(inode, nr)
-#define DQUOT_PREALLOC_SPACE(inode, nr) vfs_dq_prealloc_space(inode, nr)
-#define DQUOT_ALLOC_SPACE_NODIRTY(inode, nr) \
-                                vfs_dq_alloc_space_nodirty(inode, nr)
-#define DQUOT_ALLOC_SPACE(inode, nr) vfs_dq_alloc_space(inode, nr)
-#define DQUOT_PREALLOC_BLOCK_NODIRTY(inode, nr) \
-                                vfs_dq_prealloc_block_nodirty(inode, nr)
-#define DQUOT_PREALLOC_BLOCK(inode, nr) vfs_dq_prealloc_block(inode, nr)
-#define DQUOT_ALLOC_BLOCK_NODIRTY(inode, nr) \
-                                vfs_dq_alloc_block_nodirty(inode, nr)
-#define DQUOT_ALLOC_BLOCK(inode, nr) vfs_dq_alloc_block(inode, nr)
-#define DQUOT_ALLOC_INODE(inode) vfs_dq_alloc_inode(inode)
-#define DQUOT_FREE_SPACE_NODIRTY(inode, nr) \
-                                vfs_dq_free_space_nodirty(inode, nr)
-#define DQUOT_FREE_SPACE(inode, nr) vfs_dq_free_space(inode, nr)
-#define DQUOT_FREE_BLOCK_NODIRTY(inode, nr) \
-                                vfs_dq_free_block_nodirty(inode, nr)
-#define DQUOT_FREE_BLOCK(inode, nr) vfs_dq_free_block(inode, nr)
-#define DQUOT_FREE_INODE(inode) vfs_dq_free_inode(inode)
-#define DQUOT_TRANSFER(inode, iattr) vfs_dq_transfer(inode, iattr)
-#define DQUOT_SYNC(sb) vfs_dq_sync(sb)
-#define DQUOT_OFF(sb, remount) vfs_dq_off(sb, remount)
-#define DQUOT_ON_REMOUNT(sb) vfs_dq_quota_on_remount(sb)
-
 #endif /* _LINUX_QUOTAOPS_ */
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h
deleted file mode 100644
index e98900671ca9..000000000000
--- a/include/linux/raid/bitmap.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * bitmap.h: Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003
- *
- * additions: Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.
- */
-#ifndef BITMAP_H
-#define BITMAP_H 1
-
-#define BITMAP_MAJOR_LO 3
-/* version 4 insists the bitmap is in little-endian order
- * with version 3, it is host-endian which is non-portable
- */
-#define BITMAP_MAJOR_HI 4
-#define BITMAP_MAJOR_HOSTENDIAN 3
-
-#define BITMAP_MINOR 39
-
-/*
- * in-memory bitmap:
- *
- * Use 16 bit block counters to track pending writes to each "chunk".
- * The 2 high order bits are special-purpose, the first is a flag indicating
- * whether a resync is needed.  The second is a flag indicating whether a
- * resync is active.
- * This means that the counter is actually 14 bits:
- *
- * +--------+--------+------------------------------------------------+
- * | resync | resync |               counter                          |
- * | needed | active |                                                |
- * |  (0-1) |  (0-1) |              (0-16383)                         |
- * +--------+--------+------------------------------------------------+
- *
- * The "resync needed" bit is set when:
- *    a '1' bit is read from storage at startup.
- *    a write request fails on some drives
- *    a resync is aborted on a chunk with 'resync active' set
- * It is cleared (and resync-active set) when a resync starts across all drives
- * of the chunk.
- *
- *
- * The "resync active" bit is set when:
- *    a resync is started on all drives, and resync_needed is set.
- *       resync_needed will be cleared (as long as resync_active wasn't already set).
- * It is cleared when a resync completes.
- *
- * The counter counts pending write requests, plus the on-disk bit.
- * When the counter is '1' and the resync bits are clear, the on-disk
- * bit can be cleared aswell, thus setting the counter to 0.
- * When we set a bit, or in the counter (to start a write), if the fields is
- * 0, we first set the disk bit and set the counter to 1.
- *
- * If the counter is 0, the on-disk bit is clear and the stipe is clean
- * Anything that dirties the stipe pushes the counter to 2 (at least)
- * and sets the on-disk bit (lazily).
- * If a periodic sweep find the counter at 2, it is decremented to 1.
- * If the sweep find the counter at 1, the on-disk bit is cleared and the
- * counter goes to zero.
- *
- * Also, we'll hijack the "map" pointer itself and use it as two 16 bit block
- * counters as a fallback when "page" memory cannot be allocated:
- *
- * Normal case (page memory allocated):
- *
- *     page pointer (32-bit)
- *
- *     [ ] ------+
- *               |
- *               +-------> [   ][   ]..[   ] (4096 byte page == 2048 counters)
- *                          c1   c2    c2048
- *
- * Hijacked case (page memory allocation failed):
- *
- *     hijacked page pointer (32-bit)
- *
- *     [                  ][              ] (no page memory allocated)
- *      counter #1 (16-bit) counter #2 (16-bit)
- *
- */
-
-#ifdef __KERNEL__
-
-#define PAGE_BITS (PAGE_SIZE << 3)
-#define PAGE_BIT_SHIFT (PAGE_SHIFT + 3)
-
-typedef __u16 bitmap_counter_t;
-#define COUNTER_BITS 16
-#define COUNTER_BIT_SHIFT 4
-#define COUNTER_BYTE_RATIO (COUNTER_BITS / 8)
-#define COUNTER_BYTE_SHIFT (COUNTER_BIT_SHIFT - 3)
-
-#define NEEDED_MASK ((bitmap_counter_t) (1 << (COUNTER_BITS - 1)))
-#define RESYNC_MASK ((bitmap_counter_t) (1 << (COUNTER_BITS - 2)))
-#define COUNTER_MAX ((bitmap_counter_t) RESYNC_MASK - 1)
-#define NEEDED(x) (((bitmap_counter_t) x) & NEEDED_MASK)
-#define RESYNC(x) (((bitmap_counter_t) x) & RESYNC_MASK)
-#define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
-
-/* how many counters per page? */
-#define PAGE_COUNTER_RATIO (PAGE_BITS / COUNTER_BITS)
-/* same, except a shift value for more efficient bitops */
-#define PAGE_COUNTER_SHIFT (PAGE_BIT_SHIFT - COUNTER_BIT_SHIFT)
-/* same, except a mask value for more efficient bitops */
-#define PAGE_COUNTER_MASK  (PAGE_COUNTER_RATIO - 1)
-
-#define BITMAP_BLOCK_SIZE 512
-#define BITMAP_BLOCK_SHIFT 9
-
-/* how many blocks per chunk? (this is variable) */
-#define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->chunksize >> BITMAP_BLOCK_SHIFT)
-#define CHUNK_BLOCK_SHIFT(bitmap) ((bitmap)->chunkshift - BITMAP_BLOCK_SHIFT)
-#define CHUNK_BLOCK_MASK(bitmap) (CHUNK_BLOCK_RATIO(bitmap) - 1)
-
-/* when hijacked, the counters and bits represent even larger "chunks" */
-/* there will be 1024 chunks represented by each counter in the page pointers */
-#define PAGEPTR_BLOCK_RATIO(bitmap) \
-                        (CHUNK_BLOCK_RATIO(bitmap) << PAGE_COUNTER_SHIFT >> 1)
-#define PAGEPTR_BLOCK_SHIFT(bitmap) \
-                        (CHUNK_BLOCK_SHIFT(bitmap) + PAGE_COUNTER_SHIFT - 1)
-#define PAGEPTR_BLOCK_MASK(bitmap) (PAGEPTR_BLOCK_RATIO(bitmap) - 1)
-
-/*
- * on-disk bitmap:
- *
- * Use one bit per "chunk" (block set). We do the disk I/O on the bitmap
- * file a page at a time. There's a superblock at the start of the file.
- */
-
-/* map chunks (bits) to file pages - offset by the size of the superblock */
-#define CHUNK_BIT_OFFSET(chunk) ((chunk) + (sizeof(bitmap_super_t) << 3))
-
-#endif
-
-/*
- * bitmap structures:
- */
-
-#define BITMAP_MAGIC 0x6d746962
-
-/* use these for bitmap->flags and bitmap->sb->state bit-fields */
-enum bitmap_state {
-        BITMAP_STALE  = 0x002,  /* the bitmap file is out of date or had -EIO */
-        BITMAP_WRITE_ERROR = 0x004, /* A write error has occurred */
-        BITMAP_HOSTENDIAN = 0x8000,
-};
-
-/* the superblock at the front of the bitmap file -- little endian */
-typedef struct bitmap_super_s {
-        __le32 magic;        /*  0  BITMAP_MAGIC */
-        __le32 version;      /*  4  the bitmap major for now, could change... */
-        __u8  uuid[16];      /*  8  128 bit uuid - must match md device uuid */
-        __le64 events;       /* 24  event counter for the bitmap (1)*/
-        __le64 events_cleared;/*32  event counter when last bit cleared (2) */
-        __le64 sync_size;    /* 40  the size of the md device's sync range(3) */
-        __le32 state;        /* 48  bitmap state information */
-        __le32 chunksize;    /* 52  the bitmap chunk size in bytes */
-        __le32 daemon_sleep; /* 56  seconds between disk flushes */
-        __le32 write_behind; /* 60  number of outstanding write-behind writes */
-
-        __u8  pad[256 - 64]; /* set to zero */
-} bitmap_super_t;
-
-/* notes:
- * (1) This event counter is updated before the eventcounter in the md superblock
- *    When a bitmap is loaded, it is only accepted if this event counter is equal
- *    to, or one greater than, the event counter in the superblock.
- * (2) This event counter is updated when the other one is *if*and*only*if* the
- *    array is not degraded.  As bits are not cleared when the array is degraded,
- *    this represents the last time that any bits were cleared.
- *    If a device is being added that has an event count with this value or
- *    higher, it is accepted as conforming to the bitmap.
- * (3)This is the number of sectors represented by the bitmap, and is the range that
- *    resync happens across.  For raid1 and raid5/6 it is the size of individual
- *    devices.  For raid10 it is the size of the array.
- */
-
-#ifdef __KERNEL__
-
-/* the in-memory bitmap is represented by bitmap_pages */
-struct bitmap_page {
-        /*
-         * map points to the actual memory page
-         */
-        char *map;
-        /*
-         * in emergencies (when map cannot be alloced), hijack the map
-         * pointer and use it as two counters itself
-         */
-        unsigned int hijacked:1;
-        /*
-         * count of dirty bits on the page
-         */
-        unsigned int  count:31;
-};
-
-/* keep track of bitmap file pages that have pending writes on them */
-struct page_list {
-        struct list_head list;
-        struct page *page;
-};
-
-/* the main bitmap structure - one per mddev */
-struct bitmap {
-        struct bitmap_page *bp;
-        unsigned long pages; /* total number of pages in the bitmap */
-        unsigned long missing_pages; /* number of pages not yet allocated */
-
-        mddev_t *mddev; /* the md device that the bitmap is for */
-
-        int counter_bits; /* how many bits per block counter */
-
-        /* bitmap chunksize -- how much data does each bit represent? */
-        unsigned long chunksize;
-        unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */
-        unsigned long chunks; /* total number of data chunks for the array */
-
-        /* We hold a count on the chunk currently being synced, and drop
-         * it when the last block is started.  If the resync is aborted
-         * midway, we need to be able to drop that count, so we remember
-         * the counted chunk..
-         */
-        unsigned long syncchunk;
-
-        __u64   events_cleared;
-        int need_sync;
-
-        /* bitmap spinlock */
-        spinlock_t lock;
-
-        long offset; /* offset from superblock if file is NULL */
-        struct file *file; /* backing disk file */
-        struct page *sb_page; /* cached copy of the bitmap file superblock */
-        struct page **filemap; /* list of cache pages for the file */
-        unsigned long *filemap_attr; /* attributes associated w/ filemap pages */
-        unsigned long file_pages; /* number of pages in the file */
-        int last_page_size; /* bytes in the last page */
-
-        unsigned long flags;
-
-        int allclean;
-
-        unsigned long max_write_behind; /* write-behind mode */
-        atomic_t behind_writes;
-
-        /*
-         * the bitmap daemon - periodically wakes up and sweeps the bitmap
-         * file, cleaning up bits and flushing out pages to disk as necessary
-         */
-        unsigned long daemon_lastrun; /* jiffies of last run */
-        unsigned long daemon_sleep; /* how many seconds between updates? */
-        unsigned long last_end_sync; /* when we lasted called end_sync to
-                                      * update bitmap with resync progress */
-
-        atomic_t pending_writes; /* pending writes to the bitmap file */
-        wait_queue_head_t write_wait;
-        wait_queue_head_t overflow_wait;
-
-};
-
-/* the bitmap API */
-
-/* these are used only by md/bitmap */
-int  bitmap_create(mddev_t *mddev);
-void bitmap_flush(mddev_t *mddev);
-void bitmap_destroy(mddev_t *mddev);
-
-void bitmap_print_sb(struct bitmap *bitmap);
-void bitmap_update_sb(struct bitmap *bitmap);
-
-int  bitmap_setallbits(struct bitmap *bitmap);
-void bitmap_write_all(struct bitmap *bitmap);
-
-void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e);
-
-/* these are exported */
-int bitmap_startwrite(struct bitmap *bitmap, sector_t offset,
-                        unsigned long sectors, int behind);
-void bitmap_endwrite(struct bitmap *bitmap, sector_t offset,
-                        unsigned long sectors, int success, int behind);
-int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int degraded);
-void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted);
-void bitmap_close_sync(struct bitmap *bitmap);
-void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector);
-
-void bitmap_unplug(struct bitmap *bitmap);
-void bitmap_daemon_work(struct bitmap *bitmap);
-#endif
-
-#endif
diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
deleted file mode 100644
index f38b9c586afb..000000000000
--- a/include/linux/raid/linear.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _LINEAR_H
-#define _LINEAR_H
-
-#include <linux/raid/md.h>
-
-struct dev_info {
-        mdk_rdev_t      *rdev;
-        sector_t        num_sectors;
-        sector_t        start_sector;
-};
-
-typedef struct dev_info dev_info_t;
-
-struct linear_private_data
-{
-        struct linear_private_data *prev;       /* earlier version */
-        dev_info_t              **hash_table;
-        sector_t                spacing;
-        sector_t                array_sectors;
-        int                     sector_shift;   /* shift before dividing
-                                                 * by spacing
-                                                 */
-        dev_info_t              disks[0];
-};
-
-
-typedef struct linear_private_data linear_conf_t;
-
-#define mddev_to_conf(mddev) ((linear_conf_t *) mddev->private)
-
-#endif
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
deleted file mode 100644
index 82bea14cae1a..000000000000
--- a/include/linux/raid/md.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   md.h : Multiple Devices driver for Linux
-          Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
-          Copyright (C) 1994-96 Marc ZYNGIER
-          <zyngier@ufr-info-p7.ibp.fr> or
-          <maz@gloups.fdn.fr>
-          
-   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.
-   
-   You should have received a copy of the GNU General Public License
-   (for example /usr/src/linux/COPYING); if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-*/
-
-#ifndef _MD_H
-#define _MD_H
-
-#include <linux/blkdev.h>
-#include <linux/seq_file.h>
-
-/*
- * 'md_p.h' holds the 'physical' layout of RAID devices
- * 'md_u.h' holds the user <=> kernel API
- *
- * 'md_k.h' holds kernel internal definitions
- */
-
-#include <linux/raid/md_p.h>
-#include <linux/raid/md_u.h>
-#include <linux/raid/md_k.h>
-
-#ifdef CONFIG_MD
-
-/*
- * Different major versions are not compatible.
- * Different minor versions are only downward compatible.
- * Different patchlevel versions are downward and upward compatible.
- */
-#define MD_MAJOR_VERSION                0
-#define MD_MINOR_VERSION                90
-/*
- * MD_PATCHLEVEL_VERSION indicates kernel functionality.
- * >=1 means different superblock formats are selectable using SET_ARRAY_INFO
- *     and major_version/minor_version accordingly
- * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT
- *     in the super status byte
- * >=3 means that bitmap superblock version 4 is supported, which uses
- *     little-ending representation rather than host-endian
- */
-#define MD_PATCHLEVEL_VERSION           3
-
-extern int mdp_major;
-
-extern int register_md_personality(struct mdk_personality *p);
-extern int unregister_md_personality(struct mdk_personality *p);
-extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev),
-                                mddev_t *mddev, const char *name);
-extern void md_unregister_thread(mdk_thread_t *thread);
-extern void md_wakeup_thread(mdk_thread_t *thread);
-extern void md_check_recovery(mddev_t *mddev);
-extern void md_write_start(mddev_t *mddev, struct bio *bi);
-extern void md_write_end(mddev_t *mddev);
-extern void md_done_sync(mddev_t *mddev, int blocks, int ok);
-extern void md_error(mddev_t *mddev, mdk_rdev_t *rdev);
-
-extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
-                           sector_t sector, int size, struct page *page);
-extern void md_super_wait(mddev_t *mddev);
-extern int sync_page_io(struct block_device *bdev, sector_t sector, int size,
-                        struct page *page, int rw);
-extern void md_do_sync(mddev_t *mddev);
-extern void md_new_event(mddev_t *mddev);
-extern int md_allow_write(mddev_t *mddev);
-extern void md_wait_for_blocked_rdev(mdk_rdev_t *rdev, mddev_t *mddev);
-
-#endif /* CONFIG_MD */
-#endif 
-
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
deleted file mode 100644
index 9743e4dbc918..000000000000
--- a/include/linux/raid/md_k.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-   md_k.h : kernel internal structure of the Linux MD driver
-          Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
-          
-   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.
-   
-   You should have received a copy of the GNU General Public License
-   (for example /usr/src/linux/COPYING); if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-*/
-
-#ifndef _MD_K_H
-#define _MD_K_H
-
-/* and dm-bio-list.h is not under include/linux because.... ??? */
-#include "../../../drivers/md/dm-bio-list.h"
-
-#ifdef CONFIG_BLOCK
-
-#define LEVEL_MULTIPATH         (-4)
-#define LEVEL_LINEAR            (-1)
-#define LEVEL_FAULTY            (-5)
-
-/* we need a value for 'no level specified' and 0
- * means 'raid0', so we need something else.  This is
- * for internal use only
- */
-#define LEVEL_NONE              (-1000000)
-
-#define MaxSector (~(sector_t)0)
-
-typedef struct mddev_s mddev_t;
-typedef struct mdk_rdev_s mdk_rdev_t;
-
-/*
- * options passed in raidrun:
- */
-
-/* Currently this must fit in an 'int' */
-#define MAX_CHUNK_SIZE (1<<30)
-
-/*
- * MD's 'extended' device
- */
-struct mdk_rdev_s
-{
-        struct list_head same_set;      /* RAID devices within the same set */
-
-        sector_t size;                  /* Device size (in blocks) */
-        mddev_t *mddev;                 /* RAID array if running */
-        long last_events;               /* IO event timestamp */
-
-        struct block_device *bdev;      /* block device handle */
-
-        struct page     *sb_page;
-        int             sb_loaded;
-        __u64           sb_events;
-        sector_t        data_offset;    /* start of data in array */
-        sector_t        sb_start;       /* offset of the super block (in 512byte sectors) */
-        int             sb_size;        /* bytes in the superblock */
-        int             preferred_minor;        /* autorun support */
-
-        struct kobject  kobj;
-
-        /* A device can be in one of three states based on two flags:
-         * Not working:   faulty==1 in_sync==0
-         * Fully working: faulty==0 in_sync==1
-         * Working, but not
-         * in sync with array
-         *                faulty==0 in_sync==0
-         *
-         * It can never have faulty==1, in_sync==1
-         * This reduces the burden of testing multiple flags in many cases
-         */
-
-        unsigned long   flags;
-#define Faulty          1               /* device is known to have a fault */
-#define In_sync         2               /* device is in_sync with rest of array */
-#define WriteMostly     4               /* Avoid reading if at all possible */
-#define BarriersNotsupp 5               /* BIO_RW_BARRIER is not supported */
-#define AllReserved     6               /* If whole device is reserved for
-                                         * one array */
-#define AutoDetected    7               /* added by auto-detect */
-#define Blocked         8               /* An error occured on an externally
-                                         * managed array, don't allow writes
-                                         * until it is cleared */
-#define StateChanged    9               /* Faulty or Blocked has changed during
-                                         * interrupt, so it needs to be
-                                         * notified by the thread */
-        wait_queue_head_t blocked_wait;
-
-        int desc_nr;                    /* descriptor index in the superblock */
-        int raid_disk;                  /* role of device in array */
-        int saved_raid_disk;            /* role that device used to have in the
-                                         * array and could again if we did a partial
-                                         * resync from the bitmap
-                                         */
-        sector_t        recovery_offset;/* If this device has been partially
-                                         * recovered, this is where we were
-                                         * up to.
-                                         */
-
-        atomic_t        nr_pending;     /* number of pending requests.
-                                         * only maintained for arrays that
-                                         * support hot removal
-                                         */
-        atomic_t        read_errors;    /* number of consecutive read errors that
-                                         * we have tried to ignore.
-                                         */
-        atomic_t        corrected_errors; /* number of corrected read errors,
-                                           * for reporting to userspace and storing
-                                           * in superblock.
-                                           */
-        struct work_struct del_work;    /* used for delayed sysfs removal */
-
-        struct sysfs_dirent *sysfs_state; /* handle for 'state'
-                                           * sysfs entry */
-};
-
-struct mddev_s
-{
-        void                            *private;
-        struct mdk_personality          *pers;
-        dev_t                           unit;
-        int                             md_minor;
-        struct list_head                disks;
-        unsigned long                   flags;
-#define MD_CHANGE_DEVS  0       /* Some device status has changed */
-#define MD_CHANGE_CLEAN 1       /* transition to or from 'clean' */
-#define MD_CHANGE_PENDING 2     /* superblock update in progress */
-
-        int                             ro;
-
-        struct gendisk                  *gendisk;
-
-        struct kobject                  kobj;
-        int                             hold_active;
-#define UNTIL_IOCTL     1
-#define UNTIL_STOP      2
-
-        /* Superblock information */
-        int                             major_version,
-                                        minor_version,
-                                        patch_version;
-        int                             persistent;
-        int                             external;       /* metadata is
-                                                         * managed externally */
-        char                            metadata_type[17]; /* externally set*/
-        int                             chunk_size;
-        time_t                          ctime, utime;
-        int                             level, layout;
-        char                            clevel[16];
-        int                             raid_disks;
-        int                             max_disks;
-        sector_t                        size; /* used size of component devices */
-        sector_t                        array_sectors; /* exported array size */
-        __u64                           events;
-
-        char                            uuid[16];
-
-        /* If the array is being reshaped, we need to record the
-         * new shape and an indication of where we are up to.
-         * This is written to the superblock.
-         * If reshape_position is MaxSector, then no reshape is happening (yet).
-         */
-        sector_t                        reshape_position;
-        int                             delta_disks, new_level, new_layout, new_chunk;
-
-        struct mdk_thread_s             *thread;        /* management thread */
-        struct mdk_thread_s             *sync_thread;   /* doing resync or reconstruct */
-        sector_t                        curr_resync;    /* last block scheduled */
-        unsigned long                   resync_mark;    /* a recent timestamp */
-        sector_t                        resync_mark_cnt;/* blocks written at resync_mark */
-        sector_t                        curr_mark_cnt; /* blocks scheduled now */
-
-        sector_t                        resync_max_sectors; /* may be set by personality */
-
-        sector_t                        resync_mismatches; /* count of sectors where
-                                                            * parity/replica mismatch found
-                                                            */
-
-        /* allow user-space to request suspension of IO to regions of the array */
-        sector_t                        suspend_lo;
-        sector_t                        suspend_hi;
-        /* if zero, use the system-wide default */
-        int                             sync_speed_min;
-        int                             sync_speed_max;
-
-        /* resync even though the same disks are shared among md-devices */
-        int                             parallel_resync;
-
-        int                             ok_start_degraded;
-        /* recovery/resync flags 
-         * NEEDED:   we might need to start a resync/recover
-         * RUNNING:  a thread is running, or about to be started
-         * SYNC:     actually doing a resync, not a recovery
-         * RECOVER:  doing recovery, or need to try it.
-         * INTR:     resync needs to be aborted for some reason
-         * DONE:     thread is done and is waiting to be reaped
-         * REQUEST:  user-space has requested a sync (used with SYNC)
-         * CHECK:    user-space request for for check-only, no repair
-         * RESHAPE:  A reshape is happening
-         *
-         * If neither SYNC or RESHAPE are set, then it is a recovery.
-         */
-#define MD_RECOVERY_RUNNING     0
-#define MD_RECOVERY_SYNC        1
-#define MD_RECOVERY_RECOVER     2
-#define MD_RECOVERY_INTR        3
-#define MD_RECOVERY_DONE        4
-#define MD_RECOVERY_NEEDED      5
-#define MD_RECOVERY_REQUESTED   6
-#define MD_RECOVERY_CHECK       7
-#define MD_RECOVERY_RESHAPE     8
-#define MD_RECOVERY_FROZEN      9
-
-        unsigned long                   recovery;
-        int                             recovery_disabled; /* if we detect that recovery
-                                                            * will always fail, set this
-                                                            * so we don't loop trying */
-
-        int                             in_sync;        /* know to not need resync */
-        struct mutex                    reconfig_mutex;
-        atomic_t                        active;         /* general refcount */
-        atomic_t                        openers;        /* number of active opens */
-
-        int                             changed;        /* true if we might need to reread partition info */
-        int                             degraded;       /* whether md should consider
-                                                         * adding a spare
-                                                         */
-        int                             barriers_work;  /* initialised to true, cleared as soon
-                                                         * as a barrier request to slave
-                                                         * fails.  Only supported
-                                                         */
-        struct bio                      *biolist;       /* bios that need to be retried
-                                                         * because BIO_RW_BARRIER is not supported
-                                                         */
-
-        atomic_t                        recovery_active; /* blocks scheduled, but not written */
-        wait_queue_head_t               recovery_wait;
-        sector_t                        recovery_cp;
-        sector_t                        resync_min;     /* user requested sync
-                                                         * starts here */
-        sector_t                        resync_max;     /* resync should pause
-                                                         * when it gets here */
-
-        struct sysfs_dirent             *sysfs_state;   /* handle for 'array_state'
-                                                         * file in sysfs.
-                                                         */
-        struct sysfs_dirent             *sysfs_action;  /* handle for 'sync_action' */
-
-        struct work_struct del_work;    /* used for delayed sysfs removal */
-
-        spinlock_t                      write_lock;
-        wait_queue_head_t               sb_wait;        /* for waiting on superblock updates */
-        atomic_t                        pending_writes; /* number of active superblock writes */
-
-        unsigned int                    safemode;       /* if set, update "clean" superblock
-                                                         * when no writes pending.
-                                                         */ 
-        unsigned int                    safemode_delay;
-        struct timer_list               safemode_timer;
-        atomic_t                        writes_pending; 
-        struct request_queue            *queue; /* for plugging ... */
-
-        atomic_t                        write_behind; /* outstanding async IO */
-        unsigned int                    max_write_behind; /* 0 = sync */
-
-        struct bitmap                   *bitmap; /* the bitmap for the device */
-        struct file                     *bitmap_file; /* the bitmap file */
-        long                            bitmap_offset; /* offset from superblock of
-                                                        * start of bitmap. May be
-                                                        * negative, but not '0'
-                                                        */
-        long                            default_bitmap_offset; /* this is the offset to use when
-                                                                * hot-adding a bitmap.  It should
-                                                                * eventually be settable by sysfs.
-                                                                */
-
-        struct list_head                all_mddevs;
-};
-
-
-static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
-{
-        int faulty = test_bit(Faulty, &rdev->flags);
-        if (atomic_dec_and_test(&rdev->nr_pending) && faulty)
-                set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
-}
-
-static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
-{
-        atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
-}
-
-struct mdk_personality
-{
-        char *name;
-        int level;
-        struct list_head list;
-        struct module *owner;
-        int (*make_request)(struct request_queue *q, struct bio *bio);
-        int (*run)(mddev_t *mddev);
-        int (*stop)(mddev_t *mddev);
-        void (*status)(struct seq_file *seq, mddev_t *mddev);
-        /* error_handler must set ->faulty and clear ->in_sync
-         * if appropriate, and should abort recovery if needed 
-         */
-        void (*error_handler)(mddev_t *mddev, mdk_rdev_t *rdev);
-        int (*hot_add_disk) (mddev_t *mddev, mdk_rdev_t *rdev);
-        int (*hot_remove_disk) (mddev_t *mddev, int number);
-        int (*spare_active) (mddev_t *mddev);
-        sector_t (*sync_request)(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster);
-        int (*resize) (mddev_t *mddev, sector_t sectors);
-        int (*check_reshape) (mddev_t *mddev);
-        int (*start_reshape) (mddev_t *mddev);
-        int (*reconfig) (mddev_t *mddev, int layout, int chunk_size);
-        /* quiesce moves between quiescence states
-         * 0 - fully active
-         * 1 - no new requests allowed
-         * others - reserved
-         */
-        void (*quiesce) (mddev_t *mddev, int state);
-};
-
-
-struct md_sysfs_entry {
-        struct attribute attr;
-        ssize_t (*show)(mddev_t *, char *);
-        ssize_t (*store)(mddev_t *, const char *, size_t);
-};
-
-
-static inline char * mdname (mddev_t * mddev)
-{
-        return mddev->gendisk ? mddev->gendisk->disk_name : "mdX";
-}
-
-/*
- * iterates through some rdev ringlist. It's safe to remove the
- * current 'rdev'. Dont touch 'tmp' though.
- */
-#define rdev_for_each_list(rdev, tmp, head)                             \
-        list_for_each_entry_safe(rdev, tmp, head, same_set)
-
-/*
- * iterates through the 'same array disks' ringlist
- */
-#define rdev_for_each(rdev, tmp, mddev)                         \
-        list_for_each_entry_safe(rdev, tmp, &((mddev)->disks), same_set)
-
-#define rdev_for_each_rcu(rdev, mddev)                          \
-        list_for_each_entry_rcu(rdev, &((mddev)->disks), same_set)
-
-typedef struct mdk_thread_s {
-        void                    (*run) (mddev_t *mddev);
-        mddev_t                 *mddev;
-        wait_queue_head_t       wqueue;
-        unsigned long           flags;
-        struct task_struct      *tsk;
-        unsigned long           timeout;
-} mdk_thread_t;
-
-#define THREAD_WAKEUP  0
-
-#define __wait_event_lock_irq(wq, condition, lock, cmd)                 \
-do {                                                                    \
-        wait_queue_t __wait;                                            \
-        init_waitqueue_entry(&__wait, current);                         \
-                                                                        \
-        add_wait_queue(&wq, &__wait);                                   \
-        for (;;) {                                                      \
-                set_current_state(TASK_UNINTERRUPTIBLE);                \
-                if (condition)                                          \
-                        break;                                          \
-                spin_unlock_irq(&lock);                                 \
-                cmd;                                                    \
-                schedule();                                             \
-                spin_lock_irq(&lock);                                   \
-        }                                                               \
-        current->state = TASK_RUNNING;                                  \
-        remove_wait_queue(&wq, &__wait);                                \
-} while (0)
-
-#define wait_event_lock_irq(wq, condition, lock, cmd)                   \
-do {                                                                    \
-        if (condition)                                                  \
-                break;                                                  \
-        __wait_event_lock_irq(wq, condition, lock, cmd);                \
-} while (0)
-
-static inline void safe_put_page(struct page *p)
-{
-        if (p) put_page(p);
-}
-
-#endif /* CONFIG_BLOCK */
-#endif
-
diff --git a/include/linux/raid/md_u.h b/include/linux/raid/md_u.h
index 7192035fc4b0..fb1abb3367e9 100644
--- a/include/linux/raid/md_u.h
+++ b/include/linux/raid/md_u.h
@@ -15,6 +15,24 @@
 #ifndef _MD_U_H
 #define _MD_U_H
 
+/*
+ * Different major versions are not compatible.
+ * Different minor versions are only downward compatible.
+ * Different patchlevel versions are downward and upward compatible.
+ */
+#define MD_MAJOR_VERSION                0
+#define MD_MINOR_VERSION                90
+/*
+ * MD_PATCHLEVEL_VERSION indicates kernel functionality.
+ * >=1 means different superblock formats are selectable using SET_ARRAY_INFO
+ *     and major_version/minor_version accordingly
+ * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT
+ *     in the super status byte
+ * >=3 means that bitmap superblock version 4 is supported, which uses
+ *     little-ending representation rather than host-endian
+ */
+#define MD_PATCHLEVEL_VERSION           3
+
 /* ioctls */
 
 /* status */
@@ -46,6 +64,12 @@
 #define STOP_ARRAY_RO           _IO (MD_MAJOR, 0x33)
 #define RESTART_ARRAY_RW        _IO (MD_MAJOR, 0x34)
 
+/* 63 partitions with the alternate major number (mdp) */
+#define MdpMinorShift 6
+#ifdef __KERNEL__
+extern int mdp_major;
+#endif
+
 typedef struct mdu_version_s {
         int major;
         int minor;
@@ -85,6 +109,17 @@ typedef struct mdu_array_info_s {
 
 } mdu_array_info_t;
 
+/* non-obvious values for 'level' */
+#define LEVEL_MULTIPATH         (-4)
+#define LEVEL_LINEAR            (-1)
+#define LEVEL_FAULTY            (-5)
+
+/* we need a value for 'no level specified' and 0
+ * means 'raid0', so we need something else.  This is
+ * for internal use only
+ */
+#define LEVEL_NONE              (-1000000)
+
 typedef struct mdu_disk_info_s {
         /*
          * configuration/status of one particular disk
diff --git a/include/linux/raid/multipath.h b/include/linux/raid/multipath.h
deleted file mode 100644
index 6f53fc177a47..000000000000
--- a/include/linux/raid/multipath.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _MULTIPATH_H
-#define _MULTIPATH_H
-
-#include <linux/raid/md.h>
-
-struct multipath_info {
-        mdk_rdev_t      *rdev;
-};
-
-struct multipath_private_data {
-        mddev_t                 *mddev;
-        struct multipath_info   *multipaths;
-        int                     raid_disks;
-        int                     working_disks;
-        spinlock_t              device_lock;
-        struct list_head        retry_list;
-
-        mempool_t               *pool;
-};
-
-typedef struct multipath_private_data multipath_conf_t;
-
-/*
- * this is the only point in the RAID code where we violate
- * C type safety. mddev->private is an 'opaque' pointer.
- */
-#define mddev_to_conf(mddev) ((multipath_conf_t *) mddev->private)
-
-/*
- * this is our 'private' 'collective' MULTIPATH buffer head.
- * it contains information about what kind of IO operations were started
- * for this MULTIPATH operation, and about their status:
- */
-
-struct multipath_bh {
-        mddev_t                 *mddev;
-        struct bio              *master_bio;
-        struct bio              bio;
-        int                     path;
-        struct list_head        retry_list;
-};
-#endif
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
new file mode 100644
index 000000000000..d92480f8285c
--- /dev/null
+++ b/include/linux/raid/pq.h
@@ -0,0 +1,132 @@
+/* -*- linux-c -*- ------------------------------------------------------- *
+ *
+ *   Copyright 2003 H. Peter Anvin - 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, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+#ifndef LINUX_RAID_RAID6_H
+#define LINUX_RAID_RAID6_H
+
+#ifdef __KERNEL__
+
+/* Set to 1 to use kernel-wide empty_zero_page */
+#define RAID6_USE_EMPTY_ZERO_PAGE 0
+#include <linux/blkdev.h>
+
+/* We need a pre-zeroed page... if we don't want to use the kernel-provided
+   one define it here */
+#if RAID6_USE_EMPTY_ZERO_PAGE
+# define raid6_empty_zero_page empty_zero_page
+#else
+extern const char raid6_empty_zero_page[PAGE_SIZE];
+#endif
+
+#else /* ! __KERNEL__ */
+/* Used for testing in user space */
+
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stddef.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+
+/* Not standard, but glibc defines it */
+#define BITS_PER_LONG __WORDSIZE
+
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+#ifndef PAGE_SIZE
+# define PAGE_SIZE 4096
+#endif
+extern const char raid6_empty_zero_page[PAGE_SIZE];
+
+#define __init
+#define __exit
+#define __attribute_const__ __attribute__((const))
+#define noinline __attribute__((noinline))
+
+#define preempt_enable()
+#define preempt_disable()
+#define cpu_has_feature(x) 1
+#define enable_kernel_altivec()
+#define disable_kernel_altivec()
+
+#define EXPORT_SYMBOL(sym)
+#define MODULE_LICENSE(licence)
+#define subsys_initcall(x)
+#define module_exit(x)
+#endif /* __KERNEL__ */
+
+/* Routine choices */
+struct raid6_calls {
+        void (*gen_syndrome)(int, size_t, void **);
+        int  (*valid)(void);    /* Returns 1 if this routine set is usable */
+        const char *name;       /* Name of this routine set */
+        int prefer;             /* Has special performance attribute */
+};
+
+/* Selected algorithm */
+extern struct raid6_calls raid6_call;
+
+/* Algorithm list */
+extern const struct raid6_calls * const raid6_algos[];
+int raid6_select_algo(void);
+
+/* Return values from chk_syndrome */
+#define RAID6_OK        0
+#define RAID6_P_BAD     1
+#define RAID6_Q_BAD     2
+#define RAID6_PQ_BAD    3
+
+/* Galois field tables */
+extern const u8 raid6_gfmul[256][256] __attribute__((aligned(256)));
+extern const u8 raid6_gfexp[256]      __attribute__((aligned(256)));
+extern const u8 raid6_gfinv[256]      __attribute__((aligned(256)));
+extern const u8 raid6_gfexi[256]      __attribute__((aligned(256)));
+
+/* Recovery routines */
+void raid6_2data_recov(int disks, size_t bytes, int faila, int failb,
+                       void **ptrs);
+void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs);
+void raid6_dual_recov(int disks, size_t bytes, int faila, int failb,
+                      void **ptrs);
+
+/* Some definitions to allow code to be compiled for testing in userspace */
+#ifndef __KERNEL__
+
+# define jiffies        raid6_jiffies()
+# define printk         printf
+# define GFP_KERNEL     0
+# define __get_free_pages(x, y) ((unsigned long)mmap(NULL, PAGE_SIZE << (y), \
+                                                     PROT_READ|PROT_WRITE,   \
+                                                     MAP_PRIVATE|MAP_ANONYMOUS,\
+                                                     0, 0))
+# define free_pages(x, y)       munmap((void *)(x), (y)*PAGE_SIZE)
+
+static inline void cpu_relax(void)
+{
+        /* Nothing */
+}
+
+#undef  HZ
+#define HZ 1000
+static inline uint32_t raid6_jiffies(void)
+{
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        return tv.tv_sec*1000 + tv.tv_usec/1000;
+}
+
+#endif /* ! __KERNEL__ */
+
+#endif /* LINUX_RAID_RAID6_H */
diff --git a/include/linux/raid/raid0.h b/include/linux/raid/raid0.h
deleted file mode 100644
index fd42aa87c391..000000000000
--- a/include/linux/raid/raid0.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _RAID0_H
-#define _RAID0_H
-
-#include <linux/raid/md.h>
-
-struct strip_zone
-{
-        sector_t zone_start;    /* Zone offset in md_dev (in sectors) */
-        sector_t dev_start;     /* Zone offset in real dev (in sectors) */
-        sector_t sectors;       /* Zone size in sectors */
-        int nb_dev;             /* # of devices attached to the zone */
-        mdk_rdev_t **dev;       /* Devices attached to the zone */
-};
-
-struct raid0_private_data
-{
-        struct strip_zone **hash_table; /* Table of indexes into strip_zone */
-        struct strip_zone *strip_zone;
-        mdk_rdev_t **devlist; /* lists of rdevs, pointed to by strip_zone->dev */
-        int nr_strip_zones;
-
-        sector_t spacing;
-        int sector_shift; /* shift this before divide by spacing */
-};
-
-typedef struct raid0_private_data raid0_conf_t;
-
-#define mddev_to_conf(mddev) ((raid0_conf_t *) mddev->private)
-
-#endif
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
deleted file mode 100644
index 0a9ba7c3302e..000000000000
--- a/include/linux/raid/raid1.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _RAID1_H
-#define _RAID1_H
-
-#include <linux/raid/md.h>
-
-typedef struct mirror_info mirror_info_t;
-
-struct mirror_info {
-        mdk_rdev_t      *rdev;
-        sector_t        head_position;
-};
-
-/*
- * memory pools need a pointer to the mddev, so they can force an unplug
- * when memory is tight, and a count of the number of drives that the
- * pool was allocated for, so they know how much to allocate and free.
- * mddev->raid_disks cannot be used, as it can change while a pool is active
- * These two datums are stored in a kmalloced struct.
- */
-
-struct pool_info {
-        mddev_t *mddev;
-        int     raid_disks;
-};
-
-
-typedef struct r1bio_s r1bio_t;
-
-struct r1_private_data_s {
-        mddev_t                 *mddev;
-        mirror_info_t           *mirrors;
-        int                     raid_disks;
-        int                     last_used;
-        sector_t                next_seq_sect;
-        spinlock_t              device_lock;
-
-        struct list_head        retry_list;
-        /* queue pending writes and submit them on unplug */
-        struct bio_list         pending_bio_list;
-        /* queue of writes that have been unplugged */
-        struct bio_list         flushing_bio_list;
-
-        /* for use when syncing mirrors: */
-
-        spinlock_t              resync_lock;
-        int                     nr_pending;
-        int                     nr_waiting;
-        int                     nr_queued;
-        int                     barrier;
-        sector_t                next_resync;
-        int                     fullsync;  /* set to 1 if a full sync is needed,
-                                            * (fresh device added).
-                                            * Cleared when a sync completes.
-                                            */
-
-        wait_queue_head_t       wait_barrier;
-
-        struct pool_info        *poolinfo;
-
-        struct page             *tmppage;
-
-        mempool_t *r1bio_pool;
-        mempool_t *r1buf_pool;
-};
-
-typedef struct r1_private_data_s conf_t;
-
-/*
- * this is the only point in the RAID code where we violate
- * C type safety. mddev->private is an 'opaque' pointer.
- */
-#define mddev_to_conf(mddev) ((conf_t *) mddev->private)
-
-/*
- * this is our 'private' RAID1 bio.
- *
- * it contains information about what kind of IO operations were started
- * for this RAID1 operation, and about their status:
- */
-
-struct r1bio_s {
-        atomic_t                remaining; /* 'have we finished' count,
-                                            * used from IRQ handlers
-                                            */
-        atomic_t                behind_remaining; /* number of write-behind ios remaining
-                                                 * in this BehindIO request
-                                                 */
-        sector_t                sector;
-        int                     sectors;
-        unsigned long           state;
-        mddev_t                 *mddev;
-        /*
-         * original bio going to /dev/mdx
-         */
-        struct bio              *master_bio;
-        /*
-         * if the IO is in READ direction, then this is where we read
-         */
-        int                     read_disk;
-
-        struct list_head        retry_list;
-        struct bitmap_update    *bitmap_update;
-        /*
-         * if the IO is in WRITE direction, then multiple bios are used.
-         * We choose the number when they are allocated.
-         */
-        struct bio              *bios[0];
-        /* DO NOT PUT ANY NEW FIELDS HERE - bios array is contiguously alloced*/
-};
-
-/* when we get a read error on a read-only array, we redirect to another
- * device without failing the first device, or trying to over-write to
- * correct the read error.  To keep track of bad blocks on a per-bio
- * level, we store IO_BLOCKED in the appropriate 'bios' pointer
- */
-#define IO_BLOCKED ((struct bio*)1)
-
-/* bits for r1bio.state */
-#define R1BIO_Uptodate  0
-#define R1BIO_IsSync    1
-#define R1BIO_Degraded  2
-#define R1BIO_BehindIO  3
-#define R1BIO_Barrier   4
-#define R1BIO_BarrierRetry 5
-/* For write-behind requests, we call bi_end_io when
- * the last non-write-behind device completes, providing
- * any write was successful.  Otherwise we call when
- * any write-behind write succeeds, otherwise we call
- * with failure when last write completes (and all failed).
- * Record that bi_end_io was called with this flag...
- */
-#define R1BIO_Returned 6
-
-#endif
diff --git a/include/linux/raid/raid10.h b/include/linux/raid/raid10.h
deleted file mode 100644
index e9091cfeb286..000000000000
--- a/include/linux/raid/raid10.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef _RAID10_H
-#define _RAID10_H
-
-#include <linux/raid/md.h>
-
-typedef struct mirror_info mirror_info_t;
-
-struct mirror_info {
-        mdk_rdev_t      *rdev;
-        sector_t        head_position;
-};
-
-typedef struct r10bio_s r10bio_t;
-
-struct r10_private_data_s {
-        mddev_t                 *mddev;
-        mirror_info_t           *mirrors;
-        int                     raid_disks;
-        spinlock_t              device_lock;
-
-        /* geometry */
-        int                     near_copies;  /* number of copies layed out raid0 style */
-        int                     far_copies;   /* number of copies layed out
-                                               * at large strides across drives
-                                               */
-        int                     far_offset;   /* far_copies are offset by 1 stripe
-                                               * instead of many
-                                               */
-        int                     copies;       /* near_copies * far_copies.
-                                               * must be <= raid_disks
-                                               */
-        sector_t                stride;       /* distance between far copies.
-                                               * This is size / far_copies unless
-                                               * far_offset, in which case it is
-                                               * 1 stripe.
-                                               */
-
-        int chunk_shift; /* shift from chunks to sectors */
-        sector_t chunk_mask;
-
-        struct list_head        retry_list;
-        /* queue pending writes and submit them on unplug */
-        struct bio_list         pending_bio_list;
-
-
-        spinlock_t              resync_lock;
-        int nr_pending;
-        int nr_waiting;
-        int nr_queued;
-        int barrier;
-        sector_t                next_resync;
-        int                     fullsync;  /* set to 1 if a full sync is needed,
-                                            * (fresh device added).
-                                            * Cleared when a sync completes.
-                                            */
-
-        wait_queue_head_t       wait_barrier;
-
-        mempool_t *r10bio_pool;
-        mempool_t *r10buf_pool;
-        struct page             *tmppage;
-};
-
-typedef struct r10_private_data_s conf_t;
-
-/*
- * this is the only point in the RAID code where we violate
- * C type safety. mddev->private is an 'opaque' pointer.
- */
-#define mddev_to_conf(mddev) ((conf_t *) mddev->private)
-
-/*
- * this is our 'private' RAID10 bio.
- *
- * it contains information about what kind of IO operations were started
- * for this RAID10 operation, and about their status:
- */
-
-struct r10bio_s {
-        atomic_t                remaining; /* 'have we finished' count,
-                                            * used from IRQ handlers
-                                            */
-        sector_t                sector; /* virtual sector number */
-        int                     sectors;
-        unsigned long           state;
-        mddev_t                 *mddev;
-        /*
-         * original bio going to /dev/mdx
-         */
-        struct bio              *master_bio;
-        /*
-         * if the IO is in READ direction, then this is where we read
-         */
-        int                     read_slot;
-
-        struct list_head        retry_list;
-        /*
-         * if the IO is in WRITE direction, then multiple bios are used,
-         * one for each copy.
-         * When resyncing we also use one for each copy.
-         * When reconstructing, we use 2 bios, one for read, one for write.
-         * We choose the number when they are allocated.
-         */
-        struct {
-                struct bio              *bio;
-                sector_t addr;
-                int devnum;
-        } devs[0];
-};
-
-/* when we get a read error on a read-only array, we redirect to another
- * device without failing the first device, or trying to over-write to
- * correct the read error.  To keep track of bad blocks on a per-bio
- * level, we store IO_BLOCKED in the appropriate 'bios' pointer
- */
-#define IO_BLOCKED ((struct bio*)1)
-
-/* bits for r10bio.state */
-#define R10BIO_Uptodate 0
-#define R10BIO_IsSync   1
-#define R10BIO_IsRecover 2
-#define R10BIO_Degraded 3
-#endif
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
deleted file mode 100644
index 3b2672792457..000000000000
--- a/include/linux/raid/raid5.h
+++ /dev/null
@@ -1,402 +0,0 @@
-#ifndef _RAID5_H
-#define _RAID5_H
-
-#include <linux/raid/md.h>
-#include <linux/raid/xor.h>
-
-/*
- *
- * Each stripe contains one buffer per disc.  Each buffer can be in
- * one of a number of states stored in "flags".  Changes between
- * these states happen *almost* exclusively under a per-stripe
- * spinlock.  Some very specific changes can happen in bi_end_io, and
- * these are not protected by the spin lock.
- *
- * The flag bits that are used to represent these states are:
- *   R5_UPTODATE and R5_LOCKED
- *
- * State Empty == !UPTODATE, !LOCK
- *        We have no data, and there is no active request
- * State Want == !UPTODATE, LOCK
- *        A read request is being submitted for this block
- * State Dirty == UPTODATE, LOCK
- *        Some new data is in this buffer, and it is being written out
- * State Clean == UPTODATE, !LOCK
- *        We have valid data which is the same as on disc
- *
- * The possible state transitions are:
- *
- *  Empty -> Want   - on read or write to get old data for  parity calc
- *  Empty -> Dirty  - on compute_parity to satisfy write/sync request.(RECONSTRUCT_WRITE)
- *  Empty -> Clean  - on compute_block when computing a block for failed drive
- *  Want  -> Empty  - on failed read
- *  Want  -> Clean  - on successful completion of read request
- *  Dirty -> Clean  - on successful completion of write request
- *  Dirty -> Clean  - on failed write
- *  Clean -> Dirty  - on compute_parity to satisfy write/sync (RECONSTRUCT or RMW)
- *
- * The Want->Empty, Want->Clean, Dirty->Clean, transitions
- * all happen in b_end_io at interrupt time.
- * Each sets the Uptodate bit before releasing the Lock bit.
- * This leaves one multi-stage transition:
- *    Want->Dirty->Clean
- * This is safe because thinking that a Clean buffer is actually dirty
- * will at worst delay some action, and the stripe will be scheduled
- * for attention after the transition is complete.
- *
- * There is one possibility that is not covered by these states.  That
- * is if one drive has failed and there is a spare being rebuilt.  We
- * can't distinguish between a clean block that has been generated
- * from parity calculations, and a clean block that has been
- * successfully written to the spare ( or to parity when resyncing).
- * To distingush these states we have a stripe bit STRIPE_INSYNC that
- * is set whenever a write is scheduled to the spare, or to the parity
- * disc if there is no spare.  A sync request clears this bit, and
- * when we find it set with no buffers locked, we know the sync is
- * complete.
- *
- * Buffers for the md device that arrive via make_request are attached
- * to the appropriate stripe in one of two lists linked on b_reqnext.
- * One list (bh_read) for read requests, one (bh_write) for write.
- * There should never be more than one buffer on the two lists
- * together, but we are not guaranteed of that so we allow for more.
- *
- * If a buffer is on the read list when the associated cache buffer is
- * Uptodate, the data is copied into the read buffer and it's b_end_io
- * routine is called.  This may happen in the end_request routine only
- * if the buffer has just successfully been read.  end_request should
- * remove the buffers from the list and then set the Uptodate bit on
- * the buffer.  Other threads may do this only if they first check
- * that the Uptodate bit is set.  Once they have checked that they may
- * take buffers off the read queue.
- *
- * When a buffer on the write list is committed for write it is copied
- * into the cache buffer, which is then marked dirty, and moved onto a
- * third list, the written list (bh_written).  Once both the parity
- * block and the cached buffer are successfully written, any buffer on
- * a written list can be returned with b_end_io.
- *
- * The write list and read list both act as fifos.  The read list is
- * protected by the device_lock.  The write and written lists are
- * protected by the stripe lock.  The device_lock, which can be
- * claimed while the stipe lock is held, is only for list
- * manipulations and will only be held for a very short time.  It can
- * be claimed from interrupts.
- *
- *
- * Stripes in the stripe cache can be on one of two lists (or on
- * neither).  The "inactive_list" contains stripes which are not
- * currently being used for any request.  They can freely be reused
- * for another stripe.  The "handle_list" contains stripes that need
- * to be handled in some way.  Both of these are fifo queues.  Each
- * stripe is also (potentially) linked to a hash bucket in the hash
- * table so that it can be found by sector number.  Stripes that are
- * not hashed must be on the inactive_list, and will normally be at
- * the front.  All stripes start life this way.
- *
- * The inactive_list, handle_list and hash bucket lists are all protected by the
- * device_lock.
- *  - stripes on the inactive_list never have their stripe_lock held.
- *  - stripes have a reference counter. If count==0, they are on a list.
- *  - If a stripe might need handling, STRIPE_HANDLE is set.
- *  - When refcount reaches zero, then if STRIPE_HANDLE it is put on
- *    handle_list else inactive_list
- *
- * This, combined with the fact that STRIPE_HANDLE is only ever
- * cleared while a stripe has a non-zero count means that if the
- * refcount is 0 and STRIPE_HANDLE is set, then it is on the
- * handle_list and if recount is 0 and STRIPE_HANDLE is not set, then
- * the stripe is on inactive_list.
- *
- * The possible transitions are:
- *  activate an unhashed/inactive stripe (get_active_stripe())
- *     lockdev check-hash unlink-stripe cnt++ clean-stripe hash-stripe unlockdev
- *  activate a hashed, possibly active stripe (get_active_stripe())
- *     lockdev check-hash if(!cnt++)unlink-stripe unlockdev
- *  attach a request to an active stripe (add_stripe_bh())
- *     lockdev attach-buffer unlockdev
- *  handle a stripe (handle_stripe())
- *     lockstripe clrSTRIPE_HANDLE ...
- *              (lockdev check-buffers unlockdev) ..
- *              change-state ..
- *              record io/ops needed unlockstripe schedule io/ops
- *  release an active stripe (release_stripe())
- *     lockdev if (!--cnt) { if  STRIPE_HANDLE, add to handle_list else add to inactive-list } unlockdev
- *
- * The refcount counts each thread that have activated the stripe,
- * plus raid5d if it is handling it, plus one for each active request
- * on a cached buffer, and plus one if the stripe is undergoing stripe
- * operations.
- *
- * Stripe operations are performed outside the stripe lock,
- * the stripe operations are:
- * -copying data between the stripe cache and user application buffers
- * -computing blocks to save a disk access, or to recover a missing block
- * -updating the parity on a write operation (reconstruct write and
- *  read-modify-write)
- * -checking parity correctness
- * -running i/o to disk
- * These operations are carried out by raid5_run_ops which uses the async_tx
- * api to (optionally) offload operations to dedicated hardware engines.
- * When requesting an operation handle_stripe sets the pending bit for the
- * operation and increments the count.  raid5_run_ops is then run whenever
- * the count is non-zero.
- * There are some critical dependencies between the operations that prevent some
- * from being requested while another is in flight.
- * 1/ Parity check operations destroy the in cache version of the parity block,
- *    so we prevent parity dependent operations like writes and compute_blocks
- *    from starting while a check is in progress.  Some dma engines can perform
- *    the check without damaging the parity block, in these cases the parity
- *    block is re-marked up to date (assuming the check was successful) and is
- *    not re-read from disk.
- * 2/ When a write operation is requested we immediately lock the affected
- *    blocks, and mark them as not up to date.  This causes new read requests
- *    to be held off, as well as parity checks and compute block operations.
- * 3/ Once a compute block operation has been requested handle_stripe treats
- *    that block as if it is up to date.  raid5_run_ops guaruntees that any
- *    operation that is dependent on the compute block result is initiated after
- *    the compute block completes.
- */
-
-/*
- * Operations state - intermediate states that are visible outside of sh->lock
- * In general _idle indicates nothing is running, _run indicates a data
- * processing operation is active, and _result means the data processing result
- * is stable and can be acted upon.  For simple operations like biofill and
- * compute that only have an _idle and _run state they are indicated with
- * sh->state flags (STRIPE_BIOFILL_RUN and STRIPE_COMPUTE_RUN)
- */
-/**
- * enum check_states - handles syncing / repairing a stripe
- * @check_state_idle - check operations are quiesced
- * @check_state_run - check operation is running
- * @check_state_result - set outside lock when check result is valid
- * @check_state_compute_run - check failed and we are repairing
- * @check_state_compute_result - set outside lock when compute result is valid
- */
-enum check_states {
-        check_state_idle = 0,
-        check_state_run, /* parity check */
-        check_state_check_result,
-        check_state_compute_run, /* parity repair */
-        check_state_compute_result,
-};
-
-/**
- * enum reconstruct_states - handles writing or expanding a stripe
- */
-enum reconstruct_states {
-        reconstruct_state_idle = 0,
-        reconstruct_state_prexor_drain_run,     /* prexor-write */
-        reconstruct_state_drain_run,            /* write */
-        reconstruct_state_run,                  /* expand */
-        reconstruct_state_prexor_drain_result,
-        reconstruct_state_drain_result,
-        reconstruct_state_result,
-};
-
-struct stripe_head {
-        struct hlist_node       hash;
-        struct list_head        lru;                    /* inactive_list or handle_list */
-        struct raid5_private_data       *raid_conf;
-        sector_t                sector;                 /* sector of this row */
-        int                     pd_idx;                 /* parity disk index */
-        unsigned long           state;                  /* state flags */
-        atomic_t                count;                  /* nr of active thread/requests */
-        spinlock_t              lock;
-        int                     bm_seq; /* sequence number for bitmap flushes */
-        int                     disks;                  /* disks in stripe */
-        enum check_states       check_state;
-        enum reconstruct_states reconstruct_state;
-        /* stripe_operations
-         * @target - STRIPE_OP_COMPUTE_BLK target
-         */
-        struct stripe_operations {
-                int                target;
-                u32                zero_sum_result;
-        } ops;
-        struct r5dev {
-                struct bio      req;
-                struct bio_vec  vec;
-                struct page     *page;
-                struct bio      *toread, *read, *towrite, *written;
-                sector_t        sector;                 /* sector of this page */
-                unsigned long   flags;
-        } dev[1]; /* allocated with extra space depending of RAID geometry */
-};
-
-/* stripe_head_state - collects and tracks the dynamic state of a stripe_head
- *     for handle_stripe.  It is only valid under spin_lock(sh->lock);
- */
-struct stripe_head_state {
-        int syncing, expanding, expanded;
-        int locked, uptodate, to_read, to_write, failed, written;
-        int to_fill, compute, req_compute, non_overwrite;
-        int failed_num;
-        unsigned long ops_request;
-};
-
-/* r6_state - extra state data only relevant to r6 */
-struct r6_state {
-        int p_failed, q_failed, qd_idx, failed_num[2];
-};
-
-/* Flags */
-#define R5_UPTODATE     0       /* page contains current data */
-#define R5_LOCKED       1       /* IO has been submitted on "req" */
-#define R5_OVERWRITE    2       /* towrite covers whole page */
-/* and some that are internal to handle_stripe */
-#define R5_Insync       3       /* rdev && rdev->in_sync at start */
-#define R5_Wantread     4       /* want to schedule a read */
-#define R5_Wantwrite    5
-#define R5_Overlap      7       /* There is a pending overlapping request on this block */
-#define R5_ReadError    8       /* seen a read error here recently */
-#define R5_ReWrite      9       /* have tried to over-write the readerror */
-
-#define R5_Expanded     10      /* This block now has post-expand data */
-#define R5_Wantcompute  11 /* compute_block in progress treat as
-                                    * uptodate
-                                    */
-#define R5_Wantfill     12 /* dev->toread contains a bio that needs
-                                    * filling
-                                    */
-#define R5_Wantdrain    13 /* dev->towrite needs to be drained */
-/*
- * Write method
- */
-#define RECONSTRUCT_WRITE       1
-#define READ_MODIFY_WRITE       2
-/* not a write method, but a compute_parity mode */
-#define CHECK_PARITY            3
-
-/*
- * Stripe state
- */
-#define STRIPE_HANDLE           2
-#define STRIPE_SYNCING          3
-#define STRIPE_INSYNC           4
-#define STRIPE_PREREAD_ACTIVE   5
-#define STRIPE_DELAYED          6
-#define STRIPE_DEGRADED         7
-#define STRIPE_BIT_DELAY        8
-#define STRIPE_EXPANDING        9
-#define STRIPE_EXPAND_SOURCE    10
-#define STRIPE_EXPAND_READY     11
-#define STRIPE_IO_STARTED       12 /* do not count towards 'bypass_count' */
-#define STRIPE_FULL_WRITE       13 /* all blocks are set to be overwritten */
-#define STRIPE_BIOFILL_RUN      14
-#define STRIPE_COMPUTE_RUN      15
-/*
- * Operation request flags
- */
-#define STRIPE_OP_BIOFILL       0
-#define STRIPE_OP_COMPUTE_BLK   1
-#define STRIPE_OP_PREXOR        2
-#define STRIPE_OP_BIODRAIN      3
-#define STRIPE_OP_POSTXOR       4
-#define STRIPE_OP_CHECK 5
-
-/*
- * Plugging:
- *
- * To improve write throughput, we need to delay the handling of some
- * stripes until there has been a chance that several write requests
- * for the one stripe have all been collected.
- * In particular, any write request that would require pre-reading
- * is put on a "delayed" queue until there are no stripes currently
- * in a pre-read phase.  Further, if the "delayed" queue is empty when
- * a stripe is put on it then we "plug" the queue and do not process it
- * until an unplug call is made. (the unplug_io_fn() is called).
- *
- * When preread is initiated on a stripe, we set PREREAD_ACTIVE and add
- * it to the count of prereading stripes.
- * When write is initiated, or the stripe refcnt == 0 (just in case) we
- * clear the PREREAD_ACTIVE flag and decrement the count
- * Whenever the 'handle' queue is empty and the device is not plugged, we
- * move any strips from delayed to handle and clear the DELAYED flag and set
- * PREREAD_ACTIVE.
- * In stripe_handle, if we find pre-reading is necessary, we do it if
- * PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.
- * HANDLE gets cleared if stripe_handle leave nothing locked.
- */
- 
-
-struct disk_info {
-        mdk_rdev_t      *rdev;
-};
-
-struct raid5_private_data {
-        struct hlist_head       *stripe_hashtbl;
-        mddev_t                 *mddev;
-        struct disk_info        *spare;
-        int                     chunk_size, level, algorithm;
-        int                     max_degraded;
-        int                     raid_disks;
-        int                     max_nr_stripes;
-
-        /* used during an expand */
-        sector_t                expand_progress;        /* MaxSector when no expand happening */
-        sector_t                expand_lo; /* from here up to expand_progress it out-of-bounds
-                                            * as we haven't flushed the metadata yet
-                                            */
-        int                     previous_raid_disks;
-
-        struct list_head        handle_list; /* stripes needing handling */
-        struct list_head        hold_list; /* preread ready stripes */
-        struct list_head        delayed_list; /* stripes that have plugged requests */
-        struct list_head        bitmap_list; /* stripes delaying awaiting bitmap update */
-        struct bio              *retry_read_aligned; /* currently retrying aligned bios   */
-        struct bio              *retry_read_aligned_list; /* aligned bios retry list  */
-        atomic_t                preread_active_stripes; /* stripes with scheduled io */
-        atomic_t                active_aligned_reads;
-        atomic_t                pending_full_writes; /* full write backlog */
-        int                     bypass_count; /* bypassed prereads */
-        int                     bypass_threshold; /* preread nice */
-        struct list_head        *last_hold; /* detect hold_list promotions */
-
-        atomic_t                reshape_stripes; /* stripes with pending writes for reshape */
-        /* unfortunately we need two cache names as we temporarily have
-         * two caches.
-         */
-        int                     active_name;
-        char                    cache_name[2][20];
-        struct kmem_cache               *slab_cache; /* for allocating stripes */
-
-        int                     seq_flush, seq_write;
-        int                     quiesce;
-
-        int                     fullsync;  /* set to 1 if a full sync is needed,
-                                            * (fresh device added).
-                                            * Cleared when a sync completes.
-                                            */
-
-        struct page             *spare_page; /* Used when checking P/Q in raid6 */
-
-        /*
-         * Free stripes pool
-         */
-        atomic_t                active_stripes;
-        struct list_head        inactive_list;
-        wait_queue_head_t       wait_for_stripe;
-        wait_queue_head_t       wait_for_overlap;
-        int                     inactive_blocked;       /* release of inactive stripes blocked,
-                                                         * waiting for 25% to be free
-                                                         */
-        int                     pool_size; /* number of disks in stripeheads in pool */
-        spinlock_t              device_lock;
-        struct disk_info        *disks;
-};
-
-typedef struct raid5_private_data raid5_conf_t;
-
-#define mddev_to_conf(mddev) ((raid5_conf_t *) mddev->private)
-
-/*
- * Our supported algorithms
- */
-#define ALGORITHM_LEFT_ASYMMETRIC       0
-#define ALGORITHM_RIGHT_ASYMMETRIC      1
-#define ALGORITHM_LEFT_SYMMETRIC        2
-#define ALGORITHM_RIGHT_SYMMETRIC       3
-
-#endif
diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h
index 3e120587eada..5a210959e3f8 100644
--- a/include/linux/raid/xor.h
+++ b/include/linux/raid/xor.h
@@ -1,8 +1,6 @@
 #ifndef _XOR_H
 #define _XOR_H
 
-#include <linux/raid/md.h>
-
 #define MAX_XOR_BLOCKS 4
 
 extern void xor_blocks(unsigned int count, unsigned int bytes,
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index 80044a4f3ab9..bfd92e1e5d2c 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 
@@ -108,25 +107,14 @@ struct rcu_data {
         struct rcu_head barrier;
 };
 
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
-
 /*
  * Increment the quiescent state counter.
  * The counter is a bit degenerated: We do not need to know
  * how many quiescent states passed, just if there was at least
  * one since the start of the grace period. Thus just a flag.
  */
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-}
+extern void rcu_qsctr_inc(int cpu);
+extern void rcu_bh_qsctr_inc(int cpu);
 
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 528343e6da51..15fbb3ca634d 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 #include <linux/lockdep.h>
diff --git a/include/linux/rcupreempt.h b/include/linux/rcupreempt.h
index 74304b4538d8..fce522782ffa 100644
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
@@ -36,34 +36,19 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
+#include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 
-struct rcu_dyntick_sched {
-        int dynticks;
-        int dynticks_snap;
-        int sched_qs;
-        int sched_qs_snap;
-        int sched_dynticks_snap;
-};
-
-DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched);
-
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
-
-        rdssp->sched_qs++;
-}
-#define rcu_bh_qsctr_inc(cpu)
+extern void rcu_qsctr_inc(int cpu);
+static inline void rcu_bh_qsctr_inc(int cpu) { }
 
 /*
  * Someone might want to pass call_rcu_bh as a function pointer.
  * So this needs to just be a rename and not a macro function.
  *  (no parentheses)
  */
-#define call_rcu_bh             call_rcu
+#define call_rcu_bh             call_rcu
 
 /**
  * call_rcu_sched - Queue RCU callback for invocation after sched grace period.
@@ -117,30 +102,12 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu);
 struct softirq_action;
 
 #ifdef CONFIG_NO_HZ
-
-static inline void rcu_enter_nohz(void)
-{
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
-
-        smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        WARN_ON_RATELIMIT(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1, &rs);
-}
-
-static inline void rcu_exit_nohz(void)
-{
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
-
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
-        WARN_ON_RATELIMIT(!(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1),
-                                &rs);
-}
-
-#else /* CONFIG_NO_HZ */
-#define rcu_enter_nohz()        do { } while (0)
-#define rcu_exit_nohz()         do { } while (0)
-#endif /* CONFIG_NO_HZ */
+extern void rcu_enter_nohz(void);
+extern void rcu_exit_nohz(void);
+#else
+# define rcu_enter_nohz()       do { } while (0)
+# define rcu_exit_nohz()        do { } while (0)
+#endif
 
 /*
  * A context switch is a grace period for rcupreempt synchronize_rcu()
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index a722fb67bb2d..58b2aa5312b9 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -33,7 +33,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 
@@ -162,9 +161,8 @@ struct rcu_data {
         unsigned long offline_fqs;      /* Kicked due to being offline. */
         unsigned long resched_ipi;      /* Sent a resched IPI. */
 
-        /* 5) state to allow this CPU to force_quiescent_state on others */
+        /* 5) For future __rcu_pending statistics. */
         long n_rcu_pending;             /* rcu_pending() calls since boot. */
-        long n_rcu_pending_force_qs;    /* when to force quiescent states. */
 
         int cpu;
 };
@@ -236,30 +234,8 @@ struct rcu_state {
 #endif /* #ifdef CONFIG_NO_HZ */
 };
 
-extern struct rcu_state rcu_state;
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
-
-extern struct rcu_state rcu_bh_state;
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
-
-/*
- * Increment the quiescent state counter.
- * The counter is a bit degenerated: We do not need to know
- * how many quiescent states passed, just if there was at least
- * one since the start of the grace period. Thus just a flag.
- */
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
+extern void rcu_qsctr_inc(int cpu);
+extern void rcu_bh_qsctr_inc(int cpu);
 
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/rds.h b/include/linux/rds.h
new file mode 100644
index 000000000000..d91dc91f5443
--- /dev/null
+++ b/include/linux/rds.h
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2008 Oracle.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     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.
+ *
+ * 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 _LINUX_RDS_H
+#define _LINUX_RDS_H
+
+#include <linux/types.h>
+
+/* These sparse annotated types shouldn't be in any user
+ * visible header file. We should clean this up rather
+ * than kludging around them. */
+#ifndef __KERNEL__
+#define __be16  u_int16_t
+#define __be32  u_int32_t
+#define __be64  u_int64_t
+#endif
+
+#define RDS_IB_ABI_VERSION              0x301
+
+/*
+ * setsockopt/getsockopt for SOL_RDS
+ */
+#define RDS_CANCEL_SENT_TO              1
+#define RDS_GET_MR                      2
+#define RDS_FREE_MR                     3
+/* deprecated: RDS_BARRIER 4 */
+#define RDS_RECVERR                     5
+#define RDS_CONG_MONITOR                6
+
+/*
+ * Control message types for SOL_RDS.
+ *
+ * CMSG_RDMA_ARGS (sendmsg)
+ *      Request a RDMA transfer to/from the specified
+ *      memory ranges.
+ *      The cmsg_data is a struct rds_rdma_args.
+ * RDS_CMSG_RDMA_DEST (recvmsg, sendmsg)
+ *      Kernel informs application about intended
+ *      source/destination of a RDMA transfer
+ * RDS_CMSG_RDMA_MAP (sendmsg)
+ *      Application asks kernel to map the given
+ *      memory range into a IB MR, and send the
+ *      R_Key along in an RDS extension header.
+ *      The cmsg_data is a struct rds_get_mr_args,
+ *      the same as for the GET_MR setsockopt.
+ * RDS_CMSG_RDMA_STATUS (recvmsg)
+ *      Returns the status of a completed RDMA operation.
+ */
+#define RDS_CMSG_RDMA_ARGS              1
+#define RDS_CMSG_RDMA_DEST              2
+#define RDS_CMSG_RDMA_MAP               3
+#define RDS_CMSG_RDMA_STATUS            4
+#define RDS_CMSG_CONG_UPDATE            5
+
+#define RDS_INFO_FIRST                  10000
+#define RDS_INFO_COUNTERS               10000
+#define RDS_INFO_CONNECTIONS            10001
+/* 10002 aka RDS_INFO_FLOWS is deprecated */
+#define RDS_INFO_SEND_MESSAGES          10003
+#define RDS_INFO_RETRANS_MESSAGES       10004
+#define RDS_INFO_RECV_MESSAGES          10005
+#define RDS_INFO_SOCKETS                10006
+#define RDS_INFO_TCP_SOCKETS            10007
+#define RDS_INFO_IB_CONNECTIONS         10008
+#define RDS_INFO_CONNECTION_STATS       10009
+#define RDS_INFO_IWARP_CONNECTIONS      10010
+#define RDS_INFO_LAST                   10010
+
+struct rds_info_counter {
+        u_int8_t        name[32];
+        u_int64_t       value;
+} __attribute__((packed));
+
+#define RDS_INFO_CONNECTION_FLAG_SENDING        0x01
+#define RDS_INFO_CONNECTION_FLAG_CONNECTING     0x02
+#define RDS_INFO_CONNECTION_FLAG_CONNECTED      0x04
+
+#define TRANSNAMSIZ     16
+
+struct rds_info_connection {
+        u_int64_t       next_tx_seq;
+        u_int64_t       next_rx_seq;
+        __be32          laddr;
+        __be32          faddr;
+        u_int8_t        transport[TRANSNAMSIZ];         /* null term ascii */
+        u_int8_t        flags;
+} __attribute__((packed));
+
+struct rds_info_flow {
+        __be32          laddr;
+        __be32          faddr;
+        u_int32_t       bytes;
+        __be16          lport;
+        __be16          fport;
+} __attribute__((packed));
+
+#define RDS_INFO_MESSAGE_FLAG_ACK               0x01
+#define RDS_INFO_MESSAGE_FLAG_FAST_ACK          0x02
+
+struct rds_info_message {
+        u_int64_t       seq;
+        u_int32_t       len;
+        __be32          laddr;
+        __be32          faddr;
+        __be16          lport;
+        __be16          fport;
+        u_int8_t        flags;
+} __attribute__((packed));
+
+struct rds_info_socket {
+        u_int32_t       sndbuf;
+        __be32          bound_addr;
+        __be32          connected_addr;
+        __be16          bound_port;
+        __be16          connected_port;
+        u_int32_t       rcvbuf;
+        u_int64_t       inum;
+} __attribute__((packed));
+
+#define RDS_IB_GID_LEN  16
+struct rds_info_rdma_connection {
+        __be32          src_addr;
+        __be32          dst_addr;
+        uint8_t         src_gid[RDS_IB_GID_LEN];
+        uint8_t         dst_gid[RDS_IB_GID_LEN];
+
+        uint32_t        max_send_wr;
+        uint32_t        max_recv_wr;
+        uint32_t        max_send_sge;
+        uint32_t        rdma_mr_max;
+        uint32_t        rdma_mr_size;
+};
+
+/*
+ * Congestion monitoring.
+ * Congestion control in RDS happens at the host connection
+ * level by exchanging a bitmap marking congested ports.
+ * By default, a process sleeping in poll() is always woken
+ * up when the congestion map is updated.
+ * With explicit monitoring, an application can have more
+ * fine-grained control.
+ * The application installs a 64bit mask value in the socket,
+ * where each bit corresponds to a group of ports.
+ * When a congestion update arrives, RDS checks the set of
+ * ports that are now uncongested against the list bit mask
+ * installed in the socket, and if they overlap, we queue a
+ * cong_notification on the socket.
+ *
+ * To install the congestion monitor bitmask, use RDS_CONG_MONITOR
+ * with the 64bit mask.
+ * Congestion updates are received via RDS_CMSG_CONG_UPDATE
+ * control messages.
+ *
+ * The correspondence between bits and ports is
+ *      1 << (portnum % 64)
+ */
+#define RDS_CONG_MONITOR_SIZE   64
+#define RDS_CONG_MONITOR_BIT(port)  (((unsigned int) port) % RDS_CONG_MONITOR_SIZE)
+#define RDS_CONG_MONITOR_MASK(port) (1ULL << RDS_CONG_MONITOR_BIT(port))
+
+/*
+ * RDMA related types
+ */
+
+/*
+ * This encapsulates a remote memory location.
+ * In the current implementation, it contains the R_Key
+ * of the remote memory region, and the offset into it
+ * (so that the application does not have to worry about
+ * alignment).
+ */
+typedef u_int64_t       rds_rdma_cookie_t;
+
+struct rds_iovec {
+        u_int64_t       addr;
+        u_int64_t       bytes;
+};
+
+struct rds_get_mr_args {
+        struct rds_iovec vec;
+        u_int64_t       cookie_addr;
+        uint64_t        flags;
+};
+
+struct rds_free_mr_args {
+        rds_rdma_cookie_t cookie;
+        u_int64_t       flags;
+};
+
+struct rds_rdma_args {
+        rds_rdma_cookie_t cookie;
+        struct rds_iovec remote_vec;
+        u_int64_t       local_vec_addr;
+        u_int64_t       nr_local;
+        u_int64_t       flags;
+        u_int64_t       user_token;
+};
+
+struct rds_rdma_notify {
+        u_int64_t       user_token;
+        int32_t         status;
+};
+
+#define RDS_RDMA_SUCCESS        0
+#define RDS_RDMA_REMOTE_ERROR   1
+#define RDS_RDMA_CANCELED       2
+#define RDS_RDMA_DROPPED        3
+#define RDS_RDMA_OTHER_ERROR    4
+
+/*
+ * Common set of flags for all RDMA related structs
+ */
+#define RDS_RDMA_READWRITE      0x0001
+#define RDS_RDMA_FENCE          0x0002  /* use FENCE for immediate send */
+#define RDS_RDMA_INVALIDATE     0x0004  /* invalidate R_Key after freeing MR */
+#define RDS_RDMA_USE_ONCE       0x0008  /* free MR after use */
+#define RDS_RDMA_DONTWAIT       0x0010  /* Don't wait in SET_BARRIER */
+#define RDS_RDMA_NOTIFY_ME      0x0020  /* Notify when operation completes */
+
+#endif /* IB_RDS_H */
diff --git a/include/linux/regulator/bq24022.h b/include/linux/regulator/bq24022.h
index e84b0a9feda5..a6d014005d49 100644
--- a/include/linux/regulator/bq24022.h
+++ b/include/linux/regulator/bq24022.h
@@ -10,6 +10,8 @@
  *
  */
 
+struct regulator_init_data;
+
 /**
  * bq24022_mach_info - platform data for bq24022
  * @gpio_nce: GPIO line connected to the nCE pin, used to enable / disable charging
@@ -18,4 +20,5 @@
 struct bq24022_mach_info {
         int gpio_nce;
         int gpio_iset2;
+        struct regulator_init_data *init_data;
 };
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 801bf77ff4e2..277f4b964df5 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
  *
- * Author: Liam Girdwood <lg@opensource.wolfsonmicro.com>
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  * 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
@@ -88,6 +88,7 @@
  * FAIL           Regulator output has failed.
  * OVER_TEMP      Regulator over temp.
  * FORCE_DISABLE  Regulator shut down by software.
+ * VOLTAGE_CHANGE Regulator voltage changed.
  *
  * NOTE: These events can be OR'ed together when passed into handler.
  */
@@ -98,6 +99,7 @@
 #define REGULATOR_EVENT_FAIL                    0x08
 #define REGULATOR_EVENT_OVER_TEMP               0x10
 #define REGULATOR_EVENT_FORCE_DISABLE           0x20
+#define REGULATOR_EVENT_VOLTAGE_CHANGE          0x40
 
 struct regulator;
 
@@ -140,6 +142,8 @@ int regulator_bulk_disable(int num_consumers,
 void regulator_bulk_free(int num_consumers,
                          struct regulator_bulk_data *consumers);
 
+int regulator_count_voltages(struct regulator *regulator);
+int regulator_list_voltage(struct regulator *regulator, unsigned selector);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
 int regulator_get_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 2dae05705f13..225f733e7533 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
  *
- * Author: Liam Girdwood <lg@opensource.wolfsonmicro.com>
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  * 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
@@ -21,25 +21,39 @@
 struct regulator_dev;
 struct regulator_init_data;
 
+enum regulator_status {
+        REGULATOR_STATUS_OFF,
+        REGULATOR_STATUS_ON,
+        REGULATOR_STATUS_ERROR,
+        /* fast/normal/idle/standby are flavors of "on" */
+        REGULATOR_STATUS_FAST,
+        REGULATOR_STATUS_NORMAL,
+        REGULATOR_STATUS_IDLE,
+        REGULATOR_STATUS_STANDBY,
+};
+
 /**
  * struct regulator_ops - regulator operations.
  *
- * This struct describes regulator operations which can be implemented by
- * regulator chip drivers.
- *
- * @enable: Enable the regulator.
- * @disable: Disable the regulator.
+ * @enable: Configure the regulator as enabled.
+ * @disable: Configure the regulator as disabled.
  * @is_enabled: Return 1 if the regulator is enabled, 0 otherwise.
  *
  * @set_voltage: Set the voltage for the regulator within the range specified.
  *               The driver should select the voltage closest to min_uV.
  * @get_voltage: Return the currently configured voltage for the regulator.
+ * @list_voltage: Return one of the supported voltages, in microvolts; zero
+ *      if the selector indicates a voltage that is unusable on this system;
+ *      or negative errno.  Selectors range from zero to one less than
+ *      regulator_desc.n_voltages.  Voltages may be reported in any order.
  *
  * @set_current_limit: Configure a limit for a current-limited regulator.
- * @get_current_limit: Get the limit for a current-limited regulator.
+ * @get_current_limit: Get the configured limit for a current-limited regulator.
  *
- * @set_mode: Set the operating mode for the regulator.
- * @get_mode: Get the current operating mode for the regulator.
+ * @set_mode: Set the configured operating mode for the regulator.
+ * @get_mode: Get the configured operating mode for the regulator.
+ * @get_status: Return actual (not as-configured) status of regulator, as a
+ *      REGULATOR_STATUS value (or negative errno)
  * @get_optimum_mode: Get the most efficient operating mode for the regulator
  *                    when running with the specified parameters.
  *
@@ -51,9 +65,15 @@ struct regulator_init_data;
  *                       suspended.
  * @set_suspend_mode: Set the operating mode for the regulator when the
  *                    system is suspended.
+ *
+ * This struct describes regulator operations which can be implemented by
+ * regulator chip drivers.
  */
 struct regulator_ops {
 
+        /* enumerate supported voltages */
+        int (*list_voltage) (struct regulator_dev *, unsigned selector);
+
         /* get/set regulator voltage */
         int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV);
         int (*get_voltage) (struct regulator_dev *);
@@ -72,6 +92,13 @@ struct regulator_ops {
         int (*set_mode) (struct regulator_dev *, unsigned int mode);
         unsigned int (*get_mode) (struct regulator_dev *);
 
+        /* report regulator status ... most other accessors report
+         * control inputs, this reports results of combining inputs
+         * from Linux (and other sources) with the actual load.
+         * returns REGULATOR_STATUS_* or negative errno.
+         */
+        int (*get_status)(struct regulator_dev *);
+
         /* get most efficient regulator operating mode for load */
         unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV,
                                           int output_uV, int load_uA);
@@ -106,6 +133,7 @@ enum regulator_type {
  *
  * @name: Identifying name for the regulator.
  * @id: Numerical identifier for the regulator.
+ * @n_voltages: Number of selectors available for ops.list_voltage().
  * @ops: Regulator operations table.
  * @irq: Interrupt number for the regulator.
  * @type: Indicates if the regulator is a voltage or current regulator.
@@ -114,14 +142,48 @@ enum regulator_type {
 struct regulator_desc {
         const char *name;
         int id;
+        unsigned n_voltages;
         struct regulator_ops *ops;
         int irq;
         enum regulator_type type;
         struct module *owner;
 };
 
+/*
+ * struct regulator_dev
+ *
+ * Voltage / Current regulator class device. One for each
+ * regulator.
+ *
+ * This should *not* be used directly by anything except the regulator
+ * core and notification injection (which should take the mutex and do
+ * no other direct access).
+ */
+struct regulator_dev {
+        struct regulator_desc *desc;
+        int use_count;
+
+        /* lists we belong to */
+        struct list_head list; /* list of all regulators */
+        struct list_head slist; /* list of supplied regulators */
+
+        /* lists we own */
+        struct list_head consumer_list; /* consumers we supply */
+        struct list_head supply_list; /* regulators we supply */
+
+        struct blocking_notifier_head notifier;
+        struct mutex mutex; /* consumer lock */
+        struct module *owner;
+        struct device dev;
+        struct regulation_constraints *constraints;
+        struct regulator_dev *supply;   /* for tree */
+
+        void *reg_data;         /* regulator_dev data */
+};
+
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, void *driver_data);
+        struct device *dev, struct regulator_init_data *init_data,
+        void *driver_data);
 void regulator_unregister(struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 1387a5d2190e..91b4da31f1b5 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -14,9 +14,12 @@
 #ifndef __REGULATOR_FIXED_H
 #define __REGULATOR_FIXED_H
 
+struct regulator_init_data;
+
 struct fixed_voltage_config {
         const char *supply_name;
         int microvolts;
+        struct regulator_init_data *init_data;
 };
 
 #endif
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 3794773b23d2..bac64fa390f2 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
  *
- * Author: Liam Girdwood <lg@opensource.wolfsonmicro.com>
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  * 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
@@ -73,7 +73,9 @@ struct regulator_state {
  *
  * @always_on: Set if the regulator should never be disabled.
  * @boot_on: Set if the regulator is enabled when the system is initially
- *           started.
+ *           started.  If the regulator is not enabled by the hardware or
+ *           bootloader then it will be enabled when the constraints are
+ *           applied.
  * @apply_uV: Apply the voltage constraint when initialising.
  *
  * @input_uV: Input voltage for regulator when supplied by another regulator.
@@ -83,6 +85,7 @@ struct regulator_state {
  * @state_standby: State for regulator when system is suspended in standby
  *                 mode.
  * @initial_state: Suspend state to set by default.
+ * @initial_mode: Mode to set at startup.
  */
 struct regulation_constraints {
 
@@ -111,6 +114,9 @@ struct regulation_constraints {
         struct regulator_state state_standby;
         suspend_state_t initial_state; /* suspend state to set at init */
 
+        /* mode to set on startup */
+        unsigned int initial_mode;
+
         /* constriant flags */
         unsigned always_on:1;   /* regulator never off when system is on */
         unsigned boot_on:1;     /* bootloader/firmware enabled regulator */
@@ -160,4 +166,6 @@ struct regulator_init_data {
 
 int regulator_suspend_prepare(suspend_state_t state);
 
+void regulator_has_full_constraints(void);
+
 #endif
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index fe00f781a622..8cc65757e47a 100644
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -49,13 +49,12 @@ static inline int reiserfs_acl_count(size_t size)
 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
 struct posix_acl *reiserfs_get_acl(struct inode *inode, int type);
 int reiserfs_acl_chmod(struct inode *inode);
-int reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry,
+int reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
+                                 struct inode *dir, struct dentry *dentry,
                                  struct inode *inode);
 int reiserfs_cache_default_acl(struct inode *dir);
-extern int reiserfs_xattr_posix_acl_init(void) __init;
-extern int reiserfs_xattr_posix_acl_exit(void);
-extern struct reiserfs_xattr_handler posix_acl_default_handler;
-extern struct reiserfs_xattr_handler posix_acl_access_handler;
+extern struct xattr_handler reiserfs_posix_acl_default_handler;
+extern struct xattr_handler reiserfs_posix_acl_access_handler;
 
 static inline void reiserfs_init_acl_access(struct inode *inode)
 {
@@ -75,23 +74,14 @@ static inline struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
         return NULL;
 }
 
-static inline int reiserfs_xattr_posix_acl_init(void)
-{
-        return 0;
-}
-
-static inline int reiserfs_xattr_posix_acl_exit(void)
-{
-        return 0;
-}
-
 static inline int reiserfs_acl_chmod(struct inode *inode)
 {
         return 0;
 }
 
 static inline int
-reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
+reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
+                             const struct inode *dir, struct dentry *dentry,
                              struct inode *inode)
 {
         return 0;
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index bc5114d35e99..2245c78d5876 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -28,8 +28,6 @@
 #include <linux/reiserfs_fs_sb.h>
 #endif
 
-struct fid;
-
 /*
  *  include/linux/reiser_fs.h
  *
@@ -37,6 +35,31 @@ struct fid;
  *
  */
 
+/* ioctl's command */
+#define REISERFS_IOC_UNPACK             _IOW(0xCD,1,long)
+/* define following flags to be the same as in ext2, so that chattr(1),
+   lsattr(1) will work with us. */
+#define REISERFS_IOC_GETFLAGS           FS_IOC_GETFLAGS
+#define REISERFS_IOC_SETFLAGS           FS_IOC_SETFLAGS
+#define REISERFS_IOC_GETVERSION         FS_IOC_GETVERSION
+#define REISERFS_IOC_SETVERSION         FS_IOC_SETVERSION
+
+#ifdef __KERNEL__
+/* the 32 bit compat definitions with int argument */
+#define REISERFS_IOC32_UNPACK           _IOW(0xCD, 1, int)
+#define REISERFS_IOC32_GETFLAGS         FS_IOC32_GETFLAGS
+#define REISERFS_IOC32_SETFLAGS         FS_IOC32_SETFLAGS
+#define REISERFS_IOC32_GETVERSION       FS_IOC32_GETVERSION
+#define REISERFS_IOC32_SETVERSION       FS_IOC32_SETVERSION
+
+/* Locking primitives */
+/* Right now we are still falling back to (un)lock_kernel, but eventually that
+   would evolve into real per-fs locks */
+#define reiserfs_write_lock( sb ) lock_kernel()
+#define reiserfs_write_unlock( sb ) unlock_kernel()
+
+struct fid;
+
 /* in reading the #defines, it may help to understand that they employ
    the following abbreviations:
 
@@ -79,15 +102,21 @@ struct fid;
 */
 #define REISERFS_DEBUG_CODE 5   /* extra messages to help find/debug errors */
 
-void reiserfs_warning(struct super_block *s, const char *fmt, ...);
+void __reiserfs_warning(struct super_block *s, const char *id,
+                         const char *func, const char *fmt, ...);
+#define reiserfs_warning(s, id, fmt, args...) \
+         __reiserfs_warning(s, id, __func__, fmt, ##args)
 /* assertions handling */
 
 /** always check a condition and panic if it's false. */
-#define __RASSERT( cond, scond, format, args... )                                       \
-if( !( cond ) )                                                                 \
-  reiserfs_panic( NULL, "reiserfs[%i]: assertion " scond " failed at "  \
-                  __FILE__ ":%i:%s: " format "\n",              \
-                  in_interrupt() ? -1 : task_pid_nr(current), __LINE__ , __func__ , ##args )
+#define __RASSERT(cond, scond, format, args...)                 \
+do {                                                                    \
+        if (!(cond))                                                    \
+                reiserfs_panic(NULL, "assertion failure", "(" #cond ") at " \
+                               __FILE__ ":%i:%s: " format "\n",         \
+                               in_interrupt() ? -1 : task_pid_nr(current), \
+                               __LINE__, __func__ , ##args);            \
+} while (0)
 
 #define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args)
 
@@ -171,7 +200,11 @@ struct reiserfs_super_block {
         __le32 s_flags;         /* Right now used only by inode-attributes, if enabled */
         unsigned char s_uuid[16];       /* filesystem unique identifier */
         unsigned char s_label[16];      /* filesystem volume label */
-        char s_unused[88];      /* zero filled by mkreiserfs and
+        __le16 s_mnt_count;             /* Count of mounts since last fsck */
+        __le16 s_max_mnt_count;         /* Maximum mounts before check */
+        __le32 s_lastcheck;             /* Timestamp of last fsck */
+        __le32 s_check_interval;        /* Interval between checks */
+        char s_unused[76];      /* zero filled by mkreiserfs and
                                  * reiserfs_convert_objectid_map_v1()
                                  * so any additions must be updated
                                  * there as well. */
@@ -553,10 +586,8 @@ static inline int uniqueness2type(__u32 uniqueness)
                 return TYPE_DIRECT;
         case V1_DIRENTRY_UNIQUENESS:
                 return TYPE_DIRENTRY;
-        default:
-                reiserfs_warning(NULL, "vs-500: unknown uniqueness %d",
-                                 uniqueness);
         case V1_ANY_UNIQUENESS:
+        default:
                 return TYPE_ANY;
         }
 }
@@ -573,9 +604,8 @@ static inline __u32 type2uniqueness(int type)
                 return V1_DIRECT_UNIQUENESS;
         case TYPE_DIRENTRY:
                 return V1_DIRENTRY_UNIQUENESS;
-        default:
-                reiserfs_warning(NULL, "vs-501: unknown type %d", type);
         case TYPE_ANY:
+        default:
                 return V1_ANY_UNIQUENESS;
         }
 }
@@ -687,9 +717,9 @@ static inline void cpu_key_k_offset_dec(struct cpu_key *key)
 #define is_indirect_cpu_ih(ih) (is_indirect_cpu_key (&((ih)->ih_key)))
 #define is_statdata_cpu_ih(ih) (is_statdata_cpu_key (&((ih)->ih_key)))
 
-#define I_K_KEY_IN_ITEM(p_s_ih, p_s_key, n_blocksize) \
-    ( ! COMP_SHORT_KEYS(p_s_ih, p_s_key) && \
-          I_OFF_BYTE_IN_ITEM(p_s_ih, k_offset (p_s_key), n_blocksize) )
+#define I_K_KEY_IN_ITEM(ih, key, n_blocksize) \
+    (!COMP_SHORT_KEYS(ih, key) && \
+          I_OFF_BYTE_IN_ITEM(ih, k_offset(key), n_blocksize))
 
 /* maximal length of item */
 #define MAX_ITEM_LEN(block_size) (block_size - BLKH_SIZE - IH_SIZE)
@@ -698,6 +728,7 @@ static inline void cpu_key_k_offset_dec(struct cpu_key *key)
 /* object identifier for root dir */
 #define REISERFS_ROOT_OBJECTID 2
 #define REISERFS_ROOT_PARENT_OBJECTID 1
+
 extern struct reiserfs_key root_key;
 
 /* 
@@ -744,25 +775,25 @@ struct block_head {
 #define DISK_LEAF_NODE_LEVEL  1 /* Leaf node level. */
 
 /* Given the buffer head of a formatted node, resolve to the block head of that node. */
-#define B_BLK_HEAD(p_s_bh)            ((struct block_head *)((p_s_bh)->b_data))
+#define B_BLK_HEAD(bh)                  ((struct block_head *)((bh)->b_data))
 /* Number of items that are in buffer. */
-#define B_NR_ITEMS(p_s_bh)            (blkh_nr_item(B_BLK_HEAD(p_s_bh)))
-#define B_LEVEL(p_s_bh)               (blkh_level(B_BLK_HEAD(p_s_bh)))
-#define B_FREE_SPACE(p_s_bh)          (blkh_free_space(B_BLK_HEAD(p_s_bh)))
+#define B_NR_ITEMS(bh)                  (blkh_nr_item(B_BLK_HEAD(bh)))
+#define B_LEVEL(bh)                     (blkh_level(B_BLK_HEAD(bh)))
+#define B_FREE_SPACE(bh)                (blkh_free_space(B_BLK_HEAD(bh)))
 
-#define PUT_B_NR_ITEMS(p_s_bh,val)    do { set_blkh_nr_item(B_BLK_HEAD(p_s_bh),val); } while (0)
-#define PUT_B_LEVEL(p_s_bh,val)       do { set_blkh_level(B_BLK_HEAD(p_s_bh),val); } while (0)
-#define PUT_B_FREE_SPACE(p_s_bh,val)  do { set_blkh_free_space(B_BLK_HEAD(p_s_bh),val); } while (0)
+#define PUT_B_NR_ITEMS(bh, val)         do { set_blkh_nr_item(B_BLK_HEAD(bh), val); } while (0)
+#define PUT_B_LEVEL(bh, val)            do { set_blkh_level(B_BLK_HEAD(bh), val); } while (0)
+#define PUT_B_FREE_SPACE(bh, val)       do { set_blkh_free_space(B_BLK_HEAD(bh), val); } while (0)
 
 /* Get right delimiting key. -- little endian */
-#define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))))
+#define B_PRIGHT_DELIM_KEY(bh)          (&(blk_right_delim_key(B_BLK_HEAD(bh))))
 
 /* Does the buffer contain a disk leaf. */
-#define B_IS_ITEMS_LEVEL(p_s_bh)     (B_LEVEL(p_s_bh) == DISK_LEAF_NODE_LEVEL)
+#define B_IS_ITEMS_LEVEL(bh)            (B_LEVEL(bh) == DISK_LEAF_NODE_LEVEL)
 
 /* Does the buffer contain a disk internal node */
-#define B_IS_KEYS_LEVEL(p_s_bh)      (B_LEVEL(p_s_bh) > DISK_LEAF_NODE_LEVEL \
-                                            && B_LEVEL(p_s_bh) <= MAX_HEIGHT)
+#define B_IS_KEYS_LEVEL(bh)      (B_LEVEL(bh) > DISK_LEAF_NODE_LEVEL \
+                                            && B_LEVEL(bh) <= MAX_HEIGHT)
 
 /***************************************************************************/
 /*                             STAT DATA                                   */
@@ -1112,12 +1143,13 @@ struct disk_child {
 #define put_dc_size(dc_p, val)   do { (dc_p)->dc_size = cpu_to_le16(val); } while(0)
 
 /* Get disk child by buffer header and position in the tree node. */
-#define B_N_CHILD(p_s_bh,n_pos)  ((struct disk_child *)\
-((p_s_bh)->b_data+BLKH_SIZE+B_NR_ITEMS(p_s_bh)*KEY_SIZE+DC_SIZE*(n_pos)))
+#define B_N_CHILD(bh, n_pos)  ((struct disk_child *)\
+((bh)->b_data + BLKH_SIZE + B_NR_ITEMS(bh) * KEY_SIZE + DC_SIZE * (n_pos)))
 
 /* Get disk child number by buffer header and position in the tree node. */
-#define B_N_CHILD_NUM(p_s_bh,n_pos) (dc_block_number(B_N_CHILD(p_s_bh,n_pos)))
-#define PUT_B_N_CHILD_NUM(p_s_bh,n_pos, val) (put_dc_block_number(B_N_CHILD(p_s_bh,n_pos), val ))
+#define B_N_CHILD_NUM(bh, n_pos) (dc_block_number(B_N_CHILD(bh, n_pos)))
+#define PUT_B_N_CHILD_NUM(bh, n_pos, val) \
+                                (put_dc_block_number(B_N_CHILD(bh, n_pos), val))
 
  /* maximal value of field child_size in structure disk_child */
  /* child size is the combined size of all items and their headers */
@@ -1188,33 +1220,33 @@ struct treepath {
 struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 
 /* Get path element by path and path position. */
-#define PATH_OFFSET_PELEMENT(p_s_path,n_offset)  ((p_s_path)->path_elements +(n_offset))
+#define PATH_OFFSET_PELEMENT(path, n_offset)  ((path)->path_elements + (n_offset))
 
 /* Get buffer header at the path by path and path position. */
-#define PATH_OFFSET_PBUFFER(p_s_path,n_offset)   (PATH_OFFSET_PELEMENT(p_s_path,n_offset)->pe_buffer)
+#define PATH_OFFSET_PBUFFER(path, n_offset)   (PATH_OFFSET_PELEMENT(path, n_offset)->pe_buffer)
 
 /* Get position in the element at the path by path and path position. */
-#define PATH_OFFSET_POSITION(p_s_path,n_offset) (PATH_OFFSET_PELEMENT(p_s_path,n_offset)->pe_position)
+#define PATH_OFFSET_POSITION(path, n_offset) (PATH_OFFSET_PELEMENT(path, n_offset)->pe_position)
 
-#define PATH_PLAST_BUFFER(p_s_path) (PATH_OFFSET_PBUFFER((p_s_path), (p_s_path)->path_length))
+#define PATH_PLAST_BUFFER(path) (PATH_OFFSET_PBUFFER((path), (path)->path_length))
                                 /* you know, to the person who didn't
                                    write this the macro name does not
                                    at first suggest what it does.
                                    Maybe POSITION_FROM_PATH_END? Or
                                    maybe we should just focus on
                                    dumping paths... -Hans */
-#define PATH_LAST_POSITION(p_s_path) (PATH_OFFSET_POSITION((p_s_path), (p_s_path)->path_length))
+#define PATH_LAST_POSITION(path) (PATH_OFFSET_POSITION((path), (path)->path_length))
 
-#define PATH_PITEM_HEAD(p_s_path)    B_N_PITEM_HEAD(PATH_PLAST_BUFFER(p_s_path),PATH_LAST_POSITION(p_s_path))
+#define PATH_PITEM_HEAD(path)    B_N_PITEM_HEAD(PATH_PLAST_BUFFER(path), PATH_LAST_POSITION(path))
 
 /* in do_balance leaf has h == 0 in contrast with path structure,
    where root has level == 0. That is why we need these defines */
-#define PATH_H_PBUFFER(p_s_path, h) PATH_OFFSET_PBUFFER (p_s_path, p_s_path->path_length - (h)) /* tb->S[h] */
+#define PATH_H_PBUFFER(path, h) PATH_OFFSET_PBUFFER (path, path->path_length - (h))     /* tb->S[h] */
 #define PATH_H_PPARENT(path, h) PATH_H_PBUFFER (path, (h) + 1)  /* tb->F[h] or tb->S[0]->b_parent */
 #define PATH_H_POSITION(path, h) PATH_OFFSET_POSITION (path, path->path_length - (h))
 #define PATH_H_B_ITEM_ORDER(path, h) PATH_H_POSITION(path, h + 1)       /* tb->S[h]->b_item_order */
 
-#define PATH_H_PATH_OFFSET(p_s_path, n_h) ((p_s_path)->path_length - (n_h))
+#define PATH_H_PATH_OFFSET(path, n_h) ((path)->path_length - (n_h))
 
 #define get_last_bh(path) PATH_PLAST_BUFFER(path)
 #define get_ih(path) PATH_PITEM_HEAD(path)
@@ -1444,6 +1476,16 @@ struct buffer_info {
         int bi_position;
 };
 
+static inline struct super_block *sb_from_tb(struct tree_balance *tb)
+{
+        return tb ? tb->tb_sb : NULL;
+}
+
+static inline struct super_block *sb_from_bi(struct buffer_info *bi)
+{
+        return bi ? sb_from_tb(bi->tb) : NULL;
+}
+
 /* there are 4 types of items: stat data, directory item, indirect, direct.
 +-------------------+------------+--------------+------------+
 |                   |  k_offset  | k_uniqueness | mergeable? |
@@ -1494,7 +1536,7 @@ extern struct item_operations *item_ops[TYPE_ANY + 1];
 #define COMP_SHORT_KEYS comp_short_keys
 
 /* number of blocks pointed to by the indirect item */
-#define I_UNFM_NUM(p_s_ih)      ( ih_item_len(p_s_ih) / UNFM_P_SIZE )
+#define I_UNFM_NUM(ih)  (ih_item_len(ih) / UNFM_P_SIZE)
 
 /* the used space within the unformatted node corresponding to pos within the item pointed to by ih */
 #define I_POS_UNFM_SIZE(ih,pos,size) (((pos) == I_UNFM_NUM(ih) - 1 ) ? (size) - ih_free_space(ih) : (size))
@@ -1540,7 +1582,6 @@ struct reiserfs_iget_args {
 /*                    FUNCTION DECLARATIONS                                */
 /***************************************************************************/
 
-/*#ifdef __KERNEL__*/
 #define get_journal_desc_magic(bh) (bh->b_data + bh->b_size - 12)
 
 #define journal_trans_half(blocksize) \
@@ -1598,6 +1639,10 @@ struct reiserfs_journal_header {
 #define JOURNAL_MAX_COMMIT_AGE 30
 #define JOURNAL_MAX_TRANS_AGE 30
 #define JOURNAL_PER_BALANCE_CNT (3 * (MAX_HEIGHT-2) + 9)
+#define JOURNAL_BLOCKS_PER_OBJECT(sb)  (JOURNAL_PER_BALANCE_CNT * 3 + \
+                                         2 * (REISERFS_QUOTA_INIT_BLOCKS(sb) + \
+                                              REISERFS_QUOTA_TRANS_BLOCKS(sb)))
+
 #ifdef CONFIG_QUOTA
 /* We need to update data and inode (atime) */
 #define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? 2 : 0)
@@ -1672,7 +1717,7 @@ struct reiserfs_transaction_handle {
         int t_refcount;
         int t_blocks_logged;    /* number of blocks this writer has logged */
         int t_blocks_allocated; /* number of blocks this writer allocated */
-        unsigned long t_trans_id;       /* sanity check, equals the current trans id */
+        unsigned int t_trans_id;        /* sanity check, equals the current trans id */
         void *t_handle_save;    /* save existing current->journal_info */
         unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
                                            should be displaced from others */
@@ -1748,13 +1793,13 @@ int journal_end_sync(struct reiserfs_transaction_handle *, struct super_block *,
 int journal_mark_freed(struct reiserfs_transaction_handle *,
                        struct super_block *, b_blocknr_t blocknr);
 int journal_transaction_should_end(struct reiserfs_transaction_handle *, int);
-int reiserfs_in_journal(struct super_block *p_s_sb, unsigned int bmap_nr,
-                        int bit_nr, int searchall, b_blocknr_t *next);
+int reiserfs_in_journal(struct super_block *sb, unsigned int bmap_nr,
+                         int bit_nr, int searchall, b_blocknr_t *next);
 int journal_begin(struct reiserfs_transaction_handle *,
-                  struct super_block *p_s_sb, unsigned long);
+                  struct super_block *sb, unsigned long);
 int journal_join_abort(struct reiserfs_transaction_handle *,
-                       struct super_block *p_s_sb, unsigned long);
-void reiserfs_journal_abort(struct super_block *sb, int errno);
+                       struct super_block *sb, unsigned long);
+void reiserfs_abort_journal(struct super_block *sb, int errno);
 void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...);
 int reiserfs_allocate_list_bitmaps(struct super_block *s,
                                    struct reiserfs_list_bitmap *, unsigned int);
@@ -1771,8 +1816,8 @@ int reiserfs_convert_objectid_map_v1(struct super_block *);
 
 /* stree.c */
 int B_IS_IN_TREE(const struct buffer_head *);
-extern void copy_item_head(struct item_head *p_v_to,
-                           const struct item_head *p_v_from);
+extern void copy_item_head(struct item_head *to,
+                           const struct item_head *from);
 
 // first key is in cpu form, second - le
 extern int comp_short_keys(const struct reiserfs_key *le_key,
@@ -1807,20 +1852,20 @@ static inline void copy_key(struct reiserfs_key *to,
         memcpy(to, from, KEY_SIZE);
 }
 
-int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path);
-const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path,
-                                    const struct super_block *p_s_sb);
+int comp_items(const struct item_head *stored_ih, const struct treepath *path);
+const struct reiserfs_key *get_rkey(const struct treepath *chk_path,
+                                    const struct super_block *sb);
 int search_by_key(struct super_block *, const struct cpu_key *,
                   struct treepath *, int);
 #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)
-int search_for_position_by_key(struct super_block *p_s_sb,
-                               const struct cpu_key *p_s_cpu_key,
-                               struct treepath *p_s_search_path);
-extern void decrement_bcount(struct buffer_head *p_s_bh);
-void decrement_counters_in_path(struct treepath *p_s_search_path);
-void pathrelse(struct treepath *p_s_search_path);
+int search_for_position_by_key(struct super_block *sb,
+                               const struct cpu_key *cpu_key,
+                               struct treepath *search_path);
+extern void decrement_bcount(struct buffer_head *bh);
+void decrement_counters_in_path(struct treepath *search_path);
+void pathrelse(struct treepath *search_path);
 int reiserfs_check_path(struct treepath *p);
-void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path);
+void pathrelse_and_restore(struct super_block *s, struct treepath *search_path);
 
 int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
                          struct treepath *path,
@@ -1843,14 +1888,14 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
 int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
                          struct treepath *path,
                          const struct cpu_key *key,
-                         struct inode *inode, struct buffer_head *p_s_un_bh);
+                         struct inode *inode, struct buffer_head *un_bh);
 
 void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
                                 struct inode *inode, struct reiserfs_key *key);
 int reiserfs_delete_object(struct reiserfs_transaction_handle *th,
-                           struct inode *p_s_inode);
+                           struct inode *inode);
 int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
-                         struct inode *p_s_inode, struct page *,
+                         struct inode *inode, struct page *,
                          int update_timestamps);
 
 #define i_block_size(inode) ((inode)->i_sb->s_blocksize)
@@ -1894,10 +1939,12 @@ void make_le_item_head(struct item_head *ih, const struct cpu_key *key,
                        loff_t offset, int type, int length, int entry_count);
 struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key);
 
+struct reiserfs_security_handle;
 int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
                        struct inode *dir, int mode,
                        const char *symname, loff_t i_size,
-                       struct dentry *dentry, struct inode *inode);
+                       struct dentry *dentry, struct inode *inode,
+                       struct reiserfs_security_handle *security);
 
 void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,
                              struct inode *inode, loff_t size);
@@ -1955,7 +2002,7 @@ int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,
 #define PROC_INFO_MAX( sb, field, value ) VOID_V
 #define PROC_INFO_INC( sb, field ) VOID_V
 #define PROC_INFO_ADD( sb, field, val ) VOID_V
-#define PROC_INFO_BH_STAT( p_s_sb, p_s_bh, n_node_level ) VOID_V
+#define PROC_INFO_BH_STAT(sb, bh, n_node_level) VOID_V
 #endif
 
 /* dir.c */
@@ -1963,6 +2010,7 @@ extern const struct inode_operations reiserfs_dir_inode_operations;
 extern const struct inode_operations reiserfs_symlink_inode_operations;
 extern const struct inode_operations reiserfs_special_inode_operations;
 extern const struct file_operations reiserfs_dir_operations;
+int reiserfs_readdir_dentry(struct dentry *, void *, filldir_t, loff_t *);
 
 /* tail_conversion.c */
 int direct2indirect(struct reiserfs_transaction_handle *, struct inode *,
@@ -1979,13 +2027,20 @@ extern const struct address_space_operations reiserfs_address_space_operations;
 
 /* fix_nodes.c */
 
-int fix_nodes(int n_op_mode, struct tree_balance *p_s_tb,
-              struct item_head *p_s_ins_ih, const void *);
+int fix_nodes(int n_op_mode, struct tree_balance *tb,
+              struct item_head *ins_ih, const void *);
 void unfix_nodes(struct tree_balance *);
 
 /* prints.c */
-void reiserfs_panic(struct super_block *s, const char *fmt, ...)
+void __reiserfs_panic(struct super_block *s, const char *id,
+                      const char *function, const char *fmt, ...)
     __attribute__ ((noreturn));
+#define reiserfs_panic(s, id, fmt, args...) \
+        __reiserfs_panic(s, id, __func__, fmt, ##args)
+void __reiserfs_error(struct super_block *s, const char *id,
+                      const char *function, const char *fmt, ...);
+#define reiserfs_error(s, id, fmt, args...) \
+         __reiserfs_error(s, id, __func__, fmt, ##args)
 void reiserfs_info(struct super_block *s, const char *fmt, ...);
 void reiserfs_debug(struct super_block *s, int level, const char *fmt, ...);
 void print_indirect_item(struct buffer_head *bh, int item_num);
@@ -2022,7 +2077,7 @@ void leaf_paste_in_buffer(struct buffer_info *bi, int pasted_item_num,
                           int zeros_number);
 void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num,
                           int pos_in_item, int cut_size);
-void leaf_paste_entries(struct buffer_head *bh, int item_num, int before,
+void leaf_paste_entries(struct buffer_info *bi, int item_num, int before,
                         int new_entry_count, struct reiserfs_de_head *new_dehs,
                         const char *records, int paste_size);
 /* ibalance.c */
@@ -2178,29 +2233,6 @@ long reiserfs_compat_ioctl(struct file *filp,
                    unsigned int cmd, unsigned long arg);
 int reiserfs_unpack(struct inode *inode, struct file *filp);
 
-/* ioctl's command */
-#define REISERFS_IOC_UNPACK             _IOW(0xCD,1,long)
-/* define following flags to be the same as in ext2, so that chattr(1),
-   lsattr(1) will work with us. */
-#define REISERFS_IOC_GETFLAGS           FS_IOC_GETFLAGS
-#define REISERFS_IOC_SETFLAGS           FS_IOC_SETFLAGS
-#define REISERFS_IOC_GETVERSION         FS_IOC_GETVERSION
-#define REISERFS_IOC_SETVERSION         FS_IOC_SETVERSION
-
-/* the 32 bit compat definitions with int argument */
-#define REISERFS_IOC32_UNPACK           _IOW(0xCD, 1, int)
-#define REISERFS_IOC32_GETFLAGS         FS_IOC32_GETFLAGS
-#define REISERFS_IOC32_SETFLAGS         FS_IOC32_SETFLAGS
-#define REISERFS_IOC32_GETVERSION       FS_IOC32_GETVERSION
-#define REISERFS_IOC32_SETVERSION       FS_IOC32_SETVERSION
-
-/* Locking primitives */
-/* Right now we are still falling back to (un)lock_kernel, but eventually that
-   would evolve into real per-fs locks */
-#define reiserfs_write_lock( sb ) lock_kernel()
-#define reiserfs_write_unlock( sb ) unlock_kernel()
-
-/* xattr stuff */
-#define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem)
+#endif /* __KERNEL__ */
 
 #endif                          /* _LINUX_REISER_FS_H */
diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index ce3663fb0101..76360b36ac33 100644
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -51,7 +51,7 @@ struct reiserfs_inode_info {
         /* we use these for fsync or O_SYNC to decide which transaction
          ** needs to be committed in order for this inode to be properly
          ** flushed */
-        unsigned long i_trans_id;
+        unsigned int i_trans_id;
         struct reiserfs_journal_list *i_jl;
         struct mutex i_mmap;
 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
@@ -59,7 +59,7 @@ struct reiserfs_inode_info {
         struct posix_acl *i_acl_default;
 #endif
 #ifdef CONFIG_REISERFS_FS_XATTR
-        struct rw_semaphore xattr_sem;
+        struct rw_semaphore i_xattr_sem;
 #endif
         struct inode vfs_inode;
 };
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index bda6b562a1e0..6b361d23a499 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -14,7 +14,7 @@ typedef enum {
 } reiserfs_super_block_flags;
 
 /* struct reiserfs_super_block accessors/mutators
- * since this is a disk structure, it will always be in 
+ * since this is a disk structure, it will always be in
  * little endian format. */
 #define sb_block_count(sbp)         (le32_to_cpu((sbp)->s_v1.s_block_count))
 #define set_sb_block_count(sbp,v)   ((sbp)->s_v1.s_block_count = cpu_to_le32(v))
@@ -73,6 +73,9 @@ typedef enum {
 #define sb_version(sbp)            (le16_to_cpu((sbp)->s_v1.s_version))
 #define set_sb_version(sbp,v)      ((sbp)->s_v1.s_version = cpu_to_le16(v))
 
+#define sb_mnt_count(sbp)          (le16_to_cpu((sbp)->s_mnt_count))
+#define set_sb_mnt_count(sbp, v)   ((sbp)->s_mnt_count = cpu_to_le16(v))
+
 #define sb_reserved_for_journal(sbp) \
               (le16_to_cpu((sbp)->s_v1.s_reserved_for_journal))
 #define set_sb_reserved_for_journal(sbp,v) \
@@ -80,16 +83,16 @@ typedef enum {
 
 /* LOGGING -- */
 
-/* These all interelate for performance.  
+/* These all interelate for performance.
 **
-** If the journal block count is smaller than n transactions, you lose speed. 
+** If the journal block count is smaller than n transactions, you lose speed.
 ** I don't know what n is yet, I'm guessing 8-16.
 **
 ** typical transaction size depends on the application, how often fsync is
-** called, and how many metadata blocks you dirty in a 30 second period.  
+** called, and how many metadata blocks you dirty in a 30 second period.
 ** The more small files (<16k) you use, the larger your transactions will
 ** be.
-** 
+**
 ** If your journal fills faster than dirty buffers get flushed to disk, it must flush them before allowing the journal
 ** to wrap, which slows things down.  If you need high speed meta data updates, the journal should be big enough
 ** to prevent wrapping before dirty meta blocks get to disk.
@@ -153,7 +156,7 @@ struct reiserfs_journal_list {
         atomic_t j_commit_left;
         atomic_t j_older_commits_done;  /* all commits older than this on disk */
         struct mutex j_commit_mutex;
-        unsigned long j_trans_id;
+        unsigned int j_trans_id;
         time_t j_timestamp;
         struct reiserfs_list_bitmap *j_list_bitmap;
         struct buffer_head *j_commit_bh;        /* commit buffer head */
@@ -182,7 +185,7 @@ struct reiserfs_journal {
         int j_1st_reserved_block;       /* first block on s_dev of reserved area journal */
 
         unsigned long j_state;
-        unsigned long j_trans_id;
+        unsigned int j_trans_id;
         unsigned long j_mount_id;
         unsigned long j_start;  /* start of current waiting commit (index into j_ap_blocks) */
         unsigned long j_len;    /* length of current waiting commit */
@@ -190,7 +193,7 @@ struct reiserfs_journal {
         atomic_t j_wcount;      /* count of writers for current commit */
         unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
         unsigned long j_first_unflushed_offset; /* first unflushed transactions offset */
-        unsigned long j_last_flush_trans_id;    /* last fully flushed journal timestamp */
+        unsigned j_last_flush_trans_id; /* last fully flushed journal timestamp */
         struct buffer_head *j_header_bh;
 
         time_t j_trans_start_time;      /* time this transaction started */
@@ -223,10 +226,10 @@ struct reiserfs_journal {
         int j_num_work_lists;   /* number that need attention from kreiserfsd */
 
         /* debugging to make sure things are flushed in order */
-        int j_last_flush_id;
+        unsigned int j_last_flush_id;
 
         /* debugging to make sure things are committed in order */
-        int j_last_commit_id;
+        unsigned int j_last_commit_id;
 
         struct list_head j_bitmap_nodes;
         struct list_head j_dirty_buffers;
@@ -239,7 +242,7 @@ struct reiserfs_journal {
 
         struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS]; /* array of bitmaps to record the deleted blocks */
         struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE]; /* hash table for real buffer heads in current trans */
-        struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE];    /* hash table for all the real buffer heads in all 
+        struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE];    /* hash table for all the real buffer heads in all
                                                                                    the transactions */
         struct list_head j_prealloc_list;       /* list of inodes which have preallocated blocks */
         int j_persistent_trans;
@@ -399,10 +402,7 @@ struct reiserfs_sb_info {
         int reserved_blocks;    /* amount of blocks reserved for further allocations */
         spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
         struct dentry *priv_root;       /* root of /.reiserfs_priv */
-#ifdef CONFIG_REISERFS_FS_XATTR
         struct dentry *xattr_root;      /* root of /.reiserfs_priv/.xa */
-        struct rw_semaphore xattr_dir_sem;
-#endif
         int j_errno;
 #ifdef CONFIG_QUOTA
         char *s_qf_names[MAXQUOTAS];
@@ -426,7 +426,7 @@ enum reiserfs_mount_options {
                                    partition will be dealt with in a
                                    manner of 3.5.x */
 
-/* -o hash={tea, rupasov, r5, detect} is meant for properly mounting 
+/* -o hash={tea, rupasov, r5, detect} is meant for properly mounting
 ** reiserfs disks from 3.5.19 or earlier.  99% of the time, this option
 ** is not required.  If the normal autodection code can't determine which
 ** hash to use (because both hashes had the same value for a file)
@@ -451,7 +451,6 @@ enum reiserfs_mount_options {
         REISERFS_NO_UNHASHED_RELOCATION,
         REISERFS_HASHED_RELOCATION,
         REISERFS_ATTRS,
-        REISERFS_XATTRS,
         REISERFS_XATTRS_USER,
         REISERFS_POSIXACL,
         REISERFS_BARRIER_NONE,
@@ -489,7 +488,7 @@ enum reiserfs_mount_options {
 #define reiserfs_data_log(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_LOG))
 #define reiserfs_data_ordered(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_ORDERED))
 #define reiserfs_data_writeback(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK))
-#define reiserfs_xattrs(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS))
+#define reiserfs_xattrs(s) ((s)->s_xattr != NULL)
 #define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER))
 #define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL))
 #define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s))
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index af135ae895db..dcae01e63e40 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -15,6 +15,12 @@ struct reiserfs_xattr_header {
         __le32 h_hash;          /* hash of the value */
 };
 
+struct reiserfs_security_handle {
+        char *name;
+        void *value;
+        size_t length;
+};
+
 #ifdef __KERNEL__
 
 #include <linux/init.h>
@@ -29,22 +35,13 @@ struct iattr;
 struct super_block;
 struct nameidata;
 
-struct reiserfs_xattr_handler {
-        char *prefix;
-        int (*init) (void);
-        void (*exit) (void);
-        int (*get) (struct inode * inode, const char *name, void *buffer,
-                    size_t size);
-        int (*set) (struct inode * inode, const char *name, const void *buffer,
-                    size_t size, int flags);
-        int (*del) (struct inode * inode, const char *name);
-        int (*list) (struct inode * inode, const char *name, int namelen,
-                     char *out);
-        struct list_head handlers;
-};
+int reiserfs_xattr_register_handlers(void) __init;
+void reiserfs_xattr_unregister_handlers(void);
+int reiserfs_xattr_init(struct super_block *sb, int mount_flags);
+int reiserfs_delete_xattrs(struct inode *inode);
+int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);
 
 #ifdef CONFIG_REISERFS_FS_XATTR
-#define is_reiserfs_priv_object(inode) IS_PRIVATE(inode)
 #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
 ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
                           void *buffer, size_t size);
@@ -52,104 +49,97 @@ int reiserfs_setxattr(struct dentry *dentry, const char *name,
                       const void *value, size_t size, int flags);
 ssize_t reiserfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 int reiserfs_removexattr(struct dentry *dentry, const char *name);
-int reiserfs_delete_xattrs(struct inode *inode);
-int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);
-int reiserfs_xattr_init(struct super_block *sb, int mount_flags);
 int reiserfs_permission(struct inode *inode, int mask);
 
-int reiserfs_xattr_del(struct inode *, const char *);
-int reiserfs_xattr_get(const struct inode *, const char *, void *, size_t);
+int reiserfs_xattr_get(struct inode *, const char *, void *, size_t);
 int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);
-
-extern struct reiserfs_xattr_handler user_handler;
-extern struct reiserfs_xattr_handler trusted_handler;
-extern struct reiserfs_xattr_handler security_handler;
-
-int reiserfs_xattr_register_handlers(void) __init;
-void reiserfs_xattr_unregister_handlers(void);
-
-static inline void reiserfs_write_lock_xattrs(struct super_block *sb)
-{
-        down_write(&REISERFS_XATTR_DIR_SEM(sb));
-}
-static inline void reiserfs_write_unlock_xattrs(struct super_block *sb)
-{
-        up_write(&REISERFS_XATTR_DIR_SEM(sb));
-}
-static inline void reiserfs_read_lock_xattrs(struct super_block *sb)
-{
-        down_read(&REISERFS_XATTR_DIR_SEM(sb));
-}
-
-static inline void reiserfs_read_unlock_xattrs(struct super_block *sb)
+int reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *,
+                              struct inode *, const char *, const void *,
+                              size_t, int);
+
+extern struct xattr_handler reiserfs_xattr_user_handler;
+extern struct xattr_handler reiserfs_xattr_trusted_handler;
+extern struct xattr_handler reiserfs_xattr_security_handler;
+#ifdef CONFIG_REISERFS_FS_SECURITY
+int reiserfs_security_init(struct inode *dir, struct inode *inode,
+                           struct reiserfs_security_handle *sec);
+int reiserfs_security_write(struct reiserfs_transaction_handle *th,
+                            struct inode *inode,
+                            struct reiserfs_security_handle *sec);
+void reiserfs_security_free(struct reiserfs_security_handle *sec);
+#endif
+
+#define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))
+static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size)
 {
-        up_read(&REISERFS_XATTR_DIR_SEM(sb));
+        loff_t ret = 0;
+        if (reiserfs_file_data_log(inode)) {
+                ret = _ROUND_UP(xattr_size(size), inode->i_sb->s_blocksize);
+                ret >>= inode->i_sb->s_blocksize_bits;
+        }
+        return ret;
 }
 
-static inline void reiserfs_write_lock_xattr_i(struct inode *inode)
-{
-        down_write(&REISERFS_I(inode)->xattr_sem);
-}
-static inline void reiserfs_write_unlock_xattr_i(struct inode *inode)
+/* We may have to create up to 3 objects: xattr root, xattr dir, xattr file.
+ * Let's try to be smart about it.
+ * xattr root: We cache it. If it's not cached, we may need to create it.
+ * xattr dir: If anything has been loaded for this inode, we can set a flag
+ *            saying so.
+ * xattr file: Since we don't cache xattrs, we can't tell. We always include
+ *             blocks for it.
+ *
+ * However, since root and dir can be created between calls - YOU MUST SAVE
+ * THIS VALUE.
+ */
+static inline size_t reiserfs_xattr_jcreate_nblocks(struct inode *inode)
 {
-        up_write(&REISERFS_I(inode)->xattr_sem);
-}
-static inline void reiserfs_read_lock_xattr_i(struct inode *inode)
-{
-        down_read(&REISERFS_I(inode)->xattr_sem);
-}
+        size_t nblocks = JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
 
-static inline void reiserfs_read_unlock_xattr_i(struct inode *inode)
-{
-        up_read(&REISERFS_I(inode)->xattr_sem);
-}
+        if ((REISERFS_I(inode)->i_flags & i_has_xattr_dir) == 0) {
+                nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
+                if (REISERFS_SB(inode->i_sb)->xattr_root == NULL)
+                        nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
+        }
 
-static inline void reiserfs_mark_inode_private(struct inode *inode)
-{
-        inode->i_flags |= S_PRIVATE;
+        return nblocks;
 }
 
 static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
 {
-        init_rwsem(&REISERFS_I(inode)->xattr_sem);
+        init_rwsem(&REISERFS_I(inode)->i_xattr_sem);
 }
 
 #else
 
-#define is_reiserfs_priv_object(inode) 0
-#define reiserfs_mark_inode_private(inode) do {;} while(0)
 #define reiserfs_getxattr NULL
 #define reiserfs_setxattr NULL
 #define reiserfs_listxattr NULL
 #define reiserfs_removexattr NULL
-#define reiserfs_write_lock_xattrs(sb) do {;} while(0)
-#define reiserfs_write_unlock_xattrs(sb) do {;} while(0)
-#define reiserfs_read_lock_xattrs(sb)
-#define reiserfs_read_unlock_xattrs(sb)
 
 #define reiserfs_permission NULL
 
-#define reiserfs_xattr_register_handlers() 0
-#define reiserfs_xattr_unregister_handlers()
-
-static inline int reiserfs_delete_xattrs(struct inode *inode)
+static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
 {
-        return 0;
-};
-static inline int reiserfs_chown_xattrs(struct inode *inode,
-                                        struct iattr *attrs)
+}
+#endif  /*  CONFIG_REISERFS_FS_XATTR  */
+
+#ifndef CONFIG_REISERFS_FS_SECURITY
+static inline int reiserfs_security_init(struct inode *dir,
+                                         struct inode *inode,
+                                         struct reiserfs_security_handle *sec)
 {
         return 0;
-};
-static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)
+}
+static inline int
+reiserfs_security_write(struct reiserfs_transaction_handle *th,
+                        struct inode *inode,
+                        struct reiserfs_security_handle *sec)
 {
-        sb->s_flags = (sb->s_flags & ~MS_POSIXACL);     /* to be sure */
         return 0;
-};
-static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
-{
 }
-#endif  /*  CONFIG_REISERFS_FS_XATTR  */
+static inline void reiserfs_security_free(struct reiserfs_security_handle *sec)
+{}
+#endif
 
 #endif  /*  __KERNEL__  */
 
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index b3b359660082..e1b7b2173885 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -8,7 +8,7 @@ struct ring_buffer;
 struct ring_buffer_iter;
 
 /*
- * Don't reference this struct directly, use functions below.
+ * Don't refer to this struct directly, use functions below.
  */
 struct ring_buffer_event {
         u32             type:2, len:3, time_delta:27;
@@ -18,10 +18,13 @@ struct ring_buffer_event {
 /**
  * enum ring_buffer_type - internal ring buffer types
  *
- * @RINGBUF_TYPE_PADDING:       Left over page padding
- *                               array is ignored
- *                               size is variable depending on how much
+ * @RINGBUF_TYPE_PADDING:       Left over page padding or discarded event
+ *                               If time_delta is 0:
+ *                                array is ignored
+ *                                size is variable depending on how much
  *                                padding is needed
+ *                               If time_delta is non zero:
+ *                                everything else same as RINGBUF_TYPE_DATA
  *
  * @RINGBUF_TYPE_TIME_EXTEND:   Extend the time delta
  *                               array[0] = time delta (28 .. 59)
@@ -65,6 +68,8 @@ ring_buffer_event_time_delta(struct ring_buffer_event *event)
         return event->time_delta;
 }
 
+void ring_buffer_event_discard(struct ring_buffer_event *event);
+
 /*
  * size is in bytes for each per CPU buffer.
  */
@@ -74,13 +79,10 @@ void ring_buffer_free(struct ring_buffer *buffer);
 
 int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size);
 
-struct ring_buffer_event *
-ring_buffer_lock_reserve(struct ring_buffer *buffer,
-                         unsigned long length,
-                         unsigned long *flags);
+struct ring_buffer_event *ring_buffer_lock_reserve(struct ring_buffer *buffer,
+                                                   unsigned long length);
 int ring_buffer_unlock_commit(struct ring_buffer *buffer,
-                              struct ring_buffer_event *event,
-                              unsigned long flags);
+                              struct ring_buffer_event *event);
 int ring_buffer_write(struct ring_buffer *buffer,
                       unsigned long length, void *data);
 
@@ -121,17 +123,19 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer);
 unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu);
 
-u64 ring_buffer_time_stamp(int cpu);
-void ring_buffer_normalize_time_stamp(int cpu, u64 *ts);
+u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu);
+void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer,
+                                      int cpu, u64 *ts);
+void ring_buffer_set_clock(struct ring_buffer *buffer,
+                           u64 (*clock)(void));
+
+size_t ring_buffer_page_len(void *page);
 
-void tracing_on(void);
-void tracing_off(void);
-void tracing_off_permanent(void);
 
 void *ring_buffer_alloc_read_page(struct ring_buffer *buffer);
 void ring_buffer_free_read_page(struct ring_buffer *buffer, void *data);
-int ring_buffer_read_page(struct ring_buffer *buffer,
-                          void **data_page, int cpu, int full);
+int ring_buffer_read_page(struct ring_buffer *buffer, void **data_page,
+                          size_t len, int cpu, int full);
 
 enum ring_buffer_flags {
         RB_FL_OVERWRITE         = 1 << 0,
diff --git a/include/linux/rtc-v3020.h b/include/linux/rtc-v3020.h
index bf74e63c98fe..8ba646e610d9 100644
--- a/include/linux/rtc-v3020.h
+++ b/include/linux/rtc-v3020.h
@@ -14,6 +14,12 @@
  * is used depends on the board. */
 struct v3020_platform_data {
         int leftshift; /* (1<<(leftshift)) & readl() */
+
+        int use_gpio:1;
+        unsigned int gpio_cs;
+        unsigned int gpio_wr;
+        unsigned int gpio_rd;
+        unsigned int gpio_io;
 };
 
 #define V3020_STATUS_0  0x00
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 4046b75563c1..60f88a7fb13d 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -99,6 +99,7 @@ struct rtc_pll_info {
 
 #ifdef __KERNEL__
 
+#include <linux/types.h>
 #include <linux/interrupt.h>
 
 extern int rtc_month_days(unsigned int month, unsigned int year);
@@ -232,6 +233,11 @@ int rtc_register(rtc_task_t *task);
 int rtc_unregister(rtc_task_t *task);
 int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg);
 
+static inline bool is_leap_year(unsigned int year)
+{
+        return (!(year % 4) && (year % 100)) || !(year % 400);
+}
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_RTC_H_ */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 1e5f6730ff31..ba3254ecf7fb 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -217,6 +217,7 @@ enum
 #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
 
@@ -622,8 +623,8 @@ static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
 
 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);
-extern int rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid, u32 group,
-                       struct nlmsghdr *nlh, gfp_t flags);
+extern void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid,
+                        u32 group, struct nlmsghdr *nlh, gfp_t flags);
 extern void rtnl_set_sk_err(struct net *net, u32 group, int error);
 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
 extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8c216e057c94..b4c38bc8049c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -68,7 +68,7 @@ struct sched_param {
 #include <linux/smp.h>
 #include <linux/sem.h>
 #include <linux/signal.h>
-#include <linux/fs_struct.h>
+#include <linux/path.h>
 #include <linux/compiler.h>
 #include <linux/completion.h>
 #include <linux/pid.h>
@@ -97,6 +97,7 @@ struct futex_pi_state;
 struct robust_list_head;
 struct bio;
 struct bts_tracer;
+struct fs_struct;
 
 /*
  * List of flags we want to share for kernel threads,
@@ -137,6 +138,8 @@ extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_active(void);
 extern unsigned long nr_iowait(void);
 
+extern unsigned long get_parent_ip(unsigned long addr);
+
 struct seq_file;
 struct cfs_rq;
 struct task_group;
@@ -202,7 +205,8 @@ extern unsigned long long time_sync_thresh;
 #define task_is_stopped_or_traced(task) \
                         ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
 #define task_contributes_to_load(task)  \
-                                ((task->state & TASK_UNINTERRUPTIBLE) != 0)
+                                ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
+                                 (task->flags & PF_FROZEN) == 0)
 
 #define __set_task_state(tsk, state_value)              \
         do { (tsk)->state = (state_value); } while (0)
@@ -297,17 +301,11 @@ extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write,
                                     struct file *filp, void __user *buffer,
                                     size_t *lenp, loff_t *ppos);
 extern unsigned int  softlockup_panic;
-extern unsigned long sysctl_hung_task_check_count;
-extern unsigned long sysctl_hung_task_timeout_secs;
-extern unsigned long sysctl_hung_task_warnings;
 extern int softlockup_thresh;
 #else
 static inline void softlockup_tick(void)
 {
 }
-static inline void spawn_softlockup_task(void)
-{
-}
 static inline void touch_softlockup_watchdog(void)
 {
 }
@@ -316,6 +314,15 @@ static inline void touch_all_softlockup_watchdogs(void)
 }
 #endif
 
+#ifdef CONFIG_DETECT_HUNG_TASK
+extern unsigned int  sysctl_hung_task_panic;
+extern unsigned long sysctl_hung_task_check_count;
+extern unsigned long sysctl_hung_task_timeout_secs;
+extern unsigned long sysctl_hung_task_warnings;
+extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
+                                         struct file *filp, void __user *buffer,
+                                         size_t *lenp, loff_t *ppos);
+#endif
 
 /* Attach to any functions which should be ignored in wchan output. */
 #define __sched         __attribute__((__section__(".sched.text")))
@@ -331,7 +338,9 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+asmlinkage void __schedule(void);
 asmlinkage void schedule(void);
+extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
 struct nsproxy;
 struct user_namespace;
@@ -389,8 +398,15 @@ extern void arch_unmap_area_topdown(struct mm_struct *, unsigned long);
                 (mm)->hiwater_vm = (mm)->total_vm;      \
 } while (0)
 
-#define get_mm_hiwater_rss(mm)  max((mm)->hiwater_rss, get_mm_rss(mm))
-#define get_mm_hiwater_vm(mm)   max((mm)->hiwater_vm, (mm)->total_vm)
+static inline unsigned long get_mm_hiwater_rss(struct mm_struct *mm)
+{
+        return max(mm->hiwater_rss, get_mm_rss(mm));
+}
+
+static inline unsigned long get_mm_hiwater_vm(struct mm_struct *mm)
+{
+        return max(mm->hiwater_vm, mm->total_vm);
+}
 
 extern void set_dumpable(struct mm_struct *mm, int value);
 extern int get_dumpable(struct mm_struct *mm);
@@ -538,25 +554,8 @@ struct signal_struct {
 
         struct list_head cpu_timers[3];
 
-        /* job control IDs */
-
-        /*
-         * pgrp and session fields are deprecated.
-         * use the task_session_Xnr and task_pgrp_Xnr routines below
-         */
-
-        union {
-                pid_t pgrp __deprecated;
-                pid_t __pgrp;
-        };
-
         struct pid *tty_old_pgrp;
 
-        union {
-                pid_t session __deprecated;
-                pid_t __session;
-        };
-
         /* boolean value for session group leader */
         int leader;
 
@@ -998,6 +997,7 @@ struct sched_class {
                               struct rq *busiest, struct sched_domain *sd,
                               enum cpu_idle_type idle);
         void (*pre_schedule) (struct rq *this_rq, struct task_struct *task);
+        int (*needs_post_schedule) (struct rq *this_rq);
         void (*post_schedule) (struct rq *this_rq);
         void (*task_wake_up) (struct rq *this_rq, struct task_struct *task);
 
@@ -1052,6 +1052,10 @@ struct sched_entity {
         u64                     last_wakeup;
         u64                     avg_overlap;
 
+        u64                     start_runtime;
+        u64                     avg_wakeup;
+        u64                     nr_migrations;
+
 #ifdef CONFIG_SCHEDSTATS
         u64                     wait_start;
         u64                     wait_max;
@@ -1067,7 +1071,6 @@ struct sched_entity {
         u64                     exec_max;
         u64                     slice_max;
 
-        u64                     nr_migrations;
         u64                     nr_migrations_cold;
         u64                     nr_failed_migrations_affine;
         u64                     nr_failed_migrations_running;
@@ -1164,6 +1167,7 @@ struct task_struct {
 #endif
 
         struct list_head tasks;
+        struct plist_node pushable_tasks;
 
         struct mm_struct *mm, *active_mm;
 
@@ -1175,13 +1179,14 @@ struct task_struct {
         /* ??? */
         unsigned int personality;
         unsigned did_exec:1;
+        unsigned in_execve:1;   /* Tell the LSMs that the process is doing an
+                                 * execve */
         pid_t pid;
         pid_t tgid;
 
-#ifdef CONFIG_CC_STACKPROTECTOR
         /* Canary value for the -fstack-protector gcc feature */
         unsigned long stack_canary;
-#endif
+
         /* 
          * pointers to (original) parent process, youngest child, younger sibling,
          * older sibling, respectively.  (p->father can be replaced with 
@@ -1254,9 +1259,8 @@ struct task_struct {
 /* ipc stuff */
         struct sysv_sem sysvsem;
 #endif
-#ifdef CONFIG_DETECT_SOFTLOCKUP
+#ifdef CONFIG_DETECT_HUNG_TASK
 /* hung task detection */
-        unsigned long last_switch_timestamp;
         unsigned long last_switch_count;
 #endif
 /* CPU-specific state of this task */
@@ -1293,6 +1297,11 @@ struct task_struct {
 /* Protection of (de-)allocation: mm, files, fs, tty, keyrings */
         spinlock_t alloc_lock;
 
+#ifdef CONFIG_GENERIC_HARDIRQS
+        /* IRQ handler threads */
+        struct irqaction *irqaction;
+#endif
+
         /* Protection of the PI data structures: */
         spinlock_t pi_lock;
 
@@ -1328,6 +1337,7 @@ struct task_struct {
         int lockdep_depth;
         unsigned int lockdep_recursion;
         struct held_lock held_locks[MAX_LOCK_DEPTH];
+        gfp_t lockdep_reclaim_gfp;
 #endif
 
 /* journalling filesystem info */
@@ -1405,6 +1415,8 @@ struct task_struct {
         int curr_ret_stack;
         /* Stack of return addresses for return function tracing */
         struct ftrace_ret_stack *ret_stack;
+        /* time stamp for last schedule */
+        unsigned long long ftrace_timestamp;
         /*
          * Number of functions that haven't been traced
          * because of depth overrun.
@@ -1419,6 +1431,9 @@ struct task_struct {
 #endif
 };
 
+/* Future-safe accessor for struct task_struct's cpus_allowed. */
+#define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
+
 /*
  * Priority of a process goes from 0..MAX_PRIO-1, valid RT
  * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH
@@ -1450,16 +1465,6 @@ static inline int rt_task(struct task_struct *p)
         return rt_prio(p->prio);
 }
 
-static inline void set_task_session(struct task_struct *tsk, pid_t session)
-{
-        tsk->signal->__session = session;
-}
-
-static inline void set_task_pgrp(struct task_struct *tsk, pid_t pgrp)
-{
-        tsk->signal->__pgrp = pgrp;
-}
-
 static inline struct pid *task_pid(struct task_struct *task)
 {
         return task->pids[PIDTYPE_PID].pid;
@@ -1470,6 +1475,11 @@ static inline struct pid *task_tgid(struct task_struct *task)
         return task->group_leader->pids[PIDTYPE_PID].pid;
 }
 
+/*
+ * Without tasklist or rcu lock it is not safe to dereference
+ * the result of task_pgrp/task_session even if task == current,
+ * we can race with another thread doing sys_setsid/sys_setpgid.
+ */
 static inline struct pid *task_pgrp(struct task_struct *task)
 {
         return task->group_leader->pids[PIDTYPE_PGID].pid;
@@ -1495,17 +1505,23 @@ struct pid_namespace;
  *
  * see also pid_nr() etc in include/linux/pid.h
  */
+pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
+                        struct pid_namespace *ns);
 
 static inline pid_t task_pid_nr(struct task_struct *tsk)
 {
         return tsk->pid;
 }
 
-pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
+static inline pid_t task_pid_nr_ns(struct task_struct *tsk,
+                                        struct pid_namespace *ns)
+{
+        return __task_pid_nr_ns(tsk, PIDTYPE_PID, ns);
+}
 
 static inline pid_t task_pid_vnr(struct task_struct *tsk)
 {
-        return pid_vnr(task_pid(tsk));
+        return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
 }
 
 
@@ -1522,31 +1538,34 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
 }
 
 
-static inline pid_t task_pgrp_nr(struct task_struct *tsk)
+static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,
+                                        struct pid_namespace *ns)
 {
-        return tsk->signal->__pgrp;
+        return __task_pid_nr_ns(tsk, PIDTYPE_PGID, ns);
 }
 
-pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
-
 static inline pid_t task_pgrp_vnr(struct task_struct *tsk)
 {
-        return pid_vnr(task_pgrp(tsk));
+        return __task_pid_nr_ns(tsk, PIDTYPE_PGID, NULL);
 }
 
 
-static inline pid_t task_session_nr(struct task_struct *tsk)
+static inline pid_t task_session_nr_ns(struct task_struct *tsk,
+                                        struct pid_namespace *ns)
 {
-        return tsk->signal->__session;
+        return __task_pid_nr_ns(tsk, PIDTYPE_SID, ns);
 }
 
-pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
-
 static inline pid_t task_session_vnr(struct task_struct *tsk)
 {
-        return pid_vnr(task_session(tsk));
+        return __task_pid_nr_ns(tsk, PIDTYPE_SID, NULL);
 }
 
+/* obsolete, do not use */
+static inline pid_t task_pgrp_nr(struct task_struct *tsk)
+{
+        return task_pgrp_nr_ns(tsk, &init_pid_ns);
+}
 
 /**
  * pid_alive - check that a task structure is not stale
@@ -1670,6 +1689,16 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
         return set_cpus_allowed_ptr(p, &new_mask);
 }
 
+/*
+ * Architectures can set this to 1 if they have specified
+ * CONFIG_HAVE_UNSTABLE_SCHED_CLOCK in their arch Kconfig,
+ * but then during bootup it turns out that sched_clock()
+ * is reliable after all:
+ */
+#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
+extern int sched_clock_stable;
+#endif
+
 extern unsigned long long sched_clock(void);
 
 extern void sched_clock_init(void);
@@ -1946,7 +1975,8 @@ extern void mm_release(struct task_struct *, struct mm_struct *);
 /* Allocate a new mm structure and copy contents from tsk->mm */
 extern struct mm_struct *dup_mm(struct task_struct *tsk);
 
-extern int  copy_thread(int, unsigned long, unsigned long, unsigned long, struct task_struct *, struct pt_regs *);
+extern int copy_thread(unsigned long, unsigned long, unsigned long,
+                        struct task_struct *, struct pt_regs *);
 extern void flush_thread(void);
 extern void exit_thread(void);
 
@@ -2031,6 +2061,11 @@ static inline int thread_group_empty(struct task_struct *p)
 #define delay_group_leader(p) \
                 (thread_group_leader(p) && !thread_group_empty(p))
 
+static inline int task_detached(struct task_struct *p)
+{
+        return p->exit_signal == -1;
+}
+
 /*
  * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring
  * subscriptions and synchronises with wait4().  Also used in procfs.  Also
@@ -2087,6 +2122,19 @@ static inline int object_is_on_stack(void *obj)
 
 extern void thread_info_cache_init(void);
 
+#ifdef CONFIG_DEBUG_STACK_USAGE
+static inline unsigned long stack_not_used(struct task_struct *p)
+{
+        unsigned long *n = end_of_stack(p);
+
+        do {    /* Skip over canary */
+                n++;
+        } while (!*n);
+
+        return (unsigned long)n - (unsigned long)end_of_stack(p);
+}
+#endif
+
 /* set thread flags in other task's structures
  * - see asm/thread_info.h for TIF_xxxx flags available
  */
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 8ba1c320f975..c2731bfe04d8 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -60,7 +60,7 @@ typedef struct sctphdr {
         __be16 source;
         __be16 dest;
         __be32 vtag;
-        __be32 checksum;
+        __le32 checksum;
 } __attribute__((packed)) sctp_sctphdr_t;
 
 #ifdef __KERNEL__
@@ -172,35 +172,35 @@ typedef struct sctp_paramhdr {
 typedef enum {
 
         /* RFC 2960 Section 3.3.5 */
-        SCTP_PARAM_HEARTBEAT_INFO               = __constant_htons(1),
+        SCTP_PARAM_HEARTBEAT_INFO               = cpu_to_be16(1),
         /* RFC 2960 Section 3.3.2.1 */
-        SCTP_PARAM_IPV4_ADDRESS                 = __constant_htons(5),
-        SCTP_PARAM_IPV6_ADDRESS                 = __constant_htons(6),
-        SCTP_PARAM_STATE_COOKIE                 = __constant_htons(7),
-        SCTP_PARAM_UNRECOGNIZED_PARAMETERS      = __constant_htons(8),
-        SCTP_PARAM_COOKIE_PRESERVATIVE          = __constant_htons(9),
-        SCTP_PARAM_HOST_NAME_ADDRESS            = __constant_htons(11),
-        SCTP_PARAM_SUPPORTED_ADDRESS_TYPES      = __constant_htons(12),
-        SCTP_PARAM_ECN_CAPABLE                  = __constant_htons(0x8000),
+        SCTP_PARAM_IPV4_ADDRESS                 = cpu_to_be16(5),
+        SCTP_PARAM_IPV6_ADDRESS                 = cpu_to_be16(6),
+        SCTP_PARAM_STATE_COOKIE                 = cpu_to_be16(7),
+        SCTP_PARAM_UNRECOGNIZED_PARAMETERS      = cpu_to_be16(8),
+        SCTP_PARAM_COOKIE_PRESERVATIVE          = cpu_to_be16(9),
+        SCTP_PARAM_HOST_NAME_ADDRESS            = cpu_to_be16(11),
+        SCTP_PARAM_SUPPORTED_ADDRESS_TYPES      = cpu_to_be16(12),
+        SCTP_PARAM_ECN_CAPABLE                  = cpu_to_be16(0x8000),
 
         /* AUTH Extension Section 3 */
-        SCTP_PARAM_RANDOM                       = __constant_htons(0x8002),
-        SCTP_PARAM_CHUNKS                       = __constant_htons(0x8003),
-        SCTP_PARAM_HMAC_ALGO                    = __constant_htons(0x8004),
+        SCTP_PARAM_RANDOM                       = cpu_to_be16(0x8002),
+        SCTP_PARAM_CHUNKS                       = cpu_to_be16(0x8003),
+        SCTP_PARAM_HMAC_ALGO                    = cpu_to_be16(0x8004),
 
         /* Add-IP: Supported Extensions, Section 4.2 */
-        SCTP_PARAM_SUPPORTED_EXT        = __constant_htons(0x8008),
+        SCTP_PARAM_SUPPORTED_EXT        = cpu_to_be16(0x8008),
 
         /* PR-SCTP Sec 3.1 */
-        SCTP_PARAM_FWD_TSN_SUPPORT      = __constant_htons(0xc000),
+        SCTP_PARAM_FWD_TSN_SUPPORT      = cpu_to_be16(0xc000),
 
         /* Add-IP Extension. Section 3.2 */
-        SCTP_PARAM_ADD_IP               = __constant_htons(0xc001),
-        SCTP_PARAM_DEL_IP               = __constant_htons(0xc002),
-        SCTP_PARAM_ERR_CAUSE            = __constant_htons(0xc003),
-        SCTP_PARAM_SET_PRIMARY          = __constant_htons(0xc004),
-        SCTP_PARAM_SUCCESS_REPORT       = __constant_htons(0xc005),
-        SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
+        SCTP_PARAM_ADD_IP               = cpu_to_be16(0xc001),
+        SCTP_PARAM_DEL_IP               = cpu_to_be16(0xc002),
+        SCTP_PARAM_ERR_CAUSE            = cpu_to_be16(0xc003),
+        SCTP_PARAM_SET_PRIMARY          = cpu_to_be16(0xc004),
+        SCTP_PARAM_SUCCESS_REPORT       = cpu_to_be16(0xc005),
+        SCTP_PARAM_ADAPTATION_LAYER_IND = cpu_to_be16(0xc006),
 
 } sctp_param_t; /* enum */
 
@@ -212,13 +212,13 @@ typedef enum {
  *
  */
 typedef enum {
-        SCTP_PARAM_ACTION_DISCARD     = __constant_htons(0x0000),
-        SCTP_PARAM_ACTION_DISCARD_ERR = __constant_htons(0x4000),
-        SCTP_PARAM_ACTION_SKIP        = __constant_htons(0x8000),
-        SCTP_PARAM_ACTION_SKIP_ERR    = __constant_htons(0xc000),
+        SCTP_PARAM_ACTION_DISCARD     = cpu_to_be16(0x0000),
+        SCTP_PARAM_ACTION_DISCARD_ERR = cpu_to_be16(0x4000),
+        SCTP_PARAM_ACTION_SKIP        = cpu_to_be16(0x8000),
+        SCTP_PARAM_ACTION_SKIP_ERR    = cpu_to_be16(0xc000),
 } sctp_param_action_t;
 
-enum { SCTP_PARAM_ACTION_MASK = __constant_htons(0xc000), };
+enum { SCTP_PARAM_ACTION_MASK = cpu_to_be16(0xc000), };
 
 /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */
 
@@ -457,17 +457,17 @@ typedef struct sctp_operr_chunk {
  */
 typedef enum {
 
-        SCTP_ERROR_NO_ERROR        = __constant_htons(0x00),
-        SCTP_ERROR_INV_STRM        = __constant_htons(0x01),
-        SCTP_ERROR_MISS_PARAM      = __constant_htons(0x02),
-        SCTP_ERROR_STALE_COOKIE    = __constant_htons(0x03),
-        SCTP_ERROR_NO_RESOURCE     = __constant_htons(0x04),
-        SCTP_ERROR_DNS_FAILED      = __constant_htons(0x05),
-        SCTP_ERROR_UNKNOWN_CHUNK   = __constant_htons(0x06),
-        SCTP_ERROR_INV_PARAM       = __constant_htons(0x07),
-        SCTP_ERROR_UNKNOWN_PARAM   = __constant_htons(0x08),
-        SCTP_ERROR_NO_DATA         = __constant_htons(0x09),
-        SCTP_ERROR_COOKIE_IN_SHUTDOWN = __constant_htons(0x0a),
+        SCTP_ERROR_NO_ERROR        = cpu_to_be16(0x00),
+        SCTP_ERROR_INV_STRM        = cpu_to_be16(0x01),
+        SCTP_ERROR_MISS_PARAM      = cpu_to_be16(0x02),
+        SCTP_ERROR_STALE_COOKIE    = cpu_to_be16(0x03),
+        SCTP_ERROR_NO_RESOURCE     = cpu_to_be16(0x04),
+        SCTP_ERROR_DNS_FAILED      = cpu_to_be16(0x05),
+        SCTP_ERROR_UNKNOWN_CHUNK   = cpu_to_be16(0x06),
+        SCTP_ERROR_INV_PARAM       = cpu_to_be16(0x07),
+        SCTP_ERROR_UNKNOWN_PARAM   = cpu_to_be16(0x08),
+        SCTP_ERROR_NO_DATA         = cpu_to_be16(0x09),
+        SCTP_ERROR_COOKIE_IN_SHUTDOWN = cpu_to_be16(0x0a),
 
 
         /* SCTP Implementation Guide:
@@ -476,9 +476,9 @@ typedef enum {
          *  13  Protocol Violation
          */
 
-        SCTP_ERROR_RESTART         = __constant_htons(0x0b),
-        SCTP_ERROR_USER_ABORT      = __constant_htons(0x0c),
-        SCTP_ERROR_PROTO_VIOLATION = __constant_htons(0x0d),
+        SCTP_ERROR_RESTART         = cpu_to_be16(0x0b),
+        SCTP_ERROR_USER_ABORT      = cpu_to_be16(0x0c),
+        SCTP_ERROR_PROTO_VIOLATION = cpu_to_be16(0x0d),
 
         /* ADDIP Section 3.3  New Error Causes
          *
@@ -493,11 +493,11 @@ typedef enum {
          * 0x0103          Association Aborted due to illegal ASCONF-ACK
          * 0x0104          Request refused - no authorization.
          */
-        SCTP_ERROR_DEL_LAST_IP  = __constant_htons(0x0100),
-        SCTP_ERROR_RSRC_LOW     = __constant_htons(0x0101),
-        SCTP_ERROR_DEL_SRC_IP   = __constant_htons(0x0102),
-        SCTP_ERROR_ASCONF_ACK   = __constant_htons(0x0103),
-        SCTP_ERROR_REQ_REFUSED  = __constant_htons(0x0104),
+        SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x0100),
+        SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x0101),
+        SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x0102),
+        SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x0103),
+        SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x0104),
 
         /* AUTH Section 4.  New Error Cause
          *
@@ -509,7 +509,7 @@ typedef enum {
          * --------------------------------------------------------------
          * 0x0105          Unsupported HMAC Identifier
          */
-         SCTP_ERROR_UNSUP_HMAC  = __constant_htons(0x0105)
+         SCTP_ERROR_UNSUP_HMAC  = cpu_to_be16(0x0105)
 } sctp_error_t;
 
 
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 262a8dccfa81..167c33361d9c 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -21,6 +21,8 @@ extern long prctl_set_seccomp(unsigned long);
 
 #else /* CONFIG_SECCOMP */
 
+#include <linux/errno.h>
+
 typedef struct { } seccomp_t;
 
 #define secure_computing(x) do { } while (0)
diff --git a/include/linux/section-names.h b/include/linux/section-names.h
new file mode 100644
index 000000000000..c956f4eb2adf
--- /dev/null
+++ b/include/linux/section-names.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_SECTION_NAMES_H
+#define __LINUX_SECTION_NAMES_H
+
+#define HEAD_TEXT_SECTION .head.text
+
+#endif /* !__LINUX_SECTION_NAMES_H */
diff --git a/include/linux/security.h b/include/linux/security.h
index 1f2ab6353c00..d5fd6163606f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -32,6 +32,7 @@
 #include <linux/sched.h>
 #include <linux/key.h>
 #include <linux/xfrm.h>
+#include <linux/gfp.h>
 #include <net/flow.h>
 
 /* Maximum number of letters for an LSM name string */
@@ -880,11 +881,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @sock contains the listening socket structure.
  *      @newsock contains the newly created server socket for connection.
  *      Return 0 if permission is granted.
- * @socket_post_accept:
- *      This hook allows a security module to copy security
- *      information into the newly created socket's inode.
- *      @sock contains the listening socket structure.
- *      @newsock contains the newly created server socket for connection.
  * @socket_sendmsg:
  *      Check permission before transmitting a message to another socket.
  *      @sock contains the socket structure.
@@ -1554,8 +1550,6 @@ struct security_operations {
                                struct sockaddr *address, int addrlen);
         int (*socket_listen) (struct socket *sock, int backlog);
         int (*socket_accept) (struct socket *sock, struct socket *newsock);
-        void (*socket_post_accept) (struct socket *sock,
-                                    struct socket *newsock);
         int (*socket_sendmsg) (struct socket *sock,
                                struct msghdr *msg, int size);
         int (*socket_recvmsg) (struct socket *sock,
@@ -2537,7 +2531,6 @@ int security_socket_bind(struct socket *sock, struct sockaddr *address, int addr
 int security_socket_connect(struct socket *sock, struct sockaddr *address, int addrlen);
 int security_socket_listen(struct socket *sock, int backlog);
 int security_socket_accept(struct socket *sock, struct socket *newsock);
-void security_socket_post_accept(struct socket *sock, struct socket *newsock);
 int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size);
 int security_socket_recvmsg(struct socket *sock, struct msghdr *msg,
                             int size, int flags);
@@ -2616,11 +2609,6 @@ static inline int security_socket_accept(struct socket *sock,
         return 0;
 }
 
-static inline void security_socket_post_accept(struct socket *sock,
-                                               struct socket *newsock)
-{
-}
-
 static inline int security_socket_sendmsg(struct socket *sock,
                                           struct msghdr *msg, int size)
 {
@@ -2966,5 +2954,28 @@ static inline void securityfs_remove(struct dentry *dentry)
 
 #endif
 
+#ifdef CONFIG_SECURITY
+
+static inline char *alloc_secdata(void)
+{
+        return (char *)get_zeroed_page(GFP_KERNEL);
+}
+
+static inline void free_secdata(void *secdata)
+{
+        free_page((unsigned long)secdata);
+}
+
+#else
+
+static inline char *alloc_secdata(void)
+{
+        return (char *)1;
+}
+
+static inline void free_secdata(void *secdata)
+{ }
+#endif /* CONFIG_SECURITY */
+
 #endif /* ! __LINUX_SECURITY_H */
 
diff --git a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h
index bbf489decd84..d239797785cf 100644
--- a/include/linux/selinux_netlink.h
+++ b/include/linux/selinux_netlink.h
@@ -12,6 +12,8 @@
 #ifndef _LINUX_SELINUX_NETLINK_H
 #define _LINUX_SELINUX_NETLINK_H
 
+#include <linux/types.h>
+
 /* Message types. */
 #define SELNL_MSG_BASE 0x10
 enum {
@@ -38,11 +40,11 @@ enum selinux_nlgroups {
 
 /* Message structures */
 struct selnl_msg_setenforce {
-        int32_t         val;
+        __s32           val;
 };
 
 struct selnl_msg_policyload {
-        u_int32_t       seqno;
+        __u32   seqno;
 };
 
 #endif /* _LINUX_SELINUX_NETLINK_H */
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index f616f31576d7..004f3b3342c5 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -55,7 +55,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits,
                                    unsigned int nr_bits);
 static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
 {
-        return seq_bitmap(m, mask->bits, nr_cpu_ids);
+        return seq_bitmap(m, cpumask_bits(mask), nr_cpu_ids);
 }
 
 static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
@@ -63,12 +63,13 @@ static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
         return seq_bitmap(m, mask->bits, MAX_NUMNODES);
 }
 
-int seq_bitmap_list(struct seq_file *m, unsigned long *bits,
+int seq_bitmap_list(struct seq_file *m, const unsigned long *bits,
                 unsigned int nr_bits);
 
-static inline int seq_cpumask_list(struct seq_file *m, cpumask_t *mask)
+static inline int seq_cpumask_list(struct seq_file *m,
+                                   const struct cpumask *mask)
 {
-        return seq_bitmap_list(m, mask->bits, NR_CPUS);
+        return seq_bitmap_list(m, cpumask_bits(mask), nr_cpu_ids);
 }
 
 static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c7bd3b..57a97e52e58d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -164,6 +164,9 @@
 /* NWPSERIAL */
 #define PORT_NWPSERIAL  85
 
+/* MAX3100 */
+#define PORT_MAX3100    86
+
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>
@@ -277,7 +280,7 @@ struct uart_port {
         struct uart_icount      icount;                 /* statistics */
 
         struct console          *cons;                  /* struct console, if any */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
         unsigned long           sysrq;                  /* sysrq timeout */
 #endif
 
diff --git a/include/linux/serial_max3100.h b/include/linux/serial_max3100.h
new file mode 100644
index 000000000000..4976befb6aeb
--- /dev/null
+++ b/include/linux/serial_max3100.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Copyright (C) 2007 Christian Pellegrin
+ *
+ * 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_SERIAL_MAX3100_H
+#define _LINUX_SERIAL_MAX3100_H 1
+
+
+/**
+ * struct plat_max3100 - MAX3100 SPI UART platform data
+ * @loopback:            force MAX3100 in loopback
+ * @crystal:             1 for 3.6864 Mhz, 0 for 1.8432
+ * @max3100_hw_suspend:  MAX3100 has a shutdown pin. This is a hook
+ *                       called on suspend and resume to activate it.
+ * @poll_time:           poll time for CTS signal in ms, 0 disables (so no hw
+ *                       flow ctrl is possible but you have less CPU usage)
+ *
+ * You should use this structure in your machine description to specify
+ * how the MAX3100 is connected. Example:
+ *
+ * static struct plat_max3100 max3100_plat_data = {
+ *  .loopback = 0,
+ *  .crystal = 0,
+ *  .poll_time = 100,
+ * };
+ *
+ * static struct spi_board_info spi_board_info[] = {
+ * {
+ *  .modalias   = "max3100",
+ *  .platform_data      = &max3100_plat_data,
+ *  .irq                = IRQ_EINT12,
+ *  .max_speed_hz       = 5*1000*1000,
+ *  .chip_select        = 0,
+ * },
+ * };
+ *
+ **/
+struct plat_max3100 {
+        int loopback;
+        int crystal;
+        void (*max3100_hw_suspend) (int suspend);
+        int poll_time;
+};
+
+#endif
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 1bcb357a01a1..e0417e4d3f15 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -212,7 +212,7 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_FUJITSU   0x35
 #define SERIO_ZHENHUA   0x36
 #define SERIO_INEXIO    0x37
-#define SERIO_TOUCHIT213        0x37
+#define SERIO_TOUCHIT213        0x38
 #define SERIO_W8001     0x39
 
 #endif
diff --git a/include/linux/sh_cmt.h b/include/linux/sh_cmt.h
new file mode 100644
index 000000000000..68cacde5954f
--- /dev/null
+++ b/include/linux/sh_cmt.h
@@ -0,0 +1,13 @@
+#ifndef __SH_CMT_H__
+#define __SH_CMT_H__
+
+struct sh_cmt_config {
+        char *name;
+        unsigned long channel_offset;
+        int timer_bit;
+        char *clk;
+        unsigned long clockevent_rating;
+        unsigned long clocksource_rating;
+};
+
+#endif /* __SH_CMT_H__ */
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 68e212ff9dde..eb1423a0078d 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -85,6 +85,7 @@ struct intc_desc symbol __initdata = {					\
 }
 #endif
 
+unsigned int intc_evt2irq(unsigned int vector);
 void __init register_intc_controller(struct intc_desc *desc);
 int intc_set_priority(unsigned int irq, unsigned int prio);
 
diff --git a/include/linux/sht15.h b/include/linux/sht15.h
new file mode 100644
index 000000000000..046bce05ecab
--- /dev/null
+++ b/include/linux/sht15.h
@@ -0,0 +1,24 @@
+/*
+ * sht15.h - support for the SHT15 Temperature and Humidity Sensor
+ *
+ * Copyright (c) 2009 Jonathan Cameron
+ *
+ * Copyright (c) 2007 Wouter Horre
+ *
+ * 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.
+ */
+
+/**
+ * struct sht15_platform_data - sht15 connectivity info
+ * @gpio_data:  no. of gpio to which bidirectional data line is connected
+ * @gpio_sck:   no. of gpio to which the data clock is connected.
+ * @supply_mv:  supply voltage in mv. Overridden by regulator if available.
+ **/
+struct sht15_platform_data {
+        int gpio_data;
+        int gpio_sck;
+        int supply_mv;
+};
+
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9dcf956ad18a..5fd389162f01 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -29,9 +29,6 @@
 #include <linux/dmaengine.h>
 #include <linux/hrtimer.h>
 
-#define HAVE_ALLOC_SKB          /* For the drivers to know */
-#define HAVE_ALIGNABLE_SKB      /* Ditto 8)                */
-
 /* Don't change this without changing skb_csum_unnecessary! */
 #define CHECKSUM_NONE 0
 #define CHECKSUM_UNNECESSARY 1
@@ -135,6 +132,56 @@ struct skb_frag_struct {
         __u32 size;
 };
 
+#define HAVE_HW_TIME_STAMP
+
+/**
+ * struct skb_shared_hwtstamps - hardware time stamps
+ * @hwtstamp:   hardware time stamp transformed into duration
+ *              since arbitrary point in time
+ * @syststamp:  hwtstamp transformed to system time base
+ *
+ * Software time stamps generated by ktime_get_real() are stored in
+ * skb->tstamp. The relation between the different kinds of time
+ * stamps is as follows:
+ *
+ * syststamp and tstamp can be compared against each other in
+ * arbitrary combinations.  The accuracy of a
+ * syststamp/tstamp/"syststamp from other device" comparison is
+ * limited by the accuracy of the transformation into system time
+ * base. This depends on the device driver and its underlying
+ * hardware.
+ *
+ * hwtstamps can only be compared against other hwtstamps from
+ * the same device.
+ *
+ * This structure is attached to packets as part of the
+ * &skb_shared_info. Use skb_hwtstamps() to get a pointer.
+ */
+struct skb_shared_hwtstamps {
+        ktime_t hwtstamp;
+        ktime_t syststamp;
+};
+
+/**
+ * struct skb_shared_tx - instructions for time stamping of outgoing packets
+ * @hardware:           generate hardware time stamp
+ * @software:           generate software time stamp
+ * @in_progress:        device driver is going to provide
+ *                      hardware time stamp
+ * @flags:              all shared_tx flags
+ *
+ * These flags are attached to packets as part of the
+ * &skb_shared_info. Use skb_tx() to get a pointer.
+ */
+union skb_shared_tx {
+        struct {
+                __u8    hardware:1,
+                        software:1,
+                        in_progress:1;
+        };
+        __u8 flags;
+};
+
 /* This data is invariant across clones and lives at
  * the end of the header data, ie. at skb->end.
  */
@@ -146,10 +193,12 @@ struct skb_shared_info {
         unsigned short  gso_segs;
         unsigned short  gso_type;
         __be32          ip6_frag_id;
+        union skb_shared_tx tx_flags;
 #ifdef CONFIG_HAS_DMA
         unsigned int    num_dma_maps;
 #endif
         struct sk_buff  *frag_list;
+        struct skb_shared_hwtstamps hwtstamps;
         skb_frag_t      frags[MAX_SKB_FRAGS];
 #ifdef CONFIG_HAS_DMA
         dma_addr_t      dma_maps[MAX_SKB_FRAGS + 1];
@@ -188,6 +237,8 @@ enum {
         SKB_GSO_TCP_ECN = 1 << 3,
 
         SKB_GSO_TCPV6 = 1 << 4,
+
+        SKB_GSO_FCOE = 1 << 5,
 };
 
 #if BITS_PER_LONG > 32
@@ -373,6 +424,7 @@ extern void skb_dma_unmap(struct device *dev, struct sk_buff *skb,
 #endif
 
 extern void kfree_skb(struct sk_buff *skb);
+extern void consume_skb(struct sk_buff *skb);
 extern void            __kfree_skb(struct sk_buff *skb);
 extern struct sk_buff *__alloc_skb(unsigned int size,
                                    gfp_t priority, int fclone, int node);
@@ -411,7 +463,8 @@ extern int	       skb_to_sgvec(struct sk_buff *skb,
 extern int             skb_cow_data(struct sk_buff *skb, int tailbits,
                                     struct sk_buff **trailer);
 extern int             skb_pad(struct sk_buff *skb, int pad);
-#define dev_kfree_skb(a)        kfree_skb(a)
+#define dev_kfree_skb(a)        consume_skb(a)
+#define dev_consume_skb(a)      kfree_skb_clean(a)
 extern void           skb_over_panic(struct sk_buff *skb, int len,
                                      void *here);
 extern void           skb_under_panic(struct sk_buff *skb, int len,
@@ -459,6 +512,16 @@ static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 /* Internal */
 #define skb_shinfo(SKB) ((struct skb_shared_info *)(skb_end_pointer(SKB)))
 
+static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
+{
+        return &skb_shinfo(skb)->hwtstamps;
+}
+
+static inline union skb_shared_tx *skb_tx(struct sk_buff *skb)
+{
+        return &skb_shinfo(skb)->tx_flags;
+}
+
 /**
  *      skb_queue_empty - check if a queue is empty
  *      @list: queue head
@@ -1278,7 +1341,7 @@ static inline int skb_network_offset(const struct sk_buff *skb)
  * The networking layer reserves some headroom in skb data (via
  * dev_alloc_skb). This is used to avoid having to reallocate skb data when
  * the header has to grow. In the default case, if the header has to grow
- * 16 bytes or less we avoid the reallocation.
+ * 32 bytes or less we avoid the reallocation.
  *
  * Unfortunately this headroom changes the DMA alignment of the resulting
  * network packet. As for NET_IP_ALIGN, this unaligned DMA is expensive
@@ -1286,11 +1349,11 @@ static inline int skb_network_offset(const struct sk_buff *skb)
  * perhaps setting it to a cacheline in size (since that will maintain
  * cacheline alignment of the DMA). It must be a power of 2.
  *
- * Various parts of the networking layer expect at least 16 bytes of
+ * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
  */
 #ifndef NET_SKB_PAD
-#define NET_SKB_PAD     16
+#define NET_SKB_PAD     32
 #endif
 
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
@@ -1678,8 +1741,6 @@ extern int	       skb_shift(struct sk_buff *tgt, struct sk_buff *skb,
                                  int shiftlen);
 
 extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
-extern int             skb_gro_receive(struct sk_buff **head,
-                                       struct sk_buff *skb);
 
 static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
                                        int len, void *buffer)
@@ -1726,6 +1787,11 @@ static inline void skb_copy_to_linear_data_offset(struct sk_buff *skb,
 
 extern void skb_init(void);
 
+static inline ktime_t skb_get_ktime(const struct sk_buff *skb)
+{
+        return skb->tstamp;
+}
+
 /**
  *      skb_get_timestamp - get timestamp from a skb
  *      @skb: skb to get stamp from
@@ -1735,11 +1801,18 @@ extern void skb_init(void);
  *      This function converts the offset back to a struct timeval and stores
  *      it in stamp.
  */
-static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *stamp)
+static inline void skb_get_timestamp(const struct sk_buff *skb,
+                                     struct timeval *stamp)
 {
         *stamp = ktime_to_timeval(skb->tstamp);
 }
 
+static inline void skb_get_timestampns(const struct sk_buff *skb,
+                                       struct timespec *stamp)
+{
+        *stamp = ktime_to_timespec(skb->tstamp);
+}
+
 static inline void __net_timestamp(struct sk_buff *skb)
 {
         skb->tstamp = ktime_get_real();
@@ -1755,6 +1828,20 @@ static inline ktime_t net_invalid_timestamp(void)
         return ktime_set(0, 0);
 }
 
+/**
+ * skb_tstamp_tx - queue clone of skb with send time stamps
+ * @orig_skb:   the original outgoing packet
+ * @hwtstamps:  hardware time stamps, may be NULL if not available
+ *
+ * If the skb has a socket associated, then this function clones the
+ * skb (thus sharing the actual data and optional structures), stores
+ * the optional hardware time stamping information (if non NULL) or
+ * generates a software time stamp (otherwise), then queues the clone
+ * to the error queue of the socket.  Errors are silently ignored.
+ */
+extern void skb_tstamp_tx(struct sk_buff *orig_skb,
+                        struct skb_shared_hwtstamps *hwtstamps);
+
 extern __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len);
 extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
 
@@ -1885,7 +1972,7 @@ static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
         skb->queue_mapping = queue_mapping;
 }
 
-static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
+static inline u16 skb_get_queue_mapping(const struct sk_buff *skb)
 {
         return skb->queue_mapping;
 }
@@ -1895,6 +1982,24 @@ static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_bu
         to->queue_mapping = from->queue_mapping;
 }
 
+static inline void skb_record_rx_queue(struct sk_buff *skb, u16 rx_queue)
+{
+        skb->queue_mapping = rx_queue + 1;
+}
+
+static inline u16 skb_get_rx_queue(const struct sk_buff *skb)
+{
+        return skb->queue_mapping - 1;
+}
+
+static inline bool skb_rx_queue_recorded(const struct sk_buff *skb)
+{
+        return (skb->queue_mapping != 0);
+}
+
+extern u16 skb_tx_hash(const struct net_device *dev,
+                       const struct sk_buff *skb);
+
 #ifdef CONFIG_XFRM
 static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
 {
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 6ca6a7b66d75..5ac9b0bcaf9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -14,6 +14,7 @@
 #include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
+#include <trace/kmemtrace.h>
 
 /* Size description struct for general caches. */
 struct cache_sizes {
@@ -28,8 +29,26 @@ extern struct cache_sizes malloc_sizes[];
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
-static inline void *kmalloc(size_t size, gfp_t flags)
+#ifdef CONFIG_KMEMTRACE
+extern void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags);
+extern size_t slab_buffer_size(struct kmem_cache *cachep);
+#else
+static __always_inline void *
+kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags)
 {
+        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)
+{
+        struct kmem_cache *cachep;
+        void *ret;
+
         if (__builtin_constant_p(size)) {
                 int i = 0;
 
@@ -47,10 +66,17 @@ static inline void *kmalloc(size_t size, gfp_t flags)
 found:
 #ifdef CONFIG_ZONE_DMA
                 if (flags & GFP_DMA)
-                        return kmem_cache_alloc(malloc_sizes[i].cs_dmacachep,
-                                                flags);
+                        cachep = malloc_sizes[i].cs_dmacachep;
+                else
 #endif
-                return kmem_cache_alloc(malloc_sizes[i].cs_cachep, flags);
+                        cachep = malloc_sizes[i].cs_cachep;
+
+                ret = kmem_cache_alloc_notrace(cachep, flags);
+
+                trace_kmalloc(_THIS_IP_, ret,
+                              size, slab_buffer_size(cachep), flags);
+
+                return ret;
         }
         return __kmalloc(size, flags);
 }
@@ -59,8 +85,25 @@ found:
 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);
 
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+#ifdef CONFIG_KMEMTRACE
+extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,
+                                           gfp_t flags,
+                                           int nodeid);
+#else
+static __always_inline void *
+kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,
+                              gfp_t flags,
+                              int nodeid)
+{
+        return kmem_cache_alloc_node(cachep, flags, nodeid);
+}
+#endif
+
+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
+        struct kmem_cache *cachep;
+        void *ret;
+
         if (__builtin_constant_p(size)) {
                 int i = 0;
 
@@ -78,11 +121,18 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 found:
 #ifdef CONFIG_ZONE_DMA
                 if (flags & GFP_DMA)
-                        return kmem_cache_alloc_node(malloc_sizes[i].cs_dmacachep,
-                                                flags, node);
+                        cachep = malloc_sizes[i].cs_dmacachep;
+                else
 #endif
-                return kmem_cache_alloc_node(malloc_sizes[i].cs_cachep,
-                                                flags, node);
+                        cachep = malloc_sizes[i].cs_cachep;
+
+                ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
+
+                trace_kmalloc_node(_THIS_IP_, ret,
+                                   size, slab_buffer_size(cachep),
+                                   flags, node);
+
+                return ret;
         }
         return __kmalloc_node(size, flags, node);
 }
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index 59a3fa476ab9..0ec00b39d006 100644
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -3,14 +3,15 @@
 
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
-static inline void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
+static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
+                                              gfp_t flags)
 {
         return kmem_cache_alloc_node(cachep, flags, -1);
 }
 
 void *__kmalloc_node(size_t size, gfp_t flags, int node);
 
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
         return __kmalloc_node(size, flags, node);
 }
@@ -23,12 +24,12 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
  * kmalloc is the normal method of allocating memory
  * in the kernel.
  */
-static inline void *kmalloc(size_t size, gfp_t flags)
+static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
         return __kmalloc_node(size, flags, -1);
 }
 
-static inline void *__kmalloc(size_t size, gfp_t flags)
+static __always_inline void *__kmalloc(size_t size, gfp_t flags)
 {
         return kmalloc(size, flags);
 }
diff --git a/include/linux/slow-work.h b/include/linux/slow-work.h
new file mode 100644
index 000000000000..b65c8881f07a
--- /dev/null
+++ b/include/linux/slow-work.h
@@ -0,0 +1,95 @@
+/* Worker thread pool for slow items, such as filesystem lookups or mkdirs
+ *
+ * Copyright (C) 2008 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.
+ *
+ * See Documentation/slow-work.txt
+ */
+
+#ifndef _LINUX_SLOW_WORK_H
+#define _LINUX_SLOW_WORK_H
+
+#ifdef CONFIG_SLOW_WORK
+
+#include <linux/sysctl.h>
+
+struct slow_work;
+
+/*
+ * The operations used to support slow work items
+ */
+struct slow_work_ops {
+        /* get a ref on a work item
+         * - return 0 if successful, -ve if not
+         */
+        int (*get_ref)(struct slow_work *work);
+
+        /* discard a ref to a work item */
+        void (*put_ref)(struct slow_work *work);
+
+        /* execute a work item */
+        void (*execute)(struct slow_work *work);
+};
+
+/*
+ * A slow work item
+ * - A reference is held on the parent object by the thread pool when it is
+ *   queued
+ */
+struct slow_work {
+        unsigned long           flags;
+#define SLOW_WORK_PENDING       0       /* item pending (further) execution */
+#define SLOW_WORK_EXECUTING     1       /* item currently executing */
+#define SLOW_WORK_ENQ_DEFERRED  2       /* item enqueue deferred */
+#define SLOW_WORK_VERY_SLOW     3       /* item is very slow */
+        const struct slow_work_ops *ops; /* operations table for this item */
+        struct list_head        link;   /* link in queue */
+};
+
+/**
+ * slow_work_init - Initialise a slow work item
+ * @work: The work item to initialise
+ * @ops: The operations to use to handle the slow work item
+ *
+ * Initialise a slow work item.
+ */
+static inline void slow_work_init(struct slow_work *work,
+                                  const struct slow_work_ops *ops)
+{
+        work->flags = 0;
+        work->ops = ops;
+        INIT_LIST_HEAD(&work->link);
+}
+
+/**
+ * vslow_work_init - Initialise a very slow work item
+ * @work: The work item to initialise
+ * @ops: The operations to use to handle the slow work item
+ *
+ * Initialise a very slow work item.  This item will be restricted such that
+ * only a certain number of the pool threads will be able to execute items of
+ * this type.
+ */
+static inline void vslow_work_init(struct slow_work *work,
+                                   const struct slow_work_ops *ops)
+{
+        work->flags = 1 << SLOW_WORK_VERY_SLOW;
+        work->ops = ops;
+        INIT_LIST_HEAD(&work->link);
+}
+
+extern int slow_work_enqueue(struct slow_work *work);
+extern int slow_work_register_user(void);
+extern void slow_work_unregister_user(void);
+
+#ifdef CONFIG_SYSCTL
+extern ctl_table slow_work_sysctls[];
+#endif
+
+#endif /* CONFIG_SLOW_WORK */
+#endif /* _LINUX_SLOW_WORK_H */
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 2f5c16b1aacd..5046f90c1171 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -10,6 +10,7 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
+#include <trace/kmemtrace.h>
 
 enum stat_item {
         ALLOC_FASTPATH,         /* Allocation from cpu slab */
@@ -46,7 +47,6 @@ struct kmem_cache_cpu {
 struct kmem_cache_node {
         spinlock_t list_lock;   /* Protect partial list and nr_partial */
         unsigned long nr_partial;
-        unsigned long min_partial;
         struct list_head partial;
 #ifdef CONFIG_SLUB_DEBUG
         atomic_long_t nr_slabs;
@@ -89,6 +89,7 @@ struct kmem_cache {
         void (*ctor)(void *);
         int inuse;              /* Offset to metadata */
         int align;              /* Alignment */
+        unsigned long min_partial;
         const char *name;       /* Name (only for display!) */
         struct list_head list;  /* List of slab caches */
 #ifdef CONFIG_SLUB_DEBUG
@@ -121,10 +122,23 @@ struct kmem_cache {
 #define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE)
 
 /*
+ * Maximum kmalloc object size handled by SLUB. Larger object allocations
+ * are passed through to the page allocator. The page allocator "fastpath"
+ * is relatively slow so we need this value sufficiently high so that
+ * performance critical objects are allocated through the SLUB fastpath.
+ *
+ * This should be dropped to PAGE_SIZE / 2 once the page allocator
+ * "fastpath" becomes competitive with the slab allocator fastpaths.
+ */
+#define SLUB_MAX_SIZE (2 * PAGE_SIZE)
+
+#define SLUB_PAGE_SHIFT (PAGE_SHIFT + 2)
+
+/*
  * We keep the general caches in an array of slab caches that are used for
  * 2^x bytes of allocations.
  */
-extern struct kmem_cache kmalloc_caches[PAGE_SHIFT + 1];
+extern struct kmem_cache kmalloc_caches[SLUB_PAGE_SHIFT];
 
 /*
  * Sorry that the following has to be that ugly but some versions of GCC
@@ -204,15 +218,32 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
+#ifdef CONFIG_KMEMTRACE
+extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
+#else
+static __always_inline void *
+kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags)
+{
+        return kmem_cache_alloc(s, gfpflags);
+}
+#endif
+
 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
 {
-        return (void *)__get_free_pages(flags | __GFP_COMP, get_order(size));
+        unsigned int order = get_order(size);
+        void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
+
+        trace_kmalloc(_THIS_IP_, ret, size, PAGE_SIZE << order, flags);
+
+        return ret;
 }
 
 static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
+        void *ret;
+
         if (__builtin_constant_p(size)) {
-                if (size > PAGE_SIZE)
+                if (size > SLUB_MAX_SIZE)
                         return kmalloc_large(size, flags);
 
                 if (!(flags & SLUB_DMA)) {
@@ -221,7 +252,11 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
                         if (!s)
                                 return ZERO_SIZE_PTR;
 
-                        return kmem_cache_alloc(s, flags);
+                        ret = kmem_cache_alloc_notrace(s, flags);
+
+                        trace_kmalloc(_THIS_IP_, ret, size, s->size, flags);
+
+                        return ret;
                 }
         }
         return __kmalloc(size, flags);
@@ -231,16 +266,37 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
 void *__kmalloc_node(size_t size, gfp_t flags, int node);
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
+#ifdef CONFIG_KMEMTRACE
+extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,
+                                           gfp_t gfpflags,
+                                           int node);
+#else
+static __always_inline void *
+kmem_cache_alloc_node_notrace(struct kmem_cache *s,
+                              gfp_t gfpflags,
+                              int node)
+{
+        return kmem_cache_alloc_node(s, gfpflags, node);
+}
+#endif
+
 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
+        void *ret;
+
         if (__builtin_constant_p(size) &&
-                size <= PAGE_SIZE && !(flags & SLUB_DMA)) {
+                size <= SLUB_MAX_SIZE && !(flags & SLUB_DMA)) {
                         struct kmem_cache *s = kmalloc_slab(size);
 
                 if (!s)
                         return ZERO_SIZE_PTR;
 
-                return kmem_cache_alloc_node(s, flags, node);
+                ret = kmem_cache_alloc_node_notrace(s, flags, node);
+
+                trace_kmalloc_node(_THIS_IP_, ret,
+                                   size, s->size, flags, node);
+
+                return ret;
         }
         return __kmalloc_node(size, flags, node);
 }
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 715196b09d67..a69db820eed6 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -38,7 +38,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
  * (defined in asm header):
- */ 
+ */
 
 /*
  * stops all CPUs but the current one:
@@ -82,7 +82,8 @@ smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
         return 0;
 }
 
-void __smp_call_function_single(int cpuid, struct call_single_data *data);
+void __smp_call_function_single(int cpuid, struct call_single_data *data,
+                                int wait);
 
 /*
  * Generic and arch helpers
@@ -121,6 +122,8 @@ extern unsigned int setup_max_cpus;
 
 #else /* !SMP */
 
+static inline void smp_send_stop(void) { }
+
 /*
  *      These macros fold the SMP functionality into a single CPU system
  */
@@ -176,6 +179,12 @@ static inline void init_call_single_data(void)
 #define put_cpu()               preempt_enable()
 #define put_cpu_no_resched()    preempt_enable_no_resched()
 
+/*
+ * Callback to arch code if there's nosmp or maxcpus=0 on the
+ * boot command line:
+ */
+extern void arch_disable_smp_support(void);
+
 void smp_setup_processor_id(void);
 
 #endif /* __LINUX_SMP_H */
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 1cbf0313adde..b32725075d71 100644
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -43,5 +43,8 @@ struct smsc911x_platform_config {
 /* Constants for flags */
 #define SMSC911X_USE_16BIT                      (BIT(0))
 #define SMSC911X_USE_32BIT                      (BIT(1))
+#define SMSC911X_FORCE_INTERNAL_PHY             (BIT(2))
+#define SMSC911X_FORCE_EXTERNAL_PHY             (BIT(3))
+#define SMSC911X_SAVE_MAC_ADDRESS               (BIT(4))
 
 #endif /* __LINUX_SMSC911X_H__ */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 20fc4bbfca42..421afb4d29b0 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
 
-#ifdef CONFIG_PROC_FS
+#ifdef __KERNEL__
+# ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void socket_seq_show(struct seq_file *seq);
-#endif
+# endif
+#endif /* __KERNEL__ */
 
 typedef unsigned short  sa_family_t;
 
@@ -179,6 +181,7 @@ struct ucred {
 #define AF_ASH          18      /* Ash                          */
 #define AF_ECONET       19      /* Acorn Econet                 */
 #define AF_ATMSVC       20      /* ATM SVCs                     */
+#define AF_RDS          21      /* RDS sockets                  */
 #define AF_SNA          22      /* Linux SNA Project (nutters!) */
 #define AF_IRDA         23      /* IRDA sockets                 */
 #define AF_PPPOX        24      /* PPPoX sockets                */
@@ -217,6 +220,7 @@ struct ucred {
 #define PF_ASH          AF_ASH
 #define PF_ECONET       AF_ECONET
 #define PF_ATMSVC       AF_ATMSVC
+#define PF_RDS          AF_RDS
 #define PF_SNA          AF_SNA
 #define PF_IRDA         AF_IRDA
 #define PF_PPPOX        AF_PPPOX
@@ -298,6 +302,7 @@ struct ucred {
 #define SOL_PPPOL2TP    273
 #define SOL_BLUETOOTH   274
 #define SOL_PNPIPE      275
+#define SOL_RDS         276
 
 /* IPX options */
 #define IPX_TYPE        1
diff --git a/include/linux/sockios.h b/include/linux/sockios.h
index abef7596655a..241f179347d9 100644
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -122,6 +122,9 @@
 #define SIOCBRADDIF     0x89a2          /* add interface to bridge      */
 #define SIOCBRDELIF     0x89a3          /* remove interface from bridge */
 
+/* hardware time stamping: parameters in linux/net_tstamp.h */
+#define SIOCSHWTSTAMP   0x89b0
+
 /* Device private ioctl calls */
 
 /*
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index f41ffd7c2dd9..34c4475ac4a2 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -103,6 +103,14 @@
 #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
 
 /* get/set brightness */
 #define SONYPI_IOCGBRT          _IOR('v', 0, __u8)
diff --git a/include/linux/spi/eeprom.h b/include/linux/spi/eeprom.h
index 1085212c446e..306e7b1c69ed 100644
--- a/include/linux/spi/eeprom.h
+++ b/include/linux/spi/eeprom.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_SPI_EEPROM_H
 #define __LINUX_SPI_EEPROM_H
 
+#include <linux/memory.h>
+
 /*
  * Put one of these structures in platform_data for SPI EEPROMS handled
  * by the "at25" driver.  On SPI, most EEPROMS understand the same core
@@ -17,6 +19,10 @@ struct spi_eeprom {
 #define EE_ADDR2        0x0002                  /* 16 bit addrs */
 #define EE_ADDR3        0x0004                  /* 24 bit addrs */
 #define EE_READONLY     0x0008                  /* disallow writes */
+
+        /* for exporting this chip's data to other kernel code */
+        void (*setup)(struct memory_accessor *mem, void *context);
+        void *context;
 };
 
 #endif /* __LINUX_SPI_EEPROM_H */
diff --git a/include/linux/spi/libertas_spi.h b/include/linux/spi/libertas_spi.h
new file mode 100644
index 000000000000..79506f5f9e67
--- /dev/null
+++ b/include/linux/spi/libertas_spi.h
@@ -0,0 +1,32 @@
+/*
+ * board-specific data for the libertas_spi driver.
+ *
+ * Copyright 2008 Analog Devices 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.
+ */
+#ifndef _LIBERTAS_SPI_H_
+#define _LIBERTAS_SPI_H_
+
+struct spi_device;
+
+struct libertas_spi_platform_data {
+        /* There are two ways to read data from the WLAN module's SPI
+         * interface. Setting 0 or 1 here controls which one is used.
+         *
+         * Usually you want to set use_dummy_writes = 1.
+         * However, if that doesn't work or if you are using a slow SPI clock
+         * speed, you may want to use 0 here. */
+        u16 use_dummy_writes;
+
+        /* GPIO number to use as chip select */
+        u16 gpio_cs;
+
+        /* Board specific setup/teardown */
+        int (*setup)(struct spi_device *spi);
+        int (*teardown)(struct spi_device *spi);
+};
+#endif
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 68bb1c501d0d..a0faa18f7b1b 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -204,6 +204,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
  *      SPI slaves, and are numbered from zero to num_chipselects.
  *      each slave has a chipselect signal, but it's common that not
  *      every chipselect is connected to a slave.
+ * @dma_alignment: SPI controller constraint on DMA buffers alignment.
  * @setup: updates the device mode and clocking records used by a
  *      device's SPI controller; protocol code may call this.  This
  *      must fail if an unrecognized or unsupported mode is requested.
@@ -239,7 +240,17 @@ struct spi_master {
          */
         u16                     num_chipselect;
 
-        /* setup mode and clock, etc (spi driver may call many times) */
+        /* some SPI controllers pose alignment requirements on DMAable
+         * buffers; let protocol drivers know about these requirements.
+         */
+        u16                     dma_alignment;
+
+        /* Setup mode and clock, etc (spi driver may call many times).
+         *
+         * IMPORTANT:  this may be called when transfers to another
+         * device are active.  DO NOT UPDATE SHARED REGISTERS in ways
+         * which could break those transfers.
+         */
         int                     (*setup)(struct spi_device *spi);
 
         /* bidirectional bulk transfers
diff --git a/include/linux/spi/spi_gpio.h b/include/linux/spi/spi_gpio.h
index 0f01a0f1f40c..ca6782ee4b9f 100644
--- a/include/linux/spi/spi_gpio.h
+++ b/include/linux/spi/spi_gpio.h
@@ -25,10 +25,16 @@
  *      ...
  *      };
  *
+ * If chipselect is not used (there's only one device on the bus), assign
+ * SPI_GPIO_NO_CHIPSELECT to the controller_data:
+ *              .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT;
+ *
  * If the bitbanged bus is later switched to a "native" controller,
  * that platform_device and controller_data should be removed.
  */
 
+#define SPI_GPIO_NO_CHIPSELECT          ((unsigned long)-1l)
+
 /**
  * struct spi_gpio_platform_data - parameter for bitbanged SPI master
  * @sck: number of the GPIO used for clock output
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index a0c66a2e00ad..252b245cfcf4 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -153,9 +153,11 @@ do {								\
  extern int _raw_spin_trylock(spinlock_t *lock);
  extern void _raw_spin_unlock(spinlock_t *lock);
  extern void _raw_read_lock(rwlock_t *lock);
+#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)
  extern int _raw_read_trylock(rwlock_t *lock);
  extern void _raw_read_unlock(rwlock_t *lock);
  extern void _raw_write_lock(rwlock_t *lock);
+#define _raw_write_lock_flags(lock, flags) _raw_write_lock(lock)
  extern int _raw_write_trylock(rwlock_t *lock);
  extern void _raw_write_unlock(rwlock_t *lock);
 #else
@@ -165,9 +167,13 @@ do {								\
 # define _raw_spin_trylock(lock)        __raw_spin_trylock(&(lock)->raw_lock)
 # define _raw_spin_unlock(lock)         __raw_spin_unlock(&(lock)->raw_lock)
 # define _raw_read_lock(rwlock)         __raw_read_lock(&(rwlock)->raw_lock)
+# define _raw_read_lock_flags(lock, flags) \
+                __raw_read_lock_flags(&(lock)->raw_lock, *(flags))
 # define _raw_read_trylock(rwlock)      __raw_read_trylock(&(rwlock)->raw_lock)
 # define _raw_read_unlock(rwlock)       __raw_read_unlock(&(rwlock)->raw_lock)
 # define _raw_write_lock(rwlock)        __raw_write_lock(&(rwlock)->raw_lock)
+# define _raw_write_lock_flags(lock, flags) \
+                __raw_write_lock_flags(&(lock)->raw_lock, *(flags))
 # define _raw_write_trylock(rwlock)     __raw_write_trylock(&(rwlock)->raw_lock)
 # define _raw_write_unlock(rwlock)      __raw_write_unlock(&(rwlock)->raw_lock)
 #endif
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 528dcb93c2f2..5f3faa9d15ae 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -36,6 +36,8 @@ struct splice_desc {
                 void *data;             /* cookie */
         } u;
         loff_t pos;                     /* file position */
+        size_t num_spliced;             /* number of bytes already spliced */
+        bool need_wakeup;               /* need to wake up writer */
 };
 
 struct partial_page {
@@ -66,6 +68,16 @@ extern ssize_t splice_from_pipe(struct pipe_inode_info *, struct file *,
                                 splice_actor *);
 extern ssize_t __splice_from_pipe(struct pipe_inode_info *,
                                   struct splice_desc *, splice_actor *);
+extern int splice_from_pipe_feed(struct pipe_inode_info *, struct splice_desc *,
+                                 splice_actor *);
+extern int splice_from_pipe_next(struct pipe_inode_info *,
+                                 struct splice_desc *);
+extern void splice_from_pipe_begin(struct splice_desc *);
+extern void splice_from_pipe_end(struct pipe_inode_info *,
+                                 struct splice_desc *);
+extern int pipe_to_file(struct pipe_inode_info *, struct pipe_buffer *,
+                        struct splice_desc *);
+
 extern ssize_t splice_to_pipe(struct pipe_inode_info *,
                               struct splice_pipe_desc *);
 extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 17d9b58f6379..5ae8fa22d331 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -339,6 +339,10 @@ extern int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
 
 extern void ssb_bus_unregister(struct ssb_bus *bus);
 
+/* Set a fallback SPROM.
+ * See kdoc at the function definition for complete documentation. */
+extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
+
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
 extern int ssb_bus_suspend(struct ssb_bus *bus);
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index 7d7e03dcf77c..d3b1d18922f2 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -181,6 +181,16 @@
 #define SSB_CHIPCO_PROG_WAITCNT         0x0124
 #define SSB_CHIPCO_FLASH_CFG            0x0128
 #define SSB_CHIPCO_FLASH_WAITCNT        0x012C
+#define SSB_CHIPCO_CLKCTLST             0x01E0 /* Clock control and status (rev >= 20) */
+#define  SSB_CHIPCO_CLKCTLST_FORCEALP   0x00000001 /* Force ALP request */
+#define  SSB_CHIPCO_CLKCTLST_FORCEHT    0x00000002 /* Force HT request */
+#define  SSB_CHIPCO_CLKCTLST_FORCEILP   0x00000004 /* Force ILP request */
+#define  SSB_CHIPCO_CLKCTLST_HAVEALPREQ 0x00000008 /* ALP available request */
+#define  SSB_CHIPCO_CLKCTLST_HAVEHTREQ  0x00000010 /* HT available request */
+#define  SSB_CHIPCO_CLKCTLST_HWCROFF    0x00000020 /* Force HW clock request off */
+#define  SSB_CHIPCO_CLKCTLST_HAVEHT     0x00010000 /* HT available */
+#define  SSB_CHIPCO_CLKCTLST_HAVEALP    0x00020000 /* APL available */
+#define SSB_CHIPCO_HW_WORKAROUND        0x01E4 /* Hardware workaround (rev >= 20) */
 #define SSB_CHIPCO_UART0_DATA           0x0300
 #define SSB_CHIPCO_UART0_IMR            0x0304
 #define SSB_CHIPCO_UART0_FCR            0x0308
@@ -197,6 +207,196 @@
 #define SSB_CHIPCO_UART1_LSR            0x0414
 #define SSB_CHIPCO_UART1_MSR            0x0418
 #define SSB_CHIPCO_UART1_SCRATCH        0x041C
+/* PMU registers (rev >= 20) */
+#define SSB_CHIPCO_PMU_CTL                      0x0600 /* PMU control */
+#define  SSB_CHIPCO_PMU_CTL_ILP_DIV             0xFFFF0000 /* ILP div mask */
+#define  SSB_CHIPCO_PMU_CTL_ILP_DIV_SHIFT       16
+#define  SSB_CHIPCO_PMU_CTL_NOILPONW            0x00000200 /* No ILP on wait */
+#define  SSB_CHIPCO_PMU_CTL_HTREQEN             0x00000100 /* HT req enable */
+#define  SSB_CHIPCO_PMU_CTL_ALPREQEN            0x00000080 /* ALP req enable */
+#define  SSB_CHIPCO_PMU_CTL_XTALFREQ            0x0000007C /* Crystal freq */
+#define  SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT      2
+#define  SSB_CHIPCO_PMU_CTL_ILPDIVEN            0x00000002 /* ILP div enable */
+#define  SSB_CHIPCO_PMU_CTL_LPOSEL              0x00000001 /* LPO sel */
+#define SSB_CHIPCO_PMU_CAP                      0x0604 /* PMU capabilities */
+#define  SSB_CHIPCO_PMU_CAP_REVISION            0x000000FF /* Revision mask */
+#define SSB_CHIPCO_PMU_STAT                     0x0608 /* PMU status */
+#define  SSB_CHIPCO_PMU_STAT_INTPEND            0x00000040 /* Interrupt pending */
+#define  SSB_CHIPCO_PMU_STAT_SBCLKST            0x00000030 /* Backplane clock status? */
+#define  SSB_CHIPCO_PMU_STAT_HAVEALP            0x00000008 /* ALP available */
+#define  SSB_CHIPCO_PMU_STAT_HAVEHT             0x00000004 /* HT available */
+#define  SSB_CHIPCO_PMU_STAT_RESINIT            0x00000003 /* Res init */
+#define SSB_CHIPCO_PMU_RES_STAT                 0x060C /* PMU res status */
+#define SSB_CHIPCO_PMU_RES_PEND                 0x0610 /* PMU res pending */
+#define SSB_CHIPCO_PMU_TIMER                    0x0614 /* PMU timer */
+#define SSB_CHIPCO_PMU_MINRES_MSK               0x0618 /* PMU min res mask */
+#define SSB_CHIPCO_PMU_MAXRES_MSK               0x061C /* PMU max res mask */
+#define SSB_CHIPCO_PMU_RES_TABSEL               0x0620 /* PMU res table sel */
+#define SSB_CHIPCO_PMU_RES_DEPMSK               0x0624 /* PMU res dep mask */
+#define SSB_CHIPCO_PMU_RES_UPDNTM               0x0628 /* PMU res updown timer */
+#define SSB_CHIPCO_PMU_RES_TIMER                0x062C /* PMU res timer */
+#define SSB_CHIPCO_PMU_CLKSTRETCH               0x0630 /* PMU clockstretch */
+#define SSB_CHIPCO_PMU_WATCHDOG                 0x0634 /* PMU watchdog */
+#define SSB_CHIPCO_PMU_RES_REQTS                0x0640 /* PMU res req timer sel */
+#define SSB_CHIPCO_PMU_RES_REQT                 0x0644 /* PMU res req timer */
+#define SSB_CHIPCO_PMU_RES_REQM                 0x0648 /* PMU res req mask */
+#define SSB_CHIPCO_CHIPCTL_ADDR                 0x0650
+#define SSB_CHIPCO_CHIPCTL_DATA                 0x0654
+#define SSB_CHIPCO_REGCTL_ADDR                  0x0658
+#define SSB_CHIPCO_REGCTL_DATA                  0x065C
+#define SSB_CHIPCO_PLLCTL_ADDR                  0x0660
+#define SSB_CHIPCO_PLLCTL_DATA                  0x0664
+
+
+
+/** PMU PLL registers */
+
+/* PMU rev 0 PLL registers */
+#define SSB_PMU0_PLLCTL0                        0
+#define  SSB_PMU0_PLLCTL0_PDIV_MSK              0x00000001
+#define  SSB_PMU0_PLLCTL0_PDIV_FREQ             25000 /* kHz */
+#define SSB_PMU0_PLLCTL1                        1
+#define  SSB_PMU0_PLLCTL1_WILD_IMSK             0xF0000000 /* Wild int mask (low nibble) */
+#define  SSB_PMU0_PLLCTL1_WILD_IMSK_SHIFT       28
+#define  SSB_PMU0_PLLCTL1_WILD_FMSK             0x0FFFFF00 /* Wild frac mask */
+#define  SSB_PMU0_PLLCTL1_WILD_FMSK_SHIFT       8
+#define  SSB_PMU0_PLLCTL1_STOPMOD               0x00000040 /* Stop mod */
+#define SSB_PMU0_PLLCTL2                        2
+#define  SSB_PMU0_PLLCTL2_WILD_IMSKHI           0x0000000F /* Wild int mask (high nibble) */
+#define  SSB_PMU0_PLLCTL2_WILD_IMSKHI_SHIFT     0
+
+/* PMU rev 1 PLL registers */
+#define SSB_PMU1_PLLCTL0                        0
+#define  SSB_PMU1_PLLCTL0_P1DIV                 0x00F00000 /* P1 div */
+#define  SSB_PMU1_PLLCTL0_P1DIV_SHIFT           20
+#define  SSB_PMU1_PLLCTL0_P2DIV                 0x0F000000 /* P2 div */
+#define  SSB_PMU1_PLLCTL0_P2DIV_SHIFT           24
+#define SSB_PMU1_PLLCTL1                        1
+#define  SSB_PMU1_PLLCTL1_M1DIV                 0x000000FF /* M1 div */
+#define  SSB_PMU1_PLLCTL1_M1DIV_SHIFT           0
+#define  SSB_PMU1_PLLCTL1_M2DIV                 0x0000FF00 /* M2 div */
+#define  SSB_PMU1_PLLCTL1_M2DIV_SHIFT           8
+#define  SSB_PMU1_PLLCTL1_M3DIV                 0x00FF0000 /* M3 div */
+#define  SSB_PMU1_PLLCTL1_M3DIV_SHIFT           16
+#define  SSB_PMU1_PLLCTL1_M4DIV                 0xFF000000 /* M4 div */
+#define  SSB_PMU1_PLLCTL1_M4DIV_SHIFT           24
+#define SSB_PMU1_PLLCTL2                        2
+#define  SSB_PMU1_PLLCTL2_M5DIV                 0x000000FF /* M5 div */
+#define  SSB_PMU1_PLLCTL2_M5DIV_SHIFT           0
+#define  SSB_PMU1_PLLCTL2_M6DIV                 0x0000FF00 /* M6 div */
+#define  SSB_PMU1_PLLCTL2_M6DIV_SHIFT           8
+#define  SSB_PMU1_PLLCTL2_NDIVMODE              0x000E0000 /* NDIV mode */
+#define  SSB_PMU1_PLLCTL2_NDIVMODE_SHIFT        17
+#define  SSB_PMU1_PLLCTL2_NDIVINT               0x1FF00000 /* NDIV int */
+#define  SSB_PMU1_PLLCTL2_NDIVINT_SHIFT         20
+#define SSB_PMU1_PLLCTL3                        3
+#define  SSB_PMU1_PLLCTL3_NDIVFRAC              0x00FFFFFF /* NDIV frac */
+#define  SSB_PMU1_PLLCTL3_NDIVFRAC_SHIFT        0
+#define SSB_PMU1_PLLCTL4                        4
+#define SSB_PMU1_PLLCTL5                        5
+#define  SSB_PMU1_PLLCTL5_CLKDRV                0xFFFFFF00 /* clk drv */
+#define  SSB_PMU1_PLLCTL5_CLKDRV_SHIFT          8
+
+/* BCM4312 PLL resource numbers. */
+#define SSB_PMURES_4312_SWITCHER_BURST          0
+#define SSB_PMURES_4312_SWITCHER_PWM            1
+#define SSB_PMURES_4312_PA_REF_LDO              2
+#define SSB_PMURES_4312_CORE_LDO_BURST          3
+#define SSB_PMURES_4312_CORE_LDO_PWM            4
+#define SSB_PMURES_4312_RADIO_LDO               5
+#define SSB_PMURES_4312_ILP_REQUEST             6
+#define SSB_PMURES_4312_BG_FILTBYP              7
+#define SSB_PMURES_4312_TX_FILTBYP              8
+#define SSB_PMURES_4312_RX_FILTBYP              9
+#define SSB_PMURES_4312_XTAL_PU                 10
+#define SSB_PMURES_4312_ALP_AVAIL               11
+#define SSB_PMURES_4312_BB_PLL_FILTBYP          12
+#define SSB_PMURES_4312_RF_PLL_FILTBYP          13
+#define SSB_PMURES_4312_HT_AVAIL                14
+
+/* BCM4325 PLL resource numbers. */
+#define SSB_PMURES_4325_BUCK_BOOST_BURST        0
+#define SSB_PMURES_4325_CBUCK_BURST             1
+#define SSB_PMURES_4325_CBUCK_PWM               2
+#define SSB_PMURES_4325_CLDO_CBUCK_BURST        3
+#define SSB_PMURES_4325_CLDO_CBUCK_PWM          4
+#define SSB_PMURES_4325_BUCK_BOOST_PWM          5
+#define SSB_PMURES_4325_ILP_REQUEST             6
+#define SSB_PMURES_4325_ABUCK_BURST             7
+#define SSB_PMURES_4325_ABUCK_PWM               8
+#define SSB_PMURES_4325_LNLDO1_PU               9
+#define SSB_PMURES_4325_LNLDO2_PU               10
+#define SSB_PMURES_4325_LNLDO3_PU               11
+#define SSB_PMURES_4325_LNLDO4_PU               12
+#define SSB_PMURES_4325_XTAL_PU                 13
+#define SSB_PMURES_4325_ALP_AVAIL               14
+#define SSB_PMURES_4325_RX_PWRSW_PU             15
+#define SSB_PMURES_4325_TX_PWRSW_PU             16
+#define SSB_PMURES_4325_RFPLL_PWRSW_PU          17
+#define SSB_PMURES_4325_LOGEN_PWRSW_PU          18
+#define SSB_PMURES_4325_AFE_PWRSW_PU            19
+#define SSB_PMURES_4325_BBPLL_PWRSW_PU          20
+#define SSB_PMURES_4325_HT_AVAIL                21
+
+/* BCM4328 PLL resource numbers. */
+#define SSB_PMURES_4328_EXT_SWITCHER_PWM        0
+#define SSB_PMURES_4328_BB_SWITCHER_PWM         1
+#define SSB_PMURES_4328_BB_SWITCHER_BURST       2
+#define SSB_PMURES_4328_BB_EXT_SWITCHER_BURST   3
+#define SSB_PMURES_4328_ILP_REQUEST             4
+#define SSB_PMURES_4328_RADIO_SWITCHER_PWM      5
+#define SSB_PMURES_4328_RADIO_SWITCHER_BURST    6
+#define SSB_PMURES_4328_ROM_SWITCH              7
+#define SSB_PMURES_4328_PA_REF_LDO              8
+#define SSB_PMURES_4328_RADIO_LDO               9
+#define SSB_PMURES_4328_AFE_LDO                 10
+#define SSB_PMURES_4328_PLL_LDO                 11
+#define SSB_PMURES_4328_BG_FILTBYP              12
+#define SSB_PMURES_4328_TX_FILTBYP              13
+#define SSB_PMURES_4328_RX_FILTBYP              14
+#define SSB_PMURES_4328_XTAL_PU                 15
+#define SSB_PMURES_4328_XTAL_EN                 16
+#define SSB_PMURES_4328_BB_PLL_FILTBYP          17
+#define SSB_PMURES_4328_RF_PLL_FILTBYP          18
+#define SSB_PMURES_4328_BB_PLL_PU               19
+
+/* BCM5354 PLL resource numbers. */
+#define SSB_PMURES_5354_EXT_SWITCHER_PWM        0
+#define SSB_PMURES_5354_BB_SWITCHER_PWM         1
+#define SSB_PMURES_5354_BB_SWITCHER_BURST       2
+#define SSB_PMURES_5354_BB_EXT_SWITCHER_BURST   3
+#define SSB_PMURES_5354_ILP_REQUEST             4
+#define SSB_PMURES_5354_RADIO_SWITCHER_PWM      5
+#define SSB_PMURES_5354_RADIO_SWITCHER_BURST    6
+#define SSB_PMURES_5354_ROM_SWITCH              7
+#define SSB_PMURES_5354_PA_REF_LDO              8
+#define SSB_PMURES_5354_RADIO_LDO               9
+#define SSB_PMURES_5354_AFE_LDO                 10
+#define SSB_PMURES_5354_PLL_LDO                 11
+#define SSB_PMURES_5354_BG_FILTBYP              12
+#define SSB_PMURES_5354_TX_FILTBYP              13
+#define SSB_PMURES_5354_RX_FILTBYP              14
+#define SSB_PMURES_5354_XTAL_PU                 15
+#define SSB_PMURES_5354_XTAL_EN                 16
+#define SSB_PMURES_5354_BB_PLL_FILTBYP          17
+#define SSB_PMURES_5354_RF_PLL_FILTBYP          18
+#define SSB_PMURES_5354_BB_PLL_PU               19
+
+
+
+/** Chip specific Chip-Status register contents. */
+#define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL      0x00000003
+#define SSB_CHIPCO_CHST_4325_DEFCIS_SEL         0 /* OTP is powered up, use def. CIS, no SPROM */
+#define SSB_CHIPCO_CHST_4325_SPROM_SEL          1 /* OTP is powered up, SPROM is present */
+#define SSB_CHIPCO_CHST_4325_OTP_SEL            2 /* OTP is powered up, no SPROM */
+#define SSB_CHIPCO_CHST_4325_OTP_PWRDN          3 /* OTP is powered down, SPROM is present */
+#define SSB_CHIPCO_CHST_4325_SDIO_USB_MODE      0x00000004
+#define SSB_CHIPCO_CHST_4325_SDIO_USB_MODE_SHIFT  2
+#define SSB_CHIPCO_CHST_4325_RCAL_VALID         0x00000008
+#define SSB_CHIPCO_CHST_4325_RCAL_VALID_SHIFT   3
+#define SSB_CHIPCO_CHST_4325_RCAL_VALUE         0x000001F0
+#define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT   4
+#define SSB_CHIPCO_CHST_4325_PMUTOP_2B          0x00000200 /* 1 for 2b, 0 for to 2a */
 
 
 
@@ -353,11 +553,20 @@
 struct ssb_device;
 struct ssb_serial_port;
 
+/* Data for the PMU, if available.
+ * Check availability with ((struct ssb_chipcommon)->capabilities & SSB_CHIPCO_CAP_PMU)
+ */
+struct ssb_chipcommon_pmu {
+        u8 rev;                 /* PMU revision */
+        u32 crystalfreq;        /* The active crystal frequency (in kHz) */
+};
+
 struct ssb_chipcommon {
         struct ssb_device *dev;
         u32 capabilities;
         /* Fast Powerup Delay constant */
         u16 fast_pwrup_delay;
+        struct ssb_chipcommon_pmu pmu;
 };
 
 static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
@@ -365,6 +574,17 @@ static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
         return (cc->dev != NULL);
 }
 
+/* Register access */
+#define chipco_read32(cc, offset)       ssb_read32((cc)->dev, offset)
+#define chipco_write32(cc, offset, val) ssb_write32((cc)->dev, offset, val)
+
+#define chipco_mask32(cc, offset, mask) \
+                chipco_write32(cc, offset, chipco_read32(cc, offset) & (mask))
+#define chipco_set32(cc, offset, set) \
+                chipco_write32(cc, offset, chipco_read32(cc, offset) | (set))
+#define chipco_maskset32(cc, offset, mask, set) \
+                chipco_write32(cc, offset, (chipco_read32(cc, offset) & (mask)) | (set))
+
 extern void ssb_chipcommon_init(struct ssb_chipcommon *cc);
 
 extern void ssb_chipco_suspend(struct ssb_chipcommon *cc);
@@ -406,4 +626,8 @@ extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
                                   struct ssb_serial_port *ports);
 #endif /* CONFIG_SSB_SERIAL */
 
+/* PMU support */
+extern void ssb_pmu_init(struct ssb_chipcommon *cc);
+
+
 #endif /* LINUX_SSB_CHIPCO_H_ */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 99a0f991e850..a01b982b5783 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -326,6 +326,42 @@
 #define  SSB_SPROM5_GPIOB_P3            0xFF00  /* Pin 3 */
 #define  SSB_SPROM5_GPIOB_P3_SHIFT      8
 
+/* SPROM Revision 8 */
+#define SSB_SPROM8_BFLLO                0x1084  /* Boardflags (low 16 bits) */
+#define SSB_SPROM8_BFLHI                0x1086  /* Boardflags Hi */
+#define SSB_SPROM8_IL0MAC               0x108C  /* 6 byte MAC address */
+#define SSB_SPROM8_CCODE                0x1092  /* 2 byte country code */
+#define SSB_SPROM8_ANTAVAIL             0x109C  /* Antenna available bitfields*/
+#define SSB_SPROM8_ANTAVAIL_A           0xFF00  /* A-PHY bitfield */
+#define SSB_SPROM8_ANTAVAIL_A_SHIFT     8
+#define SSB_SPROM8_ANTAVAIL_BG          0x00FF  /* B-PHY and G-PHY bitfield */
+#define SSB_SPROM8_ANTAVAIL_BG_SHIFT    0
+#define SSB_SPROM8_AGAIN01              0x109E  /* Antenna Gain (in dBm Q5.2) */
+#define  SSB_SPROM8_AGAIN0              0x00FF  /* Antenna 0 */
+#define  SSB_SPROM8_AGAIN0_SHIFT        0
+#define  SSB_SPROM8_AGAIN1              0xFF00  /* Antenna 1 */
+#define  SSB_SPROM8_AGAIN1_SHIFT        8
+#define SSB_SPROM8_AGAIN23              0x10A0
+#define  SSB_SPROM8_AGAIN2              0x00FF  /* Antenna 2 */
+#define  SSB_SPROM8_AGAIN2_SHIFT        0
+#define  SSB_SPROM8_AGAIN3              0xFF00  /* Antenna 3 */
+#define  SSB_SPROM8_AGAIN3_SHIFT        8
+#define SSB_SPROM8_GPIOA                0x1096  /*Gen. Purpose IO # 0 and 1 */
+#define  SSB_SPROM8_GPIOA_P0            0x00FF  /* Pin 0 */
+#define  SSB_SPROM8_GPIOA_P1            0xFF00  /* Pin 1 */
+#define  SSB_SPROM8_GPIOA_P1_SHIFT      8
+#define SSB_SPROM8_GPIOB                0x1098  /* Gen. Purpose IO # 2 and 3 */
+#define  SSB_SPROM8_GPIOB_P2            0x00FF  /* Pin 2 */
+#define  SSB_SPROM8_GPIOB_P3            0xFF00  /* Pin 3 */
+#define  SSB_SPROM8_GPIOB_P3_SHIFT      8
+#define SSB_SPROM8_MAXP_BG              0x10C0  /* Max Power BG in path 1 */
+#define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power BG */
+#define  SSB_SPROM8_ITSSI_BG            0xFF00  /* Mask for path 1 itssi_bg */
+#define  SSB_SPROM8_ITSSI_BG_SHIFT      8
+#define SSB_SPROM8_MAXP_A               0x10C8  /* Max Power A in path 1 */
+#define  SSB_SPROM8_MAXP_A_MASK         0x00FF  /* Mask for Max Power A */
+#define  SSB_SPROM8_ITSSI_A             0xFF00  /* Mask for path 1 itssi_a */
+#define  SSB_SPROM8_ITSSI_A_SHIFT       8
 
 /* Values for SSB_SPROM1_BINF_CCODE */
 enum {
diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h
new file mode 100644
index 000000000000..6f3e54c704c0
--- /dev/null
+++ b/include/linux/stackprotector.h
@@ -0,0 +1,16 @@
+#ifndef _LINUX_STACKPROTECTOR_H
+#define _LINUX_STACKPROTECTOR_H 1
+
+#include <linux/compiler.h>
+#include <linux/sched.h>
+#include <linux/random.h>
+
+#ifdef CONFIG_CC_STACKPROTECTOR
+# include <asm/stackprotector.h>
+#else
+static inline void boot_init_stack_canary(void)
+{
+}
+#endif
+
+#endif
diff --git a/include/linux/string.h b/include/linux/string.h
index d18fc198aa2f..489019ef1694 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -10,8 +10,10 @@
 #include <linux/compiler.h>     /* for inline */
 #include <linux/types.h>        /* for size_t */
 #include <linux/stddef.h>       /* for NULL */
+#include <stdarg.h>
 
 extern char *strndup_user(const char __user *, long);
+extern void *memdup_user(const void __user *, size_t);
 
 /*
  * Include machine specific inline routines
@@ -111,8 +113,23 @@ extern void argv_free(char **argv);
 
 extern bool sysfs_streq(const char *s1, const char *s2);
 
+#ifdef CONFIG_BINARY_PRINTF
+int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);
+int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);
+int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4);
+#endif
+
 extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
                         const void *from, size_t available);
 
+/**
+ * strstarts - does @str start with @prefix?
+ * @str: string to examine
+ * @prefix: prefix to look for.
+ */
+static inline bool strstarts(const char *str, const char *prefix)
+{
+        return strncmp(str, prefix, strlen(prefix)) == 0;
+}
 #endif
 #endif /* _LINUX_STRING_H_ */
diff --git a/include/linux/stringify.h b/include/linux/stringify.h
index 0b4388356c87..841cec8ed525 100644
--- a/include/linux/stringify.h
+++ b/include/linux/stringify.h
@@ -6,7 +6,7 @@
  * converts to "bar".
  */
 
-#define __stringify_1(x)        #x
-#define __stringify(x)          __stringify_1(x)
+#define __stringify_1(x...)     #x
+#define __stringify(x...)       __stringify_1(x)
 
 #endif  /* !__LINUX_STRINGIFY_H */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 3435d24bfe55..2a30775959e9 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -24,6 +24,15 @@
  */
 typedef int             (*svc_thread_fn)(void *);
 
+/* statistics for svc_pool structures */
+struct svc_pool_stats {
+        unsigned long   packets;
+        unsigned long   sockets_queued;
+        unsigned long   threads_woken;
+        unsigned long   overloads_avoided;
+        unsigned long   threads_timedout;
+};
+
 /*
  *
  * RPC service thread pool.
@@ -41,6 +50,8 @@ struct svc_pool {
         struct list_head        sp_sockets;     /* pending sockets */
         unsigned int            sp_nrthreads;   /* # of threads in pool */
         struct list_head        sp_all_threads; /* all server threads */
+        int                     sp_nwaking;     /* number of threads woken but not yet active */
+        struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
 } ____cacheline_aligned_in_smp;
 
 /*
@@ -69,7 +80,6 @@ struct svc_serv {
         struct list_head        sv_tempsocks;   /* all temporary sockets */
         int                     sv_tmpcnt;      /* count of temporary sockets */
         struct timer_list       sv_temptimer;   /* timer for aging temporary sockets */
-        sa_family_t             sv_family;      /* listener's address family */
 
         char *                  sv_name;        /* service name */
 
@@ -84,6 +94,8 @@ struct svc_serv {
         struct module *         sv_module;      /* optional module to count when
                                                  * adding threads */
         svc_thread_fn           sv_function;    /* main function for threads */
+        unsigned int            sv_drc_max_pages; /* Total pages for DRC */
+        unsigned int            sv_drc_pages_used;/* DRC pages used */
 };
 
 /*
@@ -219,6 +231,7 @@ struct svc_rqst {
         struct svc_cred         rq_cred;        /* auth info */
         void *                  rq_xprt_ctxt;   /* transport specific context ptr */
         struct svc_deferred_req*rq_deferred;    /* deferred request we are replaying */
+        int                     rq_usedeferral; /* use deferral */
 
         size_t                  rq_xprt_hlen;   /* xprt header len */
         struct xdr_buf          rq_arg;
@@ -264,6 +277,7 @@ struct svc_rqst {
                                                  * cache pages */
         wait_queue_head_t       rq_wait;        /* synchronization */
         struct task_struct      *rq_task;       /* service thread */
+        int                     rq_waking;      /* 1 if thread is being woken */
 };
 
 /*
@@ -385,19 +399,20 @@ struct svc_procedure {
 /*
  * Function prototypes.
  */
-struct svc_serv *svc_create(struct svc_program *, unsigned int, sa_family_t,
+struct svc_serv *svc_create(struct svc_program *, unsigned int,
                             void (*shutdown)(struct svc_serv *));
 struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
                                         struct svc_pool *pool);
 void               svc_exit_thread(struct svc_rqst *);
 struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,
-                        sa_family_t, void (*shutdown)(struct svc_serv *),
+                        void (*shutdown)(struct svc_serv *),
                         svc_thread_fn, struct module *);
 int                svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
+int                svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void               svc_destroy(struct svc_serv *);
 int                svc_process(struct svc_rqst *);
-int                svc_register(const struct svc_serv *, const unsigned short,
-                                const unsigned short);
+int                svc_register(const struct svc_serv *, const int,
+                                const unsigned short, const unsigned short);
 
 void               svc_wake_up(struct svc_serv *);
 void               svc_reserve(struct svc_rqst *rqstp, int space);
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 0127daca4354..0d9cb6ef28b0 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -71,7 +71,8 @@ int	svc_reg_xprt_class(struct svc_xprt_class *);
 void    svc_unreg_xprt_class(struct svc_xprt_class *);
 void    svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,
                       struct svc_serv *);
-int     svc_create_xprt(struct svc_serv *, char *, unsigned short, int);
+int     svc_create_xprt(struct svc_serv *, const char *, 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);
@@ -80,7 +81,8 @@ void	svc_close_xprt(struct svc_xprt *xprt);
 void    svc_delete_xprt(struct svc_xprt *xprt);
 int     svc_port_is_privileged(struct sockaddr *sin);
 int     svc_print_xprts(char *buf, int maxlen);
-struct  svc_xprt *svc_find_xprt(struct svc_serv *, char *, int, int);
+struct  svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,
+                        const sa_family_t af, const unsigned short port);
 int     svc_xprt_names(struct svc_serv *serv, char *buf, int buflen);
 
 static inline void svc_xprt_get(struct svc_xprt *xprt)
@@ -88,29 +90,32 @@ static inline void svc_xprt_get(struct svc_xprt *xprt)
         kref_get(&xprt->xpt_ref);
 }
 static inline void svc_xprt_set_local(struct svc_xprt *xprt,
-                                      struct sockaddr *sa, int salen)
+                                      const struct sockaddr *sa,
+                                      const size_t salen)
 {
         memcpy(&xprt->xpt_local, sa, salen);
         xprt->xpt_locallen = salen;
 }
 static inline void svc_xprt_set_remote(struct svc_xprt *xprt,
-                                       struct sockaddr *sa, int salen)
+                                       const struct sockaddr *sa,
+                                       const size_t salen)
 {
         memcpy(&xprt->xpt_remote, sa, salen);
         xprt->xpt_remotelen = salen;
 }
-static inline unsigned short svc_addr_port(struct sockaddr *sa)
+static inline unsigned short svc_addr_port(const struct sockaddr *sa)
 {
-        unsigned short ret = 0;
+        const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;
+        const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sa;
+
         switch (sa->sa_family) {
         case AF_INET:
-                ret = ntohs(((struct sockaddr_in *)sa)->sin_port);
-                break;
+                return ntohs(sin->sin_port);
         case AF_INET6:
-                ret = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
-                break;
+                return ntohs(sin6->sin6_port);
         }
-        return ret;
+
+        return 0;
 }
 
 static inline size_t svc_addr_len(struct sockaddr *sa)
@@ -124,36 +129,39 @@ static inline size_t svc_addr_len(struct sockaddr *sa)
         return -EAFNOSUPPORT;
 }
 
-static inline unsigned short svc_xprt_local_port(struct svc_xprt *xprt)
+static inline unsigned short svc_xprt_local_port(const struct svc_xprt *xprt)
 {
-        return svc_addr_port((struct sockaddr *)&xprt->xpt_local);
+        return svc_addr_port((const struct sockaddr *)&xprt->xpt_local);
 }
 
-static inline unsigned short svc_xprt_remote_port(struct svc_xprt *xprt)
+static inline unsigned short svc_xprt_remote_port(const struct svc_xprt *xprt)
 {
-        return svc_addr_port((struct sockaddr *)&xprt->xpt_remote);
+        return svc_addr_port((const struct sockaddr *)&xprt->xpt_remote);
 }
 
-static inline char *__svc_print_addr(struct sockaddr *addr,
-                                     char *buf, size_t len)
+static inline char *__svc_print_addr(const struct sockaddr *addr,
+                                     char *buf, const size_t len)
 {
+        const struct sockaddr_in *sin = (const struct sockaddr_in *)addr;
+        const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)addr;
+
         switch (addr->sa_family) {
         case AF_INET:
-                snprintf(buf, len, "%pI4, port=%u",
-                        &((struct sockaddr_in *)addr)->sin_addr,
-                        ntohs(((struct sockaddr_in *) addr)->sin_port));
+                snprintf(buf, len, "%pI4, port=%u", &sin->sin_addr,
+                        ntohs(sin->sin_port));
                 break;
 
         case AF_INET6:
                 snprintf(buf, len, "%pI6, port=%u",
-                         &((struct sockaddr_in6 *)addr)->sin6_addr,
-                        ntohs(((struct sockaddr_in6 *) addr)->sin6_port));
+                         &sin6->sin6_addr,
+                        ntohs(sin6->sin6_port));
                 break;
 
         default:
                 snprintf(buf, len, "unknown address type: %d", addr->sa_family);
                 break;
         }
+
         return buf;
 }
 #endif /* SUNRPC_SVC_XPRT_H */
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 49e1eb454465..d8910b68e1bd 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -69,27 +69,27 @@ struct xdr_buf {
  * pre-xdr'ed macros.
  */
 
-#define xdr_zero        __constant_htonl(0)
-#define xdr_one         __constant_htonl(1)
-#define xdr_two         __constant_htonl(2)
-
-#define rpc_success             __constant_htonl(RPC_SUCCESS)
-#define rpc_prog_unavail        __constant_htonl(RPC_PROG_UNAVAIL)
-#define rpc_prog_mismatch       __constant_htonl(RPC_PROG_MISMATCH)
-#define rpc_proc_unavail        __constant_htonl(RPC_PROC_UNAVAIL)
-#define rpc_garbage_args        __constant_htonl(RPC_GARBAGE_ARGS)
-#define rpc_system_err          __constant_htonl(RPC_SYSTEM_ERR)
-#define rpc_drop_reply          __constant_htonl(RPC_DROP_REPLY)
-
-#define rpc_auth_ok             __constant_htonl(RPC_AUTH_OK)
-#define rpc_autherr_badcred     __constant_htonl(RPC_AUTH_BADCRED)
-#define rpc_autherr_rejectedcred __constant_htonl(RPC_AUTH_REJECTEDCRED)
-#define rpc_autherr_badverf     __constant_htonl(RPC_AUTH_BADVERF)
-#define rpc_autherr_rejectedverf __constant_htonl(RPC_AUTH_REJECTEDVERF)
-#define rpc_autherr_tooweak     __constant_htonl(RPC_AUTH_TOOWEAK)
-#define rpcsec_gsserr_credproblem       __constant_htonl(RPCSEC_GSS_CREDPROBLEM)
-#define rpcsec_gsserr_ctxproblem        __constant_htonl(RPCSEC_GSS_CTXPROBLEM)
-#define rpc_autherr_oldseqnum   __constant_htonl(101)
+#define xdr_zero        cpu_to_be32(0)
+#define xdr_one         cpu_to_be32(1)
+#define xdr_two         cpu_to_be32(2)
+
+#define rpc_success             cpu_to_be32(RPC_SUCCESS)
+#define rpc_prog_unavail        cpu_to_be32(RPC_PROG_UNAVAIL)
+#define rpc_prog_mismatch       cpu_to_be32(RPC_PROG_MISMATCH)
+#define rpc_proc_unavail        cpu_to_be32(RPC_PROC_UNAVAIL)
+#define rpc_garbage_args        cpu_to_be32(RPC_GARBAGE_ARGS)
+#define rpc_system_err          cpu_to_be32(RPC_SYSTEM_ERR)
+#define rpc_drop_reply          cpu_to_be32(RPC_DROP_REPLY)
+
+#define rpc_auth_ok             cpu_to_be32(RPC_AUTH_OK)
+#define rpc_autherr_badcred     cpu_to_be32(RPC_AUTH_BADCRED)
+#define rpc_autherr_rejectedcred cpu_to_be32(RPC_AUTH_REJECTEDCRED)
+#define rpc_autherr_badverf     cpu_to_be32(RPC_AUTH_BADVERF)
+#define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)
+#define rpc_autherr_tooweak     cpu_to_be32(RPC_AUTH_TOOWEAK)
+#define rpcsec_gsserr_credproblem       cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)
+#define rpcsec_gsserr_ctxproblem        cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)
+#define rpc_autherr_oldseqnum   cpu_to_be32(101)
 
 /*
  * Miscellaneous XDR helper functions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 11fc71d50c1e..08afe43118f4 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -235,6 +235,7 @@ static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *
  */
 int                     xprt_register_transport(struct xprt_class *type);
 int                     xprt_unregister_transport(struct xprt_class *type);
+int                     xprt_load_transport(const char *);
 void                    xprt_set_retrans_timeout_def(struct rpc_task *task);
 void                    xprt_set_retrans_timeout_rtt(struct rpc_task *task);
 void                    xprt_wake_pending_tasks(struct rpc_xprt *xprt, int status);
@@ -259,6 +260,8 @@ void			xprt_conditional_disconnect(struct rpc_xprt *xprt, unsigned int cookie);
 #define XPRT_BOUND              (4)
 #define XPRT_BINDING            (5)
 #define XPRT_CLOSING            (6)
+#define XPRT_CONNECTION_ABORT   (7)
+#define XPRT_CONNECTION_CLOSE   (8)
 
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index c7d9bb1832ba..795032edfc46 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -1,9 +1,6 @@
 #ifndef _LINUX_SUSPEND_H
 #define _LINUX_SUSPEND_H
 
-#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64)
-#include <asm/suspend.h>
-#endif
 #include <linux/swap.h>
 #include <linux/notifier.h>
 #include <linux/init.h>
@@ -61,10 +58,17 @@ typedef int __bitwise suspend_state_t;
  *      by @begin().
  *      @prepare() is called right after devices have been suspended (ie. the
  *      appropriate .suspend() method has been executed for each device) and
- *      before the nonboot CPUs are disabled (it is executed with IRQs enabled).
- *      This callback is optional.  It returns 0 on success or a negative
- *      error code otherwise, in which case the system cannot enter the desired
- *      sleep state (@enter() and @finish() will not be called in that case).
+ *      before device drivers' late suspend callbacks are executed.  It returns
+ *      0 on success or a negative error code otherwise, in which case the
+ *      system cannot enter the desired sleep state (@prepare_late(), @enter(),
+ *      @wake(), and @finish() will not be called in that case).
+ *
+ * @prepare_late: Finish preparing the platform for entering the system sleep
+ *      state indicated by @begin().
+ *      @prepare_late is called before disabling nonboot CPUs and after
+ *      device drivers' late suspend callbacks have been executed.  It returns
+ *      0 on success or a negative error code otherwise, in which case the
+ *      system cannot enter the desired sleep state (@enter() and @wake()).
  *
  * @enter: Enter the system sleep state indicated by @begin() or represented by
  *      the argument if @begin() is not implemented.
@@ -72,19 +76,26 @@ typedef int __bitwise suspend_state_t;
  *      error code otherwise, in which case the system cannot enter the desired
  *      sleep state.
  *
- * @finish: Called when the system has just left a sleep state, right after
- *      the nonboot CPUs have been enabled and before devices are resumed (it is
- *      executed with IRQs enabled).
+ * @wake: Called when the system has just left a sleep state, right after
+ *      the nonboot CPUs have been enabled and before device drivers' early
+ *      resume callbacks are executed.
+ *      This callback is optional, but should be implemented by the platforms
+ *      that implement @prepare_late().  If implemented, it is always called
+ *      after @enter(), even if @enter() fails.
+ *
+ * @finish: Finish wake-up of the platform.
+ *      @finish is called right prior to calling device drivers' regular suspend
+ *      callbacks.
  *      This callback is optional, but should be implemented by the platforms
  *      that implement @prepare().  If implemented, it is always called after
- *      @enter() (even if @enter() fails).
+ *      @enter() and @wake(), if implemented, even if any of them fails.
  *
  * @end: Called by the PM core right after resuming devices, to indicate to
  *      the platform that the system has returned to the working state or
  *      the transition to the sleep state has been aborted.
  *      This callback is optional, but should be implemented by the platforms
- *      that implement @begin(), but platforms implementing @begin() should
- *      also provide a @end() which cleans up transitions aborted before
+ *      that implement @begin().  Accordingly, platforms implementing @begin()
+ *      should also provide a @end() which cleans up transitions aborted before
  *      @enter().
  *
  * @recover: Recover the platform from a suspend failure.
@@ -96,7 +107,9 @@ struct platform_suspend_ops {
         int (*valid)(suspend_state_t state);
         int (*begin)(suspend_state_t state);
         int (*prepare)(void);
+        int (*prepare_late)(void);
         int (*enter)(suspend_state_t state);
+        void (*wake)(void);
         void (*finish)(void);
         void (*end)(void);
         void (*recover)(void);
diff --git a/include/linux/suspend_ioctls.h b/include/linux/suspend_ioctls.h
index 2c6faec96bde..0b30382984fe 100644
--- a/include/linux/suspend_ioctls.h
+++ b/include/linux/suspend_ioctls.h
@@ -1,14 +1,15 @@
 #ifndef _LINUX_SUSPEND_IOCTLS_H
 #define _LINUX_SUSPEND_IOCTLS_H
 
+#include <linux/types.h>
 /*
  * This structure is used to pass the values needed for the identification
  * of the resume swap area from a user space to the kernel via the
  * SNAPSHOT_SET_SWAP_AREA ioctl
  */
 struct resume_swap_area {
-        loff_t offset;
-        u_int32_t dev;
+        __kernel_loff_t offset;
+        __u32 dev;
 } __attribute__((packed));
 
 #define SNAPSHOT_IOC_MAGIC      '3'
@@ -20,13 +21,13 @@ struct resume_swap_area {
 #define SNAPSHOT_S2RAM                  _IO(SNAPSHOT_IOC_MAGIC, 11)
 #define SNAPSHOT_SET_SWAP_AREA          _IOW(SNAPSHOT_IOC_MAGIC, 13, \
                                                         struct resume_swap_area)
-#define SNAPSHOT_GET_IMAGE_SIZE         _IOR(SNAPSHOT_IOC_MAGIC, 14, loff_t)
+#define SNAPSHOT_GET_IMAGE_SIZE         _IOR(SNAPSHOT_IOC_MAGIC, 14, __kernel_loff_t)
 #define SNAPSHOT_PLATFORM_SUPPORT       _IO(SNAPSHOT_IOC_MAGIC, 15)
 #define SNAPSHOT_POWER_OFF              _IO(SNAPSHOT_IOC_MAGIC, 16)
 #define SNAPSHOT_CREATE_IMAGE           _IOW(SNAPSHOT_IOC_MAGIC, 17, int)
 #define SNAPSHOT_PREF_IMAGE_SIZE        _IO(SNAPSHOT_IOC_MAGIC, 18)
-#define SNAPSHOT_AVAIL_SWAP_SIZE        _IOR(SNAPSHOT_IOC_MAGIC, 19, loff_t)
-#define SNAPSHOT_ALLOC_SWAP_PAGE        _IOR(SNAPSHOT_IOC_MAGIC, 20, loff_t)
+#define SNAPSHOT_AVAIL_SWAP_SIZE        _IOR(SNAPSHOT_IOC_MAGIC, 19, __kernel_loff_t)
+#define SNAPSHOT_ALLOC_SWAP_PAGE        _IOR(SNAPSHOT_IOC_MAGIC, 20, __kernel_loff_t)
 #define SNAPSHOT_IOC_MAXNR      20
 
 #endif /* _LINUX_SUSPEND_IOCTLS_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index d30215578877..62d81435347a 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -212,7 +212,7 @@ static inline void lru_cache_add_active_file(struct page *page)
 
 /* linux/mm/vmscan.c */
 extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
-                                        gfp_t gfp_mask);
+                                        gfp_t gfp_mask, nodemask_t *mask);
 extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,
                                                   gfp_t gfp_mask, bool noswap,
                                                   unsigned int swappiness);
@@ -382,6 +382,11 @@ static inline struct page *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask,
         return NULL;
 }
 
+static inline int swap_writepage(struct page *p, struct writeback_control *wbc)
+{
+        return 0;
+}
+
 static inline struct page *lookup_swap_cache(swp_entry_t swp)
 {
         return NULL;
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index dedd3c0cfe30..ac9ff54f7cb3 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -31,7 +31,7 @@ extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev,
                                       phys_addr_t address);
 extern phys_addr_t swiotlb_bus_to_phys(dma_addr_t address);
 
-extern int swiotlb_arch_range_needs_mapping(void *ptr, size_t size);
+extern int swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size);
 
 extern void
 *swiotlb_alloc_coherent(struct device *hwdev, size_t size,
@@ -41,20 +41,13 @@ extern void
 swiotlb_free_coherent(struct device *hwdev, size_t size,
                       void *vaddr, dma_addr_t dma_handle);
 
-extern dma_addr_t
-swiotlb_map_single(struct device *hwdev, void *ptr, size_t size, int dir);
-
-extern void
-swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
-                     size_t size, int dir);
-
-extern dma_addr_t
-swiotlb_map_single_attrs(struct device *hwdev, void *ptr, size_t size,
-                         int dir, struct dma_attrs *attrs);
-
-extern void
-swiotlb_unmap_single_attrs(struct device *hwdev, dma_addr_t dev_addr,
-                           size_t size, int dir, struct dma_attrs *attrs);
+extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
+                                   unsigned long offset, size_t size,
+                                   enum dma_data_direction dir,
+                                   struct dma_attrs *attrs);
+extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
+                               size_t size, enum dma_data_direction dir,
+                               struct dma_attrs *attrs);
 
 extern int
 swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,
@@ -66,36 +59,38 @@ swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
 
 extern int
 swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
-                     int dir, struct dma_attrs *attrs);
+                     enum dma_data_direction dir, struct dma_attrs *attrs);
 
 extern void
 swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
-                       int nelems, int dir, struct dma_attrs *attrs);
+                       int nelems, enum dma_data_direction dir,
+                       struct dma_attrs *attrs);
 
 extern void
 swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
-                            size_t size, int dir);
+                            size_t size, enum dma_data_direction dir);
 
 extern void
 swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
-                        int nelems, int dir);
+                        int nelems, enum dma_data_direction dir);
 
 extern void
 swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
-                               size_t size, int dir);
+                               size_t size, enum dma_data_direction dir);
 
 extern void
 swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
-                           int nelems, int dir);
+                           int nelems, enum dma_data_direction dir);
 
 extern void
 swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
-                                  unsigned long offset, size_t size, int dir);
+                                  unsigned long offset, size_t size,
+                                  enum dma_data_direction dir);
 
 extern void
 swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,
                                      unsigned long offset, size_t size,
-                                     int dir);
+                                     enum dma_data_direction dir);
 
 extern int
 swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index 99b8bdb17b2b..0ff2779c44d0 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -125,6 +125,7 @@
 #define MGSL_MODE_MONOSYNC      3
 #define MGSL_MODE_BISYNC        4
 #define MGSL_MODE_RAW           6
+#define MGSL_MODE_BASE_CLOCK    7
 
 #define MGSL_BUS_TYPE_ISA       1
 #define MGSL_BUS_TYPE_EISA      2
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index f9f900cfd066..40617c1d8976 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -65,6 +65,7 @@ struct old_linux_dirent;
 #include <asm/signal.h>
 #include <linux/quota.h>
 #include <linux/key.h>
+#include <trace/syscall.h>
 
 #define __SC_DECL1(t1, a1)      t1 a1
 #define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
@@ -95,7 +96,46 @@ struct old_linux_dirent;
 #define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)
 #define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
 
+#ifdef CONFIG_FTRACE_SYSCALLS
+#define __SC_STR_ADECL1(t, a)           #a
+#define __SC_STR_ADECL2(t, a, ...)      #a, __SC_STR_ADECL1(__VA_ARGS__)
+#define __SC_STR_ADECL3(t, a, ...)      #a, __SC_STR_ADECL2(__VA_ARGS__)
+#define __SC_STR_ADECL4(t, a, ...)      #a, __SC_STR_ADECL3(__VA_ARGS__)
+#define __SC_STR_ADECL5(t, a, ...)      #a, __SC_STR_ADECL4(__VA_ARGS__)
+#define __SC_STR_ADECL6(t, a, ...)      #a, __SC_STR_ADECL5(__VA_ARGS__)
+
+#define __SC_STR_TDECL1(t, a)           #t
+#define __SC_STR_TDECL2(t, a, ...)      #t, __SC_STR_TDECL1(__VA_ARGS__)
+#define __SC_STR_TDECL3(t, a, ...)      #t, __SC_STR_TDECL2(__VA_ARGS__)
+#define __SC_STR_TDECL4(t, a, ...)      #t, __SC_STR_TDECL3(__VA_ARGS__)
+#define __SC_STR_TDECL5(t, a, ...)      #t, __SC_STR_TDECL4(__VA_ARGS__)
+#define __SC_STR_TDECL6(t, a, ...)      #t, __SC_STR_TDECL5(__VA_ARGS__)
+
+#define SYSCALL_METADATA(sname, nb)                             \
+        static const struct syscall_metadata __used             \
+          __attribute__((__aligned__(4)))                       \
+          __attribute__((section("__syscalls_metadata")))       \
+          __syscall_meta_##sname = {                            \
+                .name           = "sys"#sname,                  \
+                .nb_args        = nb,                           \
+                .types          = types_##sname,                \
+                .args           = args_##sname,                 \
+        }
+
+#define SYSCALL_DEFINE0(sname)                                  \
+        static const struct syscall_metadata __used             \
+          __attribute__((__aligned__(4)))                       \
+          __attribute__((section("__syscalls_metadata")))       \
+          __syscall_meta_##sname = {                            \
+                .name           = "sys_"#sname,                 \
+                .nb_args        = 0,                            \
+        };                                                      \
+        asmlinkage long sys_##sname(void)
+
+#else
 #define SYSCALL_DEFINE0(name)      asmlinkage long sys_##name(void)
+#endif
+
 #define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
 #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
 #define SYSCALL_DEFINE3(name, ...) SYSCALL_DEFINEx(3, _##name, __VA_ARGS__)
@@ -108,7 +148,7 @@ struct old_linux_dirent;
         asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"      \
              "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
 #else
-#ifdef CONFIG_ALPHA
+#if defined(CONFIG_ALPHA) || defined(CONFIG_MIPS)
 #define SYSCALL_ALIAS(alias, name)                                      \
         asm ( #alias " = " #name "\n\t.globl " #alias)
 #else
@@ -117,10 +157,26 @@ struct old_linux_dirent;
 #endif
 #endif
 
+#ifdef CONFIG_FTRACE_SYSCALLS
+#define SYSCALL_DEFINEx(x, sname, ...)                          \
+        static const char *types_##sname[] = {                  \
+                __SC_STR_TDECL##x(__VA_ARGS__)                  \
+        };                                                      \
+        static const char *args_##sname[] = {                   \
+                __SC_STR_ADECL##x(__VA_ARGS__)                  \
+        };                                                      \
+        SYSCALL_METADATA(sname, x);                             \
+        __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
+#else
+#define SYSCALL_DEFINEx(x, sname, ...)                          \
+        __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
+#endif
+
 #ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
 
 #define SYSCALL_DEFINE(name) static inline long SYSC_##name
-#define SYSCALL_DEFINEx(x, name, ...)                                   \
+
+#define __SYSCALL_DEFINEx(x, name, ...)                                 \
         asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__));           \
         static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__));       \
         asmlinkage long SyS##name(__SC_LONG##x(__VA_ARGS__))            \
@@ -134,7 +190,7 @@ struct old_linux_dirent;
 #else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
 
 #define SYSCALL_DEFINE(name) asmlinkage long sys_##name
-#define SYSCALL_DEFINEx(x, name, ...)                                   \
+#define __SYSCALL_DEFINEx(x, name, ...)                                 \
         asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__))
 
 #endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
@@ -461,6 +517,10 @@ asmlinkage long sys_pread64(unsigned int fd, char __user *buf,
                             size_t count, loff_t pos);
 asmlinkage long sys_pwrite64(unsigned int fd, const char __user *buf,
                              size_t count, loff_t pos);
+asmlinkage long sys_preadv(unsigned long fd, const struct iovec __user *vec,
+                           unsigned long vlen, unsigned long pos_l, unsigned long pos_h);
+asmlinkage long sys_pwritev(unsigned long fd, const struct iovec __user *vec,
+                            unsigned long vlen, unsigned long pos_l, unsigned long pos_h);
 asmlinkage long sys_getcwd(char __user *buf, unsigned long size);
 asmlinkage long sys_mkdir(const char __user *pathname, int mode);
 asmlinkage long sys_chdir(const char __user *filename);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 39d471d1163b..e76d3b22a466 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -490,6 +490,7 @@ enum
         NET_IPV4_CONF_ARP_IGNORE=19,
         NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
         NET_IPV4_CONF_ARP_ACCEPT=21,
+        NET_IPV4_CONF_ARP_NOTIFY=22,
         __NET_IPV4_CONF_MAX
 };
 
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index fe77e1499ab7..9d5078bd23a3 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -69,16 +69,16 @@ union tcp_word_hdr {
 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
 
 enum { 
-        TCP_FLAG_CWR = __constant_htonl(0x00800000), 
-        TCP_FLAG_ECE = __constant_htonl(0x00400000), 
-        TCP_FLAG_URG = __constant_htonl(0x00200000), 
-        TCP_FLAG_ACK = __constant_htonl(0x00100000), 
-        TCP_FLAG_PSH = __constant_htonl(0x00080000), 
-        TCP_FLAG_RST = __constant_htonl(0x00040000), 
-        TCP_FLAG_SYN = __constant_htonl(0x00020000), 
-        TCP_FLAG_FIN = __constant_htonl(0x00010000),
-        TCP_RESERVED_BITS = __constant_htonl(0x0F000000),
-        TCP_DATA_OFFSET = __constant_htonl(0xF0000000)
+        TCP_FLAG_CWR = __cpu_to_be32(0x00800000),
+        TCP_FLAG_ECE = __cpu_to_be32(0x00400000),
+        TCP_FLAG_URG = __cpu_to_be32(0x00200000),
+        TCP_FLAG_ACK = __cpu_to_be32(0x00100000),
+        TCP_FLAG_PSH = __cpu_to_be32(0x00080000),
+        TCP_FLAG_RST = __cpu_to_be32(0x00040000),
+        TCP_FLAG_SYN = __cpu_to_be32(0x00020000),
+        TCP_FLAG_FIN = __cpu_to_be32(0x00010000),
+        TCP_RESERVED_BITS = __cpu_to_be32(0x0F000000),
+        TCP_DATA_OFFSET = __cpu_to_be32(0xF0000000)
 }; 
 
 /* TCP socket options */
@@ -218,7 +218,6 @@ struct tcp_options_received {
                 snd_wscale : 4, /* Window scaling received from sender  */
                 rcv_wscale : 4; /* Window scaling to send to receiver   */
 /*      SACKs data      */
-        u8      eff_sacks;      /* Size of SACK array to send with next packet */
         u8      num_sacks;      /* Number of SACK blocks                */
         u16     user_mss;       /* mss requested by user in ioctl */
         u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
@@ -249,7 +248,7 @@ struct tcp_sock {
         /* inet_connection_sock has to be the first member of tcp_sock */
         struct inet_connection_sock     inet_conn;
         u16     tcp_header_len; /* Bytes of tcp header to send          */
-        u16     xmit_size_goal; /* Goal for segmenting output packets   */
+        u16     xmit_size_goal_segs; /* Goal for segmenting output packets */
 
 /*
  *      Header prediction flags
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 917707e6151d..1de8b9eb841b 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -27,27 +27,46 @@
 
 #include <linux/idr.h>
 #include <linux/device.h>
+#include <linux/workqueue.h>
 
 struct thermal_zone_device;
 struct thermal_cooling_device;
 
+enum thermal_device_mode {
+        THERMAL_DEVICE_DISABLED = 0,
+        THERMAL_DEVICE_ENABLED,
+};
+
+enum thermal_trip_type {
+        THERMAL_TRIP_ACTIVE = 0,
+        THERMAL_TRIP_PASSIVE,
+        THERMAL_TRIP_HOT,
+        THERMAL_TRIP_CRITICAL,
+};
+
 struct thermal_zone_device_ops {
         int (*bind) (struct thermal_zone_device *,
                      struct thermal_cooling_device *);
         int (*unbind) (struct thermal_zone_device *,
                        struct thermal_cooling_device *);
-        int (*get_temp) (struct thermal_zone_device *, char *);
-        int (*get_mode) (struct thermal_zone_device *, char *);
-        int (*set_mode) (struct thermal_zone_device *, const char *);
-        int (*get_trip_type) (struct thermal_zone_device *, int, char *);
-        int (*get_trip_temp) (struct thermal_zone_device *, int, char *);
+        int (*get_temp) (struct thermal_zone_device *, unsigned long *);
+        int (*get_mode) (struct thermal_zone_device *,
+                         enum thermal_device_mode *);
+        int (*set_mode) (struct thermal_zone_device *,
+                enum thermal_device_mode);
+        int (*get_trip_type) (struct thermal_zone_device *, int,
+                enum thermal_trip_type *);
+        int (*get_trip_temp) (struct thermal_zone_device *, int,
+                              unsigned long *);
         int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
+        int (*notify) (struct thermal_zone_device *, int,
+                       enum thermal_trip_type);
 };
 
 struct thermal_cooling_device_ops {
-        int (*get_max_state) (struct thermal_cooling_device *, char *);
-        int (*get_cur_state) (struct thermal_cooling_device *, char *);
-        int (*set_cur_state) (struct thermal_cooling_device *, unsigned int);
+        int (*get_max_state) (struct thermal_cooling_device *, unsigned long *);
+        int (*get_cur_state) (struct thermal_cooling_device *, unsigned long *);
+        int (*set_cur_state) (struct thermal_cooling_device *, unsigned long);
 };
 
 #define THERMAL_TRIPS_NONE -1
@@ -88,11 +107,19 @@ struct thermal_zone_device {
         struct device device;
         void *devdata;
         int trips;
+        int tc1;
+        int tc2;
+        int passive_delay;
+        int polling_delay;
+        int last_temperature;
+        bool passive;
+        unsigned int forced_passive;
         struct thermal_zone_device_ops *ops;
         struct list_head cooling_devices;
         struct idr idr;
         struct mutex lock;      /* protect cooling devices list */
         struct list_head node;
+        struct delayed_work poll_queue;
 #if defined(CONFIG_THERMAL_HWMON)
         struct list_head hwmon_node;
         struct thermal_hwmon_device *hwmon;
@@ -104,13 +131,16 @@ struct thermal_zone_device {
 struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
                                                          struct
                                                          thermal_zone_device_ops
-                                                         *);
+                                                         *, int tc1, int tc2,
+                                                         int passive_freq,
+                                                         int polling_freq);
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
                                      struct thermal_cooling_device *);
 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
                                        struct thermal_cooling_device *);
+void thermal_zone_device_update(struct thermal_zone_device *);
 struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
                                                                struct
                                                                thermal_cooling_device_ops
diff --git a/include/linux/time.h b/include/linux/time.h
index fbbd2a1c92ba..242f62499bb7 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -12,14 +12,14 @@
 #ifndef _STRUCT_TIMESPEC
 #define _STRUCT_TIMESPEC
 struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
+        __kernel_time_t tv_sec;                 /* seconds */
+        long            tv_nsec;                /* nanoseconds */
 };
 #endif
 
 struct timeval {
-        time_t          tv_sec;         /* seconds */
-        suseconds_t     tv_usec;        /* microseconds */
+        __kernel_time_t         tv_sec;         /* seconds */
+        __kernel_suseconds_t    tv_usec;        /* microseconds */
 };
 
 struct timezone {
diff --git a/include/linux/timecompare.h b/include/linux/timecompare.h
new file mode 100644
index 000000000000..546e2234e4b3
--- /dev/null
+++ b/include/linux/timecompare.h
@@ -0,0 +1,125 @@
+/*
+ * Utility code which helps transforming between two different time
+ * bases, called "source" and "target" time in this code.
+ *
+ * Source time has to be provided via the timecounter API while target
+ * time is accessed via a function callback whose prototype
+ * intentionally matches ktime_get() and ktime_get_real(). These
+ * interfaces where chosen like this so that the code serves its
+ * initial purpose without additional glue code.
+ *
+ * This purpose is synchronizing a hardware clock in a NIC with system
+ * time, in order to implement the Precision Time Protocol (PTP,
+ * IEEE1588) with more accurate hardware assisted time stamping.  In
+ * that context only synchronization against system time (=
+ * ktime_get_real()) is currently needed. But this utility code might
+ * become useful in other situations, which is why it was written as
+ * general purpose utility code.
+ *
+ * The source timecounter is assumed to return monotonically
+ * increasing time (but this code does its best to compensate if that
+ * is not the case) whereas target time may jump.
+ *
+ * The target time corresponding to a source time is determined by
+ * reading target time, reading source time, reading target time
+ * again, then assuming that average target time corresponds to source
+ * time. In other words, the assumption is that reading the source
+ * time is slow and involves equal time for sending the request and
+ * receiving the reply, whereas reading target time is assumed to be
+ * fast.
+ *
+ * Copyright (C) 2009 Intel Corporation.
+ * Author: Patrick Ohly <patrick.ohly@intel.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope 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_TIMECOMPARE_H
+#define _LINUX_TIMECOMPARE_H
+
+#include <linux/clocksource.h>
+#include <linux/ktime.h>
+
+/**
+ * struct timecompare - stores state and configuration for the two clocks
+ *
+ * Initialize to zero, then set source/target/num_samples.
+ *
+ * Transformation between source time and target time is done with:
+ * target_time = source_time + offset +
+ *               (source_time - last_update) * skew /
+ *               TIMECOMPARE_SKEW_RESOLUTION
+ *
+ * @source:          used to get source time stamps via timecounter_read()
+ * @target:          function returning target time (for example, ktime_get
+ *                   for monotonic time, or ktime_get_real for wall clock)
+ * @num_samples:     number of times that source time and target time are to
+ *                   be compared when determining their offset
+ * @offset:          (target time - source time) at the time of the last update
+ * @skew:            average (target time - source time) / delta source time *
+ *                   TIMECOMPARE_SKEW_RESOLUTION
+ * @last_update:     last source time stamp when time offset was measured
+ */
+struct timecompare {
+        struct timecounter *source;
+        ktime_t (*target)(void);
+        int num_samples;
+
+        s64 offset;
+        s64 skew;
+        u64 last_update;
+};
+
+/**
+ * timecompare_transform - transform source time stamp into target time base
+ * @sync:            context for time sync
+ * @source_tstamp:   the result of timecounter_read() or
+ *                   timecounter_cyc2time()
+ */
+extern ktime_t timecompare_transform(struct timecompare *sync,
+                                     u64 source_tstamp);
+
+/**
+ * timecompare_offset - measure current (target time - source time) offset
+ * @sync:            context for time sync
+ * @offset:          average offset during sample period returned here
+ * @source_tstamp:   average source time during sample period returned here
+ *
+ * Returns number of samples used. Might be zero (= no result) in the
+ * unlikely case that target time was monotonically decreasing for all
+ * samples (= broken).
+ */
+extern int timecompare_offset(struct timecompare *sync,
+                              s64 *offset,
+                              u64 *source_tstamp);
+
+extern void __timecompare_update(struct timecompare *sync,
+                                 u64 source_tstamp);
+
+/**
+ * timecompare_update - update offset and skew by measuring current offset
+ * @sync:            context for time sync
+ * @source_tstamp:   the result of timecounter_read() or
+ *                   timecounter_cyc2time(), pass zero to force update
+ *
+ * Updates are only done at most once per second.
+ */
+static inline void timecompare_update(struct timecompare *sync,
+                                      u64 source_tstamp)
+{
+        if (!source_tstamp ||
+            (s64)(source_tstamp - sync->last_update) >= NSEC_PER_SEC)
+                __timecompare_update(sync, source_tstamp);
+}
+
+#endif /* _LINUX_TIMECOMPARE_H */
diff --git a/include/linux/timer.h b/include/linux/timer.h
index daf9685b861c..6cdb6f3331f1 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -5,6 +5,7 @@
 #include <linux/ktime.h>
 #include <linux/stddef.h>
 #include <linux/debugobjects.h>
+#include <linux/stringify.h>
 
 struct tvec_base;
 
@@ -21,52 +22,126 @@ struct timer_list {
         char start_comm[16];
         int start_pid;
 #endif
+#ifdef CONFIG_LOCKDEP
+        struct lockdep_map lockdep_map;
+#endif
 };
 
 extern struct tvec_base boot_tvec_bases;
 
+#ifdef CONFIG_LOCKDEP
+/*
+ * NB: because we have to copy the lockdep_map, setting the lockdep_map key
+ * (second argument) here is required, otherwise it could be initialised to
+ * the copy of the lockdep_map later! We use the pointer to and the string
+ * "<file>:<line>" as the key resp. the name of the lockdep_map.
+ */
+#define __TIMER_LOCKDEP_MAP_INITIALIZER(_kn)                            \
+        .lockdep_map = STATIC_LOCKDEP_MAP_INIT(_kn, &_kn),
+#else
+#define __TIMER_LOCKDEP_MAP_INITIALIZER(_kn)
+#endif
+
 #define TIMER_INITIALIZER(_function, _expires, _data) {         \
                 .entry = { .prev = TIMER_ENTRY_STATIC },        \
                 .function = (_function),                        \
                 .expires = (_expires),                          \
                 .data = (_data),                                \
                 .base = &boot_tvec_bases,                       \
+                __TIMER_LOCKDEP_MAP_INITIALIZER(                \
+                        __FILE__ ":" __stringify(__LINE__))     \
         }
 
 #define DEFINE_TIMER(_name, _function, _expires, _data)         \
         struct timer_list _name =                               \
                 TIMER_INITIALIZER(_function, _expires, _data)
 
-void init_timer(struct timer_list *timer);
-void init_timer_deferrable(struct timer_list *timer);
+void init_timer_key(struct timer_list *timer,
+                    const char *name,
+                    struct lock_class_key *key);
+void init_timer_deferrable_key(struct timer_list *timer,
+                               const char *name,
+                               struct lock_class_key *key);
+
+#ifdef CONFIG_LOCKDEP
+#define init_timer(timer)                                               \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                init_timer_key((timer), #timer, &__key);                \
+        } while (0)
+
+#define init_timer_deferrable(timer)                                    \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                init_timer_deferrable_key((timer), #timer, &__key);     \
+        } while (0)
+
+#define init_timer_on_stack(timer)                                      \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                init_timer_on_stack_key((timer), #timer, &__key);       \
+        } while (0)
+
+#define setup_timer(timer, fn, data)                                    \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                setup_timer_key((timer), #timer, &__key, (fn), (data));\
+        } while (0)
+
+#define setup_timer_on_stack(timer, fn, data)                           \
+        do {                                                            \
+                static struct lock_class_key __key;                     \
+                setup_timer_on_stack_key((timer), #timer, &__key,       \
+                                         (fn), (data));                 \
+        } while (0)
+#else
+#define init_timer(timer)\
+        init_timer_key((timer), NULL, NULL)
+#define init_timer_deferrable(timer)\
+        init_timer_deferrable_key((timer), NULL, NULL)
+#define init_timer_on_stack(timer)\
+        init_timer_on_stack_key((timer), NULL, NULL)
+#define setup_timer(timer, fn, data)\
+        setup_timer_key((timer), NULL, NULL, (fn), (data))
+#define setup_timer_on_stack(timer, fn, data)\
+        setup_timer_on_stack_key((timer), NULL, NULL, (fn), (data))
+#endif
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
-extern void init_timer_on_stack(struct timer_list *timer);
+extern void init_timer_on_stack_key(struct timer_list *timer,
+                                    const char *name,
+                                    struct lock_class_key *key);
 extern void destroy_timer_on_stack(struct timer_list *timer);
 #else
 static inline void destroy_timer_on_stack(struct timer_list *timer) { }
-static inline void init_timer_on_stack(struct timer_list *timer)
+static inline void init_timer_on_stack_key(struct timer_list *timer,
+                                           const char *name,
+                                           struct lock_class_key *key)
 {
-        init_timer(timer);
+        init_timer_key(timer, name, key);
 }
 #endif
 
-static inline void setup_timer(struct timer_list * timer,
+static inline void setup_timer_key(struct timer_list * timer,
+                                const char *name,
+                                struct lock_class_key *key,
                                 void (*function)(unsigned long),
                                 unsigned long data)
 {
         timer->function = function;
         timer->data = data;
-        init_timer(timer);
+        init_timer_key(timer, name, key);
 }
 
-static inline void setup_timer_on_stack(struct timer_list *timer,
+static inline void setup_timer_on_stack_key(struct timer_list *timer,
+                                        const char *name,
+                                        struct lock_class_key *key,
                                         void (*function)(unsigned long),
                                         unsigned long data)
 {
         timer->function = function;
         timer->data = data;
-        init_timer_on_stack(timer);
+        init_timer_on_stack_key(timer, name, key);
 }
 
 /**
@@ -86,8 +161,8 @@ static inline int timer_pending(const struct timer_list * timer)
 
 extern void add_timer_on(struct timer_list *timer, int cpu);
 extern int del_timer(struct timer_list * timer);
-extern int __mod_timer(struct timer_list *timer, unsigned long expires);
 extern int mod_timer(struct timer_list *timer, unsigned long expires);
+extern int mod_timer_pending(struct timer_list *timer, unsigned long expires);
 
 /*
  * The jiffies value which is added to now, when there is no timer
@@ -146,25 +221,7 @@ static inline void timer_stats_timer_clear_start_info(struct timer_list *timer)
 }
 #endif
 
-/**
- * add_timer - start a timer
- * @timer: the timer to be added
- *
- * The kernel will do a ->function(->data) callback from the
- * timer interrupt at the ->expires point in the future. The
- * current time is 'jiffies'.
- *
- * The timer's ->expires, ->function (and if the handler uses it, ->data)
- * fields must be set prior calling this function.
- *
- * Timers with an ->expires field in the past will be executed in the next
- * timer tick.
- */
-static inline void add_timer(struct timer_list *timer)
-{
-        BUG_ON(timer_pending(timer));
-        __mod_timer(timer, timer->expires);
-}
+extern void add_timer(struct timer_list *timer);
 
 #ifdef CONFIG_SMP
   extern int try_to_del_timer_sync(struct timer_list *timer);
diff --git a/include/linux/timeriomem-rng.h b/include/linux/timeriomem-rng.h
new file mode 100644
index 000000000000..3e08a1c86830
--- /dev/null
+++ b/include/linux/timeriomem-rng.h
@@ -0,0 +1,21 @@
+/*
+ * linux/include/linux/timeriomem-rng.h
+ *
+ * Copyright (c) 2009 Alexander Clouter <alex@digriz.org.uk>
+ *
+ * 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/completion.h>
+
+struct timeriomem_rng_data {
+        struct completion       completion;
+        unsigned int            present:1;
+
+        void __iomem            *address;
+
+        /* measures in usecs */
+        unsigned int            period;
+};
diff --git a/include/linux/times.h b/include/linux/times.h
index e2d3020742a6..87b62615cedd 100644
--- a/include/linux/times.h
+++ b/include/linux/times.h
@@ -4,10 +4,10 @@
 #include <linux/types.h>
 
 struct tms {
-        clock_t tms_utime;
-        clock_t tms_stime;
-        clock_t tms_cutime;
-        clock_t tms_cstime;
+        __kernel_clock_t tms_utime;
+        __kernel_clock_t tms_stime;
+        __kernel_clock_t tms_cutime;
+        __kernel_clock_t tms_cstime;
 };
 
 #endif
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 998a55d80acf..aa3475fcff64 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -190,7 +190,7 @@ struct timex {
  * offset and maximum frequency tolerance.
  */
 #define SHIFT_USEC 16           /* frequency offset scale (shift) */
-#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
+#define PPM_SCALE ((s64)NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
 #define PPM_SCALE_INV_SHIFT 19
 #define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
                        PPM_SCALE + 1)
diff --git a/include/linux/topology.h b/include/linux/topology.h
index e632d29f0544..7402c1a27c4f 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -38,11 +38,7 @@
 #endif
 
 #ifndef nr_cpus_node
-#define nr_cpus_node(node)                              \
-        ({                                              \
-                node_to_cpumask_ptr(__tmp__, node);     \
-                cpus_weight(*__tmp__);                  \
-        })
+#define nr_cpus_node(node) cpumask_weight(cpumask_of_node(node))
 #endif
 
 #define for_each_node_with_cpus(node)                   \
@@ -193,5 +189,16 @@ int arch_update_cpu_topology(void);
 #ifndef topology_core_siblings
 #define topology_core_siblings(cpu)             cpumask_of_cpu(cpu)
 #endif
+#ifndef topology_thread_cpumask
+#define topology_thread_cpumask(cpu)            cpumask_of(cpu)
+#endif
+#ifndef topology_core_cpumask
+#define topology_core_cpumask(cpu)              cpumask_of(cpu)
+#endif
+
+/* Returns the number of the current Node. */
+#ifndef numa_node_id
+#define numa_node_id()          (cpu_to_node(raw_smp_processor_id()))
+#endif
 
 #endif /* _LINUX_TOPOLOGY_H */
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
new file mode 100644
index 000000000000..3338b3f5c21a
--- /dev/null
+++ b/include/linux/tpm.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2004,2007,2008 IBM Corporation
+ *
+ * Authors:
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * Dave Safford <safford@watson.ibm.com>
+ * Reiner Sailer <sailer@watson.ibm.com>
+ * Kylene Hall <kjhall@us.ibm.com>
+ * Debora Velarde <dvelarde@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.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.
+ *
+ */
+#ifndef __LINUX_TPM_H__
+#define __LINUX_TPM_H__
+
+/*
+ * Chip num is this value or a valid tpm idx
+ */
+#define TPM_ANY_NUM 0xFFFF
+
+#if defined(CONFIG_TCG_TPM)
+
+extern int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf);
+extern int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash);
+#endif
+#endif
diff --git a/include/linux/trace_clock.h b/include/linux/trace_clock.h
new file mode 100644
index 000000000000..7a8130384087
--- /dev/null
+++ b/include/linux/trace_clock.h
@@ -0,0 +1,19 @@
+#ifndef _LINUX_TRACE_CLOCK_H
+#define _LINUX_TRACE_CLOCK_H
+
+/*
+ * 3 trace clock variants, with differing scalability/precision
+ * tradeoffs:
+ *
+ *  -   local: CPU-local trace clock
+ *  -  medium: scalable global clock with some jitter
+ *  -  global: globally monotonic, serialized clock
+ */
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+extern u64 notrace trace_clock_local(void);
+extern u64 notrace trace_clock(void);
+extern u64 notrace trace_clock_global(void);
+
+#endif /* _LINUX_TRACE_CLOCK_H */
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 6186a789d6c7..c7aa154f4bfc 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -388,17 +388,14 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
  * tracehook_consider_ignored_signal - suppress short-circuit of ignored signal
  * @task:               task receiving the signal
  * @sig:                signal number being sent
- * @handler:            %SIG_IGN or %SIG_DFL
  *
  * Return zero iff tracing doesn't care to examine this ignored signal,
  * so it can short-circuit normal delivery and never even get queued.
- * Either @handler is %SIG_DFL and @sig's default is ignore, or it's %SIG_IGN.
  *
  * Called with @task->sighand->siglock held.
  */
 static inline int tracehook_consider_ignored_signal(struct task_struct *task,
-                                                    int sig,
-                                                    void __user *handler)
+                                                    int sig)
 {
         return (task_ptrace(task) & PT_PTRACED) != 0;
 }
@@ -407,19 +404,17 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
  * tracehook_consider_fatal_signal - suppress special handling of fatal signal
  * @task:               task receiving the signal
  * @sig:                signal number being sent
- * @handler:            %SIG_DFL or %SIG_IGN
  *
  * Return nonzero to prevent special handling of this termination signal.
- * Normally @handler is %SIG_DFL.  It can be %SIG_IGN if @sig is ignored,
- * in which case force_sig() is about to reset it to %SIG_DFL.
+ * Normally handler for signal is %SIG_DFL.  It can be %SIG_IGN if @sig is
+ * ignored, in which case force_sig() is about to reset it to %SIG_DFL.
  * When this returns zero, this signal might cause a quick termination
  * that does not give the debugger a chance to intercept the signal.
  *
  * Called with or without @task->sighand->siglock held.
  */
 static inline int tracehook_consider_fatal_signal(struct task_struct *task,
-                                                  int sig,
-                                                  void __user *handler)
+                                                  int sig)
 {
         return (task_ptrace(task) & PT_PTRACED) != 0;
 }
@@ -507,7 +502,7 @@ static inline int tracehook_notify_jctl(int notify, int why)
 static inline int tracehook_notify_death(struct task_struct *task,
                                          void **death_cookie, int group_dead)
 {
-        if (task->exit_signal == -1)
+        if (task_detached(task))
                 return task->ptrace ? SIGCHLD : DEATH_REAP;
 
         /*
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 757005458366..d35a7ee7611f 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -31,8 +31,8 @@ struct tracepoint {
                                          * Keep in sync with vmlinux.lds.h.
                                          */
 
-#define TPPROTO(args...)        args
-#define TPARGS(args...)         args
+#define TP_PROTO(args...)       args
+#define TP_ARGS(args...)                args
 
 #ifdef CONFIG_TRACEPOINTS
 
@@ -65,7 +65,7 @@ struct tracepoint {
         {                                                               \
                 if (unlikely(__tracepoint_##name.state))                \
                         __DO_TRACE(&__tracepoint_##name,                \
-                                TPPROTO(proto), TPARGS(args));          \
+                                TP_PROTO(proto), TP_ARGS(args));        \
         }                                                               \
         static inline int register_trace_##name(void (*probe)(proto))   \
         {                                                               \
@@ -153,4 +153,114 @@ static inline void tracepoint_synchronize_unregister(void)
         synchronize_sched();
 }
 
+#define PARAMS(args...) args
+#define TRACE_FORMAT(name, proto, args, fmt)            \
+        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+
+
+/*
+ * For use with the TRACE_EVENT macro:
+ *
+ * We define a tracepoint, its arguments, its printk format
+ * and its 'fast binay record' layout.
+ *
+ * Firstly, name your tracepoint via TRACE_EVENT(name : the
+ * 'subsystem_event' notation is fine.
+ *
+ * Think about this whole construct as the
+ * 'trace_sched_switch() function' from now on.
+ *
+ *
+ *  TRACE_EVENT(sched_switch,
+ *
+ *      *
+ *      * A function has a regular function arguments
+ *      * prototype, declare it via TP_PROTO():
+ *      *
+ *
+ *      TP_PROTO(struct rq *rq, struct task_struct *prev,
+ *               struct task_struct *next),
+ *
+ *      *
+ *      * Define the call signature of the 'function'.
+ *      * (Design sidenote: we use this instead of a
+ *      *  TP_PROTO1/TP_PROTO2/TP_PROTO3 ugliness.)
+ *      *
+ *
+ *      TP_ARGS(rq, prev, next),
+ *
+ *      *
+ *      * Fast binary tracing: define the trace record via
+ *      * TP_STRUCT__entry(). You can think about it like a
+ *      * regular C structure local variable definition.
+ *      *
+ *      * This is how the trace record is structured and will
+ *      * be saved into the ring buffer. These are the fields
+ *      * that will be exposed to user-space in
+ *      * /debug/tracing/events/<*>/format.
+ *      *
+ *      * The declared 'local variable' is called '__entry'
+ *      *
+ *      * __field(pid_t, prev_prid) is equivalent to a standard declariton:
+ *      *
+ *      *       pid_t   prev_pid;
+ *      *
+ *      * __array(char, prev_comm, TASK_COMM_LEN) is equivalent to:
+ *      *
+ *      *       char    prev_comm[TASK_COMM_LEN];
+ *      *
+ *
+ *      TP_STRUCT__entry(
+ *              __array(        char,   prev_comm,      TASK_COMM_LEN   )
+ *              __field(        pid_t,  prev_pid                        )
+ *              __field(        int,    prev_prio                       )
+ *              __array(        char,   next_comm,      TASK_COMM_LEN   )
+ *              __field(        pid_t,  next_pid                        )
+ *              __field(        int,    next_prio                       )
+ *      ),
+ *
+ *      *
+ *      * Assign the entry into the trace record, by embedding
+ *      * a full C statement block into TP_fast_assign(). You
+ *      * can refer to the trace record as '__entry' -
+ *      * otherwise you can put arbitrary C code in here.
+ *      *
+ *      * Note: this C code will execute every time a trace event
+ *      * happens, on an active tracepoint.
+ *      *
+ *
+ *      TP_fast_assign(
+ *              memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN);
+ *              __entry->prev_pid       = prev->pid;
+ *              __entry->prev_prio      = prev->prio;
+ *              memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN);
+ *              __entry->next_pid       = next->pid;
+ *              __entry->next_prio      = next->prio;
+ *      )
+ *
+ *      *
+ *      * Formatted output of a trace record via TP_printk().
+ *      * This is how the tracepoint will appear under ftrace
+ *      * plugins that make use of this tracepoint.
+ *      *
+ *      * (raw-binary tracing wont actually perform this step.)
+ *      *
+ *
+ *      TP_printk("task %s:%d [%d] ==> %s:%d [%d]",
+ *              __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
+ *              __entry->next_comm, __entry->next_pid, __entry->next_prio),
+ *
+ * );
+ *
+ * This macro construct is thus used for the regular printk format
+ * tracing setup, it is used to construct a function pointer based
+ * tracepoint callback (this is used by programmatic plugins and
+ * can also by used by generic instrumentation like SystemTap), and
+ * it is also used to expose a structured trace record in
+ * /debug/tracing/events/.
+ */
+
+#define TRACE_EVENT(name, proto, args, struct, assign, print)   \
+        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+
 #endif
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 08e088334dba..bcba84ea2d86 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -252,8 +252,6 @@ struct tty_operations {
         void (*set_ldisc)(struct tty_struct *tty);
         void (*wait_until_sent)(struct tty_struct *tty, int timeout);
         void (*send_xchar)(struct tty_struct *tty, char ch);
-        int (*read_proc)(char *page, char **start, off_t off,
-                          int count, int *eof, void *data);
         int (*tiocmget)(struct tty_struct *tty, struct file *file);
         int (*tiocmset)(struct tty_struct *tty, struct file *file,
                         unsigned int set, unsigned int clear);
@@ -264,6 +262,7 @@ struct tty_operations {
         int (*poll_get_char)(struct tty_driver *driver, int line);
         void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
 #endif
+        const struct file_operations *proc_fops;
 };
 
 struct tty_driver {
@@ -310,7 +309,8 @@ extern void tty_set_operations(struct tty_driver *driver,
 extern struct tty_driver *tty_find_polling_driver(char *name, int *line);
 
 extern void tty_driver_kref_put(struct tty_driver *driver);
-extern inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
+
+static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
 {
         kref_get(&d->kref);
         return d;
diff --git a/include/linux/types.h b/include/linux/types.h
index 712ca53bc348..5abe354020f9 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,6 +1,9 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+#include <asm/types.h>
+
+#ifndef __ASSEMBLY__
 #ifdef  __KERNEL__
 
 #define DECLARE_BITMAP(name,bits) \
@@ -9,9 +12,8 @@
 #endif
 
 #include <linux/posix_types.h>
-#include <asm/types.h>
 
-#ifndef __KERNEL_STRICT_NAMES
+#ifdef __KERNEL__
 
 typedef __u32 __kernel_dev_t;
 
@@ -29,7 +31,6 @@ typedef __kernel_timer_t	timer_t;
 typedef __kernel_clockid_t      clockid_t;
 typedef __kernel_mqd_t          mqd_t;
 
-#ifdef __KERNEL__
 typedef _Bool                   bool;
 
 typedef __kernel_uid32_t        uid_t;
@@ -45,14 +46,6 @@ typedef __kernel_old_uid_t	old_uid_t;
 typedef __kernel_old_gid_t      old_gid_t;
 #endif /* CONFIG_UID16 */
 
-/* libc5 includes this file to define uid_t, thus uid_t can never change
- * when it is included by non-kernel code
- */
-#else
-typedef __kernel_uid_t          uid_t;
-typedef __kernel_gid_t          gid_t;
-#endif /* __KERNEL__ */
-
 #if defined(__GNUC__)
 typedef __kernel_loff_t         loff_t;
 #endif
@@ -154,7 +147,7 @@ typedef unsigned long blkcnt_t;
 #define pgoff_t unsigned long
 #endif
 
-#endif /* __KERNEL_STRICT_NAMES */
+#endif /* __KERNEL__ */
 
 /*
  * Below are truly Linux-specific types that should never collide with
@@ -212,5 +205,5 @@ struct ustat {
 };
 
 #endif  /* __KERNEL__ */
-
+#endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index a0bb6bd2e5c1..5dcc9ff72f69 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -22,6 +22,7 @@ struct uio_map;
 
 /**
  * struct uio_mem - description of a UIO memory region
+ * @name:               name of the memory region for identification
  * @addr:               address of the device's memory
  * @size:               size of IO
  * @memtype:            type of memory addr points to
@@ -29,6 +30,7 @@ struct uio_map;
  * @map:                for use by the UIO core only.
  */
 struct uio_mem {
+        const char              *name;
         unsigned long           addr;
         unsigned long           size;
         int                     memtype;
@@ -42,12 +44,14 @@ struct uio_portio;
 
 /**
  * struct uio_port - description of a UIO port region
+ * @name:               name of the port region for identification
  * @start:              start of port region
  * @size:               size of port region
  * @porttype:           type of port (see UIO_PORT_* below)
  * @portio:             for use by the UIO core only.
  */
 struct uio_port {
+        const char              *name;
         unsigned long           start;
         unsigned long           size;
         int                     porttype;
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 88079fd60235..3aa2cd1f8d08 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -643,186 +643,6 @@ static inline int usb_make_path(struct usb_device *dev, char *buf, size_t size)
 
 /*-------------------------------------------------------------------------*/
 
-/**
- * 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));
-}
-
-/*-------------------------------------------------------------------------*/
-
 #define USB_DEVICE_ID_MATCH_DEVICE \
                 (USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT)
 #define USB_DEVICE_ID_MATCH_DEV_RANGE \
@@ -1357,8 +1177,8 @@ struct urb {
         unsigned int transfer_flags;    /* (in) URB_SHORT_NOT_OK | ...*/
         void *transfer_buffer;          /* (in) associated data buffer */
         dma_addr_t transfer_dma;        /* (in) dma addr for transfer_buffer */
-        int transfer_buffer_length;     /* (in) data buffer length */
-        int actual_length;              /* (return) actual transfer length */
+        u32 transfer_buffer_length;     /* (in) data buffer length */
+        u32 actual_length;              /* (return) actual transfer length */
         unsigned char *setup_packet;    /* (in) setup packet (control only) */
         dma_addr_t setup_dma;           /* (in) dma addr for setup_packet */
         int start_frame;                /* (modify) start frame (ISO) */
@@ -1567,6 +1387,7 @@ extern int usb_string(struct usb_device *dev, int index,
 extern int usb_clear_halt(struct usb_device *dev, int pipe);
 extern int usb_reset_configuration(struct usb_device *dev);
 extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
+extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr);
 
 /* this request isn't really synchronous, but it belongs with the others */
 extern int usb_driver_set_configuration(struct usb_device *udev, int config);
@@ -1671,14 +1492,6 @@ void usb_sg_wait(struct usb_sg_request *io);
 #define usb_pipecontrol(pipe)   (usb_pipetype((pipe)) == PIPE_CONTROL)
 #define usb_pipebulk(pipe)      (usb_pipetype((pipe)) == PIPE_BULK)
 
-/* The D0/D1 toggle bits ... USE WITH CAUTION (they're almost hcd-internal) */
-#define usb_gettoggle(dev, ep, out) (((dev)->toggle[out] >> (ep)) & 1)
-#define usb_dotoggle(dev, ep, out)  ((dev)->toggle[out] ^= (1 << (ep)))
-#define usb_settoggle(dev, ep, out, bit) \
-                ((dev)->toggle[out] = ((dev)->toggle[out] & ~(1 << (ep))) | \
-                 ((bit) << (ep)))
-
-
 static inline unsigned int __create_pipe(struct usb_device *dev,
                 unsigned int endpoint)
 {
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index 3c86ed25a04c..c24124a42ce5 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -17,6 +17,7 @@
 #define USB_CDC_SUBCLASS_DMM                    0x09
 #define USB_CDC_SUBCLASS_MDLM                   0x0a
 #define USB_CDC_SUBCLASS_OBEX                   0x0b
+#define USB_CDC_SUBCLASS_EEM                    0x0c
 
 #define USB_CDC_PROTO_NONE                      0
 
@@ -28,6 +29,8 @@
 #define USB_CDC_ACM_PROTO_AT_CDMA               6
 #define USB_CDC_ACM_PROTO_VENDOR                0xff
 
+#define USB_CDC_PROTO_EEM                       7
+
 /*-------------------------------------------------------------------------*/
 
 /*
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 9b42baed3900..b145119a90da 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -102,7 +102,7 @@
 #define USB_REQ_LOOPBACK_DATA_READ      0x16
 #define USB_REQ_SET_INTERFACE_DS        0x17
 
-/* The Link Power Mangement (LPM) ECN defines USB_REQ_TEST_AND_SET command,
+/* 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 ...
  */
@@ -353,6 +353,185 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_XFER_INT           3
 #define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
 
+/*-------------------------------------------------------------------------*/
+
+/**
+ * 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));
+}
 
 /*-------------------------------------------------------------------------*/
 
@@ -584,8 +763,8 @@ enum usb_device_state {
         /* chapter 9 and authentication (wireless) device states */
         USB_STATE_ATTACHED,
         USB_STATE_POWERED,                      /* wired */
-        USB_STATE_UNAUTHENTICATED,              /* auth */
         USB_STATE_RECONNECTING,                 /* auth */
+        USB_STATE_UNAUTHENTICATED,              /* auth */
         USB_STATE_DEFAULT,                      /* limited function */
         USB_STATE_ADDRESS,
         USB_STATE_CONFIGURED,                   /* most functions */
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 935c380ffe47..acd7b0f06c8a 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -244,6 +244,10 @@ int usb_add_config(struct usb_composite_dev *,
  *      value; it should return zero on successful initialization.
  * @unbind: Reverses @bind(); called as a side effect of unregistering
  *      this driver.
+ * @suspend: Notifies when the host stops sending USB traffic,
+ *      after function notifications
+ * @resume: Notifies configuration when the host restarts USB traffic,
+ *      before function notifications
  *
  * Devices default to reporting self powered operation.  Devices which rely
  * on bus powered operation should report this in their @bind() method.
@@ -268,6 +272,10 @@ struct usb_composite_driver {
 
         int                     (*bind)(struct usb_composite_dev *);
         int                     (*unbind)(struct usb_composite_dev *);
+
+        /* global suspend hooks */
+        void                    (*suspend)(struct usb_composite_dev *);
+        void                    (*resume)(struct usb_composite_dev *);
 };
 
 extern int usb_composite_register(struct usb_composite_driver *);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 0460a746480c..bbf45d500b6d 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -598,6 +598,7 @@ static inline int usb_gadget_clear_selfpowered(struct usb_gadget *gadget)
 /**
  * usb_gadget_vbus_connect - Notify controller that VBUS is powered
  * @gadget:The device which now has VBUS power.
+ * Context: can sleep
  *
  * This call is used by a driver for an external transceiver (or GPIO)
  * that detects a VBUS power session starting.  Common responses include
@@ -636,6 +637,7 @@ static inline int usb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA)
 /**
  * usb_gadget_vbus_disconnect - notify controller about VBUS session end
  * @gadget:the device whose VBUS supply is being described
+ * Context: can sleep
  *
  * This call is used by a driver for an external transceiver (or GPIO)
  * that detects a VBUS power session ending.  Common responses include
@@ -792,19 +794,20 @@ struct usb_gadget_driver {
 /**
  * usb_gadget_register_driver - register a gadget driver
  * @driver:the driver being registered
+ * Context: can sleep
  *
  * Call this in your gadget driver's module initialization function,
  * to tell the underlying usb controller driver about your driver.
  * The driver's bind() function will be called to bind it to a
  * gadget before this registration call returns.  It's expected that
  * the bind() functions will be in init sections.
- * This function must be called in a context that can sleep.
  */
 int usb_gadget_register_driver(struct usb_gadget_driver *driver);
 
 /**
  * usb_gadget_unregister_driver - unregister a gadget driver
  * @driver:the driver being unregistered
+ * Context: can sleep
  *
  * Call this in your gadget driver's module cleanup function,
  * to tell the underlying usb controller that your driver is
@@ -813,7 +816,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver);
  * to unbind() and clean up any device state, before this procedure
  * finally returns.  It's expected that the unbind() functions
  * will in in exit sections, so may not be linked in some kernels.
- * This function must be called in a context that can sleep.
  */
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);
 
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index d6aad0ea6033..d43755669261 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -7,6 +7,9 @@
  * key configuration differences between boards.
  */
 
+#ifndef __LINUX_USB_MUSB_H
+#define __LINUX_USB_MUSB_H
+
 /* The USB role is defined by the connector used on the board, so long as
  * standards are being followed.  (Developer boards sometimes won't.)
  */
@@ -101,3 +104,5 @@ extern int __init tusb6010_setup_interface(
 extern int tusb6010_platform_retime(unsigned is_refclk);
 
 #endif  /* OMAP2 */
+
+#endif /* __LINUX_USB_MUSB_H */
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 94df4fe6c6c0..1aaa826396a1 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -80,12 +80,17 @@ struct otg_transceiver {
 
 /* for board-specific init logic */
 extern int otg_set_transceiver(struct otg_transceiver *);
+#ifdef CONFIG_NOP_USB_XCEIV
+extern void usb_nop_xceiv_register(void);
+extern void usb_nop_xceiv_unregister(void);
+#endif
 
 
 /* for usb host and peripheral controller drivers */
 extern struct otg_transceiver *otg_get_transceiver(void);
 extern void otg_put_transceiver(struct otg_transceiver *);
 
+/* Context: can sleep */
 static inline int
 otg_start_hnp(struct otg_transceiver *otg)
 {
@@ -102,6 +107,8 @@ otg_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 
 
 /* for usb peripheral controller drivers */
+
+/* Context: can sleep */
 static inline int
 otg_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *periph)
 {
@@ -114,6 +121,7 @@ otg_set_power(struct otg_transceiver *otg, unsigned mA)
         return otg->set_power(otg, mA);
 }
 
+/* Context: can sleep */
 static inline int
 otg_set_suspend(struct otg_transceiver *otg, int suspend)
 {
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 7f6c603db654..2526f3bbd273 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -16,4 +16,7 @@
 /* device can't handle Set-Interface requests */
 #define USB_QUIRK_NO_SET_INTF           0x00000004
 
+/* device can't handle its Configuration or Interface strings */
+#define USB_QUIRK_CONFIG_INTF_STRINGS   0x00000008
+
 #endif /* __LINUX_USB_QUIRKS_H */
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 0a6e6d4b929a..37836b937d97 100644
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -49,48 +49,45 @@ struct rndis_msg_hdr {
  */
 #define RNDIS_CONTROL_TIMEOUT_MS        (5 * 1000)
 
-
-#define ccpu2 __constant_cpu_to_le32
-
-#define RNDIS_MSG_COMPLETION    ccpu2(0x80000000)
+#define RNDIS_MSG_COMPLETION    cpu_to_le32(0x80000000)
 
 /* codes for "msg_type" field of rndis messages;
  * only the data channel uses packet messages (maybe batched);
  * everything else goes on the control channel.
  */
-#define RNDIS_MSG_PACKET        ccpu2(0x00000001)       /* 1-N packets */
-#define RNDIS_MSG_INIT          ccpu2(0x00000002)
+#define RNDIS_MSG_PACKET        cpu_to_le32(0x00000001) /* 1-N packets */
+#define RNDIS_MSG_INIT          cpu_to_le32(0x00000002)
 #define RNDIS_MSG_INIT_C        (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_HALT          ccpu2(0x00000003)
-#define RNDIS_MSG_QUERY         ccpu2(0x00000004)
+#define RNDIS_MSG_HALT          cpu_to_le32(0x00000003)
+#define RNDIS_MSG_QUERY         cpu_to_le32(0x00000004)
 #define RNDIS_MSG_QUERY_C       (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_SET           ccpu2(0x00000005)
+#define RNDIS_MSG_SET           cpu_to_le32(0x00000005)
 #define RNDIS_MSG_SET_C         (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_RESET         ccpu2(0x00000006)
+#define RNDIS_MSG_RESET         cpu_to_le32(0x00000006)
 #define RNDIS_MSG_RESET_C       (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_INDICATE      ccpu2(0x00000007)
-#define RNDIS_MSG_KEEPALIVE     ccpu2(0x00000008)
+#define RNDIS_MSG_INDICATE      cpu_to_le32(0x00000007)
+#define RNDIS_MSG_KEEPALIVE     cpu_to_le32(0x00000008)
 #define RNDIS_MSG_KEEPALIVE_C   (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
 
 /* codes for "status" field of completion messages */
-#define RNDIS_STATUS_SUCCESS            ccpu2(0x00000000)
-#define RNDIS_STATUS_FAILURE            ccpu2(0xc0000001)
-#define RNDIS_STATUS_INVALID_DATA       ccpu2(0xc0010015)
-#define RNDIS_STATUS_NOT_SUPPORTED      ccpu2(0xc00000bb)
-#define RNDIS_STATUS_MEDIA_CONNECT      ccpu2(0x4001000b)
-#define RNDIS_STATUS_MEDIA_DISCONNECT   ccpu2(0x4001000c)
+#define RNDIS_STATUS_SUCCESS            cpu_to_le32(0x00000000)
+#define RNDIS_STATUS_FAILURE            cpu_to_le32(0xc0000001)
+#define RNDIS_STATUS_INVALID_DATA       cpu_to_le32(0xc0010015)
+#define RNDIS_STATUS_NOT_SUPPORTED      cpu_to_le32(0xc00000bb)
+#define RNDIS_STATUS_MEDIA_CONNECT      cpu_to_le32(0x4001000b)
+#define RNDIS_STATUS_MEDIA_DISCONNECT   cpu_to_le32(0x4001000c)
 
 /* codes for OID_GEN_PHYSICAL_MEDIUM */
-#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       ccpu2(0x00000000)
-#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN      ccpu2(0x00000001)
-#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM       ccpu2(0x00000002)
-#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE        ccpu2(0x00000003)
-#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE        ccpu2(0x00000004)
-#define RNDIS_PHYSICAL_MEDIUM_DSL               ccpu2(0x00000005)
-#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL     ccpu2(0x00000006)
-#define RNDIS_PHYSICAL_MEDIUM_1394              ccpu2(0x00000007)
-#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      ccpu2(0x00000008)
-#define RNDIS_PHYSICAL_MEDIUM_MAX               ccpu2(0x00000009)
+#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       cpu_to_le32(0x00000000)
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN      cpu_to_le32(0x00000001)
+#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM       cpu_to_le32(0x00000002)
+#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE        cpu_to_le32(0x00000003)
+#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE        cpu_to_le32(0x00000004)
+#define RNDIS_PHYSICAL_MEDIUM_DSL               cpu_to_le32(0x00000005)
+#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL     cpu_to_le32(0x00000006)
+#define RNDIS_PHYSICAL_MEDIUM_1394              cpu_to_le32(0x00000007)
+#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      cpu_to_le32(0x00000008)
+#define RNDIS_PHYSICAL_MEDIUM_MAX               cpu_to_le32(0x00000009)
 
 struct rndis_data_hdr {
         __le32  msg_type;               /* RNDIS_MSG_PACKET */
@@ -228,24 +225,24 @@ struct rndis_keepalive_c {	/* IN (optionally OUT) */
  * there are gobs more that may optionally be supported.  We'll avoid as much
  * of that mess as possible.
  */
-#define OID_802_3_PERMANENT_ADDRESS     ccpu2(0x01010101)
-#define OID_GEN_MAXIMUM_FRAME_SIZE      ccpu2(0x00010106)
-#define OID_GEN_CURRENT_PACKET_FILTER   ccpu2(0x0001010e)
-#define OID_GEN_PHYSICAL_MEDIUM         ccpu2(0x00010202)
+#define OID_802_3_PERMANENT_ADDRESS     cpu_to_le32(0x01010101)
+#define OID_GEN_MAXIMUM_FRAME_SIZE      cpu_to_le32(0x00010106)
+#define OID_GEN_CURRENT_PACKET_FILTER   cpu_to_le32(0x0001010e)
+#define OID_GEN_PHYSICAL_MEDIUM         cpu_to_le32(0x00010202)
 
 /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
-#define RNDIS_PACKET_TYPE_DIRECTED              ccpu2(0x00000001)
-#define RNDIS_PACKET_TYPE_MULTICAST             ccpu2(0x00000002)
-#define RNDIS_PACKET_TYPE_ALL_MULTICAST         ccpu2(0x00000004)
-#define RNDIS_PACKET_TYPE_BROADCAST             ccpu2(0x00000008)
-#define RNDIS_PACKET_TYPE_SOURCE_ROUTING        ccpu2(0x00000010)
-#define RNDIS_PACKET_TYPE_PROMISCUOUS           ccpu2(0x00000020)
-#define RNDIS_PACKET_TYPE_SMT                   ccpu2(0x00000040)
-#define RNDIS_PACKET_TYPE_ALL_LOCAL             ccpu2(0x00000080)
-#define RNDIS_PACKET_TYPE_GROUP                 ccpu2(0x00001000)
-#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL        ccpu2(0x00002000)
-#define RNDIS_PACKET_TYPE_FUNCTIONAL            ccpu2(0x00004000)
-#define RNDIS_PACKET_TYPE_MAC_FRAME             ccpu2(0x00008000)
+#define RNDIS_PACKET_TYPE_DIRECTED              cpu_to_le32(0x00000001)
+#define RNDIS_PACKET_TYPE_MULTICAST             cpu_to_le32(0x00000002)
+#define RNDIS_PACKET_TYPE_ALL_MULTICAST         cpu_to_le32(0x00000004)
+#define RNDIS_PACKET_TYPE_BROADCAST             cpu_to_le32(0x00000008)
+#define RNDIS_PACKET_TYPE_SOURCE_ROUTING        cpu_to_le32(0x00000010)
+#define RNDIS_PACKET_TYPE_PROMISCUOUS           cpu_to_le32(0x00000020)
+#define RNDIS_PACKET_TYPE_SMT                   cpu_to_le32(0x00000040)
+#define RNDIS_PACKET_TYPE_ALL_LOCAL             cpu_to_le32(0x00000080)
+#define RNDIS_PACKET_TYPE_GROUP                 cpu_to_le32(0x00001000)
+#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL        cpu_to_le32(0x00002000)
+#define RNDIS_PACKET_TYPE_FUNCTIONAL            cpu_to_le32(0x00004000)
+#define RNDIS_PACKET_TYPE_MAC_FRAME             cpu_to_le32(0x00008000)
 
 /* default filter used with RNDIS devices */
 #define RNDIS_DEFAULT_FILTER ( \
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 0b8617a9176d..625e9e4639c6 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -29,7 +29,7 @@
 /**
  * usb_serial_port: structure for the specific ports of a device.
  * @serial: pointer back to the struct usb_serial owner of this port.
- * @tty: pointer to the corresponding tty for this port.
+ * @port: pointer to the corresponding tty_port for this port.
  * @lock: spinlock to grab when updating portions of this structure.
  * @mutex: mutex used to synchronize serial_open() and serial_close()
  *      access for this port.
@@ -44,19 +44,22 @@
  * @interrupt_out_endpointAddress: endpoint address for the interrupt out pipe
  *      for this port.
  * @bulk_in_buffer: pointer to the bulk in buffer for this port.
+ * @bulk_in_size: the size of the bulk_in_buffer, in bytes.
  * @read_urb: pointer to the bulk in struct urb for this port.
  * @bulk_in_endpointAddress: endpoint address for the bulk in pipe for this
  *      port.
  * @bulk_out_buffer: pointer to the bulk out buffer for this port.
  * @bulk_out_size: the size of the bulk_out_buffer, in bytes.
  * @write_urb: pointer to the bulk out struct urb for this port.
+ * @write_urb_busy: port`s writing status
  * @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
  *      port.
  * @write_wait: a wait_queue_head_t used by the port.
  * @work: work queue entry for the line discipline waking up.
- * @open_count: number of times this port has been opened.
  * @throttled: nonzero if the read urb is inactive to throttle the device
  * @throttle_req: nonzero if the tty wants to throttle us
+ * @console: attached usb serial console
+ * @dev: pointer to the serial device
  *
  * This structure is used by the usb-serial core and drivers for the specific
  * ports of a device.
@@ -130,7 +133,8 @@ struct usb_serial {
         struct usb_device               *dev;
         struct usb_serial_driver        *type;
         struct usb_interface            *interface;
-        unsigned char                   disconnected;
+        unsigned char                   disconnected:1;
+        unsigned char                   suspending:1;
         unsigned char                   minor;
         unsigned char                   num_ports;
         unsigned char                   num_port_pointers;
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 7d3822243074..36fabb95c7d3 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -176,6 +176,11 @@ struct skb_data {	/* skb->cb is one of these */
         size_t                  length;
 };
 
+extern int usbnet_open (struct net_device *net);
+extern int usbnet_stop (struct net_device *net);
+extern int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net);
+extern void usbnet_tx_timeout (struct net_device *net);
+extern int usbnet_change_mtu (struct net_device *net, int new_mtu);
 
 extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
 extern void usbnet_defer_kevent (struct usbnet *, int);
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 5f401b644ed5..429c631d2aad 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -80,8 +80,7 @@ struct wusb_ckhdid {
         u8 data[16];
 } __attribute__((packed));
 
-const static
-struct wusb_ckhdid wusb_ckhdid_zero = { .data = { 0 } };
+static const struct wusb_ckhdid wusb_ckhdid_zero = { .data = { 0 } };
 
 #define WUSB_CKHDID_STRSIZE (3 * sizeof(struct wusb_ckhdid) + 1)
 
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index 1eea1ab68dc4..3d15fb9bc116 100644
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -96,39 +96,26 @@ enum { US_DO_ALL_FLAGS };
 #define US_PR_CBI       0x00            /* Control/Bulk/Interrupt */
 #define US_PR_CB        0x01            /* Control/Bulk w/o interrupt */
 #define US_PR_BULK      0x50            /* bulk only */
-#ifdef CONFIG_USB_STORAGE_USBAT
+
 #define US_PR_USBAT     0x80            /* SCM-ATAPI bridge */
-#endif
-#ifdef CONFIG_USB_STORAGE_SDDR09
 #define US_PR_EUSB_SDDR09       0x81    /* SCM-SCSI bridge for SDDR-09 */
-#endif
-#ifdef CONFIG_USB_STORAGE_SDDR55
 #define US_PR_SDDR55    0x82            /* SDDR-55 (made up) */
-#endif
 #define US_PR_DPCM_USB  0xf0            /* Combination CB/SDDR09 */
-#ifdef CONFIG_USB_STORAGE_FREECOM
 #define US_PR_FREECOM   0xf1            /* Freecom */
-#endif
-#ifdef CONFIG_USB_STORAGE_DATAFAB
 #define US_PR_DATAFAB   0xf2            /* Datafab chipsets */
-#endif
-#ifdef CONFIG_USB_STORAGE_JUMPSHOT
 #define US_PR_JUMPSHOT  0xf3            /* Lexar Jumpshot */
-#endif
-#ifdef CONFIG_USB_STORAGE_ALAUDA
 #define US_PR_ALAUDA    0xf4            /* Alauda chipsets */
-#endif
-#ifdef CONFIG_USB_STORAGE_KARMA
 #define US_PR_KARMA     0xf5            /* Rio Karma */
-#endif
 
 #define US_PR_DEVICE    0xff            /* Use device's value */
 
 /*
  */
+extern int usb_usual_ignore_device(struct usb_interface *intf);
+extern struct usb_device_id usb_storage_usb_ids[];
+
 #ifdef CONFIG_USB_LIBUSUAL
 
-extern struct usb_device_id storage_usb_ids[];
 extern void usb_usual_set_present(int type);
 extern void usb_usual_clear_present(int type);
 extern int usb_usual_check_type(const struct usb_device_id *, int type);
diff --git a/include/linux/utime.h b/include/linux/utime.h
index 640be6a1959e..5cdf673afbdb 100644
--- a/include/linux/utime.h
+++ b/include/linux/utime.h
@@ -4,8 +4,8 @@
 #include <linux/types.h>
 
 struct utimbuf {
-        time_t actime;
-        time_t modtime;
+        __kernel_time_t actime;
+        __kernel_time_t modtime;
 };
 
 #endif
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
deleted file mode 100644
index e26c0c86a6ea..000000000000
--- a/include/linux/video_decoder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _LINUX_VIDEO_DECODER_H
-#define _LINUX_VIDEO_DECODER_H
-
-#include <linux/types.h>
-
-#define HAVE_VIDEO_DECODER 1
-
-struct video_decoder_capability { /* this name is too long */
-        __u32   flags;
-#define VIDEO_DECODER_PAL       1       /* can decode PAL signal */
-#define VIDEO_DECODER_NTSC      2       /* can decode NTSC */
-#define VIDEO_DECODER_SECAM     4       /* can decode SECAM */
-#define VIDEO_DECODER_AUTO      8       /* can autosense norm */
-#define VIDEO_DECODER_CCIR      16      /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */
-        int     inputs;                 /* number of inputs */
-        int     outputs;                /* number of outputs */
-};
-
-/*
-DECODER_GET_STATUS returns the following flags.  The only one you need is
-DECODER_STATUS_GOOD, the others are just nice things to know.
-*/
-#define DECODER_STATUS_GOOD     1       /* receiving acceptable input */
-#define DECODER_STATUS_COLOR    2       /* receiving color information */
-#define DECODER_STATUS_PAL      4       /* auto detected */
-#define DECODER_STATUS_NTSC     8       /* auto detected */
-#define DECODER_STATUS_SECAM    16      /* auto detected */
-
-struct video_decoder_init {
-        unsigned char len;
-        const unsigned char *data;
-};
-
-#define DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability)
-#define DECODER_GET_STATUS      _IOR('d', 2, int)
-#define DECODER_SET_NORM        _IOW('d', 3, int)
-#define DECODER_SET_INPUT       _IOW('d', 4, int)       /* 0 <= input < #inputs */
-#define DECODER_SET_OUTPUT      _IOW('d', 5, int)       /* 0 <= output < #outputs */
-#define DECODER_ENABLE_OUTPUT   _IOW('d', 6, int)       /* boolean output enable control */
-#define DECODER_SET_PICTURE     _IOW('d', 7, struct video_picture)
-#define DECODER_SET_GPIO        _IOW('d', 8, int)       /* switch general purpose pin */
-#define DECODER_INIT            _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */
-#define DECODER_SET_VBI_BYPASS  _IOW('d', 10, int)      /* switch vbi bypass */
-
-#define DECODER_DUMP            _IO('d', 192)           /* debug hook */
-
-
-#endif
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h
deleted file mode 100644
index b7b6423bbb8a..000000000000
--- a/include/linux/video_encoder.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _LINUX_VIDEO_ENCODER_H
-#define _LINUX_VIDEO_ENCODER_H
-
-#include <linux/types.h>
-
-struct video_encoder_capability { /* this name is too long */
-        __u32   flags;
-#define VIDEO_ENCODER_PAL       1       /* can encode PAL signal */
-#define VIDEO_ENCODER_NTSC      2       /* can encode NTSC */
-#define VIDEO_ENCODER_SECAM     4       /* can encode SECAM */
-#define VIDEO_ENCODER_CCIR      16      /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */
-        int     inputs;                 /* number of inputs */
-        int     outputs;                /* number of outputs */
-};
-
-#define ENCODER_GET_CAPABILITIES _IOR('e', 1, struct video_encoder_capability)
-#define ENCODER_SET_NORM        _IOW('e', 2, int)
-#define ENCODER_SET_INPUT       _IOW('e', 3, int)       /* 0 <= input < #inputs */
-#define ENCODER_SET_OUTPUT      _IOW('e', 4, int)       /* 0 <= output < #outputs */
-#define ENCODER_ENABLE_OUTPUT   _IOW('e', 5, int)       /* boolean output enable control */
-
-
-#endif
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 837f392fbe97..b19eab140977 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -16,6 +16,23 @@
 #include <linux/ioctl.h>
 #include <linux/videodev2.h>
 
+#if defined(__MIN_V4L1) && defined (__KERNEL__)
+
+/*
+ * Used by those V4L2 core functions that need a minimum V4L1 support,
+ * in order to allow V4L1 Compatibilty code compilation.
+ */
+
+struct video_mbuf
+{
+        int     size;           /* Total memory to map */
+        int     frames;         /* Frames */
+        int     offsets[VIDEO_MAX_FRAME];
+};
+
+#define VIDIOCGMBUF             _IOR('v',20, struct video_mbuf)         /* Memory map buffer info */
+
+#else
 #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
 
 #define VID_TYPE_CAPTURE        1       /* Can capture */
@@ -312,6 +329,7 @@ struct video_code
 #define VID_PLAY_END_MARK               14
 
 #endif /* CONFIG_VIDEO_V4L1_COMPAT */
+#endif /* __MIN_V4L1 */
 
 #endif /* __LINUX_VIDEODEV_H */
 
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 5571dbe1c0ad..ebb2ea6b4995 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -344,6 +344,8 @@ struct v4l2_pix_format {
 #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_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_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16  YVU 4:2:2     */
 
@@ -735,6 +737,11 @@ struct v4l2_input {
 #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 */
@@ -829,6 +836,7 @@ struct v4l2_querymenu {
 #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
 
 /*  Query flag, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
@@ -879,8 +887,15 @@ enum v4l2_power_line_frequency {
 #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,
+};
+
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+31)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+32)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
@@ -1339,6 +1354,53 @@ struct v4l2_sliced_vbi_data {
 };
 
 /*
+ * 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
  */
 
@@ -1403,14 +1465,6 @@ struct v4l2_dbg_chip_ident {
         __u32 revision;    /* chip revision, chip specific */
 } __attribute__ ((packed));
 
-/* VIDIOC_G_CHIP_IDENT_OLD: Deprecated, do not use */
-struct v4l2_chip_ident_old {
-        __u32 match_type;  /* Match type */
-        __u32 match_chip;  /* Match this chip, meaning determined by match_type */
-        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-        __u32 revision;    /* chip revision, chip specific */
-};
-
 /*
  *      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
  *
@@ -1488,8 +1542,6 @@ struct v4l2_chip_ident_old {
 /* 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)
-/* This is deprecated and will go away in 2.6.30 */
-#define VIDIOC_G_CHIP_IDENT_OLD _IOWR('V', 81, struct v4l2_chip_ident_old)
 #endif
 
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 3efa86c3ecb3..cec79adbe3ea 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -4,6 +4,7 @@
  * compatible drivers/servers. */
 #include <linux/types.h>
 #include <linux/virtio_config.h>
+#include <linux/if_ether.h>
 
 /* The ID for virtio_net */
 #define VIRTIO_ID_NET   1
@@ -22,11 +23,19 @@
 #define VIRTIO_NET_F_HOST_ECN   13      /* Host can handle TSO[6] w/ ECN in. */
 #define VIRTIO_NET_F_HOST_UFO   14      /* Host can handle UFO in. */
 #define VIRTIO_NET_F_MRG_RXBUF  15      /* Host can merge receive buffers. */
+#define VIRTIO_NET_F_STATUS     16      /* virtio_net_config.status available */
+#define VIRTIO_NET_F_CTRL_VQ    17      /* Control channel available */
+#define VIRTIO_NET_F_CTRL_RX    18      /* Control channel RX mode support */
+#define VIRTIO_NET_F_CTRL_VLAN  19      /* Control channel VLAN filtering */
+
+#define VIRTIO_NET_S_LINK_UP    1       /* Link is up */
 
 struct virtio_net_config
 {
         /* The config defining mac address (if VIRTIO_NET_F_MAC) */
         __u8 mac[6];
+        /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
+        __u16 status;
 } __attribute__((packed));
 
 /* This is the first element of the scatter-gather list.  If you don't
@@ -54,4 +63,67 @@ struct virtio_net_hdr_mrg_rxbuf {
         __u16 num_buffers;      /* Number of merged rx buffers */
 };
 
+/*
+ * Control virtqueue data structures
+ *
+ * The control virtqueue expects a header in the first sg entry
+ * and an ack/status response in the last entry.  Data for the
+ * command goes in between.
+ */
+struct virtio_net_ctrl_hdr {
+        __u8 class;
+        __u8 cmd;
+} __attribute__((packed));
+
+typedef __u8 virtio_net_ctrl_ack;
+
+#define VIRTIO_NET_OK     0
+#define VIRTIO_NET_ERR    1
+
+/*
+ * Control the RX mode, ie. promisucous and allmulti.  PROMISC and
+ * ALLMULTI commands require an "out" sg entry containing a 1 byte
+ * state value, zero = disable, non-zero = enable.  These commands
+ * are supported with the VIRTIO_NET_F_CTRL_RX feature.
+ */
+#define VIRTIO_NET_CTRL_RX    0
+ #define VIRTIO_NET_CTRL_RX_PROMISC      0
+ #define VIRTIO_NET_CTRL_RX_ALLMULTI     1
+
+/*
+ * Control the MAC filter table.
+ *
+ * The MAC filter table is managed by the hypervisor, the guest should
+ * assume the size is infinite.  Filtering should be considered
+ * non-perfect, ie. based on hypervisor resources, the guest may
+ * received packets from sources not specified in the filter list.
+ *
+ * In addition to the class/cmd header, the TABLE_SET command requires
+ * two out scatterlists.  Each contains a 4 byte count of entries followed
+ * by a concatenated byte stream of the ETH_ALEN MAC addresses.  The
+ * first sg list contains unicast addresses, the second is for multicast.
+ * This functionality is present if the VIRTIO_NET_F_CTRL_RX feature
+ * is available.
+ */
+struct virtio_net_ctrl_mac {
+        __u32 entries;
+        __u8 macs[][ETH_ALEN];
+} __attribute__((packed));
+
+#define VIRTIO_NET_CTRL_MAC    1
+ #define VIRTIO_NET_CTRL_MAC_TABLE_SET        0
+
+/*
+ * Control VLAN filtering
+ *
+ * The VLAN filter table is controlled via a simple ADD/DEL interface.
+ * VLAN IDs not added may be filterd by the hypervisor.  Del is the
+ * opposite of add.  Both commands expect an out entry containing a 2
+ * byte VLAN ID.  VLAN filterting is available with the
+ * VIRTIO_NET_F_CTRL_VLAN feature bit.
+ */
+#define VIRTIO_NET_CTRL_VLAN       2
+ #define VIRTIO_NET_CTRL_VLAN_ADD             0
+ #define VIRTIO_NET_CTRL_VLAN_DEL             1
+
 #endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 9c0890c7a06a..a43ebec3a7b9 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -95,6 +95,9 @@ extern struct vm_struct *remove_vm_area(const void *addr);
 
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
                         struct page ***pages);
+extern int map_kernel_range_noflush(unsigned long start, unsigned long size,
+                                    pgprot_t prot, struct page **pages);
+extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long size);
 extern void unmap_kernel_range(unsigned long addr, unsigned long size);
 
 /* Allocate/destroy a 'vmalloc' VM area. */
@@ -110,5 +113,6 @@ extern long vwrite(char *buf, char *addr, unsigned long count);
  */
 extern rwlock_t vmlist_lock;
 extern struct vm_struct *vmlist;
+extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);
 
 #endif /* _LINUX_VMALLOC_H */
diff --git a/include/linux/wait.h b/include/linux/wait.h
index a210ede73b56..bc024632f365 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -135,8 +135,11 @@ static inline void __remove_wait_queue(wait_queue_head_t *head,
 void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
                         int nr_exclusive, int sync, void *key);
 void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key);
-extern void __wake_up_locked(wait_queue_head_t *q, unsigned int mode);
-extern void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr);
+void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key);
+void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode, int nr,
+                        void *key);
+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode);
+void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr);
 void __wake_up_bit(wait_queue_head_t *, void *, int);
 int __wait_on_bit(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
 int __wait_on_bit_lock(wait_queue_head_t *, struct wait_bit_queue *, int (*)(void *), unsigned);
@@ -155,21 +158,17 @@ wait_queue_head_t *bit_waitqueue(void *, int);
 #define wake_up_interruptible_all(x)    __wake_up(x, TASK_INTERRUPTIBLE, 0, NULL)
 #define wake_up_interruptible_sync(x)   __wake_up_sync((x), TASK_INTERRUPTIBLE, 1)
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
 /*
- * macro to avoid include hell
+ * Wakeup macros to be used to report events to the targets.
  */
-#define wake_up_nested(x, s)                                            \
-do {                                                                    \
-        unsigned long flags;                                            \
-                                                                        \
-        spin_lock_irqsave_nested(&(x)->lock, flags, (s));               \
-        wake_up_locked(x);                                              \
-        spin_unlock_irqrestore(&(x)->lock, flags);                      \
-} while (0)
-#else
-#define wake_up_nested(x, s)            wake_up(x)
-#endif
+#define wake_up_poll(x, m)                              \
+        __wake_up(x, TASK_NORMAL, 1, (void *) (m))
+#define wake_up_locked_poll(x, m)                               \
+        __wake_up_locked_key((x), TASK_NORMAL, (void *) (m))
+#define wake_up_interruptible_poll(x, m)                        \
+        __wake_up(x, TASK_INTERRUPTIBLE, 1, (void *) (m))
+#define wake_up_interruptible_sync_poll(x, m)                           \
+        __wake_up_sync_key((x), TASK_INTERRUPTIBLE, 1, (void *) (m))
 
 #define __wait_event(wq, condition)                                     \
 do {                                                                    \
@@ -441,13 +440,15 @@ void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait,
 int autoremove_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
 int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
 
-#define DEFINE_WAIT(name)                                               \
+#define DEFINE_WAIT_FUNC(name, function)                                \
         wait_queue_t name = {                                           \
                 .private        = current,                              \
-                .func           = autoremove_wake_function,             \
+                .func           = function,                             \
                 .task_list      = LIST_HEAD_INIT((name).task_list),     \
         }
 
+#define DEFINE_WAIT(name) DEFINE_WAIT_FUNC(name, autoremove_wake_function)
+
 #define DEFINE_WAIT_BIT(name, word, bit)                                \
         struct wait_bit_queue name = {                                  \
                 .key = __WAIT_BIT_KEY_INITIALIZER(word, bit),           \
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h
index ba0c49399a83..c703e0340423 100644
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
@@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size,
                 WARN_ON(1);
         } else
                 snprintf(head, head_size, "%s %s: ",
-                         dev_driver_string(dev), dev->bus_id);
+                         dev_driver_string(dev), dev_name(dev));
 }
 
 
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h
index 74198f5bb4dc..d5148a7889a6 100644
--- a/include/linux/wimax/i2400m.h
+++ b/include/linux/wimax/i2400m.h
@@ -207,6 +207,7 @@ enum i2400m_pt {
         I2400M_PT_TRACE,        /* For device debug */
         I2400M_PT_RESET_WARM,   /* device reset */
         I2400M_PT_RESET_COLD,   /* USB[transport] reset, like reconnect */
+        I2400M_PT_EDATA,        /* Extended RX data */
         I2400M_PT_ILLEGAL
 };
 
@@ -221,6 +222,48 @@ struct i2400m_pl_data_hdr {
 } __attribute__((packed));
 
 
+/*
+ * Payload for an extended data packet
+ *
+ * New in fw v1.4
+ *
+ * @reorder: if this payload has to be reorder or not (and how)
+ * @cs: the type of data in the packet, as defined per (802.16e
+ *     T11.13.19.1). Currently only 2 (IPv4 packet) supported.
+ *
+ * This is prefixed to each and every INCOMING DATA packet.
+ */
+struct i2400m_pl_edata_hdr {
+        __le32 reorder;         /* bits defined in i2400m_ro */
+        __u8 cs;
+        __u8 reserved[11];
+} __attribute__((packed));
+
+enum i2400m_cs {
+        I2400M_CS_IPV4_0 = 0,
+        I2400M_CS_IPV4 = 2,
+};
+
+enum i2400m_ro {
+        I2400M_RO_NEEDED     = 0x01,
+        I2400M_RO_TYPE       = 0x03,
+        I2400M_RO_TYPE_SHIFT = 1,
+        I2400M_RO_CIN        = 0x0f,
+        I2400M_RO_CIN_SHIFT  = 4,
+        I2400M_RO_FBN        = 0x07ff,
+        I2400M_RO_FBN_SHIFT  = 8,
+        I2400M_RO_SN         = 0x07ff,
+        I2400M_RO_SN_SHIFT   = 21,
+};
+
+enum i2400m_ro_type {
+        I2400M_RO_TYPE_RESET = 0,
+        I2400M_RO_TYPE_PACKET,
+        I2400M_RO_TYPE_WS,
+        I2400M_RO_TYPE_PACKET_WS,
+};
+
+
 /* Misc constants */
 enum {
         I2400M_PL_PAD = 16,     /* Payload data size alignment */
@@ -381,6 +424,9 @@ enum i2400m_tlv {
         I2400M_TLV_RF_STATUS = 163,
         I2400M_TLV_DEVICE_RESET_TYPE = 132,
         I2400M_TLV_CONFIG_IDLE_PARAMETERS = 601,
+        I2400M_TLV_CONFIG_IDLE_TIMEOUT = 611,
+        I2400M_TLV_CONFIG_D2H_DATA_FORMAT = 614,
+        I2400M_TLV_CONFIG_DL_HOST_REORDER = 615,
 };
 
 
@@ -509,4 +555,27 @@ struct i2400m_tlv_media_status {
         __le32 media_status;
 } __attribute__((packed));
 
+
+/* New in v1.4 */
+struct i2400m_tlv_config_idle_timeout {
+        struct i2400m_tlv_hdr hdr;
+        __le32 timeout; /* 100 to 300000 ms [5min], 100 increments
+                         * 0 disabled */
+} __attribute__((packed));
+
+/* New in v1.4 -- for backward compat, will be removed */
+struct i2400m_tlv_config_d2h_data_format {
+        struct i2400m_tlv_hdr hdr;
+        __u8 format;            /* 0 old format, 1 enhanced */
+        __u8 reserved[3];
+} __attribute__((packed));
+
+/* New in v1.4 */
+struct i2400m_tlv_config_dl_host_reorder {
+        struct i2400m_tlv_hdr hdr;
+        __u8 reorder;           /* 0 disabled, 1 enabled */
+        __u8 reserved[3];
+} __attribute__((packed));
+
+
 #endif /* #ifndef __LINUX__WIMAX__I2400M_H__ */
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index d7958f9b52cb..cb24204851f7 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -577,18 +577,22 @@
 #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 and IW_AUTH_GROUP_CIPHER values (bit field) */
+/* 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
@@ -604,6 +608,11 @@
 #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 */
@@ -612,6 +621,7 @@
 #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
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 3cd51e579ab1..13e1adf55c4c 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -41,6 +41,11 @@ struct delayed_work {
         struct timer_list timer;
 };
 
+static inline struct delayed_work *to_delayed_work(struct work_struct *work)
+{
+        return container_of(work, struct delayed_work, work);
+}
+
 struct execute_work {
         struct work_struct work;
 };
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 7300ecdc480c..9c1ed1fb6ddb 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -109,8 +109,8 @@ extern int dirty_background_ratio;
 extern unsigned long dirty_background_bytes;
 extern int vm_dirty_ratio;
 extern unsigned long vm_dirty_bytes;
-extern int dirty_writeback_interval;
-extern int dirty_expire_interval;
+extern unsigned int dirty_writeback_interval;
+extern unsigned int dirty_expire_interval;
 extern int vm_highmem_is_dirtyable;
 extern int block_dump;
 extern int laptop_mode;
@@ -168,6 +168,8 @@ void writeback_set_ratelimit(void);
 /* pdflush.c */
 extern int nr_pdflush_threads;  /* Global so it can be exported to sysctl
                                    read-only. */
+extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */
+extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */
 
 
 #endif          /* WRITEBACK_H */
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 52f3abd453a1..2d4ec15abaca 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -58,7 +58,7 @@ struct xfrm_selector
         __u8    prefixlen_s;
         __u8    proto;
         int     ifindex;
-        uid_t   user;
+        __kernel_uid32_t        user;
 };
 
 #define XFRM_INF (~(__u64)0)
diff --git a/include/media/bt819.h b/include/media/bt819.h
new file mode 100644
index 000000000000..38f666bde77a
--- /dev/null
+++ b/include/media/bt819.h
@@ -0,0 +1,33 @@
+/*
+    bt819.h - bt819 notifications
+
+    Copyright (C) 2009 Hans Verkuil (hverkuil@xs4all.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _BT819_H_
+#define _BT819_H_
+
+#include <linux/ioctl.h>
+
+/* v4l2_device notifications. */
+
+/* Needed to reset the FIFO buffer when changing the input
+   or the video standard. */
+#define BT819_FIFO_RESET_LOW    _IO('b', 0)
+#define BT819_FIFO_RESET_HIGH   _IO('b', 1)
+
+#endif
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index 9ec4d5889ef5..9ebe8558b9b6 100644
--- a/include/media/cx2341x.h
+++ b/include/media/cx2341x.h
@@ -1,5 +1,5 @@
 /*
-    cx23415/6 header containing common defines.
+    cx23415/6/8 header containing common defines.
 
     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
@@ -28,6 +28,7 @@ enum cx2341x_port {
 enum cx2341x_cap {
         CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
         CX2341X_CAP_HAS_TS         = 1 << 1,
+        CX2341X_CAP_HAS_AC3        = 1 << 2,
 };
 
 struct cx2341x_mpeg_params {
@@ -47,11 +48,12 @@ struct cx2341x_mpeg_params {
         enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq;
         enum v4l2_mpeg_audio_encoding audio_encoding;
         enum v4l2_mpeg_audio_l2_bitrate audio_l2_bitrate;
+        enum v4l2_mpeg_audio_ac3_bitrate audio_ac3_bitrate;
         enum v4l2_mpeg_audio_mode audio_mode;
         enum v4l2_mpeg_audio_mode_extension audio_mode_extension;
         enum v4l2_mpeg_audio_emphasis audio_emphasis;
         enum v4l2_mpeg_audio_crc audio_crc;
-        u16 audio_properties;
+        u32 audio_properties;
         u16 audio_mute;
 
         /* video */
diff --git a/include/media/cx25840.h b/include/media/cx25840.h
index db431d513f2f..2c3fbaa33f74 100644
--- a/include/media/cx25840.h
+++ b/include/media/cx25840.h
@@ -21,6 +21,18 @@
 #ifndef _CX25840_H_
 #define _CX25840_H_
 
+/* Note that the cx25840 driver requires that the bridge driver calls the
+   v4l2_subdev's init operation in order to load the driver's firmware.
+   Without this the audio standard detection will fail and you will
+   only get mono.
+
+   Since loading the firmware is often problematic when the driver is
+   compiled into the kernel I recommend postponing calling this function
+   until the first open of the video device. Another reason for
+   postponing it is that loading this firmware takes a long time (seconds)
+   due to the slow i2c bus speed. So it will speed up the boot process if
+   you can avoid loading the fw as long as the video device isn't used. */
+
 enum cx25840_video_input {
         /* Composite video inputs In1-In8 */
         CX25840_COMPOSITE1 = 1,
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 5bf2ea00678c..7b5b91f60425 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -111,6 +111,7 @@ extern IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_avermedia[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_avermedia_m135a[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_avermedia_cardbus[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE];
@@ -159,6 +160,8 @@ extern IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE];
 #endif
 
 /*
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 00fa57eb9fde..07963d705400 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -14,8 +14,7 @@ struct IR_i2c {
         /* Used to avoid fast repeating */
         unsigned char          old;
 
-        struct work_struct     work;
-        struct timer_list      timer;
+        struct delayed_work    work;
         char                   phys[32];
         int                    (*get_key)(struct IR_i2c*, u32*, u32*);
 };
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 6ab854931c05..90cf22ada8b4 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to
-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:
 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 
-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:
 
    1) which SCART input to use for each SCART output
 
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index e391d55edb95..30d9629198ef 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -13,9 +13,49 @@
 
 #include <media/soc_camera.h>
 
+/* for flags */
+#define OV772X_FLAG_VFLIP     0x00000001 /* Vertical flip image */
+#define OV772X_FLAG_HFLIP     0x00000002 /* Horizontal flip image */
+
+/*
+ * for Edge ctrl
+ *
+ * strength also control Auto or Manual Edge Control Mode
+ * see also OV772X_MANUAL_EDGE_CTRL
+ */
+struct ov772x_edge_ctrl {
+        unsigned char strength;
+        unsigned char threshold;
+        unsigned char upper;
+        unsigned char lower;
+};
+
+#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
+#define EDGE_STRENGTH_MASK      0x1F
+#define EDGE_THRESHOLD_MASK     0x0F
+#define EDGE_UPPER_MASK         0xFF
+#define EDGE_LOWER_MASK         0xFF
+
+#define OV772X_AUTO_EDGECTRL(u, l)      \
+{                                       \
+        .upper = (u & EDGE_UPPER_MASK), \
+        .lower = (l & EDGE_LOWER_MASK), \
+}
+
+#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
+{                                                                       \
+        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
+        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+}
+
+/*
+ * ov772x camera info
+ */
 struct ov772x_camera_info {
         unsigned long          buswidth;
+        unsigned long          flags;
         struct soc_camera_link link;
+        struct ov772x_edge_ctrl edgectrl;
 };
 
 #endif /* __OV772X_H__ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index c5a6e22a4b37..7a9f76ecbbbd 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -13,11 +13,12 @@
 #include <linux/stringify.h>
 #include <linux/mutex.h>
 #include <linux/scatterlist.h>
+#include <media/v4l2-device.h>
 
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
 
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000600   /* 0.6.0 */
 
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
@@ -110,6 +111,8 @@ struct saa7146_dev
 
         struct list_head                item;
 
+        struct v4l2_device              v4l2_dev;
+
         /* different device locks */
         spinlock_t                      slock;
         struct mutex                    lock;
@@ -145,6 +148,11 @@ struct saa7146_dev
         struct saa7146_dma              d_rps1;
 };
 
+static inline struct saa7146_dev *to_saa7146_dev(struct v4l2_device *v4l2_dev)
+{
+        return container_of(v4l2_dev, struct saa7146_dev, v4l2_dev);
+}
+
 /* from saa7146_i2c.c */
 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
 
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index c8d0b23fde29..eed5fccc83f3 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -150,16 +150,6 @@ struct saa7146_vv
         unsigned int resources; /* resource management for device */
 };
 
-#define SAA7146_EXCLUSIVE       0x1
-#define SAA7146_BEFORE          0x2
-#define SAA7146_AFTER           0x4
-
-struct saa7146_extension_ioctls
-{
-        unsigned int    cmd;
-        int             flags;
-};
-
 /* flags */
 #define SAA7146_USE_PORT_B_FOR_VBI      0x2     /* use input port b for vbi hardware bug workaround */
 
@@ -176,8 +166,10 @@ struct saa7146_ext_vv
         int num_stds;
         int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
 
-        struct saa7146_extension_ioctls *ioctls;
-        long (*ioctl)(struct saa7146_fh *, unsigned int cmd, void *arg);
+        /* the extension can override this */
+        struct v4l2_ioctl_ops ops;
+        /* pointer to the saa7146 core ops */
+        const struct v4l2_ioctl_ops *core_ops;
 
         struct v4l2_file_operations vbi_fops;
 };
@@ -213,6 +205,7 @@ void saa7146_set_hps_source_and_sync(struct saa7146_dev *saa, int source, int sy
 void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
 
 /* from saa7146_video.c */
+extern const struct v4l2_ioctl_ops saa7146_video_ioctl_ops;
 extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h
index b5dbefea3740..0f3524cff435 100644
--- a/include/media/sh_mobile_ceu.h
+++ b/include/media/sh_mobile_ceu.h
@@ -1,10 +1,11 @@
 #ifndef __ASM_SH_MOBILE_CEU_H__
 #define __ASM_SH_MOBILE_CEU_H__
 
-#include <media/soc_camera.h>
+#define SH_CEU_FLAG_USE_8BIT_BUS        (1 << 0) /* use  8bit bus width */
+#define SH_CEU_FLAG_USE_16BIT_BUS       (1 << 1) /* use 16bit bus width */
 
 struct sh_mobile_ceu_info {
-        unsigned long flags; /* SOCAM_... */
+        unsigned long flags;
 };
 
 #endif /* __ASM_SH_MOBILE_CEU_H__ */
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 7440d9250665..37013688af44 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -45,6 +45,7 @@ struct soc_camera_device {
         int num_formats;
         struct soc_camera_format_xlate *user_formats;
         int num_user_formats;
+        enum v4l2_field field;          /* Preserve field over close() */
         struct module *owner;
         void *host_priv;                /* Per-device host private data */
         /* soc_camera.c private count. Only accessed with .video_lock held */
@@ -74,7 +75,8 @@ struct soc_camera_host_ops {
         int (*resume)(struct soc_camera_device *);
         int (*get_formats)(struct soc_camera_device *, int,
                            struct soc_camera_format_xlate *);
-        int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
+        int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
+        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 *,
                               struct soc_camera_device *);
@@ -93,13 +95,18 @@ struct soc_camera_host_ops {
 struct soc_camera_link {
         /* Camera bus id, used to match a camera and a bus */
         int bus_id;
-        /* GPIO number to switch between 8 and 10 bit modes */
-        unsigned int gpio;
         /* Per camera SOCAM_SENSOR_* bus flags */
         unsigned long flags;
         /* Optional callbacks to power on or off and reset the sensor */
         int (*power)(struct device *, int);
         int (*reset)(struct device *);
+        /*
+         * some platforms may support different data widths than the sensors
+         * native ones due to different data line routing. Let the board code
+         * overwrite the width flags.
+         */
+        int (*set_bus_param)(struct soc_camera_link *, unsigned long flags);
+        unsigned long (*query_bus_param)(struct soc_camera_link *);
 };
 
 static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
@@ -159,7 +166,8 @@ struct soc_camera_ops {
         int (*release)(struct soc_camera_device *);
         int (*start_capture)(struct soc_camera_device *);
         int (*stop_capture)(struct soc_camera_device *);
-        int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
+        int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
+        int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
         int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
         unsigned long (*query_bus_param)(struct soc_camera_device *);
         int (*set_bus_param)(struct soc_camera_device *, unsigned long);
@@ -239,15 +247,19 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
 static inline unsigned long soc_camera_bus_param_compatible(
                         unsigned long camera_flags, unsigned long bus_flags)
 {
-        unsigned long common_flags, hsync, vsync, pclk;
+        unsigned long common_flags, hsync, vsync, pclk, data, buswidth, mode;
 
         common_flags = camera_flags & bus_flags;
 
         hsync = common_flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);
         vsync = common_flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);
         pclk = common_flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);
+        data = common_flags & (SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW);
+        mode = common_flags & (SOCAM_MASTER | SOCAM_SLAVE);
+        buswidth = common_flags & SOCAM_DATAWIDTH_MASK;
 
-        return (!hsync || !vsync || !pclk) ? 0 : common_flags;
+        return (!hsync || !vsync || !pclk || !data || !mode || !buswidth) ? 0 :
+                common_flags;
 }
 
 extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
diff --git a/include/media/tvaudio.h b/include/media/tvaudio.h
index 6915aafc875a..1ac8184693f8 100644
--- a/include/media/tvaudio.h
+++ b/include/media/tvaudio.h
@@ -21,10 +21,29 @@
 #ifndef _TVAUDIO_H
 #define _TVAUDIO_H
 
+#include <media/i2c-addr.h>
+
 /* The tvaudio module accepts the following inputs: */
 #define TVAUDIO_INPUT_TUNER  0
 #define TVAUDIO_INPUT_RADIO  1
 #define TVAUDIO_INPUT_EXTERN 2
 #define TVAUDIO_INPUT_INTERN 3
 
+static inline const unsigned short *tvaudio_addrs(void)
+{
+        static const unsigned short addrs[] = {
+                I2C_ADDR_TDA8425   >> 1,
+                I2C_ADDR_TEA6300   >> 1,
+                I2C_ADDR_TEA6420   >> 1,
+                I2C_ADDR_TDA9840   >> 1,
+                I2C_ADDR_TDA985x_L >> 1,
+                I2C_ADDR_TDA985x_H >> 1,
+                I2C_ADDR_TDA9874   >> 1,
+                I2C_ADDR_PIC16C54  >> 1,
+                I2C_CLIENT_END
+        };
+
+        return addrs;
+}
+
 #endif
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 9aaf652b20ef..1be461a29077 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -37,10 +37,8 @@ enum {
         /* module saa7110: just ident 100 */
         V4L2_IDENT_SAA7110 = 100,
 
-        /* module saa7111: just ident 101 */
+        /* module saa7115: reserved range 101-149 */
         V4L2_IDENT_SAA7111 = 101,
-
-        /* module saa7115: reserved range 102-149 */
         V4L2_IDENT_SAA7113 = 103,
         V4L2_IDENT_SAA7114 = 104,
         V4L2_IDENT_SAA7115 = 105,
@@ -63,44 +61,96 @@ enum {
         V4L2_IDENT_OV7720 = 251,
         V4L2_IDENT_OV7725 = 252,
 
-        /* Conexant MPEG encoder/decoders: reserved range 410-420 */
+        /* module saa7146: reserved range 300-309 */
+        V4L2_IDENT_SAA7146 = 300,
+
+        /* Conexant MPEG encoder/decoders: reserved range 400-420 */
+        V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
         V4L2_IDENT_CX23415 = 415,
         V4L2_IDENT_CX23416 = 416,
         V4L2_IDENT_CX23418 = 418,
 
+        /* module au0828 */
+        V4L2_IDENT_AU0828 = 828,
+
+        /* module indycam: just ident 2000 */
+        V4L2_IDENT_INDYCAM = 2000,
+
+        /* module bt819: reserved range 810-819 */
+        V4L2_IDENT_BT815A = 815,
+        V4L2_IDENT_BT817A = 817,
+        V4L2_IDENT_BT819A = 819,
+
+        /* module bt856: just ident 856 */
+        V4L2_IDENT_BT856 = 856,
+
+        /* module bt866: just ident 866 */
+        V4L2_IDENT_BT866 = 866,
+
+        /* module ks0127: reserved range 1120-1129 */
+        V4L2_IDENT_KS0122S = 1122,
+        V4L2_IDENT_KS0127  = 1127,
+        V4L2_IDENT_KS0127B = 1128,
+
         /* module vp27smpx: just ident 2700 */
         V4L2_IDENT_VP27SMPX = 2700,
 
+        /* module vpx3220: reserved range: 3210-3229 */
+        V4L2_IDENT_VPX3214C = 3214,
+        V4L2_IDENT_VPX3216B = 3216,
+        V4L2_IDENT_VPX3220A = 3220,
+
         /* module tvp5150 */
         V4L2_IDENT_TVP5150 = 5150,
 
+        /* module saa5246a: just ident 5246 */
+        V4L2_IDENT_SAA5246A = 5246,
+
+        /* module saa5249: just ident 5249 */
+        V4L2_IDENT_SAA5249 = 5249,
+
         /* module cs5345: just ident 5345 */
         V4L2_IDENT_CS5345 = 5345,
 
+        /* module tea6415c: just ident 6415 */
+        V4L2_IDENT_TEA6415C = 6415,
+
+        /* module tea6420: just ident 6420 */
+        V4L2_IDENT_TEA6420 = 6420,
+
+        /* module saa6588: just ident 6588 */
+        V4L2_IDENT_SAA6588 = 6588,
+
         /* module saa6752hs: reserved range 6750-6759 */
         V4L2_IDENT_SAA6752HS = 6752,
         V4L2_IDENT_SAA6752HS_AC3 = 6753,
 
+        /* module adv7170: just ident 7170 */
+        V4L2_IDENT_ADV7170 = 7170,
+
+        /* module adv7175: just ident 7175 */
+        V4L2_IDENT_ADV7175 = 7175,
+
+        /* module saa7185: just ident 7185 */
+        V4L2_IDENT_SAA7185 = 7185,
+
+        /* module saa7191: just ident 7191 */
+        V4L2_IDENT_SAA7191 = 7191,
+
         /* module wm8739: just ident 8739 */
         V4L2_IDENT_WM8739 = 8739,
 
         /* module wm8775: just ident 8775 */
         V4L2_IDENT_WM8775 = 8775,
 
-        /* module tw9910: just ident 9910 */
-        V4L2_IDENT_TW9910 = 9910,
-
-        /* module cs53132a: just ident 53132 */
-        V4L2_IDENT_CS53l32A = 53132,
-
-        /* module upd64031a: just ident 64031 */
-        V4L2_IDENT_UPD64031A = 64031,
+        /* module tda9840: just ident 9840 */
+        V4L2_IDENT_TDA9840 = 9840,
 
-        /* module upd64083: just ident 64083 */
-        V4L2_IDENT_UPD64083 = 64083,
+        /* module cafe_ccic, just ident 8801 */
+        V4L2_IDENT_CAFE = 8801,
 
-        /* module m52790: just ident 52790 */
-        V4L2_IDENT_M52790 = 52790,
+        /* module tw9910: just ident 9910 */
+        V4L2_IDENT_TW9910 = 9910,
 
         /* module msp3400: reserved range 34000-34999 and 44000-44999 */
         V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
@@ -178,6 +228,18 @@ enum {
         V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
         V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
         V4L2_IDENT_MT9T031              = 45020,
+
+        /* module cs53132a: just ident 53132 */
+        V4L2_IDENT_CS53l32A = 53132,
+
+        /* module upd64031a: just ident 64031 */
+        V4L2_IDENT_UPD64031A = 64031,
+
+        /* module upd64083: just ident 64083 */
+        V4L2_IDENT_UPD64083 = 64083,
+
+        /* module m52790: just ident 52790 */
+        V4L2_IDENT_M52790 = 52790,
 };
 
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 95e74f1874e1..c48c24e4d0fa 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -102,11 +102,15 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
 const char *v4l2_ctrl_get_name(u32 id);
 const char **v4l2_ctrl_get_menu(u32 id);
 int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);
-int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl);
 int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu,
                 struct v4l2_queryctrl *qctrl, const char **menu_items);
 #define V4L2_CTRL_MENU_IDS_END (0xffffffff)
 int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids);
+
+/* Note: ctrl_classes points to an array of u32 pointers. Each u32 array is a
+   0-terminated array of control IDs. Each array must be sorted low to high
+   and belong to the same control class. The array of u32 pointers must also
+   be sorted, from low class IDs to high class IDs. */
 u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 
 /* ------------------------------------------------------------------------- */
@@ -121,7 +125,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
 
 /* ------------------------------------------------------------------------- */
 
-/* Helper function for I2C legacy drivers */
+/* I2C Helper functions */
 
 struct i2c_driver;
 struct i2c_adapter;
@@ -131,157 +135,62 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct v4l2_subdev_ops;
 
-int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-                const char *name,
-                int (*probe)(struct i2c_client *, const struct i2c_device_id *));
 
 /* Load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type, u8 addr);
 /* Probe and load an i2c module and return an initialized v4l2_subdev struct.
    Only call request_module if module_name != NULL.
    The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                 const char *module_name, const char *client_type,
                 const unsigned short *addrs);
+/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr);
 /* Initialize an 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. */
+unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd);
+
+enum v4l2_i2c_tuner_type {
+        ADDRS_RADIO,    /* Radio tuner addresses */
+        ADDRS_DEMOD,    /* Demod tuner addresses */
+        ADDRS_TV,       /* TV tuner addresses */
+        /* TV tuner addresses if demod is present, this excludes
+           addresses used by the demodulator from the list of
+           candidates. */
+        ADDRS_TV_WITH_DEMOD,
+};
+/* Return a list of I2C tuner addresses to probe. Use only if the tuner
+   addresses are unknown. */
+const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
 
 /* ------------------------------------------------------------------------- */
 
-/* Internal ioctls */
-
-/* VIDIOC_INT_DECODE_VBI_LINE */
-struct v4l2_decode_vbi_line {
-        u32 is_second_field;    /* Set to 0 for the first (odd) field,
-                                   set to 1 for the second (even) field. */
-        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
-                                   On exit points to the start of the payload. */
-        u32 line;               /* Line number of the sliced VBI data (1-23) */
-        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
-};
+/* Note: these remaining ioctls/structs should be removed as well, but they are
+   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
+   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
+   is needed in those modules. */
 
+/* s_config */
 struct v4l2_priv_tun_config {
         int tuner;
         void *priv;
 };
-
-/* audio ioctls */
-
-/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
-#define AUDC_SET_RADIO        _IO('d',88)
-
-/* tuner ioctls */
-
-/* Sets tuner type and its I2C addr */
-#define TUNER_SET_TYPE_ADDR          _IOW('d', 90, int)
-
-/* Puts tuner on powersaving state, disabling it, except for i2c. To be replaced
-   by VIDIOC_INT_S_STANDBY. */
-#define TUNER_SET_STANDBY            _IOW('d', 91, int)
-
-/* Sets tda9887 specific stuff, like port1, port2 and qss */
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
 
-/* Switch the tuner to a specific tuner mode. Replacement of AUDC_SET_RADIO */
-#define VIDIOC_INT_S_TUNER_MODE      _IOW('d', 93, enum v4l2_tuner_type)
-
-/* Generic standby command. Passing -1 (all bits set to 1) will put the whole
-   chip into standby mode, value 0 will make the chip fully active. Specific
-   bits can be used by certain chips to enable/disable specific subsystems.
-   Replacement of TUNER_SET_STANDBY. */
-#define VIDIOC_INT_S_STANDBY         _IOW('d', 94, u32)
-
-/* 100, 101 used by  VIDIOC_DBG_[SG]_REGISTER */
-
-/* Generic reset command. The argument selects which subsystems to reset.
-   Passing 0 will always reset the whole chip. */
 #define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
 
-/* Set the frequency (in Hz) of the audio clock output.
-   Used to slave an audio processor to the video decoder, ensuring that audio
-   and video remain synchronized.
-   Usual values for the frequency are 48000, 44100 or 32000 Hz.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_AUDIO_CLOCK_FREQ     _IOW ('d', 103, u32)
-
-/* Video decoders that support sliced VBI need to implement this ioctl.
-   Field p of the v4l2_sliced_vbi_line struct is set to the start of the VBI
-   data that was generated by the decoder. The driver then parses the sliced
-   VBI data and sets the other fields in the struct accordingly. The pointer p
-   is updated to point to the start of the payload which can be copied
-   verbatim into the data field of the v4l2_sliced_vbi_data struct. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_DECODE_VBI_LINE      _IOWR('d', 104, struct v4l2_decode_vbi_line)
-
-/* Used to generate VBI signals on a video signal. v4l2_sliced_vbi_data is
-   filled with the data packets that should be output. Note that if you set
-   the line field to 0, then that VBI signal is disabled. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_S_VBI_DATA           _IOW ('d', 105, struct v4l2_sliced_vbi_data)
-
-/* Used to obtain the sliced VBI packet from a readback register. Not all
-   video decoders support this. If no data is available because the readback
-   register contains invalid or erroneous data -EIO is returned. Note that
-   you must fill in the 'id' member and the 'field' member (to determine
-   whether CC data from the first or second field should be obtained). */
-#define VIDIOC_INT_G_VBI_DATA           _IOWR('d', 106, struct v4l2_sliced_vbi_data)
-
-/* Sets I2S speed in bps. This is used to provide a standard way to select I2S
-   clock used by driving digital audio streams at some board designs.
-   Usual values for the frequency are 1024000 and 2048000.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_I2S_CLOCK_FREQ       _IOW ('d', 108, u32)
-
-/* Routing definition, device dependent. It specifies which inputs (if any)
-   should be routed to which outputs (if any). */
 struct v4l2_routing {
         u32 input;
         u32 output;
 };
 
-/* These internal commands should be used to define the inputs and outputs
-   of an audio/video chip. They will replace the v4l2 API commands
-   VIDIOC_S/G_INPUT, VIDIOC_S/G_OUTPUT, VIDIOC_S/G_AUDIO and VIDIOC_S/G_AUDOUT
-   that are meant to be used by the user.
-   The internal commands should be used to switch inputs/outputs
-   because only the driver knows how to map a 'Television' input to the precise
-   input/output routing of an A/D converter, or a DSP, or a video digitizer.
-   These four commands should only be sent directly to an i2c device, they
-   should not be broadcast as the routing is very device specific. */
-#define VIDIOC_INT_S_AUDIO_ROUTING      _IOW ('d', 109, struct v4l2_routing)
-#define VIDIOC_INT_G_AUDIO_ROUTING      _IOR ('d', 110, struct v4l2_routing)
-#define VIDIOC_INT_S_VIDEO_ROUTING      _IOW ('d', 111, struct v4l2_routing)
-#define VIDIOC_INT_G_VIDEO_ROUTING      _IOR ('d', 112, struct v4l2_routing)
-
-struct v4l2_crystal_freq {
-        u32 freq;       /* frequency in Hz of the crystal */
-        u32 flags;      /* device specific flags */
-};
-
-/* Sets the frequency of the crystal used to generate the clocks.
-   An extra flags field allows device specific configuration regarding
-   clock frequency dividers, etc. If not used, then set flags to 0.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_S_CRYSTAL_FREQ       _IOW('d', 113, struct v4l2_crystal_freq)
-
-/* Initialize the sensor registors to some sort of reasonable
-   default values. */
-#define VIDIOC_INT_INIT                 _IOW('d', 114, u32)
-
-/* Set v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_S_STD_OUTPUT         _IOW('d', 115, v4l2_std_id)
-
-/* Get v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_G_STD_OUTPUT         _IOW('d', 116, v4l2_std_id)
-
-/* Set GPIO pins. Very simple right now, might need to be extended with
-   a v4l2_gpio struct if a direction is also needed. */
-#define VIDIOC_INT_S_GPIO               _IOW('d', 117, u32)
-
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index e36faab8459b..2058dd45e915 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,6 +40,8 @@ struct v4l2_file_operations {
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
         long (*ioctl) (struct file *, unsigned int, unsigned long);
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
+        unsigned long (*get_unmapped_area) (struct file *, unsigned long,
+                                unsigned long, unsigned long, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
         int (*open) (struct file *);
         int (*release) (struct file *);
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index 55e41afd95ef..0dd3e8e8653e 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -33,7 +33,9 @@
 #define V4L2_DEVICE_NAME_SIZE (BUS_ID_SIZE + 16)
 
 struct v4l2_device {
-        /* dev->driver_data points to this struct */
+        /* dev->driver_data points to this struct.
+           Note: dev might be NULL if there is no parent device
+           as is the case with e.g. ISA devices. */
         struct device *dev;
         /* used to keep track of the registered subdevs */
         struct list_head subdevs;
@@ -42,33 +44,43 @@ struct v4l2_device {
         spinlock_t lock;
         /* unique device name, by default the driver name + bus ID */
         char name[V4L2_DEVICE_NAME_SIZE];
+        /* notify callback called by some sub-devices. */
+        void (*notify)(struct v4l2_subdev *sd,
+                        unsigned int notification, void *arg);
 };
 
-/* Initialize v4l2_dev and make dev->driver_data point to v4l2_dev */
+/* Initialize v4l2_dev and make dev->driver_data point to v4l2_dev.
+   dev may be NULL in rare cases (ISA devices). In that case you
+   must fill in the v4l2_dev->name field before calling this function. */
 int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev);
-/* Set v4l2_dev->dev->driver_data to NULL and unregister all sub-devices */
+/* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
+   Since the parent disappears this ensures that v4l2_dev doesn't have an
+   invalid parent pointer. */
+void v4l2_device_disconnect(struct v4l2_device *v4l2_dev);
+/* Unregister all sub-devices and any other resources related to v4l2_dev. */
 void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
 
 /* Register a subdev with a v4l2 device. While registered the subdev module
    is marked as in-use. An error is returned if the module is no longer
    loaded when you attempt to register it. */
-int __must_check v4l2_device_register_subdev(struct v4l2_device *dev, struct v4l2_subdev *sd);
+int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
+                                                struct v4l2_subdev *sd);
 /* Unregister a subdev with a v4l2 device. Can also be called if the subdev
    wasn't registered. In that case it will do nothing. */
 void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 
 /* Iterate over all subdevs. */
-#define v4l2_device_for_each_subdev(sd, dev)                            \
-        list_for_each_entry(sd, &(dev)->subdevs, list)
+#define v4l2_device_for_each_subdev(sd, v4l2_dev)                       \
+        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)
 
 /* Call the specified callback for all subdevs matching the condition.
    Ignore any errors. Note that you cannot add or delete a subdev
    while walking the subdevs list. */
-#define __v4l2_device_call_subdevs(dev, cond, o, f, args...)            \
+#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
         do {                                                            \
                 struct v4l2_subdev *sd;                                 \
                                                                         \
-                list_for_each_entry(sd, &(dev)->subdevs, list)          \
+                list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)     \
                         if ((cond) && sd->ops->o && sd->ops->o->f)      \
                                 sd->ops->o->f(sd , ##args);             \
         } while (0)
@@ -77,12 +89,12 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
    If the callback returns an error other than 0 or -ENOIOCTLCMD, then
    return with that error code. Note that you cannot add or delete a
    subdev while walking the subdevs list. */
-#define __v4l2_device_call_subdevs_until_err(dev, cond, o, f, args...)  \
+#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
 ({                                                                      \
         struct v4l2_subdev *sd;                                         \
         long err = 0;                                                   \
                                                                         \
-        list_for_each_entry(sd, &(dev)->subdevs, list) {                \
+        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) {           \
                 if ((cond) && sd->ops->o && sd->ops->o->f)              \
                         err = sd->ops->o->f(sd , ##args);               \
                 if (err && err != -ENOIOCTLCMD)                         \
@@ -94,16 +106,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). Ignore any errors. Note that you cannot add or delete
    a subdev while walking the subdevs list. */
-#define v4l2_device_call_all(dev, grpid, o, f, args...)                 \
-        __v4l2_device_call_subdevs(dev,                                 \
+#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
+        __v4l2_device_call_subdevs(v4l2_dev,                            \
                         !(grpid) || sd->grp_id == (grpid), o, f , ##args)
 
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). If the callback returns an error other than 0 or
    -ENOIOCTLCMD, then return with that error code. Note that you cannot
    add or delete a subdev while walking the subdevs list. */
-#define v4l2_device_call_until_err(dev, grpid, o, f, args...)           \
-        __v4l2_device_call_subdevs_until_err(dev,                       \
+#define v4l2_device_call_until_err(v4l2_dev, grpid, o, f, args...)      \
+        __v4l2_device_call_subdevs_until_err(v4l2_dev,                  \
                        !(grpid) || sd->grp_id == (grpid), o, f , ##args)
 
 #endif
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
deleted file mode 100644
index e65dd9d84e8b..000000000000
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * v4l2-i2c-drv-legacy.h - contains I2C handling code that's identical
- *                  for all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is used by both legacy drivers and
- *                  drivers converted to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on older kernels as well.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- */
-
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int driverid;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
-        const struct i2c_device_id *id_table;
-};
-
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static const struct i2c_client_address_data addr_data;
-static struct i2c_driver v4l2_i2c_driver_legacy;
-static char v4l2_i2c_drv_name_legacy[32];
-
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-{
-        return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver_legacy,
-                        v4l2_i2c_drv_name_legacy, v4l2_i2c_data.probe);
-}
-
-static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
-{
-        if (v4l2_i2c_data.legacy_probe) {
-                if (v4l2_i2c_data.legacy_probe(adapter))
-                        return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-                return 0;
-        }
-        if (adapter->class & v4l2_i2c_data.legacy_class)
-                return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-        return 0;
-}
-
-static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
-{
-        int err;
-
-        if (v4l2_i2c_data.remove)
-                v4l2_i2c_data.remove(client);
-
-        err = i2c_detach_client(client);
-        if (err)
-                return err;
-        kfree(client);
-        return 0;
-}
-
-static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
-{
-        return v4l2_i2c_data.suspend ? v4l2_i2c_data.suspend(client, state) : 0;
-}
-
-static int v4l2_i2c_drv_resume_helper(struct i2c_client *client)
-{
-        return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver_legacy = {
-        .driver = {
-                .owner = THIS_MODULE,
-        },
-        .attach_adapter = v4l2_i2c_drv_probe_legacy,
-        .detach_client = v4l2_i2c_drv_detach_legacy,
-        .suspend = v4l2_i2c_drv_suspend_helper,
-        .resume  = v4l2_i2c_drv_resume_helper,
-};
-
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver = {
-        .suspend        = v4l2_i2c_drv_suspend_helper,
-        .resume         = v4l2_i2c_drv_resume_helper,
-};
-
-static int __init v4l2_i2c_drv_init(void)
-{
-        int err;
-
-        strlcpy(v4l2_i2c_drv_name_legacy, v4l2_i2c_data.name, sizeof(v4l2_i2c_drv_name_legacy));
-        strlcat(v4l2_i2c_drv_name_legacy, "'", sizeof(v4l2_i2c_drv_name_legacy));
-
-        if (v4l2_i2c_data.legacy_class == 0)
-                v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-
-        v4l2_i2c_driver_legacy.driver.name = v4l2_i2c_drv_name_legacy;
-        v4l2_i2c_driver_legacy.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver_legacy.command = v4l2_i2c_data.command;
-        err = i2c_add_driver(&v4l2_i2c_driver_legacy);
-
-        if (err)
-                return err;
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        err = i2c_add_driver(&v4l2_i2c_driver);
-        if (err)
-                i2c_del_driver(&v4l2_i2c_driver_legacy);
-        return err;
-}
-
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver_legacy);
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..10a2882c3cbf 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
 
 struct v4l2_i2c_driver_data {
         const char * const name;
-        int driverid;
         int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
         int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
         int (*remove)(struct i2c_client *client);
         int (*suspend)(struct i2c_client *client, pm_message_t state);
         int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
         const struct i2c_device_id *id_table;
 };
 
@@ -54,12 +51,11 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data;
 static struct i2c_driver v4l2_i2c_driver;
 
 
-/* Bus-based I2C implementation for kernels >= 2.6.22 */
+/* Bus-based I2C implementation for kernels >= 2.6.26 */
 
 static int __init v4l2_i2c_drv_init(void)
 {
         v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
         v4l2_i2c_driver.command = v4l2_i2c_data.command;
         v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
         v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index b01c044868d0..7a4529defa88 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -15,6 +15,7 @@
 #include <linux/mutex.h>
 #include <linux/compiler.h> /* need __user */
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
+#define __MIN_V4L1
 #include <linux/videodev.h>
 #else
 #include <linux/videodev2.h>
@@ -267,6 +268,7 @@ struct v4l2_ioctl_ops {
 
 /*  Video standard functions  */
 extern const char *v4l2_norm_to_name(v4l2_std_id id);
+extern void v4l2_video_std_frame_period(int id, struct v4l2_fract *frameperiod);
 extern int v4l2_video_std_construct(struct v4l2_standard *vs,
                                     int id, const char *name);
 /* Prints the ioctl in a human-readable format */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 37b09e56e943..17856081c809 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -27,6 +27,16 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
 
+/* decode_vbi_line */
+struct v4l2_decode_vbi_line {
+        u32 is_second_field;    /* Set to 0 for the first (odd) field,
+                                   set to 1 for the second (even) field. */
+        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
+                                   On exit points to the start of the payload. */
+        u32 line;               /* Line number of the sliced VBI data (1-23) */
+        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
+};
+
 /* Sub-devices are devices that are connected somehow to the main bridge
    device. These devices are usually audio/video muxers/encoders/decoders or
    sensors and webcam controllers.
@@ -68,17 +78,36 @@ struct tuner_setup;
    the use-case it might be better to use subdev-specific ops (currently
    not yet implemented) since ops provide proper type-checking.
  */
+
+/* init: initialize the sensor registors to some sort of reasonable default
+        values. Do not use for new drivers and should be removed in existing
+        drivers.
+
+   load_fw: load firmware.
+
+   reset: generic reset command. The argument selects which subsystems to
+        reset. Passing 0 will always reset the whole chip. Do not use for new
+        drivers without discussing this first on the linux-media mailinglist.
+        There should be no reason normally to reset a device.
+
+   s_gpio: set GPIO pins. Very simple right now, might need to be extended with
+        a direction argument if needed.
+ */
 struct v4l2_subdev_core_ops {
         int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
         int (*log_status)(struct v4l2_subdev *sd);
         int (*init)(struct v4l2_subdev *sd, u32 val);
-        int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
+        int (*load_fw)(struct v4l2_subdev *sd);
         int (*reset)(struct v4l2_subdev *sd, u32 val);
         int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
         int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
         int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
         int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
+        int (*g_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
+        int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
+        int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
         int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
@@ -86,6 +115,16 @@ struct v4l2_subdev_core_ops {
 #endif
 };
 
+/* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
+
+   s_radio: v4l device was opened in Radio mode, to be replaced by s_mode.
+
+   s_type_addr: sets tuner type and its I2C addr.
+
+   s_config: sets tda9887 specific stuff, like port1, port2 and qss
+
+   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
+ */
 struct v4l2_subdev_tuner_ops {
         int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
         int (*s_radio)(struct v4l2_subdev *sd);
@@ -93,28 +132,93 @@ struct v4l2_subdev_tuner_ops {
         int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
         int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
         int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
-        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         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);
+        int (*s_standby)(struct v4l2_subdev *sd);
 };
 
+/* s_clock_freq: set the frequency (in Hz) of the audio clock output.
+        Used to slave an audio processor to the video decoder, ensuring that
+        audio and video remain synchronized. Usual values for the frequency
+        are 48000, 44100 or 32000 Hz. If the frequency is not supported, then
+        -EINVAL is returned.
+
+   s_i2s_clock_freq: sets I2S speed in bps. This is used to provide a standard
+        way to select I2S clock used by driving digital audio streams at some
+        board designs. Usual values for the frequency are 1024000 and 2048000.
+        If the frequency is not supported, then -EINVAL is returned.
+
+   s_routing: used to define the input and/or output pins of an audio chip,
+        and any additional configuration data.
+        Never attempt to use user-level input IDs (e.g. Composite, S-Video,
+        Tuner) at this level. An i2c device shouldn't know about whether an
+        input pin is connected to a Composite connector, become on another
+        board or platform it might be connected to something else entirely.
+        The calling driver is responsible for mapping a user-level input to
+        the right pins on the i2c device.
+ */
 struct v4l2_subdev_audio_ops {
         int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
         int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
 };
 
+/*
+   decode_vbi_line: video decoders that support sliced VBI need to implement
+        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
+        start of the VBI data that was generated by the decoder. The driver
+        then parses the sliced VBI data and sets the other fields in the
+        struct accordingly. The pointer p is updated to point to the start of
+        the payload which can be copied verbatim into the data field of the
+        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
+        type field is set to 0 on return.
+
+   s_vbi_data: used to generate VBI signals on a video signal.
+        v4l2_sliced_vbi_data is filled with the data packets that should be
+        output. Note that if you set the line field to 0, then that VBI signal
+        is disabled. If no valid VBI data was found, then the type field is
+        set to 0 on return.
+
+   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
+        Not all video decoders support this. If no data is available because
+        the readback register contains invalid or erroneous data -EIO is
+        returned. Note that you must fill in the 'id' member and the 'field'
+        member (to determine whether CC data from the first or second field
+        should be obtained).
+
+   s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
+        video input devices.
+
+  s_crystal_freq: sets the frequency of the crystal used to generate the
+        clocks in Hz. An extra flags field allows device specific configuration
+        regarding clock frequency dividers, etc. If not used, then set flags
+        to 0. If the frequency is not supported, then -EINVAL is returned.
+
+   g_input_status: get input status. Same as the status field in the v4l2_input
+        struct.
+
+   s_routing: see s_routing in audio_ops, except this version is for video
+        devices.
+ */
 struct v4l2_subdev_video_ops {
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
-        int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
+        int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
         int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
         int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
         int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
         int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
         int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
+        int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
+        int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
-        int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+        int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
         int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+        int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+        int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+        int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+        int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+        int (*enum_framesizes)(struct v4l2_subdev *sd, struct v4l2_frmsizeenum *fsize);
+        int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
 };
 
 struct v4l2_subdev_ops {
@@ -132,7 +236,7 @@ struct v4l2_subdev_ops {
 struct v4l2_subdev {
         struct list_head list;
         struct module *owner;
-        struct v4l2_device *dev;
+        struct v4l2_device *v4l2_dev;
         const struct v4l2_subdev_ops *ops;
         /* name must be unique */
         char name[V4L2_SUBDEV_NAME_SIZE];
@@ -152,18 +256,6 @@ static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
         return sd->priv;
 }
 
-/* Convert an ioctl-type command to the proper v4l2_subdev_ops function call.
-   This is used by subdev modules that can be called by both old-style ioctl
-   commands and through the v4l2_subdev_ops.
-
-   The ioctl API of the subdev driver can call this function to call the
-   right ops based on the ioctl cmd and arg.
-
-   Once all subdev drivers have been converted and all drivers no longer
-   use the ioctl interface, then this function can be removed.
- */
-int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg);
-
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
                                         const struct v4l2_subdev_ops *ops)
 {
@@ -171,7 +263,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
         /* ops->core MUST be set */
         BUG_ON(!ops || !ops->core);
         sd->ops = ops;
-        sd->dev = NULL;
+        sd->v4l2_dev = NULL;
         sd->name[0] = '\0';
         sd->grp_id = 0;
         sd->priv = NULL;
@@ -186,4 +278,9 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
         (!(sd) ? -ENODEV : (((sd) && (sd)->ops->o && (sd)->ops->o->f) ? \
                 (sd)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))
 
+/* Send a notification to v4l2_device. */
+#define v4l2_subdev_notify(sd, notification, arg)                          \
+        ((!(sd) || !(sd)->v4l2_dev || !(sd)->v4l2_dev->notify) ? -ENODEV : \
+         (sd)->v4l2_dev->notify((sd), (notification), (arg)))
+
 #endif
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 874f1340d049..1c5946c44758 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -18,6 +18,7 @@
 
 #include <linux/poll.h>
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
+#define __MIN_V4L1
 #include <linux/videodev.h>
 #endif
 #include <linux/videodev2.h>
diff --git a/include/mtd/inftl-user.h b/include/mtd/inftl-user.h
index d409d489d900..8376bd1a9e01 100644
--- a/include/mtd/inftl-user.h
+++ b/include/mtd/inftl-user.h
@@ -16,33 +16,33 @@
 /* Block Control Information */
 
 struct inftl_bci {
-        uint8_t ECCsig[6];
-        uint8_t Status;
-        uint8_t Status1;
+        __u8 ECCsig[6];
+        __u8 Status;
+        __u8 Status1;
 } __attribute__((packed));
 
 struct inftl_unithead1 {
-        uint16_t virtualUnitNo;
-        uint16_t prevUnitNo;
-        uint8_t ANAC;
-        uint8_t NACs;
-        uint8_t parityPerField;
-        uint8_t discarded;
+        __u16 virtualUnitNo;
+        __u16 prevUnitNo;
+        __u8 ANAC;
+        __u8 NACs;
+        __u8 parityPerField;
+        __u8 discarded;
 } __attribute__((packed));
 
 struct inftl_unithead2 {
-        uint8_t parityPerField;
-        uint8_t ANAC;
-        uint16_t prevUnitNo;
-        uint16_t virtualUnitNo;
-        uint8_t NACs;
-        uint8_t discarded;
+        __u8 parityPerField;
+        __u8 ANAC;
+        __u16 prevUnitNo;
+        __u16 virtualUnitNo;
+        __u8 NACs;
+        __u8 discarded;
 } __attribute__((packed));
 
 struct inftl_unittail {
-        uint8_t Reserved[4];
-        uint16_t EraseMark;
-        uint16_t EraseMark1;
+        __u8 Reserved[4];
+        __u16 EraseMark;
+        __u16 EraseMark1;
 } __attribute__((packed));
 
 union inftl_uci {
diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h
index 001685d7fa88..fa94b0eb67c1 100644
--- a/include/mtd/jffs2-user.h
+++ b/include/mtd/jffs2-user.h
@@ -7,6 +7,7 @@
 
 /* This file is blessed for inclusion by userspace */
 #include <linux/jffs2.h>
+#include <linux/types.h>
 #include <endian.h>
 #include <byteswap.h>
 
@@ -19,8 +20,8 @@
 
 extern int target_endian;
 
-#define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
-#define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
+#define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
+#define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
 
 #define cpu_to_je16(x) ((jint16_t){t16(x)})
 #define cpu_to_je32(x) ((jint32_t){t32(x)})
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index c6c61cd5a254..b6595b3c68b6 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -5,14 +5,16 @@
 #ifndef __MTD_ABI_H__
 #define __MTD_ABI_H__
 
+#include <linux/types.h>
+
 struct erase_info_user {
-        uint32_t start;
-        uint32_t length;
+        __u32 start;
+        __u32 length;
 };
 
 struct mtd_oob_buf {
-        uint32_t start;
-        uint32_t length;
+        __u32 start;
+        __u32 length;
         unsigned char __user *ptr;
 };
 
@@ -48,30 +50,30 @@ struct mtd_oob_buf {
 #define MTD_OTP_USER            2
 
 struct mtd_info_user {
-        uint8_t type;
-        uint32_t flags;
-        uint32_t size;   // Total size of the MTD
-        uint32_t erasesize;
-        uint32_t writesize;
-        uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
+        __u8 type;
+        __u32 flags;
+        __u32 size;      // Total size of the MTD
+        __u32 erasesize;
+        __u32 writesize;
+        __u32 oobsize;   // Amount of OOB data per block (e.g. 16)
         /* The below two fields are obsolete and broken, do not use them
          * (TODO: remove at some point) */
-        uint32_t ecctype;
-        uint32_t eccsize;
+        __u32 ecctype;
+        __u32 eccsize;
 };
 
 struct region_info_user {
-        uint32_t offset;                /* At which this region starts,
+        __u32 offset;           /* At which this region starts,
                                          * from the beginning of the MTD */
-        uint32_t erasesize;             /* For this region */
-        uint32_t numblocks;             /* Number of blocks in this region */
-        uint32_t regionindex;
+        __u32 erasesize;                /* For this region */
+        __u32 numblocks;                /* Number of blocks in this region */
+        __u32 regionindex;
 };
 
 struct otp_info {
-        uint32_t start;
-        uint32_t length;
-        uint32_t locked;
+        __u32 start;
+        __u32 length;
+        __u32 locked;
 };
 
 #define MEMGETINFO              _IOR('M', 1, struct mtd_info_user)
@@ -84,8 +86,8 @@ struct otp_info {
 #define MEMGETREGIONINFO        _IOWR('M', 8, struct region_info_user)
 #define MEMSETOOBSEL            _IOW('M', 9, struct nand_oobinfo)
 #define MEMGETOOBSEL            _IOR('M', 10, struct nand_oobinfo)
-#define MEMGETBADBLOCK          _IOW('M', 11, loff_t)
-#define MEMSETBADBLOCK          _IOW('M', 12, loff_t)
+#define MEMGETBADBLOCK          _IOW('M', 11, __kernel_loff_t)
+#define MEMSETBADBLOCK          _IOW('M', 12, __kernel_loff_t)
 #define OTPSELECT               _IOR('M', 13, int)
 #define OTPGETREGIONCOUNT       _IOW('M', 14, int)
 #define OTPGETREGIONINFO        _IOW('M', 15, struct otp_info)
@@ -99,15 +101,15 @@ struct otp_info {
  * interfaces
  */
 struct nand_oobinfo {
-        uint32_t useecc;
-        uint32_t eccbytes;
-        uint32_t oobfree[8][2];
-        uint32_t eccpos[32];
+        __u32 useecc;
+        __u32 eccbytes;
+        __u32 oobfree[8][2];
+        __u32 eccpos[32];
 };
 
 struct nand_oobfree {
-        uint32_t offset;
-        uint32_t length;
+        __u32 offset;
+        __u32 length;
 };
 
 #define MTD_MAX_OOBFREE_ENTRIES 8
@@ -116,9 +118,9 @@ struct nand_oobfree {
  * diagnosis and to allow creation of raw images
  */
 struct nand_ecclayout {
-        uint32_t eccbytes;
-        uint32_t eccpos[64];
-        uint32_t oobavail;
+        __u32 eccbytes;
+        __u32 eccpos[64];
+        __u32 oobavail;
         struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES];
 };
 
@@ -131,10 +133,10 @@ struct nand_ecclayout {
  * @bbtblocks:  number of blocks reserved for bad block tables
  */
 struct mtd_ecc_stats {
-        uint32_t corrected;
-        uint32_t failed;
-        uint32_t badblocks;
-        uint32_t bbtblocks;
+        __u32 corrected;
+        __u32 failed;
+        __u32 badblocks;
+        __u32 bbtblocks;
 };
 
 /*
diff --git a/include/mtd/nftl-user.h b/include/mtd/nftl-user.h
index 390d21c080aa..98e9e57f22de 100644
--- a/include/mtd/nftl-user.h
+++ b/include/mtd/nftl-user.h
@@ -6,33 +6,35 @@
 #ifndef __MTD_NFTL_USER_H__
 #define __MTD_NFTL_USER_H__
 
+#include <linux/types.h>
+
 /* Block Control Information */
 
 struct nftl_bci {
         unsigned char ECCSig[6];
-        uint8_t Status;
-        uint8_t Status1;
+        __u8 Status;
+        __u8 Status1;
 }__attribute__((packed));
 
 /* Unit Control Information */
 
 struct nftl_uci0 {
-        uint16_t VirtUnitNum;
-        uint16_t ReplUnitNum;
-        uint16_t SpareVirtUnitNum;
-        uint16_t SpareReplUnitNum;
+        __u16 VirtUnitNum;
+        __u16 ReplUnitNum;
+        __u16 SpareVirtUnitNum;
+        __u16 SpareReplUnitNum;
 } __attribute__((packed));
 
 struct nftl_uci1 {
-        uint32_t WearInfo;
-        uint16_t EraseMark;
-        uint16_t EraseMark1;
+        __u32 WearInfo;
+        __u16 EraseMark;
+        __u16 EraseMark1;
 } __attribute__((packed));
 
 struct nftl_uci2 {
-        uint16_t FoldMark;
-        uint16_t FoldMark1;
-        uint32_t unused;
+        __u16 FoldMark;
+        __u16 FoldMark1;
+        __u32 unused;
 } __attribute__((packed));
 
 union nftl_uci {
@@ -50,9 +52,9 @@ struct nftl_oob {
 
 struct NFTLMediaHeader {
         char DataOrgID[6];
-        uint16_t NumEraseUnits;
-        uint16_t FirstPhysicalEUN;
-        uint32_t FormattedSize;
+        __u16 NumEraseUnits;
+        __u16 FirstPhysicalEUN;
+        __u32 FormattedSize;
         unsigned char UnitSizeFactor;
 } __attribute__((packed));
 
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index 296efae3525e..466a8320f1e6 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -21,6 +21,8 @@
 #ifndef __UBI_USER_H__
 #define __UBI_USER_H__
 
+#include <linux/types.h>
+
 /*
  * UBI device creation (the same as MTD device attachment)
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -152,7 +154,7 @@
 /* Create an UBI volume */
 #define UBI_IOCMKVOL _IOW(UBI_IOC_MAGIC, 0, struct ubi_mkvol_req)
 /* Remove an UBI volume */
-#define UBI_IOCRMVOL _IOW(UBI_IOC_MAGIC, 1, int32_t)
+#define UBI_IOCRMVOL _IOW(UBI_IOC_MAGIC, 1, __s32)
 /* Re-size an UBI volume */
 #define UBI_IOCRSVOL _IOW(UBI_IOC_MAGIC, 2, struct ubi_rsvol_req)
 /* Re-name volumes */
@@ -165,24 +167,24 @@
 /* Attach an MTD device */
 #define UBI_IOCATT _IOW(UBI_CTRL_IOC_MAGIC, 64, struct ubi_attach_req)
 /* Detach an MTD device */
-#define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, int32_t)
+#define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, __s32)
 
 /* ioctl commands of UBI volume character devices */
 
 #define UBI_VOL_IOC_MAGIC 'O'
 
 /* Start UBI volume update */
-#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, int64_t)
+#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)
 /* LEB erasure command, used for debugging, disabled by default */
-#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, int32_t)
+#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)
 /* Atomic LEB change command */
-#define UBI_IOCEBCH _IOW(UBI_VOL_IOC_MAGIC, 2, int32_t)
+#define UBI_IOCEBCH _IOW(UBI_VOL_IOC_MAGIC, 2, __s32)
 /* Map LEB command */
 #define UBI_IOCEBMAP _IOW(UBI_VOL_IOC_MAGIC, 3, struct ubi_map_req)
 /* Unmap LEB command */
-#define UBI_IOCEBUNMAP _IOW(UBI_VOL_IOC_MAGIC, 4, int32_t)
+#define UBI_IOCEBUNMAP _IOW(UBI_VOL_IOC_MAGIC, 4, __s32)
 /* Check if LEB is mapped command */
-#define UBI_IOCEBISMAP _IOR(UBI_VOL_IOC_MAGIC, 5, int32_t)
+#define UBI_IOCEBISMAP _IOR(UBI_VOL_IOC_MAGIC, 5, __s32)
 /* Set an UBI volume property */
 #define UBI_IOCSETPROP _IOW(UBI_VOL_IOC_MAGIC, 6, struct ubi_set_prop_req)
 
@@ -260,10 +262,10 @@ enum {
  * sub-page of the first page and add needed padding.
  */
 struct ubi_attach_req {
-        int32_t ubi_num;
-        int32_t mtd_num;
-        int32_t vid_hdr_offset;
-        int8_t padding[12];
+        __s32 ubi_num;
+        __s32 mtd_num;
+        __s32 vid_hdr_offset;
+        __s8 padding[12];
 };
 
 /**
@@ -298,13 +300,13 @@ struct ubi_attach_req {
  * BLOBs, without caring about how to properly align them.
  */
 struct ubi_mkvol_req {
-        int32_t vol_id;
-        int32_t alignment;
-        int64_t bytes;
-        int8_t vol_type;
-        int8_t padding1;
-        int16_t name_len;
-        int8_t padding2[4];
+        __s32 vol_id;
+        __s32 alignment;
+        __s64 bytes;
+        __s8 vol_type;
+        __s8 padding1;
+        __s16 name_len;
+        __s8 padding2[4];
         char name[UBI_MAX_VOLUME_NAME + 1];
 } __attribute__ ((packed));
 
@@ -320,8 +322,8 @@ struct ubi_mkvol_req {
  * zero number of bytes).
  */
 struct ubi_rsvol_req {
-        int64_t bytes;
-        int32_t vol_id;
+        __s64 bytes;
+        __s32 vol_id;
 } __attribute__ ((packed));
 
 /**
@@ -356,12 +358,12 @@ struct ubi_rsvol_req {
  * re-name request.
  */
 struct ubi_rnvol_req {
-        int32_t count;
-        int8_t padding1[12];
+        __s32 count;
+        __s8 padding1[12];
         struct {
-                int32_t vol_id;
-                int16_t name_len;
-                int8_t  padding2[2];
+                __s32 vol_id;
+                __s16 name_len;
+                __s8  padding2[2];
                 char    name[UBI_MAX_VOLUME_NAME + 1];
         } ents[UBI_MAX_RNVOL];
 } __attribute__ ((packed));
@@ -375,10 +377,10 @@ struct ubi_rnvol_req {
  * @padding: reserved for future, not used, has to be zeroed
  */
 struct ubi_leb_change_req {
-        int32_t lnum;
-        int32_t bytes;
-        int8_t  dtype;
-        int8_t  padding[7];
+        __s32 lnum;
+        __s32 bytes;
+        __s8  dtype;
+        __s8  padding[7];
 } __attribute__ ((packed));
 
 /**
@@ -388,9 +390,9 @@ struct ubi_leb_change_req {
  * @padding: reserved for future, not used, has to be zeroed
  */
 struct ubi_map_req {
-        int32_t lnum;
-        int8_t  dtype;
-        int8_t  padding[3];
+        __s32 lnum;
+        __s8  dtype;
+        __s8  padding[3];
 } __attribute__ ((packed));
 
 
@@ -402,9 +404,9 @@ struct ubi_map_req {
  * @value: value to set
  */
 struct ubi_set_prop_req {
-       uint8_t  property;
-       uint8_t  padding[7];
-       uint64_t value;
+       __u8  property;
+       __u8  padding[7];
+       __u64 value;
 }  __attribute__ ((packed));
 
 #endif /* __UBI_USER_H__ */
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 4012e07162e5..e26812274b75 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -98,7 +98,6 @@ enum p9_req_status_t {
 struct p9_req_t {
         int status;
         int t_err;
-        u16 flush_tag;
         wait_queue_head_t *wq;
         struct p9_fcall *tc;
         struct p9_fcall *rc;
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index c216de528b08..7b55ab215a64 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -88,8 +88,8 @@ extern int			ipv6_dev_get_saddr(struct net *net,
 extern int                      ipv6_get_lladdr(struct net_device *dev,
                                                 struct in6_addr *addr,
                                                 unsigned char banned_flags);
-extern int                      ipv6_rcv_saddr_equal(const struct sock *sk, 
-                                                      const struct sock *sk2);
+extern int                      ipv6_rcv_saddr_equal(const struct sock *sk,
+                                                    const struct sock *sk2);
 extern void                     addrconf_join_solict(struct net_device *dev,
                                         struct in6_addr *addr);
 extern void                     addrconf_leave_solict(struct inet6_dev *idev,
diff --git a/include/net/atmclip.h b/include/net/atmclip.h
index b5a51a7bb364..467c531b8a7e 100644
--- a/include/net/atmclip.h
+++ b/include/net/atmclip.h
@@ -50,7 +50,6 @@ struct atmarp_entry {
 struct clip_priv {
         int number;                     /* for convenience ... */
         spinlock_t xoff_lock;           /* ensures that pop is atomic (SMP) */
-        struct net_device_stats stats;
         struct net_device *next;        /* next CLIP interface */
 };
 
diff --git a/include/net/ax88796.h b/include/net/ax88796.h
index 51329dae44e6..b9a3beca0ce4 100644
--- a/include/net/ax88796.h
+++ b/include/net/ax88796.h
@@ -15,14 +15,17 @@
 #define AXFLG_HAS_EEPROM                (1<<0)
 #define AXFLG_MAC_FROMDEV               (1<<1)  /* device already has MAC */
 #define AXFLG_HAS_93CX6                 (1<<2)  /* use eeprom_93cx6 driver */
+#define AXFLG_MAC_FROMPLATFORM          (1<<3)  /* MAC given by platform data */
 
 struct ax_plat_data {
         unsigned int     flags;
-        unsigned char    wordlength;            /* 1 or 2 */
-        unsigned char    dcr_val;               /* default value for DCR */
-        unsigned char    rcr_val;               /* default value for RCR */
-        unsigned char    gpoc_val;              /* default value for GPOC */
-        u32             *reg_offsets;           /* register offsets */
+        unsigned char    wordlength;    /* 1 or 2 */
+        unsigned char    dcr_val;       /* default value for DCR */
+        unsigned char    rcr_val;       /* default value for RCR */
+        unsigned char    gpoc_val;      /* default value for GPOC */
+        u32             *reg_offsets;   /* register offsets */
+        u8              *mac_addr;      /* MAC addr (only used when
+                                           AXFLG_MAC_FROMPLATFORM is used */
 };
 
 #endif /* __NET_AX88796_PLAT_H */
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index a04f8463ac7e..3ad5390a4dd5 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -53,6 +53,17 @@
 #define SOL_SCO         17
 #define SOL_RFCOMM      18
 
+#define BT_SECURITY     4
+struct bt_security {
+        __u8 level;
+};
+#define BT_SECURITY_SDP         0
+#define BT_SECURITY_LOW         1
+#define BT_SECURITY_MEDIUM      2
+#define BT_SECURITY_HIGH        3
+
+#define BT_DEFER_SETUP  7
+
 #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
 #define BT_ERR(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
 #define BT_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n" , __func__ , ## arg)
@@ -108,6 +119,7 @@ struct bt_sock {
         bdaddr_t    dst;
         struct list_head accept_q;
         struct sock *parent;
+        u32 defer_setup;
 };
 
 struct bt_sock_list {
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3645139e68c7..ed3aea1605e8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -101,6 +101,7 @@ enum {
 /* HCI timeouts */
 #define HCI_CONNECT_TIMEOUT     (40000) /* 40 seconds */
 #define HCI_DISCONN_TIMEOUT     (2000)  /* 2 seconds */
+#define HCI_PAIRING_TIMEOUT     (60000) /* 60 seconds */
 #define HCI_IDLE_TIMEOUT        (6000)  /* 6 seconds */
 #define HCI_INIT_TIMEOUT        (10000) /* 10 seconds */
 
@@ -133,8 +134,13 @@ enum {
 #define ESCO_EV3        0x0008
 #define ESCO_EV4        0x0010
 #define ESCO_EV5        0x0020
+#define ESCO_2EV3       0x0040
+#define ESCO_3EV3       0x0080
+#define ESCO_2EV5       0x0100
+#define ESCO_3EV5       0x0200
 
 #define SCO_ESCO_MASK  (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
+#define EDR_ESCO_MASK  (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
 
 /* ACL flags */
 #define ACL_CONT                0x01
@@ -176,6 +182,9 @@ enum {
 #define LMP_EV5         0x02
 
 #define LMP_SNIFF_SUBR  0x02
+#define LMP_EDR_ESCO_2M 0x20
+#define LMP_EDR_ESCO_3M 0x40
+#define LMP_EDR_3S_ESCO 0x80
 
 #define LMP_SIMPLE_PAIR 0x08
 
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 46a43b721dd6..73aead222b32 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -169,7 +169,9 @@ struct hci_conn {
         __u16            link_policy;
         __u32            link_mode;
         __u8             auth_type;
+        __u8             sec_level;
         __u8             power_save;
+        __u16            disc_timeout;
         unsigned long    pend;
 
         unsigned int     sent;
@@ -179,7 +181,8 @@ struct hci_conn {
         struct timer_list disc_timer;
         struct timer_list idle_timer;
 
-        struct work_struct work;
+        struct work_struct work_add;
+        struct work_struct work_del;
 
         struct device   dev;
 
@@ -325,12 +328,11 @@ int hci_conn_del(struct hci_conn *conn);
 void hci_conn_hash_flush(struct hci_dev *hdev);
 void hci_conn_check_pending(struct hci_dev *hdev);
 
-struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 auth_type);
+struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type);
 int hci_conn_check_link_mode(struct hci_conn *conn);
-int hci_conn_auth(struct hci_conn *conn);
-int hci_conn_encrypt(struct hci_conn *conn);
+int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
 int hci_conn_change_link_key(struct hci_conn *conn);
-int hci_conn_switch_role(struct hci_conn *conn, uint8_t role);
+int hci_conn_switch_role(struct hci_conn *conn, __u8 role);
 
 void hci_conn_enter_active_mode(struct hci_conn *conn);
 void hci_conn_enter_sniff_mode(struct hci_conn *conn);
@@ -348,9 +350,9 @@ static inline void hci_conn_put(struct hci_conn *conn)
                 if (conn->type == ACL_LINK) {
                         del_timer(&conn->idle_timer);
                         if (conn->state == BT_CONNECTED) {
-                                timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT);
+                                timeo = msecs_to_jiffies(conn->disc_timeout);
                                 if (!conn->out)
-                                        timeo *= 5;
+                                        timeo *= 2;
                         } else
                                 timeo = msecs_to_jiffies(10);
                 } else
@@ -455,6 +457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
 
 int hci_register_sysfs(struct hci_dev *hdev);
 void hci_unregister_sysfs(struct hci_dev *hdev);
+void hci_conn_init_sysfs(struct hci_conn *conn);
 void hci_conn_add_sysfs(struct hci_conn *conn);
 void hci_conn_del_sysfs(struct hci_conn *conn);
 
@@ -470,26 +473,26 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 
 /* ----- HCI protocols ----- */
 struct hci_proto {
-        char            *name;
+        char            *name;
         unsigned int    id;
         unsigned long   flags;
 
         void            *priv;
 
-        int (*connect_ind)      (struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type);
+        int (*connect_ind)      (struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type);
         int (*connect_cfm)      (struct hci_conn *conn, __u8 status);
-        int (*disconn_ind)      (struct hci_conn *conn, __u8 reason);
+        int (*disconn_ind)      (struct hci_conn *conn);
+        int (*disconn_cfm)      (struct hci_conn *conn, __u8 reason);
         int (*recv_acldata)     (struct hci_conn *conn, struct sk_buff *skb, __u16 flags);
         int (*recv_scodata)     (struct hci_conn *conn, struct sk_buff *skb);
-        int (*auth_cfm)         (struct hci_conn *conn, __u8 status);
-        int (*encrypt_cfm)      (struct hci_conn *conn, __u8 status, __u8 encrypt);
+        int (*security_cfm)     (struct hci_conn *conn, __u8 status, __u8 encrypt);
 };
 
 static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type)
 {
         register struct hci_proto *hp;
         int mask = 0;
-        
+
         hp = hci_proto[HCI_PROTO_L2CAP];
         if (hp && hp->connect_ind)
                 mask |= hp->connect_ind(hdev, bdaddr, type);
@@ -514,30 +517,52 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
                 hp->connect_cfm(conn, status);
 }
 
-static inline void hci_proto_disconn_ind(struct hci_conn *conn, __u8 reason)
+static inline int hci_proto_disconn_ind(struct hci_conn *conn)
 {
         register struct hci_proto *hp;
+        int reason = 0x13;
 
         hp = hci_proto[HCI_PROTO_L2CAP];
         if (hp && hp->disconn_ind)
-                hp->disconn_ind(conn, reason);
+                reason = hp->disconn_ind(conn);
 
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->disconn_ind)
-                hp->disconn_ind(conn, reason);
+                reason = hp->disconn_ind(conn);
+
+        return reason;
+}
+
+static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
+{
+        register struct hci_proto *hp;
+
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->disconn_cfm)
+                hp->disconn_cfm(conn, reason);
+
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->disconn_cfm)
+                hp->disconn_cfm(conn, reason);
 }
 
 static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
 {
         register struct hci_proto *hp;
+        __u8 encrypt;
+
+        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
+                return;
+
+        encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
 
         hp = hci_proto[HCI_PROTO_L2CAP];
-        if (hp && hp->auth_cfm)
-                hp->auth_cfm(conn, status);
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 
         hp = hci_proto[HCI_PROTO_SCO];
-        if (hp && hp->auth_cfm)
-                hp->auth_cfm(conn, status);
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 }
 
 static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
@@ -545,12 +570,12 @@ static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u
         register struct hci_proto *hp;
 
         hp = hci_proto[HCI_PROTO_L2CAP];
-        if (hp && hp->encrypt_cfm)
-                hp->encrypt_cfm(conn, status, encrypt);
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 
         hp = hci_proto[HCI_PROTO_SCO];
-        if (hp && hp->encrypt_cfm)
-                hp->encrypt_cfm(conn, status, encrypt);
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 }
 
 int hci_register_proto(struct hci_proto *hproto);
@@ -562,8 +587,7 @@ struct hci_cb {
 
         char *name;
 
-        void (*auth_cfm)        (struct hci_conn *conn, __u8 status);
-        void (*encrypt_cfm)     (struct hci_conn *conn, __u8 status, __u8 encrypt);
+        void (*security_cfm)    (struct hci_conn *conn, __u8 status, __u8 encrypt);
         void (*key_change_cfm)  (struct hci_conn *conn, __u8 status);
         void (*role_switch_cfm) (struct hci_conn *conn, __u8 status, __u8 role);
 };
@@ -571,14 +595,20 @@ struct hci_cb {
 static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
 {
         struct list_head *p;
+        __u8 encrypt;
 
         hci_proto_auth_cfm(conn, status);
 
+        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
+                return;
+
+        encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
+
         read_lock_bh(&hci_cb_list_lock);
         list_for_each(p, &hci_cb_list) {
                 struct hci_cb *cb = list_entry(p, struct hci_cb, list);
-                if (cb->auth_cfm)
-                        cb->auth_cfm(conn, status);
+                if (cb->security_cfm)
+                        cb->security_cfm(conn, status, encrypt);
         }
         read_unlock_bh(&hci_cb_list_lock);
 }
@@ -587,13 +617,16 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encr
 {
         struct list_head *p;
 
+        if (conn->sec_level == BT_SECURITY_SDP)
+                conn->sec_level = BT_SECURITY_LOW;
+
         hci_proto_encrypt_cfm(conn, status, encrypt);
 
         read_lock_bh(&hci_cb_list_lock);
         list_for_each(p, &hci_cb_list) {
                 struct hci_cb *cb = list_entry(p, struct hci_cb, list);
-                if (cb->encrypt_cfm)
-                        cb->encrypt_cfm(conn, status, encrypt);
+                if (cb->security_cfm)
+                        cb->security_cfm(conn, status, encrypt);
         }
         read_unlock_bh(&hci_cb_list_lock);
 }
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 73e115bc12dd..f566aa1f0a4c 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -37,6 +37,7 @@ struct sockaddr_l2 {
         sa_family_t     l2_family;
         __le16          l2_psm;
         bdaddr_t        l2_bdaddr;
+        __le16          l2_cid;
 };
 
 /* L2CAP socket options */
@@ -185,6 +186,7 @@ struct l2cap_info_rsp {
 /* info type */
 #define L2CAP_IT_CL_MTU     0x0001
 #define L2CAP_IT_FEAT_MASK  0x0002
+#define L2CAP_IT_FIXED_CHAN 0x0003
 
 /* info result */
 #define L2CAP_IR_SUCCESS    0x0000
@@ -219,11 +221,14 @@ struct l2cap_conn {
         __u8            rx_ident;
         __u8            tx_ident;
 
+        __u8            disc_reason;
+
         struct l2cap_chan_list chan_list;
 };
 
 #define L2CAP_INFO_CL_MTU_REQ_SENT      0x01
-#define L2CAP_INFO_FEAT_MASK_REQ_SENT   0x02
+#define L2CAP_INFO_FEAT_MASK_REQ_SENT   0x04
+#define L2CAP_INFO_FEAT_MASK_REQ_DONE   0x08
 
 /* ----- L2CAP channel and socket info ----- */
 #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
@@ -237,8 +242,9 @@ struct l2cap_pinfo {
         __u16           imtu;
         __u16           omtu;
         __u16           flush_to;
-
-        __u32           link_mode;
+        __u8            sec_level;
+        __u8            role_switch;
+        __u8            force_reliable;
 
         __u8            conf_req[64];
         __u8            conf_len;
@@ -257,6 +263,7 @@ struct l2cap_pinfo {
 #define L2CAP_CONF_REQ_SENT     0x01
 #define L2CAP_CONF_INPUT_DONE   0x02
 #define L2CAP_CONF_OUTPUT_DONE  0x04
+#define L2CAP_CONF_CONNECT_PEND 0x80
 
 #define L2CAP_CONF_MAX_RETRIES  2
 
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 4dc8d92a4638..80072611d26a 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -183,8 +183,9 @@ struct rfcomm_dlc {
         u8            remote_v24_sig;
         u8            mscex;
         u8            out;
-
-        u32           link_mode;
+        u8            sec_level;
+        u8            role_switch;
+        u32           defer_setup;
 
         uint          mtu;
         uint          cfc;
@@ -202,10 +203,12 @@ struct rfcomm_dlc {
 #define RFCOMM_RX_THROTTLED 0
 #define RFCOMM_TX_THROTTLED 1
 #define RFCOMM_TIMED_OUT    2
-#define RFCOMM_MSC_PENDING  3 
-#define RFCOMM_AUTH_PENDING 4
-#define RFCOMM_AUTH_ACCEPT  5
-#define RFCOMM_AUTH_REJECT  6
+#define RFCOMM_MSC_PENDING  3
+#define RFCOMM_SEC_PENDING  4
+#define RFCOMM_AUTH_PENDING 5
+#define RFCOMM_AUTH_ACCEPT  6
+#define RFCOMM_AUTH_REJECT  7
+#define RFCOMM_DEFER_SETUP  8
 
 /* Scheduling flags and events */
 #define RFCOMM_SCHED_STATE  0
@@ -239,6 +242,7 @@ int  rfcomm_dlc_close(struct rfcomm_dlc *d, int reason);
 int  rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb);
 int  rfcomm_dlc_set_modem_status(struct rfcomm_dlc *d, u8 v24_sig);
 int  rfcomm_dlc_get_modem_status(struct rfcomm_dlc *d, u8 *v24_sig);
+void rfcomm_dlc_accept(struct rfcomm_dlc *d);
 
 #define rfcomm_dlc_lock(d)     spin_lock(&d->lock)
 #define rfcomm_dlc_unlock(d)   spin_unlock(&d->lock)
@@ -304,7 +308,8 @@ struct rfcomm_pinfo {
         struct bt_sock bt;
         struct rfcomm_dlc   *dlc;
         u8     channel;
-        u32    link_mode;
+        u8     sec_level;
+        u8     role_switch;
 };
 
 int  rfcomm_init_sockets(void);
@@ -333,7 +338,6 @@ struct rfcomm_dev_req {
         bdaddr_t src;
         bdaddr_t dst;
         u8       channel;
-        
 };
 
 struct rfcomm_dev_info {
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 23c0ab74ded6..5389afdc1297 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4,6 +4,10 @@
 #include <linux/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/nl80211.h>
+#include <linux/if_ether.h>
+#include <linux/ieee80211.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
 #include <net/genetlink.h>
 /* remove once we remove the wext stuff */
 #include <net/iw_handler.h>
@@ -112,12 +116,14 @@ struct beacon_parameters {
  * @STATION_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
  *      with short preambles
  * @STATION_FLAG_WME: station is WME/QoS capable
+ * @STATION_FLAG_MFP: station uses management frame protection
  */
 enum station_flags {
         STATION_FLAG_CHANGED            = 1<<0,
         STATION_FLAG_AUTHORIZED         = 1<<NL80211_STA_FLAG_AUTHORIZED,
         STATION_FLAG_SHORT_PREAMBLE     = 1<<NL80211_STA_FLAG_SHORT_PREAMBLE,
         STATION_FLAG_WME                = 1<<NL80211_STA_FLAG_WME,
+        STATION_FLAG_MFP                = 1<<NL80211_STA_FLAG_MFP,
 };
 
 /**
@@ -172,6 +178,8 @@ struct station_parameters {
  * @STATION_INFO_SIGNAL: @signal filled
  * @STATION_INFO_TX_BITRATE: @tx_bitrate fields are filled
  *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)
+ * @STATION_INFO_RX_PACKETS: @rx_packets filled
+ * @STATION_INFO_TX_PACKETS: @tx_packets filled
  */
 enum station_info_flags {
         STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -182,6 +190,8 @@ enum station_info_flags {
         STATION_INFO_PLINK_STATE        = 1<<5,
         STATION_INFO_SIGNAL             = 1<<6,
         STATION_INFO_TX_BITRATE         = 1<<7,
+        STATION_INFO_RX_PACKETS         = 1<<8,
+        STATION_INFO_TX_PACKETS         = 1<<9,
 };
 
 /**
@@ -229,6 +239,8 @@ struct rate_info {
  * @plink_state: mesh peer link state
  * @signal: signal strength of last received packet in dBm
  * @txrate: current unicast bitrate to this station
+ * @rx_packets: packets received from this station
+ * @tx_packets: packets transmitted to this station
  */
 struct station_info {
         u32 filled;
@@ -240,6 +252,8 @@ struct station_info {
         u8 plink_state;
         s8 signal;
         struct rate_info txrate;
+        u32 rx_packets;
+        u32 tx_packets;
 };
 
 /**
@@ -335,24 +349,50 @@ struct bss_parameters {
 };
 
 /**
- * enum reg_set_by - Indicates who is trying to set the regulatory domain
- * @REGDOM_SET_BY_INIT: regulatory domain was set by initialization. We will be
- *      using a static world regulatory domain by default.
- * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain.
- * @REGDOM_SET_BY_USER: User asked the wireless core to set the
- *      regulatory domain.
- * @REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the wireless core
- *      it thinks its knows the regulatory domain we should be in.
- * @REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an 802.11 country
- *      information element with regulatory information it thinks we
- *      should consider.
+ * enum environment_cap - Environment parsed from country IE
+ * @ENVIRON_ANY: indicates country IE applies to both indoor and
+ *      outdoor operation.
+ * @ENVIRON_INDOOR: indicates country IE applies only to indoor operation
+ * @ENVIRON_OUTDOOR: indicates country IE applies only to outdoor operation
+ */
+enum environment_cap {
+        ENVIRON_ANY,
+        ENVIRON_INDOOR,
+        ENVIRON_OUTDOOR,
+};
+
+/**
+ * struct regulatory_request - used to keep track of regulatory requests
+ *
+ * @wiphy_idx: this is set if this request's initiator is
+ *      %REGDOM_SET_BY_COUNTRY_IE or %REGDOM_SET_BY_DRIVER. This
+ *      can be used by the wireless core to deal with conflicts
+ *      and potentially inform users of which devices specifically
+ *      cased the conflicts.
+ * @initiator: indicates who sent this request, could be any of
+ *      of those set in nl80211_reg_initiator (%NL80211_REGDOM_SET_BY_*)
+ * @alpha2: the ISO / IEC 3166 alpha2 country code of the requested
+ *      regulatory domain. We have a few special codes:
+ *      00 - World regulatory domain
+ *      99 - built by driver but a specific alpha2 cannot be determined
+ *      98 - result of an intersection between two regulatory domains
+ * @intersect: indicates whether the wireless core should intersect
+ *      the requested regulatory domain with the presently set regulatory
+ *      domain.
+ * @country_ie_checksum: checksum of the last processed and accepted
+ *      country IE
+ * @country_ie_env: lets us know if the AP is telling us we are outdoor,
+ *      indoor, or if it doesn't matter
+ * @list: used to insert into the reg_requests_list linked list
  */
-enum reg_set_by {
-        REGDOM_SET_BY_INIT,
-        REGDOM_SET_BY_CORE,
-        REGDOM_SET_BY_USER,
-        REGDOM_SET_BY_DRIVER,
-        REGDOM_SET_BY_COUNTRY_IE,
+struct regulatory_request {
+        int wiphy_idx;
+        enum nl80211_reg_initiator initiator;
+        char alpha2[2];
+        bool intersect;
+        u32 country_ie_checksum;
+        enum environment_cap country_ie_env;
+        struct list_head list;
 };
 
 struct ieee80211_freq_range {
@@ -438,6 +478,187 @@ struct wiphy;
 struct ieee80211_channel;
 
 /**
+ * struct cfg80211_ssid - SSID description
+ * @ssid: the SSID
+ * @ssid_len: length of the ssid
+ */
+struct cfg80211_ssid {
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        u8 ssid_len;
+};
+
+/**
+ * struct cfg80211_scan_request - scan request description
+ *
+ * @ssids: SSIDs to scan for (active scan only)
+ * @n_ssids: number of SSIDs
+ * @channels: channels to scan on.
+ * @n_channels: number of channels for each band
+ * @ie: optional information element(s) to add into Probe Request or %NULL
+ * @ie_len: length of ie in octets
+ * @wiphy: the wiphy this was for
+ * @ifidx: the interface index
+ */
+struct cfg80211_scan_request {
+        struct cfg80211_ssid *ssids;
+        int n_ssids;
+        struct ieee80211_channel **channels;
+        u32 n_channels;
+        u8 *ie;
+        size_t ie_len;
+
+        /* internal */
+        struct wiphy *wiphy;
+        int ifidx;
+};
+
+/**
+ * enum cfg80211_signal_type - signal type
+ *
+ * @CFG80211_SIGNAL_TYPE_NONE: no signal strength information available
+ * @CFG80211_SIGNAL_TYPE_MBM: signal strength in mBm (100*dBm)
+ * @CFG80211_SIGNAL_TYPE_UNSPEC: signal strength, increasing from 0 through 100
+ */
+enum cfg80211_signal_type {
+        CFG80211_SIGNAL_TYPE_NONE,
+        CFG80211_SIGNAL_TYPE_MBM,
+        CFG80211_SIGNAL_TYPE_UNSPEC,
+};
+
+/**
+ * struct cfg80211_bss - BSS description
+ *
+ * This structure describes a BSS (which may also be a mesh network)
+ * for use in scan results and similar.
+ *
+ * @bssid: BSSID of the BSS
+ * @tsf: timestamp of last received update
+ * @beacon_interval: the beacon interval as from the frame
+ * @capability: the capability field in host byte order
+ * @information_elements: the information elements (Note that there
+ *      is no guarantee that these are well-formed!)
+ * @len_information_elements: total length of the information elements
+ * @signal: signal strength value (type depends on the wiphy's signal_type)
+ * @hold: BSS should not expire
+ * @free_priv: function pointer to free private data
+ * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
+ */
+struct cfg80211_bss {
+        struct ieee80211_channel *channel;
+
+        u8 bssid[ETH_ALEN];
+        u64 tsf;
+        u16 beacon_interval;
+        u16 capability;
+        u8 *information_elements;
+        size_t len_information_elements;
+
+        s32 signal;
+
+        void (*free_priv)(struct cfg80211_bss *bss);
+        u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
+};
+
+/**
+ * struct cfg80211_auth_request - Authentication request data
+ *
+ * This structure provides information needed to complete IEEE 802.11
+ * authentication.
+ * NOTE: This structure will likely change when more code from mac80211 is
+ * moved into cfg80211 so that non-mac80211 drivers can benefit from it, too.
+ * Before using this in a driver that does not use mac80211, it would be better
+ * to check the status of that work and better yet, volunteer to work on it.
+ *
+ * @chan: The channel to use or %NULL if not specified (auto-select based on
+ *      scan results)
+ * @peer_addr: The address of the peer STA (AP BSSID in infrastructure case);
+ *      this field is required to be present; if the driver wants to help with
+ *      BSS selection, it should use (yet to be added) MLME event to allow user
+ *      space SME to be notified of roaming candidate, so that the SME can then
+ *      use the authentication request with the recommended BSSID and whatever
+ *      other data may be needed for authentication/association
+ * @ssid: SSID or %NULL if not yet available
+ * @ssid_len: Length of ssid in octets
+ * @auth_type: Authentication type (algorithm)
+ * @ie: Extra IEs to add to Authentication frame or %NULL
+ * @ie_len: Length of ie buffer in octets
+ */
+struct cfg80211_auth_request {
+        struct ieee80211_channel *chan;
+        u8 *peer_addr;
+        const u8 *ssid;
+        size_t ssid_len;
+        enum nl80211_auth_type auth_type;
+        const u8 *ie;
+        size_t ie_len;
+};
+
+/**
+ * struct cfg80211_assoc_request - (Re)Association request data
+ *
+ * This structure provides information needed to complete IEEE 802.11
+ * (re)association.
+ * NOTE: This structure will likely change when more code from mac80211 is
+ * moved into cfg80211 so that non-mac80211 drivers can benefit from it, too.
+ * Before using this in a driver that does not use mac80211, it would be better
+ * to check the status of that work and better yet, volunteer to work on it.
+ *
+ * @chan: The channel to use or %NULL if not specified (auto-select based on
+ *      scan results)
+ * @peer_addr: The address of the peer STA (AP BSSID); this field is required
+ *      to be present and the STA must be in State 2 (authenticated) with the
+ *      peer STA
+ * @ssid: SSID
+ * @ssid_len: Length of ssid in octets
+ * @ie: Extra IEs to add to (Re)Association Request frame or %NULL
+ * @ie_len: Length of ie buffer in octets
+ */
+struct cfg80211_assoc_request {
+        struct ieee80211_channel *chan;
+        u8 *peer_addr;
+        const u8 *ssid;
+        size_t ssid_len;
+        const u8 *ie;
+        size_t ie_len;
+};
+
+/**
+ * struct cfg80211_deauth_request - Deauthentication request data
+ *
+ * This structure provides information needed to complete IEEE 802.11
+ * deauthentication.
+ *
+ * @peer_addr: The address of the peer STA (AP BSSID); this field is required
+ *      to be present and the STA must be authenticated with the peer STA
+ * @ie: Extra IEs to add to Deauthentication frame or %NULL
+ * @ie_len: Length of ie buffer in octets
+ */
+struct cfg80211_deauth_request {
+        u8 *peer_addr;
+        u16 reason_code;
+        const u8 *ie;
+        size_t ie_len;
+};
+
+/**
+ * struct cfg80211_disassoc_request - Disassociation request data
+ *
+ * This structure provides information needed to complete IEEE 802.11
+ * disassocation.
+ *
+ * @peer_addr: The address of the peer STA (AP BSSID); this field is required
+ *      to be present and the STA must be associated with the peer STA
+ * @ie: Extra IEs to add to Disassociation frame or %NULL
+ * @ie_len: Length of ie buffer in octets
+ */
+struct cfg80211_disassoc_request {
+        u8 *peer_addr;
+        u16 reason_code;
+        const u8 *ie;
+        size_t ie_len;
+};
+
+/**
  * struct cfg80211_ops - backend description for wireless configuration
  *
  * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -450,6 +671,9 @@ struct ieee80211_channel;
  * wireless extensions but this is subject to reevaluation as soon as this
  * code is used more widely and we have a first user without wext.
  *
+ * @suspend: wiphy device needs to be suspended
+ * @resume: wiphy device needs to be resumed
+ *
  * @add_virtual_intf: create a new virtual interface with the given name,
  *      must set the struct wireless_dev's iftype.
  *
@@ -471,6 +695,8 @@ struct ieee80211_channel;
  *
  * @set_default_key: set the default key on an interface
  *
+ * @set_default_mgmt_key: set the default management frame key on an interface
+ *
  * @add_beacon: Add a beacon with given parameters, @head, @interval
  *      and @dtim_period will be valid, @tail is optional.
  * @set_beacon: Change the beacon parameters for an access point mode
@@ -497,8 +723,21 @@ struct ieee80211_channel;
  * @set_txq_params: Set TX queue parameters
  *
  * @set_channel: Set channel
+ *
+ * @scan: Request to do a scan. If returning zero, the scan request is given
+ *      the driver, and will be valid until passed to cfg80211_scan_done().
+ *      For scan results, call cfg80211_inform_bss(); you can call this outside
+ *      the scan/scan_done bracket too.
+ *
+ * @auth: Request to authenticate with the specified peer
+ * @assoc: Request to (re)associate with the specified peer
+ * @deauth: Request to deauthenticate from the specified peer
+ * @disassoc: Request to disassociate from the specified peer
  */
 struct cfg80211_ops {
+        int     (*suspend)(struct wiphy *wiphy);
+        int     (*resume)(struct wiphy *wiphy);
+
         int     (*add_virtual_intf)(struct wiphy *wiphy, char *name,
                                     enum nl80211_iftype type, u32 *flags,
                                     struct vif_params *params);
@@ -518,6 +757,9 @@ struct cfg80211_ops {
         int     (*set_default_key)(struct wiphy *wiphy,
                                    struct net_device *netdev,
                                    u8 key_index);
+        int     (*set_default_mgmt_key)(struct wiphy *wiphy,
+                                        struct net_device *netdev,
+                                        u8 key_index);
 
         int     (*add_beacon)(struct wiphy *wiphy, struct net_device *dev,
                               struct beacon_parameters *info);
@@ -564,6 +806,18 @@ struct cfg80211_ops {
         int     (*set_channel)(struct wiphy *wiphy,
                                struct ieee80211_channel *chan,
                                enum nl80211_channel_type channel_type);
+
+        int     (*scan)(struct wiphy *wiphy, struct net_device *dev,
+                        struct cfg80211_scan_request *request);
+
+        int     (*auth)(struct wiphy *wiphy, struct net_device *dev,
+                        struct cfg80211_auth_request *req);
+        int     (*assoc)(struct wiphy *wiphy, struct net_device *dev,
+                         struct cfg80211_assoc_request *req);
+        int     (*deauth)(struct wiphy *wiphy, struct net_device *dev,
+                          struct cfg80211_deauth_request *req);
+        int     (*disassoc)(struct wiphy *wiphy, struct net_device *dev,
+                            struct cfg80211_disassoc_request *req);
 };
 
 /* temporary wext handlers */
@@ -574,5 +828,134 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
                           u32 *mode, char *extra);
 int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
                           u32 *mode, char *extra);
+int cfg80211_wext_siwscan(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra);
+int cfg80211_wext_giwscan(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_point *data, char *extra);
+int cfg80211_wext_giwrange(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *extra);
+
+/**
+ * cfg80211_scan_done - notify that scan finished
+ *
+ * @request: the corresponding scan request
+ * @aborted: set to true if the scan was aborted for any reason,
+ *      userspace will be notified of that
+ */
+void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted);
+
+/**
+ * cfg80211_inform_bss - inform cfg80211 of a new BSS
+ *
+ * @wiphy: the wiphy reporting the BSS
+ * @bss: the found BSS
+ * @signal: the signal strength, type depends on the wiphy's signal_type
+ * @gfp: context flags
+ *
+ * This informs cfg80211 that BSS information was found and
+ * the BSS should be updated/added.
+ */
+struct cfg80211_bss*
+cfg80211_inform_bss_frame(struct wiphy *wiphy,
+                          struct ieee80211_channel *channel,
+                          struct ieee80211_mgmt *mgmt, size_t len,
+                          s32 signal, gfp_t gfp);
+
+struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,
+                                      struct ieee80211_channel *channel,
+                                      const u8 *bssid,
+                                      const u8 *ssid, size_t ssid_len,
+                                      u16 capa_mask, u16 capa_val);
+static inline struct cfg80211_bss *
+cfg80211_get_ibss(struct wiphy *wiphy,
+                  struct ieee80211_channel *channel,
+                  const u8 *ssid, size_t ssid_len)
+{
+        return cfg80211_get_bss(wiphy, channel, NULL, ssid, ssid_len,
+                                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
+}
+
+struct cfg80211_bss *cfg80211_get_mesh(struct wiphy *wiphy,
+                                       struct ieee80211_channel *channel,
+                                       const u8 *meshid, size_t meshidlen,
+                                       const u8 *meshcfg);
+void cfg80211_put_bss(struct cfg80211_bss *bss);
+/**
+ * cfg80211_unlink_bss - unlink BSS from internal data structures
+ * @wiphy: the wiphy
+ * @bss: the bss to remove
+ *
+ * This function removes the given BSS from the internal data structures
+ * thereby making it no longer show up in scan results etc. Use this
+ * function when you detect a BSS is gone. Normally BSSes will also time
+ * out, so it is not necessary to use this function at all.
+ */
+void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *bss);
+
+/**
+ * cfg80211_send_rx_auth - notification of processed authentication
+ * @dev: network device
+ * @buf: authentication frame (header + body)
+ * @len: length of the frame data
+ *
+ * This function is called whenever an authentication has been processed in
+ * station mode.
+ */
+void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
+
+/**
+ * cfg80211_send_rx_assoc - notification of processed association
+ * @dev: network device
+ * @buf: (re)association response frame (header + body)
+ * @len: length of the frame data
+ *
+ * This function is called whenever a (re)association response has been
+ * processed in station mode.
+ */
+void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len);
+
+/**
+ * cfg80211_send_rx_deauth - notification of processed deauthentication
+ * @dev: network device
+ * @buf: deauthentication frame (header + body)
+ * @len: length of the frame data
+ *
+ * This function is called whenever deauthentication has been processed in
+ * station mode.
+ */
+void cfg80211_send_rx_deauth(struct net_device *dev, const u8 *buf,
+                             size_t len);
+
+/**
+ * cfg80211_send_rx_disassoc - notification of processed disassociation
+ * @dev: network device
+ * @buf: disassociation response frame (header + body)
+ * @len: length of the frame data
+ *
+ * This function is called whenever disassociation has been processed in
+ * station mode.
+ */
+void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf,
+                               size_t len);
+
+/**
+ * cfg80211_hold_bss - exclude bss from expiration
+ * @bss: bss which should not expire
+ *
+ * In a case when the BSS is not updated but it shouldn't expire this
+ * function can be used to mark the BSS to be excluded from expiration.
+ */
+void cfg80211_hold_bss(struct cfg80211_bss *bss);
+
+/**
+ * cfg80211_unhold_bss - remove expiration exception from the BSS
+ * @bss: bss which can expire again
+ *
+ * This function marks the BSS to be expirable again.
+ */
+void cfg80211_unhold_bss(struct cfg80211_bss *bss);
 
 #endif /* __NET_CFG80211_H */
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index bedc7f62e35d..abd443604c9f 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -40,6 +40,7 @@
 #include <linux/net.h>
 #include <linux/skbuff.h>
 #include <net/netlabel.h>
+#include <net/request_sock.h>
 #include <asm/atomic.h>
 
 /* known doi values */
@@ -215,6 +216,10 @@ int cipso_v4_sock_setattr(struct sock *sk,
                           const struct netlbl_lsm_secattr *secattr);
 void cipso_v4_sock_delattr(struct sock *sk);
 int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr);
+int cipso_v4_req_setattr(struct request_sock *req,
+                         const struct cipso_v4_doi *doi_def,
+                         const struct netlbl_lsm_secattr *secattr);
+void cipso_v4_req_delattr(struct request_sock *req);
 int cipso_v4_skbuff_setattr(struct sk_buff *skb,
                             const struct cipso_v4_doi *doi_def,
                             const struct netlbl_lsm_secattr *secattr);
@@ -247,6 +252,18 @@ static inline int cipso_v4_sock_getattr(struct sock *sk,
         return -ENOSYS;
 }
 
+static inline int cipso_v4_req_setattr(struct request_sock *req,
+                                       const struct cipso_v4_doi *doi_def,
+                                       const struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+
+static inline void cipso_v4_req_delattr(struct request_sock *req)
+{
+        return;
+}
+
 static inline int cipso_v4_skbuff_setattr(struct sk_buff *skb,
                                       const struct cipso_v4_doi *doi_def,
                                       const struct netlbl_lsm_secattr *secattr)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 52e97bfca5a1..839f768f9e35 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -1,6 +1,6 @@
 /*
  * include/net/dsa.h - Driver for Distributed Switch Architecture switch chips
- * Copyright (c) 2008 Marvell Semiconductor
+ * Copyright (c) 2008-2009 Marvell Semiconductor
  *
  * 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
@@ -11,23 +11,47 @@
 #ifndef __LINUX_NET_DSA_H
 #define __LINUX_NET_DSA_H
 
-#define DSA_MAX_PORTS   12
+#define DSA_MAX_SWITCHES        4
+#define DSA_MAX_PORTS           12
+
+struct dsa_chip_data {
+        /*
+         * How to access the switch configuration registers.
+         */
+        struct device   *mii_bus;
+        int             sw_addr;
+
+        /*
+         * The names of the switch's ports.  Use "cpu" to
+         * designate the switch port that the cpu is connected to,
+         * "dsa" to indicate that this port is a DSA link to
+         * another switch, NULL to indicate the port is unused,
+         * or any other string to indicate this is a physical port.
+         */
+        char            *port_names[DSA_MAX_PORTS];
+
+        /*
+         * An array (with nr_chips elements) of which element [a]
+         * indicates which port on this switch should be used to
+         * send packets to that are destined for switch a.  Can be
+         * NULL if there is only one switch chip.
+         */
+        s8              *rtable;
+};
 
 struct dsa_platform_data {
         /*
          * Reference to a Linux network interface that connects
-         * to the switch chip.
+         * to the root switch chip of the tree.
          */
         struct device   *netdev;
 
         /*
-         * How to access the switch configuration registers, and
-         * the names of the switch ports (use "cpu" to designate
-         * the switch port that the cpu is connected to).
+         * Info structs describing each of the switch chips
+         * connected via this network interface.
          */
-        struct device   *mii_bus;
-        int             sw_addr;
-        char            *port_names[DSA_MAX_PORTS];
+        int             nr_chips;
+        struct dsa_chip_data    *chip;
 };
 
 extern bool dsa_uses_dsa_tags(void *dsa_ptr);
diff --git a/include/net/ethoc.h b/include/net/ethoc.h
new file mode 100644
index 000000000000..96f3789b27bc
--- /dev/null
+++ b/include/net/ethoc.h
@@ -0,0 +1,22 @@
+/*
+ * linux/include/net/ethoc.h
+ *
+ * Copyright (C) 2008-2009 Avionic Design 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.
+ *
+ * Written by Thierry Reding <thierry.reding@avionic-design.de>
+ */
+
+#ifndef LINUX_NET_ETHOC_H
+#define LINUX_NET_ETHOC_H 1
+
+struct ethoc_platform_data {
+        u8 hwaddr[IFHWADDRLEN];
+        s8 phy_id;
+};
+
+#endif /* !LINUX_NET_ETHOC_H */
+
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
deleted file mode 100644
index adb7cf31f781..000000000000
--- a/include/net/ieee80211.h
+++ /dev/null
@@ -1,1185 +0,0 @@
-/*
- * Merged with mainline ieee80211.h in Aug 2004.  Original ieee802_11
- * remains copyright by the original authors
- *
- * Portions of the merged code are based on Host AP (software wireless
- * LAN access point) driver for Intersil Prism2/2.5/3.
- *
- * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <j@w1.fi>
- * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
- *
- * Adaption to a generic IEEE 802.11 stack by James Ketrenos
- * <jketreno@linux.intel.com>
- * Copyright (c) 2004-2005, Intel Corporation
- *
- * 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. See README and COPYING for
- * more details.
- *
- * API Version History
- * 1.0.x -- Initial version
- * 1.1.x -- Added radiotap, QoS, TIM, ieee80211_geo APIs,
- *          various structure changes, and crypto API init method
- */
-#ifndef IEEE80211_H
-#define IEEE80211_H
-#include <linux/if_ether.h>     /* ETH_ALEN */
-#include <linux/kernel.h>       /* ARRAY_SIZE */
-#include <linux/wireless.h>
-#include <linux/ieee80211.h>
-
-#include <net/lib80211.h>
-
-#define IEEE80211_VERSION "git-1.1.13"
-
-#define IEEE80211_DATA_LEN              2304
-/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
-   6.2.1.1.2.
-
-   The figure in section 7.1.2 suggests a body size of up to 2312
-   bytes is allowed, which is a bit confusing, I suspect this
-   represents the 2304 bytes of real data, plus a possible 8 bytes of
-   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
-
-#define IEEE80211_1ADDR_LEN 10
-#define IEEE80211_2ADDR_LEN 16
-#define IEEE80211_3ADDR_LEN 24
-#define IEEE80211_4ADDR_LEN 30
-#define IEEE80211_FCS_LEN    4
-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
-#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
-
-#define MIN_FRAG_THRESHOLD     256U
-#define MAX_FRAG_THRESHOLD     2346U
-
-/* Frame control field constants */
-#define IEEE80211_FCTL_VERS             0x0003
-#define IEEE80211_FCTL_FTYPE            0x000c
-#define IEEE80211_FCTL_STYPE            0x00f0
-#define IEEE80211_FCTL_TODS             0x0100
-#define IEEE80211_FCTL_FROMDS           0x0200
-#define IEEE80211_FCTL_MOREFRAGS        0x0400
-#define IEEE80211_FCTL_RETRY            0x0800
-#define IEEE80211_FCTL_PM               0x1000
-#define IEEE80211_FCTL_MOREDATA         0x2000
-#define IEEE80211_FCTL_PROTECTED        0x4000
-#define IEEE80211_FCTL_ORDER            0x8000
-
-#define IEEE80211_FTYPE_MGMT            0x0000
-#define IEEE80211_FTYPE_CTL             0x0004
-#define IEEE80211_FTYPE_DATA            0x0008
-
-/* management */
-#define IEEE80211_STYPE_ASSOC_REQ       0x0000
-#define IEEE80211_STYPE_ASSOC_RESP      0x0010
-#define IEEE80211_STYPE_REASSOC_REQ     0x0020
-#define IEEE80211_STYPE_REASSOC_RESP    0x0030
-#define IEEE80211_STYPE_PROBE_REQ       0x0040
-#define IEEE80211_STYPE_PROBE_RESP      0x0050
-#define IEEE80211_STYPE_BEACON          0x0080
-#define IEEE80211_STYPE_ATIM            0x0090
-#define IEEE80211_STYPE_DISASSOC        0x00A0
-#define IEEE80211_STYPE_AUTH            0x00B0
-#define IEEE80211_STYPE_DEAUTH          0x00C0
-#define IEEE80211_STYPE_ACTION          0x00D0
-
-/* control */
-#define IEEE80211_STYPE_PSPOLL          0x00A0
-#define IEEE80211_STYPE_RTS             0x00B0
-#define IEEE80211_STYPE_CTS             0x00C0
-#define IEEE80211_STYPE_ACK             0x00D0
-#define IEEE80211_STYPE_CFEND           0x00E0
-#define IEEE80211_STYPE_CFENDACK        0x00F0
-
-/* data */
-#define IEEE80211_STYPE_DATA            0x0000
-#define IEEE80211_STYPE_DATA_CFACK      0x0010
-#define IEEE80211_STYPE_DATA_CFPOLL     0x0020
-#define IEEE80211_STYPE_DATA_CFACKPOLL  0x0030
-#define IEEE80211_STYPE_NULLFUNC        0x0040
-#define IEEE80211_STYPE_CFACK           0x0050
-#define IEEE80211_STYPE_CFPOLL          0x0060
-#define IEEE80211_STYPE_CFACKPOLL       0x0070
-#define IEEE80211_STYPE_QOS_DATA        0x0080
-
-#define IEEE80211_SCTL_FRAG             0x000F
-#define IEEE80211_SCTL_SEQ              0xFFF0
-
-/* QOS control */
-#define IEEE80211_QCTL_TID              0x000F
-
-/* debug macros */
-
-#ifdef CONFIG_IEEE80211_DEBUG
-extern u32 ieee80211_debug_level;
-#define IEEE80211_DEBUG(level, fmt, args...) \
-do { if (ieee80211_debug_level & (level)) \
-  printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
-         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
-static inline bool ieee80211_ratelimit_debug(u32 level)
-{
-        return (ieee80211_debug_level & level) && net_ratelimit();
-}
-#else
-#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
-static inline bool ieee80211_ratelimit_debug(u32 level)
-{
-        return false;
-}
-#endif                          /* CONFIG_IEEE80211_DEBUG */
-
-/*
- * To use the debug system:
- *
- * If you are defining a new debug classification, simply add it to the #define
- * list here in the form of:
- *
- * #define IEEE80211_DL_xxxx VALUE
- *
- * shifting value to the left one bit from the previous entry.  xxxx should be
- * the name of the classification (for example, WEP)
- *
- * You then need to either add a IEEE80211_xxxx_DEBUG() macro definition for your
- * classification, or use IEEE80211_DEBUG(IEEE80211_DL_xxxx, ...) whenever you want
- * to send output to that classification.
- *
- * To add your debug level to the list of levels seen when you perform
- *
- * % cat /proc/net/ieee80211/debug_level
- *
- * you simply need to add your entry to the ieee80211_debug_level array.
- *
- * If you do not see debug_level in /proc/net/ieee80211 then you do not have
- * CONFIG_IEEE80211_DEBUG defined in your kernel configuration
- *
- */
-
-#define IEEE80211_DL_INFO          (1<<0)
-#define IEEE80211_DL_WX            (1<<1)
-#define IEEE80211_DL_SCAN          (1<<2)
-#define IEEE80211_DL_STATE         (1<<3)
-#define IEEE80211_DL_MGMT          (1<<4)
-#define IEEE80211_DL_FRAG          (1<<5)
-#define IEEE80211_DL_DROP          (1<<7)
-
-#define IEEE80211_DL_TX            (1<<8)
-#define IEEE80211_DL_RX            (1<<9)
-#define IEEE80211_DL_QOS           (1<<31)
-
-#define IEEE80211_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a)
-#define IEEE80211_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a)
-#define IEEE80211_DEBUG_INFO(f, a...)   IEEE80211_DEBUG(IEEE80211_DL_INFO, f, ## a)
-
-#define IEEE80211_DEBUG_WX(f, a...)     IEEE80211_DEBUG(IEEE80211_DL_WX, f, ## a)
-#define IEEE80211_DEBUG_SCAN(f, a...)   IEEE80211_DEBUG(IEEE80211_DL_SCAN, f, ## a)
-#define IEEE80211_DEBUG_STATE(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_STATE, f, ## a)
-#define IEEE80211_DEBUG_MGMT(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_MGMT, f, ## a)
-#define IEEE80211_DEBUG_FRAG(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_FRAG, f, ## a)
-#define IEEE80211_DEBUG_DROP(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_DROP, f, ## a)
-#define IEEE80211_DEBUG_TX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_TX, f, ## a)
-#define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
-#define IEEE80211_DEBUG_QOS(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>       /* ARPHRD_ETHER */
-
-#ifndef WIRELESS_SPY
-#define WIRELESS_SPY            /* enable iwspy support */
-#endif
-#include <net/iw_handler.h>     /* new driver API */
-
-#define ETH_P_PREAUTH 0x88C7    /* IEEE 802.11i pre-authentication */
-
-#ifndef ETH_P_80211_RAW
-#define ETH_P_80211_RAW (ETH_P_ECONET + 1)
-#endif
-
-/* IEEE 802.11 defines */
-
-#define P80211_OUI_LEN 3
-
-struct ieee80211_snap_hdr {
-
-        u8 dsap;                /* always 0xAA */
-        u8 ssap;                /* always 0xAA */
-        u8 ctrl;                /* always 0x03 */
-        u8 oui[P80211_OUI_LEN]; /* organizational universal id */
-
-} __attribute__ ((packed));
-
-#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr)
-
-#define WLAN_FC_GET_VERS(fc) ((fc) & IEEE80211_FCTL_VERS)
-#define WLAN_FC_GET_TYPE(fc) ((fc) & IEEE80211_FCTL_FTYPE)
-#define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE)
-
-#define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)
-#define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-
-/* Action categories - 802.11h */
-enum ieee80211_actioncategories {
-        WLAN_ACTION_SPECTRUM_MGMT = 0,
-        /* Reserved 1-127  */
-        /* Error    128-255 */
-};
-
-/* Action details - 802.11h */
-enum ieee80211_actiondetails {
-        WLAN_ACTION_CATEGORY_MEASURE_REQUEST = 0,
-        WLAN_ACTION_CATEGORY_MEASURE_REPORT = 1,
-        WLAN_ACTION_CATEGORY_TPC_REQUEST = 2,
-        WLAN_ACTION_CATEGORY_TPC_REPORT = 3,
-        WLAN_ACTION_CATEGORY_CHANNEL_SWITCH = 4,
-        /* 5 - 255 Reserved */
-};
-
-#define IEEE80211_STATMASK_SIGNAL (1<<0)
-#define IEEE80211_STATMASK_RSSI (1<<1)
-#define IEEE80211_STATMASK_NOISE (1<<2)
-#define IEEE80211_STATMASK_RATE (1<<3)
-#define IEEE80211_STATMASK_WEMASK 0x7
-
-#define IEEE80211_CCK_MODULATION    (1<<0)
-#define IEEE80211_OFDM_MODULATION   (1<<1)
-
-#define IEEE80211_24GHZ_BAND     (1<<0)
-#define IEEE80211_52GHZ_BAND     (1<<1)
-
-#define IEEE80211_CCK_RATE_1MB                  0x02
-#define IEEE80211_CCK_RATE_2MB                  0x04
-#define IEEE80211_CCK_RATE_5MB                  0x0B
-#define IEEE80211_CCK_RATE_11MB                 0x16
-#define IEEE80211_OFDM_RATE_6MB                 0x0C
-#define IEEE80211_OFDM_RATE_9MB                 0x12
-#define IEEE80211_OFDM_RATE_12MB                0x18
-#define IEEE80211_OFDM_RATE_18MB                0x24
-#define IEEE80211_OFDM_RATE_24MB                0x30
-#define IEEE80211_OFDM_RATE_36MB                0x48
-#define IEEE80211_OFDM_RATE_48MB                0x60
-#define IEEE80211_OFDM_RATE_54MB                0x6C
-#define IEEE80211_BASIC_RATE_MASK               0x80
-
-#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
-#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
-#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
-#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
-#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
-#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
-#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
-#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
-#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
-#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
-#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
-#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
-
-#define IEEE80211_CCK_RATES_MASK                0x0000000F
-#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
-        IEEE80211_CCK_RATE_2MB_MASK)
-#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
-        IEEE80211_CCK_RATE_5MB_MASK | \
-        IEEE80211_CCK_RATE_11MB_MASK)
-
-#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
-#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
-        IEEE80211_OFDM_RATE_12MB_MASK | \
-        IEEE80211_OFDM_RATE_24MB_MASK)
-#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
-        IEEE80211_OFDM_RATE_9MB_MASK  | \
-        IEEE80211_OFDM_RATE_18MB_MASK | \
-        IEEE80211_OFDM_RATE_36MB_MASK | \
-        IEEE80211_OFDM_RATE_48MB_MASK | \
-        IEEE80211_OFDM_RATE_54MB_MASK)
-#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
-                                IEEE80211_CCK_DEFAULT_RATES_MASK)
-
-#define IEEE80211_NUM_OFDM_RATES            8
-#define IEEE80211_NUM_CCK_RATES             4
-#define IEEE80211_OFDM_SHIFT_MASK_A         4
-
-/* NOTE: This data is for statistical purposes; not all hardware provides this
- *       information for frames received.
- *       For ieee80211_rx_mgt, you need to set at least the 'len' parameter.
- */
-struct ieee80211_rx_stats {
-        u32 mac_time;
-        s8 rssi;
-        u8 signal;
-        u8 noise;
-        u16 rate;               /* in 100 kbps */
-        u8 received_channel;
-        u8 control;
-        u8 mask;
-        u8 freq;
-        u16 len;
-        u64 tsf;
-        u32 beacon_time;
-};
-
-/* IEEE 802.11 requires that STA supports concurrent reception of at least
- * three fragmented frames. This define can be increased to support more
- * concurrent frames, but it should be noted that each entry can consume about
- * 2 kB of RAM and increasing cache size will slow down frame reassembly. */
-#define IEEE80211_FRAG_CACHE_LEN 4
-
-struct ieee80211_frag_entry {
-        unsigned long first_frag_time;
-        unsigned int seq;
-        unsigned int last_frag;
-        struct sk_buff *skb;
-        u8 src_addr[ETH_ALEN];
-        u8 dst_addr[ETH_ALEN];
-};
-
-struct ieee80211_stats {
-        unsigned int tx_unicast_frames;
-        unsigned int tx_multicast_frames;
-        unsigned int tx_fragments;
-        unsigned int tx_unicast_octets;
-        unsigned int tx_multicast_octets;
-        unsigned int tx_deferred_transmissions;
-        unsigned int tx_single_retry_frames;
-        unsigned int tx_multiple_retry_frames;
-        unsigned int tx_retry_limit_exceeded;
-        unsigned int tx_discards;
-        unsigned int rx_unicast_frames;
-        unsigned int rx_multicast_frames;
-        unsigned int rx_fragments;
-        unsigned int rx_unicast_octets;
-        unsigned int rx_multicast_octets;
-        unsigned int rx_fcs_errors;
-        unsigned int rx_discards_no_buffer;
-        unsigned int tx_discards_wrong_sa;
-        unsigned int rx_discards_undecryptable;
-        unsigned int rx_message_in_msg_fragments;
-        unsigned int rx_message_in_bad_msg_fragments;
-};
-
-struct ieee80211_device;
-
-#define SEC_KEY_1               (1<<0)
-#define SEC_KEY_2               (1<<1)
-#define SEC_KEY_3               (1<<2)
-#define SEC_KEY_4               (1<<3)
-#define SEC_ACTIVE_KEY          (1<<4)
-#define SEC_AUTH_MODE           (1<<5)
-#define SEC_UNICAST_GROUP       (1<<6)
-#define SEC_LEVEL               (1<<7)
-#define SEC_ENABLED             (1<<8)
-#define SEC_ENCRYPT             (1<<9)
-
-#define SEC_LEVEL_0             0       /* None */
-#define SEC_LEVEL_1             1       /* WEP 40 and 104 bit */
-#define SEC_LEVEL_2             2       /* Level 1 + TKIP */
-#define SEC_LEVEL_2_CKIP        3       /* Level 1 + CKIP */
-#define SEC_LEVEL_3             4       /* Level 2 + CCMP */
-
-#define SEC_ALG_NONE            0
-#define SEC_ALG_WEP             1
-#define SEC_ALG_TKIP            2
-#define SEC_ALG_CCMP            3
-
-#define WEP_KEYS                4
-#define WEP_KEY_LEN             13
-#define SCM_KEY_LEN             32
-#define SCM_TEMPORAL_KEY_LENGTH 16
-
-struct ieee80211_security {
-        u16 active_key:2, enabled:1, unicast_uses_group:1, encrypt:1;
-        u8 auth_mode;
-        u8 encode_alg[WEP_KEYS];
-        u8 key_sizes[WEP_KEYS];
-        u8 keys[WEP_KEYS][SCM_KEY_LEN];
-        u8 level;
-        u16 flags;
-} __attribute__ ((packed));
-
-/*
-
- 802.11 data frame from AP
-
-      ,-------------------------------------------------------------------.
-Bytes |  2   |  2   |    6    |    6    |    6    |  2   | 0..2312 |   4  |
-      |------|------|---------|---------|---------|------|---------|------|
-Desc. | ctrl | dura |  DA/RA  |   TA    |    SA   | Sequ |  frame  |  fcs |
-      |      | tion | (BSSID) |         |         | ence |  data   |      |
-      `-------------------------------------------------------------------'
-
-Total: 28-2340 bytes
-
-*/
-
-#define BEACON_PROBE_SSID_ID_POSITION 12
-
-/* Management Frame Information Element Types */
-enum ieee80211_mfie {
-        MFIE_TYPE_SSID = 0,
-        MFIE_TYPE_RATES = 1,
-        MFIE_TYPE_FH_SET = 2,
-        MFIE_TYPE_DS_SET = 3,
-        MFIE_TYPE_CF_SET = 4,
-        MFIE_TYPE_TIM = 5,
-        MFIE_TYPE_IBSS_SET = 6,
-        MFIE_TYPE_COUNTRY = 7,
-        MFIE_TYPE_HOP_PARAMS = 8,
-        MFIE_TYPE_HOP_TABLE = 9,
-        MFIE_TYPE_REQUEST = 10,
-        MFIE_TYPE_CHALLENGE = 16,
-        MFIE_TYPE_POWER_CONSTRAINT = 32,
-        MFIE_TYPE_POWER_CAPABILITY = 33,
-        MFIE_TYPE_TPC_REQUEST = 34,
-        MFIE_TYPE_TPC_REPORT = 35,
-        MFIE_TYPE_SUPP_CHANNELS = 36,
-        MFIE_TYPE_CSA = 37,
-        MFIE_TYPE_MEASURE_REQUEST = 38,
-        MFIE_TYPE_MEASURE_REPORT = 39,
-        MFIE_TYPE_QUIET = 40,
-        MFIE_TYPE_IBSS_DFS = 41,
-        MFIE_TYPE_ERP_INFO = 42,
-        MFIE_TYPE_RSN = 48,
-        MFIE_TYPE_RATES_EX = 50,
-        MFIE_TYPE_GENERIC = 221,
-        MFIE_TYPE_QOS_PARAMETER = 222,
-};
-
-struct ieee80211_hdr_1addr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 payload[0];
-} __attribute__ ((packed));
-
-struct ieee80211_hdr_2addr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 payload[0];
-} __attribute__ ((packed));
-
-struct ieee80211_hdr_3addr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        __le16 seq_ctl;
-        u8 payload[0];
-} __attribute__ ((packed));
-
-struct ieee80211_hdr_4addr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        __le16 seq_ctl;
-        u8 addr4[ETH_ALEN];
-        u8 payload[0];
-} __attribute__ ((packed));
-
-struct ieee80211_hdr_3addrqos {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        __le16 seq_ctl;
-        u8 payload[0];
-        __le16 qos_ctl;
-} __attribute__ ((packed));
-
-struct ieee80211_info_element {
-        u8 id;
-        u8 len;
-        u8 data[0];
-} __attribute__ ((packed));
-
-/*
- * These are the data types that can make up management packets
- *
-        u16 auth_algorithm;
-        u16 auth_sequence;
-        u16 beacon_interval;
-        u16 capability;
-        u8 current_ap[ETH_ALEN];
-        u16 listen_interval;
-        struct {
-                u16 association_id:14, reserved:2;
-        } __attribute__ ((packed));
-        u32 time_stamp[2];
-        u16 reason;
-        u16 status;
-*/
-
-struct ieee80211_auth {
-        struct ieee80211_hdr_3addr header;
-        __le16 algorithm;
-        __le16 transaction;
-        __le16 status;
-        /* challenge */
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-struct ieee80211_channel_switch {
-        u8 id;
-        u8 len;
-        u8 mode;
-        u8 channel;
-        u8 count;
-} __attribute__ ((packed));
-
-struct ieee80211_action {
-        struct ieee80211_hdr_3addr header;
-        u8 category;
-        u8 action;
-        union {
-                struct ieee80211_action_exchange {
-                        u8 token;
-                        struct ieee80211_info_element info_element[0];
-                } exchange;
-                struct ieee80211_channel_switch channel_switch;
-
-        } format;
-} __attribute__ ((packed));
-
-struct ieee80211_disassoc {
-        struct ieee80211_hdr_3addr header;
-        __le16 reason;
-} __attribute__ ((packed));
-
-/* Alias deauth for disassoc */
-#define ieee80211_deauth ieee80211_disassoc
-
-struct ieee80211_probe_request {
-        struct ieee80211_hdr_3addr header;
-        /* SSID, supported rates */
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-struct ieee80211_probe_response {
-        struct ieee80211_hdr_3addr header;
-        __le32 time_stamp[2];
-        __le16 beacon_interval;
-        __le16 capability;
-        /* SSID, supported rates, FH params, DS params,
-         * CF params, IBSS params, TIM (if beacon), RSN */
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-/* Alias beacon for probe_response */
-#define ieee80211_beacon ieee80211_probe_response
-
-struct ieee80211_assoc_request {
-        struct ieee80211_hdr_3addr header;
-        __le16 capability;
-        __le16 listen_interval;
-        /* SSID, supported rates, RSN */
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-struct ieee80211_reassoc_request {
-        struct ieee80211_hdr_3addr header;
-        __le16 capability;
-        __le16 listen_interval;
-        u8 current_ap[ETH_ALEN];
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-struct ieee80211_assoc_response {
-        struct ieee80211_hdr_3addr header;
-        __le16 capability;
-        __le16 status;
-        __le16 aid;
-        /* supported rates */
-        struct ieee80211_info_element info_element[0];
-} __attribute__ ((packed));
-
-struct ieee80211_txb {
-        u8 nr_frags;
-        u8 encrypted;
-        u8 rts_included;
-        u8 reserved;
-        u16 frag_size;
-        u16 payload_size;
-        struct sk_buff *fragments[0];
-};
-
-/* SWEEP TABLE ENTRIES NUMBER */
-#define MAX_SWEEP_TAB_ENTRIES             42
-#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET  7
-/* MAX_RATES_LENGTH needs to be 12.  The spec says 8, and many APs
- * only use 8, and then use extended rates for the remaining supported
- * rates.  Other APs, however, stick all of their supported rates on the
- * main rates information element... */
-#define MAX_RATES_LENGTH                  ((u8)12)
-#define MAX_RATES_EX_LENGTH               ((u8)16)
-#define MAX_NETWORK_COUNT                  128
-
-#define CRC_LENGTH                 4U
-
-#define MAX_WPA_IE_LEN 64
-
-#define NETWORK_HAS_OFDM       (1<<1)
-#define NETWORK_HAS_CCK        (1<<2)
-
-/* QoS structure */
-#define NETWORK_HAS_QOS_PARAMETERS      (1<<3)
-#define NETWORK_HAS_QOS_INFORMATION     (1<<4)
-#define NETWORK_HAS_QOS_MASK            (NETWORK_HAS_QOS_PARAMETERS | \
-                                         NETWORK_HAS_QOS_INFORMATION)
-
-/* 802.11h */
-#define NETWORK_HAS_POWER_CONSTRAINT    (1<<5)
-#define NETWORK_HAS_CSA                 (1<<6)
-#define NETWORK_HAS_QUIET               (1<<7)
-#define NETWORK_HAS_IBSS_DFS            (1<<8)
-#define NETWORK_HAS_TPC_REPORT          (1<<9)
-
-#define NETWORK_HAS_ERP_VALUE           (1<<10)
-
-#define QOS_QUEUE_NUM                   4
-#define QOS_OUI_LEN                     3
-#define QOS_OUI_TYPE                    2
-#define QOS_ELEMENT_ID                  221
-#define QOS_OUI_INFO_SUB_TYPE           0
-#define QOS_OUI_PARAM_SUB_TYPE          1
-#define QOS_VERSION_1                   1
-#define QOS_AIFSN_MIN_VALUE             2
-
-struct ieee80211_qos_information_element {
-        u8 elementID;
-        u8 length;
-        u8 qui[QOS_OUI_LEN];
-        u8 qui_type;
-        u8 qui_subtype;
-        u8 version;
-        u8 ac_info;
-} __attribute__ ((packed));
-
-struct ieee80211_qos_ac_parameter {
-        u8 aci_aifsn;
-        u8 ecw_min_max;
-        __le16 tx_op_limit;
-} __attribute__ ((packed));
-
-struct ieee80211_qos_parameter_info {
-        struct ieee80211_qos_information_element info_element;
-        u8 reserved;
-        struct ieee80211_qos_ac_parameter ac_params_record[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
-
-struct ieee80211_qos_parameters {
-        __le16 cw_min[QOS_QUEUE_NUM];
-        __le16 cw_max[QOS_QUEUE_NUM];
-        u8 aifs[QOS_QUEUE_NUM];
-        u8 flag[QOS_QUEUE_NUM];
-        __le16 tx_op_limit[QOS_QUEUE_NUM];
-} __attribute__ ((packed));
-
-struct ieee80211_qos_data {
-        struct ieee80211_qos_parameters parameters;
-        int active;
-        int supported;
-        u8 param_count;
-        u8 old_param_count;
-};
-
-struct ieee80211_tim_parameters {
-        u8 tim_count;
-        u8 tim_period;
-} __attribute__ ((packed));
-
-/*******************************************************/
-
-enum {                          /* ieee80211_basic_report.map */
-        IEEE80211_BASIC_MAP_BSS = (1 << 0),
-        IEEE80211_BASIC_MAP_OFDM = (1 << 1),
-        IEEE80211_BASIC_MAP_UNIDENTIFIED = (1 << 2),
-        IEEE80211_BASIC_MAP_RADAR = (1 << 3),
-        IEEE80211_BASIC_MAP_UNMEASURED = (1 << 4),
-        /* Bits 5-7 are reserved */
-
-};
-struct ieee80211_basic_report {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-        u8 map;
-} __attribute__ ((packed));
-
-enum {                          /* ieee80211_measurement_request.mode */
-        /* Bit 0 is reserved */
-        IEEE80211_MEASUREMENT_ENABLE = (1 << 1),
-        IEEE80211_MEASUREMENT_REQUEST = (1 << 2),
-        IEEE80211_MEASUREMENT_REPORT = (1 << 3),
-        /* Bits 4-7 are reserved */
-};
-
-enum {
-        IEEE80211_REPORT_BASIC = 0,     /* required */
-        IEEE80211_REPORT_CCA = 1,       /* optional */
-        IEEE80211_REPORT_RPI = 2,       /* optional */
-        /* 3-255 reserved */
-};
-
-struct ieee80211_measurement_params {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-} __attribute__ ((packed));
-
-struct ieee80211_measurement_request {
-        struct ieee80211_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        struct ieee80211_measurement_params params[0];
-} __attribute__ ((packed));
-
-struct ieee80211_measurement_report {
-        struct ieee80211_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        union {
-                struct ieee80211_basic_report basic[0];
-        } u;
-} __attribute__ ((packed));
-
-struct ieee80211_tpc_report {
-        u8 transmit_power;
-        u8 link_margin;
-} __attribute__ ((packed));
-
-struct ieee80211_channel_map {
-        u8 channel;
-        u8 map;
-} __attribute__ ((packed));
-
-struct ieee80211_ibss_dfs {
-        struct ieee80211_info_element ie;
-        u8 owner[ETH_ALEN];
-        u8 recovery_interval;
-        struct ieee80211_channel_map channel_map[0];
-};
-
-struct ieee80211_csa {
-        u8 mode;
-        u8 channel;
-        u8 count;
-} __attribute__ ((packed));
-
-struct ieee80211_quiet {
-        u8 count;
-        u8 period;
-        u8 duration;
-        u8 offset;
-} __attribute__ ((packed));
-
-struct ieee80211_network {
-        /* These entries are used to identify a unique network */
-        u8 bssid[ETH_ALEN];
-        u8 channel;
-        /* Ensure null-terminated for any debug msgs */
-        u8 ssid[IW_ESSID_MAX_SIZE + 1];
-        u8 ssid_len;
-
-        struct ieee80211_qos_data qos_data;
-
-        /* These are network statistics */
-        struct ieee80211_rx_stats stats;
-        u16 capability;
-        u8 rates[MAX_RATES_LENGTH];
-        u8 rates_len;
-        u8 rates_ex[MAX_RATES_EX_LENGTH];
-        u8 rates_ex_len;
-        unsigned long last_scanned;
-        u8 mode;
-        u32 flags;
-        u32 last_associate;
-        u32 time_stamp[2];
-        u16 beacon_interval;
-        u16 listen_interval;
-        u16 atim_window;
-        u8 erp_value;
-        u8 wpa_ie[MAX_WPA_IE_LEN];
-        size_t wpa_ie_len;
-        u8 rsn_ie[MAX_WPA_IE_LEN];
-        size_t rsn_ie_len;
-        struct ieee80211_tim_parameters tim;
-
-        /* 802.11h info */
-
-        /* Power Constraint - mandatory if spctrm mgmt required */
-        u8 power_constraint;
-
-        /* TPC Report - mandatory if spctrm mgmt required */
-        struct ieee80211_tpc_report tpc_report;
-
-        /* IBSS DFS - mandatory if spctrm mgmt required and IBSS
-         * NOTE: This is variable length and so must be allocated dynamically */
-        struct ieee80211_ibss_dfs *ibss_dfs;
-
-        /* Channel Switch Announcement - optional if spctrm mgmt required */
-        struct ieee80211_csa csa;
-
-        /* Quiet - optional if spctrm mgmt required */
-        struct ieee80211_quiet quiet;
-
-        struct list_head list;
-};
-
-enum ieee80211_state {
-        IEEE80211_UNINITIALIZED = 0,
-        IEEE80211_INITIALIZED,
-        IEEE80211_ASSOCIATING,
-        IEEE80211_ASSOCIATED,
-        IEEE80211_AUTHENTICATING,
-        IEEE80211_AUTHENTICATED,
-        IEEE80211_SHUTDOWN
-};
-
-#define DEFAULT_MAX_SCAN_AGE (15 * HZ)
-#define DEFAULT_FTS 2346
-
-#define CFG_IEEE80211_RESERVE_FCS (1<<0)
-#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
-#define CFG_IEEE80211_RTS (1<<2)
-
-#define IEEE80211_24GHZ_MIN_CHANNEL 1
-#define IEEE80211_24GHZ_MAX_CHANNEL 14
-#define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \
-                                  IEEE80211_24GHZ_MIN_CHANNEL + 1)
-
-#define IEEE80211_52GHZ_MIN_CHANNEL 34
-#define IEEE80211_52GHZ_MAX_CHANNEL 165
-#define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \
-                                  IEEE80211_52GHZ_MIN_CHANNEL + 1)
-
-enum {
-        IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
-        IEEE80211_CH_80211H_RULES = (1 << 1),
-        IEEE80211_CH_B_ONLY = (1 << 2),
-        IEEE80211_CH_NO_IBSS = (1 << 3),
-        IEEE80211_CH_UNIFORM_SPREADING = (1 << 4),
-        IEEE80211_CH_RADAR_DETECT = (1 << 5),
-        IEEE80211_CH_INVALID = (1 << 6),
-};
-
-struct ieee80211_channel {
-        u32 freq;       /* in MHz */
-        u8 channel;
-        u8 flags;
-        u8 max_power;   /* in dBm */
-};
-
-struct ieee80211_geo {
-        u8 name[4];
-        u8 bg_channels;
-        u8 a_channels;
-        struct ieee80211_channel bg[IEEE80211_24GHZ_CHANNELS];
-        struct ieee80211_channel a[IEEE80211_52GHZ_CHANNELS];
-};
-
-struct ieee80211_device {
-        struct net_device *dev;
-        struct ieee80211_security sec;
-
-        /* Bookkeeping structures */
-        struct net_device_stats stats;
-        struct ieee80211_stats ieee_stats;
-
-        struct ieee80211_geo geo;
-
-        /* Probe / Beacon management */
-        struct list_head network_free_list;
-        struct list_head network_list;
-        struct ieee80211_network *networks;
-        int scans;
-        int scan_age;
-
-        int iw_mode;            /* operating mode (IW_MODE_*) */
-        struct iw_spy_data spy_data;    /* iwspy support */
-
-        spinlock_t lock;
-
-        int tx_headroom;        /* Set to size of any additional room needed at front
-                                 * of allocated Tx SKBs */
-        u32 config;
-
-        /* WEP and other encryption related settings at the device level */
-        int open_wep;           /* Set to 1 to allow unencrypted frames */
-
-        int reset_on_keychange; /* Set to 1 if the HW needs to be reset on
-                                 * WEP key changes */
-
-        /* If the host performs {en,de}cryption, then set to 1 */
-        int host_encrypt;
-        int host_encrypt_msdu;
-        int host_decrypt;
-        /* host performs multicast decryption */
-        int host_mc_decrypt;
-
-        /* host should strip IV and ICV from protected frames */
-        /* meaningful only when hardware decryption is being used */
-        int host_strip_iv_icv;
-
-        int host_open_frag;
-        int host_build_iv;
-        int ieee802_1x;         /* is IEEE 802.1X used */
-
-        /* WPA data */
-        int wpa_enabled;
-        int drop_unencrypted;
-        int privacy_invoked;
-        size_t wpa_ie_len;
-        u8 *wpa_ie;
-
-        struct lib80211_crypt_info crypt_info;
-
-        int bcrx_sta_key;       /* use individual keys to override default keys even
-                                 * with RX of broad/multicast frames */
-
-        /* Fragmentation structures */
-        struct ieee80211_frag_entry frag_cache[IEEE80211_FRAG_CACHE_LEN];
-        unsigned int frag_next_idx;
-        u16 fts;                /* Fragmentation Threshold */
-        u16 rts;                /* RTS threshold */
-
-        /* Association info */
-        u8 bssid[ETH_ALEN];
-
-        enum ieee80211_state state;
-
-        int mode;               /* A, B, G */
-        int modulation;         /* CCK, OFDM */
-        int freq_band;          /* 2.4Ghz, 5.2Ghz, Mixed */
-        int abg_true;           /* ABG flag              */
-
-        int perfect_rssi;
-        int worst_rssi;
-
-        u16 prev_seq_ctl;       /* used to drop duplicate frames */
-
-        /* Callback functions */
-        void (*set_security) (struct net_device * dev,
-                              struct ieee80211_security * sec);
-        int (*hard_start_xmit) (struct ieee80211_txb * txb,
-                                struct net_device * dev, int pri);
-        int (*reset_port) (struct net_device * dev);
-        int (*is_queue_full) (struct net_device * dev, int pri);
-
-        int (*handle_management) (struct net_device * dev,
-                                  struct ieee80211_network * network, u16 type);
-        int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
-
-        /* Typical STA methods */
-        int (*handle_auth) (struct net_device * dev,
-                            struct ieee80211_auth * auth);
-        int (*handle_deauth) (struct net_device * dev,
-                              struct ieee80211_deauth * auth);
-        int (*handle_action) (struct net_device * dev,
-                              struct ieee80211_action * action,
-                              struct ieee80211_rx_stats * stats);
-        int (*handle_disassoc) (struct net_device * dev,
-                                struct ieee80211_disassoc * assoc);
-        int (*handle_beacon) (struct net_device * dev,
-                              struct ieee80211_beacon * beacon,
-                              struct ieee80211_network * network);
-        int (*handle_probe_response) (struct net_device * dev,
-                                      struct ieee80211_probe_response * resp,
-                                      struct ieee80211_network * network);
-        int (*handle_probe_request) (struct net_device * dev,
-                                     struct ieee80211_probe_request * req,
-                                     struct ieee80211_rx_stats * stats);
-        int (*handle_assoc_response) (struct net_device * dev,
-                                      struct ieee80211_assoc_response * resp,
-                                      struct ieee80211_network * network);
-
-        /* Typical AP methods */
-        int (*handle_assoc_request) (struct net_device * dev);
-        int (*handle_reassoc_request) (struct net_device * dev,
-                                       struct ieee80211_reassoc_request * req);
-
-        /* This must be the last item so that it points to the data
-         * allocated beyond this structure by alloc_ieee80211 */
-        u8 priv[0];
-};
-
-#define IEEE_A            (1<<0)
-#define IEEE_B            (1<<1)
-#define IEEE_G            (1<<2)
-#define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
-
-static inline void *ieee80211_priv(struct net_device *dev)
-{
-        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
-}
-
-static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,
-                                          int mode)
-{
-        /*
-         * It is possible for both access points and our device to support
-         * combinations of modes, so as long as there is one valid combination
-         * of ap/device supported modes, then return success
-         *
-         */
-        if ((mode & IEEE_A) &&
-            (ieee->modulation & IEEE80211_OFDM_MODULATION) &&
-            (ieee->freq_band & IEEE80211_52GHZ_BAND))
-                return 1;
-
-        if ((mode & IEEE_G) &&
-            (ieee->modulation & IEEE80211_OFDM_MODULATION) &&
-            (ieee->freq_band & IEEE80211_24GHZ_BAND))
-                return 1;
-
-        if ((mode & IEEE_B) &&
-            (ieee->modulation & IEEE80211_CCK_MODULATION) &&
-            (ieee->freq_band & IEEE80211_24GHZ_BAND))
-                return 1;
-
-        return 0;
-}
-
-static inline int ieee80211_get_hdrlen(u16 fc)
-{
-        int hdrlen = IEEE80211_3ADDR_LEN;
-        u16 stype = WLAN_FC_GET_STYPE(fc);
-
-        switch (WLAN_FC_GET_TYPE(fc)) {
-        case IEEE80211_FTYPE_DATA:
-                if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
-                        hdrlen = IEEE80211_4ADDR_LEN;
-                if (stype & IEEE80211_STYPE_QOS_DATA)
-                        hdrlen += 2;
-                break;
-        case IEEE80211_FTYPE_CTL:
-                switch (WLAN_FC_GET_STYPE(fc)) {
-                case IEEE80211_STYPE_CTS:
-                case IEEE80211_STYPE_ACK:
-                        hdrlen = IEEE80211_1ADDR_LEN;
-                        break;
-                default:
-                        hdrlen = IEEE80211_2ADDR_LEN;
-                        break;
-                }
-                break;
-        }
-
-        return hdrlen;
-}
-
-static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
-{
-        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control))) {
-        case IEEE80211_1ADDR_LEN:
-                return ((struct ieee80211_hdr_1addr *)hdr)->payload;
-        case IEEE80211_2ADDR_LEN:
-                return ((struct ieee80211_hdr_2addr *)hdr)->payload;
-        case IEEE80211_3ADDR_LEN:
-                return ((struct ieee80211_hdr_3addr *)hdr)->payload;
-        case IEEE80211_4ADDR_LEN:
-                return ((struct ieee80211_hdr_4addr *)hdr)->payload;
-        }
-        return NULL;
-}
-
-static inline int ieee80211_is_ofdm_rate(u8 rate)
-{
-        switch (rate & ~IEEE80211_BASIC_RATE_MASK) {
-        case IEEE80211_OFDM_RATE_6MB:
-        case IEEE80211_OFDM_RATE_9MB:
-        case IEEE80211_OFDM_RATE_12MB:
-        case IEEE80211_OFDM_RATE_18MB:
-        case IEEE80211_OFDM_RATE_24MB:
-        case IEEE80211_OFDM_RATE_36MB:
-        case IEEE80211_OFDM_RATE_48MB:
-        case IEEE80211_OFDM_RATE_54MB:
-                return 1;
-        }
-        return 0;
-}
-
-static inline int ieee80211_is_cck_rate(u8 rate)
-{
-        switch (rate & ~IEEE80211_BASIC_RATE_MASK) {
-        case IEEE80211_CCK_RATE_1MB:
-        case IEEE80211_CCK_RATE_2MB:
-        case IEEE80211_CCK_RATE_5MB:
-        case IEEE80211_CCK_RATE_11MB:
-                return 1;
-        }
-        return 0;
-}
-
-/* ieee80211.c */
-extern void free_ieee80211(struct net_device *dev);
-extern struct net_device *alloc_ieee80211(int sizeof_priv);
-
-extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
-
-/* ieee80211_tx.c */
-extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev);
-extern void ieee80211_txb_free(struct ieee80211_txb *);
-
-/* ieee80211_rx.c */
-extern void ieee80211_rx_any(struct ieee80211_device *ieee,
-                     struct sk_buff *skb, struct ieee80211_rx_stats *stats);
-extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
-                        struct ieee80211_rx_stats *rx_stats);
-/* make sure to set stats->len */
-extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
-                             struct ieee80211_hdr_4addr *header,
-                             struct ieee80211_rx_stats *stats);
-extern void ieee80211_network_reset(struct ieee80211_network *network);
-
-/* ieee80211_geo.c */
-extern const struct ieee80211_geo *ieee80211_get_geo(struct ieee80211_device
-                                                     *ieee);
-extern int ieee80211_set_geo(struct ieee80211_device *ieee,
-                             const struct ieee80211_geo *geo);
-
-extern int ieee80211_is_valid_channel(struct ieee80211_device *ieee,
-                                      u8 channel);
-extern int ieee80211_channel_to_index(struct ieee80211_device *ieee,
-                                      u8 channel);
-extern u8 ieee80211_freq_to_channel(struct ieee80211_device *ieee, u32 freq);
-extern u8 ieee80211_get_channel_flags(struct ieee80211_device *ieee,
-                                      u8 channel);
-extern const struct ieee80211_channel *ieee80211_get_channel(struct
-                                                             ieee80211_device
-                                                             *ieee, u8 channel);
-extern u32 ieee80211_channel_to_freq(struct ieee80211_device * ieee,
-                                      u8 channel);
-
-/* ieee80211_wx.c */
-extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *wrqu, char *key);
-extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *wrqu, char *key);
-extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *wrqu, char *key);
-extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *wrqu, char *extra);
-extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *wrqu, char *extra);
-
-static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
-{
-        ieee->scans++;
-}
-
-static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
-{
-        return ieee->scans;
-}
-
-#endif                          /* IEEE80211_H */
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 384698cb773a..23c3f3d97779 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -230,8 +230,10 @@ enum ieee80211_radiotap_type {
                                                  * 802.11 header and payload
                                                  * (to 32-bit boundary)
                                                  */
+#define IEEE80211_RADIOTAP_F_BADFCS     0x40    /* bad FCS */
+
 /* For IEEE80211_RADIOTAP_RX_FLAGS */
-#define IEEE80211_RADIOTAP_F_RX_BADFCS  0x0001  /* frame failed crc check */
+#define IEEE80211_RADIOTAP_F_RX_BADPLCP 0x0002  /* frame has bad PLCP */
 
 /* For IEEE80211_RADIOTAP_TX_FLAGS */
 #define IEEE80211_RADIOTAP_F_TX_FAIL    0x0001  /* failed due to excessive
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index c8effa4b1feb..38b78132019b 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -39,8 +39,6 @@ struct inet6_ifaddr
         
         __u32                   valid_lft;
         __u32                   prefered_lft;
-        unsigned long           cstamp; /* created timestamp */
-        unsigned long           tstamp; /* updated timestamp */
         atomic_t                refcnt;
         spinlock_t              lock;
 
@@ -49,6 +47,9 @@ struct inet6_ifaddr
 
         __u16                   scope;
 
+        unsigned long           cstamp; /* created timestamp */
+        unsigned long           tstamp; /* updated timestamp */
+
         struct timer_list       timer;
 
         struct inet6_dev        *idev;
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 7040a782c656..9b5d08f4f6e8 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -113,12 +113,12 @@ static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
 static inline int INET_ECN_set_ce(struct sk_buff *skb)
 {
         switch (skb->protocol) {
-        case __constant_htons(ETH_P_IP):
+        case cpu_to_be16(ETH_P_IP):
                 if (skb->network_header + sizeof(struct iphdr) <= skb->tail)
                         return IP_ECN_set_ce(ip_hdr(skb));
                 break;
 
-        case __constant_htons(ETH_P_IPV6):
+        case cpu_to_be16(ETH_P_IPV6):
                 if (skb->network_header + sizeof(struct ipv6hdr) <= skb->tail)
                         return IP6_ECN_set_ce(ipv6_hdr(skb));
                 break;
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index e081eefd6f47..39f2dc943908 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -61,7 +61,8 @@ void inet_frag_destroy(struct inet_frag_queue *q,
                                 struct inet_frags *f, int *work);
 int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f);
 struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,
-                struct inet_frags *f, void *key, unsigned int hash);
+                struct inet_frags *f, void *key, unsigned int hash)
+        __releases(&f->lock);
 
 static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
 {
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index d0a043153cc6..a44e2248b2ef 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -82,6 +82,7 @@ struct inet_bind_bucket {
 #endif
         unsigned short          port;
         signed short            fastreuse;
+        int                     num_owners;
         struct hlist_node       node;
         struct hlist_head       owners;
 };
@@ -133,7 +134,7 @@ struct inet_hashinfo {
         struct inet_bind_hashbucket     *bhash;
 
         unsigned int                    bhash_size;
-        /* Note : 4 bytes padding on 64 bit arches */
+        /* 4 bytes hole on 64 bit */
 
         struct kmem_cache               *bind_bucket_cachep;
 
@@ -150,6 +151,7 @@ struct inet_hashinfo {
         struct inet_listen_hashbucket   listening_hash[INET_LHTABLE_SIZE]
                                         ____cacheline_aligned_in_smp;
 
+        atomic_t                        bsockets;
 };
 
 static inline struct inet_ehash_bucket *inet_ehash_bucket(
diff --git a/include/net/ip.h b/include/net/ip.h
index 10868139e656..4ac7577f98d0 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -55,6 +55,7 @@ struct ipcm_cookie
         __be32                  addr;
         int                     oif;
         struct ip_options       *opt;
+        union skb_shared_tx     shtx;
 };
 
 #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index ab9b003ab671..bbae1e87efcd 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -184,8 +184,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
 /*
  *      The port number of FTP service (in network order).
  */
-#define FTPPORT  __constant_htons(21)
-#define FTPDATA  __constant_htons(20)
+#define FTPPORT  cpu_to_be16(21)
+#define FTPDATA  cpu_to_be16(20)
 
 /*
  *      TCP State Values
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 6d5b58a1c743..c1f16fc49ade 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -196,8 +196,8 @@ struct ip6_flowlabel
         struct net              *fl_net;
 };
 
-#define IPV6_FLOWINFO_MASK      __constant_htonl(0x0FFFFFFF)
-#define IPV6_FLOWLABEL_MASK     __constant_htonl(0x000FFFFF)
+#define IPV6_FLOWINFO_MASK      cpu_to_be32(0x0FFFFFFF)
+#define IPV6_FLOWLABEL_MASK     cpu_to_be32(0x000FFFFF)
 
 struct ipv6_fl_socklist
 {
diff --git a/include/net/ipx.h b/include/net/ipx.h
index 4cc0b4eca948..a14121dd1932 100644
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -27,7 +27,7 @@ struct ipx_address {
 
 struct ipxhdr {
         __be16                  ipx_checksum __attribute__ ((packed));
-#define IPX_NO_CHECKSUM __constant_htons(0xFFFF)
+#define IPX_NO_CHECKSUM cpu_to_be16(0xFFFF)
         __be16                  ipx_pktsize __attribute__ ((packed));
         __u8                    ipx_tctrl;
         __u8                    ipx_type;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 559422fc0943..3b83a80e3fe0 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -93,12 +93,9 @@ struct ieee80211_ht_bss_info {
  * enum ieee80211_max_queues - maximum number of queues
  *
  * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.
- * @IEEE80211_MAX_AMPDU_QUEUES: Maximum number of queues usable
- *      for A-MPDU operation.
  */
 enum ieee80211_max_queues {
-        IEEE80211_MAX_QUEUES =          16,
-        IEEE80211_MAX_AMPDU_QUEUES =    16,
+        IEEE80211_MAX_QUEUES =          4,
 };
 
 /**
@@ -207,7 +204,7 @@ struct ieee80211_bss_conf {
         u16 beacon_int;
         u16 assoc_capability;
         u64 timestamp;
-        u64 basic_rates;
+        u32 basic_rates;
         struct ieee80211_bss_ht_conf ht;
 };
 
@@ -245,6 +242,12 @@ struct ieee80211_bss_conf {
  * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be
  *      set by rate control algorithms to indicate probe rate, will
  *      be cleared for fragmented frames (except on the last fragment)
+ * @IEEE80211_TX_INTFL_RCALGO: mac80211 internal flag, do not test or
+ *      set this flag in the driver; indicates that the rate control
+ *      algorithm was used and should be notified of TX status
+ * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211,
+ *      used to indicate that a pending frame requires TX processing before
+ *      it can be sent out.
  */
 enum mac80211_tx_control_flags {
         IEEE80211_TX_CTL_REQ_TX_STATUS          = BIT(0),
@@ -260,8 +263,30 @@ enum mac80211_tx_control_flags {
         IEEE80211_TX_STAT_AMPDU                 = BIT(10),
         IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(11),
         IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(12),
+        IEEE80211_TX_INTFL_RCALGO               = BIT(13),
+        IEEE80211_TX_INTFL_NEED_TXPROCESSING    = BIT(14),
 };
 
+/**
+ * enum mac80211_rate_control_flags - per-rate flags set by the
+ *      Rate Control algorithm.
+ *
+ * These flags are set by the Rate control algorithm for each rate during tx,
+ * in the @flags member of struct ieee80211_tx_rate.
+ *
+ * @IEEE80211_TX_RC_USE_RTS_CTS: Use RTS/CTS exchange for this rate.
+ * @IEEE80211_TX_RC_USE_CTS_PROTECT: CTS-to-self protection is required.
+ *      This is set if the current BSS requires ERP protection.
+ * @IEEE80211_TX_RC_USE_SHORT_PREAMBLE: Use short preamble.
+ * @IEEE80211_TX_RC_MCS: HT rate.
+ * @IEEE80211_TX_RC_GREEN_FIELD: Indicates whether this rate should be used in
+ *      Greenfield mode.
+ * @IEEE80211_TX_RC_40_MHZ_WIDTH: Indicates if the Channel Width should be 40 MHz.
+ * @IEEE80211_TX_RC_DUP_DATA: The frame should be transmitted on both of the
+ *      adjacent 20 MHz channels, if the current channel type is
+ *      NL80211_CHAN_HT40MINUS or NL80211_CHAN_HT40PLUS.
+ * @IEEE80211_TX_RC_SHORT_GI: Short Guard interval should be used for this rate.
+ */
 enum mac80211_rate_control_flags {
         IEEE80211_TX_RC_USE_RTS_CTS             = BIT(0),
         IEEE80211_TX_RC_USE_CTS_PROTECT         = BIT(1),
@@ -500,17 +525,6 @@ enum ieee80211_conf_flags {
         IEEE80211_CONF_PS               = (1<<1),
 };
 
-/* XXX: remove all this once drivers stop trying to use it */
-static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
-{
-        return 0;
-}
-#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
-
-struct ieee80211_ht_conf {
-        bool enabled;
-        enum nl80211_channel_type channel_type;
-};
 
 /**
  * enum ieee80211_conf_changed - denotes which configuration changed
@@ -520,10 +534,10 @@ struct ieee80211_ht_conf {
  * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
  * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
  * @IEEE80211_CONF_CHANGE_PS: the PS flag changed
+ * @IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT: the dynamic PS timeout changed
  * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
- * @IEEE80211_CONF_CHANGE_CHANNEL: the channel changed
+ * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed
  * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
- * @IEEE80211_CONF_CHANGE_HT: HT configuration changed
  */
 enum ieee80211_conf_changed {
         IEEE80211_CONF_CHANGE_RADIO_ENABLED     = BIT(0),
@@ -531,10 +545,10 @@ enum ieee80211_conf_changed {
         IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
         IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
         IEEE80211_CONF_CHANGE_PS                = BIT(4),
-        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
-        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
-        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
-        IEEE80211_CONF_CHANGE_HT                = BIT(8),
+        IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT     = BIT(5),
+        IEEE80211_CONF_CHANGE_POWER             = BIT(6),
+        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(7),
+        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(8),
 };
 
 /**
@@ -547,8 +561,9 @@ enum ieee80211_conf_changed {
  * @listen_interval: listen interval in units of beacon interval
  * @flags: configuration flags defined above
  * @power_level: requested transmit power (in dBm)
+ * @dynamic_ps_timeout: dynamic powersave timeout (in ms)
  * @channel: the channel to tune to
- * @ht: the HT configuration for the device
+ * @channel_type: the channel (HT) type
  * @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
  *    (a frame not RTS protected), called "dot11LongRetryLimit" in 802.11,
  *    but actually means the number of transmissions not the number of retries
@@ -559,7 +574,7 @@ enum ieee80211_conf_changed {
 struct ieee80211_conf {
         int beacon_int;
         u32 flags;
-        int power_level;
+        int power_level, dynamic_ps_timeout;
 
         u16 listen_interval;
         bool radio_enabled;
@@ -567,7 +582,7 @@ struct ieee80211_conf {
         u8 long_frame_max_tx_count, short_frame_max_tx_count;
 
         struct ieee80211_channel *channel;
-        struct ieee80211_ht_conf ht;
+        enum nl80211_channel_type channel_type;
 };
 
 /**
@@ -630,10 +645,12 @@ struct ieee80211_if_init_conf {
  * @IEEE80211_IFCC_BSSID: The BSSID changed.
  * @IEEE80211_IFCC_BEACON: The beacon for this interface changed
  *      (currently AP and MESH only), use ieee80211_beacon_get().
+ * @IEEE80211_IFCC_BEACON_ENABLED: The enable_beacon value changed.
  */
 enum ieee80211_if_conf_change {
-        IEEE80211_IFCC_BSSID    = BIT(0),
-        IEEE80211_IFCC_BEACON   = BIT(1),
+        IEEE80211_IFCC_BSSID            = BIT(0),
+        IEEE80211_IFCC_BEACON           = BIT(1),
+        IEEE80211_IFCC_BEACON_ENABLED   = BIT(2),
 };
 
 /**
@@ -641,13 +658,16 @@ enum ieee80211_if_conf_change {
  *
  * @changed: parameters that have changed, see &enum ieee80211_if_conf_change.
  * @bssid: BSSID of the network we are associated to/creating.
+ * @enable_beacon: Indicates whether beacons can be sent.
+ *      This is valid only for AP/IBSS/MESH modes.
  *
  * This structure is passed to the config_interface() callback of
  * &struct ieee80211_hw.
  */
 struct ieee80211_if_conf {
         u32 changed;
-        u8 *bssid;
+        const u8 *bssid;
+        bool enable_beacon;
 };
 
 /**
@@ -655,11 +675,13 @@ struct ieee80211_if_conf {
  * @ALG_WEP: WEP40 or WEP104
  * @ALG_TKIP: TKIP
  * @ALG_CCMP: CCMP (AES)
+ * @ALG_AES_CMAC: AES-128-CMAC
  */
 enum ieee80211_key_alg {
         ALG_WEP,
         ALG_TKIP,
         ALG_CCMP,
+        ALG_AES_CMAC,
 };
 
 /**
@@ -688,12 +710,16 @@ enum ieee80211_key_len {
  *      generation in software.
  * @IEEE80211_KEY_FLAG_PAIRWISE: Set by mac80211, this flag indicates
  *      that the key is pairwise rather then a shared key.
+ * @IEEE80211_KEY_FLAG_SW_MGMT: This flag should be set by the driver for a
+ *      CCMP key if it requires CCMP encryption of management frames (MFP) to
+ *      be done in software.
  */
 enum ieee80211_key_flags {
         IEEE80211_KEY_FLAG_WMM_STA      = 1<<0,
         IEEE80211_KEY_FLAG_GENERATE_IV  = 1<<1,
         IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2,
         IEEE80211_KEY_FLAG_PAIRWISE     = 1<<3,
+        IEEE80211_KEY_FLAG_SW_MGMT      = 1<<4,
 };
 
 /**
@@ -714,8 +740,8 @@ enum ieee80211_key_flags {
  *      - Temporal Encryption Key (128 bits)
  *      - Temporal Authenticator Tx MIC Key (64 bits)
  *      - Temporal Authenticator Rx MIC Key (64 bits)
- * @icv_len: FIXME
- * @iv_len: FIXME
+ * @icv_len: The ICV length for this key type
+ * @iv_len: The IV length for this key type
  */
 struct ieee80211_key_conf {
         enum ieee80211_key_alg alg;
@@ -759,7 +785,7 @@ enum set_key_cmd {
  *      sizeof(void *), size is determined in hw information.
  */
 struct ieee80211_sta {
-        u64 supp_rates[IEEE80211_NUM_BANDS];
+        u32 supp_rates[IEEE80211_NUM_BANDS];
         u8 addr[ETH_ALEN];
         u16 aid;
         struct ieee80211_sta_ht_cap ht_cap;
@@ -833,11 +859,6 @@ enum ieee80211_tkip_key_type {
  *      expect values between 0 and @max_signal.
  *      If possible please provide dB or dBm instead.
  *
- * @IEEE80211_HW_SIGNAL_DB:
- *      Hardware gives signal values in dB, decibel difference from an
- *      arbitrary, fixed reference. We expect values between 0 and @max_signal.
- *      If possible please provide dBm instead.
- *
  * @IEEE80211_HW_SIGNAL_DBM:
  *      Hardware gives signal values in dBm, decibel difference from
  *      one milliwatt. This is the preferred method since it is standardized
@@ -854,10 +875,22 @@ enum ieee80211_tkip_key_type {
  * @IEEE80211_HW_AMPDU_AGGREGATION:
  *      Hardware supports 11n A-MPDU aggregation.
  *
- * @IEEE80211_HW_NO_STACK_DYNAMIC_PS:
- *      Hardware which has dynamic power save support, meaning
- *      that power save is enabled in idle periods, and don't need support
- *      from stack.
+ * @IEEE80211_HW_SUPPORTS_PS:
+ *      Hardware has power save support (i.e. can go to sleep).
+ *
+ * @IEEE80211_HW_PS_NULLFUNC_STACK:
+ *      Hardware requires nullfunc frame handling in stack, implies
+ *      stack support for dynamic PS.
+ *
+ * @IEEE80211_HW_SUPPORTS_DYNAMIC_PS:
+ *      Hardware has support for dynamic PS.
+ *
+ * @IEEE80211_HW_MFP_CAPABLE:
+ *      Hardware supports management frame protection (MFP, IEEE 802.11w).
+ *
+ * @IEEE80211_HW_BEACON_FILTER:
+ *      Hardware supports dropping of irrelevant beacon frames to
+ *      avoid waking up cpu.
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
@@ -865,12 +898,15 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE          = 1<<3,
         IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE      = 1<<4,
         IEEE80211_HW_SIGNAL_UNSPEC                      = 1<<5,
-        IEEE80211_HW_SIGNAL_DB                          = 1<<6,
-        IEEE80211_HW_SIGNAL_DBM                         = 1<<7,
-        IEEE80211_HW_NOISE_DBM                          = 1<<8,
-        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<9,
-        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<10,
-        IEEE80211_HW_NO_STACK_DYNAMIC_PS                = 1<<11,
+        IEEE80211_HW_SIGNAL_DBM                         = 1<<6,
+        IEEE80211_HW_NOISE_DBM                          = 1<<7,
+        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<8,
+        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<9,
+        IEEE80211_HW_SUPPORTS_PS                        = 1<<10,
+        IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<11,
+        IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<12,
+        IEEE80211_HW_MFP_CAPABLE                        = 1<<13,
+        IEEE80211_HW_BEACON_FILTER                      = 1<<14,
 };
 
 /**
@@ -890,9 +926,8 @@ enum ieee80211_hw_flags {
  * @workqueue: single threaded workqueue available for driver use,
  *      allocated by mac80211 on registration and flushed when an
  *      interface is removed.
- *      NOTICE: All work performed on this workqueue should NEVER
- *      acquire the RTNL lock (i.e. Don't use the function
- *      ieee80211_iterate_active_interfaces())
+ *      NOTICE: All work performed on this workqueue must not
+ *      acquire the RTNL lock.
  *
  * @priv: pointer to private area that was allocated for driver use
  *      along with this structure.
@@ -914,12 +949,6 @@ enum ieee80211_hw_flags {
  *      data packets. WMM/QoS requires at least four, these
  *      queues need to have configurable access parameters.
  *
- * @ampdu_queues: number of available hardware transmit queues
- *      for A-MPDU packets, these have no access parameters
- *      because they're used only for A-MPDU frames. Note that
- *      mac80211 will not currently use any of the regular queues
- *      for aggregation.
- *
  * @rate_control_algorithm: rate control algorithm for this hardware.
  *      If unset (NULL), the default algorithm will be used. Must be
  *      set before calling ieee80211_register_hw().
@@ -944,7 +973,6 @@ struct ieee80211_hw {
         int vif_data_size;
         int sta_data_size;
         u16 queues;
-        u16 ampdu_queues;
         u16 max_listen_interval;
         s8 max_signal;
         u8 max_rates;
@@ -952,6 +980,19 @@ struct ieee80211_hw {
 };
 
 /**
+ * wiphy_to_ieee80211_hw - return a mac80211 driver hw struct from a wiphy
+ *
+ * @wiphy: the &struct wiphy which we want to query
+ *
+ * mac80211 drivers can use this to get to their respective
+ * &struct ieee80211_hw. Drivers wishing to get to their own private
+ * structure can then access it via hw->priv. Note that mac802111 drivers should
+ * not use wiphy_priv() to try to get their private driver structure as this
+ * is already used internally by mac80211.
+ */
+struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy);
+
+/**
  * SET_IEEE80211_DEV - set device for 802.11 hardware
  *
  * @hw: the &struct ieee80211_hw to set the device for
@@ -973,16 +1014,6 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr)
         memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN);
 }
 
-static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw)
-{
-        return hw->queues;
-}
-
-static inline int ieee80211_num_queues(struct ieee80211_hw *hw)
-{
-        return hw->queues + hw->ampdu_queues;
-}
-
 static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                       const struct ieee80211_tx_info *c)
@@ -1018,16 +1049,12 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
  *
  * The set_key() callback in the &struct ieee80211_ops for a given
  * device is called to enable hardware acceleration of encryption and
- * decryption. The callback takes an @address parameter that will be
- * the broadcast address for default keys, the other station's hardware
- * address for individual keys or the zero address for keys that will
- * be used only for transmission.
+ * decryption. The callback takes a @sta parameter that will be NULL
+ * for default keys or keys used for transmission only, or point to
+ * the station information for the peer for individual keys.
  * Multiple transmission keys with the same key index may be used when
  * VLANs are configured for an access point.
  *
- * The @local_address parameter will always be set to our own address,
- * this is only relevant if you support multiple local addresses.
- *
  * When transmitting, the TX control data will use the @hw_key_idx
  * selected by the driver by modifying the &struct ieee80211_key_conf
  * pointed to by the @key parameter to the set_key() function.
@@ -1061,6 +1088,60 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
  */
 
 /**
+ * DOC: Powersave support
+ *
+ * mac80211 has support for various powersave implementations.
+ *
+ * First, it can support hardware that handles all powersaving by
+ * itself, such hardware should simply set the %IEEE80211_HW_SUPPORTS_PS
+ * hardware flag. In that case, it will be told about the desired
+ * powersave mode depending on the association status, and the driver
+ * must take care of sending nullfunc frames when necessary, i.e. when
+ * entering and leaving powersave mode. The driver is required to look at
+ * the AID in beacons and signal to the AP that it woke up when it finds
+ * traffic directed to it. This mode supports dynamic PS by simply
+ * enabling/disabling PS.
+ *
+ * Additionally, such hardware may set the %IEEE80211_HW_SUPPORTS_DYNAMIC_PS
+ * flag to indicate that it can support dynamic PS mode itself (see below).
+ *
+ * Other hardware designs cannot send nullfunc frames by themselves and also
+ * need software support for parsing the TIM bitmap. This is also supported
+ * by mac80211 by combining the %IEEE80211_HW_SUPPORTS_PS and
+ * %IEEE80211_HW_PS_NULLFUNC_STACK flags. The hardware is of course still
+ * required to pass up beacons. Additionally, in this case, mac80211 will
+ * wake up the hardware when multicast traffic is announced in the beacon.
+ *
+ * FIXME: I don't think we can be fast enough in software when we want to
+ *        receive multicast traffic?
+ *
+ * Dynamic powersave mode is an extension to normal powersave mode in which
+ * the hardware stays awake for a user-specified period of time after sending
+ * a frame so that reply frames need not be buffered and therefore delayed
+ * to the next wakeup. This can either be supported by hardware, in which case
+ * the driver needs to look at the @dynamic_ps_timeout hardware configuration
+ * value, or by the stack if all nullfunc handling is in the stack.
+ */
+
+/**
+ * DOC: Beacon filter support
+ *
+ * Some hardware have beacon filter support to reduce host cpu wakeups
+ * which will reduce system power consumption. It usuallly works so that
+ * the firmware creates a checksum of the beacon but omits all constantly
+ * changing elements (TSF, TIM etc). Whenever the checksum changes the
+ * beacon is forwarded to the host, otherwise it will be just dropped. That
+ * way the host will only receive beacons where some relevant information
+ * (for example ERP protection or WMM settings) have changed.
+ *
+ * Beacon filter support is informed with %IEEE80211_HW_BEACON_FILTER flag.
+ * The driver needs to enable beacon filter support whenever power save is
+ * enabled, that is %IEEE80211_CONF_PS is set. When power save is enabled,
+ * the stack will not check for beacon miss at all and the driver needs to
+ * notify about complete loss of beacons with ieee80211_beacon_loss().
+ */
+
+/**
  * DOC: Frame filtering
  *
  * mac80211 requires to see many management frames for proper
@@ -1149,14 +1230,14 @@ enum ieee80211_filter_flags {
  * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
  * @IEEE80211_AMPDU_TX_START: start Tx aggregation
  * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
- * @IEEE80211_AMPDU_TX_RESUME: resume TX aggregation
+ * @IEEE80211_AMPDU_TX_OPERATIONAL: TX aggregation has become operational
  */
 enum ieee80211_ampdu_mlme_action {
         IEEE80211_AMPDU_RX_START,
         IEEE80211_AMPDU_RX_STOP,
         IEEE80211_AMPDU_TX_START,
         IEEE80211_AMPDU_TX_STOP,
-        IEEE80211_AMPDU_TX_RESUME,
+        IEEE80211_AMPDU_TX_OPERATIONAL,
 };
 
 /**
@@ -1172,6 +1253,8 @@ enum ieee80211_ampdu_mlme_action {
  *      configuration in the TX control data. This handler should,
  *      preferably, never fail and stop queues appropriately, more
  *      importantly, however, it must never fail for A-MPDU-queues.
+ *      This function should return NETDEV_TX_OK except in very
+ *      limited cases.
  *      Must be implemented and atomic.
  *
  * @start: Called before the first netdevice attached to the hardware
@@ -1212,9 +1295,12 @@ enum ieee80211_ampdu_mlme_action {
  *
  * @config: Handler for configuration requests. IEEE 802.11 code calls this
  *      function to change hardware configuration, e.g., channel.
+ *      This function should never fail but returns a negative error code
+ *      if it does.
  *
  * @config_interface: Handler for configuration requests related to interfaces
  *      (e.g. BSSID changes.)
+ *      Returns a negative error code which will be seen in userspace.
  *
  * @bss_info_changed: Handler for configuration requests related to BSS
  *      parameters that may vary during BSS's lifespan, and may affect low
@@ -1232,8 +1318,9 @@ enum ieee80211_ampdu_mlme_action {
  *
  * @set_key: See the section "Hardware crypto acceleration"
  *      This callback can sleep, and is only called between add_interface
- *      and remove_interface calls, i.e. while the interface with the
- *      given local_address is enabled.
+ *      and remove_interface calls, i.e. while the given virtual interface
+ *      is enabled.
+ *      Returns a negative error code if the key can't be added.
  *
  * @update_tkip_key: See the section "Hardware crypto acceleration"
  *      This callback will be called in the context of Rx. Called for drivers
@@ -1241,12 +1328,22 @@ enum ieee80211_ampdu_mlme_action {
  *
  * @hw_scan: Ask the hardware to service the scan request, no need to start
  *      the scan state machine in stack. The scan must honour the channel
- *      configuration done by the regulatory agent in the wiphy's registered
- *      bands. When the scan finishes, ieee80211_scan_completed() must be
- *      called; note that it also must be called when the scan cannot finish
- *      because the hardware is turned off! Anything else is a bug!
+ *      configuration done by the regulatory agent in the wiphy's
+ *      registered bands. The hardware (or the driver) needs to make sure
+ *      that power save is disabled. When the scan finishes,
+ *      ieee80211_scan_completed() must be called; note that it also must
+ *      be called when the scan cannot finish because the hardware is
+ *      turned off! Anything else is a bug! Returns a negative error code
+ *      which will be seen in userspace.
+ *
+ * @sw_scan_start: Notifier function that is called just before a software scan
+ *      is started. Can be NULL, if the driver doesn't need this notification.
+ *
+ * @sw_scan_complete: Notifier function that is called just after a software scan
+ *      finished. Can be NULL, if the driver doesn't need this notification.
  *
- * @get_stats: return low-level statistics
+ * @get_stats: Return low-level statistics.
+ *      Returns zero if statistics are available.
  *
  * @get_tkip_seq: If your device implements TKIP encryption in hardware this
  *      callback should be provided to read the TKIP transmit IVs (both IV32
@@ -1260,16 +1357,21 @@ enum ieee80211_ampdu_mlme_action {
  *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue.
+ *      Returns a negative error code on failure.
  *
  * @get_tx_stats: Get statistics of the current TX queue status. This is used
  *      to get number of currently queued packets (queue length), maximum queue
  *      size (limit), and total number of packets sent using each TX queue
- *      (count). The 'stats' pointer points to an array that has hw->queues +
- *      hw->ampdu_queues items.
+ *      (count). The 'stats' pointer points to an array that has hw->queues
+ *      items.
  *
  * @get_tsf: Get the current TSF timer value from firmware/hardware. Currently,
- *      this is only used for IBSS mode debugging and, as such, is not a
- *      required function. Must be atomic.
+ *      this is only used for IBSS mode BSSID merging and debugging. Is not a
+ *      required function.
+ *
+ * @set_tsf: Set the TSF timer to the specified value in the firmware/hardware.
+ *      Currently, this is only used for IBSS mode debugging. Is not a
+ *      required function.
  *
  * @reset_tsf: Reset the TSF timer and allow firmware/hardware to synchronize
  *      with other STAs in the IBSS. This is only used in IBSS mode. This
@@ -1279,13 +1381,15 @@ enum ieee80211_ampdu_mlme_action {
  * @tx_last_beacon: Determine whether the last IBSS beacon was sent by us.
  *      This is needed only for IBSS mode and the result of this function is
  *      used to determine whether to reply to Probe Requests.
+ *      Returns non-zero if this device sent the last beacon.
  *
  * @ampdu_action: Perform a certain A-MPDU action
  *      The RA/TID combination determines the destination and TID we want
  *      the ampdu action to be performed for. The action is defined through
  *      ieee80211_ampdu_mlme_action. Starting sequence number (@ssn)
- *      is the first frame we expect to perform the action on. notice
+ *      is the first frame we expect to perform the action on. Notice
  *      that TX/RX_STOP can pass NULL for this parameter.
+ *      Returns a negative error code on failure.
  */
 struct ieee80211_ops {
         int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -1310,12 +1414,15 @@ struct ieee80211_ops {
         int (*set_tim)(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                        bool set);
         int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       const u8 *local_address, const u8 *address,
+                       struct ieee80211_vif *vif, struct ieee80211_sta *sta,
                        struct ieee80211_key_conf *key);
         void (*update_tkip_key)(struct ieee80211_hw *hw,
                         struct ieee80211_key_conf *conf, const u8 *address,
                         u32 iv32, u16 *phase1key);
-        int (*hw_scan)(struct ieee80211_hw *hw, u8 *ssid, size_t len);
+        int (*hw_scan)(struct ieee80211_hw *hw,
+                       struct cfg80211_scan_request *req);
+        void (*sw_scan_start)(struct ieee80211_hw *hw);
+        void (*sw_scan_complete)(struct ieee80211_hw *hw);
         int (*get_stats)(struct ieee80211_hw *hw,
                          struct ieee80211_low_level_stats *stats);
         void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx,
@@ -1328,6 +1435,7 @@ struct ieee80211_ops {
         int (*get_tx_stats)(struct ieee80211_hw *hw,
                             struct ieee80211_tx_queue_stats *stats);
         u64 (*get_tsf)(struct ieee80211_hw *hw);
+        void (*set_tsf)(struct ieee80211_hw *hw, u64 tsf);
         void (*reset_tsf)(struct ieee80211_hw *hw);
         int (*tx_last_beacon)(struct ieee80211_hw *hw);
         int (*ampdu_action)(struct ieee80211_hw *hw,
@@ -1752,8 +1860,9 @@ void ieee80211_wake_queues(struct ieee80211_hw *hw);
  * mac80211 that the scan finished.
  *
  * @hw: the hardware that finished the scan
+ * @aborted: set to true if scan was aborted
  */
-void ieee80211_scan_completed(struct ieee80211_hw *hw);
+void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted);
 
 /**
  * ieee80211_iterate_active_interfaces - iterate active interfaces
@@ -1882,10 +1991,30 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
 struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
                                          const u8 *addr);
 
+/**
+ * ieee80211_beacon_loss - inform hardware does not receive beacons
+ *
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
+ *
+ * When beacon filtering is enabled with IEEE80211_HW_BEACON_FILTERING and
+ * IEEE80211_CONF_PS is set, the driver needs to inform whenever the
+ * hardware is not receiving beacons with this function.
+ */
+void ieee80211_beacon_loss(struct ieee80211_vif *vif);
 
 /* Rate control API */
 
 /**
+ * enum rate_control_changed - flags to indicate which parameter changed
+ *
+ * @IEEE80211_RC_HT_CHANGED: The HT parameters of the operating channel have
+ *      changed, rate control algorithm can update its internal state if needed.
+ */
+enum rate_control_changed {
+        IEEE80211_RC_HT_CHANGED = BIT(0)
+};
+
+/**
  * struct ieee80211_tx_rate_control - rate control information for/from RC algo
  *
  * @hw: The hardware the algorithm is invoked for.
@@ -1921,6 +2050,9 @@ struct rate_control_ops {
         void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp);
         void (*rate_init)(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta);
+        void (*rate_update)(void *priv, struct ieee80211_supported_band *sband,
+                            struct ieee80211_sta *sta,
+                            void *priv_sta, u32 changed);
         void (*free_sta)(void *priv, struct ieee80211_sta *sta,
                          void *priv_sta);
 
@@ -1962,4 +2094,34 @@ rate_lowest_index(struct ieee80211_supported_band *sband,
 int ieee80211_rate_control_register(struct rate_control_ops *ops);
 void ieee80211_rate_control_unregister(struct rate_control_ops *ops);
 
+static inline bool
+conf_is_ht20(struct ieee80211_conf *conf)
+{
+        return conf->channel_type == NL80211_CHAN_HT20;
+}
+
+static inline bool
+conf_is_ht40_minus(struct ieee80211_conf *conf)
+{
+        return conf->channel_type == NL80211_CHAN_HT40MINUS;
+}
+
+static inline bool
+conf_is_ht40_plus(struct ieee80211_conf *conf)
+{
+        return conf->channel_type == NL80211_CHAN_HT40PLUS;
+}
+
+static inline bool
+conf_is_ht40(struct ieee80211_conf *conf)
+{
+        return conf_is_ht40_minus(conf) || conf_is_ht40_plus(conf);
+}
+
+static inline bool
+conf_is_ht(struct ieee80211_conf *conf)
+{
+        return conf->channel_type != NL80211_CHAN_NO_HT;
+}
+
 #endif /* MAC80211_H */
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 6fc13d905c5f..ded434b032a4 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -109,11 +109,6 @@ extern struct list_head net_namespace_list;
 #ifdef CONFIG_NET_NS
 extern void __put_net(struct net *net);
 
-static inline int net_alive(struct net *net)
-{
-        return net && atomic_read(&net->count);
-}
-
 static inline struct net *get_net(struct net *net)
 {
         atomic_inc(&net->count);
@@ -145,11 +140,6 @@ int net_eq(const struct net *net1, const struct net *net2)
 }
 #else
 
-static inline int net_alive(struct net *net)
-{
-        return 1;
-}
-
 static inline struct net *get_net(struct net *net)
 {
         return net;
@@ -234,6 +224,23 @@ struct pernet_operations {
         void (*exit)(struct net *net);
 };
 
+/*
+ * Use these carefully.  If you implement a network device and it
+ * needs per network namespace operations use device pernet operations,
+ * otherwise use pernet subsys operations.
+ *
+ * This is critically important.  Most of the network code cleanup
+ * runs with the assumption that dev_remove_pack has been called so no
+ * new packets will arrive during and after the cleanup functions have
+ * been called.  dev_remove_pack is not per namespace so instead the
+ * guarantee of no more packets arriving in a network namespace is
+ * provided by ensuring that all network devices and all sockets have
+ * left the network namespace before the cleanup methods are called.
+ *
+ * For the longest time the ipv4 icmp code was registered as a pernet
+ * device which caused kernel oops, and panics during network
+ * namespace cleanup.   So please don't get this wrong.
+ */
 extern int register_pernet_subsys(struct pernet_operations *);
 extern void unregister_pernet_subsys(struct pernet_operations *);
 extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 2e0c53641cbe..6c3f964de9e1 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -91,8 +91,7 @@ struct nf_conn_help {
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
 #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
 
-struct nf_conn
-{
+struct nf_conn {
         /* Usage count in here is 1 for hash table/destruct timer, 1 per skb,
            plus 1 for any connection(s) we are `master' for */
         struct nf_conntrack ct_general;
@@ -126,7 +125,6 @@ struct nf_conn
 #ifdef CONFIG_NET_NS
         struct net *ct_net;
 #endif
-        struct rcu_head rcu;
 };
 
 static inline struct nf_conn *
@@ -190,9 +188,13 @@ static inline void nf_ct_put(struct nf_conn *ct)
 extern int nf_ct_l3proto_try_module_get(unsigned short l3proto);
 extern void nf_ct_l3proto_module_put(unsigned short l3proto);
 
-extern struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced);
-extern void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced,
-                                 unsigned int size);
+/*
+ * Allocate a hashtable of hlist_head (if nulls == 0),
+ * or hlist_nulls_head (if nulls == 1)
+ */
+extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced, int nulls);
+
+extern void nf_ct_free_hashtable(void *hash, int vmalloced, unsigned int size);
 
 extern struct nf_conntrack_tuple_hash *
 __nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple);
@@ -287,7 +289,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb)
 
 extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
 extern unsigned int nf_conntrack_htable_size;
-extern int nf_conntrack_max;
+extern unsigned int nf_conntrack_max;
 
 #define NF_CT_STAT_INC(net, count)      \
         (per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++)
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index c25068e38516..5a449b44ba33 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -62,7 +62,8 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
         if (ct && ct != &nf_conntrack_untracked) {
                 if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
                         ret = __nf_conntrack_confirm(skb);
-                nf_ct_deliver_cached_events(ct);
+                if (likely(ret == NF_ACCEPT))
+                        nf_ct_deliver_cached_events(ct);
         }
         return ret;
 }
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index ab17a159ac66..a9652806d0df 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -99,9 +99,12 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
                        const union nf_inet_addr *,
                        u_int8_t, const __be16 *, const __be16 *);
 void nf_ct_expect_put(struct nf_conntrack_expect *exp);
-int nf_ct_expect_related(struct nf_conntrack_expect *expect);
 int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
                                 u32 pid, int report);
+static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect)
+{
+        return nf_ct_expect_related_report(expect, 0, 0);
+}
 
 #endif /*_NF_CONNTRACK_EXPECT_H*/
 
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 66d65a7caa39..ee2a4b369a04 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -14,6 +14,8 @@
 
 struct module;
 
+#define NF_CT_HELPER_NAME_LEN   16
+
 struct nf_conntrack_helper
 {
         struct hlist_node hnode;        /* Internal use. */
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 0378676c3dd8..9f99d36d5de9 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -53,10 +53,17 @@ struct nf_conntrack_l3proto
         int (*tuple_to_nlattr)(struct sk_buff *skb,
                                const struct nf_conntrack_tuple *t);
 
+        /*
+         * Calculate size of tuple nlattr
+         */
+        int (*nlattr_tuple_size)(void);
+
         int (*nlattr_to_tuple)(struct nlattr *tb[],
                                struct nf_conntrack_tuple *t);
         const struct nla_policy *nla_policy;
 
+        size_t nla_size;
+
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *ctl_table_header;
         struct ctl_path         *ctl_table_path;
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index debdaf75cecf..ba32ed7bdabe 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -64,16 +64,22 @@ struct nf_conntrack_l4proto
         /* convert protoinfo to nfnetink attributes */
         int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
                          const struct nf_conn *ct);
+        /* Calculate protoinfo nlattr size */
+        int (*nlattr_size)(void);
 
         /* convert nfnetlink attributes to protoinfo */
         int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);
 
         int (*tuple_to_nlattr)(struct sk_buff *skb,
                                const struct nf_conntrack_tuple *t);
+        /* Calculate tuple nlattr size */
+        int (*nlattr_tuple_size)(void);
         int (*nlattr_to_tuple)(struct nlattr *tb[],
                                struct nf_conntrack_tuple *t);
         const struct nla_policy *nla_policy;
 
+        size_t nla_size;
+
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header **ctl_table_header;
         struct ctl_table        *ctl_table;
@@ -90,10 +96,7 @@ struct nf_conntrack_l4proto
         struct module *me;
 };
 
-/* Existing built-in protocols */
-extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
-extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
-extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
+/* Existing built-in generic protocol */
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
 
 #define MAX_NF_CT_PROTO 256
@@ -101,11 +104,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
 extern struct nf_conntrack_l4proto *
 __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
 
-extern struct nf_conntrack_l4proto *
-nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);
-
-extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
-
 /* Protocol registration. */
 extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
 extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
@@ -115,6 +113,7 @@ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
                                       const struct nf_conntrack_tuple *tuple);
 extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
                                       struct nf_conntrack_tuple *t);
+extern int nf_ct_port_nlattr_tuple_size(void);
 extern const struct nla_policy nf_ct_port_nla_policy[];
 
 #ifdef CONFIG_SYSCTL
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index f2f6aa73dc10..2628c154d40e 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -12,6 +12,7 @@
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/nf_conntrack_tuple_common.h>
+#include <linux/list_nulls.h>
 
 /* A `tuple' is a structure containing the information to uniquely
   identify a connection.  ie. if two packets have the same tuple, they
@@ -146,9 +147,8 @@ static inline void nf_ct_dump_tuple(const struct nf_conntrack_tuple *t)
         ((enum ip_conntrack_dir)(h)->tuple.dst.dir)
 
 /* Connections have two entries in the hash table: one for each way */
-struct nf_conntrack_tuple_hash
-{
-        struct hlist_node hnode;
+struct nf_conntrack_tuple_hash {
+        struct hlist_nulls_node hnnode;
         struct nf_conntrack_tuple tuple;
 };
 
diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h
index 7182c06974f4..920997f1aff0 100644
--- a/include/net/netfilter/nf_log.h
+++ b/include/net/netfilter/nf_log.h
@@ -1,6 +1,8 @@
 #ifndef _NF_LOG_H
 #define _NF_LOG_H
 
+#include <linux/netfilter.h>
+
 /* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will
  * disappear once iptables is replaced with pkttables.  Please DO NOT use them
  * for any new code! */
@@ -40,12 +42,15 @@ struct nf_logger {
         struct module   *me;
         nf_logfn        *logfn;
         char            *name;
+        struct list_head        list[NFPROTO_NUMPROTO];
 };
 
 /* Function to register/unregister log function. */
-int nf_log_register(u_int8_t pf, const struct nf_logger *logger);
-void nf_log_unregister(const struct nf_logger *logger);
-void nf_log_unregister_pf(u_int8_t pf);
+int nf_log_register(u_int8_t pf, struct nf_logger *logger);
+void nf_log_unregister(struct nf_logger *logger);
+
+int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger);
+void nf_log_unbind_pf(u_int8_t pf);
 
 /* Calls the registered backend logging function */
 void nf_log_packet(u_int8_t pf,
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 9dc1039ff78b..8df0b7f7fc6e 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -18,6 +18,7 @@ enum nf_nat_manip_type
 #define IP_NAT_RANGE_MAP_IPS 1
 #define IP_NAT_RANGE_PROTO_SPECIFIED 2
 #define IP_NAT_RANGE_PROTO_RANDOM 4
+#define IP_NAT_RANGE_PERSISTENT 8
 
 /* NAT sequence number modifications */
 struct nf_nat_seq {
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 749011eedc0b..60ebbc1fef46 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -36,6 +36,7 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <net/netlink.h>
+#include <net/request_sock.h>
 #include <asm/atomic.h>
 
 struct cipso_v4_doi;
@@ -406,6 +407,7 @@ int netlbl_secattr_catmap_setrng(struct netlbl_lsm_secattr_catmap *catmap,
  */
 int netlbl_enabled(void);
 int netlbl_sock_setattr(struct sock *sk,
+                        u16 family,
                         const struct netlbl_lsm_secattr *secattr);
 void netlbl_sock_delattr(struct sock *sk);
 int netlbl_sock_getattr(struct sock *sk,
@@ -413,6 +415,9 @@ int netlbl_sock_getattr(struct sock *sk,
 int netlbl_conn_setattr(struct sock *sk,
                         struct sockaddr *addr,
                         const struct netlbl_lsm_secattr *secattr);
+int netlbl_req_setattr(struct request_sock *req,
+                       const struct netlbl_lsm_secattr *secattr);
+void netlbl_req_delattr(struct request_sock *req);
 int netlbl_skbuff_setattr(struct sk_buff *skb,
                           u16 family,
                           const struct netlbl_lsm_secattr *secattr);
@@ -519,7 +524,8 @@ static inline int netlbl_enabled(void)
         return 0;
 }
 static inline int netlbl_sock_setattr(struct sock *sk,
-                                     const struct netlbl_lsm_secattr *secattr)
+                                      u16 family,
+                                      const struct netlbl_lsm_secattr *secattr)
 {
         return -ENOSYS;
 }
@@ -537,6 +543,15 @@ static inline int netlbl_conn_setattr(struct sock *sk,
 {
         return -ENOSYS;
 }
+static inline int netlbl_req_setattr(struct request_sock *req,
+                                     const struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline void netlbl_req_delattr(struct request_sock *req)
+{
+        return;
+}
 static inline int netlbl_skbuff_setattr(struct sk_buff *skb,
                                       u16 family,
                                       const struct netlbl_lsm_secattr *secattr)
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 8a6150a3f4c7..eddb50289d6d 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -230,6 +230,7 @@ extern int		nla_validate(struct nlattr *head, int len, int maxtype,
 extern int              nla_parse(struct nlattr *tb[], int maxtype,
                                   struct nlattr *head, int len,
                                   const struct nla_policy *policy);
+extern int              nla_policy_len(const struct nla_policy *, int);
 extern struct nlattr *  nla_find(struct nlattr *head, int len, int attrtype);
 extern size_t           nla_strlcpy(char *dst, const struct nlattr *nla,
                                     size_t dstsize);
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index f4498a62881b..9dc58402bc09 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -2,6 +2,7 @@
 #define __NETNS_CONNTRACK_H
 
 #include <linux/list.h>
+#include <linux/list_nulls.h>
 #include <asm/atomic.h>
 
 struct ctl_table_header;
@@ -10,9 +11,9 @@ struct nf_conntrack_ecache;
 struct netns_ct {
         atomic_t                count;
         unsigned int            expect_count;
-        struct hlist_head       *hash;
+        struct hlist_nulls_head *hash;
         struct hlist_head       *expect_hash;
-        struct hlist_head       unconfirmed;
+        struct hlist_nulls_head unconfirmed;
         struct ip_conntrack_stat *stat;
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
         struct nf_conntrack_ecache *ecache;
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 977f482d97a9..2eb3814d6258 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -54,5 +54,18 @@ struct netns_ipv4 {
 
         struct timer_list rt_secret_timer;
         atomic_t rt_genid;
+
+#ifdef CONFIG_IP_MROUTE
+        struct sock             *mroute_sk;
+        struct mfc_cache        **mfc_cache_array;
+        struct vif_device       *vif_table;
+        int                     maxvif;
+        atomic_t                cache_resolve_queue_len;
+        int                     mroute_do_assert;
+        int                     mroute_do_pim;
+#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
+        int                     mroute_reg_vif_num;
+#endif
+#endif
 };
 #endif
diff --git a/include/net/netrom.h b/include/net/netrom.h
index f06852bba62a..15696b1fd30f 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -59,10 +59,6 @@ enum {
 #define NR_MAX_WINDOW_SIZE              127                     /* Maximum Window Allowable - 127 */
 #define NR_MAX_PACKET_SIZE              236                     /* Maximum Packet Length - 236 */
 
-struct nr_private {
-        struct net_device_stats stats;
-};
-
 struct nr_sock {
         struct sock             sock;
         ax25_address            user_addr, source_addr, dest_addr;
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index 057b0a8a2885..d43f71b5ec00 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -105,7 +105,6 @@ void phonet_proto_unregister(int protocol, struct phonet_protocol *pp);
 
 int phonet_sysctl_init(void);
 void phonet_sysctl_exit(void);
-void phonet_netlink_register(void);
 int isi_register(void);
 void isi_unregister(void);
 
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index aa1c59a1d33f..5054dc5ea2c2 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -28,7 +28,7 @@ struct phonet_device_list {
         spinlock_t lock;
 };
 
-extern struct phonet_device_list pndevs;
+struct phonet_device_list *phonet_device_list(struct net *net);
 
 struct phonet_device {
         struct list_head list;
@@ -36,8 +36,9 @@ struct phonet_device {
         DECLARE_BITMAP(addrs, 64);
 };
 
-void phonet_device_init(void);
+int phonet_device_init(void);
 void phonet_device_exit(void);
+int phonet_netlink_register(void);
 struct net_device *phonet_device_get(struct net *net);
 
 int phonet_address_add(struct net_device *dev, u8 addr);
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 4082f39f5079..e37fe3129c17 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -85,6 +85,7 @@ extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r,
                 struct nlattr *tab);
 extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
 extern void qdisc_put_stab(struct qdisc_size_table *tab);
+extern void qdisc_warn_nonwc(char *txt, struct Qdisc *qdisc);
 
 extern void __qdisc_run(struct Qdisc *q);
 
diff --git a/include/net/psnap.h b/include/net/psnap.h
index b2e01cc3fc8a..fe456c295b04 100644
--- a/include/net/psnap.h
+++ b/include/net/psnap.h
@@ -1,7 +1,11 @@
 #ifndef _NET_PSNAP_H
 #define _NET_PSNAP_H
 
-extern struct datalink_proto *register_snap_client(unsigned char *desc, int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *orig_dev));
+extern struct datalink_proto *
+register_snap_client(const unsigned char *desc,
+                     int (*rcvfunc)(struct sk_buff *, struct net_device *,
+                                    struct packet_type *,
+                                    struct net_device *orig_dev));
 extern void unregister_snap_client(struct datalink_proto *proto);
 
 #endif
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index f8c47429044a..964ffa0d8815 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -42,24 +42,17 @@ struct Qdisc
         int                     (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
         struct sk_buff *        (*dequeue)(struct Qdisc *dev);
         unsigned                flags;
-#define TCQ_F_BUILTIN   1
-#define TCQ_F_THROTTLED 2
-#define TCQ_F_INGRESS   4
+#define TCQ_F_BUILTIN           1
+#define TCQ_F_THROTTLED         2
+#define TCQ_F_INGRESS           4
+#define TCQ_F_WARN_NONWC        (1 << 16)
         int                     padded;
         struct Qdisc_ops        *ops;
         struct qdisc_size_table *stab;
+        struct list_head        list;
         u32                     handle;
         u32                     parent;
         atomic_t                refcnt;
-        unsigned long           state;
-        struct sk_buff          *gso_skb;
-        struct sk_buff_head     q;
-        struct netdev_queue     *dev_queue;
-        struct Qdisc            *next_sched;
-        struct list_head        list;
-
-        struct gnet_stats_basic bstats;
-        struct gnet_stats_queue qstats;
         struct gnet_stats_rate_est      rate_est;
         int                     (*reshape_fail)(struct sk_buff *skb,
                                         struct Qdisc *q);
@@ -70,6 +63,17 @@ struct Qdisc
          * and it will live until better solution will be invented.
          */
         struct Qdisc            *__parent;
+        struct netdev_queue     *dev_queue;
+        struct Qdisc            *next_sched;
+
+        struct sk_buff          *gso_skb;
+        /*
+         * For performance sake on SMP, we put highly modified fields at the end
+         */
+        unsigned long           state;
+        struct sk_buff_head     q;
+        struct gnet_stats_basic bstats;
+        struct gnet_stats_queue qstats;
 };
 
 struct Qdisc_class_ops
diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
index 2fec3c366e81..befc8d2a1b9f 100644
--- a/include/net/sctp/checksum.h
+++ b/include/net/sctp/checksum.h
@@ -46,14 +46,14 @@
 #include <net/sctp/sctp.h>
 #include <linux/crc32c.h>
 
-static inline __be32 sctp_crc32c(__be32 crc, u8 *buffer, u16 length)
+static inline __u32 sctp_crc32c(__u32 crc, u8 *buffer, u16 length)
 {
-        return (__force __be32)crc32c((__force u32)crc, buffer, length);
+        return crc32c(crc, buffer, length);
 }
 
-static inline __be32 sctp_start_cksum(__u8 *buffer, __u16 length)
+static inline __u32 sctp_start_cksum(__u8 *buffer, __u16 length)
 {
-        __be32 crc = ~cpu_to_be32(0);
+        __u32 crc = ~(__u32)0;
         __u8  zero[sizeof(__u32)] = {0};
 
         /* Optimize this routine to be SCTP specific, knowing how
@@ -72,12 +72,12 @@ static inline __be32 sctp_start_cksum(__u8 *buffer, __u16 length)
         return crc;
 }
 
-static inline __be32 sctp_update_cksum(__u8 *buffer, __u16 length, __be32 crc32)
+static inline __u32 sctp_update_cksum(__u8 *buffer, __u16 length, __u32 crc32)
 {
         return sctp_crc32c(crc32, buffer, length);
 }
 
-static inline __be32 sctp_end_cksum(__be32 crc32)
+static inline __le32 sctp_end_cksum(__be32 crc32)
 {
-        return (__force __be32)~cpu_to_le32((__force u32)crc32);
+        return cpu_to_le32(~crc32);
 }
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 88988ab03d75..3b966802e05d 100644
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -77,7 +77,8 @@ typedef enum {
         SCTP_CMD_HB_TIMERS_START,    /* Start the heartbeat timers. */
         SCTP_CMD_HB_TIMER_UPDATE,    /* Update a heartbeat timers.  */
         SCTP_CMD_HB_TIMERS_STOP,     /* Stop the heartbeat timers.  */
-        SCTP_CMD_TRANSPORT_RESET,    /* Reset the status of a transport. */
+        SCTP_CMD_TRANSPORT_HB_SENT,  /* Reset the status of a transport. */
+        SCTP_CMD_TRANSPORT_IDLE,     /* Do manipulations on idle transport */
         SCTP_CMD_TRANSPORT_ON,       /* Mark the transport as active. */
         SCTP_CMD_REPORT_ERROR,   /* Pass this error back out of the sm. */
         SCTP_CMD_REPORT_BAD_TAG, /* Verification tags didn't match. */
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index bbb7742195b0..9f80a7668289 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -62,13 +62,6 @@
  *   and will continue to evolve.
  */
 
-
-
-#ifdef TEST_FRAME
-#undef CONFIG_SCTP_DBG_OBJCNT
-#undef CONFIG_SYSCTL
-#endif /* TEST_FRAME */
-
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/in.h>
@@ -138,6 +131,8 @@ void sctp_write_space(struct sock *sk);
 unsigned int sctp_poll(struct file *file, struct socket *sock,
                 poll_table *wait);
 void sctp_sock_rfree(struct sk_buff *skb);
+void sctp_copy_sock(struct sock *newsk, struct sock *sk,
+                    struct sctp_association *asoc);
 extern struct percpu_counter sctp_sockets_allocated;
 
 /*
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 9661d7b765f0..23f08fe1d50a 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -218,6 +218,10 @@ extern struct sctp_globals {
 
         /* Flag to idicate if SCTP-AUTH is enabled */
         int auth_enable;
+
+        /* Flag to indicate whether computing and verifying checksum
+         * is disabled. */
+        int checksum_disable;
 } sctp_globals;
 
 #define sctp_rto_initial                (sctp_globals.rto_initial)
@@ -252,6 +256,7 @@ extern struct sctp_globals {
 #define sctp_addip_noauth               (sctp_globals.addip_noauth_enable)
 #define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
 #define sctp_auth_enable                (sctp_globals.auth_enable)
+#define sctp_checksum_disable           (sctp_globals.checksum_disable)
 
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
@@ -905,8 +910,10 @@ struct sctp_transport {
          *              should be set. Every time the RTT
          *              calculation completes (i.e. the DATA chunk
          *              is SACK'd) clear this flag.
+         * hb_sent : a flag that signals that we have a pending heartbeat.
          */
         __u8 rto_pending;
+        __u8 hb_sent;
 
         /* Flag to track the current fast recovery state */
         __u8 fast_recovery;
diff --git a/include/net/sock.h b/include/net/sock.h
index eefeeaf7fc46..4bb1ff9fd15b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -158,7 +158,7 @@ struct sock_common {
   *     @sk_allocation: allocation mode
   *     @sk_sndbuf: size of send buffer in bytes
   *     @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE,
-  *                %SO_OOBINLINE settings
+  *                %SO_OOBINLINE settings, %SO_TIMESTAMPING settings
   *     @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets
   *     @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)
   *     @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
@@ -488,6 +488,13 @@ enum sock_flags {
         SOCK_RCVTSTAMPNS, /* %SO_TIMESTAMPNS setting */
         SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */
         SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */
+        SOCK_TIMESTAMPING_TX_HARDWARE,  /* %SOF_TIMESTAMPING_TX_HARDWARE */
+        SOCK_TIMESTAMPING_TX_SOFTWARE,  /* %SOF_TIMESTAMPING_TX_SOFTWARE */
+        SOCK_TIMESTAMPING_RX_HARDWARE,  /* %SOF_TIMESTAMPING_RX_HARDWARE */
+        SOCK_TIMESTAMPING_RX_SOFTWARE,  /* %SOF_TIMESTAMPING_RX_SOFTWARE */
+        SOCK_TIMESTAMPING_SOFTWARE,     /* %SOF_TIMESTAMPING_SOFTWARE */
+        SOCK_TIMESTAMPING_RAW_HARDWARE, /* %SOF_TIMESTAMPING_RAW_HARDWARE */
+        SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */
 };
 
 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
@@ -944,6 +951,11 @@ extern struct sk_buff 		*sock_alloc_send_skb(struct sock *sk,
                                                      unsigned long size,
                                                      int noblock,
                                                      int *errcode);
+extern struct sk_buff           *sock_alloc_send_pskb(struct sock *sk,
+                                                      unsigned long header_len,
+                                                      unsigned long data_len,
+                                                      int noblock,
+                                                      int *errcode);
 extern void *sock_kmalloc(struct sock *sk, int size,
                           gfp_t priority);
 extern void sock_kfree_s(struct sock *sk, void *mem, int size);
@@ -1340,14 +1352,45 @@ static __inline__ void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
         ktime_t kt = skb->tstamp;
+        struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);
 
-        if (sock_flag(sk, SOCK_RCVTSTAMP))
+        /*
+         * generate control messages if
+         * - receive time stamping in software requested (SOCK_RCVTSTAMP
+         *   or SOCK_TIMESTAMPING_RX_SOFTWARE)
+         * - software time stamp available and wanted
+         *   (SOCK_TIMESTAMPING_SOFTWARE)
+         * - hardware time stamps available and wanted
+         *   (SOCK_TIMESTAMPING_SYS_HARDWARE or
+         *   SOCK_TIMESTAMPING_RAW_HARDWARE)
+         */
+        if (sock_flag(sk, SOCK_RCVTSTAMP) ||
+            sock_flag(sk, SOCK_TIMESTAMPING_RX_SOFTWARE) ||
+            (kt.tv64 && sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE)) ||
+            (hwtstamps->hwtstamp.tv64 &&
+             sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE)) ||
+            (hwtstamps->syststamp.tv64 &&
+             sock_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE)))
                 __sock_recv_timestamp(msg, sk, skb);
         else
                 sk->sk_stamp = kt;
 }
 
 /**
+ * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
+ * @msg:        outgoing packet
+ * @sk:         socket sending this packet
+ * @shtx:       filled with instructions for time stamping
+ *
+ * Currently only depends on SOCK_TIMESTAMPING* flags. Returns error code if
+ * parameters are invalid.
+ */
+extern int sock_tx_timestamp(struct msghdr *msg,
+                             struct sock *sk,
+                             union skb_shared_tx *shtx);
+
+
+/**
  * sk_eat_skb - Release a skb if it is no longer needed
  * @sk: socket to eat this skb from
  * @skb: socket buffer to eat
@@ -1415,7 +1458,7 @@ static inline struct sock *skb_steal_sock(struct sk_buff *skb)
         return NULL;
 }
 
-extern void sock_enable_timestamp(struct sock *sk);
+extern void sock_enable_timestamp(struct sock *sk, int flag);
 extern int sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int sock_get_timestampns(struct sock *, struct timespec __user *);
 
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 218235de8963..646dbe3962ea 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -41,6 +41,7 @@
 #include <net/ip.h>
 #include <net/tcp_states.h>
 #include <net/inet_ecn.h>
+#include <net/dst.h>
 
 #include <linux/seq_file.h>
 
@@ -481,7 +482,16 @@ static inline void tcp_clear_xmit_timers(struct sock *sk)
 }
 
 extern unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu);
-extern unsigned int tcp_current_mss(struct sock *sk, int large);
+extern unsigned int tcp_current_mss(struct sock *sk);
+
+/* Bound MSS / TSO packet size with the half of the window */
+static inline int tcp_bound_to_half_wnd(struct tcp_sock *tp, int pktsize)
+{
+        if (tp->max_window && pktsize > (tp->max_window >> 1))
+                return max(tp->max_window >> 1, 68U - tp->tcp_header_len);
+        else
+                return pktsize;
+}
 
 /* tcp.c */
 extern void tcp_get_info(struct sock *, struct tcp_info *);
@@ -521,6 +531,17 @@ static inline void tcp_fast_path_check(struct sock *sk)
                 tcp_fast_path_on(tp);
 }
 
+/* Compute the actual rto_min value */
+static inline u32 tcp_rto_min(struct sock *sk)
+{
+        struct dst_entry *dst = __sk_dst_get(sk);
+        u32 rto_min = TCP_RTO_MIN;
+
+        if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
+                rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
+        return rto_min;
+}
+
 /* Compute the actual receive window we are currently advertising.
  * Rcv_nxt can be after the window if our peer push more data
  * than the offered window.
@@ -607,21 +628,6 @@ static inline int tcp_skb_mss(const struct sk_buff *skb)
         return skb_shinfo(skb)->gso_size;
 }
 
-static inline void tcp_dec_pcount_approx_int(__u32 *count, const int decr)
-{
-        if (*count) {
-                *count -= decr;
-                if ((int)*count < 0)
-                        *count = 0;
-        }
-}
-
-static inline void tcp_dec_pcount_approx(__u32 *count,
-                                         const struct sk_buff *skb)
-{
-        tcp_dec_pcount_approx_int(count, tcp_skb_pcount(skb));
-}
-
 /* Events passed to congestion control interface */
 enum tcp_ca_event {
         CA_EVENT_TX_START,      /* first transmit when no packets in flight */
@@ -685,6 +691,7 @@ extern void tcp_get_allowed_congestion_control(char *buf, size_t len);
 extern int tcp_set_allowed_congestion_control(char *allowed);
 extern int tcp_set_congestion_control(struct sock *sk, const char *name);
 extern void tcp_slow_start(struct tcp_sock *tp);
+extern void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w);
 
 extern struct tcp_congestion_ops tcp_init_congestion_ops;
 extern u32 tcp_reno_ssthresh(struct sock *sk);
@@ -821,15 +828,15 @@ static inline void tcp_push_pending_frames(struct sock *sk)
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
-        __tcp_push_pending_frames(sk, tcp_current_mss(sk, 1), tp->nonagle);
+        __tcp_push_pending_frames(sk, tcp_current_mss(sk), tp->nonagle);
 }
 
-static inline void tcp_init_wl(struct tcp_sock *tp, u32 ack, u32 seq)
+static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)
 {
         tp->snd_wl1 = seq;
 }
 
-static inline void tcp_update_wl(struct tcp_sock *tp, u32 ack, u32 seq)
+static inline void tcp_update_wl(struct tcp_sock *tp, u32 seq)
 {
         tp->snd_wl1 = seq;
 }
@@ -900,7 +907,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
                         wake_up_interruptible(sk->sk_sleep);
                         if (!inet_csk_ack_scheduled(sk))
                                 inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
-                                                          (3 * TCP_RTO_MIN) / 4,
+                                                          (3 * tcp_rto_min(sk)) / 4,
                                                           TCP_RTO_MAX);
                 }
                 return 1;
@@ -925,7 +932,6 @@ extern void tcp_done(struct sock *sk);
 static inline void tcp_sack_reset(struct tcp_options_received *rx_opt)
 {
         rx_opt->dsack = 0;
-        rx_opt->eff_sacks = 0;
         rx_opt->num_sacks = 0;
 }
 
@@ -997,11 +1003,21 @@ static inline int tcp_fin_time(const struct sock *sk)
         return fin_timeout;
 }
 
-static inline int tcp_paws_check(const struct tcp_options_received *rx_opt, int rst)
+static inline int tcp_paws_check(const struct tcp_options_received *rx_opt,
+                                 int paws_win)
 {
-        if ((s32)(rx_opt->rcv_tsval - rx_opt->ts_recent) >= 0)
-                return 0;
-        if (get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS)
+        if ((s32)(rx_opt->ts_recent - rx_opt->rcv_tsval) <= paws_win)
+                return 1;
+        if (unlikely(get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS))
+                return 1;
+
+        return 0;
+}
+
+static inline int tcp_paws_reject(const struct tcp_options_received *rx_opt,
+                                  int rst)
+{
+        if (tcp_paws_check(rx_opt, 0))
                 return 0;
 
         /* RST segments are not recommended to carry timestamp,
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 876b6f2bb4fd..bfb240c6cf79 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -46,7 +46,7 @@ extern int			datagram_send_ctl(struct net *net,
                                                   struct ipv6_txoptions *opt,
                                                   int *hlimit, int *tclass);
 
-#define         LOOPBACK4_IPV6          __constant_htonl(0x7f000006)
+#define         LOOPBACK4_IPV6          cpu_to_be32(0x7f000006)
 
 /*
  *      address family specific functions
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 21c5d966142d..64a76208580c 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -69,6 +69,9 @@ enum ieee80211_channel_flags {
  * @band: band this channel belongs to.
  * @max_antenna_gain: maximum antenna gain in dBi
  * @max_power: maximum transmission power (in dBm)
+ * @beacon_found: helper to regulatory code to indicate when a beacon
+ *      has been found on this channel. Use regulatory_hint_found_beacon()
+ *      to enable this, this is is useful only on 5 GHz band.
  * @orig_mag: internal use
  * @orig_mpwr: internal use
  */
@@ -80,6 +83,7 @@ struct ieee80211_channel {
         u32 flags;
         int max_antenna_gain;
         int max_power;
+        bool beacon_found;
         u32 orig_flags;
         int orig_mag, orig_mpwr;
 };
@@ -181,12 +185,26 @@ struct ieee80211_supported_band {
  * struct wiphy - wireless hardware description
  * @idx: the wiphy index assigned to this item
  * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
- * @fw_handles_regulatory: tells us the firmware for this device
- *      has its own regulatory solution and cannot identify the
+ * @custom_regulatory: tells us the driver for this device
+ *      has its own custom regulatory domain and cannot identify the
  *      ISO / IEC 3166 alpha2 it belongs to. When this is enabled
  *      we will disregard the first regulatory hint (when the
  *      initiator is %REGDOM_SET_BY_CORE).
+ * @strict_regulatory: tells us the driver for this device will ignore
+ *      regulatory domain settings until it gets its own regulatory domain
+ *      via its regulatory_hint(). After its gets its own regulatory domain
+ *      it will only allow further regulatory domain settings to further
+ *      enhance compliance. For example if channel 13 and 14 are disabled
+ *      by this regulatory domain no user regulatory domain can enable these
+ *      channels at a later time. This can be used for devices which do not
+ *      have calibration information gauranteed for frequencies or settings
+ *      outside of its regulatory domain.
  * @reg_notifier: the driver's regulatory notification callback
+ * @regd: the driver's regulatory domain, if one was requested via
+ *      the regulatory_hint() API. This can be used by the driver
+ *      on the reg_notifier() if it chooses to ignore future
+ *      regulatory domain changes caused by other drivers.
+ * @signal_type: signal type reported in &struct cfg80211_bss.
  */
 struct wiphy {
         /* assign these fields before you register the wiphy */
@@ -197,7 +215,13 @@ struct wiphy {
         /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
         u16 interface_modes;
 
-        bool fw_handles_regulatory;
+        bool custom_regulatory;
+        bool strict_regulatory;
+
+        enum cfg80211_signal_type signal_type;
+
+        int bss_priv_size;
+        u8 max_scan_ssids;
 
         /* If multiple wiphys are registered and you're handed e.g.
          * a regular netdev with assigned ieee80211_ptr, you won't
@@ -209,10 +233,13 @@ struct wiphy {
         struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS];
 
         /* Lets us get back the wiphy on the callback */
-        int (*reg_notifier)(struct wiphy *wiphy, enum reg_set_by setby);
+        int (*reg_notifier)(struct wiphy *wiphy,
+                            struct regulatory_request *request);
 
         /* fields below are read-only, assigned by cfg80211 */
 
+        const struct ieee80211_regdomain *regd;
+
         /* the item in /sys/class/ieee80211/ points to this,
          * you need use set_wiphy_dev() (see below) */
         struct device dev;
@@ -361,7 +388,7 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
  */
 struct ieee80211_rate *
 ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
-                            u64 basic_rates, int bitrate);
+                            u32 basic_rates, int bitrate);
 
 /**
  * regulatory_hint - driver hint to the wireless core a regulatory domain
@@ -378,8 +405,15 @@ ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
  * domain should be in or by providing a completely build regulatory domain.
  * If the driver provides an ISO/IEC 3166 alpha2 userspace will be queried
  * for a regulatory domain structure for the respective country.
+ *
+ * The wiphy must have been registered to cfg80211 prior to this call.
+ * For cfg80211 drivers this means you must first use wiphy_register(),
+ * for mac80211 drivers you must first use ieee80211_register_hw().
+ *
+ * Drivers should check the return value, its possible you can get
+ * an -ENOMEM.
  */
-extern void regulatory_hint(struct wiphy *wiphy, const char *alpha2);
+extern int regulatory_hint(struct wiphy *wiphy, const char *alpha2);
 
 /**
  * regulatory_hint_11d - hints a country IE as a regulatory domain
@@ -395,4 +429,44 @@ extern void regulatory_hint(struct wiphy *wiphy, const char *alpha2);
 extern void regulatory_hint_11d(struct wiphy *wiphy,
                                 u8 *country_ie,
                                 u8 country_ie_len);
+/**
+ * wiphy_apply_custom_regulatory - apply a custom driver regulatory domain
+ * @wiphy: the wireless device we want to process the regulatory domain on
+ * @regd: the custom regulatory domain to use for this wiphy
+ *
+ * Drivers can sometimes have custom regulatory domains which do not apply
+ * to a specific country. Drivers can use this to apply such custom regulatory
+ * domains. This routine must be called prior to wiphy registration. The
+ * custom regulatory domain will be trusted completely and as such previous
+ * default channel settings will be disregarded. If no rule is found for a
+ * channel on the regulatory domain the channel will be disabled.
+ */
+extern void wiphy_apply_custom_regulatory(
+        struct wiphy *wiphy,
+        const struct ieee80211_regdomain *regd);
+
+/**
+ * freq_reg_info - get regulatory information for the given frequency
+ * @wiphy: the wiphy for which we want to process this rule for
+ * @center_freq: Frequency in KHz for which we want regulatory information for
+ * @bandwidth: the bandwidth requirement you have in KHz, if you do not have one
+ *      you can set this to 0. If this frequency is allowed we then set
+ *      this value to the maximum allowed bandwidth.
+ * @reg_rule: the regulatory rule which we have for this frequency
+ *
+ * Use this function to get the regulatory rule for a specific frequency on
+ * a given wireless device. If the device has a specific regulatory domain
+ * it wants to follow we respect that unless a country IE has been received
+ * and processed already.
+ *
+ * Returns 0 if it was able to find a valid regulatory rule which does
+ * apply to the given center_freq otherwise it returns non-zero. It will
+ * also return -ERANGE if we determine the given center_freq does not even have
+ * a regulatory rule for a frequency range in the center_freq's band. See
+ * freq_in_rule_band() for our current definition of a band -- this is purely
+ * subjective and right now its 802.11 specific.
+ */
+extern int freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 *bandwidth,
+                         const struct ieee80211_reg_rule **reg_rule);
+
 #endif /* __NET_WIRELESS_H */
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index ec7c6d99ed3f..938858304300 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -314,12 +314,12 @@ struct ib_cm_id *ib_create_cm_id(struct ib_device *device,
  */
 void ib_destroy_cm_id(struct ib_cm_id *cm_id);
 
-#define IB_SERVICE_ID_AGN_MASK  __constant_cpu_to_be64(0xFF00000000000000ULL)
-#define IB_CM_ASSIGN_SERVICE_ID __constant_cpu_to_be64(0x0200000000000000ULL)
-#define IB_CMA_SERVICE_ID       __constant_cpu_to_be64(0x0000000001000000ULL)
-#define IB_CMA_SERVICE_ID_MASK  __constant_cpu_to_be64(0xFFFFFFFFFF000000ULL)
-#define IB_SDP_SERVICE_ID       __constant_cpu_to_be64(0x0000000000010000ULL)
-#define IB_SDP_SERVICE_ID_MASK  __constant_cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
+#define IB_SERVICE_ID_AGN_MASK  cpu_to_be64(0xFF00000000000000ULL)
+#define IB_CM_ASSIGN_SERVICE_ID cpu_to_be64(0x0200000000000000ULL)
+#define IB_CMA_SERVICE_ID       cpu_to_be64(0x0000000001000000ULL)
+#define IB_CMA_SERVICE_ID_MASK  cpu_to_be64(0xFFFFFFFFFF000000ULL)
+#define IB_SDP_SERVICE_ID       cpu_to_be64(0x0000000000010000ULL)
+#define IB_SDP_SERVICE_ID_MASK  cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
 
 struct ib_cm_compare_data {
         u8  data[IB_CM_COMPARE_SIZE];
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index 5f6c40fffcf4..d3b9401b77b0 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -107,7 +107,7 @@
 #define IB_MGMT_RMPP_STATUS_ABORT_MAX           127
 
 #define IB_QP0          0
-#define IB_QP1          __constant_htonl(1)
+#define IB_QP1          cpu_to_be32(1)
 #define IB_QP1_QKEY     0x80010000
 #define IB_QP_SET_QKEY  0x80000000
 
@@ -290,7 +290,7 @@ static inline void ib_set_rmpp_resptime(struct ib_rmpp_hdr *rmpp_hdr, u8 rtime)
  */
 static inline void ib_set_rmpp_flags(struct ib_rmpp_hdr *rmpp_hdr, u8 flags)
 {
-        rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF1) |
+        rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF8) |
                                      (flags & 0x7);
 }
 
diff --git a/include/rdma/ib_smi.h b/include/rdma/ib_smi.h
index aaca0878668f..98b9086d769a 100644
--- a/include/rdma/ib_smi.h
+++ b/include/rdma/ib_smi.h
@@ -63,25 +63,25 @@ struct ib_smp {
         u8      return_path[IB_SMP_MAX_PATH_HOPS];
 } __attribute__ ((packed));
 
-#define IB_SMP_DIRECTION                        __constant_htons(0x8000)
+#define IB_SMP_DIRECTION                        cpu_to_be16(0x8000)
 
 /* Subnet management attributes */
-#define IB_SMP_ATTR_NOTICE                      __constant_htons(0x0002)
-#define IB_SMP_ATTR_NODE_DESC                   __constant_htons(0x0010)
-#define IB_SMP_ATTR_NODE_INFO                   __constant_htons(0x0011)
-#define IB_SMP_ATTR_SWITCH_INFO                 __constant_htons(0x0012)
-#define IB_SMP_ATTR_GUID_INFO                   __constant_htons(0x0014)
-#define IB_SMP_ATTR_PORT_INFO                   __constant_htons(0x0015)
-#define IB_SMP_ATTR_PKEY_TABLE                  __constant_htons(0x0016)
-#define IB_SMP_ATTR_SL_TO_VL_TABLE              __constant_htons(0x0017)
-#define IB_SMP_ATTR_VL_ARB_TABLE                __constant_htons(0x0018)
-#define IB_SMP_ATTR_LINEAR_FORWARD_TABLE        __constant_htons(0x0019)
-#define IB_SMP_ATTR_RANDOM_FORWARD_TABLE        __constant_htons(0x001A)
-#define IB_SMP_ATTR_MCAST_FORWARD_TABLE         __constant_htons(0x001B)
-#define IB_SMP_ATTR_SM_INFO                     __constant_htons(0x0020)
-#define IB_SMP_ATTR_VENDOR_DIAG                 __constant_htons(0x0030)
-#define IB_SMP_ATTR_LED_INFO                    __constant_htons(0x0031)
-#define IB_SMP_ATTR_VENDOR_MASK                 __constant_htons(0xFF00)
+#define IB_SMP_ATTR_NOTICE                      cpu_to_be16(0x0002)
+#define IB_SMP_ATTR_NODE_DESC                   cpu_to_be16(0x0010)
+#define IB_SMP_ATTR_NODE_INFO                   cpu_to_be16(0x0011)
+#define IB_SMP_ATTR_SWITCH_INFO                 cpu_to_be16(0x0012)
+#define IB_SMP_ATTR_GUID_INFO                   cpu_to_be16(0x0014)
+#define IB_SMP_ATTR_PORT_INFO                   cpu_to_be16(0x0015)
+#define IB_SMP_ATTR_PKEY_TABLE                  cpu_to_be16(0x0016)
+#define IB_SMP_ATTR_SL_TO_VL_TABLE              cpu_to_be16(0x0017)
+#define IB_SMP_ATTR_VL_ARB_TABLE                cpu_to_be16(0x0018)
+#define IB_SMP_ATTR_LINEAR_FORWARD_TABLE        cpu_to_be16(0x0019)
+#define IB_SMP_ATTR_RANDOM_FORWARD_TABLE        cpu_to_be16(0x001A)
+#define IB_SMP_ATTR_MCAST_FORWARD_TABLE         cpu_to_be16(0x001B)
+#define IB_SMP_ATTR_SM_INFO                     cpu_to_be16(0x0020)
+#define IB_SMP_ATTR_VENDOR_DIAG                 cpu_to_be16(0x0030)
+#define IB_SMP_ATTR_LED_INFO                    cpu_to_be16(0x0031)
+#define IB_SMP_ATTR_VENDOR_MASK                 cpu_to_be16(0xFF00)
 
 struct ib_port_info {
         __be64 mkey;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 936e333e7ce5..c179318edd92 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -388,7 +388,7 @@ enum {
         IB_MULTICAST_QPN = 0xffffff
 };
 
-#define IB_LID_PERMISSIVE       __constant_htons(0xFFFF)
+#define IB_LID_PERMISSIVE       cpu_to_be16(0xFFFF)
 
 enum ib_ah_flags {
         IB_AH_GRH       = 1
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index 57aaa8f0d613..ccb3dbe90463 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -25,17 +25,6 @@
  */
 
 /*
- * The FCoE ethertype eventually goes in net/if_ether.h.
- */
-#ifndef ETH_P_FCOE
-#define ETH_P_FCOE      0x8906          /* FCOE ether type */
-#endif
-
-#ifndef ETH_P_8021Q
-#define ETH_P_8021Q     0x8100
-#endif
-
-/*
  * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
  */
 #ifndef FC_FCOE_OUI
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
new file mode 100644
index 000000000000..0627a9ae6347
--- /dev/null
+++ b/include/scsi/fc/fc_fip.h
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  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 _FC_FIP_H_
+#define _FC_FIP_H_
+
+/*
+ * This version is based on:
+ * http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf
+ */
+
+/*
+ * The FIP ethertype eventually goes in net/if_ether.h.
+ */
+#ifndef ETH_P_FIP
+#define ETH_P_FIP       0x8914  /* FIP Ethertype */
+#endif
+
+#define FIP_DEF_PRI     128     /* default selection priority */
+#define FIP_DEF_FC_MAP  0x0efc00 /* default FCoE MAP (MAC OUI) value */
+#define FIP_DEF_FKA     8000    /* default FCF keep-alive/advert period (mS) */
+#define FIP_VN_KA_PERIOD 90000  /* required VN_port keep-alive period (mS) */
+#define FIP_FCF_FUZZ    100     /* random time added by FCF (mS) */
+
+/*
+ * Multicast MAC addresses.  T11-adopted.
+ */
+#define FIP_ALL_FCOE_MACS       ((u8[6]) { 1, 0x10, 0x18, 1, 0, 0 })
+#define FIP_ALL_ENODE_MACS      ((u8[6]) { 1, 0x10, 0x18, 1, 0, 1 })
+#define FIP_ALL_FCF_MACS        ((u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })
+
+#define FIP_VER         1               /* version for fip_header */
+
+struct fip_header {
+        __u8    fip_ver;                /* upper 4 bits are the version */
+        __u8    fip_resv1;              /* reserved */
+        __be16  fip_op;                 /* operation code */
+        __u8    fip_resv2;              /* reserved */
+        __u8    fip_subcode;            /* lower 4 bits are sub-code */
+        __be16  fip_dl_len;             /* length of descriptors in words */
+        __be16  fip_flags;              /* header flags */
+} __attribute__((packed));
+
+#define FIP_VER_SHIFT   4
+#define FIP_VER_ENCAPS(v) ((v) << FIP_VER_SHIFT)
+#define FIP_VER_DECAPS(v) ((v) >> FIP_VER_SHIFT)
+#define FIP_BPW         4               /* bytes per word for lengths */
+
+/*
+ * fip_op.
+ */
+enum fip_opcode {
+        FIP_OP_DISC =   1,              /* discovery, advertisement, etc. */
+        FIP_OP_LS =     2,              /* Link Service request or reply */
+        FIP_OP_CTRL =   3,              /* Keep Alive / Link Reset */
+        FIP_OP_VLAN =   4,              /* VLAN discovery */
+        FIP_OP_VENDOR_MIN = 0xfff8,     /* min vendor-specific opcode */
+        FIP_OP_VENDOR_MAX = 0xfffe,     /* max vendor-specific opcode */
+};
+
+/*
+ * Subcodes for FIP_OP_DISC.
+ */
+enum fip_disc_subcode {
+        FIP_SC_SOL =    1,              /* solicitation */
+        FIP_SC_ADV =    2,              /* advertisement */
+};
+
+/*
+ * Subcodes for FIP_OP_LS.
+ */
+enum fip_trans_subcode {
+        FIP_SC_REQ =    1,              /* request */
+        FIP_SC_REP =    2,              /* reply */
+};
+
+/*
+ * Subcodes for FIP_OP_RESET.
+ */
+enum fip_reset_subcode {
+        FIP_SC_KEEP_ALIVE = 1,          /* keep-alive from VN_Port */
+        FIP_SC_CLR_VLINK = 2,           /* clear virtual link from VF_Port */
+};
+
+/*
+ * Subcodes for FIP_OP_VLAN.
+ */
+enum fip_vlan_subcode {
+        FIP_SC_VL_REQ = 1,              /* request */
+        FIP_SC_VL_REP = 2,              /* reply */
+};
+
+/*
+ * flags in header fip_flags.
+ */
+enum fip_flag {
+        FIP_FL_FPMA =   0x8000,         /* supports FPMA fabric-provided MACs */
+        FIP_FL_SPMA =   0x4000,         /* supports SPMA server-provided MACs */
+        FIP_FL_AVAIL =  0x0004,         /* available for FLOGI/ELP */
+        FIP_FL_SOL =    0x0002,         /* this is a solicited message */
+        FIP_FL_FPORT =  0x0001,         /* sent from an F port */
+};
+
+/*
+ * Common descriptor header format.
+ */
+struct fip_desc {
+        __u8    fip_dtype;              /* type - see below */
+        __u8    fip_dlen;               /* length - in 32-bit words */
+};
+
+enum fip_desc_type {
+        FIP_DT_PRI =    1,              /* priority for forwarder selection */
+        FIP_DT_MAC =    2,              /* MAC address */
+        FIP_DT_MAP_OUI = 3,             /* FC-MAP OUI */
+        FIP_DT_NAME =   4,              /* switch name or node name */
+        FIP_DT_FAB =    5,              /* fabric descriptor */
+        FIP_DT_FCOE_SIZE = 6,           /* max FCoE frame size */
+        FIP_DT_FLOGI =  7,              /* FLOGI request or response */
+        FIP_DT_FDISC =  8,              /* FDISC request or response */
+        FIP_DT_LOGO =   9,              /* LOGO request or response */
+        FIP_DT_ELP =    10,             /* ELP request or response */
+        FIP_DT_VN_ID =  11,             /* VN_Node Identifier */
+        FIP_DT_FKA =    12,             /* advertisement keep-alive period */
+        FIP_DT_VENDOR = 13,             /* vendor ID */
+        FIP_DT_VLAN =   14,             /* vlan number */
+        FIP_DT_LIMIT,                   /* max defined desc_type + 1 */
+        FIP_DT_VENDOR_BASE = 128,       /* first vendor-specific desc_type */
+};
+
+/*
+ * FIP_DT_PRI - priority descriptor.
+ */
+struct fip_pri_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd;
+        __u8            fd_pri;         /* FCF priority:  higher is better */
+} __attribute__((packed));
+
+/*
+ * FIP_DT_MAC - MAC address descriptor.
+ */
+struct fip_mac_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+} __attribute__((packed));
+
+/*
+ * FIP_DT_MAP - descriptor.
+ */
+struct fip_map_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[3];
+        __u8            fd_map[3];
+} __attribute__((packed));
+
+/*
+ * FIP_DT_NAME descriptor.
+ */
+struct fip_wwn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be64          fd_wwn;         /* 64-bit WWN, unaligned */
+} __attribute__((packed));
+
+/*
+ * FIP_DT_FAB descriptor.
+ */
+struct fip_fab_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_vfid;        /* virtual fabric ID */
+        __u8            fd_resvd;
+        __u8            fd_map[3];      /* FC-MAP value */
+        __be64          fd_wwn;         /* fabric name, unaligned */
+} __attribute__((packed));
+
+/*
+ * FIP_DT_FCOE_SIZE descriptor.
+ */
+struct fip_size_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_size;
+} __attribute__((packed));
+
+/*
+ * Descriptor that encapsulates an ELS or ILS frame.
+ * The encapsulated frame immediately follows this header, without
+ * SOF, EOF, or CRC.
+ */
+struct fip_encaps {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+} __attribute__((packed));
+
+/*
+ * FIP_DT_VN_ID - VN_Node Identifier descriptor.
+ */
+struct fip_vn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+        __u8            fd_resvd;
+        __u8            fd_fc_id[3];
+        __be64          fd_wwpn;        /* port name, unaligned */
+} __attribute__((packed));
+
+/*
+ * FIP_DT_FKA - Advertisement keep-alive period.
+ */
+struct fip_fka_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be32          fd_fka_period;  /* adv./keep-alive period in mS */
+} __attribute__((packed));
+
+/*
+ * FIP_DT_VENDOR descriptor.
+ */
+struct fip_vendor_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __u8            fd_vendor_id[8];
+} __attribute__((packed));
+
+#endif /* _FC_FIP_H_ */
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
index 3e4801d2bdbb..ac4cd38c860e 100644
--- a/include/scsi/fc/fc_fs.h
+++ b/include/scsi/fc/fc_fs.h
@@ -149,6 +149,7 @@ enum fc_rctl {
  * Well-known fabric addresses.
  */
 enum fc_well_known_fid {
+        FC_FID_NONE =           0x000000,       /* No destination */
         FC_FID_BCAST =          0xffffff,       /* broadcast */
         FC_FID_FLOGI =          0xfffffe,       /* fabric login */
         FC_FID_FCTRL =          0xfffffd,       /* fabric controller */
@@ -337,4 +338,9 @@ enum fc_pf_rjt_reason {
         FC_RJT_VENDOR =         0xff,   /* vendor specific reject */
 };
 
+/* default timeout values */
+
+#define FC_DEF_E_D_TOV  2000UL
+#define FC_DEF_R_A_TOV  10000UL
+
 #endif /* _FC_FS_H_ */
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h
index 04d34a71355f..59511057cee0 100644
--- a/include/scsi/fc_frame.h
+++ b/include/scsi/fc_frame.h
@@ -54,8 +54,7 @@
 #define fr_eof(fp)      (fr_cb(fp)->fr_eof)
 #define fr_flags(fp)    (fr_cb(fp)->fr_flags)
 #define fr_max_payload(fp)      (fr_cb(fp)->fr_max_payload)
-#define fr_cmd(fp)      (fr_cb(fp)->fr_cmd)
-#define fr_dir(fp)      (fr_cmd(fp)->sc_data_direction)
+#define fr_fsp(fp)      (fr_cb(fp)->fr_fsp)
 #define fr_crc(fp)      (fr_cb(fp)->fr_crc)
 
 struct fc_frame {
@@ -66,7 +65,7 @@ struct fcoe_rcv_info {
         struct packet_type  *ptype;
         struct fc_lport *fr_dev;        /* transport layer private pointer */
         struct fc_seq   *fr_seq;        /* for use with exchange manager */
-        struct scsi_cmnd *fr_cmd;       /* for use of scsi command */
+        struct fc_fcp_pkt *fr_fsp;      /* for the corresponding fcp I/O */
         u32             fr_crc;
         u16             fr_max_payload; /* max FC payload */
         enum fc_sof     fr_sof;         /* start of frame delimiter */
@@ -218,20 +217,6 @@ static inline bool fc_frame_is_cmd(const struct fc_frame *fp)
         return fc_frame_rctl(fp) == FC_RCTL_DD_UNSOL_CMD;
 }
 
-static inline bool fc_frame_is_read(const struct fc_frame *fp)
-{
-        if (fc_frame_is_cmd(fp) && fr_cmd(fp))
-                return fr_dir(fp) == DMA_FROM_DEVICE;
-        return false;
-}
-
-static inline bool fc_frame_is_write(const struct fc_frame *fp)
-{
-        if (fc_frame_is_cmd(fp) && fr_cmd(fp))
-                return fr_dir(fp) == DMA_TO_DEVICE;
-        return false;
-}
-
 /*
  * Check for leaks.
  * Print the frame header of any currently allocated frame, assuming there
diff --git a/include/scsi/fc_transport_fcoe.h b/include/scsi/fc_transport_fcoe.h
deleted file mode 100644
index 8dca2af14ffc..000000000000
--- a/include/scsi/fc_transport_fcoe.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef FC_TRANSPORT_FCOE_H
-#define FC_TRANSPORT_FCOE_H
-
-#include <linux/device.h>
-#include <linux/netdevice.h>
-#include <scsi/scsi_host.h>
-#include <scsi/libfc.h>
-
-/**
- * struct fcoe_transport - FCoE transport struct for generic transport
- * for Ethernet devices as well as pure HBAs
- *
- * @name: name for thsi transport
- * @bus: physical bus type (pci_bus_type)
- * @driver: physical bus driver for network device
- * @create: entry create function
- * @destroy: exit destroy function
- * @list: list of transports
- */
-struct fcoe_transport {
-        char *name;
-        unsigned short vendor;
-        unsigned short device;
-        struct bus_type *bus;
-        struct device_driver *driver;
-        int (*create)(struct net_device *device);
-        int (*destroy)(struct net_device *device);
-        bool (*match)(struct net_device *device);
-        struct list_head list;
-        struct list_head devlist;
-        struct mutex devlock;
-};
-
-/**
- * MODULE_ALIAS_FCOE_PCI
- *
- * some care must be taken with this, vendor and device MUST be a hex value
- * preceded with 0x and with letters in lower case (0x12ab, not 0x12AB or 12AB)
- */
-#define MODULE_ALIAS_FCOE_PCI(vendor, device) \
-        MODULE_ALIAS("fcoe-pci-" __stringify(vendor) "-" __stringify(device))
-
-/* exported funcs */
-int fcoe_transport_attach(struct net_device *netdev);
-int fcoe_transport_release(struct net_device *netdev);
-int fcoe_transport_register(struct fcoe_transport *t);
-int fcoe_transport_unregister(struct fcoe_transport *t);
-int fcoe_load_transport_driver(struct net_device *netdev);
-int __init fcoe_transport_init(void);
-int __exit fcoe_transport_exit(void);
-
-/* fcow_sw is the default transport */
-extern struct fcoe_transport fcoe_sw_transport;
-#endif /* FC_TRANSPORT_FCOE_H */
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 9f2876397dda..45f9cc642c46 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -22,6 +22,7 @@
 
 #include <linux/timer.h>
 #include <linux/if.h>
+#include <linux/percpu.h>
 
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
@@ -68,9 +69,6 @@
 /*
  * FC HBA status
  */
-#define FC_PAUSE                    (1 << 1)
-#define FC_LINK_UP                  (1 << 0)
-
 enum fc_lport_state {
         LPORT_ST_NONE = 0,
         LPORT_ST_FLOGI,
@@ -248,6 +246,7 @@ struct fc_fcp_pkt {
          */
         struct fcp_cmnd cdb_cmd;
         size_t          xfer_len;
+        u16             xfer_ddp;       /* this xfer is ddped */
         u32             xfer_contig_end; /* offset of end of contiguous xfer */
         u16             max_payload;    /* max payload size in bytes */
 
@@ -270,6 +269,15 @@ struct fc_fcp_pkt {
         u8              recov_retry;    /* count of recovery retries */
         struct fc_seq   *recov_seq;     /* sequence for REC or SRR */
 };
+/*
+ * FC_FCP HELPER FUNCTIONS
+ *****************************/
+static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
+{
+        if (fsp && fsp->cmd)
+                return fsp->cmd->sc_data_direction == DMA_FROM_DEVICE;
+        return false;
+}
 
 /*
  * Structure and function definitions for managing Fibre Channel Exchanges
@@ -339,31 +347,17 @@ struct fc_exch {
 
 struct libfc_function_template {
 
-        /**
-         * Mandatory Fields
-         *
-         * These handlers must be implemented by the LLD.
-         */
-
         /*
          * Interface to send a FC frame
-         */
-        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
-
-        /**
-         * Optional Fields
          *
-         * The LLD may choose to implement any of the following handlers.
-         * If LLD doesn't specify hander and leaves its pointer NULL then
-         * the default libfc function will be used for that handler.
-         */
-
-        /**
-         * ELS/CT interfaces
+         * STATUS: REQUIRED
          */
+        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
 
         /*
-         * elsct_send - sends ELS/CT frame
+         * Interface to send ELS/CT frames
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*elsct_send)(struct fc_lport *lport,
                                      struct fc_rport *rport,
@@ -373,9 +367,6 @@ struct libfc_function_template {
                                              struct fc_frame *fp,
                                              void *arg),
                                      void *arg, u32 timer_msec);
-        /**
-         * Exhance Manager interfaces
-         */
 
         /*
          * Send the FC frame payload using a new exchange and sequence.
@@ -407,6 +398,8 @@ struct libfc_function_template {
          * timer_msec argument is specified. The timer is canceled when
          * it fires or when the exchange is done. The exchange timeout handler
          * is registered by EM layer.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*exch_seq_send)(struct fc_lport *lp,
                                         struct fc_frame *fp,
@@ -418,14 +411,33 @@ struct libfc_function_template {
                                         void *arg, unsigned int timer_msec);
 
         /*
-         * send a frame using existing sequence and exchange.
+         * Sets up the DDP context for a given exchange id on the given
+         * scatterlist if LLD supports DDP for large receive.
+         *
+         * STATUS: OPTIONAL
+         */
+        int (*ddp_setup)(struct fc_lport *lp, u16 xid,
+                         struct scatterlist *sgl, unsigned int sgc);
+        /*
+         * Completes the DDP transfer and returns the length of data DDPed
+         * for the given exchange id.
+         *
+         * STATUS: OPTIONAL
+         */
+        int (*ddp_done)(struct fc_lport *lp, u16 xid);
+        /*
+         * Send a frame using an existing sequence and exchange.
+         *
+         * STATUS: OPTIONAL
          */
         int (*seq_send)(struct fc_lport *lp, struct fc_seq *sp,
                         struct fc_frame *fp);
 
         /*
-         * Send ELS response using mainly infomation
-         * in exchange and sequence in EM layer.
+         * Send an ELS response using infomation from a previous
+         * exchange and sequence.
+         *
+         * STATUS: OPTIONAL
          */
         void (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
                                  struct fc_seq_els_data *els_data);
@@ -437,6 +449,8 @@ struct libfc_function_template {
          * A timer_msec can be specified for abort timeout, if non-zero
          * timer_msec value is specified then exchange resp handler
          * will be called with timeout error if no response to abort.
+         *
+         * STATUS: OPTIONAL
          */
         int (*seq_exch_abort)(const struct fc_seq *req_sp,
                               unsigned int timer_msec);
@@ -444,6 +458,8 @@ struct libfc_function_template {
         /*
          * Indicate that an exchange/sequence tuple is complete and the memory
          * allocated for the related objects may be freed.
+         *
+         * STATUS: OPTIONAL
          */
         void (*exch_done)(struct fc_seq *sp);
 
@@ -451,6 +467,8 @@ struct libfc_function_template {
          * Assigns a EM and a free XID for an new exchange and then
          * allocates a new exchange and sequence pair.
          * The fp can be used to determine free XID.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_exch *(*exch_get)(struct fc_lport *lp, struct fc_frame *fp);
 
@@ -458,12 +476,16 @@ struct libfc_function_template {
          * Release previously assigned XID by exch_get API.
          * The LLD may implement this if XID is assigned by LLD
          * in exch_get().
+         *
+         * STATUS: OPTIONAL
          */
         void (*exch_put)(struct fc_lport *lp, struct fc_exch_mgr *mp,
                          u16 ex_id);
 
         /*
          * Start a new sequence on the same exchange/sequence tuple.
+         *
+         * STATUS: OPTIONAL
          */
         struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
 
@@ -471,26 +493,38 @@ struct libfc_function_template {
          * Reset an exchange manager, completing all sequences and exchanges.
          * If s_id is non-zero, reset only exchanges originating from that FID.
          * If d_id is non-zero, reset only exchanges sending to that FID.
+         *
+         * STATUS: OPTIONAL
          */
-        void (*exch_mgr_reset)(struct fc_exch_mgr *,
+        void (*exch_mgr_reset)(struct fc_lport *,
                                u32 s_id, u32 d_id);
 
-        void (*rport_flush_queue)(void);
-        /**
-         * Local Port interfaces
+        /*
+         * Flush the rport work queue. Generally used before shutdown.
+         *
+         * STATUS: OPTIONAL
          */
+        void (*rport_flush_queue)(void);
 
         /*
-         * Receive a frame to a local port.
+         * Receive a frame for a local port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
                            struct fc_frame *fp);
 
+        /*
+         * Reset the local port.
+         *
+         * STATUS: OPTIONAL
+         */
         int (*lport_reset)(struct fc_lport *);
 
-        /**
-         * Remote Port interfaces
+        /*
+         * Create a remote port
          */
+        struct fc_rport *(*rport_create)(struct fc_disc_port *);
 
         /*
          * Initiates the RP state machine. It is called from the LP module.
@@ -500,26 +534,33 @@ struct libfc_function_template {
          * - PLOGI
          * - PRLI
          * - RTV
+         *
+         * STATUS: OPTIONAL
          */
         int (*rport_login)(struct fc_rport *rport);
 
         /*
          * Logoff, and remove the rport from the transport if
          * it had been added. This will send a LOGO to the target.
+         *
+         * STATUS: OPTIONAL
          */
         int (*rport_logoff)(struct fc_rport *rport);
 
         /*
          * Recieve a request from a remote port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
                                struct fc_rport *);
 
-        struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
-
-        /**
-         * FCP interfaces
+        /*
+         * lookup an rport by it's port ID.
+         *
+         * STATUS: OPTIONAL
          */
+        struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
 
         /*
          * Send a fcp cmd from fsp pkt.
@@ -527,30 +568,38 @@ struct libfc_function_template {
          *
          * The resp handler is called when FCP_RSP received.
          *
+         * STATUS: OPTIONAL
          */
         int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
                             void (*resp)(struct fc_seq *, struct fc_frame *fp,
                                          void *arg));
 
         /*
-         * Used at least durring linkdown and reset
+         * Cleanup the FCP layer, used durring link down and reset
+         *
+         * STATUS: OPTIONAL
          */
         void (*fcp_cleanup)(struct fc_lport *lp);
 
         /*
          * Abort all I/O on a local port
+         *
+         * STATUS: OPTIONAL
          */
         void (*fcp_abort_io)(struct fc_lport *lp);
 
-        /**
-         * Discovery interfaces
+        /*
+         * Receive a request for the discovery layer.
+         *
+         * STATUS: OPTIONAL
          */
-
         void (*disc_recv_req)(struct fc_seq *,
                               struct fc_frame *, struct fc_lport *);
 
         /*
          * Start discovery for a local port.
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_start)(void (*disc_callback)(struct fc_lport *,
                                                  enum fc_disc_event),
@@ -559,6 +608,8 @@ struct libfc_function_template {
         /*
          * Stop discovery for a given lport. This will remove
          * all discovered rports
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_stop) (struct fc_lport *);
 
@@ -566,6 +617,8 @@ struct libfc_function_template {
          * Stop discovery for a given lport. This will block
          * until all discovered rports are deleted from the
          * FC transport class
+         *
+         * STATUS: OPTIONAL
          */
         void (*disc_stop_final) (struct fc_lport *);
 };
@@ -584,6 +637,7 @@ struct fc_disc {
                               enum fc_disc_event);
 
         struct list_head         rports;
+        struct list_head         rogue_rports;
         struct fc_lport         *lport;
         struct mutex            disc_mutex;
         struct fc_gpn_ft_resp   partial_buf;    /* partial name buffer */
@@ -603,12 +657,14 @@ struct fc_lport {
 
         /* Operational Information */
         struct libfc_function_template tt;
-        u16                     link_status;
+        u8                      link_up;
+        u8                      qfull;
         enum fc_lport_state     state;
         unsigned long           boot_time;
 
         struct fc_host_statistics host_stats;
-        struct fcoe_dev_stats   *dev_stats[NR_CPUS];
+        struct fcoe_dev_stats   *dev_stats;
+
         u64                     wwpn;
         u64                     wwnn;
         u8                      retry_count;
@@ -626,6 +682,7 @@ struct fc_lport {
         u16                     link_speed;
         u16                     link_supported_speeds;
         u16                     lro_xid;        /* max xid for fcoe lro */
+        unsigned int            lso_max;        /* max large send size */
         struct fc_ns_fts        fcts;           /* FC-4 type masks */
         struct fc_els_rnid_gen  rnid_gen;       /* RNID information */
 
@@ -637,14 +694,9 @@ struct fc_lport {
         struct delayed_work     disc_work;
 };
 
-/**
+/*
  * FC_LPORT HELPER FUNCTIONS
  *****************************/
-static inline void *lport_priv(const struct fc_lport *lp)
-{
-        return (void *)(lp + 1);
-}
-
 static inline int fc_lport_test_ready(struct fc_lport *lp)
 {
         return lp->state == LPORT_ST_READY;
@@ -668,8 +720,44 @@ static inline void fc_lport_state_enter(struct fc_lport *lp,
         lp->state = state;
 }
 
+static inline int fc_lport_init_stats(struct fc_lport *lp)
+{
+        /* allocate per cpu stats block */
+        lp->dev_stats = alloc_percpu(struct fcoe_dev_stats);
+        if (!lp->dev_stats)
+                return -ENOMEM;
+        return 0;
+}
+
+static inline void fc_lport_free_stats(struct fc_lport *lp)
+{
+        free_percpu(lp->dev_stats);
+}
+
+static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lp)
+{
+        return per_cpu_ptr(lp->dev_stats, smp_processor_id());
+}
+
+static inline void *lport_priv(const struct fc_lport *lp)
+{
+        return (void *)(lp + 1);
+}
 
 /**
+ * libfc_host_alloc() - Allocate a Scsi_Host with room for the fc_lport
+ * @sht: ptr to the scsi host templ
+ * @priv_size: size of private data after fc_lport
+ *
+ * Returns: ptr to Scsi_Host
+ */
+static inline struct Scsi_Host *
+libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
+{
+        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+}
+
+/*
  * LOCAL PORT LAYER
  *****************************/
 int fc_lport_init(struct fc_lport *lp);
@@ -704,12 +792,6 @@ void fc_linkup(struct fc_lport *);
 void fc_linkdown(struct fc_lport *);
 
 /*
- * Pause and unpause traffic.
- */
-void fc_pause(struct fc_lport *);
-void fc_unpause(struct fc_lport *);
-
-/*
  * Configure the local port.
  */
 int fc_lport_config(struct fc_lport *);
@@ -725,19 +807,19 @@ int fc_lport_reset(struct fc_lport *);
 int fc_set_mfs(struct fc_lport *lp, u32 mfs);
 
 
-/**
+/*
  * REMOTE PORT LAYER
  *****************************/
 int fc_rport_init(struct fc_lport *lp);
 void fc_rport_terminate_io(struct fc_rport *rp);
 
-/**
+/*
  * DISCOVERY LAYER
  *****************************/
 int fc_disc_init(struct fc_lport *lp);
 
 
-/**
+/*
  * SCSI LAYER
  *****************************/
 /*
@@ -798,7 +880,12 @@ int fc_change_queue_type(struct scsi_device *sdev, int tag_type);
  */
 void fc_fcp_destroy(struct fc_lport *);
 
-/**
+/*
+ * Set up direct-data placement for this I/O request
+ */
+void fc_fcp_ddp_setup(struct fc_fcp_pkt *fsp, u16 xid);
+
+/*
  * ELS/CT interface
  *****************************/
 /*
@@ -807,7 +894,7 @@ void fc_fcp_destroy(struct fc_lport *);
 int fc_elsct_init(struct fc_lport *lp);
 
 
-/**
+/*
  * EXCHANGE MANAGER LAYER
  *****************************/
 /*
@@ -916,7 +1003,7 @@ struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
  * If s_id is non-zero, reset only exchanges originating from that FID.
  * If d_id is non-zero, reset only exchanges sending to that FID.
  */
-void fc_exch_mgr_reset(struct fc_exch_mgr *, u32 s_id, u32 d_id);
+void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);
 
 /*
  * Functions for fc_functions_template
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 89fdbb9a6a1b..666cc131732e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -1,5 +1,6 @@
 /*
- * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
+ * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2008 Intel Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -20,157 +21,144 @@
 #ifndef _LIBFCOE_H
 #define _LIBFCOE_H
 
+#include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
 
 /*
- * this percpu struct for fcoe
+ * FIP tunable parameters.
  */
-struct fcoe_percpu_s {
-        int             cpu;
-        struct task_struct *thread;
-        struct sk_buff_head fcoe_rx_list;
-        struct page *crc_eof_page;
-        int crc_eof_offset;
+#define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
+#define FCOE_CTRL_SOL_TOV       2000    /* min. solicitation interval (mS) */
+#define FCOE_CTLR_FCF_LIMIT     20      /* max. number of FCF entries */
+
+/**
+ * enum fip_state - internal state of FCoE controller.
+ * @FIP_ST_DISABLED:    controller has been disabled or not yet enabled.
+ * @FIP_ST_LINK_WAIT:   the physical link is down or unusable.
+ * @FIP_ST_AUTO:        determining whether to use FIP or non-FIP mode.
+ * @FIP_ST_NON_FIP:     non-FIP mode selected.
+ * @FIP_ST_ENABLED:     FIP mode selected.
+ */
+enum fip_state {
+        FIP_ST_DISABLED,
+        FIP_ST_LINK_WAIT,
+        FIP_ST_AUTO,
+        FIP_ST_NON_FIP,
+        FIP_ST_ENABLED,
 };
 
-/*
- * the fcoe sw transport private data
+/**
+ * struct fcoe_ctlr - FCoE Controller and FIP state.
+ * @state:      internal FIP state for network link and FIP or non-FIP mode.
+ * @lp:         &fc_lport: libfc local port.
+ * @sel_fcf:    currently selected FCF, or NULL.
+ * @fcfs:       list of discovered FCFs.
+ * @fcf_count:  number of discovered FCF entries.
+ * @sol_time:   time when a multicast solicitation was last sent.
+ * @sel_time:   time after which to select an FCF.
+ * @port_ka_time: time of next port keep-alive.
+ * @ctlr_ka_time: time of next controller keep-alive.
+ * @timer:      timer struct used for all delayed events.
+ * @link_work:  &work_struct for doing FCF selection.
+ * @recv_work:  &work_struct for receiving FIP frames.
+ * @fip_recv_list: list of received FIP frames.
+ * @user_mfs:   configured maximum FC frame size, including FC header.
+ * @flogi_oxid: exchange ID of most recent fabric login.
+ * @flogi_count: number of FLOGI attempts in AUTO mode.
+ * @link:       current link status for libfc.
+ * @last_link:  last link state reported to libfc.
+ * @map_dest:   use the FC_MAP mode for destination MAC addresses.
+ * @dest_addr:  MAC address of the selected FC forwarder.
+ * @ctl_src_addr: the native MAC address of our local port.
+ * @data_src_addr: the assigned MAC address for the local port after FLOGI.
+ * @send:       LLD-supplied function to handle sending of FIP Ethernet frames.
+ * @update_mac: LLD-supplied function to handle changes to MAC addresses.
+ * @lock:       lock protecting this structure.
+ *
+ * This structure is used by all FCoE drivers.  It contains information
+ * needed by all FCoE low-level drivers (LLDs) as well as internal state
+ * for FIP, and fields shared with the LLDS.
  */
-struct fcoe_softc {
-        struct list_head list;
+struct fcoe_ctlr {
+        enum fip_state state;
         struct fc_lport *lp;
-        struct net_device *real_dev;
-        struct net_device *phys_dev;            /* device with ethtool_ops */
-        struct packet_type  fcoe_packet_type;
-        struct sk_buff_head fcoe_pending_queue;
-
+        struct fcoe_fcf *sel_fcf;
+        struct list_head fcfs;
+        u16 fcf_count;
+        unsigned long sol_time;
+        unsigned long sel_time;
+        unsigned long port_ka_time;
+        unsigned long ctlr_ka_time;
+        struct timer_list timer;
+        struct work_struct link_work;
+        struct work_struct recv_work;
+        struct sk_buff_head fip_recv_list;
+        u16 user_mfs;
+        u16 flogi_oxid;
+        u8 flogi_count;
+        u8 link;
+        u8 last_link;
+        u8 map_dest;
         u8 dest_addr[ETH_ALEN];
         u8 ctl_src_addr[ETH_ALEN];
         u8 data_src_addr[ETH_ALEN];
-        /*
-         * fcoe protocol address learning related stuff
-         */
-        u16 flogi_oxid;
-        u8 flogi_progress;
-        u8 address_mode;
-};
-
-static inline struct fcoe_softc *fcoe_softc(
-        const struct fc_lport *lp)
-{
-        return (struct fcoe_softc *)lport_priv(lp);
-}
-
-static inline struct net_device *fcoe_netdev(
-        const struct fc_lport *lp)
-{
-        return fcoe_softc(lp)->real_dev;
-}
-
-static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)
-{
-        return (struct fcoe_hdr *)skb_network_header(skb);
-}
-
-static inline int skb_fcoe_offset(const struct sk_buff *skb)
-{
-        return skb_network_offset(skb);
-}
-
-static inline struct fc_frame_header *skb_fc_header(const struct sk_buff *skb)
-{
-        return (struct fc_frame_header *)skb_transport_header(skb);
-}
-
-static inline int skb_fc_offset(const struct sk_buff *skb)
-{
-        return skb_transport_offset(skb);
-}
-
-static inline void skb_reset_fc_header(struct sk_buff *skb)
-{
-        skb_reset_network_header(skb);
-        skb_set_transport_header(skb, skb_network_offset(skb) +
-                                 sizeof(struct fcoe_hdr));
-}
 
-static inline bool skb_fc_is_data(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_SOL_DATA;
-}
-
-static inline bool skb_fc_is_cmd(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_UNSOL_CMD;
-}
-
-static inline bool skb_fc_has_exthdr(const struct sk_buff *skb)
-{
-        return (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_VFTH) ||
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_IFRH) ||
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_ENCH);
-}
-
-static inline bool skb_fc_is_roff(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_f_ctl[2] & FC_FC_REL_OFF;
-}
+        void (*send)(struct fcoe_ctlr *, struct sk_buff *);
+        void (*update_mac)(struct fcoe_ctlr *, u8 *old, u8 *new);
+        spinlock_t lock;
+};
 
-static inline u16 skb_fc_oxid(const struct sk_buff *skb)
-{
-        return be16_to_cpu(skb_fc_header(skb)->fh_ox_id);
-}
+/*
+ * struct fcoe_fcf - Fibre-Channel Forwarder.
+ * @list:       list linkage.
+ * @time:       system time (jiffies) when an advertisement was last received.
+ * @switch_name: WWN of switch from advertisement.
+ * @fabric_name: WWN of fabric from advertisement.
+ * @fc_map:     FC_MAP value from advertisement.
+ * @fcf_mac:    Ethernet address of the FCF.
+ * @vfid:       virtual fabric ID.
+ * @pri:        seletion priority, smaller values are better.
+ * @flags:      flags received from advertisement.
+ * @fka_period: keep-alive period, in jiffies.
+ *
+ * A Fibre-Channel Forwarder (FCF) is the entity on the Ethernet that
+ * passes FCoE frames on to an FC fabric.  This structure represents
+ * one FCF from which advertisements have been received.
+ *
+ * When looking up an FCF, @switch_name, @fabric_name, @fc_map, @vfid, and
+ * @fcf_mac together form the lookup key.
+ */
+struct fcoe_fcf {
+        struct list_head list;
+        unsigned long time;
 
-static inline u16 skb_fc_rxid(const struct sk_buff *skb)
-{
-        return be16_to_cpu(skb_fc_header(skb)->fh_rx_id);
-}
+        u64 switch_name;
+        u64 fabric_name;
+        u32 fc_map;
+        u16 vfid;
+        u8 fcf_mac[ETH_ALEN];
 
-/* FIXME - DMA_BIDIRECTIONAL ? */
-#define skb_cb(skb)     ((struct fcoe_rcv_info *)&((skb)->cb[0]))
-#define skb_cmd(skb)    (skb_cb(skb)->fr_cmd)
-#define skb_dir(skb)    (skb_cmd(skb)->sc_data_direction)
-static inline bool skb_fc_is_read(const struct sk_buff *skb)
-{
-        if (skb_fc_is_cmd(skb) && skb_cmd(skb))
-                return skb_dir(skb) == DMA_FROM_DEVICE;
-        return false;
-}
+        u8 pri;
+        u16 flags;
+        u32 fka_period;
+};
 
-static inline bool skb_fc_is_write(const struct sk_buff *skb)
-{
-        if (skb_fc_is_cmd(skb) && skb_cmd(skb))
-                return skb_dir(skb) == DMA_TO_DEVICE;
-        return false;
-}
+/* FIP API functions */
+void fcoe_ctlr_init(struct fcoe_ctlr *);
+void fcoe_ctlr_destroy(struct fcoe_ctlr *);
+void fcoe_ctlr_link_up(struct fcoe_ctlr *);
+int fcoe_ctlr_link_down(struct fcoe_ctlr *);
+int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct sk_buff *);
+void fcoe_ctlr_recv(struct fcoe_ctlr *, struct sk_buff *);
+int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_frame *fp, u8 *sa);
 
 /* libfcoe funcs */
-int fcoe_reset(struct Scsi_Host *shost);
-u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
-                      unsigned int scheme, unsigned int port);
-
-u32 fcoe_fc_crc(struct fc_frame *fp);
-int fcoe_xmit(struct fc_lport *, struct fc_frame *);
-int fcoe_rcv(struct sk_buff *, struct net_device *,
-             struct packet_type *, struct net_device *);
-
-int fcoe_percpu_receive_thread(void *arg);
-void fcoe_clean_pending_queue(struct fc_lport *lp);
-void fcoe_percpu_clean(struct fc_lport *lp);
-void fcoe_watchdog(ulong vp);
-int fcoe_link_ok(struct fc_lport *lp);
-
-struct fc_lport *fcoe_hostlist_lookup(const struct net_device *);
-int fcoe_hostlist_add(const struct fc_lport *);
-int fcoe_hostlist_remove(const struct fc_lport *);
-
-struct Scsi_Host *fcoe_host_alloc(struct scsi_host_template *, int);
+u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
 int fcoe_libfc_config(struct fc_lport *, struct libfc_function_template *);
 
-/* fcoe sw hba */
-int __init fcoe_sw_init(void);
-int __exit fcoe_sw_exit(void);
 #endif /* _LIBFCOE_H */
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 7360e1916e75..0289f5745fb9 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -36,6 +36,7 @@ struct scsi_transport_template;
 struct scsi_host_template;
 struct scsi_device;
 struct Scsi_Host;
+struct scsi_target;
 struct scsi_cmnd;
 struct socket;
 struct iscsi_transport;
@@ -45,18 +46,10 @@ struct iscsi_session;
 struct iscsi_nopin;
 struct device;
 
-/* #define DEBUG_SCSI */
-#ifdef DEBUG_SCSI
-#define debug_scsi(fmt...) printk(KERN_INFO "iscsi: " fmt)
-#else
-#define debug_scsi(fmt...)
-#endif
-
 #define ISCSI_DEF_XMIT_CMDS_MAX 128     /* must be power of 2 */
 #define ISCSI_MGMT_CMDS_MAX     15
 
-#define ISCSI_DEF_CMD_PER_LUN           32
-#define ISCSI_MAX_CMD_PER_LUN           128
+#define ISCSI_DEF_CMD_PER_LUN   32
 
 /* Task Mgmt states */
 enum {
@@ -326,6 +319,9 @@ struct iscsi_host {
         spinlock_t              lock;
         int                     num_sessions;
         int                     state;
+
+        struct workqueue_struct *workq;
+        char                    workq_name[20];
 };
 
 /*
@@ -351,9 +347,11 @@ extern int iscsi_host_get_param(struct Scsi_Host *shost,
                                 enum iscsi_host_param param, char *buf);
 extern int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev);
 extern struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,
-                                          int dd_data_size, uint16_t qdepth);
+                                          int dd_data_size,
+                                          bool xmit_can_sleep);
 extern void iscsi_host_remove(struct Scsi_Host *shost);
 extern void iscsi_host_free(struct Scsi_Host *shost);
+extern int iscsi_target_alloc(struct scsi_target *starget);
 
 /*
  * session management
@@ -382,11 +380,12 @@ extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);
 extern int iscsi_conn_bind(struct iscsi_cls_session *, struct iscsi_cls_conn *,
                            int);
 extern void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err);
-extern void iscsi_session_failure(struct iscsi_cls_session *cls_session,
+extern void iscsi_session_failure(struct iscsi_session *session,
                                   enum iscsi_err err);
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
                                 enum iscsi_param param, char *buf);
 extern void iscsi_suspend_tx(struct iscsi_conn *conn);
+extern void iscsi_conn_queue_work(struct iscsi_conn *conn);
 
 #define iscsi_conn_printk(prefix, _c, fmt, a...) \
         iscsi_cls_conn_printk(prefix, ((struct iscsi_conn *)_c)->cls_conn, \
diff --git a/include/scsi/osd_attributes.h b/include/scsi/osd_attributes.h
new file mode 100644
index 000000000000..f888a6fda073
--- /dev/null
+++ b/include/scsi/osd_attributes.h
@@ -0,0 +1,327 @@
+#ifndef __OSD_ATTRIBUTES_H__
+#define __OSD_ATTRIBUTES_H__
+
+#include "osd_protocol.h"
+
+/*
+ * Contains types and constants that define attribute pages and attribute
+ * numbers and their data types.
+ */
+
+#define ATTR_SET(pg, id, l, ptr) \
+        { .attr_page = pg, .attr_id = id, .len = l, .val_ptr = ptr }
+
+#define ATTR_DEF(pg, id, l) ATTR_SET(pg, id, l, NULL)
+
+/* osd-r10 4.7.3 Attributes pages */
+enum {
+        OSD_APAGE_OBJECT_FIRST          = 0x0,
+        OSD_APAGE_OBJECT_DIRECTORY      = 0,
+        OSD_APAGE_OBJECT_INFORMATION    = 1,
+        OSD_APAGE_OBJECT_QUOTAS         = 2,
+        OSD_APAGE_OBJECT_TIMESTAMP      = 3,
+        OSD_APAGE_OBJECT_COLLECTIONS    = 4,
+        OSD_APAGE_OBJECT_SECURITY       = 5,
+        OSD_APAGE_OBJECT_LAST           = 0x2fffffff,
+
+        OSD_APAGE_PARTITION_FIRST       = 0x30000000,
+        OSD_APAGE_PARTITION_DIRECTORY   = OSD_APAGE_PARTITION_FIRST + 0,
+        OSD_APAGE_PARTITION_INFORMATION = OSD_APAGE_PARTITION_FIRST + 1,
+        OSD_APAGE_PARTITION_QUOTAS      = OSD_APAGE_PARTITION_FIRST + 2,
+        OSD_APAGE_PARTITION_TIMESTAMP   = OSD_APAGE_PARTITION_FIRST + 3,
+        OSD_APAGE_PARTITION_SECURITY    = OSD_APAGE_PARTITION_FIRST + 5,
+        OSD_APAGE_PARTITION_LAST        = 0x5FFFFFFF,
+
+        OSD_APAGE_COLLECTION_FIRST      = 0x60000000,
+        OSD_APAGE_COLLECTION_DIRECTORY  = OSD_APAGE_COLLECTION_FIRST + 0,
+        OSD_APAGE_COLLECTION_INFORMATION = OSD_APAGE_COLLECTION_FIRST + 1,
+        OSD_APAGE_COLLECTION_TIMESTAMP  = OSD_APAGE_COLLECTION_FIRST + 3,
+        OSD_APAGE_COLLECTION_SECURITY   = OSD_APAGE_COLLECTION_FIRST + 5,
+        OSD_APAGE_COLLECTION_LAST       = 0x8FFFFFFF,
+
+        OSD_APAGE_ROOT_FIRST            = 0x90000000,
+        OSD_APAGE_ROOT_DIRECTORY        = OSD_APAGE_ROOT_FIRST + 0,
+        OSD_APAGE_ROOT_INFORMATION      = OSD_APAGE_ROOT_FIRST + 1,
+        OSD_APAGE_ROOT_QUOTAS           = OSD_APAGE_ROOT_FIRST + 2,
+        OSD_APAGE_ROOT_TIMESTAMP        = OSD_APAGE_ROOT_FIRST + 3,
+        OSD_APAGE_ROOT_SECURITY         = OSD_APAGE_ROOT_FIRST + 5,
+        OSD_APAGE_ROOT_LAST             = 0xBFFFFFFF,
+
+        OSD_APAGE_RESERVED_TYPE_FIRST   = 0xC0000000,
+        OSD_APAGE_RESERVED_TYPE_LAST    = 0xEFFFFFFF,
+
+        OSD_APAGE_COMMON_FIRST          = 0xF0000000,
+        OSD_APAGE_COMMON_LAST           = 0xFFFFFFFE,
+
+        OSD_APAGE_REQUEST_ALL           = 0xFFFFFFFF,
+};
+
+/* subcategories of attr pages within each range above */
+enum {
+        OSD_APAGE_STD_FIRST             = 0x0,
+        OSD_APAGE_STD_DIRECTORY         = 0,
+        OSD_APAGE_STD_INFORMATION       = 1,
+        OSD_APAGE_STD_QUOTAS            = 2,
+        OSD_APAGE_STD_TIMESTAMP         = 3,
+        OSD_APAGE_STD_COLLECTIONS       = 4,
+        OSD_APAGE_STD_POLICY_SECURITY   = 5,
+        OSD_APAGE_STD_LAST              = 0x0000007F,
+
+        OSD_APAGE_RESERVED_FIRST        = 0x00000080,
+        OSD_APAGE_RESERVED_LAST         = 0x00007FFF,
+
+        OSD_APAGE_OTHER_STD_FIRST       = 0x00008000,
+        OSD_APAGE_OTHER_STD_LAST        = 0x0000EFFF,
+
+        OSD_APAGE_PUBLIC_FIRST          = 0x0000F000,
+        OSD_APAGE_PUBLIC_LAST           = 0x0000FFFF,
+
+        OSD_APAGE_APP_DEFINED_FIRST     = 0x00010000,
+        OSD_APAGE_APP_DEFINED_LAST      = 0x1FFFFFFF,
+
+        OSD_APAGE_VENDOR_SPECIFIC_FIRST = 0x20000000,
+        OSD_APAGE_VENDOR_SPECIFIC_LAST  = 0x2FFFFFFF,
+};
+
+enum {
+        OSD_ATTR_PAGE_IDENTIFICATION = 0, /* in all pages 40 bytes */
+};
+
+struct page_identification {
+        u8 vendor_identification[8];
+        u8 page_identification[32];
+}  __packed;
+
+struct osd_attr_page_header {
+        __be32 page_number;
+        __be32 page_length;
+} __packed;
+
+/* 7.1.2.8 Root Information attributes page (OSD_APAGE_ROOT_INFORMATION) */
+enum {
+        OSD_ATTR_RI_OSD_SYSTEM_ID            = 0x3,   /* 20       */
+        OSD_ATTR_RI_VENDOR_IDENTIFICATION    = 0x4,   /* 8        */
+        OSD_ATTR_RI_PRODUCT_IDENTIFICATION   = 0x5,   /* 16       */
+        OSD_ATTR_RI_PRODUCT_MODEL            = 0x6,   /* 32       */
+        OSD_ATTR_RI_PRODUCT_REVISION_LEVEL   = 0x7,   /* 4        */
+        OSD_ATTR_RI_PRODUCT_SERIAL_NUMBER    = 0x8,   /* variable */
+        OSD_ATTR_RI_OSD_NAME                 = 0x9,   /* variable */
+        OSD_ATTR_RI_TOTAL_CAPACITY           = 0x80,  /* 8        */
+        OSD_ATTR_RI_USED_CAPACITY            = 0x81,  /* 8        */
+        OSD_ATTR_RI_NUMBER_OF_PARTITIONS     = 0xC0,  /* 8        */
+        OSD_ATTR_RI_CLOCK                    = 0x100, /* 6        */
+};
+/* Root_Information_attributes_page does not have a get_page structure */
+
+/* 7.1.2.9 Partition Information attributes page
+ * (OSD_APAGE_PARTITION_INFORMATION)
+ */
+enum {
+        OSD_ATTR_PI_PARTITION_ID            = 0x1,     /* 8        */
+        OSD_ATTR_PI_USERNAME                = 0x9,     /* variable */
+        OSD_ATTR_PI_USED_CAPACITY           = 0x81,    /* 8        */
+        OSD_ATTR_PI_NUMBER_OF_OBJECTS       = 0xC1,    /* 8        */
+};
+/* Partition Information attributes page does not have a get_page structure */
+
+/* 7.1.2.10 Collection Information attributes page
+ * (OSD_APAGE_COLLECTION_INFORMATION)
+ */
+enum {
+        OSD_ATTR_CI_PARTITION_ID           = 0x1,       /* 8        */
+        OSD_ATTR_CI_COLLECTION_OBJECT_ID   = 0x2,       /* 8        */
+        OSD_ATTR_CI_USERNAME               = 0x9,       /* variable */
+        OSD_ATTR_CI_USED_CAPACITY          = 0x81,      /* 8        */
+};
+/* Collection Information attributes page does not have a get_page structure */
+
+/* 7.1.2.11 User Object Information attributes page
+ * (OSD_APAGE_OBJECT_INFORMATION)
+ */
+enum {
+        OSD_ATTR_OI_PARTITION_ID         = 0x1,       /* 8        */
+        OSD_ATTR_OI_OBJECT_ID            = 0x2,       /* 8        */
+        OSD_ATTR_OI_USERNAME             = 0x9,       /* variable */
+        OSD_ATTR_OI_USED_CAPACITY        = 0x81,      /* 8        */
+        OSD_ATTR_OI_LOGICAL_LENGTH       = 0x82,      /* 8        */
+};
+/* Object Information attributes page does not have a get_page structure */
+
+/* 7.1.2.12 Root Quotas attributes page (OSD_APAGE_ROOT_QUOTAS) */
+enum {
+        OSD_ATTR_RQ_DEFAULT_MAXIMUM_USER_OBJECT_LENGTH     = 0x1,      /* 8  */
+        OSD_ATTR_RQ_PARTITION_CAPACITY_QUOTA               = 0x10001,  /* 8  */
+        OSD_ATTR_RQ_PARTITION_OBJECT_COUNT                 = 0x10002,  /* 8  */
+        OSD_ATTR_RQ_PARTITION_COLLECTIONS_PER_USER_OBJECT  = 0x10081,  /* 4  */
+        OSD_ATTR_RQ_PARTITION_COUNT                        = 0x20002,  /* 8  */
+};
+
+struct Root_Quotas_attributes_page {
+        struct osd_attr_page_header hdr; /* id=R+2, size=0x24 */
+        __be64 default_maximum_user_object_length;
+        __be64 partition_capacity_quota;
+        __be64 partition_object_count;
+        __be64 partition_collections_per_user_object;
+        __be64 partition_count;
+}  __packed;
+
+/* 7.1.2.13 Partition Quotas attributes page (OSD_APAGE_PARTITION_QUOTAS)*/
+enum {
+        OSD_ATTR_PQ_DEFAULT_MAXIMUM_USER_OBJECT_LENGTH  = 0x1,        /* 8 */
+        OSD_ATTR_PQ_CAPACITY_QUOTA                      = 0x10001,    /* 8 */
+        OSD_ATTR_PQ_OBJECT_COUNT                        = 0x10002,    /* 8 */
+        OSD_ATTR_PQ_COLLECTIONS_PER_USER_OBJECT         = 0x10081,    /* 4 */
+};
+
+struct Partition_Quotas_attributes_page {
+        struct osd_attr_page_header hdr; /* id=P+2, size=0x1C */
+        __be64 default_maximum_user_object_length;
+        __be64 capacity_quota;
+        __be64 object_count;
+        __be64 collections_per_user_object;
+}  __packed;
+
+/* 7.1.2.14 User Object Quotas attributes page (OSD_APAGE_OBJECT_QUOTAS) */
+enum {
+        OSD_ATTR_OQ_MAXIMUM_LENGTH  = 0x1,        /* 8 */
+};
+
+struct Object_Quotas_attributes_page {
+        struct osd_attr_page_header hdr; /* id=U+2, size=0x8 */
+        __be64 maximum_length;
+}  __packed;
+
+/* 7.1.2.15 Root Timestamps attributes page (OSD_APAGE_ROOT_TIMESTAMP) */
+enum {
+        OSD_ATTR_RT_ATTRIBUTES_ACCESSED_TIME  = 0x2,        /* 6 */
+        OSD_ATTR_RT_ATTRIBUTES_MODIFIED_TIME  = 0x3,        /* 6 */
+        OSD_ATTR_RT_TIMESTAMP_BYPASS          = 0xFFFFFFFE, /* 1 */
+};
+
+struct root_timestamps_attributes_page {
+        struct osd_attr_page_header hdr; /* id=R+3, size=0xD */
+        struct osd_timestamp attributes_accessed_time;
+        struct osd_timestamp attributes_modified_time;
+        u8 timestamp_bypass;
+}  __packed;
+
+/* 7.1.2.16 Partition Timestamps attributes page
+ * (OSD_APAGE_PARTITION_TIMESTAMP)
+ */
+enum {
+        OSD_ATTR_PT_CREATED_TIME              = 0x1,        /* 6 */
+        OSD_ATTR_PT_ATTRIBUTES_ACCESSED_TIME  = 0x2,        /* 6 */
+        OSD_ATTR_PT_ATTRIBUTES_MODIFIED_TIME  = 0x3,        /* 6 */
+        OSD_ATTR_PT_DATA_ACCESSED_TIME        = 0x4,        /* 6 */
+        OSD_ATTR_PT_DATA_MODIFIED_TIME        = 0x5,        /* 6 */
+        OSD_ATTR_PT_TIMESTAMP_BYPASS          = 0xFFFFFFFE, /* 1 */
+};
+
+struct partition_timestamps_attributes_page {
+        struct osd_attr_page_header hdr; /* id=P+3, size=0x1F */
+        struct osd_timestamp created_time;
+        struct osd_timestamp attributes_accessed_time;
+        struct osd_timestamp attributes_modified_time;
+        struct osd_timestamp data_accessed_time;
+        struct osd_timestamp data_modified_time;
+        u8 timestamp_bypass;
+}  __packed;
+
+/* 7.1.2.17/18 Collection/Object Timestamps attributes page
+ * (OSD_APAGE_COLLECTION_TIMESTAMP/OSD_APAGE_OBJECT_TIMESTAMP)
+ */
+enum {
+        OSD_ATTR_OT_CREATED_TIME              = 0x1,        /* 6 */
+        OSD_ATTR_OT_ATTRIBUTES_ACCESSED_TIME  = 0x2,        /* 6 */
+        OSD_ATTR_OT_ATTRIBUTES_MODIFIED_TIME  = 0x3,        /* 6 */
+        OSD_ATTR_OT_DATA_ACCESSED_TIME        = 0x4,        /* 6 */
+        OSD_ATTR_OT_DATA_MODIFIED_TIME        = 0x5,        /* 6 */
+};
+
+/* same for collection */
+struct object_timestamps_attributes_page {
+        struct osd_attr_page_header hdr; /* id=C+3/3, size=0x1E */
+        struct osd_timestamp created_time;
+        struct osd_timestamp attributes_accessed_time;
+        struct osd_timestamp attributes_modified_time;
+        struct osd_timestamp data_accessed_time;
+        struct osd_timestamp data_modified_time;
+}  __packed;
+
+/* 7.1.2.19 Collections attributes page */
+/* TBD */
+
+/* 7.1.2.20 Root Policy/Security attributes page (OSD_APAGE_ROOT_SECURITY) */
+enum {
+        OSD_ATTR_RS_DEFAULT_SECURITY_METHOD           = 0x1,       /* 1      */
+        OSD_ATTR_RS_OLDEST_VALID_NONCE_LIMIT          = 0x2,       /* 6      */
+        OSD_ATTR_RS_NEWEST_VALID_NONCE_LIMIT          = 0x3,       /* 6      */
+        OSD_ATTR_RS_PARTITION_DEFAULT_SECURITY_METHOD = 0x6,       /* 1      */
+        OSD_ATTR_RS_SUPPORTED_SECURITY_METHODS        = 0x7,       /* 2      */
+        OSD_ATTR_RS_ADJUSTABLE_CLOCK                  = 0x9,       /* 6      */
+        OSD_ATTR_RS_MASTER_KEY_IDENTIFIER             = 0x7FFD,    /* 0 or 7 */
+        OSD_ATTR_RS_ROOT_KEY_IDENTIFIER               = 0x7FFE,    /* 0 or 7 */
+        OSD_ATTR_RS_SUPPORTED_INTEGRITY_ALGORITHM_0   = 0x80000000,/* 1,(x16)*/
+        OSD_ATTR_RS_SUPPORTED_DH_GROUP_0              = 0x80000010,/* 1,(x16)*/
+};
+
+struct root_security_attributes_page {
+        struct osd_attr_page_header hdr; /* id=R+5, size=0x3F */
+        u8 default_security_method;
+        u8 partition_default_security_method;
+        __be16 supported_security_methods;
+        u8 mki_valid_rki_valid;
+        struct osd_timestamp oldest_valid_nonce_limit;
+        struct osd_timestamp newest_valid_nonce_limit;
+        struct osd_timestamp adjustable_clock;
+        u8 master_key_identifier[32-25];
+        u8 root_key_identifier[39-32];
+        u8 supported_integrity_algorithm[16];
+        u8 supported_dh_group[16];
+}  __packed;
+
+/* 7.1.2.21 Partition Policy/Security attributes page
+ * (OSD_APAGE_PARTITION_SECURITY)
+ */
+enum {
+        OSD_ATTR_PS_DEFAULT_SECURITY_METHOD        = 0x1,        /* 1      */
+        OSD_ATTR_PS_OLDEST_VALID_NONCE             = 0x2,        /* 6      */
+        OSD_ATTR_PS_NEWEST_VALID_NONCE             = 0x3,        /* 6      */
+        OSD_ATTR_PS_REQUEST_NONCE_LIST_DEPTH       = 0x4,        /* 2      */
+        OSD_ATTR_PS_FROZEN_WORKING_KEY_BIT_MASK    = 0x5,        /* 2      */
+        OSD_ATTR_PS_PARTITION_KEY_IDENTIFIER       = 0x7FFF,     /* 0 or 7 */
+        OSD_ATTR_PS_WORKING_KEY_IDENTIFIER_FIRST   = 0x8000,     /* 0 or 7 */
+        OSD_ATTR_PS_WORKING_KEY_IDENTIFIER_LAST    = 0x800F,     /* 0 or 7 */
+        OSD_ATTR_PS_POLICY_ACCESS_TAG              = 0x40000001, /* 4      */
+        OSD_ATTR_PS_USER_OBJECT_POLICY_ACCESS_TAG  = 0x40000002, /* 4      */
+};
+
+struct partition_security_attributes_page {
+        struct osd_attr_page_header hdr; /* id=p+5, size=0x8f */
+        u8 reserved[3];
+        u8 default_security_method;
+        struct osd_timestamp oldest_valid_nonce;
+        struct osd_timestamp newest_valid_nonce;
+        __be16 request_nonce_list_depth;
+        __be16 frozen_working_key_bit_mask;
+        __be32 policy_access_tag;
+        __be32 user_object_policy_access_tag;
+        u8 pki_valid;
+        __be16 wki_00_0f_vld;
+        struct osd_key_identifier partition_key_identifier;
+        struct osd_key_identifier working_key_identifiers[16];
+}  __packed;
+
+/* 7.1.2.22/23 Collection/Object Policy-Security attributes page
+ * (OSD_APAGE_COLLECTION_SECURITY/OSD_APAGE_OBJECT_SECURITY)
+ */
+enum {
+        OSD_ATTR_OS_POLICY_ACCESS_TAG              = 0x40000001, /* 4      */
+};
+
+struct object_security_attributes_page {
+        struct osd_attr_page_header hdr; /* id=C+5/5, size=4 */
+        __be32 policy_access_tag;
+}  __packed;
+
+#endif /*ndef __OSD_ATTRIBUTES_H__*/
diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
new file mode 100644
index 000000000000..b24d9616eb46
--- /dev/null
+++ b/include/scsi/osd_initiator.h
@@ -0,0 +1,433 @@
+/*
+ * osd_initiator.h - OSD initiator API definition
+ *
+ * Copyright (C) 2008 Panasas Inc.  All rights reserved.
+ *
+ * Authors:
+ *   Boaz Harrosh <bharrosh@panasas.com>
+ *   Benny Halevy <bhalevy@panasas.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
+ *
+ */
+#ifndef __OSD_INITIATOR_H__
+#define __OSD_INITIATOR_H__
+
+#include "osd_protocol.h"
+#include "osd_types.h"
+
+#include <linux/blkdev.h>
+
+/* Note: "NI" in comments below means "Not Implemented yet" */
+
+/* Configure of code:
+ * #undef if you *don't* want OSD v1 support in runtime.
+ * If #defined the initiator will dynamically configure to encode OSD v1
+ * CDB's if the target is detected to be OSD v1 only.
+ * OSD v2 only commands, options, and attributes will be ignored if target
+ * is v1 only.
+ * If #defined will result in bigger/slower code (OK Slower maybe not)
+ * Q: Should this be CONFIG_SCSI_OSD_VER1_SUPPORT and set from Kconfig?
+ */
+#define OSD_VER1_SUPPORT y
+
+enum osd_std_version {
+        OSD_VER_NONE = 0,
+        OSD_VER1 = 1,
+        OSD_VER2 = 2,
+};
+
+/*
+ * Object-based Storage Device.
+ * This object represents an OSD device.
+ * It is not a full linux device in any way. It is only
+ * a place to hang resources associated with a Linux
+ * request Q and some default properties.
+ */
+struct osd_dev {
+        struct scsi_device *scsi_device;
+        unsigned def_timeout;
+
+#ifdef OSD_VER1_SUPPORT
+        enum osd_std_version version;
+#endif
+};
+
+/* Retrieve/return osd_dev(s) for use by Kernel clients */
+struct osd_dev *osduld_path_lookup(const char *dev_name); /*Use IS_ERR/ERR_PTR*/
+void osduld_put_device(struct osd_dev *od);
+
+/* Add/remove test ioctls from external modules */
+typedef int (do_test_fn)(struct osd_dev *od, unsigned cmd, unsigned long arg);
+int osduld_register_test(unsigned ioctl, do_test_fn *do_test);
+void osduld_unregister_test(unsigned ioctl);
+
+/* These are called by uld at probe time */
+void osd_dev_init(struct osd_dev *od, struct scsi_device *scsi_device);
+void osd_dev_fini(struct osd_dev *od);
+
+/* some hi level device operations */
+int osd_auto_detect_ver(struct osd_dev *od, void *caps);    /* GFP_KERNEL */
+
+/* we might want to use function vector in the future */
+static inline void osd_dev_set_ver(struct osd_dev *od, enum osd_std_version v)
+{
+#ifdef OSD_VER1_SUPPORT
+        od->version = v;
+#endif
+}
+
+struct osd_request;
+typedef void (osd_req_done_fn)(struct osd_request *or, void *private);
+
+struct osd_request {
+        struct osd_cdb cdb;
+        struct osd_data_out_integrity_info out_data_integ;
+        struct osd_data_in_integrity_info in_data_integ;
+
+        struct osd_dev *osd_dev;
+        struct request *request;
+
+        struct _osd_req_data_segment {
+                void *buff;
+                unsigned alloc_size; /* 0 here means: don't call kfree */
+                unsigned total_bytes;
+        } set_attr, enc_get_attr, get_attr;
+
+        struct _osd_io_info {
+                struct bio *bio;
+                u64 total_bytes;
+                struct request *req;
+                struct _osd_req_data_segment *last_seg;
+                u8 *pad_buff;
+        } out, in;
+
+        gfp_t alloc_flags;
+        unsigned timeout;
+        unsigned retries;
+        u8 sense[OSD_MAX_SENSE_LEN];
+        enum osd_attributes_mode attributes_mode;
+
+        osd_req_done_fn *async_done;
+        void *async_private;
+        int async_error;
+};
+
+/* OSD Version control */
+static inline bool osd_req_is_ver1(struct osd_request *or)
+{
+#ifdef OSD_VER1_SUPPORT
+        return or->osd_dev->version == OSD_VER1;
+#else
+        return false;
+#endif
+}
+
+/*
+ * How to use the osd library:
+ *
+ * osd_start_request
+ *      Allocates a request.
+ *
+ * osd_req_*
+ *      Call one of, to encode the desired operation.
+ *
+ * osd_add_{get,set}_attr
+ *      Optionally add attributes to the CDB, list or page mode.
+ *
+ * osd_finalize_request
+ *      Computes final data out/in offsets and signs the request,
+ *      making it ready for execution.
+ *
+ * osd_execute_request
+ *      May be called to execute it through the block layer. Other wise submit
+ *      the associated block request in some other way.
+ *
+ * After execution:
+ * osd_req_decode_sense
+ *      Decodes sense information to verify execution results.
+ *
+ * osd_req_decode_get_attr
+ *      Retrieve osd_add_get_attr_list() values if used.
+ *
+ * osd_end_request
+ *      Must be called to deallocate the request.
+ */
+
+/**
+ * osd_start_request - Allocate and initialize an osd_request
+ *
+ * @osd_dev:    OSD device that holds the scsi-device and default values
+ *              that the request is associated with.
+ * @gfp:        The allocation flags to use for request allocation, and all
+ *              subsequent allocations. This will be stored at
+ *              osd_request->alloc_flags, can be changed by user later
+ *
+ * Allocate osd_request and initialize all members to the
+ * default/initial state.
+ */
+struct osd_request *osd_start_request(struct osd_dev *od, gfp_t gfp);
+
+enum osd_req_options {
+        OSD_REQ_FUA = 0x08,     /* Force Unit Access */
+        OSD_REQ_DPO = 0x10,     /* Disable Page Out */
+
+        OSD_REQ_BYPASS_TIMESTAMPS = 0x80,
+};
+
+/**
+ * osd_finalize_request - Sign request and prepare request for execution
+ *
+ * @or:         osd_request to prepare
+ * @options:    combination of osd_req_options bit flags or 0.
+ * @cap:        A Pointer to an OSD_CAP_LEN bytes buffer that is received from
+ *              The security manager as capabilities for this cdb.
+ * @cap_key:    The cryptographic key used to sign the cdb/data. Can be null
+ *              if NOSEC is used.
+ *
+ * The actual request and bios are only allocated here, so are the get_attr
+ * buffers that will receive the returned attributes. Copy's @cap to cdb.
+ * Sign the cdb/data with @cap_key.
+ */
+int osd_finalize_request(struct osd_request *or,
+        u8 options, const void *cap, const u8 *cap_key);
+
+/**
+ * osd_execute_request - Execute the request synchronously through block-layer
+ *
+ * @or:         osd_request to Executed
+ *
+ * Calls blk_execute_rq to q the command and waits for completion.
+ */
+int osd_execute_request(struct osd_request *or);
+
+/**
+ * osd_execute_request_async - Execute the request without waitting.
+ *
+ * @or:                      - osd_request to Executed
+ * @done: (Optional)         - Called at end of execution
+ * @private:                 - Will be passed to @done function
+ *
+ * Calls blk_execute_rq_nowait to queue the command. When execution is done
+ * optionally calls @done with @private as parameter. @or->async_error will
+ * have the return code
+ */
+int osd_execute_request_async(struct osd_request *or,
+        osd_req_done_fn *done, void *private);
+
+/**
+ * osd_req_decode_sense_full - Decode sense information after execution.
+ *
+ * @or:           - osd_request to examine
+ * @osi           - Recievs a more detailed error report information (optional).
+ * @silent        - Do not print to dmsg (Even if enabled)
+ * @bad_obj_list  - Some commands act on multiple objects. Failed objects will
+ *                  be recieved here (optional)
+ * @max_obj       - Size of @bad_obj_list.
+ * @bad_attr_list - List of failing attributes (optional)
+ * @max_attr      - Size of @bad_attr_list.
+ *
+ * After execution, sense + return code can be analyzed using this function. The
+ * return code is the final disposition on the error. So it is possible that a
+ * CHECK_CONDITION was returned from target but this will return NO_ERROR, for
+ * example on recovered errors. All parameters are optional if caller does
+ * not need any returned information.
+ * Note: This function will also dump the error to dmsg according to settings
+ * of the SCSI_OSD_DPRINT_SENSE Kconfig value. Set @silent if you know the
+ * command would routinely fail, to not spam the dmsg file.
+ */
+struct osd_sense_info {
+        int key;                /* one of enum scsi_sense_keys */
+        int additional_code ;   /* enum osd_additional_sense_codes */
+        union { /* Sense specific information */
+                u16 sense_info;
+                u16 cdb_field_offset;   /* scsi_invalid_field_in_cdb */
+        };
+        union { /* Command specific information */
+                u64 command_info;
+        };
+
+        u32 not_initiated_command_functions; /* osd_command_functions_bits */
+        u32 completed_command_functions; /* osd_command_functions_bits */
+        struct osd_obj_id obj;
+        struct osd_attr attr;
+};
+
+int osd_req_decode_sense_full(struct osd_request *or,
+        struct osd_sense_info *osi, bool silent,
+        struct osd_obj_id *bad_obj_list, int max_obj,
+        struct osd_attr *bad_attr_list, int max_attr);
+
+static inline int osd_req_decode_sense(struct osd_request *or,
+        struct osd_sense_info *osi)
+{
+        return osd_req_decode_sense_full(or, osi, false, NULL, 0, NULL, 0);
+}
+
+/**
+ * osd_end_request - return osd_request to free store
+ *
+ * @or:         osd_request to free
+ *
+ * Deallocate all osd_request resources (struct req's, BIOs, buffers, etc.)
+ */
+void osd_end_request(struct osd_request *or);
+
+/*
+ * CDB Encoding
+ *
+ * Note: call only one of the following methods.
+ */
+
+/*
+ * Device commands
+ */
+void osd_req_set_master_seed_xchg(struct osd_request *or, ...);/* NI */
+void osd_req_set_master_key(struct osd_request *or, ...);/* NI */
+
+void osd_req_format(struct osd_request *or, u64 tot_capacity);
+
+/* list all partitions
+ * @list header must be initialized to zero on first run.
+ *
+ * Call osd_is_obj_list_done() to find if we got the complete list.
+ */
+int osd_req_list_dev_partitions(struct osd_request *or,
+        osd_id initial_id, struct osd_obj_id_list *list, unsigned nelem);
+
+void osd_req_flush_obsd(struct osd_request *or,
+        enum osd_options_flush_scope_values);
+
+void osd_req_perform_scsi_command(struct osd_request *or,
+        const u8 *cdb, ...);/* NI */
+void osd_req_task_management(struct osd_request *or, ...);/* NI */
+
+/*
+ * Partition commands
+ */
+void osd_req_create_partition(struct osd_request *or, osd_id partition);
+void osd_req_remove_partition(struct osd_request *or, osd_id partition);
+
+void osd_req_set_partition_key(struct osd_request *or,
+        osd_id partition, u8 new_key_id[OSD_CRYPTO_KEYID_SIZE],
+        u8 seed[OSD_CRYPTO_SEED_SIZE]);/* NI */
+
+/* list all collections in the partition
+ * @list header must be init to zero on first run.
+ *
+ * Call osd_is_obj_list_done() to find if we got the complete list.
+ */
+int osd_req_list_partition_collections(struct osd_request *or,
+        osd_id partition, osd_id initial_id, struct osd_obj_id_list *list,
+        unsigned nelem);
+
+/* list all objects in the partition
+ * @list header must be init to zero on first run.
+ *
+ * Call osd_is_obj_list_done() to find if we got the complete list.
+ */
+int osd_req_list_partition_objects(struct osd_request *or,
+        osd_id partition, osd_id initial_id, struct osd_obj_id_list *list,
+        unsigned nelem);
+
+void osd_req_flush_partition(struct osd_request *or,
+        osd_id partition, enum osd_options_flush_scope_values);
+
+/*
+ * Collection commands
+ */
+void osd_req_create_collection(struct osd_request *or,
+        const struct osd_obj_id *);/* NI */
+void osd_req_remove_collection(struct osd_request *or,
+        const struct osd_obj_id *);/* NI */
+
+/* list all objects in the collection */
+int osd_req_list_collection_objects(struct osd_request *or,
+        const struct osd_obj_id *, osd_id initial_id,
+        struct osd_obj_id_list *list, unsigned nelem);
+
+/* V2 only filtered list of objects in the collection */
+void osd_req_query(struct osd_request *or, ...);/* NI */
+
+void osd_req_flush_collection(struct osd_request *or,
+        const struct osd_obj_id *, enum osd_options_flush_scope_values);
+
+void osd_req_get_member_attrs(struct osd_request *or, ...);/* V2-only NI */
+void osd_req_set_member_attrs(struct osd_request *or, ...);/* V2-only NI */
+
+/*
+ * Object commands
+ */
+void osd_req_create_object(struct osd_request *or, struct osd_obj_id *);
+void osd_req_remove_object(struct osd_request *or, struct osd_obj_id *);
+
+void osd_req_write(struct osd_request *or,
+        const struct osd_obj_id *, struct bio *data_out, u64 offset);
+void osd_req_append(struct osd_request *or,
+        const struct osd_obj_id *, struct bio *data_out);/* NI */
+void osd_req_create_write(struct osd_request *or,
+        const struct osd_obj_id *, struct bio *data_out, u64 offset);/* NI */
+void osd_req_clear(struct osd_request *or,
+        const struct osd_obj_id *, u64 offset, u64 len);/* NI */
+void osd_req_punch(struct osd_request *or,
+        const struct osd_obj_id *, u64 offset, u64 len);/* V2-only NI */
+
+void osd_req_flush_object(struct osd_request *or,
+        const struct osd_obj_id *, enum osd_options_flush_scope_values,
+        /*V2*/ u64 offset, /*V2*/ u64 len);
+
+void osd_req_read(struct osd_request *or,
+        const struct osd_obj_id *, struct bio *data_in, u64 offset);
+
+/*
+ * Root/Partition/Collection/Object Attributes commands
+ */
+
+/* get before set */
+void osd_req_get_attributes(struct osd_request *or, const struct osd_obj_id *);
+
+/* set before get */
+void osd_req_set_attributes(struct osd_request *or, const struct osd_obj_id *);
+
+/*
+ * Attributes appended to most commands
+ */
+
+/* Attributes List mode (or V2 CDB) */
+  /*
+   * TODO: In ver2 if at finalize time only one attr was set and no gets,
+   * then the Attributes CDB mode is used automatically to save IO.
+   */
+
+/* set a list of attributes. */
+int osd_req_add_set_attr_list(struct osd_request *or,
+        const struct osd_attr *, unsigned nelem);
+
+/* get a list of attributes */
+int osd_req_add_get_attr_list(struct osd_request *or,
+        const struct osd_attr *, unsigned nelem);
+
+/*
+ * Attributes list decoding
+ * Must be called after osd_request.request was executed
+ * It is called in a loop to decode the returned get_attr
+ * (see osd_add_get_attr)
+ */
+int osd_req_decode_get_attr_list(struct osd_request *or,
+        struct osd_attr *, int *nelem, void **iterator);
+
+/* Attributes Page mode */
+
+/*
+ * Read an attribute page and optionally set one attribute
+ *
+ * Retrieves the attribute page directly to a user buffer.
+ * @attr_page_data shall stay valid until end of execution.
+ * See osd_attributes.h for common page structures
+ */
+int osd_req_add_get_attr_page(struct osd_request *or,
+        u32 page_id, void *attr_page_data, unsigned max_page_len,
+        const struct osd_attr *set_one);
+
+#endif /* __OSD_LIB_H__ */
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
new file mode 100644
index 000000000000..62b2ab8c69d4
--- /dev/null
+++ b/include/scsi/osd_protocol.h
@@ -0,0 +1,625 @@
+/*
+ * osd_protocol.h - OSD T10 standard C definitions.
+ *
+ * Copyright (C) 2008 Panasas Inc.  All rights reserved.
+ *
+ * Authors:
+ *   Boaz Harrosh <bharrosh@panasas.com>
+ *   Benny Halevy <bhalevy@panasas.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
+ *
+ * This file contains types and constants that are defined by the protocol
+ * Note: All names and symbols are taken from the OSD standard's text.
+ */
+#ifndef __OSD_PROTOCOL_H__
+#define __OSD_PROTOCOL_H__
+
+#include <linux/types.h>
+#include <asm/unaligned.h>
+#include <scsi/scsi.h>
+
+enum {
+        OSDv1_ADDITIONAL_CDB_LENGTH = 192,
+        OSDv1_TOTAL_CDB_LEN = OSDv1_ADDITIONAL_CDB_LENGTH + 8,
+        OSDv1_CAP_LEN = 80,
+
+        /* Latest supported version */
+        OSDv2_ADDITIONAL_CDB_LENGTH = 228,
+        OSD_ADDITIONAL_CDB_LENGTH =
+                OSDv2_ADDITIONAL_CDB_LENGTH,
+        OSD_TOTAL_CDB_LEN = OSD_ADDITIONAL_CDB_LENGTH + 8,
+        OSD_CAP_LEN = 104,
+
+        OSD_SYSTEMID_LEN = 20,
+        OSDv1_CRYPTO_KEYID_SIZE = 20,
+        OSDv2_CRYPTO_KEYID_SIZE = 32,
+        OSD_CRYPTO_KEYID_SIZE = OSDv2_CRYPTO_KEYID_SIZE,
+        OSD_CRYPTO_SEED_SIZE = 4,
+        OSD_CRYPTO_NONCE_SIZE = 12,
+        OSD_MAX_SENSE_LEN = 252, /* from SPC-3 */
+
+        OSD_PARTITION_FIRST_ID = 0x10000,
+        OSD_OBJECT_FIRST_ID = 0x10000,
+};
+
+/* (osd-r10 5.2.4)
+ * osd2r03: 5.2.3 Caching control bits
+ */
+enum osd_options_byte {
+        OSD_CDB_FUA = 0x08,     /* Force Unit Access */
+        OSD_CDB_DPO = 0x10,     /* Disable Page Out */
+};
+
+/*
+ * osd2r03: 5.2.5 Isolation.
+ * First 3 bits, V2-only.
+ * Also for attr 110h "default isolation method" at Root Information page
+ */
+enum osd_options_byte_isolation {
+        OSD_ISOLATION_DEFAULT = 0,
+        OSD_ISOLATION_NONE = 1,
+        OSD_ISOLATION_STRICT = 2,
+        OSD_ISOLATION_RANGE = 4,
+        OSD_ISOLATION_FUNCTIONAL = 5,
+        OSD_ISOLATION_VENDOR = 7,
+};
+
+/* (osd-r10: 6.7)
+ * osd2r03: 6.8 FLUSH, FLUSH COLLECTION, FLUSH OSD, FLUSH PARTITION
+ */
+enum osd_options_flush_scope_values {
+        OSD_CDB_FLUSH_ALL = 0,
+        OSD_CDB_FLUSH_ATTR_ONLY = 1,
+
+        OSD_CDB_FLUSH_ALL_RECURSIVE = 2,
+        /* V2-only */
+        OSD_CDB_FLUSH_ALL_RANGE = 2,
+};
+
+/* osd2r03: 5.2.10 Timestamps control */
+enum {
+        OSD_CDB_NORMAL_TIMESTAMPS = 0,
+        OSD_CDB_BYPASS_TIMESTAMPS = 0x7f,
+};
+
+/* (osd-r10: 5.2.2.1)
+ * osd2r03: 5.2.4.1 Get and set attributes CDB format selection
+ *      2 bits at second nibble of command_specific_options byte
+ */
+enum osd_attributes_mode {
+        /* V2-only */
+        OSD_CDB_SET_ONE_ATTR = 0x10,
+
+        OSD_CDB_GET_ATTR_PAGE_SET_ONE = 0x20,
+        OSD_CDB_GET_SET_ATTR_LISTS = 0x30,
+
+        OSD_CDB_GET_SET_ATTR_MASK = 0x30,
+};
+
+/* (osd-r10: 4.12.5)
+ * osd2r03: 4.14.5 Data-In and Data-Out buffer offsets
+ *      byte offset = mantissa * (2^(exponent+8))
+ *      struct {
+ *              unsigned mantissa: 28;
+ *              int exponent: 04;
+ *      }
+ */
+typedef __be32 __bitwise osd_cdb_offset;
+
+enum {
+        OSD_OFFSET_UNUSED = 0xFFFFFFFF,
+        OSD_OFFSET_MAX_BITS = 28,
+
+        OSDv1_OFFSET_MIN_SHIFT = 8,
+        OSD_OFFSET_MIN_SHIFT = 3,
+        OSD_OFFSET_MAX_SHIFT = 16,
+};
+
+/* Return the smallest allowed encoded offset that contains @offset.
+ *
+ * The actual encoded offset returned is @offset + *padding.
+ * (up to max_shift, non-inclusive)
+ */
+osd_cdb_offset __osd_encode_offset(u64 offset, unsigned *padding,
+        int min_shift, int max_shift);
+
+/* Minimum alignment is 256 bytes
+ * Note: Seems from std v1 that exponent can be from 0+8 to 0xE+8 (inclusive)
+ * which is 8 to 23 but IBM code restricts it to 16, so be it.
+ */
+static inline osd_cdb_offset osd_encode_offset_v1(u64 offset, unsigned *padding)
+{
+        return __osd_encode_offset(offset, padding,
+                                OSDv1_OFFSET_MIN_SHIFT, OSD_OFFSET_MAX_SHIFT);
+}
+
+/* Minimum 8 bytes alignment
+ * Same as v1 but since exponent can be signed than a less than
+ * 256 alignment can be reached with small offsets (<2GB)
+ */
+static inline osd_cdb_offset osd_encode_offset_v2(u64 offset, unsigned *padding)
+{
+        return __osd_encode_offset(offset, padding,
+                                   OSD_OFFSET_MIN_SHIFT, OSD_OFFSET_MAX_SHIFT);
+}
+
+/* osd2r03: 5.2.1 Overview */
+struct osd_cdb_head {
+        struct scsi_varlen_cdb_hdr varlen_cdb;
+/*10*/  u8              options;
+        u8              command_specific_options;
+        u8              timestamp_control;
+/*13*/  u8              reserved1[3];
+/*16*/  __be64          partition;
+/*24*/  __be64          object;
+/*32*/  union { /* V1 vs V2 alignment differences */
+                struct __osdv1_cdb_addr_len {
+/*32*/                  __be32          list_identifier;/* Rarely used */
+/*36*/                  __be64          length;
+/*44*/                  __be64          start_address;
+                } __packed v1;
+
+                struct __osdv2_cdb_addr_len {
+                        /* called allocation_length in some commands */
+/*32*/                  __be64  length;
+/*40*/                  __be64  start_address;
+                        union {
+/*48*/                          __be32 list_identifier;/* Rarely used */
+                                /* OSD2r05 5.2.5 CDB continuation length */
+/*48*/                          __be32 cdb_continuation_length;
+                        };
+                } __packed v2;
+        };
+/*52*/  union { /* selected attributes mode Page/List/Single */
+                struct osd_attributes_page_mode {
+/*52*/                  __be32          get_attr_page;
+/*56*/                  __be32          get_attr_alloc_length;
+/*60*/                  osd_cdb_offset  get_attr_offset;
+
+/*64*/                  __be32          set_attr_page;
+/*68*/                  __be32          set_attr_id;
+/*72*/                  __be32          set_attr_length;
+/*76*/                  osd_cdb_offset  set_attr_offset;
+/*80*/          } __packed attrs_page;
+
+                struct osd_attributes_list_mode {
+/*52*/                  __be32          get_attr_desc_bytes;
+/*56*/                  osd_cdb_offset  get_attr_desc_offset;
+
+/*60*/                  __be32          get_attr_alloc_length;
+/*64*/                  osd_cdb_offset  get_attr_offset;
+
+/*68*/                  __be32          set_attr_bytes;
+/*72*/                  osd_cdb_offset  set_attr_offset;
+                        __be32 not_used;
+/*80*/          } __packed attrs_list;
+
+                /* osd2r03:5.2.4.2 Set one attribute value using CDB fields */
+                struct osd_attributes_cdb_mode {
+/*52*/                  __be32          set_attr_page;
+/*56*/                  __be32          set_attr_id;
+/*60*/                  __be16          set_attr_len;
+/*62*/                  u8              set_attr_val[18];
+/*80*/          } __packed attrs_cdb;
+/*52*/          u8 get_set_attributes_parameters[28];
+        };
+} __packed;
+/*80*/
+
+/*160 v1*/
+struct osdv1_security_parameters {
+/*160*/u8       integrity_check_value[OSDv1_CRYPTO_KEYID_SIZE];
+/*180*/u8       request_nonce[OSD_CRYPTO_NONCE_SIZE];
+/*192*/osd_cdb_offset   data_in_integrity_check_offset;
+/*196*/osd_cdb_offset   data_out_integrity_check_offset;
+} __packed;
+/*200 v1*/
+
+/*184 v2*/
+struct osdv2_security_parameters {
+/*184*/u8       integrity_check_value[OSDv2_CRYPTO_KEYID_SIZE];
+/*216*/u8       request_nonce[OSD_CRYPTO_NONCE_SIZE];
+/*228*/osd_cdb_offset   data_in_integrity_check_offset;
+/*232*/osd_cdb_offset   data_out_integrity_check_offset;
+} __packed;
+/*236 v2*/
+
+struct osd_security_parameters {
+        union {
+                struct osdv1_security_parameters v1;
+                struct osdv2_security_parameters v2;
+        };
+};
+
+struct osdv1_cdb {
+        struct osd_cdb_head h;
+        u8 caps[OSDv1_CAP_LEN];
+        struct osdv1_security_parameters sec_params;
+} __packed;
+
+struct osdv2_cdb {
+        struct osd_cdb_head h;
+        u8 caps[OSD_CAP_LEN];
+        struct osdv2_security_parameters sec_params;
+} __packed;
+
+struct osd_cdb {
+        union {
+                struct osdv1_cdb v1;
+                struct osdv2_cdb v2;
+                u8 buff[OSD_TOTAL_CDB_LEN];
+        };
+} __packed;
+
+static inline struct osd_cdb_head *osd_cdb_head(struct osd_cdb *ocdb)
+{
+        return (struct osd_cdb_head *)ocdb->buff;
+}
+
+/* define both version actions
+ * Ex name = FORMAT_OSD we have OSD_ACT_FORMAT_OSD && OSDv1_ACT_FORMAT_OSD
+ */
+#define OSD_ACT___(Name, Num) \
+        OSD_ACT_##Name = __constant_cpu_to_be16(0x8880 + Num), \
+        OSDv1_ACT_##Name = __constant_cpu_to_be16(0x8800 + Num),
+
+/* V2 only actions */
+#define OSD_ACT_V2(Name, Num) \
+        OSD_ACT_##Name = __constant_cpu_to_be16(0x8880 + Num),
+
+#define OSD_ACT_V1_V2(Name, Num1, Num2) \
+        OSD_ACT_##Name = __constant_cpu_to_be16(Num2), \
+        OSDv1_ACT_##Name = __constant_cpu_to_be16(Num1),
+
+enum osd_service_actions {
+        OSD_ACT_V2(OBJECT_STRUCTURE_CHECK,      0x00)
+        OSD_ACT___(FORMAT_OSD,                  0x01)
+        OSD_ACT___(CREATE,                      0x02)
+        OSD_ACT___(LIST,                        0x03)
+        OSD_ACT_V2(PUNCH,                       0x04)
+        OSD_ACT___(READ,                        0x05)
+        OSD_ACT___(WRITE,                       0x06)
+        OSD_ACT___(APPEND,                      0x07)
+        OSD_ACT___(FLUSH,                       0x08)
+        OSD_ACT_V2(CLEAR,                       0x09)
+        OSD_ACT___(REMOVE,                      0x0A)
+        OSD_ACT___(CREATE_PARTITION,            0x0B)
+        OSD_ACT___(REMOVE_PARTITION,            0x0C)
+        OSD_ACT___(GET_ATTRIBUTES,              0x0E)
+        OSD_ACT___(SET_ATTRIBUTES,              0x0F)
+        OSD_ACT___(CREATE_AND_WRITE,            0x12)
+        OSD_ACT___(CREATE_COLLECTION,           0x15)
+        OSD_ACT___(REMOVE_COLLECTION,           0x16)
+        OSD_ACT___(LIST_COLLECTION,             0x17)
+        OSD_ACT___(SET_KEY,                     0x18)
+        OSD_ACT___(SET_MASTER_KEY,              0x19)
+        OSD_ACT___(FLUSH_COLLECTION,            0x1A)
+        OSD_ACT___(FLUSH_PARTITION,             0x1B)
+        OSD_ACT___(FLUSH_OSD,                   0x1C)
+
+        OSD_ACT_V2(QUERY,                       0x20)
+        OSD_ACT_V2(REMOVE_MEMBER_OBJECTS,       0x21)
+        OSD_ACT_V2(GET_MEMBER_ATTRIBUTES,       0x22)
+        OSD_ACT_V2(SET_MEMBER_ATTRIBUTES,       0x23)
+        OSD_ACT_V2(READ_MAP,                    0x31)
+
+        OSD_ACT_V1_V2(PERFORM_SCSI_COMMAND,     0x8F7E, 0x8F7C)
+        OSD_ACT_V1_V2(SCSI_TASK_MANAGEMENT,     0x8F7F, 0x8F7D)
+        /* 0x8F80 to 0x8FFF are Vendor specific */
+};
+
+/* osd2r03: 7.1.3.2 List entry format for retrieving attributes */
+struct osd_attributes_list_attrid {
+        __be32 attr_page;
+        __be32 attr_id;
+} __packed;
+
+/*
+ * NOTE: v1: is not aligned.
+ */
+struct osdv1_attributes_list_element {
+        __be32 attr_page;
+        __be32 attr_id;
+        __be16 attr_bytes; /* valid bytes at attr_val without padding */
+        u8 attr_val[0];
+} __packed;
+
+/*
+ * osd2r03: 7.1.3.3 List entry format for retrieved attributes and
+ *                  for setting attributes
+ * NOTE: v2 is 8-bytes aligned
+ */
+struct osdv2_attributes_list_element {
+        __be32 attr_page;
+        __be32 attr_id;
+        u8 reserved[6];
+        __be16 attr_bytes; /* valid bytes at attr_val without padding */
+        u8 attr_val[0];
+} __packed;
+
+enum {
+        OSDv1_ATTRIBUTES_ELEM_ALIGN = 1,
+        OSD_ATTRIBUTES_ELEM_ALIGN = 8,
+};
+
+enum {
+        OSD_ATTR_LIST_ALL_PAGES = 0xFFFFFFFF,
+        OSD_ATTR_LIST_ALL_IN_PAGE = 0xFFFFFFFF,
+};
+
+static inline unsigned osdv1_attr_list_elem_size(unsigned len)
+{
+        return ALIGN(len + sizeof(struct osdv1_attributes_list_element),
+                     OSDv1_ATTRIBUTES_ELEM_ALIGN);
+}
+
+static inline unsigned osdv2_attr_list_elem_size(unsigned len)
+{
+        return ALIGN(len + sizeof(struct osdv2_attributes_list_element),
+                     OSD_ATTRIBUTES_ELEM_ALIGN);
+}
+
+/*
+ * osd2r03: 7.1.3 OSD attributes lists (Table 184) — List type values
+ */
+enum osd_attr_list_types {
+        OSD_ATTR_LIST_GET = 0x1,        /* descriptors only */
+        OSD_ATTR_LIST_SET_RETRIEVE = 0x9, /*descriptors/values variable-length*/
+        OSD_V2_ATTR_LIST_MULTIPLE = 0xE,  /* ver2, Multiple Objects lists*/
+        OSD_V1_ATTR_LIST_CREATE_MULTIPLE = 0xF,/*ver1, used by create_multple*/
+};
+
+/* osd2r03: 7.1.3.4 Multi-object retrieved attributes format */
+struct osd_attributes_list_multi_header {
+        __be64 object_id;
+        u8 object_type; /* object_type enum below */
+        u8 reserved[5];
+        __be16 list_bytes;
+        /* followed by struct osd_attributes_list_element's */
+};
+
+struct osdv1_attributes_list_header {
+        u8 type;        /* low 4-bit only */
+        u8 pad;
+        __be16 list_bytes; /* Initiator shall set to Zero. Only set by target */
+        /*
+         * type=9 followed by struct osd_attributes_list_element's
+         * type=E followed by struct osd_attributes_list_multi_header's
+         */
+} __packed;
+
+static inline unsigned osdv1_list_size(struct osdv1_attributes_list_header *h)
+{
+        return be16_to_cpu(h->list_bytes);
+}
+
+struct osdv2_attributes_list_header {
+        u8 type;        /* lower 4-bits only */
+        u8 pad[3];
+/*4*/   __be32 list_bytes; /* Initiator shall set to zero. Only set by target */
+        /*
+         * type=9 followed by struct osd_attributes_list_element's
+         * type=E followed by struct osd_attributes_list_multi_header's
+         */
+} __packed;
+
+static inline unsigned osdv2_list_size(struct osdv2_attributes_list_header *h)
+{
+        return be32_to_cpu(h->list_bytes);
+}
+
+/* (osd-r10 6.13)
+ * osd2r03: 6.15 LIST (Table 79) LIST command parameter data.
+ *      for root_lstchg below
+ */
+enum {
+        OSD_OBJ_ID_LIST_PAR = 0x1, /* V1-only. Not used in V2 */
+        OSD_OBJ_ID_LIST_LSTCHG = 0x2,
+};
+
+/*
+ * osd2r03: 6.15.2 LIST command parameter data
+ * (Also for LIST COLLECTION)
+ */
+struct osd_obj_id_list {
+        __be64 list_bytes; /* bytes in list excluding list_bytes (-8) */
+        __be64 continuation_id;
+        __be32 list_identifier;
+        u8 pad[3];
+        u8 root_lstchg;
+        __be64 object_ids[0];
+} __packed;
+
+static inline bool osd_is_obj_list_done(struct osd_obj_id_list *list,
+        bool *is_changed)
+{
+        *is_changed = (0 != (list->root_lstchg & OSD_OBJ_ID_LIST_LSTCHG));
+        return 0 != list->continuation_id;
+}
+
+/*
+ * osd2r03: 4.12.4.5 The ALLDATA security method
+ */
+struct osd_data_out_integrity_info {
+        __be64 data_bytes;
+        __be64 set_attributes_bytes;
+        __be64 get_attributes_bytes;
+        __u8 integrity_check_value[OSD_CRYPTO_KEYID_SIZE];
+} __packed;
+
+/* Same osd_data_out_integrity_info is used for OSD2/OSD1. The only difference
+ * Is the sizeof the structure since in OSD1 the last array is smaller. Use
+ * below for version independent handling of this structure
+ */
+static inline int osd_data_out_integrity_info_sizeof(bool is_ver1)
+{
+        return sizeof(struct osd_data_out_integrity_info) -
+                (is_ver1 * (OSDv2_CRYPTO_KEYID_SIZE - OSDv1_CRYPTO_KEYID_SIZE));
+}
+
+struct osd_data_in_integrity_info {
+        __be64 data_bytes;
+        __be64 retrieved_attributes_bytes;
+        __u8 integrity_check_value[OSD_CRYPTO_KEYID_SIZE];
+} __packed;
+
+/* Same osd_data_in_integrity_info is used for OSD2/OSD1. The only difference
+ * Is the sizeof the structure since in OSD1 the last array is smaller. Use
+ * below for version independent handling of this structure
+ */
+static inline int osd_data_in_integrity_info_sizeof(bool is_ver1)
+{
+        return sizeof(struct osd_data_in_integrity_info) -
+                (is_ver1 * (OSDv2_CRYPTO_KEYID_SIZE - OSDv1_CRYPTO_KEYID_SIZE));
+}
+
+struct osd_timestamp {
+        u8 time[6]; /* number of milliseconds since 1/1/1970 UT (big endian) */
+} __packed;
+/* FIXME: define helper functions to convert to/from osd time format */
+
+/*
+ * Capability & Security definitions
+ * osd2r03: 4.11.2.2 Capability format
+ * osd2r03: 5.2.8 Security parameters
+ */
+
+struct osd_key_identifier {
+        u8 id[7]; /* if you know why 7 please email bharrosh@panasas.com */
+} __packed;
+
+/* for osd_capability.format */
+enum {
+        OSD_SEC_CAP_FORMAT_NO_CAPS = 0,
+        OSD_SEC_CAP_FORMAT_VER1 = 1,
+        OSD_SEC_CAP_FORMAT_VER2 = 2,
+};
+
+/* security_method */
+enum {
+        OSD_SEC_NOSEC = 0,
+        OSD_SEC_CAPKEY = 1,
+        OSD_SEC_CMDRSP = 2,
+        OSD_SEC_ALLDATA = 3,
+};
+
+enum object_type {
+        OSD_SEC_OBJ_ROOT = 0x1,
+        OSD_SEC_OBJ_PARTITION = 0x2,
+        OSD_SEC_OBJ_COLLECTION = 0x40,
+        OSD_SEC_OBJ_USER = 0x80,
+};
+
+enum osd_capability_bit_masks {
+        OSD_SEC_CAP_APPEND      = BIT(0),
+        OSD_SEC_CAP_OBJ_MGMT    = BIT(1),
+        OSD_SEC_CAP_REMOVE      = BIT(2),
+        OSD_SEC_CAP_CREATE      = BIT(3),
+        OSD_SEC_CAP_SET_ATTR    = BIT(4),
+        OSD_SEC_CAP_GET_ATTR    = BIT(5),
+        OSD_SEC_CAP_WRITE       = BIT(6),
+        OSD_SEC_CAP_READ        = BIT(7),
+
+        OSD_SEC_CAP_NONE1       = BIT(8),
+        OSD_SEC_CAP_NONE2       = BIT(9),
+        OSD_SEC_GBL_REM         = BIT(10), /*v2 only*/
+        OSD_SEC_CAP_QUERY       = BIT(11), /*v2 only*/
+        OSD_SEC_CAP_M_OBJECT    = BIT(12), /*v2 only*/
+        OSD_SEC_CAP_POL_SEC     = BIT(13),
+        OSD_SEC_CAP_GLOBAL      = BIT(14),
+        OSD_SEC_CAP_DEV_MGMT    = BIT(15),
+};
+
+/* for object_descriptor_type (hi nibble used) */
+enum {
+        OSD_SEC_OBJ_DESC_NONE = 0,     /* Not allowed */
+        OSD_SEC_OBJ_DESC_OBJ = 1 << 4, /* v1: also collection */
+        OSD_SEC_OBJ_DESC_PAR = 2 << 4, /* also root */
+        OSD_SEC_OBJ_DESC_COL = 3 << 4, /* v2 only */
+};
+
+/* (osd-r10:4.9.2.2)
+ * osd2r03:4.11.2.2 Capability format
+ */
+struct osd_capability_head {
+        u8 format; /* low nibble */
+        u8 integrity_algorithm__key_version; /* MAKE_BYTE(integ_alg, key_ver) */
+        u8 security_method;
+        u8 reserved1;
+/*04*/  struct osd_timestamp expiration_time;
+/*10*/  u8 audit[20];
+/*30*/  u8 discriminator[12];
+/*42*/  struct osd_timestamp object_created_time;
+/*48*/  u8 object_type;
+/*49*/  u8 permissions_bit_mask[5];
+/*54*/  u8 reserved2;
+/*55*/  u8 object_descriptor_type; /* high nibble */
+} __packed;
+
+/*56 v1*/
+struct osdv1_cap_object_descriptor {
+        union {
+                struct {
+/*56*/                  __be32 policy_access_tag;
+/*60*/                  __be64 allowed_partition_id;
+/*68*/                  __be64 allowed_object_id;
+/*76*/                  __be32 reserved;
+                } __packed obj_desc;
+
+/*56*/          u8 object_descriptor[24];
+        };
+} __packed;
+/*80 v1*/
+
+/*56 v2*/
+struct osd_cap_object_descriptor {
+        union {
+                struct {
+/*56*/                  __be32 allowed_attributes_access;
+/*60*/                  __be32 policy_access_tag;
+/*64*/                  __be16 boot_epoch;
+/*66*/                  u8 reserved[6];
+/*72*/                  __be64 allowed_partition_id;
+/*80*/                  __be64 allowed_object_id;
+/*88*/                  __be64 allowed_range_length;
+/*96*/                  __be64 allowed_range_start;
+                } __packed obj_desc;
+
+/*56*/          u8 object_descriptor[48];
+        };
+} __packed;
+/*104 v2*/
+
+struct osdv1_capability {
+        struct osd_capability_head h;
+        struct osdv1_cap_object_descriptor od;
+} __packed;
+
+struct osd_capability {
+        struct osd_capability_head h;
+        struct osd_cap_object_descriptor od;
+} __packed;
+
+/**
+ * osd_sec_set_caps - set cap-bits into the capabilities header
+ *
+ * @cap:        The osd_capability_head to set cap bits to.
+ * @bit_mask:   Use an ORed list of enum osd_capability_bit_masks values
+ *
+ * permissions_bit_mask is unaligned use below to set into caps
+ * in a version independent way
+ */
+static inline void osd_sec_set_caps(struct osd_capability_head *cap,
+        u16 bit_mask)
+{
+        /*
+         *Note: The bits above are defined LE order this is because this way
+         *      they can grow in the future to more then 16, and still retain
+         *      there constant values.
+         */
+        put_unaligned_le16(bit_mask, &cap->permissions_bit_mask);
+}
+
+#endif /* ndef __OSD_PROTOCOL_H__ */
diff --git a/include/scsi/osd_sec.h b/include/scsi/osd_sec.h
new file mode 100644
index 000000000000..4c09fee8ae1e
--- /dev/null
+++ b/include/scsi/osd_sec.h
@@ -0,0 +1,45 @@
+/*
+ * osd_sec.h - OSD security manager API
+ *
+ * Copyright (C) 2008 Panasas Inc.  All rights reserved.
+ *
+ * Authors:
+ *   Boaz Harrosh <bharrosh@panasas.com>
+ *   Benny Halevy <bhalevy@panasas.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
+ *
+ */
+#ifndef __OSD_SEC_H__
+#define __OSD_SEC_H__
+
+#include "osd_protocol.h"
+#include "osd_types.h"
+
+/*
+ * Contains types and constants of osd capabilities and security
+ * encoding/decoding.
+ * API is trying to keep security abstract so initiator of an object
+ * based pNFS client knows as little as possible about security and
+ * capabilities. It is the Server's osd-initiator place to know more.
+ * Also can be used by osd-target.
+ */
+void osd_sec_encode_caps(void *caps, ...);/* NI */
+void osd_sec_init_nosec_doall_caps(void *caps,
+        const struct osd_obj_id *obj, bool is_collection, const bool is_v1);
+
+bool osd_is_sec_alldata(struct osd_security_parameters *sec_params);
+
+/* Conditionally sign the CDB according to security setting in ocdb
+ * with cap_key */
+void osd_sec_sign_cdb(struct osd_cdb *ocdb, const u8 *cap_key);
+
+/* Unconditionally sign the BIO data with cap_key.
+ * Check for osd_is_sec_alldata() was done prior to calling this. */
+void osd_sec_sign_data(void *data_integ, struct bio *bio, const u8 *cap_key);
+
+/* Version independent copy of caps into the cdb */
+void osd_set_caps(struct osd_cdb *cdb, const void *caps);
+
+#endif /* ndef __OSD_SEC_H__ */
diff --git a/include/scsi/osd_sense.h b/include/scsi/osd_sense.h
new file mode 100644
index 000000000000..ff9b33c773c7
--- /dev/null
+++ b/include/scsi/osd_sense.h
@@ -0,0 +1,260 @@
+/*
+ * osd_sense.h - OSD Related sense handling definitions.
+ *
+ * Copyright (C) 2008 Panasas Inc.  All rights reserved.
+ *
+ * Authors:
+ *   Boaz Harrosh <bharrosh@panasas.com>
+ *   Benny Halevy <bhalevy@panasas.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
+ *
+ * This file contains types and constants that are defined by the protocol
+ * Note: All names and symbols are taken from the OSD standard's text.
+ */
+#ifndef __OSD_SENSE_H__
+#define __OSD_SENSE_H__
+
+#include <scsi/osd_protocol.h>
+
+/* SPC3r23 4.5.6 Sense key and sense code definitions table 27 */
+enum scsi_sense_keys {
+        scsi_sk_no_sense        = 0x0,
+        scsi_sk_recovered_error = 0x1,
+        scsi_sk_not_ready       = 0x2,
+        scsi_sk_medium_error    = 0x3,
+        scsi_sk_hardware_error  = 0x4,
+        scsi_sk_illegal_request = 0x5,
+        scsi_sk_unit_attention  = 0x6,
+        scsi_sk_data_protect    = 0x7,
+        scsi_sk_blank_check     = 0x8,
+        scsi_sk_vendor_specific = 0x9,
+        scsi_sk_copy_aborted    = 0xa,
+        scsi_sk_aborted_command = 0xb,
+        scsi_sk_volume_overflow = 0xd,
+        scsi_sk_miscompare      = 0xe,
+        scsi_sk_reserved        = 0xf,
+};
+
+/* SPC3r23 4.5.6 Sense key and sense code definitions table 28 */
+/* Note: only those which can be returned by an OSD target. Most of
+ *       these errors are taken care of by the generic scsi layer.
+ */
+enum osd_additional_sense_codes {
+        scsi_no_additional_sense_information                    = 0x0000,
+        scsi_operation_in_progress                              = 0x0016,
+        scsi_cleaning_requested                                 = 0x0017,
+        scsi_lunr_cause_not_reportable                          = 0x0400,
+        scsi_logical_unit_is_in_process_of_becoming_ready       = 0x0401,
+        scsi_lunr_initializing_command_required                 = 0x0402,
+        scsi_lunr_manual_intervention_required                  = 0x0403,
+        scsi_lunr_operation_in_progress                         = 0x0407,
+        scsi_lunr_selftest_in_progress                          = 0x0409,
+        scsi_luna_asymmetric_access_state_transition            = 0x040a,
+        scsi_luna_target_port_in_standby_state                  = 0x040b,
+        scsi_luna_target_port_in_unavailable_state              = 0x040c,
+        scsi_lunr_notify_enable_spinup_required                 = 0x0411,
+        scsi_logical_unit_does_not_respond_to_selection         = 0x0500,
+        scsi_logical_unit_communication_failure                 = 0x0800,
+        scsi_logical_unit_communication_timeout                 = 0x0801,
+        scsi_logical_unit_communication_parity_error            = 0x0802,
+        scsi_error_log_overflow                                 = 0x0a00,
+        scsi_warning                                            = 0x0b00,
+        scsi_warning_specified_temperature_exceeded             = 0x0b01,
+        scsi_warning_enclosure_degraded                         = 0x0b02,
+        scsi_write_error_unexpected_unsolicited_data            = 0x0c0c,
+        scsi_write_error_not_enough_unsolicited_data            = 0x0c0d,
+        scsi_invalid_information_unit                           = 0x0e00,
+        scsi_invalid_field_in_command_information_unit          = 0x0e03,
+        scsi_read_error_failed_retransmission_request           = 0x1113,
+        scsi_parameter_list_length_error                        = 0x1a00,
+        scsi_invalid_command_operation_code                     = 0x2000,
+        scsi_invalid_field_in_cdb                               = 0x2400,
+        osd_security_audit_value_frozen                         = 0x2404,
+        osd_security_working_key_frozen                         = 0x2405,
+        osd_nonce_not_unique                                    = 0x2406,
+        osd_nonce_timestamp_out_of_range                        = 0x2407,
+        scsi_logical_unit_not_supported                         = 0x2500,
+        scsi_invalid_field_in_parameter_list                    = 0x2600,
+        scsi_parameter_not_supported                            = 0x2601,
+        scsi_parameter_value_invalid                            = 0x2602,
+        scsi_invalid_release_of_persistent_reservation          = 0x2604,
+        osd_invalid_dataout_buffer_integrity_check_value        = 0x260f,
+        scsi_not_ready_to_ready_change_medium_may_have_changed  = 0x2800,
+        scsi_power_on_reset_or_bus_device_reset_occurred        = 0x2900,
+        scsi_power_on_occurred                                  = 0x2901,
+        scsi_scsi_bus_reset_occurred                            = 0x2902,
+        scsi_bus_device_reset_function_occurred                 = 0x2903,
+        scsi_device_internal_reset                              = 0x2904,
+        scsi_transceiver_mode_changed_to_single_ended           = 0x2905,
+        scsi_transceiver_mode_changed_to_lvd                    = 0x2906,
+        scsi_i_t_nexus_loss_occurred                            = 0x2907,
+        scsi_parameters_changed                                 = 0x2a00,
+        scsi_mode_parameters_changed                            = 0x2a01,
+        scsi_asymmetric_access_state_changed                    = 0x2a06,
+        scsi_priority_changed                                   = 0x2a08,
+        scsi_command_sequence_error                             = 0x2c00,
+        scsi_previous_busy_status                               = 0x2c07,
+        scsi_previous_task_set_full_status                      = 0x2c08,
+        scsi_previous_reservation_conflict_status               = 0x2c09,
+        osd_partition_or_collection_contains_user_objects       = 0x2c0a,
+        scsi_commands_cleared_by_another_initiator              = 0x2f00,
+        scsi_cleaning_failure                                   = 0x3007,
+        scsi_enclosure_failure                                  = 0x3400,
+        scsi_enclosure_services_failure                         = 0x3500,
+        scsi_unsupported_enclosure_function                     = 0x3501,
+        scsi_enclosure_services_unavailable                     = 0x3502,
+        scsi_enclosure_services_transfer_failure                = 0x3503,
+        scsi_enclosure_services_transfer_refused                = 0x3504,
+        scsi_enclosure_services_checksum_error                  = 0x3505,
+        scsi_rounded_parameter                                  = 0x3700,
+        osd_read_past_end_of_user_object                        = 0x3b17,
+        scsi_logical_unit_has_not_self_configured_yet           = 0x3e00,
+        scsi_logical_unit_failure                               = 0x3e01,
+        scsi_timeout_on_logical_unit                            = 0x3e02,
+        scsi_logical_unit_failed_selftest                       = 0x3e03,
+        scsi_logical_unit_unable_to_update_selftest_log         = 0x3e04,
+        scsi_target_operating_conditions_have_changed           = 0x3f00,
+        scsi_microcode_has_been_changed                         = 0x3f01,
+        scsi_inquiry_data_has_changed                           = 0x3f03,
+        scsi_echo_buffer_overwritten                            = 0x3f0f,
+        scsi_diagnostic_failure_on_component_nn_first           = 0x4080,
+        scsi_diagnostic_failure_on_component_nn_last            = 0x40ff,
+        scsi_message_error                                      = 0x4300,
+        scsi_internal_target_failure                            = 0x4400,
+        scsi_select_or_reselect_failure                         = 0x4500,
+        scsi_scsi_parity_error                                  = 0x4700,
+        scsi_data_phase_crc_error_detected                      = 0x4701,
+        scsi_scsi_parity_error_detected_during_st_data_phase    = 0x4702,
+        scsi_asynchronous_information_protection_error_detected = 0x4704,
+        scsi_protocol_service_crc_error                         = 0x4705,
+        scsi_phy_test_function_in_progress                      = 0x4706,
+        scsi_invalid_message_error                              = 0x4900,
+        scsi_command_phase_error                                = 0x4a00,
+        scsi_data_phase_error                                   = 0x4b00,
+        scsi_logical_unit_failed_self_configuration             = 0x4c00,
+        scsi_overlapped_commands_attempted                      = 0x4e00,
+        osd_quota_error                                         = 0x5507,
+        scsi_failure_prediction_threshold_exceeded              = 0x5d00,
+        scsi_failure_prediction_threshold_exceeded_false        = 0x5dff,
+        scsi_voltage_fault                                      = 0x6500,
+};
+
+enum scsi_descriptor_types {
+        scsi_sense_information                  = 0x0,
+        scsi_sense_command_specific_information = 0x1,
+        scsi_sense_key_specific                 = 0x2,
+        scsi_sense_field_replaceable_unit       = 0x3,
+        scsi_sense_stream_commands              = 0x4,
+        scsi_sense_block_commands               = 0x5,
+        osd_sense_object_identification         = 0x6,
+        osd_sense_response_integrity_check      = 0x7,
+        osd_sense_attribute_identification      = 0x8,
+        scsi_sense_ata_return                   = 0x9,
+
+        scsi_sense_Reserved_first               = 0x0A,
+        scsi_sense_Reserved_last                = 0x7F,
+        scsi_sense_Vendor_specific_first        = 0x80,
+        scsi_sense_Vendor_specific_last         = 0xFF,
+};
+
+struct scsi_sense_descriptor { /* for picking into desc type */
+        u8      descriptor_type; /* one of enum scsi_descriptor_types */
+        u8      additional_length; /* n - 1 */
+        u8      data[];
+} __packed;
+
+/* OSD deploys only scsi descriptor_based sense buffers */
+struct scsi_sense_descriptor_based {
+/*0*/   u8      response_code; /* 0x72 or 0x73 */
+/*1*/   u8      sense_key; /* one of enum scsi_sense_keys (4 lower bits) */
+/*2*/   __be16  additional_sense_code; /* enum osd_additional_sense_codes */
+/*4*/   u8      Reserved[3];
+/*7*/   u8      additional_sense_length; /* n - 7 */
+/*8*/   struct  scsi_sense_descriptor ssd[0]; /* variable length, 1 or more */
+} __packed;
+
+/* some descriptors deployed by OSD */
+
+/* SPC3r23 4.5.2.3 Command-specific information sense data descriptor */
+/* Note: this is the same for descriptor_type=00 but with type=00 the
+ *        Reserved[0] == 0x80 (ie. bit-7 set)
+ */
+struct scsi_sense_command_specific_data_descriptor {
+/*0*/   u8      descriptor_type; /* (00h/01h) */
+/*1*/   u8      additional_length; /* (0Ah) */
+/*2*/   u8      Reserved[2];
+/*4*/   __be64  information;
+} __packed;
+/*12*/
+
+struct scsi_sense_key_specific_data_descriptor {
+/*0*/   u8      descriptor_type; /* (02h) */
+/*1*/   u8      additional_length; /* (06h) */
+/*2*/   u8      Reserved[2];
+/* SKSV, C/D, Reserved (2), BPV, BIT POINTER (3) */
+/*4*/   u8      sksv_cd_bpv_bp;
+/*5*/   __be16  value; /* field-pointer/progress-value/retry-count/... */
+/*7*/   u8      Reserved2;
+} __packed;
+/*8*/
+
+/* 4.16.2.1 OSD error identification sense data descriptor - table 52 */
+/* Note: these bits are defined LE order for easy definition, this way the BIT()
+ * number is the same as in the documentation. Below members at
+ * osd_sense_identification_data_descriptor are therefore defined __le32.
+ */
+enum osd_command_functions_bits {
+        OSD_CFB_COMMAND          = BIT(4),
+        OSD_CFB_CMD_CAP_VERIFIED = BIT(5),
+        OSD_CFB_VALIDATION       = BIT(7),
+        OSD_CFB_IMP_ST_ATT       = BIT(12),
+        OSD_CFB_SET_ATT          = BIT(20),
+        OSD_CFB_SA_CAP_VERIFIED  = BIT(21),
+        OSD_CFB_GET_ATT          = BIT(28),
+        OSD_CFB_GA_CAP_VERIFIED  = BIT(29),
+};
+
+struct osd_sense_identification_data_descriptor {
+/*0*/   u8      descriptor_type; /* (06h) */
+/*1*/   u8      additional_length; /* (1Eh) */
+/*2*/   u8      Reserved[6];
+/*8*/   __le32  not_initiated_functions; /*osd_command_functions_bits*/
+/*12*/  __le32  completed_functions; /*osd_command_functions_bits*/
+/*16*/  __be64  partition_id;
+/*24*/  __be64  object_id;
+} __packed;
+/*32*/
+
+struct osd_sense_response_integrity_check_descriptor {
+/*0*/   u8      descriptor_type; /* (07h) */
+/*1*/   u8      additional_length; /* (20h) */
+/*2*/   u8      integrity_check_value[32]; /*FIXME: OSDv2_CRYPTO_KEYID_SIZE*/
+} __packed;
+/*34*/
+
+struct osd_sense_attributes_data_descriptor {
+/*0*/   u8      descriptor_type; /* (08h) */
+/*1*/   u8      additional_length; /* (n-2) */
+/*2*/   u8      Reserved[6];
+        struct osd_sense_attr {
+/*8*/           __be32  attr_page;
+/*12*/          __be32  attr_id;
+/*16*/  } sense_attrs[0]; /* 1 or more */
+} __packed;
+/*variable*/
+
+/* Dig into scsi_sk_illegal_request/scsi_invalid_field_in_cdb errors */
+
+/*FIXME: Support also field in CAPS*/
+#define OSD_CDB_OFFSET(F) offsetof(struct osd_cdb_head, F)
+
+enum osdv2_cdb_field_offset {
+        OSDv1_CFO_STARTING_BYTE = OSD_CDB_OFFSET(v1.start_address),
+        OSD_CFO_STARTING_BYTE   = OSD_CDB_OFFSET(v2.start_address),
+        OSD_CFO_PARTITION_ID    = OSD_CDB_OFFSET(partition),
+        OSD_CFO_OBJECT_ID       = OSD_CDB_OFFSET(object),
+};
+
+#endif /* ndef __OSD_SENSE_H__ */
diff --git a/include/scsi/osd_types.h b/include/scsi/osd_types.h
new file mode 100644
index 000000000000..3f5e88cc75c0
--- /dev/null
+++ b/include/scsi/osd_types.h
@@ -0,0 +1,40 @@
+/*
+ * osd_types.h - Types and constants which are not part of the protocol.
+ *
+ * Copyright (C) 2008 Panasas Inc.  All rights reserved.
+ *
+ * Authors:
+ *   Boaz Harrosh <bharrosh@panasas.com>
+ *   Benny Halevy <bhalevy@panasas.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
+ *
+ * Contains types and constants that are implementation specific and are
+ * used by more than one part of the osd library.
+ *     (Eg initiator/target/security_manager/...)
+ */
+#ifndef __OSD_TYPES_H__
+#define __OSD_TYPES_H__
+
+struct osd_systemid {
+        u8 data[OSD_SYSTEMID_LEN];
+};
+
+typedef u64 __bitwise osd_id;
+
+struct osd_obj_id {
+        osd_id partition;
+        osd_id id;
+};
+
+static const struct __weak osd_obj_id osd_root_object = {0, 0};
+
+struct osd_attr {
+        u32 attr_page;
+        u32 attr_id;
+        u16 len;                /* byte count of operand */
+        void *val_ptr;          /* in network order */
+};
+
+#endif /* ndef __OSD_TYPES_H__ */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index a109165714d6..084478e14d24 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -9,7 +9,8 @@
 #define _SCSI_SCSI_H
 
 #include <linux/types.h>
-#include <scsi/scsi_cmnd.h>
+
+struct scsi_cmnd;
 
 /*
  * The maximum number of SG segments that we will put inside a
@@ -263,6 +264,7 @@ static inline int scsi_status_is_good(int status)
 #define TYPE_RAID           0x0c
 #define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
 #define TYPE_RBC            0x0e
+#define TYPE_OSD            0x11
 #define TYPE_NO_LUN         0x7f
 
 /* SCSI protocols; these are taken from SPC-3 section 7.5 */
@@ -402,16 +404,6 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define DRIVER_HARD         0x07
 #define DRIVER_SENSE        0x08
 
-#define SUGGEST_RETRY       0x10
-#define SUGGEST_ABORT       0x20
-#define SUGGEST_REMAP       0x30
-#define SUGGEST_DIE         0x40
-#define SUGGEST_SENSE       0x80
-#define SUGGEST_IS_OK       0xff
-
-#define DRIVER_MASK         0x0f
-#define SUGGEST_MASK        0xf0
-
 /*
  * Internal return values.
  */
@@ -447,23 +439,6 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define msg_byte(result)    (((result) >> 8) & 0xff)
 #define host_byte(result)   (((result) >> 16) & 0xff)
 #define driver_byte(result) (((result) >> 24) & 0xff)
-#define suggestion(result)  (driver_byte(result) & SUGGEST_MASK)
-
-static inline void set_msg_byte(struct scsi_cmnd *cmd, char status)
-{
-        cmd->result |= status << 8;
-}
-
-static inline void set_host_byte(struct scsi_cmnd *cmd, char status)
-{
-        cmd->result |= status << 16;
-}
-
-static inline void set_driver_byte(struct scsi_cmnd *cmd, char status)
-{
-        cmd->result |= status << 24;
-}
-
 
 #define sense_class(sense)  (((sense) >> 4) & 0x7)
 #define sense_error(sense)  ((sense) & 0xf)
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 855bf95963e7..43b50d36925c 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -291,4 +291,19 @@ static inline struct scsi_data_buffer *scsi_prot(struct scsi_cmnd *cmd)
 #define scsi_for_each_prot_sg(cmd, sg, nseg, __i)               \
         for_each_sg(scsi_prot_sglist(cmd), sg, nseg, __i)
 
+static inline void set_msg_byte(struct scsi_cmnd *cmd, char status)
+{
+        cmd->result |= status << 8;
+}
+
+static inline void set_host_byte(struct scsi_cmnd *cmd, char status)
+{
+        cmd->result |= status << 16;
+}
+
+static inline void set_driver_byte(struct scsi_cmnd *cmd, char status)
+{
+        cmd->result |= status << 24;
+}
+
 #endif /* _SCSI_SCSI_CMND_H */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 01a4c58f8bad..3f566af3f101 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -340,6 +340,7 @@ extern int scsi_mode_select(struct scsi_device *sdev, int pf, int sp,
                             struct scsi_sense_hdr *);
 extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,
                                 int retries, struct scsi_sense_hdr *sshdr);
+extern unsigned char *scsi_get_vpd_page(struct scsi_device *, u8 page);
 extern int scsi_device_set_state(struct scsi_device *sdev,
                                  enum scsi_device_state state);
 extern struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type,
@@ -370,12 +371,6 @@ extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
                             int data_direction, void *buffer, unsigned bufflen,
                             struct scsi_sense_hdr *, int timeout, int retries,
                             int *resid);
-extern int scsi_execute_async(struct scsi_device *sdev,
-                              const unsigned char *cmd, int cmd_len, int data_direction,
-                              void *buffer, unsigned bufflen, int use_sg,
-                              int timeout, int retries, void *privdata,
-                              void (*done)(void *, char *, int, int),
-                              gfp_t gfp);
 
 static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
 {
@@ -400,7 +395,8 @@ static inline unsigned int sdev_id(struct scsi_device *sdev)
  */
 static inline int scsi_device_online(struct scsi_device *sdev)
 {
-        return sdev->sdev_state != SDEV_OFFLINE;
+        return (sdev->sdev_state != SDEV_OFFLINE &&
+                sdev->sdev_state != SDEV_DEL);
 }
 static inline int scsi_device_blocked(struct scsi_device *sdev)
 {
diff --git a/include/scsi/scsi_scan.h b/include/scsi/scsi_scan.h
new file mode 100644
index 000000000000..78898889243d
--- /dev/null
+++ b/include/scsi/scsi_scan.h
@@ -0,0 +1,11 @@
+#ifndef _SCSI_SCSI_SCAN_H
+#define _SCSI_SCSI_SCAN_H
+
+#ifdef CONFIG_SCSI
+/* drivers/scsi/scsi_scan.c */
+extern int scsi_complete_async_scans(void);
+#else
+static inline int scsi_complete_async_scans(void) { return 0; }
+#endif
+
+#endif /* _SCSI_SCSI_SCAN_H */
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index b50aabe2861e..457588e1119b 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -88,7 +88,7 @@ struct iscsi_transport {
         uint64_t host_param_mask;
         struct iscsi_cls_session *(*create_session) (struct iscsi_endpoint *ep,
                                         uint16_t cmds_max, uint16_t qdepth,
-                                        uint32_t sn, uint32_t *hn);
+                                        uint32_t sn);
         void (*destroy_session) (struct iscsi_cls_session *session);
         struct iscsi_cls_conn *(*create_conn) (struct iscsi_cls_session *sess,
                                 uint32_t cid);
@@ -206,8 +206,6 @@ struct iscsi_cls_session {
 struct iscsi_cls_host {
         atomic_t nr_scans;
         struct mutex mutex;
-        struct workqueue_struct *scan_workq;
-        char scan_workq_name[20];
 };
 
 extern void iscsi_host_for_each_session(struct Scsi_Host *shost,
diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h
index b3aa62ee3c8d..d010858c33c2 100644
--- a/include/sound/ad1816a.h
+++ b/include/sound/ad1816a.h
@@ -169,5 +169,7 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port,
 
 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);
 
 #endif  /* __SOUND_AD1816A_H */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 1c02ed1d7c4a..6add80fc2512 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -23,9 +23,10 @@
 #ifndef __SOUND_ASOUND_H
 #define __SOUND_ASOUND_H
 
+#include <linux/types.h>
+
 #ifdef __KERNEL__
 #include <linux/ioctl.h>
-#include <linux/types.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 
@@ -126,12 +127,10 @@ struct snd_hwdep_dsp_image {
         unsigned long driver_data;      /* W: driver-specific data */
 };
 
-enum {
-        SNDRV_HWDEP_IOCTL_PVERSION = _IOR ('H', 0x00, int),
-        SNDRV_HWDEP_IOCTL_INFO = _IOR ('H', 0x01, struct snd_hwdep_info),
-        SNDRV_HWDEP_IOCTL_DSP_STATUS = _IOR('H', 0x02, struct snd_hwdep_dsp_status),
-        SNDRV_HWDEP_IOCTL_DSP_LOAD   = _IOW('H', 0x03, struct snd_hwdep_dsp_image)
-};
+#define SNDRV_HWDEP_IOCTL_PVERSION      _IOR ('H', 0x00, int)
+#define SNDRV_HWDEP_IOCTL_INFO          _IOR ('H', 0x01, struct snd_hwdep_info)
+#define SNDRV_HWDEP_IOCTL_DSP_STATUS    _IOR('H', 0x02, struct snd_hwdep_dsp_status)
+#define SNDRV_HWDEP_IOCTL_DSP_LOAD      _IOW('H', 0x03, struct snd_hwdep_dsp_image)
 
 /*****************************************************************************
  *                                                                           *
@@ -342,7 +341,7 @@ struct snd_interval {
 #define SNDRV_MASK_MAX  256
 
 struct snd_mask {
-        u_int32_t bits[(SNDRV_MASK_MAX+31)/32];
+        __u32 bits[(SNDRV_MASK_MAX+31)/32];
 };
 
 struct snd_pcm_hw_params {
@@ -385,7 +384,7 @@ struct snd_pcm_sw_params {
 
 struct snd_pcm_channel_info {
         unsigned int channel;
-        off_t offset;                   /* mmap offset */
+        __kernel_off_t offset;          /* mmap offset */
         unsigned int first;             /* offset to first sample in bits */
         unsigned int step;              /* samples distance in bits */
 };
@@ -451,40 +450,35 @@ enum {
         SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
 };
 
-enum {
-        SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int),
-        SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct snd_pcm_info),
-        SNDRV_PCM_IOCTL_TSTAMP = _IOW('A', 0x02, int),
-        SNDRV_PCM_IOCTL_TTSTAMP = _IOW('A', 0x03, int),
-        SNDRV_PCM_IOCTL_HW_REFINE = _IOWR('A', 0x10, struct snd_pcm_hw_params),
-        SNDRV_PCM_IOCTL_HW_PARAMS = _IOWR('A', 0x11, struct snd_pcm_hw_params),
-        SNDRV_PCM_IOCTL_HW_FREE = _IO('A', 0x12),
-        SNDRV_PCM_IOCTL_SW_PARAMS = _IOWR('A', 0x13, struct snd_pcm_sw_params),
-        SNDRV_PCM_IOCTL_STATUS = _IOR('A', 0x20, struct snd_pcm_status),
-        SNDRV_PCM_IOCTL_DELAY = _IOR('A', 0x21, snd_pcm_sframes_t),
-        SNDRV_PCM_IOCTL_HWSYNC = _IO('A', 0x22),
-        SNDRV_PCM_IOCTL_SYNC_PTR = _IOWR('A', 0x23, struct snd_pcm_sync_ptr),
-        SNDRV_PCM_IOCTL_CHANNEL_INFO = _IOR('A', 0x32, struct snd_pcm_channel_info),
-        SNDRV_PCM_IOCTL_PREPARE = _IO('A', 0x40),
-        SNDRV_PCM_IOCTL_RESET = _IO('A', 0x41),
-        SNDRV_PCM_IOCTL_START = _IO('A', 0x42),
-        SNDRV_PCM_IOCTL_DROP = _IO('A', 0x43),
-        SNDRV_PCM_IOCTL_DRAIN = _IO('A', 0x44),
-        SNDRV_PCM_IOCTL_PAUSE = _IOW('A', 0x45, int),
-        SNDRV_PCM_IOCTL_REWIND = _IOW('A', 0x46, snd_pcm_uframes_t),
-        SNDRV_PCM_IOCTL_RESUME = _IO('A', 0x47),
-        SNDRV_PCM_IOCTL_XRUN = _IO('A', 0x48),
-        SNDRV_PCM_IOCTL_FORWARD = _IOW('A', 0x49, snd_pcm_uframes_t),
-        SNDRV_PCM_IOCTL_WRITEI_FRAMES = _IOW('A', 0x50, struct snd_xferi),
-        SNDRV_PCM_IOCTL_READI_FRAMES = _IOR('A', 0x51, struct snd_xferi),
-        SNDRV_PCM_IOCTL_WRITEN_FRAMES = _IOW('A', 0x52, struct snd_xfern),
-        SNDRV_PCM_IOCTL_READN_FRAMES = _IOR('A', 0x53, struct snd_xfern),
-        SNDRV_PCM_IOCTL_LINK = _IOW('A', 0x60, int),
-        SNDRV_PCM_IOCTL_UNLINK = _IO('A', 0x61),
-};
-
-/* Trick to make alsa-lib/acinclude.m4 happy */
-#define SNDRV_PCM_IOCTL_REWIND SNDRV_PCM_IOCTL_REWIND
+#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)
+#define SNDRV_PCM_IOCTL_TTSTAMP         _IOW('A', 0x03, int)
+#define SNDRV_PCM_IOCTL_HW_REFINE       _IOWR('A', 0x10, struct snd_pcm_hw_params)
+#define SNDRV_PCM_IOCTL_HW_PARAMS       _IOWR('A', 0x11, struct snd_pcm_hw_params)
+#define SNDRV_PCM_IOCTL_HW_FREE         _IO('A', 0x12)
+#define SNDRV_PCM_IOCTL_SW_PARAMS       _IOWR('A', 0x13, struct snd_pcm_sw_params)
+#define SNDRV_PCM_IOCTL_STATUS          _IOR('A', 0x20, struct snd_pcm_status)
+#define SNDRV_PCM_IOCTL_DELAY           _IOR('A', 0x21, snd_pcm_sframes_t)
+#define SNDRV_PCM_IOCTL_HWSYNC          _IO('A', 0x22)
+#define SNDRV_PCM_IOCTL_SYNC_PTR        _IOWR('A', 0x23, struct snd_pcm_sync_ptr)
+#define SNDRV_PCM_IOCTL_CHANNEL_INFO    _IOR('A', 0x32, struct snd_pcm_channel_info)
+#define SNDRV_PCM_IOCTL_PREPARE         _IO('A', 0x40)
+#define SNDRV_PCM_IOCTL_RESET           _IO('A', 0x41)
+#define SNDRV_PCM_IOCTL_START           _IO('A', 0x42)
+#define SNDRV_PCM_IOCTL_DROP            _IO('A', 0x43)
+#define SNDRV_PCM_IOCTL_DRAIN           _IO('A', 0x44)
+#define SNDRV_PCM_IOCTL_PAUSE           _IOW('A', 0x45, int)
+#define SNDRV_PCM_IOCTL_REWIND          _IOW('A', 0x46, snd_pcm_uframes_t)
+#define SNDRV_PCM_IOCTL_RESUME          _IO('A', 0x47)
+#define SNDRV_PCM_IOCTL_XRUN            _IO('A', 0x48)
+#define SNDRV_PCM_IOCTL_FORWARD         _IOW('A', 0x49, snd_pcm_uframes_t)
+#define SNDRV_PCM_IOCTL_WRITEI_FRAMES   _IOW('A', 0x50, struct snd_xferi)
+#define SNDRV_PCM_IOCTL_READI_FRAMES    _IOR('A', 0x51, struct snd_xferi)
+#define SNDRV_PCM_IOCTL_WRITEN_FRAMES   _IOW('A', 0x52, struct snd_xfern)
+#define SNDRV_PCM_IOCTL_READN_FRAMES    _IOR('A', 0x53, struct snd_xfern)
+#define SNDRV_PCM_IOCTL_LINK            _IOW('A', 0x60, int)
+#define SNDRV_PCM_IOCTL_UNLINK          _IO('A', 0x61)
 
 /*****************************************************************************
  *                                                                           *
@@ -538,14 +532,12 @@ struct snd_rawmidi_status {
         unsigned char reserved[16];     /* reserved for future use */
 };
 
-enum {
-        SNDRV_RAWMIDI_IOCTL_PVERSION = _IOR('W', 0x00, int),
-        SNDRV_RAWMIDI_IOCTL_INFO = _IOR('W', 0x01, struct snd_rawmidi_info),
-        SNDRV_RAWMIDI_IOCTL_PARAMS = _IOWR('W', 0x10, struct snd_rawmidi_params),
-        SNDRV_RAWMIDI_IOCTL_STATUS = _IOWR('W', 0x20, struct snd_rawmidi_status),
-        SNDRV_RAWMIDI_IOCTL_DROP = _IOW('W', 0x30, int),
-        SNDRV_RAWMIDI_IOCTL_DRAIN = _IOW('W', 0x31, int),
-};
+#define SNDRV_RAWMIDI_IOCTL_PVERSION    _IOR('W', 0x00, int)
+#define SNDRV_RAWMIDI_IOCTL_INFO        _IOR('W', 0x01, struct snd_rawmidi_info)
+#define SNDRV_RAWMIDI_IOCTL_PARAMS      _IOWR('W', 0x10, struct snd_rawmidi_params)
+#define SNDRV_RAWMIDI_IOCTL_STATUS      _IOWR('W', 0x20, struct snd_rawmidi_status)
+#define SNDRV_RAWMIDI_IOCTL_DROP        _IOW('W', 0x30, int)
+#define SNDRV_RAWMIDI_IOCTL_DRAIN       _IOW('W', 0x31, int)
 
 /*
  *  Timer section - /dev/snd/timer
@@ -654,23 +646,21 @@ struct snd_timer_status {
         unsigned char reserved[64];     /* reserved */
 };
 
-enum {
-        SNDRV_TIMER_IOCTL_PVERSION = _IOR('T', 0x00, int),
-        SNDRV_TIMER_IOCTL_NEXT_DEVICE = _IOWR('T', 0x01, struct snd_timer_id),
-        SNDRV_TIMER_IOCTL_TREAD = _IOW('T', 0x02, int),
-        SNDRV_TIMER_IOCTL_GINFO = _IOWR('T', 0x03, struct snd_timer_ginfo),
-        SNDRV_TIMER_IOCTL_GPARAMS = _IOW('T', 0x04, struct snd_timer_gparams),
-        SNDRV_TIMER_IOCTL_GSTATUS = _IOWR('T', 0x05, struct snd_timer_gstatus),
-        SNDRV_TIMER_IOCTL_SELECT = _IOW('T', 0x10, struct snd_timer_select),
-        SNDRV_TIMER_IOCTL_INFO = _IOR('T', 0x11, struct snd_timer_info),
-        SNDRV_TIMER_IOCTL_PARAMS = _IOW('T', 0x12, struct snd_timer_params),
-        SNDRV_TIMER_IOCTL_STATUS = _IOR('T', 0x14, struct snd_timer_status),
-        /* The following four ioctls are changed since 1.0.9 due to confliction */
-        SNDRV_TIMER_IOCTL_START = _IO('T', 0xa0),
-        SNDRV_TIMER_IOCTL_STOP = _IO('T', 0xa1),
-        SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0xa2),
-        SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0xa3),
-};
+#define SNDRV_TIMER_IOCTL_PVERSION      _IOR('T', 0x00, int)
+#define SNDRV_TIMER_IOCTL_NEXT_DEVICE   _IOWR('T', 0x01, struct snd_timer_id)
+#define SNDRV_TIMER_IOCTL_TREAD         _IOW('T', 0x02, int)
+#define SNDRV_TIMER_IOCTL_GINFO         _IOWR('T', 0x03, struct snd_timer_ginfo)
+#define SNDRV_TIMER_IOCTL_GPARAMS       _IOW('T', 0x04, struct snd_timer_gparams)
+#define SNDRV_TIMER_IOCTL_GSTATUS       _IOWR('T', 0x05, struct snd_timer_gstatus)
+#define SNDRV_TIMER_IOCTL_SELECT        _IOW('T', 0x10, struct snd_timer_select)
+#define SNDRV_TIMER_IOCTL_INFO          _IOR('T', 0x11, struct snd_timer_info)
+#define SNDRV_TIMER_IOCTL_PARAMS        _IOW('T', 0x12, struct snd_timer_params)
+#define SNDRV_TIMER_IOCTL_STATUS        _IOR('T', 0x14, struct snd_timer_status)
+/* The following four ioctls are changed since 1.0.9 due to confliction */
+#define SNDRV_TIMER_IOCTL_START         _IO('T', 0xa0)
+#define SNDRV_TIMER_IOCTL_STOP          _IO('T', 0xa1)
+#define SNDRV_TIMER_IOCTL_CONTINUE      _IO('T', 0xa2)
+#define SNDRV_TIMER_IOCTL_PAUSE         _IO('T', 0xa3)
 
 struct snd_timer_read {
         unsigned int resolution;
@@ -789,7 +779,7 @@ struct snd_ctl_elem_info {
         snd_ctl_elem_type_t type;       /* R: value type - SNDRV_CTL_ELEM_TYPE_* */
         unsigned int access;            /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */
         unsigned int count;             /* count of values */
-        pid_t owner;                    /* owner's PID of this control */
+        __kernel_pid_t owner;           /* owner's PID of this control */
         union {
                 struct {
                         long min;               /* R: minimum value */
@@ -847,33 +837,31 @@ struct snd_ctl_tlv {
         unsigned int tlv[0];    /* first TLV */
 };
 
-enum {
-        SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int),
-        SNDRV_CTL_IOCTL_CARD_INFO = _IOR('U', 0x01, struct snd_ctl_card_info),
-        SNDRV_CTL_IOCTL_ELEM_LIST = _IOWR('U', 0x10, struct snd_ctl_elem_list),
-        SNDRV_CTL_IOCTL_ELEM_INFO = _IOWR('U', 0x11, struct snd_ctl_elem_info),
-        SNDRV_CTL_IOCTL_ELEM_READ = _IOWR('U', 0x12, struct snd_ctl_elem_value),
-        SNDRV_CTL_IOCTL_ELEM_WRITE = _IOWR('U', 0x13, struct snd_ctl_elem_value),
-        SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct snd_ctl_elem_id),
-        SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct snd_ctl_elem_id),
-        SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
-        SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct snd_ctl_elem_info),
-        SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct snd_ctl_elem_info),
-        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
-        SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv),
-        SNDRV_CTL_IOCTL_TLV_WRITE = _IOWR('U', 0x1b, struct snd_ctl_tlv),
-        SNDRV_CTL_IOCTL_TLV_COMMAND = _IOWR('U', 0x1c, struct snd_ctl_tlv),
-        SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
-        SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info),
-        SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),
-        SNDRV_CTL_IOCTL_PCM_INFO = _IOWR('U', 0x31, struct snd_pcm_info),
-        SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE = _IOW('U', 0x32, int),
-        SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE = _IOWR('U', 0x40, int),
-        SNDRV_CTL_IOCTL_RAWMIDI_INFO = _IOWR('U', 0x41, struct snd_rawmidi_info),
-        SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE = _IOW('U', 0x42, int),
-        SNDRV_CTL_IOCTL_POWER = _IOWR('U', 0xd0, int),
-        SNDRV_CTL_IOCTL_POWER_STATE = _IOR('U', 0xd1, int),
-};
+#define SNDRV_CTL_IOCTL_PVERSION        _IOR('U', 0x00, int)
+#define SNDRV_CTL_IOCTL_CARD_INFO       _IOR('U', 0x01, struct snd_ctl_card_info)
+#define SNDRV_CTL_IOCTL_ELEM_LIST       _IOWR('U', 0x10, struct snd_ctl_elem_list)
+#define SNDRV_CTL_IOCTL_ELEM_INFO       _IOWR('U', 0x11, struct snd_ctl_elem_info)
+#define SNDRV_CTL_IOCTL_ELEM_READ       _IOWR('U', 0x12, struct snd_ctl_elem_value)
+#define SNDRV_CTL_IOCTL_ELEM_WRITE      _IOWR('U', 0x13, struct snd_ctl_elem_value)
+#define SNDRV_CTL_IOCTL_ELEM_LOCK       _IOW('U', 0x14, struct snd_ctl_elem_id)
+#define SNDRV_CTL_IOCTL_ELEM_UNLOCK     _IOW('U', 0x15, struct snd_ctl_elem_id)
+#define SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS _IOWR('U', 0x16, int)
+#define SNDRV_CTL_IOCTL_ELEM_ADD        _IOWR('U', 0x17, struct snd_ctl_elem_info)
+#define SNDRV_CTL_IOCTL_ELEM_REPLACE    _IOWR('U', 0x18, struct snd_ctl_elem_info)
+#define SNDRV_CTL_IOCTL_ELEM_REMOVE     _IOWR('U', 0x19, struct snd_ctl_elem_id)
+#define SNDRV_CTL_IOCTL_TLV_READ        _IOWR('U', 0x1a, struct snd_ctl_tlv)
+#define SNDRV_CTL_IOCTL_TLV_WRITE       _IOWR('U', 0x1b, struct snd_ctl_tlv)
+#define SNDRV_CTL_IOCTL_TLV_COMMAND     _IOWR('U', 0x1c, struct snd_ctl_tlv)
+#define SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE _IOWR('U', 0x20, int)
+#define SNDRV_CTL_IOCTL_HWDEP_INFO      _IOR('U', 0x21, struct snd_hwdep_info)
+#define SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE _IOR('U', 0x30, int)
+#define SNDRV_CTL_IOCTL_PCM_INFO        _IOWR('U', 0x31, struct snd_pcm_info)
+#define SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE _IOW('U', 0x32, int)
+#define SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE _IOWR('U', 0x40, int)
+#define SNDRV_CTL_IOCTL_RAWMIDI_INFO    _IOWR('U', 0x41, struct snd_rawmidi_info)
+#define SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE _IOW('U', 0x42, int)
+#define SNDRV_CTL_IOCTL_POWER           _IOWR('U', 0xd0, int)
+#define SNDRV_CTL_IOCTL_POWER_STATE     _IOR('U', 0xd1, int)
 
 /*
  *  Read interface.
@@ -919,18 +907,4 @@ struct snd_ctl_event {
 #define SNDRV_CTL_NAME_IEC958_PCM_STREAM                "PCM Stream"
 #define SNDRV_CTL_NAME_IEC958(expl,direction,what)      "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what
 
-/*
- *
- */
-
-struct snd_xferv {
-        const struct iovec *vector;
-        unsigned long count;
-};
-
-enum {
-        SNDRV_IOCTL_READV = _IOW('K', 0x00, struct snd_xferv),
-        SNDRV_IOCTL_WRITEV = _IOW('K', 0x01, struct snd_xferv),
-};
-
 #endif /* __SOUND_ASOUND_H */
diff --git a/include/sound/atmel-abdac.h b/include/sound/atmel-abdac.h
new file mode 100644
index 000000000000..edff6a8ba1b5
--- /dev/null
+++ b/include/sound/atmel-abdac.h
@@ -0,0 +1,23 @@
+/*
+ * Driver for the Atmel Audio Bitstream DAC (ABDAC)
+ *
+ * Copyright (C) 2009 Atmel Corporation
+ *
+ * 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 __INCLUDE_SOUND_ATMEL_ABDAC_H
+#define __INCLUDE_SOUND_ATMEL_ABDAC_H
+
+#include <linux/dw_dmac.h>
+
+/**
+ * struct atmel_abdac_pdata - board specific ABDAC configuration
+ * @dws: DMA slave interface to use for sound playback.
+ */
+struct atmel_abdac_pdata {
+        struct dw_dma_slave     dws;
+};
+
+#endif /* __INCLUDE_SOUND_ATMEL_ABDAC_H */
diff --git a/include/sound/atmel-ac97c.h b/include/sound/atmel-ac97c.h
new file mode 100644
index 000000000000..e6aabdb45865
--- /dev/null
+++ b/include/sound/atmel-ac97c.h
@@ -0,0 +1,40 @@
+/*
+ * Driver for the Atmel AC97C controller
+ *
+ * Copyright (C) 2005-2009 Atmel Corporation
+ *
+ * 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 __INCLUDE_SOUND_ATMEL_AC97C_H
+#define __INCLUDE_SOUND_ATMEL_AC97C_H
+
+#include <linux/dw_dmac.h>
+
+#define AC97C_CAPTURE   0x01
+#define AC97C_PLAYBACK  0x02
+#define AC97C_BOTH      (AC97C_CAPTURE | AC97C_PLAYBACK)
+
+/**
+ * struct atmel_ac97c_pdata - board specific AC97C configuration
+ * @rx_dws: DMA slave interface to use for sound capture.
+ * @tx_dws: DMA slave interface to use for sound playback.
+ * @reset_pin: GPIO pin wired to the reset input on the external AC97 codec,
+ *             optional to use, set to -ENODEV if not in use. AC97 layer will
+ *             try to do a software reset of the external codec anyway.
+ * @flags: Flags for which directions should be enabled.
+ *
+ * If the user do not want to use a DMA channel for playback or capture, i.e.
+ * only one feature is required on the board. The slave for playback or capture
+ * can be set to NULL. The AC97C driver will take use of this when setting up
+ * the sound streams.
+ */
+struct ac97c_platform_data {
+        struct dw_dma_slave     rx_dws;
+        struct dw_dma_slave     tx_dws;
+        unsigned int            flags;
+        int                     reset_pin;
+};
+
+#endif /* __INCLUDE_SOUND_ATMEL_AC97C_H */
diff --git a/include/sound/control.h b/include/sound/control.h
index 4721b4bba053..ef96f07aa03b 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -171,6 +171,54 @@ int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
  */
 struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
                                                  const unsigned int *tlv);
-int snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave);
-                      
+int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
+                       unsigned int flags);
+/* optional flags for slave */
+#define SND_CTL_SLAVE_NEED_UPDATE       (1 << 0)
+
+/**
+ * snd_ctl_add_slave - Add a virtual slave control
+ * @master: vmaster element
+ * @slave: slave element to add
+ *
+ * Add a virtual slave control to the given master element created via
+ * snd_ctl_create_virtual_master() beforehand.
+ * Returns zero if successful or a negative error code.
+ *
+ * All slaves must be the same type (returning the same information
+ * via info callback).  The fucntion doesn't check it, so it's your
+ * responsibility.
+ *
+ * Also, some additional limitations:
+ * at most two channels,
+ * logarithmic volume control (dB level) thus no linear volume,
+ * master can only attenuate the volume without gain
+ */
+static inline int
+snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
+{
+        return _snd_ctl_add_slave(master, slave, 0);
+}
+
+/**
+ * snd_ctl_add_slave_uncached - Add a virtual slave control
+ * @master: vmaster element
+ * @slave: slave element to add
+ *
+ * Add a virtual slave control to the given master.
+ * Unlike snd_ctl_add_slave(), the element added via this function
+ * is supposed to have volatile values, and get callback is called
+ * at each time quried from the master.
+ *
+ * When the control peeks the hardware values directly and the value
+ * can be changed by other means than the put callback of the element,
+ * this function should be used to keep the value always up-to-date.
+ */
+static inline int
+snd_ctl_add_slave_uncached(struct snd_kcontrol *master,
+                           struct snd_kcontrol *slave)
+{
+        return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE);
+}
+
 #endif  /* __SOUND_CONTROL_H */
diff --git a/include/sound/core.h b/include/sound/core.h
index f632484bc743..3dea79829acc 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -97,9 +97,9 @@ struct snd_device {
 
 struct snd_monitor_file {
         struct file *file;
-        struct snd_monitor_file *next;
         const struct file_operations *disconnected_f_op;
-        struct list_head shutdown_list;
+        struct list_head shutdown_list; /* still need to shutdown */
+        struct list_head list;  /* link of monitor files */
 };
 
 /* main structure for soundcard */
@@ -134,7 +134,7 @@ struct snd_card {
         struct snd_info_entry *proc_id; /* the card id */
         struct proc_dir_entry *proc_root_link;  /* number link to real id */
 
-        struct snd_monitor_file *files; /* all files associated to this card */
+        struct list_head files_list;    /* all files associated to this card */
         struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown
                                                                 state */
         spinlock_t files_lock;          /* lock the files for this card */
@@ -296,8 +296,20 @@ int snd_card_locked(int card);
 extern int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int cmd);
 #endif
 
+int snd_card_create(int idx, const char *id,
+                    struct module *module, int extra_size,
+                    struct snd_card **card_ret);
+
+static inline __deprecated
 struct snd_card *snd_card_new(int idx, const char *id,
-                         struct module *module, int extra_size);
+                              struct module *module, int extra_size)
+{
+        struct snd_card *card;
+        if (snd_card_create(idx, id, module, extra_size, &card) < 0)
+                return NULL;
+        return card;
+}
+
 int snd_card_disconnect(struct snd_card *card);
 int snd_card_free(struct snd_card *card);
 int snd_card_free_when_closed(struct snd_card *card);
@@ -446,21 +458,33 @@ static inline int __snd_bug_on(int cond)
 struct snd_pci_quirk {
         unsigned short subvendor;       /* PCI subvendor ID */
         unsigned short subdevice;       /* PCI subdevice ID */
+        unsigned short subdevice_mask;  /* bitmask to match */
         int value;                      /* value */
 #ifdef CONFIG_SND_DEBUG_VERBOSE
         const char *name;               /* name of the device (optional) */
 #endif
 };
 
-#define _SND_PCI_QUIRK_ID(vend,dev) \
-        .subvendor = (vend), .subdevice = (dev)
+#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev) \
+        .subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
+#define _SND_PCI_QUIRK_ID(vend, dev) \
+        _SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
 #define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
 #ifdef CONFIG_SND_DEBUG_VERBOSE
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
         {_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)                  \
+        {_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)                 \
+        {_SND_PCI_QUIRK_ID_MASK(vend, mask, dev),                       \
+                        .value = (val), .name = (xname)}
 #else
 #define SND_PCI_QUIRK(vend,dev,xname,val) \
         {_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
+#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val)                 \
+        {_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
+#define SND_PCI_QUIRK_VENDOR(vend, xname, val)                  \
+        {_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
 #endif
 
 const struct snd_pci_quirk *
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 10ee28eac018..6a664c3f7c1e 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1,6 +1,8 @@
 #ifndef __SOUND_EMU10K1_H
 #define __SOUND_EMU10K1_H
 
+#include <linux/types.h>
+
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Creative Labs, Inc.
@@ -34,6 +36,7 @@
 #include <sound/timer.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
+
 #include <asm/io.h>
 
 /* ------------------- DEFINES -------------------- */
@@ -2171,7 +2174,7 @@ struct snd_emu10k1_fx8010_code {
         char name[128];
 
         DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
-        u_int32_t __user *gpr_map;        /* initializers */
+        __u32 __user *gpr_map;          /* initializers */
 
         unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
         struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */
@@ -2184,11 +2187,11 @@ struct snd_emu10k1_fx8010_code {
         struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
 
         DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
-        u_int32_t __user *tram_data_map;  /* data initializers */
-        u_int32_t __user *tram_addr_map;  /* map initializers */
+        __u32 __user *tram_data_map;      /* data initializers */
+        __u32 __user *tram_addr_map;      /* map initializers */
 
         DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
-        u_int32_t __user *code;           /* one instruction - 64 bits */
+        __u32 __user *code;               /* one instruction - 64 bits */
 };
 
 struct snd_emu10k1_fx8010_tram {
diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index d9eea013c753..8c05e47a4090 100644
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -27,18 +27,28 @@
 
 struct snd_hwdep;
 
+/* hwdep file ops; all ops can be NULL */
 struct snd_hwdep_ops {
-        long long (*llseek) (struct snd_hwdep *hw, struct file * file, long long offset, int orig);
-        long (*read) (struct snd_hwdep *hw, char __user *buf, long count, loff_t *offset);
-        long (*write) (struct snd_hwdep *hw, const char __user *buf, long count, loff_t *offset);
-        int (*open) (struct snd_hwdep * hw, struct file * file);
-        int (*release) (struct snd_hwdep *hw, struct file * file);
-        unsigned int (*poll) (struct snd_hwdep *hw, struct file * file, poll_table * wait);
-        int (*ioctl) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
-        int (*ioctl_compat) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
-        int (*mmap) (struct snd_hwdep *hw, struct file * file, struct vm_area_struct * vma);
-        int (*dsp_status) (struct snd_hwdep *hw, struct snd_hwdep_dsp_status *status);
-        int (*dsp_load) (struct snd_hwdep *hw, struct snd_hwdep_dsp_image *image);
+        long long (*llseek)(struct snd_hwdep *hw, struct file *file,
+                            long long offset, int orig);
+        long (*read)(struct snd_hwdep *hw, char __user *buf,
+                     long count, loff_t *offset);
+        long (*write)(struct snd_hwdep *hw, const char __user *buf,
+                      long count, loff_t *offset);
+        int (*open)(struct snd_hwdep *hw, struct file * file);
+        int (*release)(struct snd_hwdep *hw, struct file * file);
+        unsigned int (*poll)(struct snd_hwdep *hw, struct file *file,
+                             poll_table *wait);
+        int (*ioctl)(struct snd_hwdep *hw, struct file *file,
+                     unsigned int cmd, unsigned long arg);
+        int (*ioctl_compat)(struct snd_hwdep *hw, struct file *file,
+                            unsigned int cmd, unsigned long arg);
+        int (*mmap)(struct snd_hwdep *hw, struct file *file,
+                    struct vm_area_struct *vma);
+        int (*dsp_status)(struct snd_hwdep *hw,
+                          struct snd_hwdep_dsp_status *status);
+        int (*dsp_load)(struct snd_hwdep *hw,
+                        struct snd_hwdep_dsp_image *image);
 };
 
 struct snd_hwdep {
@@ -61,9 +71,9 @@ struct snd_hwdep {
         void (*private_free) (struct snd_hwdep *hwdep);
 
         struct mutex open_mutex;
-        int used;
-        unsigned int dsp_loaded;
-        unsigned int exclusive: 1;
+        int used;                       /* reference counter */
+        unsigned int dsp_loaded;        /* bit fields of loaded dsp indices */
+        unsigned int exclusive:1;       /* exclusive access mode */
 };
 
 extern int snd_hwdep_new(struct snd_card *card, char *id, int device,
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 2e0315cdd0d6..f236e426a706 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -30,6 +30,9 @@ struct input_dev;
 /**
  * Jack types which can be reported.  These values are used as a
  * bitmask.
+ *
+ * Note that this must be kept in sync with the lookup table in
+ * sound/core/jack.c.
  */
 enum snd_jack_types {
         SND_JACK_HEADPHONE      = 0x0001,
@@ -37,6 +40,8 @@ enum snd_jack_types {
         SND_JACK_HEADSET        = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
         SND_JACK_LINEOUT        = 0x0004,
         SND_JACK_MECHANICAL     = 0x0008, /* If detected separately */
+        SND_JACK_VIDEOOUT       = 0x0010,
+        SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
 };
 
 struct snd_jack {
@@ -45,6 +50,8 @@ struct snd_jack {
         int type;
         const char *id;
         char name[100];
+        void *private_data;
+        void (*private_free)(struct snd_jack *);
 };
 
 #ifdef CONFIG_SND_JACK
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 40c5a6fa6bcd..c17296891617 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -268,7 +268,8 @@ struct snd_pcm_runtime {
         int overrange;
         snd_pcm_uframes_t avail_max;
         snd_pcm_uframes_t hw_ptr_base;  /* Position at buffer restart */
-        snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/
+        snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
+        unsigned long hw_ptr_jiffies;   /* Time when hw_ptr is updated */
 
         /* -- HW params -- */
         snd_pcm_access_t access;        /* access mode */
@@ -364,7 +365,6 @@ struct snd_pcm_substream {
         /* -- timer section -- */
         struct snd_timer *timer;                /* timer */
         unsigned timer_running: 1;      /* time is running */
-        spinlock_t timer_lock;
         /* -- next substream -- */
         struct snd_pcm_substream *next;
         /* -- linked substreams -- */
@@ -451,7 +451,7 @@ struct snd_pcm_notify {
 
 extern const struct file_operations snd_pcm_f_ops[2];
 
-int snd_pcm_new(struct snd_card *card, char *id, int device,
+int snd_pcm_new(struct snd_card *card, const char *id, int device,
                 int playback_count, int capture_count,
                 struct snd_pcm **rpcm);
 int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count);
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index b550a416d075..c23c26585700 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -42,7 +42,6 @@
 #define SNDRV_RAWMIDI_LFLG_INPUT        (1<<1)
 #define SNDRV_RAWMIDI_LFLG_OPEN         (3<<0)
 #define SNDRV_RAWMIDI_LFLG_APPEND       (1<<2)
-#define SNDRV_RAWMIDI_LFLG_NOOPENLOCK   (1<<3)
 
 struct snd_rawmidi;
 struct snd_rawmidi_substream;
diff --git a/include/sound/sb.h b/include/sound/sb.h
index 85f93c5fe1e4..4e62ee1e4115 100644
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
@@ -249,6 +249,7 @@ struct snd_sb {
 #define SB_ALS4000_3D_AUTO_MUTE 0x52
 #define SB_ALS4000_ANALOG_BLOCK_CTRL 0x53
 #define SB_ALS4000_3D_DELAYLINE_PATTERN 0x54
+#define SB_ALS4000_CR3_CONFIGURATION    0xc3 /* bit 7 is Digital Loop Enable */
 #define SB_ALS4000_QSOUND       0xdb
 
 /* IRQ setting bitmap */
@@ -330,7 +331,8 @@ enum {
         SB_MIX_DOUBLE,
         SB_MIX_INPUT_SW,
         SB_MIX_CAPTURE_PRO,
-        SB_MIX_CAPTURE_DT019X
+        SB_MIX_CAPTURE_DT019X,
+        SB_MIX_MONO_CAPTURE_ALS4K
 };
 
 #define SB_MIXVAL_DOUBLE(left_reg, right_reg, left_shift, right_shift, mask) \
diff --git a/include/sound/sfnt_info.h b/include/sound/sfnt_info.h
index 5d1ab9c4950f..1bce7fd1725f 100644
--- a/include/sound/sfnt_info.h
+++ b/include/sound/sfnt_info.h
@@ -202,13 +202,11 @@ struct snd_emux_misc_mode {
         int value2;     /* reserved */
 };
 
-enum {
-        SNDRV_EMUX_IOCTL_VERSION = _IOR('H', 0x80, unsigned int),
-        SNDRV_EMUX_IOCTL_LOAD_PATCH = _IOWR('H', 0x81, struct soundfont_patch_info),
-        SNDRV_EMUX_IOCTL_RESET_SAMPLES = _IO('H', 0x82),
-        SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES = _IO('H', 0x83),
-        SNDRV_EMUX_IOCTL_MEM_AVAIL = _IOW('H', 0x84, int),
-        SNDRV_EMUX_IOCTL_MISC_MODE = _IOWR('H', 0x84, struct snd_emux_misc_mode),
-};
+#define SNDRV_EMUX_IOCTL_VERSION        _IOR('H', 0x80, unsigned int)
+#define SNDRV_EMUX_IOCTL_LOAD_PATCH     _IOWR('H', 0x81, struct soundfont_patch_info)
+#define SNDRV_EMUX_IOCTL_RESET_SAMPLES  _IO('H', 0x82)
+#define SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES _IO('H', 0x83)
+#define SNDRV_EMUX_IOCTL_MEM_AVAIL      _IOW('H', 0x84, int)
+#define SNDRV_EMUX_IOCTL_MISC_MODE      _IOWR('H', 0x84, struct snd_emux_misc_mode)
 
 #endif /* __SOUND_SFNT_INFO_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 24247f763608..13676472ddfc 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -203,7 +203,7 @@ struct snd_soc_dai {
         int (*resume)(struct snd_soc_dai *dai);
 
         /* ops */
-        struct snd_soc_dai_ops ops;
+        struct snd_soc_dai_ops *ops;
 
         /* DAI capabilities */
         struct snd_soc_pcm_stream capture;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index dfa804958820..a7def6a9a030 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -76,6 +76,11 @@
          wcontrols, wncontrols)\
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
         .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
+#define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
+         wcontrols, wncontrols)\
+{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \
+        .shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
+        .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
 {       .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
         .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0}
@@ -101,6 +106,11 @@
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
         .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
         .event = wevent, .event_flags = wflags}
+#define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
+        wcontrols, wncontrols, wevent, wflags) \
+{       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
+        .invert = winvert, .kcontrols = wcontrols, \
+        .num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \
 {       .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
         .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \
@@ -182,6 +192,12 @@
         .get = snd_soc_dapm_get_value_enum_double, \
         .put = snd_soc_dapm_put_value_enum_double, \
         .private_value = (unsigned long)&xenum }
+#define SOC_DAPM_PIN_SWITCH(xname) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
+        .info = snd_soc_dapm_info_pin_switch, \
+        .get = snd_soc_dapm_get_pin_switch, \
+        .put = snd_soc_dapm_put_pin_switch, \
+        .private_value = (unsigned long)xname }
 
 /* dapm stream operations */
 #define SND_SOC_DAPM_STREAM_NOP                 0x0
@@ -228,6 +244,12 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
+int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *uinfo);
+int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *uncontrol);
+int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *uncontrol);
 int snd_soc_dapm_new_control(struct snd_soc_codec *codec,
         const struct snd_soc_dapm_widget *widget);
 int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
@@ -250,10 +272,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
 int snd_soc_dapm_sys_add(struct device *dev);
 
 /* dapm audio pin control and status */
-int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin);
-int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin);
-int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, char *pin);
-int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin);
+int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);
 int snd_soc_dapm_sync(struct snd_soc_codec *codec);
 
 /* dapm widget types */
@@ -263,6 +285,7 @@ enum snd_soc_dapm_type {
         snd_soc_dapm_mux,                       /* selects 1 analog signal from many inputs */
         snd_soc_dapm_value_mux,                 /* selects 1 analog signal from many inputs */
         snd_soc_dapm_mixer,                     /* mixes several analog signals together */
+        snd_soc_dapm_mixer_named_ctl,           /* mixer with named controls */
         snd_soc_dapm_pga,                       /* programmable gain/attenuation (volume) */
         snd_soc_dapm_adc,                       /* analog to digital converter */
         snd_soc_dapm_dac,                       /* digital to analog converter */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 24593ac3ea19..a40bc6f316fc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -16,6 +16,8 @@
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/control.h>
@@ -154,6 +156,8 @@ enum snd_soc_bias_level {
         SND_SOC_BIAS_OFF,
 };
 
+struct snd_jack;
+struct snd_soc_card;
 struct snd_soc_device;
 struct snd_soc_pcm_stream;
 struct snd_soc_ops;
@@ -164,6 +168,11 @@ struct snd_soc_platform;
 struct snd_soc_codec;
 struct soc_enum;
 struct snd_soc_ac97_ops;
+struct snd_soc_jack;
+struct snd_soc_jack_pin;
+#ifdef CONFIG_GPIOLIB
+struct snd_soc_jack_gpio;
+#endif
 
 typedef int (*hw_write_t)(void *,const char* ,int);
 typedef int (*hw_read_t)(void *,char* ,int);
@@ -184,6 +193,19 @@ int snd_soc_init_card(struct snd_soc_device *socdev);
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
+/* Jack reporting */
+int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
+                     struct snd_soc_jack *jack);
+void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
+int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
+                          struct snd_soc_jack_pin *pins);
+#ifdef CONFIG_GPIOLIB
+int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
+                        struct snd_soc_jack_gpio *gpios);
+void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
+                        struct snd_soc_jack_gpio *gpios);
+#endif
+
 /* codec IO */
 #define snd_soc_read(codec, reg) codec->read(codec, reg)
 #define snd_soc_write(codec, reg, value) codec->write(codec, reg, value)
@@ -203,6 +225,8 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec);
  */
 struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
         void *data, char *long_name);
+int snd_soc_add_controls(struct snd_soc_codec *codec,
+        const struct snd_kcontrol_new *controls, int num_controls);
 int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
@@ -237,6 +261,48 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
 int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 
+/**
+ * struct snd_soc_jack_pin - Describes a pin to update based on jack detection
+ *
+ * @pin:    name of the pin to update
+ * @mask:   bits to check for in reported jack status
+ * @invert: if non-zero then pin is enabled when status is not reported
+ */
+struct snd_soc_jack_pin {
+        struct list_head list;
+        const char *pin;
+        int mask;
+        bool invert;
+};
+
+/**
+ * struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
+ *
+ * @gpio:         gpio number
+ * @name:         gpio name
+ * @report:       value to report when jack detected
+ * @invert:       report presence in low state
+ * @debouce_time: debouce time in ms
+ */
+#ifdef CONFIG_GPIOLIB
+struct snd_soc_jack_gpio {
+        unsigned int gpio;
+        const char *name;
+        int report;
+        int invert;
+        int debounce_time;
+        struct snd_soc_jack *jack;
+        struct work_struct work;
+};
+#endif
+
+struct snd_soc_jack {
+        struct snd_jack *jack;
+        struct snd_soc_card *card;
+        struct list_head pins;
+        int status;
+};
+
 /* SoC PCM stream information */
 struct snd_soc_pcm_stream {
         char *stream_name;
@@ -384,6 +450,8 @@ struct snd_soc_card {
 
         struct snd_soc_device *socdev;
 
+        struct snd_soc_codec *codec;
+
         struct snd_soc_platform *platform;
         struct delayed_work delayed_work;
         struct work_struct deferred_resume_work;
@@ -393,7 +461,6 @@ struct snd_soc_card {
 struct snd_soc_device {
         struct device *dev;
         struct snd_soc_card *card;
-        struct snd_soc_codec *codec;
         struct snd_soc_codec_device *codec_dev;
         void *codec_data;
 };
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index 426899e529c5..5718a02d3afb 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -22,8 +22,9 @@
  *
  */
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <media/v4l2-dev.h>
+#include <media/v4l2-ioctl.h>
 
 struct snd_tea575x;
 
@@ -35,11 +36,10 @@ struct snd_tea575x_ops {
 
 struct snd_tea575x {
         struct snd_card *card;
-        struct video_device vd;         /* video device */
-        struct v4l2_file_operations fops;
+        struct video_device *vd;        /* video device */
         int dev_nr;                     /* requested device number + 1 */
-        int vd_registered;              /* video device is registered */
         int tea5759;                    /* 5759 chip is present */
+        int mute;                       /* Device is muted? */
         unsigned int freq_fixup;        /* crystal onboard */
         unsigned int val;               /* hw value */
         unsigned long freq;             /* frequency */
diff --git a/include/sound/uda1341.h b/include/sound/uda1341.h
deleted file mode 100644
index 110d5dc3a2be..000000000000
--- a/include/sound/uda1341.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  linux/include/linux/l3/uda1341.h
- *
- * Philips UDA1341 mixer device driver for ALSA
- *
- * Copyright (c) 2002 Tomas Kasparek <tomas.kasparek@seznam.cz>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License.
- *
- * History:
- *
- * 2002-03-13 Tomas Kasparek Initial release - based on uda1341.h from OSS
- * 2002-03-30 Tomas Kasparek Proc filesystem support, complete mixer and DSP
- *                           features support
- */
-
-#define UDA1341_ALSA_NAME "snd-uda1341"
-
-/*
- * Default rate set after inicialization
- */
-#define AUDIO_RATE_DEFAULT      44100
-
-/*
- * UDA1341 L3 address and command types
- */
-#define UDA1341_L3ADDR          5
-#define UDA1341_DATA0           (UDA1341_L3ADDR << 2 | 0)
-#define UDA1341_DATA1           (UDA1341_L3ADDR << 2 | 1)
-#define UDA1341_STATUS          (UDA1341_L3ADDR << 2 | 2)
-
-enum uda1341_onoff {
-        OFF=0,
-        ON,
-};
-
-enum uda1341_format {
-        I2S=0,
-        LSB16,
-        LSB18,
-        LSB20,
-        MSB,
-        LSB16MSB,
-        LSB18MSB,
-        LSB20MSB,        
-};
-
-enum uda1341_fs {
-        F512=0,
-        F384,
-        F256,
-        Funused,
-};
-
-enum uda1341_peak {
-        BEFORE=0,
-        AFTER,
-};
-
-enum uda1341_filter {
-        FLAT=0,
-        MIN,
-        MIN2,
-        MAX,
-};
-
-enum uda1341_mixer {
-        DOUBLE,
-        LINE,
-        MIC,
-        MIXER,
-};
-
-enum uda1341_deemp {
-        NONE,
-        D32,
-        D44,
-        D48,
-};
-
-enum uda1341_config {
-        CMD_READ_REG = 0,
-        CMD_RESET,
-        CMD_FS,
-        CMD_FORMAT,
-        CMD_OGAIN,
-        CMD_IGAIN,
-        CMD_DAC,
-        CMD_ADC,
-        CMD_VOLUME,
-        CMD_BASS,
-        CMD_TREBBLE,
-        CMD_PEAK,
-        CMD_DEEMP,
-        CMD_MUTE,        
-        CMD_FILTER,
-        CMD_CH1,
-        CMD_CH2,
-        CMD_MIC,       
-        CMD_MIXER,
-        CMD_AGC,
-        CMD_IG,
-        CMD_AGC_TIME,
-        CMD_AGC_LEVEL,
-#ifdef CONFIG_PM
-        CMD_SUSPEND,
-        CMD_RESUME,
-#endif
-        CMD_LAST,
-};
-
-enum write_through {
-        //used in update_bits (write_cfg) to avoid l3_write - just update local copy of regs.
-        REGS_ONLY=0,
-        //update local regs and write value to uda1341 - do l3_write
-        FLUSH,
-};
-
-int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client **clnt);
-
-/*
- * Local variables:
- * indent-tabs-mode: t
- * End:
- */
diff --git a/include/sound/version.h b/include/sound/version.h
index 2b48237e23bf..a7e74e23ad2e 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "1.0.18a"
+#define CONFIG_SND_VERSION "1.0.19"
 #define CONFIG_SND_DATE ""
diff --git a/include/sound/wss.h b/include/sound/wss.h
index fd01f22825cd..6d65f322f1d5 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card,
                       unsigned short hardware,
                       unsigned short hwshare,
                       struct snd_wss **rchip);
+int snd_wss_free(struct snd_wss *chip);
 int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
 int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
 int snd_wss_mixer(struct snd_wss *chip);
diff --git a/include/trace/block.h b/include/trace/block.h
index 25c6a1fd5b77..25b7068b819e 100644
--- a/include/trace/block.h
+++ b/include/trace/block.h
@@ -5,72 +5,72 @@
 #include <linux/tracepoint.h>
 
 DECLARE_TRACE(block_rq_abort,
-        TPPROTO(struct request_queue *q, struct request *rq),
-                TPARGS(q, rq));
+        TP_PROTO(struct request_queue *q, struct request *rq),
+              TP_ARGS(q, rq));
 
 DECLARE_TRACE(block_rq_insert,
-        TPPROTO(struct request_queue *q, struct request *rq),
-                TPARGS(q, rq));
+        TP_PROTO(struct request_queue *q, struct request *rq),
+              TP_ARGS(q, rq));
 
 DECLARE_TRACE(block_rq_issue,
-        TPPROTO(struct request_queue *q, struct request *rq),
-                TPARGS(q, rq));
+        TP_PROTO(struct request_queue *q, struct request *rq),
+              TP_ARGS(q, rq));
 
 DECLARE_TRACE(block_rq_requeue,
-        TPPROTO(struct request_queue *q, struct request *rq),
-                TPARGS(q, rq));
+        TP_PROTO(struct request_queue *q, struct request *rq),
+              TP_ARGS(q, rq));
 
 DECLARE_TRACE(block_rq_complete,
-        TPPROTO(struct request_queue *q, struct request *rq),
-                TPARGS(q, rq));
+        TP_PROTO(struct request_queue *q, struct request *rq),
+              TP_ARGS(q, rq));
 
 DECLARE_TRACE(block_bio_bounce,
-        TPPROTO(struct request_queue *q, struct bio *bio),
-                TPARGS(q, bio));
+        TP_PROTO(struct request_queue *q, struct bio *bio),
+              TP_ARGS(q, bio));
 
 DECLARE_TRACE(block_bio_complete,
-        TPPROTO(struct request_queue *q, struct bio *bio),
-                TPARGS(q, bio));
+        TP_PROTO(struct request_queue *q, struct bio *bio),
+              TP_ARGS(q, bio));
 
 DECLARE_TRACE(block_bio_backmerge,
-        TPPROTO(struct request_queue *q, struct bio *bio),
-                TPARGS(q, bio));
+        TP_PROTO(struct request_queue *q, struct bio *bio),
+              TP_ARGS(q, bio));
 
 DECLARE_TRACE(block_bio_frontmerge,
-        TPPROTO(struct request_queue *q, struct bio *bio),
-                TPARGS(q, bio));
+        TP_PROTO(struct request_queue *q, struct bio *bio),
+              TP_ARGS(q, bio));
 
 DECLARE_TRACE(block_bio_queue,
-        TPPROTO(struct request_queue *q, struct bio *bio),
-                TPARGS(q, bio));
+        TP_PROTO(struct request_queue *q, struct bio *bio),
+              TP_ARGS(q, bio));
 
 DECLARE_TRACE(block_getrq,
-        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-                TPARGS(q, bio, rw));
+        TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
+              TP_ARGS(q, bio, rw));
 
 DECLARE_TRACE(block_sleeprq,
-        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-                TPARGS(q, bio, rw));
+        TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
+              TP_ARGS(q, bio, rw));
 
 DECLARE_TRACE(block_plug,
-        TPPROTO(struct request_queue *q),
-                TPARGS(q));
+        TP_PROTO(struct request_queue *q),
+              TP_ARGS(q));
 
 DECLARE_TRACE(block_unplug_timer,
-        TPPROTO(struct request_queue *q),
-                TPARGS(q));
+        TP_PROTO(struct request_queue *q),
+              TP_ARGS(q));
 
 DECLARE_TRACE(block_unplug_io,
-        TPPROTO(struct request_queue *q),
-                TPARGS(q));
+        TP_PROTO(struct request_queue *q),
+              TP_ARGS(q));
 
 DECLARE_TRACE(block_split,
-        TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
-                TPARGS(q, bio, pdu));
+        TP_PROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
+              TP_ARGS(q, bio, pdu));
 
 DECLARE_TRACE(block_remap,
-        TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
-                sector_t from, sector_t to),
-                TPARGS(q, bio, dev, from, to));
+        TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
+                 sector_t from, sector_t to),
+              TP_ARGS(q, bio, dev, from, to));
 
 #endif
diff --git a/include/trace/irq.h b/include/trace/irq.h
new file mode 100644
index 000000000000..ff5d4495dc37
--- /dev/null
+++ b/include/trace/irq.h
@@ -0,0 +1,9 @@
+#ifndef _TRACE_IRQ_H
+#define _TRACE_IRQ_H
+
+#include <linux/interrupt.h>
+#include <linux/tracepoint.h>
+
+#include <trace/irq_event_types.h>
+
+#endif
diff --git a/include/trace/irq_event_types.h b/include/trace/irq_event_types.h
new file mode 100644
index 000000000000..85964ebd47ec
--- /dev/null
+++ b/include/trace/irq_event_types.h
@@ -0,0 +1,55 @@
+
+/* use <trace/irq.h> instead */
+#ifndef TRACE_FORMAT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM irq
+
+/*
+ * Tracepoint for entry of interrupt handler:
+ */
+TRACE_FORMAT(irq_handler_entry,
+        TP_PROTO(int irq, struct irqaction *action),
+        TP_ARGS(irq, action),
+        TP_FMT("irq=%d handler=%s", irq, action->name)
+        );
+
+/*
+ * Tracepoint for return of an interrupt handler:
+ */
+TRACE_EVENT(irq_handler_exit,
+
+        TP_PROTO(int irq, struct irqaction *action, int ret),
+
+        TP_ARGS(irq, action, ret),
+
+        TP_STRUCT__entry(
+                __field(        int,    irq     )
+                __field(        int,    ret     )
+        ),
+
+        TP_fast_assign(
+                __entry->irq    = irq;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("irq=%d return=%s",
+                  __entry->irq, __entry->ret ? "handled" : "unhandled")
+);
+
+TRACE_FORMAT(softirq_entry,
+        TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
+        TP_ARGS(h, vec),
+        TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])
+        );
+
+TRACE_FORMAT(softirq_exit,
+        TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
+        TP_ARGS(h, vec),
+        TP_FMT("softirq=%d action=%s", (int)(h - vec), softirq_to_name[h-vec])
+        );
+
+#undef TRACE_SYSTEM
diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h
new file mode 100644
index 000000000000..28ee69f9cd46
--- /dev/null
+++ b/include/trace/kmemtrace.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008 Eduard - Gabriel Munteanu
+ *
+ * This file is released under GPL version 2.
+ */
+
+#ifndef _LINUX_KMEMTRACE_H
+#define _LINUX_KMEMTRACE_H
+
+#ifdef __KERNEL__
+
+#include <linux/tracepoint.h>
+#include <linux/types.h>
+
+#ifdef CONFIG_KMEMTRACE
+extern void kmemtrace_init(void);
+#else
+static inline void kmemtrace_init(void)
+{
+}
+#endif
+
+DECLARE_TRACE(kmalloc,
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
+                      size_t bytes_req,
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmem_cache_alloc,
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
+                      size_t bytes_req,
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmalloc_node,
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
+                      size_t bytes_req,
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags,
+                      int node),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kmem_cache_alloc_node,
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
+                      size_t bytes_req,
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags,
+                      int node),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kfree,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
+DECLARE_TRACE(kmem_cache_free,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_KMEMTRACE_H */
+
diff --git a/include/trace/lockdep.h b/include/trace/lockdep.h
new file mode 100644
index 000000000000..5ca67df87f2a
--- /dev/null
+++ b/include/trace/lockdep.h
@@ -0,0 +1,9 @@
+#ifndef _TRACE_LOCKDEP_H
+#define _TRACE_LOCKDEP_H
+
+#include <linux/lockdep.h>
+#include <linux/tracepoint.h>
+
+#include <trace/lockdep_event_types.h>
+
+#endif
diff --git a/include/trace/lockdep_event_types.h b/include/trace/lockdep_event_types.h
new file mode 100644
index 000000000000..adccfcd2ec8f
--- /dev/null
+++ b/include/trace/lockdep_event_types.h
@@ -0,0 +1,44 @@
+
+#ifndef TRACE_FORMAT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM lock
+
+#ifdef CONFIG_LOCKDEP
+
+TRACE_FORMAT(lock_acquire,
+        TP_PROTO(struct lockdep_map *lock, unsigned int subclass,
+                int trylock, int read, int check,
+                struct lockdep_map *next_lock, unsigned long ip),
+        TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),
+        TP_FMT("%s%s%s", trylock ? "try " : "",
+                read ? "read " : "", lock->name)
+        );
+
+TRACE_FORMAT(lock_release,
+        TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip),
+        TP_ARGS(lock, nested, ip),
+        TP_FMT("%s", lock->name)
+        );
+
+#ifdef CONFIG_LOCK_STAT
+
+TRACE_FORMAT(lock_contended,
+        TP_PROTO(struct lockdep_map *lock, unsigned long ip),
+        TP_ARGS(lock, ip),
+        TP_FMT("%s", lock->name)
+        );
+
+TRACE_FORMAT(lock_acquired,
+        TP_PROTO(struct lockdep_map *lock, unsigned long ip),
+        TP_ARGS(lock, ip),
+        TP_FMT("%s", lock->name)
+        );
+
+#endif
+#endif
+
+#undef TRACE_SYSTEM
diff --git a/include/trace/power.h b/include/trace/power.h
new file mode 100644
index 000000000000..ef204666e983
--- /dev/null
+++ b/include/trace/power.h
@@ -0,0 +1,32 @@
+#ifndef _TRACE_POWER_H
+#define _TRACE_POWER_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+enum {
+        POWER_NONE = 0,
+        POWER_CSTATE = 1,
+        POWER_PSTATE = 2,
+};
+
+struct power_trace {
+        ktime_t                 stamp;
+        ktime_t                 end;
+        int                     type;
+        int                     state;
+};
+
+DECLARE_TRACE(power_start,
+        TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+              TP_ARGS(it, type, state));
+
+DECLARE_TRACE(power_mark,
+        TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+              TP_ARGS(it, type, state));
+
+DECLARE_TRACE(power_end,
+        TP_PROTO(struct power_trace *it),
+              TP_ARGS(it));
+
+#endif /* _TRACE_POWER_H */
diff --git a/include/trace/sched.h b/include/trace/sched.h
index 0d81098ee9fc..4e372a1a29bf 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -4,53 +4,6 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(sched_kthread_stop,
-        TPPROTO(struct task_struct *t),
-                TPARGS(t));
-
-DECLARE_TRACE(sched_kthread_stop_ret,
-        TPPROTO(int ret),
-                TPARGS(ret));
-
-DECLARE_TRACE(sched_wait_task,
-        TPPROTO(struct rq *rq, struct task_struct *p),
-                TPARGS(rq, p));
-
-DECLARE_TRACE(sched_wakeup,
-        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_wakeup_new,
-        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_switch,
-        TPPROTO(struct rq *rq, struct task_struct *prev,
-                struct task_struct *next),
-                TPARGS(rq, prev, next));
-
-DECLARE_TRACE(sched_migrate_task,
-        TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
-                TPARGS(p, orig_cpu, dest_cpu));
-
-DECLARE_TRACE(sched_process_free,
-        TPPROTO(struct task_struct *p),
-                TPARGS(p));
-
-DECLARE_TRACE(sched_process_exit,
-        TPPROTO(struct task_struct *p),
-                TPARGS(p));
-
-DECLARE_TRACE(sched_process_wait,
-        TPPROTO(struct pid *pid),
-                TPARGS(pid));
-
-DECLARE_TRACE(sched_process_fork,
-        TPPROTO(struct task_struct *parent, struct task_struct *child),
-                TPARGS(parent, child));
-
-DECLARE_TRACE(sched_signal_send,
-        TPPROTO(int sig, struct task_struct *p),
-                TPARGS(sig, p));
+#include <trace/sched_event_types.h>
 
 #endif
diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
new file mode 100644
index 000000000000..63547dc1125f
--- /dev/null
+++ b/include/trace/sched_event_types.h
@@ -0,0 +1,337 @@
+
+/* use <trace/sched.h> instead */
+#ifndef TRACE_EVENT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM sched
+
+/*
+ * Tracepoint for calling kthread_stop, performed to end a kthread:
+ */
+TRACE_EVENT(sched_kthread_stop,
+
+        TP_PROTO(struct task_struct *t),
+
+        TP_ARGS(t),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, t->comm, TASK_COMM_LEN);
+                __entry->pid    = t->pid;
+        ),
+
+        TP_printk("task %s:%d", __entry->comm, __entry->pid)
+);
+
+/*
+ * Tracepoint for the return value of the kthread stopping:
+ */
+TRACE_EVENT(sched_kthread_stop_ret,
+
+        TP_PROTO(int ret),
+
+        TP_ARGS(ret),
+
+        TP_STRUCT__entry(
+                __field(        int,    ret     )
+        ),
+
+        TP_fast_assign(
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("ret %d", __entry->ret)
+);
+
+/*
+ * Tracepoint for waiting on task to unschedule:
+ *
+ * (NOTE: the 'rq' argument is not used by generic trace events,
+ *        but used by the latency tracer plugin. )
+ */
+TRACE_EVENT(sched_wait_task,
+
+        TP_PROTO(struct rq *rq, struct task_struct *p),
+
+        TP_ARGS(rq, p),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid    = p->pid;
+                __entry->prio   = p->prio;
+        ),
+
+        TP_printk("task %s:%d [%d]",
+                  __entry->comm, __entry->pid, __entry->prio)
+);
+
+/*
+ * Tracepoint for waking up a task:
+ *
+ * (NOTE: the 'rq' argument is not used by generic trace events,
+ *        but used by the latency tracer plugin. )
+ */
+TRACE_EVENT(sched_wakeup,
+
+        TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+
+        TP_ARGS(rq, p, success),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+                __field(        int,    success                 )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid            = p->pid;
+                __entry->prio           = p->prio;
+                __entry->success        = success;
+        ),
+
+        TP_printk("task %s:%d [%d] success=%d",
+                  __entry->comm, __entry->pid, __entry->prio,
+                  __entry->success)
+);
+
+/*
+ * Tracepoint for waking up a new task:
+ *
+ * (NOTE: the 'rq' argument is not used by generic trace events,
+ *        but used by the latency tracer plugin. )
+ */
+TRACE_EVENT(sched_wakeup_new,
+
+        TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+
+        TP_ARGS(rq, p, success),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+                __field(        int,    success                 )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid            = p->pid;
+                __entry->prio           = p->prio;
+                __entry->success        = success;
+        ),
+
+        TP_printk("task %s:%d [%d] success=%d",
+                  __entry->comm, __entry->pid, __entry->prio,
+                  __entry->success)
+);
+
+/*
+ * Tracepoint for task switches, performed by the scheduler:
+ *
+ * (NOTE: the 'rq' argument is not used by generic trace events,
+ *        but used by the latency tracer plugin. )
+ */
+TRACE_EVENT(sched_switch,
+
+        TP_PROTO(struct rq *rq, struct task_struct *prev,
+                 struct task_struct *next),
+
+        TP_ARGS(rq, prev, next),
+
+        TP_STRUCT__entry(
+                __array(        char,   prev_comm,      TASK_COMM_LEN   )
+                __field(        pid_t,  prev_pid                        )
+                __field(        int,    prev_prio                       )
+                __array(        char,   next_comm,      TASK_COMM_LEN   )
+                __field(        pid_t,  next_pid                        )
+                __field(        int,    next_prio                       )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN);
+                __entry->prev_pid       = prev->pid;
+                __entry->prev_prio      = prev->prio;
+                memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN);
+                __entry->next_pid       = next->pid;
+                __entry->next_prio      = next->prio;
+        ),
+
+        TP_printk("task %s:%d [%d] ==> %s:%d [%d]",
+                __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
+                __entry->next_comm, __entry->next_pid, __entry->next_prio)
+);
+
+/*
+ * Tracepoint for a task being migrated:
+ */
+TRACE_EVENT(sched_migrate_task,
+
+        TP_PROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
+
+        TP_ARGS(p, orig_cpu, dest_cpu),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+                __field(        int,    orig_cpu                )
+                __field(        int,    dest_cpu                )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid            = p->pid;
+                __entry->prio           = p->prio;
+                __entry->orig_cpu       = orig_cpu;
+                __entry->dest_cpu       = dest_cpu;
+        ),
+
+        TP_printk("task %s:%d [%d] from: %d  to: %d",
+                  __entry->comm, __entry->pid, __entry->prio,
+                  __entry->orig_cpu, __entry->dest_cpu)
+);
+
+/*
+ * Tracepoint for freeing a task:
+ */
+TRACE_EVENT(sched_process_free,
+
+        TP_PROTO(struct task_struct *p),
+
+        TP_ARGS(p),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid            = p->pid;
+                __entry->prio           = p->prio;
+        ),
+
+        TP_printk("task %s:%d [%d]",
+                  __entry->comm, __entry->pid, __entry->prio)
+);
+
+/*
+ * Tracepoint for a task exiting:
+ */
+TRACE_EVENT(sched_process_exit,
+
+        TP_PROTO(struct task_struct *p),
+
+        TP_ARGS(p),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid            = p->pid;
+                __entry->prio           = p->prio;
+        ),
+
+        TP_printk("task %s:%d [%d]",
+                  __entry->comm, __entry->pid, __entry->prio)
+);
+
+/*
+ * Tracepoint for a waiting task:
+ */
+TRACE_EVENT(sched_process_wait,
+
+        TP_PROTO(struct pid *pid),
+
+        TP_ARGS(pid),
+
+        TP_STRUCT__entry(
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+                __field(        int,    prio                    )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
+                __entry->pid            = pid_nr(pid);
+                __entry->prio           = current->prio;
+        ),
+
+        TP_printk("task %s:%d [%d]",
+                  __entry->comm, __entry->pid, __entry->prio)
+);
+
+/*
+ * Tracepoint for do_fork:
+ */
+TRACE_EVENT(sched_process_fork,
+
+        TP_PROTO(struct task_struct *parent, struct task_struct *child),
+
+        TP_ARGS(parent, child),
+
+        TP_STRUCT__entry(
+                __array(        char,   parent_comm,    TASK_COMM_LEN   )
+                __field(        pid_t,  parent_pid                      )
+                __array(        char,   child_comm,     TASK_COMM_LEN   )
+                __field(        pid_t,  child_pid                       )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->parent_comm, parent->comm, TASK_COMM_LEN);
+                __entry->parent_pid     = parent->pid;
+                memcpy(__entry->child_comm, child->comm, TASK_COMM_LEN);
+                __entry->child_pid      = child->pid;
+        ),
+
+        TP_printk("parent %s:%d  child %s:%d",
+                __entry->parent_comm, __entry->parent_pid,
+                __entry->child_comm, __entry->child_pid)
+);
+
+/*
+ * Tracepoint for sending a signal:
+ */
+TRACE_EVENT(sched_signal_send,
+
+        TP_PROTO(int sig, struct task_struct *p),
+
+        TP_ARGS(sig, p),
+
+        TP_STRUCT__entry(
+                __field(        int,    sig                     )
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+                __entry->pid    = p->pid;
+                __entry->sig    = sig;
+        ),
+
+        TP_printk("sig: %d  task %s:%d",
+                  __entry->sig, __entry->comm, __entry->pid)
+);
+
+#undef TRACE_SYSTEM
diff --git a/include/trace/skb.h b/include/trace/skb.h
new file mode 100644
index 000000000000..b66206d9be72
--- /dev/null
+++ b/include/trace/skb.h
@@ -0,0 +1,11 @@
+#ifndef _TRACE_SKB_H_
+#define _TRACE_SKB_H_
+
+#include <linux/skbuff.h>
+#include <linux/tracepoint.h>
+
+DECLARE_TRACE(kfree_skb,
+        TP_PROTO(struct sk_buff *skb, void *location),
+        TP_ARGS(skb, location));
+
+#endif
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
new file mode 100644
index 000000000000..8cfe515cbc47
--- /dev/null
+++ b/include/trace/syscall.h
@@ -0,0 +1,35 @@
+#ifndef _TRACE_SYSCALL_H
+#define _TRACE_SYSCALL_H
+
+#include <asm/ptrace.h>
+
+/*
+ * A syscall entry in the ftrace syscalls array.
+ *
+ * @name: name of the syscall
+ * @nb_args: number of parameters it takes
+ * @types: list of types as strings
+ * @args: list of args as strings (args[i] matches types[i])
+ */
+struct syscall_metadata {
+        const char      *name;
+        int             nb_args;
+        const char      **types;
+        const char      **args;
+};
+
+#ifdef CONFIG_FTRACE_SYSCALLS
+extern void arch_init_ftrace_syscalls(void);
+extern struct syscall_metadata *syscall_nr_to_meta(int nr);
+extern void start_ftrace_syscalls(void);
+extern void stop_ftrace_syscalls(void);
+extern void ftrace_syscall_enter(struct pt_regs *regs);
+extern void ftrace_syscall_exit(struct pt_regs *regs);
+#else
+static inline void start_ftrace_syscalls(void)                  { }
+static inline void stop_ftrace_syscalls(void)                   { }
+static inline void ftrace_syscall_enter(struct pt_regs *regs)   { }
+static inline void ftrace_syscall_exit(struct pt_regs *regs)    { }
+#endif
+
+#endif /* _TRACE_SYSCALL_H */
diff --git a/include/trace/trace_event_types.h b/include/trace/trace_event_types.h
new file mode 100644
index 000000000000..df56f5694be6
--- /dev/null
+++ b/include/trace/trace_event_types.h
@@ -0,0 +1,5 @@
+/* trace/<type>_event_types.h here */
+
+#include <trace/sched_event_types.h>
+#include <trace/irq_event_types.h>
+#include <trace/lockdep_event_types.h>
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
new file mode 100644
index 000000000000..fd13750ca4ba
--- /dev/null
+++ b/include/trace/trace_events.h
@@ -0,0 +1,5 @@
+/* trace/<type>.h here */
+
+#include <trace/sched.h>
+#include <trace/irq.h>
+#include <trace/lockdep.h>
diff --git a/include/trace/workqueue.h b/include/trace/workqueue.h
new file mode 100644
index 000000000000..7626523deeba
--- /dev/null
+++ b/include/trace/workqueue.h
@@ -0,0 +1,25 @@
+#ifndef __TRACE_WORKQUEUE_H
+#define __TRACE_WORKQUEUE_H
+
+#include <linux/tracepoint.h>
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+
+DECLARE_TRACE(workqueue_insertion,
+           TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
+           TP_ARGS(wq_thread, work));
+
+DECLARE_TRACE(workqueue_execution,
+           TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
+           TP_ARGS(wq_thread, work));
+
+/* Trace the creation of one workqueue thread on a cpu */
+DECLARE_TRACE(workqueue_creation,
+           TP_PROTO(struct task_struct *wq_thread, int cpu),
+           TP_ARGS(wq_thread, cpu));
+
+DECLARE_TRACE(workqueue_destruction,
+           TP_PROTO(struct task_struct *wq_thread),
+           TP_ARGS(wq_thread));
+
+#endif /* __TRACE_WORKQUEUE_H */
diff --git a/include/video/aty128.h b/include/video/aty128.h
index 51ac69f05bdc..f0851e3bb7cc 100644
--- a/include/video/aty128.h
+++ b/include/video/aty128.h
@@ -415,7 +415,7 @@
 #define PWR_MGT_SLOWDOWN_MCLK                   0x00002000
 
 #define PMI_PMSCR_REG                           0x60
-                                                                                
+
 /* used by ATI bug fix for hardware ROM */
 #define RAGE128_MPP_TB_CONFIG                   0x01c0
 
diff --git a/include/video/broadsheetfb.h b/include/video/broadsheetfb.h
new file mode 100644
index 000000000000..a758534c0272
--- /dev/null
+++ b/include/video/broadsheetfb.h
@@ -0,0 +1,59 @@
+/*
+ * broadsheetfb.h - definitions for the broadsheet framebuffer driver
+ *
+ * Copyright (C) 2008 by Jaya Kumar
+ *
+ * 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.
+ *
+ */
+
+#ifndef _LINUX_BROADSHEETFB_H_
+#define _LINUX_BROADSHEETFB_H_
+
+/* Broadsheet command defines */
+#define BS_CMD_INIT_SYS_RUN     0x06
+#define BS_CMD_INIT_DSPE_CFG    0x09
+#define BS_CMD_INIT_DSPE_TMG    0x0A
+#define BS_CMD_INIT_ROTMODE     0x0B
+#define BS_CMD_RD_REG           0x10
+#define BS_CMD_WR_REG           0x11
+#define BS_CMD_LD_IMG           0x20
+#define BS_CMD_LD_IMG_AREA      0x22
+#define BS_CMD_LD_IMG_END       0x23
+#define BS_CMD_WAIT_DSPE_TRG    0x28
+#define BS_CMD_WAIT_DSPE_FREND  0x29
+#define BS_CMD_RD_WFM_INFO      0x30
+#define BS_CMD_UPD_INIT         0x32
+#define BS_CMD_UPD_FULL         0x33
+#define BS_CMD_UPD_GDRV_CLR     0x37
+
+/* Broadsheet pin interface specific defines */
+#define BS_CS   0x01
+#define BS_DC   0x02
+#define BS_WR   0x03
+
+/* struct used by broadsheet. board specific stuff comes from *board */
+struct broadsheetfb_par {
+        struct fb_info *info;
+        struct broadsheet_board *board;
+        void (*write_reg)(struct broadsheetfb_par *, u16 reg, u16 val);
+        u16 (*read_reg)(struct broadsheetfb_par *, u16 reg);
+        wait_queue_head_t waitq;
+};
+
+/* board specific routines */
+struct broadsheet_board {
+        struct module *owner;
+        int (*init)(struct broadsheetfb_par *);
+        int (*wait_for_rdy)(struct broadsheetfb_par *);
+        void (*set_ctl)(struct broadsheetfb_par *, unsigned char, u8);
+        void (*set_hdb)(struct broadsheetfb_par *, u16);
+        u16 (*get_hdb)(struct broadsheetfb_par *);
+        void (*cleanup)(struct broadsheetfb_par *);
+        int (*get_panel_type)(void);
+        int (*setup_irq)(struct fb_info *);
+};
+
+#endif
diff --git a/include/video/cirrus.h b/include/video/cirrus.h
index b2776b6c8679..9a5e9ee30782 100644
--- a/include/video/cirrus.h
+++ b/include/video/cirrus.h
@@ -32,7 +32,6 @@
 #define CL_VSSM2        0x3c3   /* Motherboard Sleep */
 
 /*** VGA Sequencer Registers ***/
-#define CL_SEQR0        0x0     /* Reset */
 /* the following are from the "extension registers" group */
 #define CL_SEQR6        0x6     /* Unlock ALL Extensions */
 #define CL_SEQR7        0x7     /* Extended Sequencer Mode */
@@ -71,6 +70,7 @@
 #define CL_CRT1B        0x1b    /* Extended Display Controls */
 #define CL_CRT1C        0x1c    /* Sync adjust and genlock register */
 #define CL_CRT1D        0x1d    /* Overlay Extended Control register */
+#define CL_CRT1E        0x1e    /* Another overflow register */
 #define CL_CRT25        0x25    /* Part Status Register */
 #define CL_CRT27        0x27    /* ID Register */
 #define CL_CRT51        0x51    /* P4 disable "flicker fixer" */
diff --git a/include/video/cyblafb.h b/include/video/cyblafb.h
deleted file mode 100644
index d3c1d4e2c8e3..000000000000
--- a/include/video/cyblafb.h
+++ /dev/null
@@ -1,175 +0,0 @@
-
-#ifndef CYBLAFB_DEBUG
-#define CYBLAFB_DEBUG 0
-#endif
-
-#if CYBLAFB_DEBUG
-#define debug(f,a...)   printk("%s:" f,  __func__ , ## a);
-#else
-#define debug(f,a...)
-#endif
-
-#define output(f, a...) printk("cyblafb: " f, ## a)
-
-#define Kb      (1024)
-#define Mb      (Kb*Kb)
-
-/* PCI IDS of supported cards temporarily here */
-
-#define CYBERBLADEi1    0x8500
-
-/* these defines are for 'lcd' variable */
-#define LCD_STRETCH     0
-#define LCD_CENTER      1
-#define LCD_BIOS        2
-
-/* display types */
-#define DISPLAY_CRT     0
-#define DISPLAY_FP      1
-
-#define ROP_S   0xCC
-
-#define point(x,y) ((y)<<16|(x))
-
-//
-// Attribute Regs, ARxx, 3c0/3c1
-//
-#define AR00    0x00
-#define AR01    0x01
-#define AR02    0x02
-#define AR03    0x03
-#define AR04    0x04
-#define AR05    0x05
-#define AR06    0x06
-#define AR07    0x07
-#define AR08    0x08
-#define AR09    0x09
-#define AR0A    0x0A
-#define AR0B    0x0B
-#define AR0C    0x0C
-#define AR0D    0x0D
-#define AR0E    0x0E
-#define AR0F    0x0F
-#define AR10    0x10
-#define AR12    0x12
-#define AR13    0x13
-
-//
-// Sequencer Regs, SRxx, 3c4/3c5
-//
-#define SR00    0x00
-#define SR01    0x01
-#define SR02    0x02
-#define SR03    0x03
-#define SR04    0x04
-#define SR0D    0x0D
-#define SR0E    0x0E
-#define SR11    0x11
-#define SR18    0x18
-#define SR19    0x19
-
-//
-//
-//
-#define CR00    0x00
-#define CR01    0x01
-#define CR02    0x02
-#define CR03    0x03
-#define CR04    0x04
-#define CR05    0x05
-#define CR06    0x06
-#define CR07    0x07
-#define CR08    0x08
-#define CR09    0x09
-#define CR0A    0x0A
-#define CR0B    0x0B
-#define CR0C    0x0C
-#define CR0D    0x0D
-#define CR0E    0x0E
-#define CR0F    0x0F
-#define CR10    0x10
-#define CR11    0x11
-#define CR12    0x12
-#define CR13    0x13
-#define CR14    0x14
-#define CR15    0x15
-#define CR16    0x16
-#define CR17    0x17
-#define CR18    0x18
-#define CR19    0x19
-#define CR1A    0x1A
-#define CR1B    0x1B
-#define CR1C    0x1C
-#define CR1D    0x1D
-#define CR1E    0x1E
-#define CR1F    0x1F
-#define CR20    0x20
-#define CR21    0x21
-#define CR27    0x27
-#define CR29    0x29
-#define CR2A    0x2A
-#define CR2B    0x2B
-#define CR2D    0x2D
-#define CR2F    0x2F
-#define CR36    0x36
-#define CR38    0x38
-#define CR39    0x39
-#define CR3A    0x3A
-#define CR55    0x55
-#define CR56    0x56
-#define CR57    0x57
-#define CR58    0x58
-
-//
-//
-//
-
-#define GR00    0x01
-#define GR01    0x01
-#define GR02    0x02
-#define GR03    0x03
-#define GR04    0x04
-#define GR05    0x05
-#define GR06    0x06
-#define GR07    0x07
-#define GR08    0x08
-#define GR0F    0x0F
-#define GR20    0x20
-#define GR23    0x23
-#define GR2F    0x2F
-#define GR30    0x30
-#define GR31    0x31
-#define GR33    0x33
-#define GR52    0x52
-#define GR53    0x53
-#define GR5D    0x5d
-
-
-//
-// Graphics Engine
-//
-#define GEBase  0x2100          // could be mapped elsewhere if we like it
-#define GE00    (GEBase+0x00)   // source 1, p 111
-#define GE04    (GEBase+0x04)   // source 2, p 111
-#define GE08    (GEBase+0x08)   // destination 1, p 111
-#define GE0C    (GEBase+0x0C)   // destination 2, p 112
-#define GE10    (GEBase+0x10)   // right view base & enable, p 112
-#define GE13    (GEBase+0x13)   // left view base & enable, p 112
-#define GE18    (GEBase+0x18)   // block write start address, p 112
-#define GE1C    (GEBase+0x1C)   // block write end address, p 112
-#define GE20    (GEBase+0x20)   // engine status, p 113
-#define GE24    (GEBase+0x24)   // reset all GE pointers
-#define GE44    (GEBase+0x44)   // command register, p 126
-#define GE48    (GEBase+0x48)   // raster operation, p 127
-#define GE60    (GEBase+0x60)   // foreground color, p 128
-#define GE64    (GEBase+0x64)   // background color, p 128
-#define GE6C    (GEBase+0x6C)   // Pattern and Style, p 129, ok
-#define GE9C    (GEBase+0x9C)   // pixel engine data port, p 125
-#define GEB8    (GEBase+0xB8)   // Destination Stride / Buffer Base 0, p 133
-#define GEBC    (GEBase+0xBC)   // Destination Stride / Buffer Base 1, p 133
-#define GEC0    (GEBase+0xC0)   // Destination Stride / Buffer Base 2, p 133
-#define GEC4    (GEBase+0xC4)   // Destination Stride / Buffer Base 3, p 133
-#define GEC8    (GEBase+0xC8)   // Source Stride / Buffer Base 0, p 133
-#define GECC    (GEBase+0xCC)   // Source Stride / Buffer Base 1, p 133
-#define GED0    (GEBase+0xD0)   // Source Stride / Buffer Base 2, p 133
-#define GED4    (GEBase+0xD4)   // Source Stride / Buffer Base 3, p 133
diff --git a/include/video/newport.h b/include/video/newport.h
index 1f5ebeaa818f..001b935e71c4 100644
--- a/include/video/newport.h
+++ b/include/video/newport.h
@@ -453,7 +453,7 @@ static __inline__ int newport_wait(struct newport_regs *regs)
 {
         int t = BUSY_TIMEOUT;
 
-        while (t--)
+        while (--t)
                 if (!(regs->cset.status & NPORT_STAT_GBUSY))
                         break;
         return !t;
@@ -463,7 +463,7 @@ static __inline__ int newport_bfwait(struct newport_regs *regs)
 {
         int t = BUSY_TIMEOUT;
 
-        while (t--)
+        while (--t)
                 if(!(regs->cset.status & NPORT_STAT_BBUSY))
                         break;
         return !t;
diff --git a/include/video/radeon.h b/include/video/radeon.h
index e072b16b39ab..56b188abfb54 100644
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -5,12 +5,12 @@
 #define RADEON_REGSIZE                  0x4000
 
 
-#define MM_INDEX                               0x0000  
-#define MM_DATA                                0x0004  
-#define BUS_CNTL                               0x0030  
-#define HI_STAT                                0x004C  
+#define MM_INDEX                               0x0000
+#define MM_DATA                                0x0004
+#define BUS_CNTL                               0x0030
+#define HI_STAT                                0x004C
 #define BUS_CNTL1                              0x0034
-#define I2C_CNTL_1                             0x0094  
+#define I2C_CNTL_1                             0x0094
 #define CNFG_CNTL                              0x00E0
 #define CNFG_MEMSIZE                           0x00F8
 #define CNFG_APER_0_BASE                       0x0100
@@ -18,8 +18,8 @@
 #define CNFG_APER_SIZE                         0x0108
 #define CNFG_REG_1_BASE                        0x010C
 #define CNFG_REG_APER_SIZE                     0x0110
-#define PAD_AGPINPUT_DELAY                     0x0164  
-#define PAD_CTLR_STRENGTH                      0x0168  
+#define PAD_AGPINPUT_DELAY                     0x0164
+#define PAD_CTLR_STRENGTH                      0x0168
 #define PAD_CTLR_UPDATE                        0x016C
 #define PAD_CTLR_MISC                          0x0aa0
 #define AGP_CNTL                               0x0174
@@ -27,171 +27,171 @@
 #define CAP0_TRIG_CNTL                         0x0950
 #define CAP1_TRIG_CNTL                         0x09c0
 #define VIPH_CONTROL                           0x0C40
-#define VENDOR_ID                              0x0F00  
-#define DEVICE_ID                              0x0F02  
-#define COMMAND                                0x0F04  
-#define STATUS                                 0x0F06  
-#define REVISION_ID                            0x0F08  
-#define REGPROG_INF                            0x0F09  
-#define SUB_CLASS                              0x0F0A  
-#define BASE_CODE                              0x0F0B  
-#define CACHE_LINE                             0x0F0C  
-#define LATENCY                                0x0F0D  
-#define HEADER                                 0x0F0E  
-#define BIST                                   0x0F0F  
-#define REG_MEM_BASE                           0x0F10  
-#define REG_IO_BASE                            0x0F14  
+#define VENDOR_ID                              0x0F00
+#define DEVICE_ID                              0x0F02
+#define COMMAND                                0x0F04
+#define STATUS                                 0x0F06
+#define REVISION_ID                            0x0F08
+#define REGPROG_INF                            0x0F09
+#define SUB_CLASS                              0x0F0A
+#define BASE_CODE                              0x0F0B
+#define CACHE_LINE                             0x0F0C
+#define LATENCY                                0x0F0D
+#define HEADER                                 0x0F0E
+#define BIST                                   0x0F0F
+#define REG_MEM_BASE                           0x0F10
+#define REG_IO_BASE                            0x0F14
 #define REG_REG_BASE                           0x0F18
 #define ADAPTER_ID                             0x0F2C
 #define BIOS_ROM                               0x0F30
-#define CAPABILITIES_PTR                       0x0F34  
-#define INTERRUPT_LINE                         0x0F3C  
-#define INTERRUPT_PIN                          0x0F3D  
-#define MIN_GRANT                              0x0F3E  
-#define MAX_LATENCY                            0x0F3F  
-#define ADAPTER_ID_W                           0x0F4C  
-#define PMI_CAP_ID                             0x0F50  
-#define PMI_NXT_CAP_PTR                        0x0F51  
-#define PMI_PMC_REG                            0x0F52  
-#define PM_STATUS                              0x0F54  
-#define PMI_DATA                               0x0F57  
-#define AGP_CAP_ID                             0x0F58  
-#define AGP_STATUS                             0x0F5C  
-#define AGP_COMMAND                            0x0F60  
+#define CAPABILITIES_PTR                       0x0F34
+#define INTERRUPT_LINE                         0x0F3C
+#define INTERRUPT_PIN                          0x0F3D
+#define MIN_GRANT                              0x0F3E
+#define MAX_LATENCY                            0x0F3F
+#define ADAPTER_ID_W                           0x0F4C
+#define PMI_CAP_ID                             0x0F50
+#define PMI_NXT_CAP_PTR                        0x0F51
+#define PMI_PMC_REG                            0x0F52
+#define PM_STATUS                              0x0F54
+#define PMI_DATA                               0x0F57
+#define AGP_CAP_ID                             0x0F58
+#define AGP_STATUS                             0x0F5C
+#define AGP_COMMAND                            0x0F60
 #define AIC_CTRL                               0x01D0
 #define AIC_STAT                               0x01D4
 #define AIC_PT_BASE                            0x01D8
-#define AIC_LO_ADDR                            0x01DC  
-#define AIC_HI_ADDR                            0x01E0  
-#define AIC_TLB_ADDR                           0x01E4  
-#define AIC_TLB_DATA                           0x01E8  
-#define DAC_CNTL                               0x0058  
+#define AIC_LO_ADDR                            0x01DC
+#define AIC_HI_ADDR                            0x01E0
+#define AIC_TLB_ADDR                           0x01E4
+#define AIC_TLB_DATA                           0x01E8
+#define DAC_CNTL                               0x0058
 #define DAC_CNTL2                              0x007c
-#define CRTC_GEN_CNTL                          0x0050  
-#define MEM_CNTL                               0x0140  
+#define CRTC_GEN_CNTL                          0x0050
+#define MEM_CNTL                               0x0140
 #define MC_CNTL                                0x0140
-#define EXT_MEM_CNTL                           0x0144  
+#define EXT_MEM_CNTL                           0x0144
 #define MC_TIMING_CNTL                         0x0144
-#define MC_AGP_LOCATION                        0x014C  
-#define MEM_IO_CNTL_A0                         0x0178  
+#define MC_AGP_LOCATION                        0x014C
+#define MEM_IO_CNTL_A0                         0x0178
 #define MEM_REFRESH_CNTL                       0x0178
-#define MEM_INIT_LATENCY_TIMER                 0x0154  
+#define MEM_INIT_LATENCY_TIMER                 0x0154
 #define MC_INIT_GFX_LAT_TIMER                  0x0154
-#define MEM_SDRAM_MODE_REG                     0x0158  
-#define AGP_BASE                               0x0170  
-#define MEM_IO_CNTL_A1                         0x017C  
+#define MEM_SDRAM_MODE_REG                     0x0158
+#define AGP_BASE                               0x0170
+#define MEM_IO_CNTL_A1                         0x017C
 #define MC_READ_CNTL_AB                        0x017C
 #define MEM_IO_CNTL_B0                         0x0180
 #define MC_INIT_MISC_LAT_TIMER                 0x0180
 #define MEM_IO_CNTL_B1                         0x0184
 #define MC_IOPAD_CNTL                          0x0184
 #define MC_DEBUG                               0x0188
-#define MC_STATUS                              0x0150  
-#define MEM_IO_OE_CNTL                         0x018C  
+#define MC_STATUS                              0x0150
+#define MEM_IO_OE_CNTL                         0x018C
 #define MC_CHIP_IO_OE_CNTL_AB                  0x018C
-#define MC_FB_LOCATION                         0x0148  
-#define HOST_PATH_CNTL                         0x0130  
-#define MEM_VGA_WP_SEL                         0x0038  
-#define MEM_VGA_RP_SEL                         0x003C  
-#define HDP_DEBUG                              0x0138  
+#define MC_FB_LOCATION                         0x0148
+#define HOST_PATH_CNTL                         0x0130
+#define MEM_VGA_WP_SEL                         0x0038
+#define MEM_VGA_RP_SEL                         0x003C
+#define HDP_DEBUG                              0x0138
 #define SW_SEMAPHORE                           0x013C
-#define CRTC2_GEN_CNTL                         0x03f8  
+#define CRTC2_GEN_CNTL                         0x03f8
 #define CRTC2_DISPLAY_BASE_ADDR                0x033c
-#define SURFACE_CNTL                           0x0B00  
-#define SURFACE0_LOWER_BOUND                   0x0B04  
-#define SURFACE1_LOWER_BOUND                   0x0B14  
-#define SURFACE2_LOWER_BOUND                   0x0B24  
-#define SURFACE3_LOWER_BOUND                   0x0B34  
-#define SURFACE4_LOWER_BOUND                   0x0B44  
+#define SURFACE_CNTL                           0x0B00
+#define SURFACE0_LOWER_BOUND                   0x0B04
+#define SURFACE1_LOWER_BOUND                   0x0B14
+#define SURFACE2_LOWER_BOUND                   0x0B24
+#define SURFACE3_LOWER_BOUND                   0x0B34
+#define SURFACE4_LOWER_BOUND                   0x0B44
 #define SURFACE5_LOWER_BOUND                   0x0B54
 #define SURFACE6_LOWER_BOUND                   0x0B64
 #define SURFACE7_LOWER_BOUND                   0x0B74
-#define SURFACE0_UPPER_BOUND                   0x0B08  
-#define SURFACE1_UPPER_BOUND                   0x0B18  
-#define SURFACE2_UPPER_BOUND                   0x0B28  
-#define SURFACE3_UPPER_BOUND                   0x0B38  
-#define SURFACE4_UPPER_BOUND                   0x0B48  
-#define SURFACE5_UPPER_BOUND                   0x0B58  
-#define SURFACE6_UPPER_BOUND                   0x0B68  
-#define SURFACE7_UPPER_BOUND                   0x0B78  
-#define SURFACE0_INFO                          0x0B0C  
-#define SURFACE1_INFO                          0x0B1C  
-#define SURFACE2_INFO                          0x0B2C  
-#define SURFACE3_INFO                          0x0B3C  
-#define SURFACE4_INFO                          0x0B4C  
-#define SURFACE5_INFO                          0x0B5C  
+#define SURFACE0_UPPER_BOUND                   0x0B08
+#define SURFACE1_UPPER_BOUND                   0x0B18
+#define SURFACE2_UPPER_BOUND                   0x0B28
+#define SURFACE3_UPPER_BOUND                   0x0B38
+#define SURFACE4_UPPER_BOUND                   0x0B48
+#define SURFACE5_UPPER_BOUND                   0x0B58
+#define SURFACE6_UPPER_BOUND                   0x0B68
+#define SURFACE7_UPPER_BOUND                   0x0B78
+#define SURFACE0_INFO                          0x0B0C
+#define SURFACE1_INFO                          0x0B1C
+#define SURFACE2_INFO                          0x0B2C
+#define SURFACE3_INFO                          0x0B3C
+#define SURFACE4_INFO                          0x0B4C
+#define SURFACE5_INFO                          0x0B5C
 #define SURFACE6_INFO                          0x0B6C
 #define SURFACE7_INFO                          0x0B7C
 #define SURFACE_ACCESS_FLAGS                   0x0BF8
-#define SURFACE_ACCESS_CLR                     0x0BFC  
-#define GEN_INT_CNTL                           0x0040  
-#define GEN_INT_STATUS                         0x0044  
+#define SURFACE_ACCESS_CLR                     0x0BFC
+#define GEN_INT_CNTL                           0x0040
+#define GEN_INT_STATUS                         0x0044
 #define CRTC_EXT_CNTL                          0x0054
-#define RB3D_CNTL                              0x1C3C  
-#define WAIT_UNTIL                             0x1720  
-#define ISYNC_CNTL                             0x1724  
-#define RBBM_GUICNTL                           0x172C  
-#define RBBM_STATUS                            0x0E40  
-#define RBBM_STATUS_alt_1                      0x1740  
-#define RBBM_CNTL                              0x00EC  
-#define RBBM_CNTL_alt_1                        0x0E44  
-#define RBBM_SOFT_RESET                        0x00F0  
-#define RBBM_SOFT_RESET_alt_1                  0x0E48  
-#define NQWAIT_UNTIL                           0x0E50  
+#define RB3D_CNTL                              0x1C3C
+#define WAIT_UNTIL                             0x1720
+#define ISYNC_CNTL                             0x1724
+#define RBBM_GUICNTL                           0x172C
+#define RBBM_STATUS                            0x0E40
+#define RBBM_STATUS_alt_1                      0x1740
+#define RBBM_CNTL                              0x00EC
+#define RBBM_CNTL_alt_1                        0x0E44
+#define RBBM_SOFT_RESET                        0x00F0
+#define RBBM_SOFT_RESET_alt_1                  0x0E48
+#define NQWAIT_UNTIL                           0x0E50
 #define RBBM_DEBUG                             0x0E6C
 #define RBBM_CMDFIFO_ADDR                      0x0E70
 #define RBBM_CMDFIFO_DATAL                     0x0E74
-#define RBBM_CMDFIFO_DATAH                     0x0E78  
-#define RBBM_CMDFIFO_STAT                      0x0E7C  
-#define CRTC_STATUS                            0x005C  
-#define GPIO_VGA_DDC                           0x0060  
-#define GPIO_DVI_DDC                           0x0064  
-#define GPIO_MONID                             0x0068  
+#define RBBM_CMDFIFO_DATAH                     0x0E78
+#define RBBM_CMDFIFO_STAT                      0x0E7C
+#define CRTC_STATUS                            0x005C
+#define GPIO_VGA_DDC                           0x0060
+#define GPIO_DVI_DDC                           0x0064
+#define GPIO_MONID                             0x0068
 #define GPIO_CRT2_DDC                          0x006c
-#define PALETTE_INDEX                          0x00B0  
-#define PALETTE_DATA                           0x00B4  
-#define PALETTE_30_DATA                        0x00B8  
-#define CRTC_H_TOTAL_DISP                      0x0200  
-#define CRTC_H_SYNC_STRT_WID                   0x0204  
-#define CRTC_V_TOTAL_DISP                      0x0208  
-#define CRTC_V_SYNC_STRT_WID                   0x020C  
-#define CRTC_VLINE_CRNT_VLINE                  0x0210  
+#define PALETTE_INDEX                          0x00B0
+#define PALETTE_DATA                           0x00B4
+#define PALETTE_30_DATA                        0x00B8
+#define CRTC_H_TOTAL_DISP                      0x0200
+#define CRTC_H_SYNC_STRT_WID                   0x0204
+#define CRTC_V_TOTAL_DISP                      0x0208
+#define CRTC_V_SYNC_STRT_WID                   0x020C
+#define CRTC_VLINE_CRNT_VLINE                  0x0210
 #define CRTC_CRNT_FRAME                        0x0214
 #define CRTC_GUI_TRIG_VLINE                    0x0218
 #define CRTC_DEBUG                             0x021C
-#define CRTC_OFFSET_RIGHT                      0x0220  
-#define CRTC_OFFSET                            0x0224  
-#define CRTC_OFFSET_CNTL                       0x0228  
-#define CRTC_PITCH                             0x022C  
-#define OVR_CLR                                0x0230  
-#define OVR_WID_LEFT_RIGHT                     0x0234  
-#define OVR_WID_TOP_BOTTOM                     0x0238  
-#define DISPLAY_BASE_ADDR                      0x023C  
-#define SNAPSHOT_VH_COUNTS                     0x0240  
-#define SNAPSHOT_F_COUNT                       0x0244  
-#define N_VIF_COUNT                            0x0248  
-#define SNAPSHOT_VIF_COUNT                     0x024C  
-#define FP_CRTC_H_TOTAL_DISP                   0x0250  
-#define FP_CRTC_V_TOTAL_DISP                   0x0254  
+#define CRTC_OFFSET_RIGHT                      0x0220
+#define CRTC_OFFSET                            0x0224
+#define CRTC_OFFSET_CNTL                       0x0228
+#define CRTC_PITCH                             0x022C
+#define OVR_CLR                                0x0230
+#define OVR_WID_LEFT_RIGHT                     0x0234
+#define OVR_WID_TOP_BOTTOM                     0x0238
+#define DISPLAY_BASE_ADDR                      0x023C
+#define SNAPSHOT_VH_COUNTS                     0x0240
+#define SNAPSHOT_F_COUNT                       0x0244
+#define N_VIF_COUNT                            0x0248
+#define SNAPSHOT_VIF_COUNT                     0x024C
+#define FP_CRTC_H_TOTAL_DISP                   0x0250
+#define FP_CRTC_V_TOTAL_DISP                   0x0254
 #define CRT_CRTC_H_SYNC_STRT_WID               0x0258
 #define CRT_CRTC_V_SYNC_STRT_WID               0x025C
 #define CUR_OFFSET                             0x0260
-#define CUR_HORZ_VERT_POSN                     0x0264  
-#define CUR_HORZ_VERT_OFF                      0x0268  
-#define CUR_CLR0                               0x026C  
-#define CUR_CLR1                               0x0270  
-#define FP_HORZ_VERT_ACTIVE                    0x0278  
-#define CRTC_MORE_CNTL                         0x027C  
+#define CUR_HORZ_VERT_POSN                     0x0264
+#define CUR_HORZ_VERT_OFF                      0x0268
+#define CUR_CLR0                               0x026C
+#define CUR_CLR1                               0x0270
+#define FP_HORZ_VERT_ACTIVE                    0x0278
+#define CRTC_MORE_CNTL                         0x027C
 #define CRTC_H_CUTOFF_ACTIVE_EN                (1<<4)
 #define CRTC_V_CUTOFF_ACTIVE_EN                (1<<5)
-#define DAC_EXT_CNTL                           0x0280  
-#define FP_GEN_CNTL                            0x0284  
-#define FP_HORZ_STRETCH                        0x028C  
-#define FP_VERT_STRETCH                        0x0290  
-#define FP_H_SYNC_STRT_WID                     0x02C4  
-#define FP_V_SYNC_STRT_WID                     0x02C8  
-#define AUX_WINDOW_HORZ_CNTL                   0x02D8  
-#define AUX_WINDOW_VERT_CNTL                   0x02DC  
+#define DAC_EXT_CNTL                           0x0280
+#define FP_GEN_CNTL                            0x0284
+#define FP_HORZ_STRETCH                        0x028C
+#define FP_VERT_STRETCH                        0x0290
+#define FP_H_SYNC_STRT_WID                     0x02C4
+#define FP_V_SYNC_STRT_WID                     0x02C8
+#define AUX_WINDOW_HORZ_CNTL                   0x02D8
+#define AUX_WINDOW_VERT_CNTL                   0x02DC
 //#define DDA_CONFIG                           0x02e0
 //#define DDA_ON_OFF                           0x02e4
 #define DVI_I2C_CNTL_1                         0x02e4
@@ -199,192 +199,192 @@
 #define GRPH2_BUFFER_CNTL                      0x03F0
 #define VGA_BUFFER_CNTL                        0x02F4
 #define OV0_Y_X_START                          0x0400
-#define OV0_Y_X_END                            0x0404  
-#define OV0_PIPELINE_CNTL                      0x0408  
-#define OV0_REG_LOAD_CNTL                      0x0410  
-#define OV0_SCALE_CNTL                         0x0420  
-#define OV0_V_INC                              0x0424  
-#define OV0_P1_V_ACCUM_INIT                    0x0428  
-#define OV0_P23_V_ACCUM_INIT                   0x042C  
-#define OV0_P1_BLANK_LINES_AT_TOP              0x0430  
-#define OV0_P23_BLANK_LINES_AT_TOP             0x0434  
-#define OV0_BASE_ADDR                          0x043C  
-#define OV0_VID_BUF0_BASE_ADRS                 0x0440  
-#define OV0_VID_BUF1_BASE_ADRS                 0x0444  
-#define OV0_VID_BUF2_BASE_ADRS                 0x0448  
-#define OV0_VID_BUF3_BASE_ADRS                 0x044C  
+#define OV0_Y_X_END                            0x0404
+#define OV0_PIPELINE_CNTL                      0x0408
+#define OV0_REG_LOAD_CNTL                      0x0410
+#define OV0_SCALE_CNTL                         0x0420
+#define OV0_V_INC                              0x0424
+#define OV0_P1_V_ACCUM_INIT                    0x0428
+#define OV0_P23_V_ACCUM_INIT                   0x042C
+#define OV0_P1_BLANK_LINES_AT_TOP              0x0430
+#define OV0_P23_BLANK_LINES_AT_TOP             0x0434
+#define OV0_BASE_ADDR                          0x043C
+#define OV0_VID_BUF0_BASE_ADRS                 0x0440
+#define OV0_VID_BUF1_BASE_ADRS                 0x0444
+#define OV0_VID_BUF2_BASE_ADRS                 0x0448
+#define OV0_VID_BUF3_BASE_ADRS                 0x044C
 #define OV0_VID_BUF4_BASE_ADRS                 0x0450
 #define OV0_VID_BUF5_BASE_ADRS                 0x0454
 #define OV0_VID_BUF_PITCH0_VALUE               0x0460
-#define OV0_VID_BUF_PITCH1_VALUE               0x0464  
-#define OV0_AUTO_FLIP_CNTRL                    0x0470  
-#define OV0_DEINTERLACE_PATTERN                0x0474  
-#define OV0_SUBMIT_HISTORY                     0x0478  
-#define OV0_H_INC                              0x0480  
-#define OV0_STEP_BY                            0x0484  
-#define OV0_P1_H_ACCUM_INIT                    0x0488  
-#define OV0_P23_H_ACCUM_INIT                   0x048C  
-#define OV0_P1_X_START_END                     0x0494  
-#define OV0_P2_X_START_END                     0x0498  
-#define OV0_P3_X_START_END                     0x049C  
-#define OV0_FILTER_CNTL                        0x04A0  
-#define OV0_FOUR_TAP_COEF_0                    0x04B0  
-#define OV0_FOUR_TAP_COEF_1                    0x04B4  
+#define OV0_VID_BUF_PITCH1_VALUE               0x0464
+#define OV0_AUTO_FLIP_CNTRL                    0x0470
+#define OV0_DEINTERLACE_PATTERN                0x0474
+#define OV0_SUBMIT_HISTORY                     0x0478
+#define OV0_H_INC                              0x0480
+#define OV0_STEP_BY                            0x0484
+#define OV0_P1_H_ACCUM_INIT                    0x0488
+#define OV0_P23_H_ACCUM_INIT                   0x048C
+#define OV0_P1_X_START_END                     0x0494
+#define OV0_P2_X_START_END                     0x0498
+#define OV0_P3_X_START_END                     0x049C
+#define OV0_FILTER_CNTL                        0x04A0
+#define OV0_FOUR_TAP_COEF_0                    0x04B0
+#define OV0_FOUR_TAP_COEF_1                    0x04B4
 #define OV0_FOUR_TAP_COEF_2                    0x04B8
 #define OV0_FOUR_TAP_COEF_3                    0x04BC
 #define OV0_FOUR_TAP_COEF_4                    0x04C0
-#define OV0_FLAG_CNTRL                         0x04DC  
-#define OV0_SLICE_CNTL                         0x04E0  
-#define OV0_VID_KEY_CLR_LOW                    0x04E4  
-#define OV0_VID_KEY_CLR_HIGH                   0x04E8  
-#define OV0_GRPH_KEY_CLR_LOW                   0x04EC  
-#define OV0_GRPH_KEY_CLR_HIGH                  0x04F0  
-#define OV0_KEY_CNTL                           0x04F4  
-#define OV0_TEST                               0x04F8  
-#define SUBPIC_CNTL                            0x0540  
-#define SUBPIC_DEFCOLCON                       0x0544  
-#define SUBPIC_Y_X_START                       0x054C  
-#define SUBPIC_Y_X_END                         0x0550  
-#define SUBPIC_V_INC                           0x0554  
-#define SUBPIC_H_INC                           0x0558  
+#define OV0_FLAG_CNTRL                         0x04DC
+#define OV0_SLICE_CNTL                         0x04E0
+#define OV0_VID_KEY_CLR_LOW                    0x04E4
+#define OV0_VID_KEY_CLR_HIGH                   0x04E8
+#define OV0_GRPH_KEY_CLR_LOW                   0x04EC
+#define OV0_GRPH_KEY_CLR_HIGH                  0x04F0
+#define OV0_KEY_CNTL                           0x04F4
+#define OV0_TEST                               0x04F8
+#define SUBPIC_CNTL                            0x0540
+#define SUBPIC_DEFCOLCON                       0x0544
+#define SUBPIC_Y_X_START                       0x054C
+#define SUBPIC_Y_X_END                         0x0550
+#define SUBPIC_V_INC                           0x0554
+#define SUBPIC_H_INC                           0x0558
 #define SUBPIC_BUF0_OFFSET                     0x055C
 #define SUBPIC_BUF1_OFFSET                     0x0560
 #define SUBPIC_LC0_OFFSET                      0x0564
-#define SUBPIC_LC1_OFFSET                      0x0568  
-#define SUBPIC_PITCH                           0x056C  
-#define SUBPIC_BTN_HLI_COLCON                  0x0570  
-#define SUBPIC_BTN_HLI_Y_X_START               0x0574  
-#define SUBPIC_BTN_HLI_Y_X_END                 0x0578  
-#define SUBPIC_PALETTE_INDEX                   0x057C  
-#define SUBPIC_PALETTE_DATA                    0x0580  
-#define SUBPIC_H_ACCUM_INIT                    0x0584  
-#define SUBPIC_V_ACCUM_INIT                    0x0588  
-#define DISP_MISC_CNTL                         0x0D00  
-#define DAC_MACRO_CNTL                         0x0D04  
-#define DISP_PWR_MAN                           0x0D08  
-#define DISP_TEST_DEBUG_CNTL                   0x0D10  
-#define DISP_HW_DEBUG                          0x0D14  
+#define SUBPIC_LC1_OFFSET                      0x0568
+#define SUBPIC_PITCH                           0x056C
+#define SUBPIC_BTN_HLI_COLCON                  0x0570
+#define SUBPIC_BTN_HLI_Y_X_START               0x0574
+#define SUBPIC_BTN_HLI_Y_X_END                 0x0578
+#define SUBPIC_PALETTE_INDEX                   0x057C
+#define SUBPIC_PALETTE_DATA                    0x0580
+#define SUBPIC_H_ACCUM_INIT                    0x0584
+#define SUBPIC_V_ACCUM_INIT                    0x0588
+#define DISP_MISC_CNTL                         0x0D00
+#define DAC_MACRO_CNTL                         0x0D04
+#define DISP_PWR_MAN                           0x0D08
+#define DISP_TEST_DEBUG_CNTL                   0x0D10
+#define DISP_HW_DEBUG                          0x0D14
 #define DAC_CRC_SIG1                           0x0D18
 #define DAC_CRC_SIG2                           0x0D1C
 #define OV0_LIN_TRANS_A                        0x0D20
-#define OV0_LIN_TRANS_B                        0x0D24  
-#define OV0_LIN_TRANS_C                        0x0D28  
-#define OV0_LIN_TRANS_D                        0x0D2C  
-#define OV0_LIN_TRANS_E                        0x0D30  
-#define OV0_LIN_TRANS_F                        0x0D34  
-#define OV0_GAMMA_0_F                          0x0D40  
-#define OV0_GAMMA_10_1F                        0x0D44  
-#define OV0_GAMMA_20_3F                        0x0D48  
-#define OV0_GAMMA_40_7F                        0x0D4C  
-#define OV0_GAMMA_380_3BF                      0x0D50  
-#define OV0_GAMMA_3C0_3FF                      0x0D54  
-#define DISP_MERGE_CNTL                        0x0D60  
-#define DISP_OUTPUT_CNTL                       0x0D64  
-#define DISP_LIN_TRANS_GRPH_A                  0x0D80  
+#define OV0_LIN_TRANS_B                        0x0D24
+#define OV0_LIN_TRANS_C                        0x0D28
+#define OV0_LIN_TRANS_D                        0x0D2C
+#define OV0_LIN_TRANS_E                        0x0D30
+#define OV0_LIN_TRANS_F                        0x0D34
+#define OV0_GAMMA_0_F                          0x0D40
+#define OV0_GAMMA_10_1F                        0x0D44
+#define OV0_GAMMA_20_3F                        0x0D48
+#define OV0_GAMMA_40_7F                        0x0D4C
+#define OV0_GAMMA_380_3BF                      0x0D50
+#define OV0_GAMMA_3C0_3FF                      0x0D54
+#define DISP_MERGE_CNTL                        0x0D60
+#define DISP_OUTPUT_CNTL                       0x0D64
+#define DISP_LIN_TRANS_GRPH_A                  0x0D80
 #define DISP_LIN_TRANS_GRPH_B                  0x0D84
 #define DISP_LIN_TRANS_GRPH_C                  0x0D88
 #define DISP_LIN_TRANS_GRPH_D                  0x0D8C
-#define DISP_LIN_TRANS_GRPH_E                  0x0D90  
-#define DISP_LIN_TRANS_GRPH_F                  0x0D94  
-#define DISP_LIN_TRANS_VID_A                   0x0D98  
-#define DISP_LIN_TRANS_VID_B                   0x0D9C  
-#define DISP_LIN_TRANS_VID_C                   0x0DA0  
-#define DISP_LIN_TRANS_VID_D                   0x0DA4  
-#define DISP_LIN_TRANS_VID_E                   0x0DA8  
-#define DISP_LIN_TRANS_VID_F                   0x0DAC  
-#define RMX_HORZ_FILTER_0TAP_COEF              0x0DB0  
-#define RMX_HORZ_FILTER_1TAP_COEF              0x0DB4  
-#define RMX_HORZ_FILTER_2TAP_COEF              0x0DB8  
-#define RMX_HORZ_PHASE                         0x0DBC  
-#define DAC_EMBEDDED_SYNC_CNTL                 0x0DC0  
-#define DAC_BROAD_PULSE                        0x0DC4  
+#define DISP_LIN_TRANS_GRPH_E                  0x0D90
+#define DISP_LIN_TRANS_GRPH_F                  0x0D94
+#define DISP_LIN_TRANS_VID_A                   0x0D98
+#define DISP_LIN_TRANS_VID_B                   0x0D9C
+#define DISP_LIN_TRANS_VID_C                   0x0DA0
+#define DISP_LIN_TRANS_VID_D                   0x0DA4
+#define DISP_LIN_TRANS_VID_E                   0x0DA8
+#define DISP_LIN_TRANS_VID_F                   0x0DAC
+#define RMX_HORZ_FILTER_0TAP_COEF              0x0DB0
+#define RMX_HORZ_FILTER_1TAP_COEF              0x0DB4
+#define RMX_HORZ_FILTER_2TAP_COEF              0x0DB8
+#define RMX_HORZ_PHASE                         0x0DBC
+#define DAC_EMBEDDED_SYNC_CNTL                 0x0DC0
+#define DAC_BROAD_PULSE                        0x0DC4
 #define DAC_SKEW_CLKS                          0x0DC8
 #define DAC_INCR                               0x0DCC
 #define DAC_NEG_SYNC_LEVEL                     0x0DD0
-#define DAC_POS_SYNC_LEVEL                     0x0DD4  
-#define DAC_BLANK_LEVEL                        0x0DD8  
-#define CLOCK_CNTL_INDEX                       0x0008  
-#define CLOCK_CNTL_DATA                        0x000C  
-#define CP_RB_CNTL                             0x0704  
-#define CP_RB_BASE                             0x0700  
-#define CP_RB_RPTR_ADDR                        0x070C  
-#define CP_RB_RPTR                             0x0710  
-#define CP_RB_WPTR                             0x0714  
-#define CP_RB_WPTR_DELAY                       0x0718  
-#define CP_IB_BASE                             0x0738  
-#define CP_IB_BUFSZ                            0x073C  
-#define SCRATCH_REG0                           0x15E0  
-#define GUI_SCRATCH_REG0                       0x15E0  
-#define SCRATCH_REG1                           0x15E4  
-#define GUI_SCRATCH_REG1                       0x15E4  
+#define DAC_POS_SYNC_LEVEL                     0x0DD4
+#define DAC_BLANK_LEVEL                        0x0DD8
+#define CLOCK_CNTL_INDEX                       0x0008
+#define CLOCK_CNTL_DATA                        0x000C
+#define CP_RB_CNTL                             0x0704
+#define CP_RB_BASE                             0x0700
+#define CP_RB_RPTR_ADDR                        0x070C
+#define CP_RB_RPTR                             0x0710
+#define CP_RB_WPTR                             0x0714
+#define CP_RB_WPTR_DELAY                       0x0718
+#define CP_IB_BASE                             0x0738
+#define CP_IB_BUFSZ                            0x073C
+#define SCRATCH_REG0                           0x15E0
+#define GUI_SCRATCH_REG0                       0x15E0
+#define SCRATCH_REG1                           0x15E4
+#define GUI_SCRATCH_REG1                       0x15E4
 #define SCRATCH_REG2                           0x15E8
 #define GUI_SCRATCH_REG2                       0x15E8
 #define SCRATCH_REG3                           0x15EC
-#define GUI_SCRATCH_REG3                       0x15EC  
-#define SCRATCH_REG4                           0x15F0  
-#define GUI_SCRATCH_REG4                       0x15F0  
-#define SCRATCH_REG5                           0x15F4  
-#define GUI_SCRATCH_REG5                       0x15F4  
-#define SCRATCH_UMSK                           0x0770  
-#define SCRATCH_ADDR                           0x0774  
-#define DP_BRUSH_FRGD_CLR                      0x147C  
+#define GUI_SCRATCH_REG3                       0x15EC
+#define SCRATCH_REG4                           0x15F0
+#define GUI_SCRATCH_REG4                       0x15F0
+#define SCRATCH_REG5                           0x15F4
+#define GUI_SCRATCH_REG5                       0x15F4
+#define SCRATCH_UMSK                           0x0770
+#define SCRATCH_ADDR                           0x0774
+#define DP_BRUSH_FRGD_CLR                      0x147C
 #define DP_BRUSH_BKGD_CLR                      0x1478
 #define DST_LINE_START                         0x1600
-#define DST_LINE_END                           0x1604  
-#define SRC_OFFSET                             0x15AC  
+#define DST_LINE_END                           0x1604
+#define SRC_OFFSET                             0x15AC
 #define SRC_PITCH                              0x15B0
 #define SRC_TILE                               0x1704
 #define SRC_PITCH_OFFSET                       0x1428
-#define SRC_X                                  0x1414  
-#define SRC_Y                                  0x1418  
-#define SRC_X_Y                                0x1590  
-#define SRC_Y_X                                0x1434  
+#define SRC_X                                  0x1414
+#define SRC_Y                                  0x1418
+#define SRC_X_Y                                0x1590
+#define SRC_Y_X                                0x1434
 #define DST_Y_X                                0x1438
 #define DST_WIDTH_HEIGHT                       0x1598
 #define DST_HEIGHT_WIDTH                       0x143c
 #define DST_OFFSET                             0x1404
-#define SRC_CLUT_ADDRESS                       0x1780  
-#define SRC_CLUT_DATA                          0x1784  
-#define SRC_CLUT_DATA_RD                       0x1788  
-#define HOST_DATA0                             0x17C0  
-#define HOST_DATA1                             0x17C4  
-#define HOST_DATA2                             0x17C8  
-#define HOST_DATA3                             0x17CC  
-#define HOST_DATA4                             0x17D0  
-#define HOST_DATA5                             0x17D4  
-#define HOST_DATA6                             0x17D8  
+#define SRC_CLUT_ADDRESS                       0x1780
+#define SRC_CLUT_DATA                          0x1784
+#define SRC_CLUT_DATA_RD                       0x1788
+#define HOST_DATA0                             0x17C0
+#define HOST_DATA1                             0x17C4
+#define HOST_DATA2                             0x17C8
+#define HOST_DATA3                             0x17CC
+#define HOST_DATA4                             0x17D0
+#define HOST_DATA5                             0x17D4
+#define HOST_DATA6                             0x17D8
 #define HOST_DATA7                             0x17DC
 #define HOST_DATA_LAST                         0x17E0
 #define DP_SRC_ENDIAN                          0x15D4
-#define DP_SRC_FRGD_CLR                        0x15D8  
-#define DP_SRC_BKGD_CLR                        0x15DC  
-#define SC_LEFT                                0x1640  
-#define SC_RIGHT                               0x1644  
-#define SC_TOP                                 0x1648  
-#define SC_BOTTOM                              0x164C  
-#define SRC_SC_RIGHT                           0x1654  
-#define SRC_SC_BOTTOM                          0x165C  
-#define DP_CNTL                                0x16C0  
-#define DP_CNTL_XDIR_YDIR_YMAJOR               0x16D0  
-#define DP_DATATYPE                            0x16C4  
-#define DP_MIX                                 0x16C8  
-#define DP_WRITE_MSK                           0x16CC  
-#define DP_XOP                                 0x17F8  
+#define DP_SRC_FRGD_CLR                        0x15D8
+#define DP_SRC_BKGD_CLR                        0x15DC
+#define SC_LEFT                                0x1640
+#define SC_RIGHT                               0x1644
+#define SC_TOP                                 0x1648
+#define SC_BOTTOM                              0x164C
+#define SRC_SC_RIGHT                           0x1654
+#define SRC_SC_BOTTOM                          0x165C
+#define DP_CNTL                                0x16C0
+#define DP_CNTL_XDIR_YDIR_YMAJOR               0x16D0
+#define DP_DATATYPE                            0x16C4
+#define DP_MIX                                 0x16C8
+#define DP_WRITE_MSK                           0x16CC
+#define DP_XOP                                 0x17F8
 #define CLR_CMP_CLR_SRC                        0x15C4
 #define CLR_CMP_CLR_DST                        0x15C8
 #define CLR_CMP_CNTL                           0x15C0
-#define CLR_CMP_MSK                            0x15CC  
-#define DSTCACHE_MODE                          0x1710  
-#define DSTCACHE_CTLSTAT                       0x1714  
-#define DEFAULT_PITCH_OFFSET                   0x16E0  
-#define DEFAULT_SC_BOTTOM_RIGHT                0x16E8  
+#define CLR_CMP_MSK                            0x15CC
+#define DSTCACHE_MODE                          0x1710
+#define DSTCACHE_CTLSTAT                       0x1714
+#define DEFAULT_PITCH_OFFSET                   0x16E0
+#define DEFAULT_SC_BOTTOM_RIGHT                0x16E8
 #define DEFAULT_SC_TOP_LEFT                    0x16EC
 #define SRC_PITCH_OFFSET                       0x1428
 #define DST_PITCH_OFFSET                       0x142C
-#define DP_GUI_MASTER_CNTL                     0x146C  
-#define SC_TOP_LEFT                            0x16EC  
-#define SC_BOTTOM_RIGHT                        0x16F0  
-#define SRC_SC_BOTTOM_RIGHT                    0x16F4  
+#define DP_GUI_MASTER_CNTL                     0x146C
+#define SC_TOP_LEFT                            0x16EC
+#define SC_BOTTOM_RIGHT                        0x16F0
+#define SRC_SC_BOTTOM_RIGHT                    0x16F4
 #define RB2D_DSTCACHE_MODE                     0x3428
 #define RB2D_DSTCACHE_CTLSTAT_broken           0x342C /* do not use */
 #define LVDS_GEN_CNTL                          0x02d0
@@ -686,7 +686,7 @@
 #define VERT_FP_LOOP_STRETCH                       (0x7 << 28)
 #define VERT_STRETCH_RESERVED                      0xf1000000
 
-/* DAC_CNTL bit constants */   
+/* DAC_CNTL bit constants */
 #define DAC_8BIT_EN                                0x00000100
 #define DAC_4BPP_PIX_ORDER                         0x00000200
 #define DAC_CRC_EN                                 0x00080000
@@ -700,7 +700,7 @@
 #define DAC_CMP_EN                                 (1 <<  3)
 #define DAC_CMP_OUTPUT                             (1 <<  7)
 
-/* DAC_CNTL2 bit constants */   
+/* DAC_CNTL2 bit constants */
 #define DAC2_EXPAND_MODE                           (1 << 14)
 #define DAC2_CMP_EN                                (1 << 7)
 #define DAC2_PALETTE_ACCESS_CNTL                   (1 << 5)
diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index fe41b8407946..c3b2a2aa7140 100644
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -14,13 +14,16 @@
 #define S1D13XXXFB_H
 
 #define S1D_PALETTE_SIZE                256
-#define S1D13506_CHIP_REV               4       /* expected chip revision number for s1d13506 */
-#define S1D13806_CHIP_REV               7       /* expected chip revision number for s1d13806 */
-#define S1D_FBID                        "S1D13806"
-#define S1D_DEVICENAME                  "s1d13806fb"
+#define S1D_FBID                        "S1D13xxx"
+#define S1D_DEVICENAME                  "s1d13xxxfb"
+
+/* S1DREG_REV_CODE register = prod_id (6 bits) + revision (2 bits) */
+#define S1D13505_PROD_ID                0x3     /* 000011 */
+#define S1D13506_PROD_ID                0x4     /* 000100 */
+#define S1D13806_PROD_ID                0x7     /* 000111 */
 
 /* register definitions (tested on s1d13896) */
-#define S1DREG_REV_CODE                 0x0000  /* Revision Code Register */
+#define S1DREG_REV_CODE                 0x0000  /* Prod + Rev Code Register */
 #define S1DREG_MISC                     0x0001  /* Miscellaneous Register */
 #define S1DREG_GPIO_CNF0                0x0004  /* General IO Pins Configuration Register 0 */
 #define S1DREG_GPIO_CNF1                0x0005  /* General IO Pins Configuration Register 1 */
@@ -141,10 +144,11 @@ struct s1d13xxxfb_regval {
         u8      value;
 };
 
-
 struct s1d13xxxfb_par {
         void __iomem    *regs;
         unsigned char   display;
+        unsigned char   prod_id;
+        unsigned char   revision;
 
         unsigned int    pseudo_palette[16];
 #ifdef CONFIG_PM
diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index 7431d9681e57..befbaf0a92d8 100644
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -1,6 +1,9 @@
 #ifndef _TDFX_H
 #define _TDFX_H
 
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+
 /* membase0 register offsets */
 #define STATUS          0x00
 #define PCIINIT0        0x04
@@ -123,6 +126,18 @@
 #define VIDCFG_PIXFMT_SHIFT             18
 #define DACMODE_2X                      BIT(0)
 
+/* I2C bit locations in the VIDSERPARPORT register */
+#define DDC_ENAB        0x00040000
+#define DDC_SCL_OUT     0x00080000
+#define DDC_SDA_OUT     0x00100000
+#define DDC_SCL_IN      0x00200000
+#define DDC_SDA_IN      0x00400000
+#define I2C_ENAB        0x00800000
+#define I2C_SCL_OUT     0x01000000
+#define I2C_SDA_OUT     0x02000000
+#define I2C_SCL_IN      0x04000000
+#define I2C_SDA_IN      0x08000000
+
 /* VGA rubbish, need to change this for multihead support */
 #define MISC_W          0x3c2
 #define MISC_R          0x3cc
@@ -168,12 +183,23 @@ struct banshee_reg {
         unsigned long miscinit0;
 };
 
+struct tdfx_par;
+
+struct tdfxfb_i2c_chan {
+        struct tdfx_par *par;
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
+
 struct tdfx_par {
         u32 max_pixclock;
         u32 palette[16];
         void __iomem *regbase_virt;
         unsigned long iobase;
         int mtrr_handle;
+#ifdef CONFIG_FB_3DFX_I2C
+        struct tdfxfb_i2c_chan chan[2];
+#endif
 };
 
 #endif  /* __KERNEL__ */